fix: empty rank for subject browsing (#584)

bangumi · Jun 3, 2024 · 75ce30c · 75ce30c
1 parent b4f5f6d
commit 75ce30c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/internal/subject/mysql_repository.go b/internal/subject/mysql_repository.go
@@ -261,7 +261,7 @@ func (r mysqlRepo) Count(
 		case "date":
 			q = q.Order(r.q.SubjectField.Date.Desc())
 		case "rank":
-			q = q.Order(r.q.SubjectField.Rank)
+			q = q.Where(r.q.SubjectField.Rank.Gt(0)).Order(r.q.SubjectField.Rank)
 		}
 	}
 
@@ -298,7 +298,7 @@ func (r mysqlRepo) Browse(
 		case "date":
 			q = q.Order(r.q.SubjectField.Date.Desc())
 		case "rank":
-			q = q.Order(r.q.SubjectField.Rank)
+			q = q.Where(r.q.SubjectField.Rank.Gt(0)).Order(r.q.SubjectField.Rank)
 		}
 	}
 

diff --git a/internal/subject/mysql_repository_test.go b/internal/subject/mysql_repository_test.go
@@ -97,16 +97,15 @@ func TestBrowse(t *testing.T) {
 	}
 	s, err = repo.Browse(context.Background(), filter, 30, 0)
 	require.NoError(t, err)
-	require.Equal(t, 9, len(s))
-	require.Equal(t, model.SubjectID(2), s[0].ID)
-	require.Equal(t, model.SubjectID(20), s[1].ID)
-	require.Equal(t, model.SubjectID(17), s[2].ID)
-	require.Equal(t, model.SubjectID(16), s[3].ID)
-	require.Equal(t, model.SubjectID(15), s[4].ID)
-	require.Equal(t, model.SubjectID(406604), s[5].ID)
-	require.Equal(t, model.SubjectID(19), s[6].ID)
-	require.Equal(t, model.SubjectID(315957), s[7].ID)
-	require.Equal(t, model.SubjectID(18), s[8].ID)
+	require.Equal(t, 8, len(s))
+	require.Equal(t, model.SubjectID(20), s[0].ID)
+	require.Equal(t, model.SubjectID(17), s[1].ID)
+	require.Equal(t, model.SubjectID(16), s[2].ID)
+	require.Equal(t, model.SubjectID(15), s[3].ID)
+	require.Equal(t, model.SubjectID(406604), s[4].ID)
+	require.Equal(t, model.SubjectID(19), s[5].ID)
+	require.Equal(t, model.SubjectID(315957), s[6].ID)
+	require.Equal(t, model.SubjectID(18), s[7].ID)
 
 	filter = subject.BrowseFilter{
 		Type:     4,

diff --git a/openapi/v0.yaml b/openapi/v0.yaml
@@ -228,7 +228,7 @@ paths:
           required: false
           schema:
             type: string
-        - name: order
+        - name: sort
           in: query
           description: 排序，枚举值 {date|rank}
           required: false

diff --git a/web/handler/subject/browse.go b/web/handler/subject/browse.go
@@ -69,7 +69,7 @@ func (h Subject) Browse(c echo.Context) error {
 func parseBrowseQuery(c echo.Context) (*subject.BrowseFilter, error) {
 	filter := subject.BrowseFilter{}
 	u := accessor.GetFromCtx(c)
-	filter.NSFW = null.Bool{Value: !u.AllowNSFW(), Set: true}
+	filter.NSFW = null.Bool{Value: false, Set: !u.AllowNSFW()}
 	if stype, err := req.ParseSubjectType(c.QueryParam("type")); err != nil {
 		return nil, res.BadRequest(err.Error())
 	} else {