add some features view dev log for detail

Author: alba054

.env

@@ -4,9 +4,13 @@
 # Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
 # See the documentation for all the connection string options: https://pris.ly/d/connection-strings
 
-DATABASE_URL="mysql://admin:12345678@localhost:3306/asco"
+DATABASE_URL_SANDBOX="mysql://root:12345678@34.128.67.12:3306/asco"
+DATABASE_URL_LOCAL="mysql://admin:12345678@localhost:3306/asco"
 PORT=7892
 TESTING_PORT=8889
 HOST=127.0.0.1
 JWT_SECRET="^[Nk&S,!;5;N9sUFt#,GBlsWdKB,YPaMyTY]zv4SCkNd}aioJ#"
-ISSUER=api.jj
+ISSUER=api.jj
+GCP_PUB_SUB_PROJECTID="asco-app"
+GCP_PUB_SUB_TOPICID="publish-card-sync-meeting"
+GCP_PUB_SUB_SUBSCRIPTIONID="pull-card-meeting"

package-lock.json

@@ -34,7 +34,7 @@
     "cors": "^2.8.5",
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
-    "joi": "^17.9.1",
+    "joi": "^17.13.3",
     "jsonwebtoken": "^9.0.2",
     "multer": "^1.4.5-lts.1",
     "mysql": "^2.18.1",

package.json

@@ -38,3 +38,10 @@ untuk menambahkan data student pada database
 
 1. (practicums.removeAssistantFromPracticum) /api/practicums/{practicumId}/assistants/{username} -> remove assistants from practicum (authorized for admin)
 2. (classrooms.deleteClassroomById) /api/classes/{classId} -> delete classroom by id (authorized for admin)
+
+## DEV LOG <28 July 2024>
+
+1. (assistance groups.removeStudentFromGroup) /api/groups/{groupId}/students/{username} -> remove students from group (authorized for admin)
+2. (meetings.getAttendancesByMeetingId) /api/meetings/{meetingId}/attendances -> get students attendance list by meeting id (authorized for admin and assistant)
+3. (meetings.insertAttendanceForAllStudentInMeeting) /api/meetings/{meetingId}/attendances/v2 -> add all students attendances in one meeting default status ABSENT (authorized for admin)
+4. (practicums.getPracticumAttendances) /api/practicums/{practicumId}/meetings/attendances -> get practicum meetings (authorized for admin)

readme.md

@@ -5,8 +5,16 @@ export abstract class AssistanceGroupHandler {
     this.deleteAssistanceGroup = this.deleteAssistanceGroup.bind(this);
     this.getAssistanceGroup = this.getAssistanceGroup.bind(this);
     this.putAssistanceGroup = this.putAssistanceGroup.bind(this);
+    this.deleteStudentFromAssistantGroup =
+      this.deleteStudentFromAssistantGroup.bind(this);
   }
 
+  abstract deleteStudentFromAssistantGroup(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ): Promise<any>;
+
   abstract putAssistanceGroup(
     req: Request,
     res: Response,

src/api/assistanceGroup/handler/AssistanceGroupHandler.ts

@@ -24,6 +24,32 @@ export class AssistanceGroupHandlerImpl extends AssistanceGroupHandler {
     this.schemaValidator = schemaValidator;
   }
 
+  async deleteStudentFromAssistantGroup(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ): Promise<any> {
+    const { username, groupId } = req.params;
+
+    try {
+      await this.assistanceGroupService.removeStudentFromAssistantGroup(
+        groupId,
+        username
+      );
+
+      return res
+        .status(200)
+        .json(
+          createResponse(
+            RESPONSE_MESSAGE.SUCCESS,
+            "successfully remove student from asssitant group"
+          )
+        );
+    } catch (error) {
+      return next(error);
+    }
+  }
+
   async putAssistanceGroup(
     req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>,
     res: Response<any, Record<string, any>>,

src/api/assistanceGroup/handler/AssistanceGroupHandlerImpl.ts

@@ -36,6 +36,14 @@ export class AssistanceGroupRouterImpl extends BaseRouter {
         this.handler.putAssistanceGroup
       );
 
+    // * remove student from assistantGroup
+    this.router
+      .route(this.path + "/:groupId/students/:username")
+      .delete(
+        this.authorizationMiddlware.authorize([USER_ROLE.ADMIN]),
+        this.handler.deleteStudentFromAssistantGroup
+      );
+
     return this.router;
   }
 }

