resolve-conflicts

moevm · Dec 23, 2023 · e2af6bd · e2af6bd
1 parent 2de08a2
commit e2af6bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/backend/src/init_data/init_data.ts b/backend/src/init_data/init_data.ts
@@ -66,9 +66,9 @@ class DataInitializer {
         const patientIds: Types.ObjectId[] = patientUsers.map(patient => patient._id!) as Types.ObjectId[];
 
         const testData: PatientDto[] = [
-            { _id: patientIds[0], name: "Максим", surname: "Тишкин", email: "[email protected]", birthdate: "22.08.2002", contact: "987654321", bloodgroup: "A+", card: "0001" },
-            { _id: patientIds[1], name: "Саша", surname: "Морозов", email: "[email protected]", birthdate: "22.08.2002", contact: "987654321", bloodgroup: "A+", card: "0002"  },
-            { _id: patientIds[2], name: "Миша", surname: "Переверза", email: "[email protected]", birthdate: "22.08.2002", contact: "987654321", bloodgroup: "A+", card: "0003"  },
+            { _id: patientIds[0], name: "Максим", surname: "Тишкин", email: "[email protected]", birthdate: "22.08.2002", contact: "88005553535", bloodgroup: "A+", card: "0001" },
+            { _id: patientIds[1], name: "Саша", surname: "Морозов", email: "[email protected]", birthdate: "22.08.2002", contact: "88219876532", bloodgroup: "A+", card: "0002"  },
+            { _id: patientIds[2], name: "Миша", surname: "Переверза", email: "[email protected]", birthdate: "22.08.2002", contact: "89638527415", bloodgroup: "A+", card: "0003"  },
         ];
 
         await PatientsMongoCollection.insertMany(testData);
@@ -85,9 +85,9 @@ class DataInitializer {
         const doctorId = new Types.ObjectId(String(doctorUser?._id))
 
         const testData: AppoitmentDto[] = [
-            { _id: new mongoose.Types.ObjectId(), date: "01/01/2024, 00:00-08:00", procedure_id: procedureId, patient_id: patientIds[0], doctor_id: doctorId },
-            { _id: new mongoose.Types.ObjectId(), date: "02/01/2024, 00:00-08:00", procedure_id: procedureId, patient_id: patientIds[1], doctor_id: doctorId },
-            { _id: new mongoose.Types.ObjectId(), date: "03/01/2024, 00:00-08:00", procedure_id: procedureId, patient_id: patientIds[2], doctor_id: doctorId },
+            { _id: new mongoose.Types.ObjectId(), date: "01.01.2024, 11:00", procedure_id: procedureId, patient_id: patientIds[0], doctor_id: doctorId },
+            { _id: new mongoose.Types.ObjectId(), date: "02.01.2024, 11:00", procedure_id: procedureId, patient_id: patientIds[1], doctor_id: doctorId },
+            { _id: new mongoose.Types.ObjectId(), date: "03.01.2024, 11:00", procedure_id: procedureId, patient_id: patientIds[2], doctor_id: doctorId },
         ];
 
         await AppoitmentMongoCollection.insertMany(testData);

diff --git a/backend/test.rest b/backend/test.rest
@@ -2,13 +2,13 @@ POST http://localhost:1234/api/login
 Content-Type: application/json
 
 {
-    "login": "admin",
-    "password": "admin"
+    "login": "doctor",
+    "password": "doctor"
 }
 
 ###
 
-GET http://localhost:1234/api/doctors/658705e53b786ef1006e04f9
+GET http://localhost:1234/api/doctors/658712e411893f7cb9895a64
 
 ###