Updated design + added documentation page
This commit is contained in:
1 parent
c33a883c34
commit
76a3c446da
25 files changed
+1080
-448
No files matched your search
+26
-2
@@ -26,6 +26,30 @@ type Search struct {
|
||||
Date *time.Time `form:"date" time_format:"2006-01-02"`
|
||||
RangeStart *time.Time `form:"range_start" time_format:"2006-01-02"`
|
||||
RangeEnd *time.Time `form:"range_end" time_format:"2006-01-02"`
|
||||
StateHoliday *bool `form:"state_holiday,omitempty"`
|
||||
ReligiousHoliday *bool `form:"religious_holiday,omitempty"`
|
||||
StateHoliday string `form:"state_holiday,omitempty" binding:"omitempty"`
|
||||
ReligiousHoliday string `form:"religious_holiday,omitempty" binding:"omitempty"`
|
||||
}
|
||||
|
||||
func (s Search) IsStateHoliday() *bool {
|
||||
var value bool
|
||||
if s.StateHoliday == "true" {
|
||||
value = true
|
||||
} else if s.StateHoliday == "false" {
|
||||
value = false
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
return &value
|
||||
}
|
||||
|
||||
func (s Search) IsReligiousHoliday() *bool {
|
||||
var value bool
|
||||
if s.ReligiousHoliday == "true" {
|
||||
value = true
|
||||
} else if s.ReligiousHoliday == "false" {
|
||||
value = false
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
return &value
|
||||
}
|
||||
+4
-4
@@ -16,13 +16,13 @@ func (s *Service) Find(search Search, paging Paging) ([]Holiday, error) {
|
||||
var holidays []Holiday
|
||||
var err error
|
||||
if search.Date != nil {
|
||||
holidays, err = s.findByDate(*search.Date, search.StateHoliday, search.ReligiousHoliday, search.Country)
|
||||
holidays, err = s.findByDate(*search.Date, search.IsStateHoliday(), search.IsReligiousHoliday(), search.Country)
|
||||
} else if search.RangeStart != nil || search.RangeEnd != nil {
|
||||
holidays, err = s.findForRange(getDateOrDefault(search.RangeStart, 1000), getDateOrDefault(search.RangeEnd, 3000), search.StateHoliday, search.ReligiousHoliday, search.Country)
|
||||
holidays, err = s.findForRange(getDateOrDefault(search.RangeStart, 1000), getDateOrDefault(search.RangeEnd, 3000), search.IsStateHoliday(), search.IsReligiousHoliday(), search.Country)
|
||||
} else if search.Year != nil {
|
||||
holidays, err = s.findByYear(*search.Year, search.StateHoliday, search.ReligiousHoliday, search.Country)
|
||||
holidays, err = s.findByYear(*search.Year, search.IsStateHoliday(), search.IsReligiousHoliday(), search.Country)
|
||||
} else {
|
||||
holidays, err = s.find(search.StateHoliday, search.ReligiousHoliday, search.Country)
|
||||
holidays, err = s.find(search.IsStateHoliday(), search.IsReligiousHoliday(), search.Country)
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in new issue
Block a user