From e2af6bd154b1c27b80f70b123085803b165a6a0f Mon Sep 17 00:00:00 2001 From: Toropigeon <71664787+TheAnton1@users.noreply.github.com> Date: Sat, 23 Dec 2023 20:52:06 +0300 Subject: [PATCH] resolve-conflicts --- backend/src/init_data/init_data.ts | 12 ++++++------ backend/test.rest | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/src/init_data/init_data.ts b/backend/src/init_data/init_data.ts index 3026198..c374c71 100644 --- 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: "patient@example.com", birthdate: "22.08.2002", contact: "987654321", bloodgroup: "A+", card: "0001" }, - { _id: patientIds[1], name: "Саша", surname: "Морозов", email: "patient@example.com", birthdate: "22.08.2002", contact: "987654321", bloodgroup: "A+", card: "0002" }, - { _id: patientIds[2], name: "Миша", surname: "Переверза", email: "patient@example.com", birthdate: "22.08.2002", contact: "987654321", bloodgroup: "A+", card: "0003" }, + { _id: patientIds[0], name: "Максим", surname: "Тишкин", email: "patient@example.com", birthdate: "22.08.2002", contact: "88005553535", bloodgroup: "A+", card: "0001" }, + { _id: patientIds[1], name: "Саша", surname: "Морозов", email: "patient@example.com", birthdate: "22.08.2002", contact: "88219876532", bloodgroup: "A+", card: "0002" }, + { _id: patientIds[2], name: "Миша", surname: "Переверза", email: "patient@example.com", 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 index 5f2d7f6..3db80a9 100644 --- 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 ###