fix: create appointments

Signed-off-by: maxwellgithinji <maxwellgithinji@gmail.com>

pkg/mycarehub/domain/appointments.go

@@ -18,6 +18,7 @@ type Appointment struct {
 	Provider                  string `json:"provider"`
 	HasRescheduledAppointment bool   `json:"hasRescheduledApointment"`
 	ProgramID                 string `json:"programID"`
+	OrganisationID            string `json:"organisationID"`
 }
 
 // AppointmentsPage is a list of paginated appointments

pkg/mycarehub/infrastructure/database/postgres/gorm/tables.go

@@ -1267,26 +1267,12 @@ type Appointment struct {
 
 // BeforeCreate is a hook run before creating an appointment
 func (a *Appointment) BeforeCreate(tx *gorm.DB) (err error) {
-	ctx := tx.Statement.Context
-	if userID := utils.GetLoggedInUserID(ctx); userID != nil {
-		a.CreatedBy = userID
-	}
-
 	id := uuid.New().String()
 	a.ID = id
 
 	return
 }
 
-// BeforeUpdate is a hook called before updating Appointment.
-func (a *Appointment) BeforeUpdate(tx *gorm.DB) (err error) {
-	ctx := tx.Statement.Context
-	if userID := utils.GetLoggedInUserID(ctx); userID != nil {
-		a.UpdatedBy = userID
-	}
-	return
-}
-
 // TableName references the table that we map data from
 func (Appointment) TableName() string {
 	return "appointments_appointment"

pkg/mycarehub/infrastructure/database/postgres/pg_create.go

@@ -293,14 +293,15 @@ func (d *MyCareHubDb) CreateAppointment(ctx context.Context, appointment domain.
 
 	date := appointment.Date.AsTime()
 	ap := &gorm.Appointment{
-		Active:     true,
-		ExternalID: appointment.ExternalID,
-		ClientID:   appointment.ClientID,
-		FacilityID: appointment.FacilityID,
-		Reason:     appointment.Reason,
-		Provider:   appointment.Provider,
-		Date:       date,
-		ProgramID:  appointment.ProgramID,
+		Active:         true,
+		ExternalID:     appointment.ExternalID,
+		ClientID:       appointment.ClientID,
+		FacilityID:     appointment.FacilityID,
+		Reason:         appointment.Reason,
+		Provider:       appointment.Provider,
+		Date:           date,
+		ProgramID:      appointment.ProgramID,
+		OrganisationID: appointment.OrganisationID,
 	}
 
 	return d.create.CreateAppointment(ctx, ap)

pkg/mycarehub/usecases/appointments/appointment.go

@@ -170,12 +170,13 @@ func (a *UseCasesAppointmentsImpl) CreateKenyaEMRAppointments(ctx context.Contex
 	var errs error
 	for _, clientProfile := range clientProfiles {
 		appointment := domain.Appointment{
-			Date:       input.AppointmentDate,
-			Reason:     input.AppointmentReason,
-			FacilityID: *facility.ID,
-			ExternalID: input.ExternalID,
-			ClientID:   *clientProfile.ID,
-			ProgramID:  clientProfile.User.CurrentProgramID,
+			Date:           input.AppointmentDate,
+			Reason:         input.AppointmentReason,
+			FacilityID:     *facility.ID,
+			ExternalID:     input.ExternalID,
+			ClientID:       *clientProfile.ID,
+			ProgramID:      clientProfile.User.CurrentProgramID,
+			OrganisationID: clientProfile.User.CurrentOrganizationID,
 		}
 
 		err = a.Create.CreateAppointment(ctx, appointment)