feat: participation streak templates (#964)

* fix: reset achievedAt * fix: schema adjustments and resolver update * fix: add missing semicolons
corona-school · Feb 9, 2024 · 8f0c368 · 8f0c368
1 parent 2ffceb3
commit 8f0c368
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 72 deletions.
diff --git a/common/achievement/bucket.ts b/common/achievement/bucket.ts
@@ -57,7 +57,8 @@ export const bucketCreatorDefs: BucketCreatorDefs = {
             const subcourseBuckets = context.subcourse
                 .map((subcourse) => createLectureBuckets(subcourse, LectureBucketMessuringType.start))
                 .reduce((acc, val) => acc.concat(val), []);
-            return { bucketKind: 'time', buckets: [...matchBuckets, ...subcourseBuckets] };
+            const buckets = [...matchBuckets, ...subcourseBuckets].sort((a, b) => a.startTime.getTime() - b.startTime.getTime());
+            return { bucketKind: 'time', buckets: buckets };
         },
     },
     by_lecture_participation: {
@@ -67,9 +68,10 @@ export const bucketCreatorDefs: BucketCreatorDefs = {
                 .map((match) => createLectureBuckets(match, LectureBucketMessuringType.participation))
                 .reduce((acc, val) => acc.concat(val), []);
             const subcourseBuckets = context.subcourse
-                .map((subcourse) => createLectureBuckets(subcourse, LectureBucketMessuringType.participation))
+                .map((subcourse) => createLectureBuckets(subcourse, LectureBucketMessuringType.start))
                 .reduce((acc, val) => acc.concat(val), []);
-            return { bucketKind: 'time', buckets: [...matchBuckets, ...subcourseBuckets] };
+            const buckets = [...matchBuckets, ...subcourseBuckets].sort((a, b) => b.startTime.getTime() - a.startTime.getTime());
+            return { bucketKind: 'time', buckets: buckets };
         },
     },
     by_weeks: {

diff --git a/common/achievement/get.ts b/common/achievement/get.ts
@@ -72,7 +72,7 @@ const getFurtherAchievements = async (user: User): Promise<Achievement[]> => {
         const dataAggr = template.conditionDataAggregations as Prisma.JsonObject;
         const maxValue = Object.keys(dataAggr)
             .map((key) => {
-                const val = dataAggr[key] as number;
+                const val = dataAggr[key]['valueToAchieve'] as number;
                 return Number(val);
             })
             .reduce((a, b) => a + b, 0);
@@ -90,7 +90,7 @@ const getFurtherAchievements = async (user: User): Promise<Achievement[]> => {
             maxSteps: maxValue,
             currentStep: 0,
             isNewAchievement: null,
-            progressDescription: `Noch ${userAchievements.length - userAchievements.length} Schritte bis zum Abschluss`,
+            progressDescription: template.progressDescription,
             actionName: template.actionName,
             actionRedirectLink: template.actionRedirectLink,
         };
@@ -152,10 +152,6 @@ const assembleAchievementData = async (userAchievements: achievements_with_templ
         orderBy: { groupOrder: 'asc' },
     });
 
-    const state: achievement_state = getAchievementState(userAchievements, currentAchievementIndex);
-
-    const isNewAchievement = state === achievement_state.COMPLETED && !userAchievements[currentAchievementIndex].isSeen;
-
     const condition = userAchievements[currentAchievementIndex].recordValue
         ? userAchievements[currentAchievementIndex].template.condition.replace(
               'recordValue',
@@ -181,8 +177,8 @@ const assembleAchievementData = async (userAchievements: achievements_with_templ
             currentValue = dataAggregationKeys.map((key) => evaluationResult.resultObject[key]).reduce((a, b) => a + b, 0);
             maxValue =
                 userAchievements[currentAchievementIndex].template.type === achievement_type_enum.STREAK
-                    ? userAchievements[currentAchievementIndex].recordValue !== null && userAchievements[currentAchievementIndex].recordValue! > currentValue
-                        ? userAchievements[currentAchievementIndex].recordValue!
+                    ? userAchievements[currentAchievementIndex].recordValue !== null && userAchievements[currentAchievementIndex].recordValue > currentValue
+                        ? userAchievements[currentAchievementIndex].recordValue
                         : currentValue
                     : dataAggregationKeys
                           .map((key) => {
@@ -192,22 +188,31 @@ const assembleAchievementData = async (userAchievements: achievements_with_templ
                               );
                           })
                           .reduce((a, b) => a + b, 0);
+            if (currentValue < maxValue && userAchievements[currentAchievementIndex].achievedAt) {
+                await prisma.user_achievement.update({
+                    where: { id: userAchievements[currentAchievementIndex].id },
+                    data: { achievedAt: null, isSeen: false },
+                });
+            }
         }
     } else {
         currentValue = currentAchievementIndex;
         maxValue = achievementTemplates.length - 1;
     }
 
+    const state: achievement_state = getAchievementState(userAchievements, currentAchievementIndex);
+    const isNewAchievement = state === achievement_state.COMPLETED && !userAchievements[currentAchievementIndex].isSeen;
+
     const achievementContext = transformPrismaJson(
         user,
         userAchievements[currentAchievementIndex].relation,
         userAchievements[currentAchievementIndex].context as Prisma.JsonObject
     );
-    const leftProgress = maxValue - currentValue;
+    const leftProgress = maxValue - currentValue + 1;
     const currentAchievementTemplate = renderAchievementWithContext(userAchievements[currentAchievementIndex], achievementContext, {
         remainingProgress: leftProgress.toString(),
         progress: currentValue.toString(),
-        recordValue: maxValue.toString(),
+        maxValue: maxValue.toString(),
     });
 
     return {

diff --git a/graphql/types/achievement.ts b/graphql/types/achievement.ts
@@ -27,8 +27,8 @@ class Achievement {
     @Field()
     name: string;
 
-    @Field()
-    subtitle: string;
+    @Field({ nullable: true })
+    subtitle?: string;
 
     @Field()
     description: string;

diff --git a/prisma/migrations/20240130140914_nullable_subtitle_achieved_image/migration.sql b/prisma/migrations/20240130140914_nullable_subtitle_achieved_image/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "achievement_template" ALTER COLUMN "subtitle" DROP NOT NULL,
+ALTER COLUMN "achievedImage" DROP NOT NULL;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -45,10 +45,10 @@ model achievement_template {
   stepName                  String                        @db.VarChar
   // what type of achievement is it
   type                      achievement_type_enum
-  subtitle                  String                        @db.VarChar
+  subtitle                  String?                       @db.VarChar
   description               String                        @db.VarChar
   image                     String                        @db.VarChar
-  achievedImage             String                        @db.VarChar
+  achievedImage             String?                       @db.VarChar
   // some achievements show actions that a user can/must perform next.
   // therefore we need the action name, type (for the icon) and a redirect link
   actionName                String?                       @db.VarChar