Merge pull request #1581 from serlo/fix-order-unrevised

fix(unrevised): be sure new revisions come first
serlo · Jun 14, 2024 · 77af71c · 77af71c
2 parents ea6b2de + 9d0ff75
commit 77af71c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/__tests__/schema/entity/checkout-revision.ts b/__tests__/schema/entity/checkout-revision.ts
@@ -33,7 +33,7 @@ test('checks out a revision', async () => {
     .withVariables({ id: 26334 })
     .shouldReturnData({
       uuid: {
-        unrevisedEntities: { nodes: [{ id: 34907 }, { id: 35247 }] },
+        unrevisedEntities: { nodes: [{ id: 35247 }, { id: 34907 }] },
       },
     })
 

diff --git a/__tests__/schema/entity/reject-revision.ts b/__tests__/schema/entity/reject-revision.ts
@@ -33,7 +33,7 @@ test('checks out a revision', async () => {
     .withVariables({ id: 26334 })
     .shouldReturnData({
       uuid: {
-        unrevisedEntities: { nodes: [{ id: 34907 }, { id: 35247 }] },
+        unrevisedEntities: { nodes: [{ id: 35247 }, { id: 34907 }] },
       },
     })
 

diff --git a/__tests__/schema/subject.ts b/__tests__/schema/subject.ts
@@ -45,8 +45,8 @@ const subjects = [
   {
     unrevisedEntities: {
       nodes: [
-        { __typename: 'Article', id: 34907 },
         { __typename: 'Article', id: 35247 },
+        { __typename: 'Article', id: 34907 },
       ],
     },
   },
@@ -93,17 +93,18 @@ test('`Subject.unrevisedEntities` shows new revisions first', async () => {
     })
     .execute()
   const subjectsChangedOrder = [...subjects]
-  ;(subjectsChangedOrder[4] = {
+  subjectsChangedOrder[4] = {
     unrevisedEntities: {
       nodes: [
-        { __typename: 'Article', id: 35247 },
         { __typename: 'Article', id: 34907 },
+        { __typename: 'Article', id: 35247 },
       ],
     },
-  }),
-    await query.shouldReturnData({
-      subject: {
-        subjects: subjectsChangedOrder,
-      },
-    })
+  }
+
+  await query.shouldReturnData({
+    subject: {
+      subjects: subjectsChangedOrder,
+    },
+  })
 })
diff --git a/packages/server/src/schema/uuid/abstract-entity/resolvers.ts b/packages/server/src/schema/uuid/abstract-entity/resolvers.ts
@@ -508,7 +508,7 @@ export async function resolveUnrevisedEntityIds(
       entity_uuid.trashed = 0
       and (entity.current_revision_id is null or
         entity.current_revision_id < revision.max_revision_id)
-    order by max_revision_id
+    order by max_revision_id desc
     `,
     [userId, userId],
   )