ran linter and small error catching fix

Author: liya-zhu

backend/typescript/middlewares/validators/activityValidators.ts

@@ -145,7 +145,7 @@ export const activityUserPatchValidator = async (
   if (!validatePrimitive(body.userId, "integer")) {
     return res.status(400).send(getApiValidationError("userId", "integer"));
   }
-  
+
   return next();
 };
 
@@ -157,9 +157,11 @@ export const activityScheduledTimePatchValidator = async (
   const { body } = req;
 
   if (!validateDate(body.scheduledStartTime)) {
-    return res.status(400).send(getApiValidationError("scheduledStartTime", "Date"));
+    return res
+      .status(400)
+      .send(getApiValidationError("scheduledStartTime", "Date"));
   }
-  
+
   return next();
 };
 
@@ -173,7 +175,7 @@ export const activityStartTimePatchValidator = async (
   if (!validateDate(body.startTime)) {
     return res.status(400).send(getApiValidationError("startTime", "Date"));
   }
-  
+
   return next();
 };
 
@@ -187,7 +189,7 @@ export const activityEndTimePatchValidator = async (
   if (!validateDate(body.endTime)) {
     return res.status(400).send(getApiValidationError("endTime", "Date"));
   }
-  
+
   return next();
 };
 
@@ -197,11 +199,9 @@ export const activityNotesPatchValidator = async (
   next: NextFunction,
 ) => {
   const { body } = req;
-  if (
-    !validatePrimitive(body.notes, "string")
-  ) {
+  if (!validatePrimitive(body.notes, "string")) {
     return res.status(400).send(getApiValidationError("notes", "string"));
   }
 
   return next();
-};
+};

backend/typescript/rest/activityRoutes.ts