src/api/assistanceGroup/router/AssistanceGroupRouter.ts

@@ -6,8 +6,22 @@ export abstract class MeetingHandler {
     this.getMeeting = this.getMeeting.bind(this);
     this.putMeeting = this.putMeeting.bind(this);
     this.postMeetingAttendance = this.postMeetingAttendance.bind(this);
+    this.getMeetingAttendances = this.getMeetingAttendances.bind(this);
+    this.postMeetingAttendances = this.postMeetingAttendances.bind(this);
   }
 
+  abstract postMeetingAttendances(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ): Promise<any>;
+
+  abstract getMeetingAttendances(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ): Promise<any>;
+
   abstract postMeetingAttendance(
     req: Request,
     res: Response,

src/api/meeting/handler/MeetingHandler.ts

@@ -15,6 +15,7 @@ import { PracticumMeetingPutPayloadSchema } from "../../../utils/validator/meeti
 import { IPostMeetingAttendancePayload } from "../../../utils/interfaces/request/IPostMeetingAttendancePayload";
 import { MeetingAttendancePostPayloadSchema } from "../../../utils/validator/attendance/Joi/MeetingAttendancePostPayloadSchema";
 import { AttendanceService } from "../../../services/attendance/AttendanceService";
+import { ListStudentAttendanceDTO } from "../../../utils/dto/attendances/IListStudentAttendanceDTO";
 
 export class MeetingHandlerImpl extends MeetingHandler {
   private meetingService: MeetingService;
@@ -34,6 +35,49 @@ export class MeetingHandlerImpl extends MeetingHandler {
     this.schemaValidator = schemaValidator;
   }
 
+  async postMeetingAttendances(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ): Promise<any> {
+    const { id } = req.params;
+
+    try {
+      await this.attendanceService.addAttendancesForAllStudentsByMeetingId(id);
+
+      return res
+        .status(201)
+        .json(
+          createResponse(RESPONSE_MESSAGE.SUCCESS, "successfully edit meeting")
+        );
+    } catch (error) {
+      return next(error);
+    }
+  }
+
+  async getMeetingAttendances(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ): Promise<any> {
+    const { id } = req.params;
+    const { classroom } = req.query;
+
+    const attendances = await this.attendanceService.getAttendancesByMeetingId(
+      id,
+      classroom
+    );
+
+    return res
+      .status(200)
+      .json(
+        createResponse(
+          RESPONSE_MESSAGE.SUCCESS,
+          attendances.map(ListStudentAttendanceDTO)
+        )
+      );
+  }
+
   async postMeetingAttendance(
     req: Request,
     res: Response,

src/api/meeting/handler/MeetingHandlerImpl.ts

@@ -43,11 +43,30 @@ export class MeetingRouter extends BaseRouter {
       );
 
     // * create attendance of a meeting
+    // * get attendances by meeting id
     this.router
       .route(this.path + "/:id/attendances")
       .post(
         this.authorizationMiddlware.authorize([USER_ROLE.ASSISTANT]),
         this.handler.postMeetingAttendance
+      )
+      .get(
+        this.authorizationMiddlware.authorize([
+          USER_ROLE.ASSISTANT,
+          USER_ROLE.ADMIN,
+        ]),
+        this.handler.getMeetingAttendances
+      );
+
+    // * post all student attendances in one meeting
+    this.router
+      .route(this.path + "/:id/attendances/v2")
+      .post(
+        this.authorizationMiddlware.authorize([
+          USER_ROLE.ASSISTANT,
+          USER_ROLE.ADMIN,
+        ]),
+        this.handler.postMeetingAttendances
       );
 
     return this.router;

src/api/meeting/router/MeetingRouterImpl.ts

@@ -23,8 +23,16 @@ export abstract class PracticumHandler {
       this.getStudentPracticumAttendances.bind(this);
     this.deleteAssistantFromPracticum =
       this.deleteAssistantFromPracticum.bind(this);
+    this.getPracticumMeetingAttendances =
+      this.getPracticumMeetingAttendances.bind(this);
   }
 
+  abstract getPracticumMeetingAttendances(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ): Promise<any>;
+
   abstract deleteAssistantFromPracticum(
     req: Request,
     res: Response,

src/api/practicum/handler/PracticumHandler.ts

@@ -30,6 +30,7 @@ import { USER_ROLE } from "@prisma/client";
 import { ControlCardEntity } from "../../../entity/controlCard/ControlCardEntity";
 import { ListAttendanceDTO } from "../../../utils/dto/attendances/IListAttendanceDTO";
 import { AttendanceService } from "../../../services/attendance/AttendanceService";
+import { ListMeetingAttendanceDTO } from "../../../utils/dto/meeting/IListMeetingAttendanceDTO";
 
 export class PracticumHandlerImpl extends PracticumHandler {
   private practicumService: PracticumService;
@@ -62,6 +63,30 @@ export class PracticumHandlerImpl extends PracticumHandler {
     this.schemaValidator = schemaValidator;
   }
 
+  async getPracticumMeetingAttendances(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ): Promise<any> {
+    const { practicumId } = req.params;
+    const { classroom } = req.query;
+
+    const attendances =
+      await this.meetingService.getMeetingAttendancesByPracticumId(
+        practicumId,
+        classroom
+      );
+
+    return res
+      .status(200)
+      .json(
+        createResponse(
+          RESPONSE_MESSAGE.SUCCESS,
+          attendances.map(ListMeetingAttendanceDTO)
+        )
+      );
+  }
+
   async deleteAssistantFromPracticum(
     req: Request,
     res: Response,

src/api/practicum/handler/PracticumHandlerImpl.ts

@@ -157,6 +157,14 @@ export class PracticumRouterImpl extends BaseRouter {
         this.handler.getStudentPracticumAttendances
       );
 
+    // * get practicum meetings attendances
+    this.router
+      .route(this.path + "/:practicumId/meetings/attendances")
+      .get(
+        this.authorizationMiddlware.authorize([USER_ROLE.ADMIN]),
+        this.handler.getPracticumMeetingAttendances
+      );
+
     return this.router;
   }
 }

src/api/practicum/router/PracticumRouterImpl.ts

@@ -31,6 +31,7 @@ import { ClassroomPrismaRepositoryImpl } from "./repository/classroom/ClassroomP
 import { ControlCardPrismaRepositoryImpl } from "./repository/controlCard/ControlCardPrismaRepositoryImpl";
 import { AssistanceGroupAssistancePrismaRepositoryImpl } from "./repository/facade/assistanceGroupAssistanceRepository/AssistanceGroupAssistancePrismaRepositoryImpl";
 import { AssistanceGroupAssistanceRepository } from "./repository/facade/assistanceGroupAssistanceRepository/AssistanceGroupAssistanceRepository";
+import { AssistantGroupControlCardPrismaRepositoryImpl } from "./repository/facade/assistantGroupControlCardRepository/AssistantGroupControlCardPrismaRepositoryImpl";
 import { ClassroomAssistantGroupPracticumPrismaRepositoryImpl } from "./repository/facade/classroomAssistantGroupPracticumRepository/ClassroomAssistantGroupPracticumPrismaRepositoryImpl";
 import { ClassroomPracticumPrismaRepositoryImpl } from "./repository/facade/classroomPracticumRepository/ClassroomPracticumPrismaRepositoryImpl";
 import { ClassroomPracticumStudentsPrismaRepositoryImpl } from "./repository/facade/classroomPracticumStudents/ClassroomPracticumStudentsPrismaRepositoryImpl";
@@ -96,11 +97,14 @@ const meetingService = new MeetingServiceImpl({
   meetingRepository,
   practicumRepository,
 });
+const assistantGroupControlCardRepository =
+  new AssistantGroupControlCardPrismaRepositoryImpl();
 const assistanceGroupService = new AssistanceGroupServiceImpl(
   {
     practicumRepository,
     assistanceGroupRepository,
     assistanceGroupAssistanceRepository,
+    assistantGroupControlCardRepository,
   },
   publisher.googlePubSub
 );
@@ -118,6 +122,7 @@ const attendanceService = new AttendanceServiceImpl({
   practicumRepository,
   attendanceRepository,
   meetingRepository,
+  classroomRepository,
 });
 // * validators
 const schemaValidator = new JoiValidatorImpl();