Modified get project detail api

navgurukul · Aug 13, 2024 · 696c28a · 696c28a
1 parent 4b39580
commit 696c28a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 13 deletions.
diff --git a/src/controller/progress/tracking.controller.ts b/src/controller/progress/tracking.controller.ts
@@ -490,13 +490,21 @@ export class TrackingController {
     @Param('projectId') projectId: number,
     @Param('moduleId') moduleId: number,
     @Req() req,
+    @Res() res
   ) {
-    const res = await this.TrackingService.getProjectDetailsWithStatus(
-      projectId,
-      moduleId,
-      req.user[0].id
-    );
-    return res;
+    try {
+      let [err, success] = await this.TrackingService.getProjectDetailsWithStatus(
+          projectId,
+          moduleId,
+          req.user[0].id
+        );
+      if (err) {
+        return ErrorResponse.BadRequestException(err.message, err.statusCode).send(res)
+      }
+      return new SuccessResponse(success.message, success.statusCode, success.data).send(res);
+    } catch (error) {
+      return ErrorResponse.BadRequestException(error.message).send(res);
+    }  
   }
 
   @Get('/allBootcampProgress')

diff --git a/src/controller/progress/tracking.service.ts b/src/controller/progress/tracking.service.ts
@@ -1413,7 +1413,7 @@ export class TrackingService {
     } catch (err) { }
   }
 
-  async getProjectDetailsWithStatus(projectId: number, moduleId: number, userId: number) {
+  async getProjectDetailsWithStatus(projectId: number, moduleId: number, userId: number):Promise<any> {
     try {
       const data = await db.query.zuvyCourseModules.findFirst({
         where: (courseModules, { eq }) =>
@@ -1422,6 +1422,16 @@ export class TrackingService {
           projectData: {
             where: (projectDetails, { eq }) =>
               eq(projectDetails.id, projectId),
+            with: {
+              projectTrackingData: {
+                columns: {
+                  projectLink:true,
+                  isChecked:true,
+                  grades:true
+                },
+                where: (projectTrack, { eq }) => eq(projectTrack.userId, userId)
+              }
+            }
           },
           moduleTracking: {
             columns: {
@@ -1438,13 +1448,9 @@ export class TrackingService {
         projectData: data['projectData'],
         status: data['moduleTracking'].length > 0 ? 'Completed' : 'Pending'
       }
-      return {
-        status: 'success',
-        code: 200,
-        projectDetails
-      }
+      return [null,{message:'Project details successfully fetched',statusCode: STATUS_CODES.OK,data:projectDetails}]
     } catch (err) {
-      throw err;
+      return [{message:err.message,statusCode: STATUS_CODES.BAD_REQUEST}]
     }
   }