Fix linter errors

Author: ji-mmyliu

backend/__mocks__/firebase-admin/storage.ts

@@ -1,5 +1,5 @@
 const getDownloadURL = jest.fn().mockReturnValue("https://test.com/image.jpg");
 
 module.exports = {
-  getDownloadURL
-}; 
+  getDownloadURL,
+};

backend/__mocks__/mockData.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-underscore-dangle */
 import { LearnerDTO, Role, Status } from "../types/userTypes";
 
 export const testLessons = [

backend/rest/userRoutes.ts

@@ -363,7 +363,6 @@ userRouter.put(
       const { unitId, moduleId, activityId } = req.body;
 
       // Check that everything exists
-      const courseUnitService = new CourseUnitService();
       const courseUnit = await courseUnitService.getCourseUnit(unitId);
 
       if (!courseUnit) {
@@ -398,9 +397,9 @@ userRouter.put(
         moduleId,
         activityId,
       ))!;
-      res.status(200).json(updatedUser);
+      return res.status(200).json(updatedUser);
     } catch (error) {
-      res.status(500).send(getErrorMessage(error));
+      return res.status(500).send(getErrorMessage(error));
     }
   },
 );
@@ -425,12 +424,12 @@ userRouter.get(
         0,
       );
 
-      res.status(200).send({
+      return res.status(200).send({
         completedModules,
         numModules,
       });
     } catch (error) {
-      res.status(500).send(getErrorMessage(error));
+      return res.status(500).send(getErrorMessage(error));
     }
   },
 );
@@ -450,15 +449,18 @@ userRouter.put(
 
       const { unitId, moduleId, pageId } = req.body;
 
-      const updatedUser = await userService.updateNextPage(learnerId.toString(), {
-        unitId,
-        moduleId,
-        pageId,
-      });
+      const updatedUser = await userService.updateNextPage(
+        learnerId.toString(),
+        {
+          unitId,
+          moduleId,
+          pageId,
+        },
+      );
 
-      res.status(200).json(updatedUser);
+      return res.status(200).json(updatedUser);
     } catch (error) {
-      res.status(500).send(getErrorMessage(error));
+      return res.status(500).send(getErrorMessage(error));
     }
   },
 );

backend/services/implementations/__tests__/courseModuleService.test.ts

@@ -1,9 +1,6 @@
 import db from "../../../testUtils/testDb";
