@gbl-uzh/platform 0.4.13 → 0.4.14-beta.1

package/dist/index.d.ts

@@ -5,6 +5,7 @@ import { PrismaClient } from '@prisma/client';
 import { NextPageContext } from 'next';
 import * as yup from 'yup';
 import yup__default from 'yup';
+import * as _prisma_client_runtime_library from '@prisma/client/runtime/library';
 
 declare const logger: winston.Logger;
 
@@ -783,6 +784,24 @@ declare function getLearningElements(args: any, ctx: Context$1): Promise<({
     createdAt: Date;
     updatedAt: Date;
 })[]>;
+declare function mapAction({ ctx, gameId, activePeriodIx, activeSegmentIx, playerId, }: {
+    ctx: Context$1;
+    gameId: number;
+    activePeriodIx: number;
+    activeSegmentIx?: number;
+    playerId: string;
+}): (action: any) => DB.Prisma.Prisma__PlayerActionClient<{
+    id: number;
+    type: string;
+    facts: DB.Prisma.JsonValue;
+    gameId: number;
+    playerId: string;
+    periodId: number;
+    periodIx: number;
+    segmentId: number | null;
+    segmentIx: number | null;
+    createdAt: Date;
+}, never, _prisma_client_runtime_library.DefaultArgs>;
 declare function computePeriodStartResults({ results, players, activePeriodIx, gameId, periodFacts }: {
     results: any;
     players: any;
@@ -837,6 +856,7 @@ declare const GameService_getGame: typeof getGame;
 declare const GameService_getGameFromContext: typeof getGameFromContext;
 declare const GameService_getGames: typeof getGames;
 declare const GameService_getLearningElements: typeof getLearningElements;
+declare const GameService_mapAction: typeof mapAction;
 declare const GameService_updatePlayerData: typeof updatePlayerData;
 declare namespace GameService {
   export {
@@ -854,6 +874,7 @@ declare namespace GameService {
     GameService_getGameFromContext as getGameFromContext,
     GameService_getGames as getGames,
     GameService_getLearningElements as getLearningElements,
+    GameService_mapAction as mapAction,
     GameService_updatePlayerData as updatePlayerData,
   };
 }
@@ -867,31 +888,7 @@ interface PerformActionArgs<ActionTypes> {
     actionType: ActionTypes;
     facts: any;
 }
-declare function performAction<ActionTypes>(args: PerformActionArgs<ActionTypes>, ctx: Context, { reducers }: any): Promise<({
-    period: {
-        id: number;
-        index: number;
-        facts: DB.Prisma.JsonValue;
-        activeSegmentIx: number;
-        activeSegmentId: number | null;
-        nextPeriodId: number | null;
-        gameId: number;
-        createdAt: Date;
-        updatedAt: Date;
-    };
-} & {
-    id: number;
-    type: DB.$Enums.PlayerResultType;
-    facts: DB.Prisma.JsonValue;
-    playerId: string;
-    gameId: number;
-    periodId: number;
-    periodIx: number;
-    segmentId: number | null;
-    segmentIx: number | null;
-    createdAt: Date;
-    updatedAt: Date;
-}) | null>;
+declare function performAction<ActionTypes>(args: PerformActionArgs<ActionTypes>, ctx: Context, { reducers }: any): Promise<any>;
 interface SaveDecisionsArgs {
     decisionType: DB.PlayerDecisionType;
     facts: any;

package/dist/index.js

@@ -376,6 +376,7 @@ __export(GameService_exports, {
   getGameFromContext: () => getGameFromContext,
   getGames: () => getGames,
   getLearningElements: () => getLearningElements,
+  mapAction: () => mapAction,
   updatePlayerData: () => updatePlayerData
 });
 var DB2 = __toESM(require("@prisma/client"));
@@ -1135,7 +1136,13 @@ async function getLearningElements(args, ctx) {
     }
   });
 }
-function mapAction({ ctx, gameId, activePeriodIx, playerId }) {
+function mapAction({
+  ctx,
+  gameId,
+  activePeriodIx,
+  activeSegmentIx,
+  playerId
+}) {
   return (action) => ctx.prisma.playerAction.create({
     data: {
       type: action.type,
@@ -1155,7 +1162,7 @@ function mapAction({ ctx, gameId, activePeriodIx, playerId }) {
           }
         }
       },
-      segmentIx: typeof action.segment === "number" ? action.segment : void 0,
+      segmentIx: typeof action.segment === "number" ? action.segment : typeof activeSegmentIx === "number" ? activeSegmentIx : void 0,
       segment: typeof action.segment === "number" ? {
         connect: {
           gameId_periodIx_index: {
@@ -1164,6 +1171,14 @@ function mapAction({ ctx, gameId, activePeriodIx, playerId }) {
             index: action.segment
           }
         }
+      } : typeof activeSegmentIx === "number" ? {
+        connect: {
+          gameId_periodIx_index: {
+            gameId,
+            periodIx: activePeriodIx,
+            index: activeSegmentIx
+          }
+        }
       } : void 0
     }
   });
@@ -1536,7 +1551,7 @@ async function performAction(args, ctx, { reducers }) {
   if (previousResult.game.status !== DB3.GameStatus.RUNNING) {
     throw new Error("ACTIONS_NOT_ALLOWED");
   }
-  const { result, events, notifications, isDirty, extras } = reducers.Actions.apply(previousResult.facts, {
+  const { result, actions, events, notifications, isDirty, extras } = reducers.Actions.apply(previousResult.facts, {
     type: args.actionType,
     payload: {
       playerArgs: args.facts,
@@ -1544,6 +1559,13 @@ async function performAction(args, ctx, { reducers }) {
       periodFacts: previousResult.period.facts
     }
   });
+  const mapper = mapAction({
+    ctx,
+    gameId: args.gameId,
+    activePeriodIx: args.periodIx,
+    activeSegmentIx: args.segmentIx,
+    playerId: args.playerId
+  });
   publishUserNotification(ctx, notifications);
   await receiveEvents({
     events,
@@ -1608,7 +1630,8 @@ async function performAction(args, ctx, { reducers }) {
           ...extras
         }
       }
-    })
+    }),
+    ...(actions ?? []).map(mapper)
   ]);
   return updatedResult;
 }

