update All feture and service

internal/satusehat/usecase/medicationdispense/mapper.go

@@ -1,7 +1,6 @@
 package medicationdispense
 
 import (
-	"os"
 	"time"
 
 	"service/internal/interfaces/satusehat"
@@ -10,10 +9,7 @@ import (
 func MapRequestToFHIR(req MedicationDispenseRequest) satusehat.FHIRPayload {
 	payload := satusehat.NewFHIRPayload("MedicationDispense")
 
-	orgID := os.Getenv("SATUSEHAT_ORG_ID")
-	if orgID == "" {
-		orgID = req.OrganizationID
-	}
+	orgID := req.OrganizationID
 
 	if orgID != "" && req.PrescriptionID != "" {
 		identifiers := []map[string]interface{}{

internal/satusehat/usecase/medicationdispense/repository.go

@@ -26,12 +26,8 @@ func NewRepository(client satusehat.SatuSehatClient) Repository {
 	return &repository{client: client}
 }
 
-type hiddenCtx struct {
-	context.Context
-}
-
 func (r *repository) executeRequest(ctx context.Context, method, endpoint string, req interface{}) (*satusehat.FHIRResponse, error) {
-	resp, err := r.client.DoRequest(hiddenCtx{ctx}, method, endpoint, req)
+	resp, err := r.client.DoRequest(ctx, method, endpoint, req)
 	if err != nil {
 		return nil, errors.InternalError().Message("Failed to execute request to SatuSehat").Cause(err).Build()
 	}

internal/satusehat/usecase/medicationdispense/service.go

@@ -17,20 +17,27 @@ type Service interface {
 }
 
 type service struct {
-	repo Repository
+	repo  Repository
+	orgID string
 }
 
-func NewService(repo Repository) Service {
-	return &service{repo: repo}
+func NewService(repo Repository, orgID string) Service {
+	return &service{repo: repo, orgID: orgID}
 }
 
 func (s *service) Create(ctx context.Context, req MedicationDispenseRequest) (*satusehat.FHIRResponse, error) {
+	if req.OrganizationID == "" {
+		req.OrganizationID = s.orgID
+	}
 	return s.repo.Create(ctx, MapRequestToFHIR(req))
 }
 func (s *service) Update(ctx context.Context, id string, req MedicationDispenseRequest) (*satusehat.FHIRResponse, error) {
 	if id == "" {
 		return nil, errors.NewValidationError().Message("MedicationDispense ID is required").Build()
 	}
+	if req.OrganizationID == "" {
+		req.OrganizationID = s.orgID
+	}
 	payload := MapRequestToFHIR(req)
 	payload.Set("id", id)
 	return s.repo.Update(ctx, id, payload)