Merge branch 'dev-ars' into dev

modules/backend/queries.sql

@@ -193,10 +193,10 @@ WHERE
     )
 
     AND (
-        'title_statuses'::title_status_t[] IS NULL
+        sqlc.narg('title_statuses')::title_status_t[] IS NULL
-        OR array_length('title_statuses'::title_status_t[], 1) IS NULL
+        OR array_length(sqlc.narg('title_statuses')::title_status_t[], 1) IS NULL
-        OR array_length('title_statuses'::title_status_t[], 1) = 0
+        OR array_length(sqlc.narg('title_statuses')::title_status_t[], 1) = 0
-        OR t.title_status = ANY('title_statuses'::title_status_t[])
+        OR t.title_status = ANY(sqlc.narg('title_statuses')::title_status_t[])
     )
     AND (sqlc.narg('rating')::float IS NULL OR t.rating >= sqlc.narg('rating')::float)
     AND (sqlc.narg('release_year')::int IS NULL OR t.release_year = sqlc.narg('release_year')::int)
@@ -325,16 +325,16 @@ WHERE
     )
 
     AND (
-        'title_statuses'::title_status_t[] IS NULL
+        sqlc.narg('title_statuses')::title_status_t[] IS NULL
-        OR array_length('title_statuses'::title_status_t[], 1) IS NULL
+        OR array_length(sqlc.narg('title_statuses')::title_status_t[], 1) IS NULL
-        OR array_length('title_statuses'::title_status_t[], 1) = 0
+        OR array_length(sqlc.narg('title_statuses')::title_status_t[], 1) = 0
-        OR t.title_status = ANY('title_statuses'::title_status_t[])
+        OR t.title_status = ANY(sqlc.narg('title_statuses')::title_status_t[])
     )
     AND (
-        'usertitle_statuses'::title_status_t[] IS NULL
+        sqlc.narg('usertitle_statuses')::usertitle_status_t[] IS NULL
-        OR array_length('usertitle_statuses'::title_status_t[], 1) IS NULL
+        OR array_length(sqlc.narg('usertitle_statuses')::usertitle_status_t[], 1) IS NULL
-        OR array_length('usertitle_statuses'::title_status_t[], 1) = 0
+        OR array_length(sqlc.narg('usertitle_statuses')::usertitle_status_t[], 1) = 0
-        OR t.title_status = ANY('usertitle_statuses'::title_status_t[])
+        OR t.title_status = ANY(sqlc.narg('usertitle_statuses')::usertitle_status_t[])
     )
     AND (sqlc.narg('rate')::int IS NULL OR u.rate >= sqlc.narg('rate')::int)
     AND (sqlc.narg('rating')::float IS NULL OR t.rating >= sqlc.narg('rating')::float)

sql/queries.sql.go

@@ -434,14 +434,14 @@ WHERE
     )
 
     AND (
-        'title_statuses'::title_status_t[] IS NULL
+        $7::title_status_t[] IS NULL
-        OR array_length('title_statuses'::title_status_t[], 1) IS NULL
+        OR array_length($7::title_status_t[], 1) IS NULL
-        OR array_length('title_statuses'::title_status_t[], 1) = 0
+        OR array_length($7::title_status_t[], 1) = 0
-        OR t.title_status = ANY('title_statuses'::title_status_t[])
+        OR t.title_status = ANY($7::title_status_t[])
     )
-    AND ($7::float IS NULL OR t.rating >= $7::float)
+    AND ($8::float IS NULL OR t.rating >= $8::float)
-    AND ($8::int IS NULL OR t.release_year = $8::int)
+    AND ($9::int IS NULL OR t.release_year = $9::int)
-    AND ($9::release_season_t IS NULL OR t.release_season = $9::release_season_t)
+    AND ($10::release_season_t IS NULL OR t.release_season = $10::release_season_t)
 
 GROUP BY 
     t.id, i.id, s.id
@@ -464,7 +464,7 @@ ORDER BY
 
     CASE WHEN $2::text <> 'id' THEN t.id END ASC
 
