Merge branch 'master' into feat-add-user-organization-join-confirmation

rage · Oct 20, 2022 · 61752fb · 61752fb
2 parents 612fe8b + a8f67c5
commit 61752fb
Show file tree

Hide file tree

Showing 56 changed files with 755 additions and 493 deletions.
diff --git a/backend/bin/fetchAvoinLinks.ts b/backend/bin/fetchAvoinLinks.ts
@@ -100,7 +100,7 @@ const getInfoWithCourseCode = async (
   const res = await axios.get(url, {
     headers: { Authorized: "Basic " + AVOIN_TOKEN },
   })
-  return await res.data
+  return res.data
 }
 
 interface AvoinLinkData {

diff --git a/backend/bin/importOrganizations.ts b/backend/bin/importOrganizations.ts
@@ -118,7 +118,7 @@ const getUserFromTmc = async (user_id: number) => {
     username: details.username,
   }
 
-  return await prisma.user.upsert({
+  return prisma.user.upsert({
     where: { upstream_id: details.id },
     create: prismaDetails,
     update: convertUpdate(prismaDetails),

diff --git a/backend/bin/kafkaConsumer/common/userPoints/__test__/saveToDB.test.ts b/backend/bin/kafkaConsumer/common/userPoints/__test__/saveToDB.test.ts
@@ -24,6 +24,10 @@ const tmc = fakeTMCSpecific({
   9999: [404, { errors: "asdf" }],
 })
 
+function expectIsDefined<T>(value: T | null | undefined): asserts value is T {
+  expect(value).toBeDefined()
+}
+
 describe("userPoints/saveToDatabase", () => {
   const kafkaContext = {} as KafkaContext
 
@@ -193,6 +197,12 @@ describe("userPoints/saveToDatabase", () => {
         },
       })
 
+      expectIsDefined(existing)
+      expect(
+        existing.exercise_completion_required_actions.map((ra) => ra.value)
+          .length,
+      ).toEqual(0)
+
       const ret = await saveToDatabase(kafkaContext, {
         ...message,
         timestamp: "2000-03-01T10:00:00.00+02:00",
@@ -211,8 +221,10 @@ describe("userPoints/saveToDatabase", () => {
           exercise_completion_required_actions: true,
         },
       })
-
-      expect(updated?.updated_at! > existing?.updated_at!).toBeTruthy()
+      expectIsDefined(updated)
+      expect(updated.updated_at?.valueOf() ?? -Infinity).toBeGreaterThan(
+        existing.updated_at?.valueOf() ?? -Infinity,
+      )
       expect(
         updated?.exercise_completion_required_actions
           .map((ra) => ra.value)

diff --git a/backend/bin/lib/await-semaphore.ts b/backend/bin/lib/await-semaphore.ts
@@ -9,9 +9,9 @@ export class Semaphore {
   private sched() {
     if (this.count > 0 && this.tasks.length > 0) {
       this.count--
-      let next = this.tasks.shift()
+      const next = this.tasks.shift()
       if (next === undefined) {
-        throw "Unexpected undefined value in tasks list"
+        throw new Error("Unexpected undefined value in tasks list")
       }
 
       next()
@@ -20,8 +20,8 @@ export class Semaphore {
 
   public acquire() {
     return new Promise<() => void>((res, _) => {
-      var task = () => {
-        var released = false
+      const task = () => {
+        let released = false
         res(() => {
           if (!released) {
             released = true

diff --git a/backend/bin/seed.ts b/backend/bin/seed.ts
@@ -392,13 +392,13 @@ const seed = async () => {
           : undefined,
       }
 
-      return await prisma.studyModule.create({
+      return prisma.studyModule.create({
         data: _module,
       })
     }),
   )
 
-  return await Promise.all(
+  return Promise.all(
     Courses.map(async (course) => {
       const _course = {
         ...course,

diff --git a/backend/bin/seedPoints.ts b/backend/bin/seedPoints.ts
@@ -75,7 +75,7 @@ const addServices = async () => {
 const addUserCourseProgressess = async (courseId: string) => {
   const usersInDb = await prisma.user.findMany({ take: 100 })
 
-  return await Promise.all(
+  return Promise.all(
     usersInDb.map(async (user) => {
       const progress = [
         {
@@ -126,14 +126,14 @@ const addUserCourseProgressess = async (courseId: string) => {
         max_points: progress.reduce((acc, curr) => acc + curr.max_points, 0),
       }
 
-      return await prisma.userCourseProgress.create({ data: ucp })
+      return prisma.userCourseProgress.create({ data: ucp })
     }),
   )
 }
 
 const addUserCourseSettingses = async (courseId: string) => {
   const UsersInDb = await prisma.user.findMany({ take: 100 })
-  return await Promise.all(
+  return Promise.all(
     UsersInDb.map(async (user) => {
       const ucs: Prisma.UserCourseSettingCreateInput = {
         user: {
@@ -153,7 +153,7 @@ const addUserCourseSettingses = async (courseId: string) => {
         course_variant: null,
         other: null,
       }
-      return await prisma.userCourseSetting.create({ data: ucs })
+      return prisma.userCourseSetting.create({ data: ucs })
     }),
   )
 }

diff --git a/backend/graphql/ABEnrollment.ts b/backend/graphql/ABEnrollment.ts
@@ -52,30 +52,31 @@ export const ABEnrollmentMutations = extendType({
           },
         })
       },
-    }),
-      t.field("updateAbEnrollment", {
-        type: "AbEnrollment",
-        args: {
-          abEnrollment: nonNull(
-            arg({
-              type: "AbEnrollmentCreateOrUpsertInput",
-            }),
-          ),
-        },
-        authorize: isAdmin,
-        resolve: async (_, { abEnrollment }, ctx: Context) => {
-          const { user_id, ab_study_id } = abEnrollment
+    })
 
-          return ctx.prisma.abEnrollment.update({
-            where: {
-              user_id_ab_study_id: {
-                user_id,
-                ab_study_id,
-              },
+    t.field("updateAbEnrollment", {
+      type: "AbEnrollment",
+      args: {
+        abEnrollment: nonNull(
+          arg({
+            type: "AbEnrollmentCreateOrUpsertInput",
+          }),
+        ),
+      },
+      authorize: isAdmin,
+      resolve: async (_, { abEnrollment }, ctx: Context) => {
+        const { user_id, ab_study_id } = abEnrollment
+
+        return ctx.prisma.abEnrollment.update({
+          where: {
+            user_id_ab_study_id: {
+              user_id,
+              ab_study_id,
             },
-            data: abEnrollment,
-          })
-        },
-      })
+          },
+          data: abEnrollment,
+        })
+      },
+    })
   },
 })
diff --git a/backend/graphql/ABStudy.ts b/backend/graphql/ABStudy.ts
@@ -52,25 +52,26 @@ export const ABStudyMutations = extendType({
           data: abStudy,
         })
       },
-    }),
-      t.field("updateAbStudy", {
-        type: "AbStudy",
-        args: {
-          abStudy: nonNull(
-            arg({
-              type: "AbStudyUpsertInput",
-            }),
-          ),
-        },
-        authorize: isAdmin,
-        resolve: async (_, { abStudy }, ctx: Context) => {
-          const { id } = abStudy
+    })
 
-          return ctx.prisma.abStudy.update({
-            where: { id },
-            data: abStudy,
-          })
-        },
-      })
+    t.field("updateAbStudy", {
+      type: "AbStudy",
+      args: {
+        abStudy: nonNull(
+          arg({
+            type: "AbStudyUpsertInput",
+          }),
+        ),
+      },
+      authorize: isAdmin,
+      resolve: async (_, { abStudy }, ctx: Context) => {
+        const { id } = abStudy
+
+        return ctx.prisma.abStudy.update({
+          where: { id },
+          data: abStudy,
+        })
+      },
+    })
   },
 })
diff --git a/backend/graphql/Completion/model.ts b/backend/graphql/Completion/model.ts
@@ -104,7 +104,7 @@ export const Completion = objectType({
       },
     })
 
-    t.field("registered", {
+    t.nonNull.field("registered", {
       type: "Boolean",
       resolve: async (parent, _, ctx) => {
         const registered = await ctx.prisma.completion
@@ -117,7 +117,7 @@ export const Completion = objectType({
       },
     })
 
-    t.field("project_completion", {
+    t.nonNull.field("project_completion", {
       type: "Boolean",
       resolve: async (parent, _, ctx) => {
         if (!parent.course_id) {
@@ -149,7 +149,7 @@ export const Completion = objectType({
       },
     })
 
-    t.field("certificate_availability", {
+    t.nullable.field("certificate_availability", {
       type: "CertificateAvailability",
       resolve: async ({ course_id, user_upstream_id }, _, ctx) => {
         if (!course_id) {

diff --git a/backend/graphql/Completion/mutations.ts b/backend/graphql/Completion/mutations.ts
@@ -59,7 +59,7 @@ export const CompletionMutations = extendType({
       },
     })
 
-    t.list.field("addManualCompletion", {
+    t.list.nonNull.field("addManualCompletion", {
       type: "Completion",
       args: {
         completions: list(arg({ type: "ManualCompletionArg" })),

diff --git a/backend/graphql/Completion/queries.ts b/backend/graphql/Completion/queries.ts
@@ -14,7 +14,7 @@ import { buildUserSearch } from "../common"
 export const CompletionQueries = extendType({
   type: "Query",
   definition(t) {
-    t.list.field("completions", {
+    t.list.nonNull.field("completions", {
       type: "Completion",
       args: {
         course: nonNull(stringArg()),

diff --git a/backend/graphql/CompletionRegistered.ts b/backend/graphql/CompletionRegistered.ts
@@ -39,7 +39,7 @@ export const CompletionRegistered = objectType({
 export const CompletionRegisteredQueries = extendType({
   type: "Query",
   definition(t) {
-    t.list.field("registeredCompletions", {
+    t.list.nonNull.field("registeredCompletions", {
       type: "CompletionRegistered",
       args: {
         course: stringArg({ description: "course slug or course alias" }),
@@ -93,7 +93,7 @@ export const CompletionRegisteredQueries = extendType({
 export const CompletionRegisteredMutations = extendType({
   type: "Mutation",
   definition(t) {
-    t.field("registerCompletion", {
+    t.nonNull.field("registerCompletion", {
       type: "String",
       args: {
         completions: nonNull(list(nonNull(arg({ type: "CompletionArg" })))),
@@ -102,8 +102,8 @@ export const CompletionRegisteredMutations = extendType({
       resolve: async (_, args, ctx: Context) => {
         const queue = chunk(args.completions, 500)
 
-        for (let i = 0; i < queue.length; i++) {
-          const promises = buildPromises(queue[i], ctx)
+        for (const element of queue) {
+          const promises = buildPromises(element, ctx)
           await Promise.all(promises)
         }
         return "success"

diff --git a/backend/graphql/Course/input.ts b/backend/graphql/Course/input.ts
@@ -19,19 +19,19 @@ export const CourseCreateArg = inputObjectType({
     t.string("support_email")
     t.nonNull.datetime("start_date")
     t.datetime("end_date")
-    t.list.field("study_modules", {
+    t.list.nonNull.field("study_modules", {
       type: "StudyModuleWhereUniqueInput",
     })
-    t.list.nullable.field("course_translations", {
+    t.list.nonNull.field("course_translations", {
       type: "CourseTranslationCreateInput",
     })
-    t.list.nullable.field("open_university_registration_links", {
+    t.list.nonNull.field("open_university_registration_links", {
       type: "OpenUniversityRegistrationLinkCreateInput",
     })
-    t.list.nullable.field("course_variants", {
+    t.list.nonNull.field("course_variants", {
       type: "CourseVariantCreateInput",
     })
-    t.list.nullable.field("course_aliases", {
+    t.list.nonNull.field("course_aliases", {
       type: "CourseAliasCreateInput",
     })
     t.int("order")
@@ -43,7 +43,7 @@ export const CourseCreateArg = inputObjectType({
     t.nullable.id("inherit_settings_from")
     t.nullable.id("completions_handled_by")
     t.nullable.boolean("has_certificate")
-    t.list.nullable.field("user_course_settings_visibilities", {
+    t.list.nonNull.field("user_course_settings_visibilities", {
       type: "UserCourseSettingsVisibilityCreateInput",
     })
     t.nullable.boolean("upcoming_active_link")
@@ -76,19 +76,19 @@ export const CourseUpsertArg = inputObjectType({
     t.string("support_email")
     t.nonNull.datetime("start_date")
     t.datetime("end_date")
-    t.list.field("study_modules", {
+    t.list.nonNull.field("study_modules", {
       type: "StudyModuleWhereUniqueInput",
     })
-    t.list.nullable.field("course_translations", {
+    t.list.nonNull.field("course_translations", {
       type: "CourseTranslationUpsertInput",
     })
-    t.list.nullable.field("open_university_registration_links", {
+    t.list.nonNull.field("open_university_registration_links", {
       type: "OpenUniversityRegistrationLinkUpsertInput",
     })
-    t.list.nullable.field("course_variants", {
+    t.list.nonNull.field("course_variants", {
       type: "CourseVariantUpsertInput",
     })
-    t.list.nullable.field("course_aliases", {
+    t.list.nonNull.field("course_aliases", {
       type: "CourseAliasUpsertInput",
     })
     t.int("order")
@@ -100,7 +100,7 @@ export const CourseUpsertArg = inputObjectType({
     t.nullable.id("inherit_settings_from")
     t.nullable.id("completions_handled_by")
     t.nullable.boolean("has_certificate")
-    t.list.nullable.field("user_course_settings_visibilities", {
+    t.list.nonNull.field("user_course_settings_visibilities", {
       type: "UserCourseSettingsVisibilityUpsertInput",
     })
     t.nullable.boolean("upcoming_active_link")

diff --git a/backend/graphql/Course/model.ts b/backend/graphql/Course/model.ts
@@ -64,7 +64,7 @@ export const Course = objectType({
     t.string("instructions")
     t.string("link")
 
-    t.list.field("completions", {
+    t.list.nonNull.field("completions", {
       type: "Completion",
       args: {
         user_id: nullable(stringArg()),
@@ -103,7 +103,7 @@ export const Course = objectType({
       },
     })
 
-    t.list.field("exercises", {
+    t.list.nonNull.field("exercises", {
       type: "Exercise",
       args: {
         includeDeleted: booleanArg({ default: false }),