Skip to content

Refactoring #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enjyashraf18 merged 3 commits into from
May 1, 2026
Merged

Refactoring #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
612af7a
remove unnecessary stuff
enjyashraf18 Apr 26, 2026
f1cc1f7
centralize all time logic
enjyashraf18 Apr 30, 2026
27eac4b
fix bug: boundaries of the day
enjyashraf18 May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 32 additions & 122 deletions src/services/appointment.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ export class AppointmentService {
scheduleMap.set(schedule.day_of_week, schedule);
});

const today = new Date();
today.setUTCHours(0, 0, 0, 0);
const now = this.getNowInEgypt();
const today = this.getTodayBoundaries(now).start;

for (let i = 0; i < daysAhead; i++) {
// create a copy from today --> if we used today directly it will be modified to today + 1 --> tomorrow date
Expand Down Expand Up @@ -115,11 +115,8 @@ export class AppointmentService {
const requestedDate = new Date(date);
const dayOfWeek = this.getDayOfWeek(requestedDate.getUTCDay());

const now = new Date();
const { start: today, end: endOfToday } = this.getTodayBoundaries(now);

// const requestedDateOnly = new Date(requestedDate);
// requestedDateOnly.setUTCHours(0, 0, 0, 0);
const now = this.getNowInEgypt();
const { start: today } = this.getTodayBoundaries(now);
const { start: requestedDateOnly } = this.getTodayBoundaries(requestedDate);

if (requestedDateOnly < today) {
Expand Down Expand Up @@ -199,9 +196,6 @@ export class AppointmentService {
return this.doesSlotOverlap(slotStart, slotEnd, apptStart, apptEnd);
});

const nowUTC = new Date();
const egyptOffset = 2 * 60 * 60 * 1000;
const now = new Date(nowUTC.getTime() + egyptOffset);
const isInPast = slotStart <= now;

return {
Expand Down Expand Up @@ -385,7 +379,7 @@ export class AppointmentService {
public async getTodayAppointment(patientId: string): Promise<PatientTodayAppointment[]> {
const result: PatientTodayAppointment[] = [];

const now = new Date();
const now = this.getNowInEgypt();
const { start: today, end: endOfToday } = this.getTodayBoundaries(now);

const appointments = await prisma.appointment.findMany({
Expand Down Expand Up @@ -507,8 +501,6 @@ export class AppointmentService {
appointmentDate: this.formatDate(appointment.scheduled_time),
startTime: this.formatTime(appointment.scheduled_time),
};

// penalty to be added later
}

public async rescheduleAppointmentByDoctor(doctorId: string, appointmentId: string, minutes: number): Promise<AppointmentEventData[]> {
Expand Down Expand Up @@ -746,10 +738,7 @@ export class AppointmentService {
};

public async getUpcommingDoctorSchedule(doctorId: string): Promise<DoctorScheduleDay[]> {
// to be changed later -->
const nowUTC = new Date();
const egyptOffset = 2 * 60 * 60 * 1000;
const now = new Date(nowUTC.getTime() + egyptOffset);
const now = this.getNowInEgypt();

const appointments = await prisma.appointment.findMany({
where: {
Expand Down Expand Up @@ -966,10 +955,7 @@ export class AppointmentService {
throw new HttpException(error.status, error.message, error.messageAr);
}

const nowUTC = new Date();
const egyptOffset = 2 * 60 * 60 * 1000;
const now = new Date(nowUTC.getTime() + egyptOffset);

const now = this.getNowInEgypt();

if (now < appointment.scheduled_time) {
const error = createBilingualError(400, ErrorMessages.CANNOT_BE_COMPLETED_BEFORE_SCHEDULED_TIME);
Expand Down Expand Up @@ -1155,7 +1141,7 @@ export class AppointmentService {
}

public async getCurrentDoctorSchedule(doctorId: string): Promise<DoctorAppointment[]> {
const now = new Date();
const now = this.getNowInEgypt();
const { start: startOfDay, end: endOfDay } = this.getTodayBoundaries(now);

const appointments = await prisma.appointment.findMany({
Expand Down Expand Up @@ -1382,7 +1368,6 @@ export class AppointmentService {
}

})
// DONT FORGET LATER --> notify patients/ penalty
}


Expand Down Expand Up @@ -1411,12 +1396,10 @@ export class AppointmentService {
deleted_at: new Date(),
}
})
// DONT FORGET LATER --> notify patients / penalty

}

public async getNurseAppointmentsToday(nurseId: string): Promise<AppointmentData[]> {
const crrentDate = new Date();
const crrentDate = this.getNowInEgypt();
const today = this.formatDate(crrentDate);
const dayOfWeek = this.getDayOfWeek(crrentDate.getUTCDay());

Expand Down Expand Up @@ -1639,19 +1622,6 @@ export class AppointmentService {
return (slotStart < appointmentEnd && slotEnd > appointmentStart);
}

private async doctorIsOnline(doctorId: string): Promise<boolean> {
const { availability_type } = await prisma.doctor.findUnique({
where: {
id: doctorId,
},
select: {
availability_type: true,
}
});
return availability_type === 'ONLINE' || availability_type === 'BOTH';
}


private async rescheduleSingleAppointment(doctorId: string, appointmentId: string, minutes: number): Promise<void> {
const appointment = await this.getAndValidateAppointment(appointmentId, doctorId);

Expand Down Expand Up @@ -1712,100 +1682,40 @@ export class AppointmentService {
return appointment;
}

private async validateDoctorAvailability(doctorId: string, clinicId: string | null, newScheduledTime: Date, newEndTime: Date, excludeAppointmentId?: string): Promise<void> {

// check if doctor works on this day
const dayOfWeek = this.getDayOfWeek(newScheduledTime.getUTCDay());
const isOnline = await this.doctorIsOnline(doctorId);

const schedule = await prisma.doctorSchedule.findFirst({
where: {
doctor_id: doctorId,
clinic_id: isOnline ? null : clinicId,
day_of_week: dayOfWeek,
is_active: true,
deleted_at: null,
},
select: {
start_time: true,
end_time: true,
}
});

if (!schedule) {
const error = createBilingualError(400, ErrorMessages.DOCTOR_NOT_WORKING_ON_DAY);
throw new HttpException(error.status, error.message, error.messageAr);
}

// check if the new time within schedule or not
const scheduleStart = this.parseTimeToDate(newScheduledTime, schedule.start_time);
const scheduleEnd = this.parseTimeToDate(newScheduledTime, schedule.end_time);

if (newScheduledTime < scheduleStart || newEndTime > scheduleEnd) {
const error = createBilingualError(400, ErrorMessages.TIME_OUTSIDE_SCHEDULE);
throw new HttpException(error.status, error.message, error.messageAr);
}

// check for any conflicts with existing appointments (appointments on the same calendar day)
const startOfDay = new Date(newScheduledTime);
startOfDay.setUTCHours(0, 0, 0, 0);

const endOfDay = new Date(newScheduledTime);
endOfDay.setUTCHours(23, 59, 59, 999);

const whereClause: any = {
doctor_id: doctorId,
clinic_id: isOnline ? null : clinicId,
scheduled_time: {
gte: startOfDay,
lte: endOfDay,
},
status: { in: ['CONFIRMED', 'COMPLETED'] },
deleted_at: null,
};

// exclude the appointment being rescheduled
if (excludeAppointmentId) {
whereClause.id = { not: excludeAppointmentId };
}

const conflictingAppointments = await prisma.appointment.findMany({
where: whereClause,
select: {
scheduled_time: true,
end_time: true,
}
});

// check for overlap
const hasConflict = conflictingAppointments.some(existing => {
return this.doesSlotOverlap(newScheduledTime, newEndTime, new Date(existing.scheduled_time), new Date(existing.end_time));
});

if (hasConflict) {
const error = createBilingualError(400, ErrorMessages.TIME_SLOT_NOT_AVAILABLE);
throw new HttpException(error.status, error.message, error.messageAr);
}
}

private camelToSnakeCase(str: string): string {
return str.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`);
}

private getTodayBoundaries(date: Date, timezone: string = 'Africa/Cairo'): { start: Date; end: Date } {
const localDateStr = new Intl.DateTimeFormat('en-CA', {
timeZone: timezone,
private getNowInEgypt(): Date {
const now = new Date();

const cairoFormatter = new Intl.DateTimeFormat('en-CA', {
timeZone: 'Africa/Cairo',
year: 'numeric',
month: '2-digit',
day: '2-digit'}).format(date);
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
hour12: false,
});

const cairoDateTimeStr = cairoFormatter.format(now).replace(', ', 'T');
return new Date(`${cairoDateTimeStr}Z`);
}

private getTodayBoundaries(date: Date): { start: Date; end: Date } {
const year = date.getUTCFullYear();
const month = date.getUTCMonth();
const day = date.getUTCDate();

const [year, month, day] = localDateStr.split('-').map(Number);
const start = new Date(Date.UTC(year, month, day, 0, 0, 0, 0));
const end = new Date(Date.UTC(year, month, day, 23, 59, 59, 999));

const start = new Date(Date.UTC(year, month - 1, day, 0, 0, 0, 0));
const end = new Date(Date.UTC(year, month - 1, day, 23, 59, 59, 999));
return { start, end };
}


public async generateAgoraToken(appointmentId: string, userId: string): Promise<string> {
const appointment = await prisma.appointment.findUnique({
where: {
Expand Down
Loading