-import CourseModuleService from "../courseModuleService";
 
 describe("courseModuleService", (): void => {
-  let courseModuleService: CourseModuleService;
-
   beforeAll(async () => {
     await db.connect();
   });
@@ -12,9 +9,7 @@ describe("courseModuleService", (): void => {
     await db.disconnect();
   });
 
-  beforeEach(async () => {
-    courseModuleService = new CourseModuleService();
-  });
+  beforeEach(async () => {});
 
   afterEach(async () => {
     await db.clear();

backend/services/implementations/__tests__/userService.test.ts

@@ -1,9 +1,10 @@
+/* eslint-disable no-underscore-dangle */
+import mongoose from "mongoose";
 import MgUser, { Learner, LearnerModel } from "../../../models/user.mgmodel";
 import UserService from "../userService";
 
 import { LearnerDTO, UserDTO } from "../../../types/userTypes";
 
-import mongoose from "mongoose";
 import {
   testActivities,
   testCourseModules,
@@ -119,8 +120,14 @@ describe("mongo userService", (): void => {
   it("updateNextPage", async () => {
     const updatedLearner = await userService.updateNextPage(
       testLearners[0]._id,
-      { unitId: testCourseUnits[0]._id, moduleId: testCourseModules[0]._id, pageId: testCourseModules[0].pages[0] },
+      {
+        unitId: testCourseUnits[0]._id,
+        moduleId: testCourseModules[0]._id,
+        pageId: testCourseModules[0].pages[0],
+      },
+    );
+    expect(updatedLearner?.nextPage?.toString()).toEqual(
+      testCourseModules[1].pages[0].toString(),
     );
-    expect(updatedLearner?.nextPage?.toString()).toEqual(testCourseModules[1].pages[0].toString());
   });
 });

backend/services/implementations/userService.ts

@@ -408,24 +408,26 @@ class UserService implements IUserService {
   }
 
   async getCompletedModules(learner: LearnerDTO): Promise<Set<string>> {
-    let completedModules = new Set<string>();
+    const completedModules = new Set<string>();
 
+    // eslint-disable-next-line no-restricted-syntax
     for (const unitsMap of learner.activitiesCompleted.values()) {
+      // eslint-disable-next-line no-restricted-syntax
       for (const [
         moduleId,
         activitiesCompletedInModule,
       ] of unitsMap.entries()) {
         try {
+          // eslint-disable-next-line no-await-in-loop
           const module = await courseModuleService.getCourseModule(moduleId);
           const moduleActivities = module.pages.filter(
             (page) => page.type === "Activity",
           );
           if (activitiesCompletedInModule.length === moduleActivities.length) {
             completedModules.add(moduleId);
           }
-        } catch (error) {
-          console.error(`Error finding module ${moduleId}:`, error);
-        }
+          // eslint-disable-next-line no-empty
+        } catch (error) {}
       }
     }
 
@@ -446,38 +448,62 @@ class UserService implements IUserService {
     return modifiedCount;
   }
 
-  private async getNextPage(unitId: string, moduleId: string, pageId: string): Promise<string | null> {
-    const module = await courseModuleService.getCourseModule(moduleId);
-    const curPageIndex = module.pages.findIndex((page) => page.id === pageId);
-    const nextPage = module.pages[curPageIndex + 1];
+  private async getNextPage(
+    unitId: string,
+    moduleId: string,
+    pageId: string,
+  ): Promise<string | null> {
+    const curModule = await courseModuleService.getCourseModule(moduleId);
+    const curPageIndex = curModule.pages.findIndex(
+      (page) => page.id === pageId,
+    );
+    const nextPage = curModule.pages[curPageIndex + 1];
     if (nextPage) {
       return nextPage.id;
     }
     const unit = await courseUnitService.getCourseUnit(unitId);
-    const curModuleIndex = unit.modules.findIndex((module) => module === moduleId);
+    const curModuleIndex = unit.modules.findIndex(
+      (module) => module === moduleId,
+    );
     const nextModuleId = unit.modules[curModuleIndex + 1];
     if (nextModuleId) {
       try {
-        const nextModule = await courseModuleService.getCourseModule(nextModuleId);
+        const nextModule = await courseModuleService.getCourseModule(
+          nextModuleId,
+        );
         if (nextModule && nextModule.pages.length > 0) {
           return nextModule.pages[0].id;
         }
+        // eslint-disable-next-line no-empty
       } catch (error) {}
     }
-    const nextUnit = await courseunitMgmodel.findOne({displayIndex: unit.displayIndex + 1});
+    const nextUnit = await courseunitMgmodel.findOne({
+      displayIndex: unit.displayIndex + 1,
+    });
     if (nextUnit) {
-      const nextModule = await courseModuleService.getCourseModule(nextUnit.modules[0].toString());
+      const nextModule = await courseModuleService.getCourseModule(
+        nextUnit.modules[0].toString(),
+      );
       if (nextModule && nextModule.pages.length > 0) {
         return nextModule.pages[0].id;
       }
     }
     return null;
   }
 
-  async updateNextPage(learnerId: string, justViewed: {unitId: string, moduleId: string, pageId: string}): Promise<Learner | null> {
-    const nextPageId = await this.getNextPage(justViewed.unitId, justViewed.moduleId, justViewed.pageId);
+  async updateNextPage(
+    learnerId: string,
+    justViewed: { unitId: string; moduleId: string; pageId: string },
+  ): Promise<Learner | null> {
+    const nextPageId = await this.getNextPage(
+      justViewed.unitId,
+      justViewed.moduleId,
+      justViewed.pageId,
+    );
     if (!nextPageId) {
-      Logger.warn(`No next page found for learner ${learnerId} after viewing ${justViewed.pageId} in module ${justViewed.moduleId} of unit ${justViewed.unitId}`);
+      Logger.warn(
+        `No next page found for learner ${learnerId} after viewing ${justViewed.pageId} in module ${justViewed.moduleId} of unit ${justViewed.unitId}`,
+      );
       return null;
     }
     const updatedUser = await LearnerModel.findByIdAndUpdate(

backend/services/interfaces/userService.ts

@@ -162,6 +162,9 @@ interface IUserService {
    * @param justViewed information about the page that the learner just viewed
    * @returns the updated learner
    */
-  updateNextPage(learnerId: string, justViewed: {unitId: string, moduleId: string, pageId: string}): Promise<Learner | null>;
+  updateNextPage(
+    learnerId: string,
+    justViewed: { unitId: string; moduleId: string; pageId: string },
+  ): Promise<Learner | null>;
 }
 export default IUserService;