package/dist/nexus.js

@@ -1430,7 +1430,13 @@ async function getLearningElements(args, ctx) {
     }
   });
 }
-function mapAction({ ctx, gameId, activePeriodIx, playerId }) {
+function mapAction({
+  ctx,
+  gameId,
+  activePeriodIx,
+  activeSegmentIx,
+  playerId
+}) {
   return (action) => ctx.prisma.playerAction.create({
     data: {
       type: action.type,
@@ -1450,7 +1456,7 @@ function mapAction({ ctx, gameId, activePeriodIx, playerId }) {
           }
         }
       },
-      segmentIx: typeof action.segment === "number" ? action.segment : void 0,
+      segmentIx: typeof action.segment === "number" ? action.segment : typeof activeSegmentIx === "number" ? activeSegmentIx : void 0,
       segment: typeof action.segment === "number" ? {
         connect: {
           gameId_periodIx_index: {
@@ -1459,6 +1465,14 @@ function mapAction({ ctx, gameId, activePeriodIx, playerId }) {
             index: action.segment
           }
         }
+      } : typeof activeSegmentIx === "number" ? {
+        connect: {
+          gameId_periodIx_index: {
+            gameId,
+            periodIx: activePeriodIx,
+            index: activeSegmentIx
+          }
+        }
       } : void 0
     }
   });
@@ -1816,7 +1830,7 @@ async function performAction(args, ctx, { reducers }) {
   if (previousResult.game.status !== DB7.GameStatus.RUNNING) {
     throw new Error("ACTIONS_NOT_ALLOWED");
   }
-  const { result, events, notifications, isDirty, extras } = reducers.Actions.apply(previousResult.facts, {
+  const { result, actions, events, notifications, isDirty, extras } = reducers.Actions.apply(previousResult.facts, {
     type: args.actionType,
     payload: {
       playerArgs: args.facts,
@@ -1824,6 +1838,13 @@ async function performAction(args, ctx, { reducers }) {
       periodFacts: previousResult.period.facts
     }
   });
+  const mapper = mapAction({
+    ctx,
+    gameId: args.gameId,
+    activePeriodIx: args.periodIx,
+    activeSegmentIx: args.segmentIx,
+    playerId: args.playerId
+  });
   publishUserNotification(ctx, notifications);
   await receiveEvents({
     events,
@@ -1888,7 +1909,8 @@ async function performAction(args, ctx, { reducers }) {
           ...extras
         }
       }
-    })
+    }),
+    ...(actions ?? []).map(mapper)
   ]);
   return updatedResult;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gbl-uzh/platform",
-  "version": "0.4.13",
+  "version": "0.4.14-beta.1",
   "license": "LGPL-3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",