fix: ordering of segments

Author: rschlaefli

packages/platform/src/services/GameService.ts

@@ -564,6 +564,12 @@ export async function activateNextPeriod(
           },
         })
 
+        // reset player readiness
+        await tx.player.updateMany({
+          where: { game: { id: gameId } },
+          data: { isReady: false },
+        })
+
         for (const extra of extras) {
           await extra
         }
@@ -676,6 +682,12 @@ export async function activateNextPeriod(
           include: { results: true },
         })
 
+        // reset player readiness
+        await tx.player.updateMany({
+          where: { game: { id: gameId } },
+          data: { isReady: false },
+        })
+
         for (const extra of extras) {
           await extra
         }
@@ -760,6 +772,12 @@ export async function activateNextPeriod(
           },
         }),
 
+        // reset player readiness
+        ctx.prisma.player.updateMany({
+          where: { game: { id: gameId } },
+          data: { isReady: false },
+        }),
+
         ...extras,
       ])
 
@@ -818,7 +836,7 @@ export async function activateNextSegment(
     include: {
       activePeriod: {
         include: {
-          segments: { include: { nextSegment: true } },
+          segments: { orderBy: { index: 'asc' }, include: { nextSegment: true } },
           results: { include: { player: true } },
           activeSegment: {
             include: {
@@ -914,6 +932,12 @@ export async function activateNextSegment(
           },
         })
 
+        // reset player readiness
+        await tx.player.updateMany({
+          where: { game: { id: gameId } },
+          data: { isReady: false },
+        })
+
         for (const extra of extras) {
           await extra
         }

packages/platform/src/services/PlayService.ts

@@ -326,6 +326,7 @@ export async function getPlayerResult(args: GetPlayerResultArgs, ctx: Context) {
             },
           },
           segments: {
+            orderBy: { index: 'asc' },
             include: {
               learningElements: true,
               storyElements: true,
@@ -337,6 +338,7 @@ export async function getPlayerResult(args: GetPlayerResultArgs, ctx: Context) {
         orderBy: { createdAt: 'asc' },
         include: {
           segments: {
+            orderBy: { index: 'asc' },
             include: {
               learningElements: true,
               storyElements: true,
@@ -359,12 +361,12 @@ export async function getPlayerResult(args: GetPlayerResultArgs, ctx: Context) {
   // should not be visible to the user
   const activePeriodIx = currentGame.activePeriodIx
   currentGame.periods = currentGame.periods.filter(
-    (_, ix) => ix <= activePeriodIx
+    (period) => period.index <= activePeriodIx
   )
   const activeSegmentIx = currentGame.activePeriod.activeSegmentIx
 
   currentGame.activePeriod.segments = currentGame.activePeriod.segments.filter(
-    (_, ix) => ix <= activeSegmentIx
+    (segment) => segment.index <= activeSegmentIx
   )
 
   currentGame.periods[activePeriodIx]!.segments =