wip: update graphql types to be consistent with updated database schema

uzh-bf · Oct 30, 2024 · ac8419b · ac8419b
1 parent 227112f
commit ac8419b
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 152 deletions.
diff --git a/packages/graphql/src/ops.schema.json b/packages/graphql/src/ops.schema.json
@@ -5078,12 +5078,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "LIVE_QUIZ",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "MICROLEARNING",
             "description": null,
@@ -8237,7 +8231,7 @@
               "name": null,
               "ofType": {
                 "kind": "ENUM",
-                "name": "GroupActivityStatus",
+                "name": "PublicationStatus",
                 "ofType": null
               }
             },
@@ -8937,7 +8931,7 @@
               "name": null,
               "ofType": {
                 "kind": "ENUM",
-                "name": "GroupActivityStatus",
+                "name": "PublicationStatus",
                 "ofType": null
               }
             },
@@ -9382,48 +9376,6 @@
         "enumValues": null,
         "possibleTypes": null
       },
-      {
-        "kind": "ENUM",
-        "name": "GroupActivityStatus",
-        "description": null,
-        "isOneOf": null,
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          {
-            "name": "DRAFT",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "ENDED",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "GRADED",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "PUBLISHED",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "SCHEDULED",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "possibleTypes": null
-      },
       {
         "kind": "OBJECT",
         "name": "GroupActivitySummary",
@@ -19422,6 +19374,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "ENDED",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "GRADED",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "PUBLISHED",
             "description": null,

diff --git a/packages/graphql/src/ops.ts b/packages/graphql/src/ops.ts
diff --git a/packages/graphql/src/public/schema.graphql b/packages/graphql/src/public/schema.graphql
@@ -445,7 +445,6 @@ input ElementStackInput {
 
 enum ElementStackType {
   GROUP_ACTIVITY
-  LIVE_QUIZ
   MICROLEARNING
   PRACTICE_QUIZ
 }
@@ -726,7 +725,7 @@ type GroupActivity {
   scheduledEndAt: Date!
   scheduledStartAt: Date!
   stacks: [ElementStack!]
-  status: GroupActivityStatus!
+  status: PublicationStatus!
 }
 
 type GroupActivityClue {
@@ -787,7 +786,7 @@ type GroupActivityDetails {
   scheduledEndAt: Date
   scheduledStartAt: Date
   stacks: [ElementStack!]!
-  status: GroupActivityStatus!
+  status: PublicationStatus!
 }
 
 type GroupActivityGrading {
@@ -831,14 +830,6 @@ type GroupActivityResults {
   points: Float!
 }
 
-enum GroupActivityStatus {
-  DRAFT
-  ENDED
-  GRADED
-  PUBLISHED
-  SCHEDULED
-}
-
 type GroupActivitySummary {
   numOfStartedInstances: Int!
   numOfSubmissions: Int!
@@ -1318,6 +1309,8 @@ type PracticeQuiz {
 
 enum PublicationStatus {
   DRAFT
+  ENDED
+  GRADED
   PUBLISHED
   SCHEDULED
 }

diff --git a/packages/graphql/src/schema/groupActivity.ts b/packages/graphql/src/schema/groupActivity.ts
@@ -13,17 +13,17 @@ import {
   ParticipantGroupRef,
   ParticipantRef,
 } from './participant.js'
-import { type IElementStack, ElementStackRef } from './practiceQuizzes.js'
+import {
+  type IElementStack,
+  ElementStackRef,
+  PublicationStatus,
+} from './practiceQuizzes.js'
 import { ElementType } from './questionData.js'
 
 export const ParameterType = builder.enumType('ParameterType', {
   values: Object.values(DB.ParameterType),
 })
 
-export const GroupActivityStatus = builder.enumType('GroupActivityStatus', {
-  values: Object.values(DB.GroupActivityStatus),
-})
-
 export const ResponseCorrectnessType = builder.enumType(
   'ResponseCorrectnessType',
   {
@@ -59,7 +59,7 @@ export const GroupActivity = GroupActivityRef.implement({
     name: t.exposeString('name'),
     displayName: t.exposeString('displayName'),
     description: t.exposeString('description', { nullable: true }),
-    status: t.expose('status', { type: GroupActivityStatus }),
+    status: t.expose('status', { type: PublicationStatus }),
     numOfQuestions: t.exposeInt('numOfQuestions', { nullable: true }),
 
     pointsMultiplier: t.exposeInt('pointsMultiplier', { nullable: true }),
@@ -220,7 +220,7 @@ export interface IGroupActivityDetails {
   id: string
   name: string
   displayName: string
-  status: DB.GroupActivityStatus
+  status: DB.PublicationStatus
   description?: string | null
   scheduledStartAt?: Date
   scheduledEndAt?: Date
@@ -240,7 +240,7 @@ export const GroupActivityDetails = GroupActivityDetailsRef.implement({
     name: t.exposeString('name', { nullable: false }),
     displayName: t.exposeString('displayName', { nullable: false }),
     description: t.exposeString('description', { nullable: true }),
-    status: t.expose('status', { type: GroupActivityStatus }),
+    status: t.expose('status', { type: PublicationStatus }),
 
     scheduledStartAt: t.expose('scheduledStartAt', {
       type: 'Date',

diff --git a/packages/graphql/src/services/courses.ts b/packages/graphql/src/services/courses.ts
@@ -1,6 +1,5 @@
 import {
   ElementOrderType,
-  GroupActivityStatus,
   LeaderboardType,
   type Participant,
   type ParticipantGroup,
@@ -1129,7 +1128,7 @@ export async function publishScheduledActivities(ctx: Context) {
   // ! Set group activity status to ended for all published group activities that have ended
   const groupActivitiesToEnd = await ctx.prisma.groupActivity.findMany({
     where: {
-      status: GroupActivityStatus.PUBLISHED,
+      status: PublicationStatus.PUBLISHED,
       scheduledEndAt: {
         lte: new Date(),
       },
@@ -1143,7 +1142,7 @@ export async function publishScheduledActivities(ctx: Context) {
           id: group.id,
         },
         data: {
-          status: GroupActivityStatus.ENDED,
+          status: PublicationStatus.ENDED,
         },
       })
     )