-LIMIT COALESCE($10::int, 100)
+LIMIT COALESCE($11::int, 100)
 `
 
 type SearchTitlesParams struct {
@@ -474,6 +474,7 @@ type SearchTitlesParams struct {
 	CursorID      *int64          `json:"cursor_id"`
 	CursorRating  *float64        `json:"cursor_rating"`
 	Word          *string         `json:"word"`
+	TitleStatuses []TitleStatusT  `json:"title_statuses"`
 	Rating        *float64        `json:"rating"`
 	ReleaseYear   *int32          `json:"release_year"`
 	ReleaseSeason *ReleaseSeasonT `json:"release_season"`
@@ -506,6 +507,7 @@ func (q *Queries) SearchTitles(ctx context.Context, arg SearchTitlesParams) ([]S
 		arg.CursorID,
 		arg.CursorRating,
 		arg.Word,
+		arg.TitleStatuses,
 		arg.Rating,
 		arg.ReleaseYear,
 		arg.ReleaseSeason,
@@ -646,21 +648,21 @@ WHERE
     )
 
     AND (
-        'title_statuses'::title_status_t[] IS NULL
+        $7::title_status_t[] IS NULL
-        OR array_length('title_statuses'::title_status_t[], 1) IS NULL
+        OR array_length($7::title_status_t[], 1) IS NULL
-        OR array_length('title_statuses'::title_status_t[], 1) = 0
+        OR array_length($7::title_status_t[], 1) = 0
-        OR t.title_status = ANY('title_statuses'::title_status_t[])
+        OR t.title_status = ANY($7::title_status_t[])
     )
     AND (
-        'usertitle_statuses'::title_status_t[] IS NULL
+        $8::usertitle_status_t[] IS NULL
-        OR array_length('usertitle_statuses'::title_status_t[], 1) IS NULL
+        OR array_length($8::usertitle_status_t[], 1) IS NULL
-        OR array_length('usertitle_statuses'::title_status_t[], 1) = 0
+        OR array_length($8::usertitle_status_t[], 1) = 0
-        OR t.title_status = ANY('usertitle_statuses'::title_status_t[])
+        OR t.title_status = ANY($8::usertitle_status_t[])
     )
-    AND ($7::int IS NULL OR u.rate >= $7::int)
+    AND ($9::int IS NULL OR u.rate >= $9::int)
-    AND ($8::float IS NULL OR t.rating >= $8::float)
+    AND ($10::float IS NULL OR t.rating >= $10::float)
-    AND ($9::int IS NULL OR t.release_year = $9::int)
+    AND ($11::int IS NULL OR t.release_year = $11::int)
-    AND ($10::release_season_t IS NULL OR t.release_season = $10::release_season_t)
+    AND ($12::release_season_t IS NULL OR t.release_season = $12::release_season_t)
 
 GROUP BY 
     t.id, i.id, s.id
@@ -685,7 +687,7 @@ ORDER BY
 
     CASE WHEN $2::text <> 'id' THEN t.id END ASC
 
-LIMIT COALESCE($11::int, 100)
+LIMIT COALESCE($13::int, 100)
 `
 
 type SearchUserTitlesParams struct {
@@ -695,6 +697,8 @@ type SearchUserTitlesParams struct {
 	CursorID          *int64             `json:"cursor_id"`
 	CursorRating      *float64           `json:"cursor_rating"`
 	Word              *string            `json:"word"`
+	TitleStatuses     []TitleStatusT     `json:"title_statuses"`
+	UsertitleStatuses []UsertitleStatusT `json:"usertitle_statuses"`
 	Rate              *int32             `json:"rate"`
 	Rating            *float64           `json:"rating"`
 	ReleaseYear       *int32             `json:"release_year"`
@@ -734,6 +738,8 @@ func (q *Queries) SearchUserTitles(ctx context.Context, arg SearchUserTitlesPara
 		arg.CursorID,
 		arg.CursorRating,
 		arg.Word,
+		arg.TitleStatuses,
+		arg.UsertitleStatuses,
 		arg.Rate,
 		arg.Rating,
 		arg.ReleaseYear,