@@ -167,7 +167,7 @@ activityRouter.patch(
     try {
       const { body } = req;
       const Activity = await activityService.scheduleActivity(id, {
-        time: body.scheduledStartTime
+        time: body.scheduledStartTime,
       });
       res.status(200).json(Activity);
     } catch (e: unknown) {
@@ -185,7 +185,7 @@ activityRouter.patch(
     try {
       const { body } = req;
       const Activity = await activityService.startActivity(id, {
-        time: body.startTime
+        time: body.startTime,
       });
       res.status(200).json(Activity);
     } catch (e: unknown) {
@@ -203,7 +203,7 @@ activityRouter.patch(
     try {
       const { body } = req;
       const Activity = await activityService.endActivity(id, {
-        time: body.endTime
+        time: body.endTime,
       });
       res.status(200).json(Activity);
     } catch (e: unknown) {
@@ -221,7 +221,7 @@ activityRouter.patch(
     try {
       const { body } = req;
       const Activity = await activityService.updateActivityNotes(id, {
-        notes: body.notes
+        notes: body.notes,
       });
       res.status(200).json(Activity);
     } catch (e: unknown) {

backend/typescript/services/implementations/activityService.ts

@@ -67,10 +67,13 @@ class ActivityService implements IActivityService {
     try {
       const activities: Array<PgActivity> = await PgActivity.findAll({
         where: {
-          pet_id: pet_id,
+          pet_id,
         },
         raw: true,
       });
+      if (!activities[0]) {
+        throw new NotFoundError(`No activities for pet id ${pet_id}`);
+      }
       return activities.map((activity) => ({
         id: activity.id,
         userId: activity.user_id,
@@ -89,14 +92,19 @@ class ActivityService implements IActivityService {
     }
   }
 
-  async getUserActivities(user_id: string): Promise<Array<ActivityResponseDTO>> {
+  async getUserActivities(
+    user_id: string,
+  ): Promise<Array<ActivityResponseDTO>> {
     try {
       const activities: Array<PgActivity> = await PgActivity.findAll({
         where: {
-          user_id: user_id,
+          user_id,
         },
         raw: true,
       });
+      if (!activities[0]) {
+        throw new NotFoundError(`No activities for user id ${user_id}`);
+      }
       return activities.map((activity) => ({
         id: activity.id,
         userId: activity.user_id,
@@ -115,7 +123,6 @@ class ActivityService implements IActivityService {
     }
   }
 
-
   async createActivity(
     activity: ActivityRequestDTO,
   ): Promise<ActivityResponseDTO> {
@@ -192,7 +199,7 @@ class ActivityService implements IActivityService {
 
   async assignUser(
     id: string,
-    user: ActivityUserPatchDTO
+    user: ActivityUserPatchDTO,
   ): Promise<ActivityResponseDTO | null> {
     let resultingActivity: PgActivity | null;
     let updateResult: [number, PgActivity[]] | null;
@@ -228,7 +235,7 @@ class ActivityService implements IActivityService {
 
   async scheduleActivity(
     id: string,
-    schedule: ActivityTimePatchDTO
+    schedule: ActivityTimePatchDTO,
   ): Promise<ActivityResponseDTO | null> {
     let resultingActivity: PgActivity | null;
     let updateResult: [number, PgActivity[]] | null;
@@ -261,84 +268,82 @@ class ActivityService implements IActivityService {
       notes: resultingActivity.notes,
     };
   }
-    
-      
+
   async startActivity(
-      id: string,
-      startTime: ActivityTimePatchDTO
-    ): Promise<ActivityResponseDTO | null> {
-      let resultingActivity: PgActivity | null;
-      let updateResult: [number, PgActivity[]] | null;
-      try {
-        updateResult = await PgActivity.update(
-          {
-            start_time: startTime.time,
-          },
-          { where: { id }, returning: true },
-        );
-  
-        if (!updateResult[0]) {
-          throw new NotFoundError(`Activity id ${id} not found`);
-        }
-        [, [resultingActivity]] = updateResult;
-      } catch (error: unknown) {
-        Logger.error(
-          `Failed to update activity. Reason = ${getErrorMessage(error)}`,
-        );
-        throw error;
+    id: string,
+    startTime: ActivityTimePatchDTO,
+  ): Promise<ActivityResponseDTO | null> {
+    let resultingActivity: PgActivity | null;
+    let updateResult: [number, PgActivity[]] | null;
+    try {
+      updateResult = await PgActivity.update(
+        {
+          start_time: startTime.time,
+        },
+        { where: { id }, returning: true },
+      );
+
+      if (!updateResult[0]) {
+        throw new NotFoundError(`Activity id ${id} not found`);
       }
-      return {
-        id: resultingActivity.id,
-        userId: resultingActivity.user_id,
-        petId: resultingActivity.pet_id,
-        activityTypeId: resultingActivity.activity_type_id,
-        scheduledStartTime: resultingActivity.scheduled_start_time,
-        startTime: resultingActivity.start_time,
-        endTime: resultingActivity.end_time,
-        notes: resultingActivity.notes,
-      };
+      [, [resultingActivity]] = updateResult;
+    } catch (error: unknown) {
+      Logger.error(
+        `Failed to update activity. Reason = ${getErrorMessage(error)}`,
+      );
+      throw error;
     }
-    
+    return {
+      id: resultingActivity.id,
+      userId: resultingActivity.user_id,
+      petId: resultingActivity.pet_id,
+      activityTypeId: resultingActivity.activity_type_id,
+      scheduledStartTime: resultingActivity.scheduled_start_time,
+      startTime: resultingActivity.start_time,
+      endTime: resultingActivity.end_time,
+      notes: resultingActivity.notes,
+    };
+  }
+
   async endActivity(
-      id: string,
-      endTime: ActivityTimePatchDTO
-    ): Promise<ActivityResponseDTO | null> {
-      let resultingActivity: PgActivity | null;
-      let updateResult: [number, PgActivity[]] | null;
-      try {
-        updateResult = await PgActivity.update(
-          {
-            end_time: endTime.time,
-          },
-          { where: { id }, returning: true },
-        );
-  
-        if (!updateResult[0]) {
-          throw new NotFoundError(`Activity id ${id} not found`);
-        }
-        [, [resultingActivity]] = updateResult;
-      } catch (error: unknown) {
-        Logger.error(
-          `Failed to update activity. Reason = ${getErrorMessage(error)}`,
-        );
-        throw error;
+    id: string,
+    endTime: ActivityTimePatchDTO,
+  ): Promise<ActivityResponseDTO | null> {
+    let resultingActivity: PgActivity | null;
+    let updateResult: [number, PgActivity[]] | null;
+    try {
+      updateResult = await PgActivity.update(
+        {
+          end_time: endTime.time,
+        },
+        { where: { id }, returning: true },
+      );
+
+      if (!updateResult[0]) {
+        throw new NotFoundError(`Activity id ${id} not found`);
       }
-      return {
-        id: resultingActivity.id,
-        userId: resultingActivity.user_id,
-        petId: resultingActivity.pet_id,
-        activityTypeId: resultingActivity.activity_type_id,
-        scheduledStartTime: resultingActivity.scheduled_start_time,
-        startTime: resultingActivity.start_time,
-        endTime: resultingActivity.end_time,
-        notes: resultingActivity.notes,
-      };
+      [, [resultingActivity]] = updateResult;
+    } catch (error: unknown) {
+      Logger.error(
+        `Failed to update activity. Reason = ${getErrorMessage(error)}`,
+      );
+      throw error;
     }
-    
-      
+    return {
+      id: resultingActivity.id,
+      userId: resultingActivity.user_id,
+      petId: resultingActivity.pet_id,
+      activityTypeId: resultingActivity.activity_type_id,
+      scheduledStartTime: resultingActivity.scheduled_start_time,
+      startTime: resultingActivity.start_time,
+      endTime: resultingActivity.end_time,
+      notes: resultingActivity.notes,
+    };
+  }
+
   async updateActivityNotes(
     id: string,
-    notes: ActivityNotesPatchDTO
+    notes: ActivityNotesPatchDTO,
   ): Promise<ActivityResponseDTO | null> {
     let resultingActivity: PgActivity | null;
     let updateResult: [number, PgActivity[]] | null;

backend/typescript/services/interfaces/activityService.ts

@@ -56,7 +56,7 @@ export interface IActivityService {
    */
   getPetActivities(pet_id: string): Promise<Array<ActivityResponseDTO>>;
 
-   /**
+  /**
    * retrieve all Activities for a specific user
    * @param user_id user id
    * @returns returns array of Activities
@@ -93,7 +93,7 @@ export interface IActivityService {
    */
   assignUser(
     id: string,
-    user: ActivityUserPatchDTO
+    user: ActivityUserPatchDTO,
   ): Promise<ActivityResponseDTO | null>;
 
   /**
@@ -104,9 +104,9 @@ export interface IActivityService {
    * @throws Error if update fails
    */
   scheduleActivity(
-      id: string,
-      schedule: ActivityTimePatchDTO
-    ): Promise<ActivityResponseDTO | null>;
+    id: string,
+    schedule: ActivityTimePatchDTO,
+  ): Promise<ActivityResponseDTO | null>;
 
   /**
    * starts an activity by adding a start time
@@ -117,7 +117,7 @@ export interface IActivityService {
    */
   startActivity(
     id: string,
-    startTime: ActivityTimePatchDTO
+    startTime: ActivityTimePatchDTO,
   ): Promise<ActivityResponseDTO | null>;
 
   /**
@@ -129,7 +129,7 @@ export interface IActivityService {
    */
   endActivity(
     id: string,
-    endTime: ActivityTimePatchDTO
+    endTime: ActivityTimePatchDTO,
   ): Promise<ActivityResponseDTO | null>;
 
   /**
@@ -141,7 +141,7 @@ export interface IActivityService {
    */
   updateActivityNotes(
     id: string,
-    notes: ActivityNotesPatchDTO
+    notes: ActivityNotesPatchDTO,
   ): Promise<ActivityResponseDTO | null>;
 
   /**