handling module items

nextjs/src/hooks/canvas/canvasAssignmentHooks.ts

@@ -8,6 +8,11 @@ import {
 } from "@tanstack/react-query";
 import { useLocalCourseSettingsQuery } from "../localCourse/localCoursesHooks";
 import { LocalAssignment } from "@/models/local/assignment/localAssignment";
+import { canvasModuleService } from "@/services/canvas/canvasModuleService";
+import {
+  useAddCanvasModuleMutation,
+  useCanvasModulesQuery,
+} from "./canvasModuleHooks";
 
 export const canvasAssignmentKeys = {
   assignments: (canvasCourseId: number) =>
@@ -43,18 +48,38 @@ export const useCanvasAssignmentsQuery = () => {
 
 export const useAddAssignmentToCanvasMutation = () => {
   const { data: settings } = useLocalCourseSettingsQuery();
+  const { data: canvasModules } = useCanvasModulesQuery();
+  const addModule = useAddCanvasModuleMutation();
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: async (assignment: LocalAssignment) => {
+    mutationFn: async ({
+      assignment,
+      moduleName,
+    }: {
+      assignment: LocalAssignment;
+      moduleName: string;
+    }) => {
       const assignmentGroup = settings.assignmentGroups.find(
         (g) => g.name === assignment.localAssignmentGroupName
       );
-      await canvasAssignmentService.create(
+      const canvasAssignmentId = await canvasAssignmentService.create(
         settings.canvasId,
         assignment,
         assignmentGroup?.canvasId
       );
+      const canvasModule = canvasModules.find((c) => c.name === moduleName);
+      const moduleId = canvasModule
+        ? canvasModule.id
+        : await addModule.mutateAsync(moduleName);
+
+      await canvasModuleService.createModuleItem(
+        settings.canvasId,
+        moduleId,
+        assignment.name,
+        "Assignment",
+        canvasAssignmentId
+      );
     },
     onSuccess: () => {
       queryClient.invalidateQueries({

nextjs/src/hooks/canvas/canvasPageHooks.ts

@@ -1,7 +1,16 @@
 import { LocalCoursePage } from "@/models/local/page/localCoursePage";
 import { canvasPageService } from "@/services/canvas/canvasPageService";
-import { useMutation, useQuery, useQueryClient, useSuspenseQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQueryClient,
+  useSuspenseQuery,
+} from "@tanstack/react-query";
 import { useLocalCourseSettingsQuery } from "../localCourse/localCoursesHooks";
+import { canvasModuleService } from "@/services/canvas/canvasModuleService";
+import {
+  useCanvasModulesQuery,
+  useAddCanvasModuleMutation,
+} from "./canvasModuleHooks";
 
 export const canvasPageKeys = {
   pagesInCourse: (courseCanvasId: number) => [
@@ -22,9 +31,35 @@ export const useCanvasPagesQuery = () => {
 export const useCreateCanvasPageMutation = () => {
   const { data: settings } = useLocalCourseSettingsQuery();
   const queryClient = useQueryClient();
+  const { data: canvasModules } = useCanvasModulesQuery();
+  const addModule = useAddCanvasModuleMutation();
+
   return useMutation({
-    mutationFn: async (page: LocalCoursePage) =>
-      canvasPageService.create(settings.canvasId, page),
+    mutationFn: async ({
+      page,
+      moduleName,
+    }: {
+      page: LocalCoursePage;
+      moduleName: string;
+    }) => {
+      const canvasPage = await canvasPageService.create(
+        settings.canvasId,
+        page
+      );
+
+      const canvasModule = canvasModules.find((c) => c.name === moduleName);
+      const moduleId = canvasModule
+        ? canvasModule.id
+        : await addModule.mutateAsync(moduleName);
+
+      await canvasModuleService.createPageModuleItem(
+        settings.canvasId,
+        moduleId,
+        page.name,
+        canvasPage
+      );
+      return canvasPage;
+    },
     onSuccess: () => {
       queryClient.invalidateQueries({
         queryKey: canvasPageKeys.pagesInCourse(settings.canvasId),

nextjs/src/hooks/canvas/canvasQuizHooks.ts

@@ -6,6 +6,8 @@ import {
 import { useLocalCourseSettingsQuery } from "../localCourse/localCoursesHooks";
 import { canvasQuizService } from "@/services/canvas/canvasQuizService";
 import { LocalQuiz } from "@/models/local/quiz/localQuiz";
+import { useAddCanvasModuleMutation, useCanvasModulesQuery } from "./canvasModuleHooks";
+import { canvasModuleService } from "@/services/canvas/canvasModuleService";
 
 export const canvasQuizKeys = {
   quizzes: (canvasCourseId: number) =>
@@ -24,17 +26,38 @@ export const useCanvasQuizzesQuery = () => {
 export const useAddQuizToCanvasMutation = () => {
   const { data: settings } = useLocalCourseSettingsQuery();
   const queryClient = useQueryClient();
+  const { data: canvasModules } = useCanvasModulesQuery();
+  const addModule = useAddCanvasModuleMutation();
 
   return useMutation({
-    mutationFn: async (quiz: LocalQuiz) => {
+    mutationFn: async ({
+      quiz,
+      moduleName,
+    }: {
+      quiz: LocalQuiz;
+      moduleName: string;
+    }) => {
       const assignmentGroup = settings.assignmentGroups.find(
         (g) => g.name === quiz.localAssignmentGroupName
       );
-      await canvasQuizService.create(
+      const canvasQuizId = await canvasQuizService.create(
         settings.canvasId,
         quiz,
         assignmentGroup?.canvasId
       );
+
+      const canvasModule = canvasModules.find((c) => c.name === moduleName);
+      const moduleId = canvasModule
+        ? canvasModule.id
+        : await addModule.mutateAsync(moduleName);
+
+      await canvasModuleService.createModuleItem(
+        settings.canvasId,
+        moduleId,
+        quiz.name,
+        "Quiz",
+        canvasQuizId
+      );
     },
     onSuccess: () => {
       queryClient.invalidateQueries({