get sections updated

sinanptm · Sep 27, 2024 · b5c835d · b5c835d
1 parent b62dd03
commit b5c835d
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-speech
 /clean.txt
 
 # Ignore all node_modules directories

diff --git a/server/src/domain/entities/IVideoChatSection.ts b/server/src/domain/entities/IVideoChatSection.ts
@@ -4,7 +4,9 @@ export default interface IVideoSection {
   doctorName?: string;
   patientName?: string;
   doctorProfile?: string;
+  doctorId?: string;
   patientProfile?: string;
+  patientId?: string;
   createdAt?: Date;
   updatedAt?: Date;
   startTime?: Date | string;

diff --git a/server/src/domain/interface/repositories/IVideoSectionRepository.ts b/server/src/domain/interface/repositories/IVideoSectionRepository.ts
@@ -7,7 +7,8 @@ export interface IVideoSectionRepository {
   delete(id: string): Promise<void>;
   findByAppointmentId(appointmentId: string): Promise<IVideoSection | null>;
   findByStatus(status: VideoSectionStatus): Promise<IVideoSection | null>;
-  findByStartTimeRange(startTime: string, endTime: string): Promise<IVideoSection[] | null>;
+  findByStartTimeRangeByDoctorId(startTime: string, endTime: string, doctorId: string): Promise<IVideoSection[] | null>;
+  findByStartTimeRangeByPatientId(startTime: string, endTime: string, patientId: string): Promise<IVideoSection[] | null>;
 }
 
 
diff --git a/server/src/infrastructure/model/VideoSectionModel.ts b/server/src/infrastructure/model/VideoSectionModel.ts
@@ -2,7 +2,19 @@ import { model, Schema } from "mongoose";
 import IVideoSection, { VideoSectionStatus } from "../../domain/entities/IVideoChatSection";
 
 const videoSectionSchema = new Schema<IVideoSection>({
-    appointmentId: { type: String, required: true, index: true },
+    appointmentId: { type: String, required: true },
+    doctorId: {
+        type: Schema.Types.ObjectId,
+        ref: "Doctor",
+        required: true,
+        index: true,
+    },
+    patientId: {
+        type: Schema.Types.ObjectId,
+        ref: "Patient",
+        required: true,
+        index: true,
+    },
     doctorName: { type: String, required: true },
     patientName: { type: String, required: true },
     startTime: { type: Date, required: true, index: true },

diff --git a/server/src/infrastructure/repositories/VideoSectionRepository.ts b/server/src/infrastructure/repositories/VideoSectionRepository.ts
@@ -24,10 +24,18 @@ export default class VideoSectionRepository implements IVideoSectionRepository {
     async findByAppointmentId(appointmentId: string): Promise<IVideoSection | null> {
         return await this.model.findOne({ appointmentId });
     }
-
-    async findByStartTimeRange(startTime: string, endTime: string): Promise<IVideoSection[] | null> {
+
+    async findByStartTimeRangeByDoctorId(startTime: string, endTime: string, doctorId: string): Promise<IVideoSection[] | null> {
+        return await this.model.find({
+            startTime: { $gte: startTime, $lte: endTime },
+            doctorId
+        });
+    }
+
+    async findByStartTimeRangeByPatientId(startTime: string, endTime: string, patientId: string): Promise<IVideoSection[] | null> {
         return await this.model.find({
-            startTime: { $gte: startTime, $lte: endTime }
+            startTime: { $gte: startTime, $lte: endTime },
+            patientId
         });
     }
 

diff --git a/server/src/use_case/video/GetVideoSectionUseCase.ts b/server/src/use_case/video/GetVideoSectionUseCase.ts
@@ -1,13 +1,12 @@
 import IVideoSection from "../../domain/entities/IVideoChatSection";
-// import IAppointmentRepository from "../../domain/interface/repositories/IAppointmentRepository";
 import { IVideoSectionRepository } from "../../domain/interface/repositories/IVideoSectionRepository";
 import IValidatorService from "../../domain/interface/services/IValidatorService";
+import { addHours } from "../../utils/date-formatter";
 
 export default class GetVideoSectionUseCase {
     constructor(
         private readonly videoSectionRepository: IVideoSectionRepository,
         private readonly validatorService: IValidatorService
-        // private readonly appointmentRepository: IAppointmentRepository
     ) { }
 
     async getSectionById(id: string): Promise<IVideoSection | null> {
@@ -20,12 +19,19 @@ export default class GetVideoSectionUseCase {
         return await this.videoSectionRepository.findByAppointmentId(appointmentId);
     }
 
-    async getSectionsInOneHour(): Promise<IVideoSection[] | []> {
+    async getSectionsInOneHourDoctor(doctorId: string): Promise<IVideoSection[] | []> {
+        this.validatorService.validateIdFormat(doctorId)
         const currentTime = new Date();
-        const afterOneHour = new Date(currentTime.getTime() + 60 * 60 * 1000);
-        const sections = await this.videoSectionRepository.findByStartTimeRange(currentTime.toISOString(), afterOneHour.toISOString());
+        const afterOneHour = addHours(currentTime, 1);
+        const sections = await this.videoSectionRepository.findByStartTimeRangeByDoctorId(currentTime.toISOString(), afterOneHour.toISOString(), doctorId);
         return sections ?? [];
     }
 
-
+    async getSectionsInOneHourPatient(patientId: string): Promise<IVideoSection[] | []> {
+        this.validatorService.validateIdFormat(patientId)
+        const currentTime = new Date();
+        const afterOneHour = addHours(currentTime, 1);
+        const sections = await this.videoSectionRepository.findByStartTimeRangeByPatientId(currentTime.toISOString(), afterOneHour.toISOString(), patientId);
+        return sections ?? [];
+    }
 }