refactor: code cleanup

Author: serapieTuyishime

src/components/sections/learning-modules/InteractiveModule/index.tsx

@@ -10,10 +10,9 @@ import InteractiveModuleItem from "@/components/sections/learning-modules/Intera
 import { authCheck } from "@/store/feature/auth.slice";
 import { Course, InteractiveModule as InteractiveModuleType } from "@/types/course";
 import { hidePageNavigation, showPageNavigation } from "@/store/feature/communities/navigation.slice";
-// import { checkAnswer } from "@/store/feature/learningModules.slice";
+import { checkAnswer } from "@/store/feature/learningModules.slice";
 import { IRootState } from "@/store";
-import { checkAnswer, submitModuleAnswer } from "@/store/services/learningModules.service";
-import { useRouter } from "next/router";
+import { submitModuleAnswer } from "@/store/services/learningModules.service";
 
 /**
  * interface for InteractiveModule multiSelector
@@ -53,7 +52,6 @@ export default function InteractiveModule({ data }: interactiveModuleProps): Rea
   const [ended, setEnded] = useState(false);
   const [loading, setLoading] = useState(true);
   const [answering, setAnswering] = useState(false);
-  const router = useRouter()
   const dispatch = useDispatch();
 
   const { isLoggedIn, course } = useMultiSelector<unknown, InteractiveModuleMultiSelector>({
@@ -65,7 +63,7 @@ export default function InteractiveModule({ data }: interactiveModuleProps): Rea
   const checkIfAnswered = useCallback(async () => {
     try {
       if (!isLoggedIn) return;
-      const answers = await checkAnswer({ ref: data.ref, locale: router.locale });
+      const answers = await checkAnswer(data.ref);
       if (!answers.length) return;
       setCurrent(items.length);
       setEnded(true);

src/pages/communities/[slug]/challenges/[challenge_id]/learning-modules/[id].tsx

@@ -5,6 +5,7 @@ import { useDispatch } from "@/hooks/useTypedDispatch";
 import { Community } from "@/types/community";
 import { Challenge, LearningModule } from "@/types/course";
 import { setCurrentLearningModule } from "@/store/feature/learningModules.slice";
+import { findLearningModule } from "@/store/services/learningModules.service";
 import { setCurrentCommunity } from "@/store/feature/community.slice";
 import { getMetadataDescription, getMetadataTitle } from "@/utilities/Metadata";
 import DefaultLayout from "@/components/layout/Default";
@@ -22,7 +23,6 @@ import { fetchChallenge } from "@/store/services/communities/challenges";
 import PageNavigation from "@/components/sections/courses/PageNavigation";
 import ChallengeCard from "@/components/cards/challenge/Challenge";
 import { useTranslation } from "next-i18next";
-import { findLearningModule } from "@/store/services/learningModules.service";
 
 
 /**

src/pages/communities/[slug]/challenges/[challenge_id]/submissions/[submission_id].tsx

@@ -35,7 +35,7 @@ export default function SubmissionPage() {
     };
     setLoading(true);
     await Promise.all([
-      dispatch(fetchChallenge({ id: challenge_id as string, relations: ["rubric"] })),
+      dispatch(fetchChallenge({ id: challenge_id as string, relations: ["rubric"], locale })),
       dispatch(fetchCurrentCommunity(fetchCurrentCommunityPayload)),
       dispatch(findSubmssionById({ id: submission_id as string })),
     ]);

src/pages/communities/[slug]/challenges/[challenge_id]/submissions/index.tsx

@@ -118,7 +118,7 @@ export const getServerSideProps: GetServerSideProps = wrapper.getServerSideProps
     const [{ data: currentCommunity }, { data: submissions }, { data: challenge }, translations] = await Promise.all([
       dispatch(fetchCurrentCommunity({ slug: slug as string, locale: locale as string })),
       dispatch(fetchAllSubmission({ challengeId: challenge_id as string, locale: locale as string })),
-      dispatch(fetchChallenge({ id: challenge_id as string, relations: ["rubric", "courses", "learning-modules"] })),
+      dispatch(fetchChallenge({ id: challenge_id as string, relations: ["rubric", "courses", "learning-modules"], locale })),
       serverSideTranslations(locale as string),
     ]);
 

src/pages/communities/[slug]/courses/[course_slug]/learning-modules/[id].tsx

@@ -4,6 +4,7 @@ import Head from "next/head";
 import { useDispatch } from "@/hooks/useTypedDispatch";
 import { Community } from "@/types/community";
 import { Challenge, Course, LearningModule } from "@/types/course";
+import { findLearningModule } from "@/store/services/learningModules.service";
 import { getMetadataDescription, getMetadataTitle } from "@/utilities/Metadata";
 import DefaultLayout from "@/components/layout/Default";
 import Header from "@/components/sections/learning-modules/Header";
@@ -19,7 +20,6 @@ import ChallengeCard from "@/components/cards/challenge/Challenge";
 import { useTranslation } from "next-i18next";
 import PageNavigation from "@/components/sections/courses/PageNavigation";
 import { NotFoundError } from "@/utilities/errors/NotFoundError";
-import { findLearningModule } from "@/store/services/learningModules.service";
 
 /**
  * Learning module page props interfae
@@ -108,6 +108,7 @@ export const getServerSideProps = wrapper.getServerSideProps((store) => async ({
     const communitySlug = params?.slug as string;
     const courseSlug = params?.course_slug as string;
     const id = params?.id as string;
+
     const [{ data: community }, { data: course }, { data: learningModule }, translations] = await Promise.all([
       store.dispatch(fetchCurrentCommunity({ slug: communitySlug, locale })),
       store.dispatch(fetchCourse({ slug: courseSlug, locale })),

src/store/services/communities/challenges/index.ts

@@ -39,14 +39,12 @@ export const challengeService = createApi({
     }),
 
     getAllChallenges: builder.query({
-      query: ({ slug, locale }) => {
-        return {
-          url: `communities/${slug}/challenges`,
-          headers: {
-            "accept-language": locale,
-          },
-        };
-      },
+      query: ({ slug, locale }) => ({
+        url: `communities/${slug}/challenges`,
+        headers: {
+          "accept-language": locale,
+        },
+      }),
       onQueryStarted: async (_, { dispatch, queryFulfilled }) => {
         try {
           const { data } = await queryFulfilled;

src/store/services/learningModules.service.ts

@@ -1,6 +1,12 @@
 import { createApi } from "@reduxjs/toolkit/query/react";
 import baseQuery from "@/config/baseQuery";
 
+/**
+ * Learning module api service
+ * @date 3/13/2024 - 4:55:54 PM
+ *
+ * @type {*}
+ */
 export const learningModulesService = createApi({
   reducerPath: "learningModulesService",
   baseQuery: baseQuery(),
@@ -41,6 +47,15 @@ export const learningModulesService = createApi({
   }),
 });
 
+/**
+ * Find learning module by Id
+ * @date 3/13/2024 - 4:56:49 PM
+ *
+ * @param {{ id: string; locale?: string }} param0
+ * @param {string} param0.id
+ * @param {string} param0.locale
+ * @returns {*}
+ */
 export const findLearningModule = ({ id, locale }: { id: string; locale?: string }) => learningModulesService.endpoints.findLearningModule.initiate({ locale, id });
 
 export const getAllLearningModules = ({ slug, locale }: { slug: string; locale?: string }) => learningModulesService.endpoints.getAllLearningModules.initiate({ slug, locale });