Skip to content

Commit

Permalink
Ar 776 fix language filter (#226)
Browse files Browse the repository at this point in the history
* use media lang filter to lessons

* fix bug
  • Loading branch information
davgur committed Mar 10, 2021
1 parent b14e72b commit 3c1bb42
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
14 changes: 8 additions & 6 deletions api/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@ func LessonsHandler(c *gin.Context) {

if utils.IsEmpty(r.Authors) &&
utils.IsEmpty(r.Sources) &&
utils.IsEmpty(r.Tags) {
utils.IsEmpty(r.Tags) &&
r.MediaLanguage == "" {
if r.OrderBy == "" {
r.OrderBy = "(properties->>'film_date')::date desc, (properties->>'number')::int desc, created_at desc"
}
Expand Down Expand Up @@ -328,11 +329,12 @@ func LessonsHandler(c *gin.Context) {
ContentTypesFilter: ContentTypesFilter{
ContentTypes: []string{consts.CT_LESSON_PART},
},
ListRequest: r.ListRequest,
DateRangeFilter: r.DateRangeFilter,
SourcesFilter: r.SourcesFilter,
TagsFilter: r.TagsFilter,
WithFiles: withFiles,
ListRequest: r.ListRequest,
DateRangeFilter: r.DateRangeFilter,
SourcesFilter: r.SourcesFilter,
TagsFilter: r.TagsFilter,
WithFiles: withFiles,
MediaLanguageFilter: r.MediaLanguageFilter,
}
resp, err := handleContentUnits(c.MustGet("MDB_DB").(*sql.DB), cur)
concludeRequest(c, resp, err)
Expand Down
1 change: 1 addition & 0 deletions api/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ type LessonsRequest struct {
DateRangeFilter
SourcesFilter
TagsFilter
MediaLanguageFilter
}

type PublishersRequest struct {
Expand Down

0 comments on commit 3c1bb42

Please sign in to comment.