From 2cbc2c638a3d376b7ae33921898f74875734185b Mon Sep 17 00:00:00 2001 From: hasyim_kai Date: Tue, 2 Dec 2025 13:42:02 +0700 Subject: [PATCH 1/3] Feat: add Vaccine Data migration --- .../migrations/20251202063820.sql | 17 +++ .../domain/main-entities/vaccine-data/dto.go | 101 ++++++++++++++++++ .../main-entities/vaccine-data/entity.go | 21 ++++ internal/interface/migration/main-entities.go | 2 + 4 files changed, 141 insertions(+) create mode 100644 cmd/main-migration/migrations/20251202063820.sql create mode 100644 internal/domain/main-entities/vaccine-data/dto.go create mode 100644 internal/domain/main-entities/vaccine-data/entity.go diff --git a/cmd/main-migration/migrations/20251202063820.sql b/cmd/main-migration/migrations/20251202063820.sql new file mode 100644 index 00000000..52b2689e --- /dev/null +++ b/cmd/main-migration/migrations/20251202063820.sql @@ -0,0 +1,17 @@ +-- Create "VaccineData" table +CREATE TABLE "public"."VaccineData" ( + "Id" bigserial NOT NULL, + "CreatedAt" timestamptz NULL, + "UpdatedAt" timestamptz NULL, + "DeletedAt" timestamptz NULL, + "Vaccine_type_Code" text NULL, + "Encounter_Id" bigint NULL, + "Vaccine_batch_number" bigint NULL, + "Vaccine_dose" bigint NULL, + "Dose_order" bigint NULL, + "Injection_location" text NULL, + "Vaccination_datetime" timestamptz NULL, + "Vaccine_expiration_date" timestamptz NULL, + PRIMARY KEY ("Id"), + CONSTRAINT "fk_VaccineData_Encounter" FOREIGN KEY ("Encounter_Id") REFERENCES "public"."Encounter" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION +); diff --git a/internal/domain/main-entities/vaccine-data/dto.go b/internal/domain/main-entities/vaccine-data/dto.go new file mode 100644 index 00000000..38222604 --- /dev/null +++ b/internal/domain/main-entities/vaccine-data/dto.go @@ -0,0 +1,101 @@ +package vaccinedata + +import ( + // std + "time" + + // internal - lib + + // internal - domain - base-entities + ecore "simrs-vx/internal/domain/base-entities/core" + + // internal - domain - main-entities + + ee "simrs-vx/internal/domain/main-entities/encounter" +) + +type CreateDto struct { + Vaccine_type_Code *string `json:"vaccine_type_code"` + Encounter_Id *uint `json:"encounter_id"` + Vaccine_batch_number *uint `json:"vaccine_batch_number"` + Vaccine_dose *uint `json:"vaccine_dose"` + Dose_order *uint `json:"dose_order"` + Injection_location *string `json:"injection_location"` + Vaccination_datetime *time.Time `json:"vaccination_datetime"` + Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` +} + +type ReadListDto struct { + FilterDto + Includes string `json:"includes"` + Pagination ecore.Pagination +} + +type FilterDto struct { + Encounter_Id *uint `json:"encounter-id"` + Date *time.Time `json:"date"` + Vaccine_type_Code *string `json:"vaccine-type-code"` + Vaccine_batch_number *uint `json:"vaccine_batch_number"` + Vaccine_dose *uint `json:"vaccine_dose"` + Dose_order *uint `json:"dose_order"` + Injection_location *string `json:"injection_location"` + Vaccination_datetime *time.Time `json:"vaccination_datetime"` + Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` +} + +type ReadDetailDto struct { + Id uint16 `json:"id"` + Includes string `json:"includes"` +} + +type UpdateDto struct { + Id uint `json:"id"` + CreateDto +} + +type DeleteDto struct { + Id uint `json:"id"` +} + +type MetaDto struct { + PageNumber int `json:"page_number"` + PageSize int `json:"page_size"` + Count int `json:"count"` +} + +type ResponseDto struct { + ecore.Main + Vaccine_type_Code *string `json:"vaccine_type_code"` + Encounter_Id *uint `json:"encounter_id"` + Encounter *ee.Encounter `json:"encounter" gorm:"foreignKey:Encounter_Id;references:Id"` + Vaccine_batch_number *uint `json:"vaccine_batch_number"` + Vaccine_dose *uint `json:"vaccine_dose"` + Dose_order *uint `json:"dose_order"` + Injection_location *string `json:"injection_location"` + Vaccination_datetime *time.Time `json:"vaccination_datetime"` + Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` +} + +func (d VaccineData) ToResponse() ResponseDto { + resp := ResponseDto{ + Encounter_Id: d.Encounter_Id, + Encounter: d.Encounter, + Vaccine_type_Code: d.Vaccine_type_Code, + Vaccine_batch_number: d.Vaccine_batch_number, + Vaccine_dose: d.Vaccine_dose, + Dose_order: d.Dose_order, + Injection_location: d.Injection_location, + Vaccination_datetime: d.Vaccination_datetime, + Vaccine_expiration_date: d.Vaccine_expiration_date, + } + resp.Main = d.Main + return resp +} + +func ToResponseList(data []VaccineData) []ResponseDto { + resp := make([]ResponseDto, len(data)) + for i, u := range data { + resp[i] = u.ToResponse() + } + return resp +} diff --git a/internal/domain/main-entities/vaccine-data/entity.go b/internal/domain/main-entities/vaccine-data/entity.go new file mode 100644 index 00000000..7eb4a023 --- /dev/null +++ b/internal/domain/main-entities/vaccine-data/entity.go @@ -0,0 +1,21 @@ +package vaccinedata + +import ( + "time" + + ecore "simrs-vx/internal/domain/base-entities/core" + ee "simrs-vx/internal/domain/main-entities/encounter" +) + +type VaccineData struct { + ecore.Main // adjust this according to the needs + Vaccine_type_Code *string `json:"vaccine_type_code"` + Encounter_Id *uint `json:"encounter_id"` + Encounter *ee.Encounter `json:"encounter" gorm:"foreignKey:Encounter_Id;references:Id"` + Vaccine_batch_number *uint `json:"vaccine_batch_number"` + Vaccine_dose *uint `json:"vaccine_dose"` + Dose_order *uint `json:"dose_order"` + Injection_location *string `json:"injection_location"` + Vaccination_datetime *time.Time `json:"vaccination_datetime"` + Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` +} diff --git a/internal/interface/migration/main-entities.go b/internal/interface/migration/main-entities.go index bed0c18c..16128e5a 100644 --- a/internal/interface/migration/main-entities.go +++ b/internal/interface/migration/main-entities.go @@ -99,6 +99,7 @@ import ( uom "simrs-vx/internal/domain/main-entities/uom" user "simrs-vx/internal/domain/main-entities/user" userfes "simrs-vx/internal/domain/main-entities/user-fes" + vaccinedata "simrs-vx/internal/domain/main-entities/vaccine-data" vehicle "simrs-vx/internal/domain/main-entities/vehicle" vehiclehist "simrs-vx/internal/domain/main-entities/vehicle-hist" village "simrs-vx/internal/domain/main-entities/village" @@ -214,6 +215,7 @@ func getMainEntities() []any { &vclaimmember.VclaimMember{}, &controlletter.ControlLetter{}, &rehab.Rehab{}, + &vaccinedata.VaccineData{}, &chemoprotocol.ChemoProtocol{}, &fileattachemnt.EncounterDocument{}, &vclaimsepcontrolletter.VclaimSepControlLetter{}, From d5583eaf15b8335b5687e8ea6f12a05ad97f6c64 Mon Sep 17 00:00:00 2001 From: hasyim_kai Date: Tue, 2 Dec 2025 16:13:31 +0700 Subject: [PATCH 2/3] Feat: add Vaccine Data CRUD API --- .../domain/main-entities/vaccine-data/dto.go | 101 ++++++ .../main-entities/vaccine-data/entity.go | 21 ++ .../interface/main-handler/main-handler.go | 2 + .../main-handler/vaccine-data/handler.go | 72 +++++ internal/interface/migration/main-entities.go | 2 + .../main-use-case/vaccine-data/case.go | 303 ++++++++++++++++++ .../main-use-case/vaccine-data/helper.go | 28 ++ .../main-use-case/vaccine-data/lib.go | 144 +++++++++ .../vaccine-data/middleware-runner.go | 103 ++++++ .../main-use-case/vaccine-data/middleware.go | 9 + .../main-use-case/vaccine-data/tycovar.go | 44 +++ 11 files changed, 829 insertions(+) create mode 100644 internal/domain/main-entities/vaccine-data/dto.go create mode 100644 internal/domain/main-entities/vaccine-data/entity.go create mode 100644 internal/interface/main-handler/vaccine-data/handler.go create mode 100644 internal/use-case/main-use-case/vaccine-data/case.go create mode 100644 internal/use-case/main-use-case/vaccine-data/helper.go create mode 100644 internal/use-case/main-use-case/vaccine-data/lib.go create mode 100644 internal/use-case/main-use-case/vaccine-data/middleware-runner.go create mode 100644 internal/use-case/main-use-case/vaccine-data/middleware.go create mode 100644 internal/use-case/main-use-case/vaccine-data/tycovar.go diff --git a/internal/domain/main-entities/vaccine-data/dto.go b/internal/domain/main-entities/vaccine-data/dto.go new file mode 100644 index 00000000..38222604 --- /dev/null +++ b/internal/domain/main-entities/vaccine-data/dto.go @@ -0,0 +1,101 @@ +package vaccinedata + +import ( + // std + "time" + + // internal - lib + + // internal - domain - base-entities + ecore "simrs-vx/internal/domain/base-entities/core" + + // internal - domain - main-entities + + ee "simrs-vx/internal/domain/main-entities/encounter" +) + +type CreateDto struct { + Vaccine_type_Code *string `json:"vaccine_type_code"` + Encounter_Id *uint `json:"encounter_id"` + Vaccine_batch_number *uint `json:"vaccine_batch_number"` + Vaccine_dose *uint `json:"vaccine_dose"` + Dose_order *uint `json:"dose_order"` + Injection_location *string `json:"injection_location"` + Vaccination_datetime *time.Time `json:"vaccination_datetime"` + Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` +} + +type ReadListDto struct { + FilterDto + Includes string `json:"includes"` + Pagination ecore.Pagination +} + +type FilterDto struct { + Encounter_Id *uint `json:"encounter-id"` + Date *time.Time `json:"date"` + Vaccine_type_Code *string `json:"vaccine-type-code"` + Vaccine_batch_number *uint `json:"vaccine_batch_number"` + Vaccine_dose *uint `json:"vaccine_dose"` + Dose_order *uint `json:"dose_order"` + Injection_location *string `json:"injection_location"` + Vaccination_datetime *time.Time `json:"vaccination_datetime"` + Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` +} + +type ReadDetailDto struct { + Id uint16 `json:"id"` + Includes string `json:"includes"` +} + +type UpdateDto struct { + Id uint `json:"id"` + CreateDto +} + +type DeleteDto struct { + Id uint `json:"id"` +} + +type MetaDto struct { + PageNumber int `json:"page_number"` + PageSize int `json:"page_size"` + Count int `json:"count"` +} + +type ResponseDto struct { + ecore.Main + Vaccine_type_Code *string `json:"vaccine_type_code"` + Encounter_Id *uint `json:"encounter_id"` + Encounter *ee.Encounter `json:"encounter" gorm:"foreignKey:Encounter_Id;references:Id"` + Vaccine_batch_number *uint `json:"vaccine_batch_number"` + Vaccine_dose *uint `json:"vaccine_dose"` + Dose_order *uint `json:"dose_order"` + Injection_location *string `json:"injection_location"` + Vaccination_datetime *time.Time `json:"vaccination_datetime"` + Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` +} + +func (d VaccineData) ToResponse() ResponseDto { + resp := ResponseDto{ + Encounter_Id: d.Encounter_Id, + Encounter: d.Encounter, + Vaccine_type_Code: d.Vaccine_type_Code, + Vaccine_batch_number: d.Vaccine_batch_number, + Vaccine_dose: d.Vaccine_dose, + Dose_order: d.Dose_order, + Injection_location: d.Injection_location, + Vaccination_datetime: d.Vaccination_datetime, + Vaccine_expiration_date: d.Vaccine_expiration_date, + } + resp.Main = d.Main + return resp +} + +func ToResponseList(data []VaccineData) []ResponseDto { + resp := make([]ResponseDto, len(data)) + for i, u := range data { + resp[i] = u.ToResponse() + } + return resp +} diff --git a/internal/domain/main-entities/vaccine-data/entity.go b/internal/domain/main-entities/vaccine-data/entity.go new file mode 100644 index 00000000..7eb4a023 --- /dev/null +++ b/internal/domain/main-entities/vaccine-data/entity.go @@ -0,0 +1,21 @@ +package vaccinedata + +import ( + "time" + + ecore "simrs-vx/internal/domain/base-entities/core" + ee "simrs-vx/internal/domain/main-entities/encounter" +) + +type VaccineData struct { + ecore.Main // adjust this according to the needs + Vaccine_type_Code *string `json:"vaccine_type_code"` + Encounter_Id *uint `json:"encounter_id"` + Encounter *ee.Encounter `json:"encounter" gorm:"foreignKey:Encounter_Id;references:Id"` + Vaccine_batch_number *uint `json:"vaccine_batch_number"` + Vaccine_dose *uint `json:"vaccine_dose"` + Dose_order *uint `json:"dose_order"` + Injection_location *string `json:"injection_location"` + Vaccination_datetime *time.Time `json:"vaccination_datetime"` + Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` +} diff --git a/internal/interface/main-handler/main-handler.go b/internal/interface/main-handler/main-handler.go index dd025d0e..15430791 100644 --- a/internal/interface/main-handler/main-handler.go +++ b/internal/interface/main-handler/main-handler.go @@ -39,6 +39,7 @@ import ( sbar "simrs-vx/internal/interface/main-handler/sbar" soapi "simrs-vx/internal/interface/main-handler/soapi" uploadfile "simrs-vx/internal/interface/main-handler/upload-file" + vaccineData "simrs-vx/internal/interface/main-handler/vaccine-data" /******************** actor ********************/ authpartner "simrs-vx/internal/interface/main-handler/auth-partner" @@ -300,6 +301,7 @@ func SetRoutes() http.Handler { }) hc.RegCrud(r, "/v1/chemo-protocol", chemoprotocol.O) hc.RegCrud(r, "/v1/upload-file", uploadfile.O) + hc.RegCrud(r, "/v1/vaccine-data", vaccineData.O) hc.RegCrud(r, "/v1/encounter-document", encounterdocument.O) hc.RegCrud(r, "/v1/general-consent", generalconsent.O) r.HandleFunc("POST /v1/generate-file", generatefile.Generate) diff --git a/internal/interface/main-handler/vaccine-data/handler.go b/internal/interface/main-handler/vaccine-data/handler.go new file mode 100644 index 00000000..1aa163ba --- /dev/null +++ b/internal/interface/main-handler/vaccine-data/handler.go @@ -0,0 +1,72 @@ +package vaccinedata + +import ( + "net/http" + + rw "github.com/karincake/risoles" + sf "github.com/karincake/semprit" + + // ua "github.com/karincake/tumpeng/auth/svc" + + e "simrs-vx/internal/domain/main-entities/vaccine-data" + u "simrs-vx/internal/use-case/main-use-case/vaccine-data" +) + +type myBase struct{} + +var O myBase + +func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { + dto := e.CreateDto{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + res, err := u.Create(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) { + dto := e.ReadListDto{} + sf.UrlQueryParam(&dto, *r.URL) + res, err := u.ReadList(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + dto := e.ReadDetailDto{} + sf.UrlQueryParam(&dto, *r.URL) + dto.Id = uint16(id) + res, err := u.ReadDetail(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + + dto := e.UpdateDto{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + dto.Id = uint(id) + res, err := u.Update(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) { + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + + dto := e.DeleteDto{} + dto.Id = uint(id) + res, err := u.Delete(dto) + rw.DataResponse(w, res, err) +} diff --git a/internal/interface/migration/main-entities.go b/internal/interface/migration/main-entities.go index bed0c18c..16128e5a 100644 --- a/internal/interface/migration/main-entities.go +++ b/internal/interface/migration/main-entities.go @@ -99,6 +99,7 @@ import ( uom "simrs-vx/internal/domain/main-entities/uom" user "simrs-vx/internal/domain/main-entities/user" userfes "simrs-vx/internal/domain/main-entities/user-fes" + vaccinedata "simrs-vx/internal/domain/main-entities/vaccine-data" vehicle "simrs-vx/internal/domain/main-entities/vehicle" vehiclehist "simrs-vx/internal/domain/main-entities/vehicle-hist" village "simrs-vx/internal/domain/main-entities/village" @@ -214,6 +215,7 @@ func getMainEntities() []any { &vclaimmember.VclaimMember{}, &controlletter.ControlLetter{}, &rehab.Rehab{}, + &vaccinedata.VaccineData{}, &chemoprotocol.ChemoProtocol{}, &fileattachemnt.EncounterDocument{}, &vclaimsepcontrolletter.VclaimSepControlLetter{}, diff --git a/internal/use-case/main-use-case/vaccine-data/case.go b/internal/use-case/main-use-case/vaccine-data/case.go new file mode 100644 index 00000000..dbe76f96 --- /dev/null +++ b/internal/use-case/main-use-case/vaccine-data/case.go @@ -0,0 +1,303 @@ +package vaccinedata + +import ( + "errors" + "strconv" + + e "simrs-vx/internal/domain/main-entities/vaccine-data" + ue "simrs-vx/internal/use-case/main-use-case/encounter" + + dg "github.com/karincake/apem/db-gorm-pg" + d "github.com/karincake/dodol" + + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + + "gorm.io/gorm" +) + +const source = "vaccine-data" + +func Create(input e.CreateDto) (*d.Data, error) { + data := e.VaccineData{} + + event := pl.Event{ + Feature: "Create", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "create") + + err := dg.I.Transaction(func(tx *gorm.DB) error { + mwRunner := newMiddlewareRunner(&event, tx) + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunCreateMiddleware(createPreMw, &input, &data); err != nil { + return err + } + + if pu.IsDateBeforeNow(input.Vaccination_datetime) { + return errors.New("vaccination date is in the past") + } + if pu.IsDateBeforeNow(input.Vaccine_expiration_date) { + return errors.New("vaccine expiration date is in the past") + } + + // check if encounter is done + if ue.IsDone(*input.Encounter_Id, &event, tx) { + return errors.New("encounter is already done") + } + + if resData, err := CreateData(input, &event, tx); err != nil { + return err + } else { + data = *resData + } + + mwRunner.setMwType(pu.MWTPost) + // Run post-middleware + if err := mwRunner.RunCreateMiddleware(createPostMw, &input, &data); err != nil { + return err + } + + pl.SetLogInfo(&event, nil, "complete") + + return nil + }) + + if err != nil { + return nil, err + } + + return &d.Data{ + Meta: d.II{ + "source": source, + "structure": "single-data", + "status": "created", + }, + Data: data.ToResponse(), + }, nil +} + +func ReadList(input e.ReadListDto) (*d.Data, error) { + var data *e.VaccineData + var dataList []e.VaccineData + var metaList *e.MetaDto + var err error + + event := pl.Event{ + Feature: "ReadList", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "readList") + + err = dg.I.Transaction(func(tx *gorm.DB) error { + mwRunner := newMiddlewareRunner(&event, tx) + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunReadListMiddleware(readListPreMw, &input, data); err != nil { + return err + } + + if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { + return err + } + + mwRunner.setMwType(pu.MWTPost) + // Run post-middleware + if err := mwRunner.RunReadListMiddleware(readListPostMw, &input, data); err != nil { + return err + } + + return nil + }) + + if err != nil { + return nil, err + } + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), + }, + Data: e.ToResponseList(dataList), + }, nil +} + +func ReadDetail(input e.ReadDetailDto) (*d.Data, error) { + var data *e.VaccineData + var err error + + event := pl.Event{ + Feature: "ReadDetail", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "readDetail") + + err = dg.I.Transaction(func(tx *gorm.DB) error { + mwRunner := newMiddlewareRunner(&event, tx) + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunReadDetailMiddleware(readDetailPreMw, &input, data); err != nil { + return err + } + + if data, err = ReadDetailData(input, &event, tx); err != nil { + return err + } + + mwRunner.setMwType(pu.MWTPost) + // Run post-middleware + if err := mwRunner.RunReadDetailMiddleware(readDetailPostMw, &input, data); err != nil { + return err + } + + return nil + }) + + if err != nil { + return nil, err + } + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "single-data", + "status": "fetched", + }, + Data: data.ToResponse(), + }, nil +} + +func Update(input e.UpdateDto) (*d.Data, error) { + rdDto := e.ReadDetailDto{Id: uint16(input.Id)} + var data *e.VaccineData + var err error + + event := pl.Event{ + Feature: "Update", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "update") + + err = dg.I.Transaction(func(tx *gorm.DB) error { + pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail") + if data, err = ReadDetailData(rdDto, &event, tx); err != nil { + return err + } + + mwRunner := newMiddlewareRunner(&event, tx) + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunUpdateMiddleware(readDetailPreMw, &rdDto, data); err != nil { + return err + } + + if pu.IsDateBeforeNow(input.Vaccination_datetime) { + return errors.New("vaccination date is in the past") + } + if pu.IsDateBeforeNow(input.Vaccine_expiration_date) { + return errors.New("vaccine expiration date is in the past") + } + + // check if encounter is done + if ue.IsDone(*input.Encounter_Id, &event, tx) { + return errors.New("encounter is already done") + } + + if err := UpdateData(input, data, &event, tx); err != nil { + return err + } + + pl.SetLogInfo(&event, nil, "complete") + + mwRunner.setMwType(pu.MWTPost) + // Run post-middleware + if err := mwRunner.RunUpdateMiddleware(readDetailPostMw, &rdDto, data); err != nil { + return err + } + + return nil + }) + + if err != nil { + return nil, err + } + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "single-data", + "status": "updated", + }, + Data: data.ToResponse(), + }, nil + +} + +func Delete(input e.DeleteDto) (*d.Data, error) { + rdDto := e.ReadDetailDto{Id: uint16(input.Id)} + var data *e.VaccineData + var err error + + event := pl.Event{ + Feature: "Delete", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "delete") + + err = dg.I.Transaction(func(tx *gorm.DB) error { + pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail") + if data, err = ReadDetailData(rdDto, &event, tx); err != nil { + return err + } + + mwRunner := newMiddlewareRunner(&event, tx) + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunDeleteMiddleware(readDetailPreMw, &rdDto, data); err != nil { + return err + } + + if err := DeleteData(data, &event, tx); err != nil { + return err + } + + mwRunner.setMwType(pu.MWTPost) + // Run post-middleware + if err := mwRunner.RunDeleteMiddleware(readDetailPostMw, &rdDto, data); err != nil { + return err + } + + return nil + }) + + if err != nil { + return nil, err + } + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "single-data", + "status": "deleted", + }, + Data: data.ToResponse(), + }, nil + +} diff --git a/internal/use-case/main-use-case/vaccine-data/helper.go b/internal/use-case/main-use-case/vaccine-data/helper.go new file mode 100644 index 00000000..a2b423ec --- /dev/null +++ b/internal/use-case/main-use-case/vaccine-data/helper.go @@ -0,0 +1,28 @@ +/* +DESCRIPTION: +Any functions that are used internally by the use-case +*/ +package vaccinedata + +import ( + e "simrs-vx/internal/domain/main-entities/vaccine-data" +) + +func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.VaccineData) { + var inputSrc *e.CreateDto + if inputT, ok := any(input).(*e.CreateDto); ok { + inputSrc = inputT + } else { + inputTemp := any(input).(*e.UpdateDto) + inputSrc = &inputTemp.CreateDto + } + + data.Encounter_Id = inputSrc.Encounter_Id + data.Vaccine_type_Code = inputSrc.Vaccine_type_Code + data.Vaccine_batch_number = inputSrc.Vaccine_batch_number + data.Vaccine_dose = inputSrc.Vaccine_dose + data.Dose_order = inputSrc.Dose_order + data.Injection_location = inputSrc.Injection_location + data.Vaccination_datetime = inputSrc.Vaccination_datetime + data.Vaccine_expiration_date = inputSrc.Vaccine_expiration_date +} diff --git a/internal/use-case/main-use-case/vaccine-data/lib.go b/internal/use-case/main-use-case/vaccine-data/lib.go new file mode 100644 index 00000000..e9d0a5e2 --- /dev/null +++ b/internal/use-case/main-use-case/vaccine-data/lib.go @@ -0,0 +1,144 @@ +package vaccinedata + +import ( + e "simrs-vx/internal/domain/main-entities/vaccine-data" + + plh "simrs-vx/pkg/lib-helper" + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + + dg "github.com/karincake/apem/db-gorm-pg" + gh "github.com/karincake/getuk" + "gorm.io/gorm" +) + +func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.VaccineData, error) { + pl.SetLogInfo(event, nil, "started", "DBCreate") + + data := e.VaccineData{} + setData(&input, &data) + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if err := tx.Create(&data).Error; err != nil { + return nil, plh.HandleCreateError(input, event, err) + } + + pl.SetLogInfo(event, nil, "complete") + return &data, nil +} + +func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.VaccineData, *e.MetaDto, error) { + pl.SetLogInfo(event, input, "started", "DBReadList") + data := []e.VaccineData{} + pagination := gh.Pagination{} + count := int64(0) + meta := e.MetaDto{} + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + tx = tx. + Model(&e.VaccineData{}). + Scopes(gh.Preload(input.Includes)). + Scopes(gh.Filter(input.FilterDto)). + Count(&count). + Scopes(gh.Paginate(input, &pagination)). + Order("\"CreatedAt\" DESC") + + if err := tx.Find(&data).Error; err != nil { + if err == gorm.ErrRecordNotFound { + return nil, &meta, nil + } + return nil, nil, plh.HandleListError(input, event, err) + } + + meta.Count = int(count) + meta.PageNumber = pagination.PageNumber + meta.PageSize = pagination.PageSize + + pl.SetLogInfo(event, nil, "complete") + return data, &meta, nil +} + +func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.VaccineData, error) { + pl.SetLogInfo(event, input, "started", "DBReadDetail") + data := e.VaccineData{} + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if input.Includes != "" { + tx = tx.Scopes(gh.Preload(input.Includes)) + } + + if err := tx.First(&data, input.Id).Error; err != nil { + if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil { + return nil, processedErr + } + } + + pl.SetLogInfo(event, nil, "complete") + return &data, nil +} + +func UpdateData(input e.UpdateDto, data *e.VaccineData, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, data, "started", "DBUpdate") + setData(&input, data) + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if err := tx.Save(&data).Error; err != nil { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-update-fail", + Detail: "Database update failed", + Raw: err, + } + return pl.SetLogError(event, input) + } + + pl.SetLogInfo(event, nil, "complete") + return nil +} + +func DeleteData(data *e.VaccineData, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, data, "started", "DBDelete") + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if err := tx.Delete(&data).Error; err != nil { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-delete-fail", + Detail: "Database delete failed", + Raw: err, + } + return pl.SetLogError(event, data) + } + + pl.SetLogInfo(event, nil, "complete") + return nil +} diff --git a/internal/use-case/main-use-case/vaccine-data/middleware-runner.go b/internal/use-case/main-use-case/vaccine-data/middleware-runner.go new file mode 100644 index 00000000..985cb6d9 --- /dev/null +++ b/internal/use-case/main-use-case/vaccine-data/middleware-runner.go @@ -0,0 +1,103 @@ +package vaccinedata + +import ( + e "simrs-vx/internal/domain/main-entities/vaccine-data" + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + + "gorm.io/gorm" +) + +type middlewareRunner struct { + Event *pl.Event + Tx *gorm.DB + MwType pu.MWType +} + +// NewMiddlewareExecutor creates a new middleware executor +func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner { + return &middlewareRunner{ + Event: event, + Tx: tx, + } +} + +// ExecuteCreateMiddleware executes create middleware +func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.VaccineData) error { + for _, middleware := range middlewares { + logData := pu.GetLogData(input, data) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input, data, me.Tx); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + +func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.VaccineData) error { + for _, middleware := range middlewares { + logData := pu.GetLogData(input, data) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input, data, me.Tx); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + +func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.VaccineData) error { + for _, middleware := range middlewares { + logData := pu.GetLogData(input, data) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input, data, me.Tx); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + +func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.VaccineData) error { + for _, middleware := range middlewares { + logData := pu.GetLogData(input, data) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input, data, me.Tx); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + +func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.VaccineData) error { + for _, middleware := range middlewares { + logData := pu.GetLogData(input, data) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input, data, me.Tx); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + +func (me *middlewareRunner) setMwType(mwType pu.MWType) { + me.MwType = mwType +} diff --git a/internal/use-case/main-use-case/vaccine-data/middleware.go b/internal/use-case/main-use-case/vaccine-data/middleware.go new file mode 100644 index 00000000..02c0cda6 --- /dev/null +++ b/internal/use-case/main-use-case/vaccine-data/middleware.go @@ -0,0 +1,9 @@ +package vaccinedata + +// example of middleware +// func init() { +// createPreMw = append(createPreMw, +// CreateMw{Name: "modif-input", Func: pm.ModifInput}, +// CreateMw{Name: "check-data", Func: pm.CheckData}, +// ) +// } diff --git a/internal/use-case/main-use-case/vaccine-data/tycovar.go b/internal/use-case/main-use-case/vaccine-data/tycovar.go new file mode 100644 index 00000000..d32700e1 --- /dev/null +++ b/internal/use-case/main-use-case/vaccine-data/tycovar.go @@ -0,0 +1,44 @@ +/* +DESCRIPTION: +A sample, part of the package that contains type, constants, and/or variables. + +In this sample it also provides type and variable regarding the needs of the +middleware to separate from main use-case which has the basic CRUD +functionality. The purpose of this is to make the code more maintainable. +*/ +package vaccinedata + +import ( + "gorm.io/gorm" + + e "simrs-vx/internal/domain/main-entities/vaccine-data" +) + +type createMw struct { + Name string + Func func(input *e.CreateDto, data *e.VaccineData, tx *gorm.DB) error +} + +type readListMw struct { + Name string + Func func(input *e.ReadListDto, data *e.VaccineData, tx *gorm.DB) error +} + +type readDetailMw struct { + Name string + Func func(input *e.ReadDetailDto, data *e.VaccineData, tx *gorm.DB) error +} + +type UpdateMw = readDetailMw +type DeleteMw = readDetailMw + +var createPreMw []createMw // preprocess middleware +var createPostMw []createMw // postprocess middleware +var readListPreMw []readListMw // .. +var readListPostMw []readListMw // .. +var readDetailPreMw []readDetailMw +var readDetailPostMw []readDetailMw +var updatePreMw []readDetailMw +var updatePostMw []readDetailMw +var deletePreMw []readDetailMw +var deletePostMw []readDetailMw From 5e80b49bc51c884d52ec12bfd5100f96fbf0bb11 Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Tue, 16 Dec 2025 14:53:50 +0700 Subject: [PATCH 3/3] feat (vaccine-data): add migration and fix entity --- .../migrations/20251216074834.sql | 17 +++++ cmd/main-migration/migrations/atlas.sum | 3 +- .../domain/main-entities/encounter/dto.go | 3 + .../domain/main-entities/encounter/entity.go | 2 + .../domain/main-entities/vaccine-data/dto.go | 71 +++++++++---------- .../main-entities/vaccine-data/entity.go | 22 +++--- .../domain/references/clinical/clinical.go | 16 +++++ .../main-use-case/vaccine-data/case.go | 12 ++-- .../main-use-case/vaccine-data/helper.go | 14 ++-- 9 files changed, 97 insertions(+), 63 deletions(-) create mode 100644 cmd/main-migration/migrations/20251216074834.sql diff --git a/cmd/main-migration/migrations/20251216074834.sql b/cmd/main-migration/migrations/20251216074834.sql new file mode 100644 index 00000000..e0c30316 --- /dev/null +++ b/cmd/main-migration/migrations/20251216074834.sql @@ -0,0 +1,17 @@ +-- Create "VaccineData" table +CREATE TABLE "public"."VaccineData" ( + "Id" bigserial NOT NULL, + "CreatedAt" timestamptz NULL, + "UpdatedAt" timestamptz NULL, + "DeletedAt" timestamptz NULL, + "Type" character varying(25) NULL, + "Encounter_Id" bigint NULL, + "BatchNumber" text NULL, + "Dose" numeric NULL, + "DoseOrder" bigint NULL, + "InjectionLocation" text NULL, + "GivenDate" timestamptz NULL, + "ExpirationDate" timestamptz NULL, + PRIMARY KEY ("Id"), + CONSTRAINT "fk_Encounter_Vaccines" FOREIGN KEY ("Encounter_Id") REFERENCES "public"."Encounter" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION +); diff --git a/cmd/main-migration/migrations/atlas.sum b/cmd/main-migration/migrations/atlas.sum index 77699682..4b0c4948 100644 --- a/cmd/main-migration/migrations/atlas.sum +++ b/cmd/main-migration/migrations/atlas.sum @@ -1,4 +1,4 @@ -h1:bNByj2VsHOaJEMfbX3xRNdLNTeYIVgInihZwRFfBUpc= +h1:hG7tbR8A3hp2zgbUt9pwONdJrHiSfrgcVBWoRB8Cx9k= 20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k= 20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0= 20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI= @@ -163,3 +163,4 @@ h1:bNByj2VsHOaJEMfbX3xRNdLNTeYIVgInihZwRFfBUpc= 20251210145148.sql h1:rejGrnTpaygxPv06v0vxMytF4rk1OJBXaw3ttSmidgc= 20251211101547.sql h1:+jT5yRCEsSRExzoawrqymS/I7lVfwUQQSgSzbxCxgRk= 20251211113942.sql h1:hRwiVZnXGzgUbqOk5TZ6ZHzGs1GebIFeIKkJNb+6+f0= +20251216074834.sql h1:OJkATzCGB8NQlhaNblRMRhBLuT5XV1YSUWhtYjJzxl0= diff --git a/internal/domain/main-entities/encounter/dto.go b/internal/domain/main-entities/encounter/dto.go index b6072a68..583a1efc 100644 --- a/internal/domain/main-entities/encounter/dto.go +++ b/internal/domain/main-entities/encounter/dto.go @@ -30,6 +30,7 @@ import ( er "simrs-vx/internal/domain/main-entities/rehab/base" es "simrs-vx/internal/domain/main-entities/specialist" ess "simrs-vx/internal/domain/main-entities/subspecialist" + evd "simrs-vx/internal/domain/main-entities/vaccine-data" ) type CreateDto struct { @@ -234,6 +235,7 @@ type ResponseDto struct { EncounterDocuments *[]eed.EncounterDocument `json:"encounterDocuments,omitempty"` Responsible_Nurse_Code *string `json:"responsible_nurse_code"` Responsible_Nurse *en.Nurse `json:"responsible_nurse,omitempty"` + Vaccines *evd.VaccineData `json:"vaccines,omitempty"` } func (d Encounter) ToResponse() ResponseDto { @@ -281,6 +283,7 @@ func (d Encounter) ToResponse() ResponseDto { EncounterDocuments: d.EncounterDocuments, Responsible_Nurse_Code: d.Responsible_Nurse_Code, Responsible_Nurse: d.Responsible_Nurse, + Vaccines: d.Vaccines, } resp.Main = d.Main return resp diff --git a/internal/domain/main-entities/encounter/entity.go b/internal/domain/main-entities/encounter/entity.go index 6bdcfa0c..48f3184e 100644 --- a/internal/domain/main-entities/encounter/entity.go +++ b/internal/domain/main-entities/encounter/entity.go @@ -25,6 +25,7 @@ import ( er "simrs-vx/internal/domain/main-entities/rehab/base" es "simrs-vx/internal/domain/main-entities/specialist" ess "simrs-vx/internal/domain/main-entities/subspecialist" + evd "simrs-vx/internal/domain/main-entities/vaccine-data" ) type Encounter struct { @@ -77,6 +78,7 @@ type Encounter struct { VclaimReference *evr.VclaimReference `json:"vclaimReference,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"` Responsible_Nurse_Code *string `json:"responsible_nurse_code"` Responsible_Nurse *en.Nurse `json:"responsible_nurse,omitempty" gorm:"foreignKey:Responsible_Nurse_Code;references:Code"` + Vaccines *evd.VaccineData `json:"vaccines,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"` } func (d Encounter) IsDone() bool { diff --git a/internal/domain/main-entities/vaccine-data/dto.go b/internal/domain/main-entities/vaccine-data/dto.go index 38222604..0cf427b6 100644 --- a/internal/domain/main-entities/vaccine-data/dto.go +++ b/internal/domain/main-entities/vaccine-data/dto.go @@ -5,24 +5,22 @@ import ( "time" // internal - lib + erc "simrs-vx/internal/domain/references/clinical" // internal - domain - base-entities ecore "simrs-vx/internal/domain/base-entities/core" - // internal - domain - main-entities - - ee "simrs-vx/internal/domain/main-entities/encounter" ) type CreateDto struct { - Vaccine_type_Code *string `json:"vaccine_type_code"` - Encounter_Id *uint `json:"encounter_id"` - Vaccine_batch_number *uint `json:"vaccine_batch_number"` - Vaccine_dose *uint `json:"vaccine_dose"` - Dose_order *uint `json:"dose_order"` - Injection_location *string `json:"injection_location"` - Vaccination_datetime *time.Time `json:"vaccination_datetime"` - Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` + Type *erc.VaccineTypeCode `json:"type"` + Encounter_Id *uint `json:"encounter_id"` + BatchNumber *string `json:"batchNumber"` + Dose *float64 `json:"dose"` + DoseOrder *uint `json:"doseOrder"` + InjectionLocation *string `json:"injectionLocation"` + GivenDate *time.Time `json:"givenDate"` + ExpirationDate *time.Time `json:"expirationDate"` } type ReadListDto struct { @@ -32,15 +30,14 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter-id"` - Date *time.Time `json:"date"` - Vaccine_type_Code *string `json:"vaccine-type-code"` - Vaccine_batch_number *uint `json:"vaccine_batch_number"` - Vaccine_dose *uint `json:"vaccine_dose"` - Dose_order *uint `json:"dose_order"` - Injection_location *string `json:"injection_location"` - Vaccination_datetime *time.Time `json:"vaccination_datetime"` - Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` + Type *erc.VaccineTypeCode `json:"type"` + Encounter_Id *uint `json:"encounter_id"` + BatchNumber *string `json:"batchNumber"` + Dose *float64 `json:"dose"` + DoseOrder *uint `json:"doseOrder"` + InjectionLocation *string `json:"injectionLocation"` + GivenDate *time.Time `json:"givenDate"` + ExpirationDate *time.Time `json:"expirationDate"` } type ReadDetailDto struct { @@ -65,28 +62,26 @@ type MetaDto struct { type ResponseDto struct { ecore.Main - Vaccine_type_Code *string `json:"vaccine_type_code"` - Encounter_Id *uint `json:"encounter_id"` - Encounter *ee.Encounter `json:"encounter" gorm:"foreignKey:Encounter_Id;references:Id"` - Vaccine_batch_number *uint `json:"vaccine_batch_number"` - Vaccine_dose *uint `json:"vaccine_dose"` - Dose_order *uint `json:"dose_order"` - Injection_location *string `json:"injection_location"` - Vaccination_datetime *time.Time `json:"vaccination_datetime"` - Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` + Type *erc.VaccineTypeCode `json:"type"` + Encounter_Id *uint `json:"encounter_id"` + BatchNumber *string `json:"batchNumber"` + Dose *float64 `json:"dose"` + DoseOrder *uint `json:"doseOrder"` + InjectionLocation *string `json:"injectionLocation"` + GivenDate *time.Time `json:"givenDate"` + ExpirationDate *time.Time `json:"expirationDate"` } func (d VaccineData) ToResponse() ResponseDto { resp := ResponseDto{ - Encounter_Id: d.Encounter_Id, - Encounter: d.Encounter, - Vaccine_type_Code: d.Vaccine_type_Code, - Vaccine_batch_number: d.Vaccine_batch_number, - Vaccine_dose: d.Vaccine_dose, - Dose_order: d.Dose_order, - Injection_location: d.Injection_location, - Vaccination_datetime: d.Vaccination_datetime, - Vaccine_expiration_date: d.Vaccine_expiration_date, + Type: d.Type, + Encounter_Id: d.Encounter_Id, + BatchNumber: d.BatchNumber, + Dose: d.Dose, + DoseOrder: d.DoseOrder, + InjectionLocation: d.InjectionLocation, + GivenDate: d.GivenDate, + ExpirationDate: d.ExpirationDate, } resp.Main = d.Main return resp diff --git a/internal/domain/main-entities/vaccine-data/entity.go b/internal/domain/main-entities/vaccine-data/entity.go index 7eb4a023..88841582 100644 --- a/internal/domain/main-entities/vaccine-data/entity.go +++ b/internal/domain/main-entities/vaccine-data/entity.go @@ -4,18 +4,18 @@ import ( "time" ecore "simrs-vx/internal/domain/base-entities/core" - ee "simrs-vx/internal/domain/main-entities/encounter" + + erc "simrs-vx/internal/domain/references/clinical" ) type VaccineData struct { - ecore.Main // adjust this according to the needs - Vaccine_type_Code *string `json:"vaccine_type_code"` - Encounter_Id *uint `json:"encounter_id"` - Encounter *ee.Encounter `json:"encounter" gorm:"foreignKey:Encounter_Id;references:Id"` - Vaccine_batch_number *uint `json:"vaccine_batch_number"` - Vaccine_dose *uint `json:"vaccine_dose"` - Dose_order *uint `json:"dose_order"` - Injection_location *string `json:"injection_location"` - Vaccination_datetime *time.Time `json:"vaccination_datetime"` - Vaccine_expiration_date *time.Time `json:"vaccine_expiration_date"` + ecore.Main // adjust this according to the needs + Type *erc.VaccineTypeCode `json:"type" gorm:"size:25"` + Encounter_Id *uint `json:"encounter_id"` + BatchNumber *string `json:"batchNumber"` + Dose *float64 `json:"dose"` + DoseOrder *uint `json:"doseOrder"` + InjectionLocation *string `json:"injectionLocation"` + GivenDate *time.Time `json:"givenDate"` + ExpirationDate *time.Time `json:"expirationDate"` } diff --git a/internal/domain/references/clinical/clinical.go b/internal/domain/references/clinical/clinical.go index fc538677..dbbbf576 100644 --- a/internal/domain/references/clinical/clinical.go +++ b/internal/domain/references/clinical/clinical.go @@ -32,6 +32,7 @@ type ( BornLocationCode string SpecimentDestCode string ProcedureReportType string + VaccineTypeCode string ) const ( @@ -243,6 +244,21 @@ const ( PRTProcedure ProcedureReportType = "procedure" PRTSurgery ProcedureReportType = "surgery" + + VaccineBCG VaccineTypeCode = "BCG" // BCG + VaccineIPV VaccineTypeCode = "IPV" // IPV + VaccineTD VaccineTypeCode = "TD" // TD + VaccinePCVPneumoni VaccineTypeCode = "PCVPneumoni" // PCV pneumoni + VaccineRotavirus VaccineTypeCode = "ROTAVIRUS" // ROTAVIRUS + VaccineDT VaccineTypeCode = "DT" // DT + VaccineTT VaccineTypeCode = "TT" // TT + VaccineMRCampak VaccineTypeCode = "MRCampak" // MR / Campak + VaccineHB VaccineTypeCode = "HB" // HB + VaccineHIV VaccineTypeCode = "HIV" // HIV + VaccineDPT VaccineTypeCode = "DPT" // DPT + VaccineInfluenzaBType VaccineTypeCode = "INFLUENZABType" // INFLUENSA tipe B + VaccinePolioOPV VaccineTypeCode = "PolioOPV" // Polio OPV + VaccinePolioDrops VaccineTypeCode = "PolioDrops" // Polio Tetes ) type Soapi struct { diff --git a/internal/use-case/main-use-case/vaccine-data/case.go b/internal/use-case/main-use-case/vaccine-data/case.go index dbe76f96..e78b3d5a 100644 --- a/internal/use-case/main-use-case/vaccine-data/case.go +++ b/internal/use-case/main-use-case/vaccine-data/case.go @@ -37,11 +37,11 @@ func Create(input e.CreateDto) (*d.Data, error) { return err } - if pu.IsDateBeforeNow(input.Vaccination_datetime) { - return errors.New("vaccination date is in the past") + if pu.IsDateBeforeNow(input.GivenDate) { + return errors.New("given date is in the past") } - if pu.IsDateBeforeNow(input.Vaccine_expiration_date) { - return errors.New("vaccine expiration date is in the past") + if pu.IsDateBeforeNow(input.ExpirationDate) { + return errors.New("expiration date is in the past") } // check if encounter is done @@ -206,10 +206,10 @@ func Update(input e.UpdateDto) (*d.Data, error) { return err } - if pu.IsDateBeforeNow(input.Vaccination_datetime) { + if pu.IsDateBeforeNow(input.GivenDate) { return errors.New("vaccination date is in the past") } - if pu.IsDateBeforeNow(input.Vaccine_expiration_date) { + if pu.IsDateBeforeNow(input.ExpirationDate) { return errors.New("vaccine expiration date is in the past") } diff --git a/internal/use-case/main-use-case/vaccine-data/helper.go b/internal/use-case/main-use-case/vaccine-data/helper.go index a2b423ec..bdf43468 100644 --- a/internal/use-case/main-use-case/vaccine-data/helper.go +++ b/internal/use-case/main-use-case/vaccine-data/helper.go @@ -17,12 +17,12 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.VaccineData) { inputSrc = &inputTemp.CreateDto } + data.Type = inputSrc.Type data.Encounter_Id = inputSrc.Encounter_Id - data.Vaccine_type_Code = inputSrc.Vaccine_type_Code - data.Vaccine_batch_number = inputSrc.Vaccine_batch_number - data.Vaccine_dose = inputSrc.Vaccine_dose - data.Dose_order = inputSrc.Dose_order - data.Injection_location = inputSrc.Injection_location - data.Vaccination_datetime = inputSrc.Vaccination_datetime - data.Vaccine_expiration_date = inputSrc.Vaccine_expiration_date + data.BatchNumber = inputSrc.BatchNumber + data.Dose = inputSrc.Dose + data.DoseOrder = inputSrc.DoseOrder + data.InjectionLocation = inputSrc.InjectionLocation + data.GivenDate = inputSrc.GivenDate + data.ExpirationDate = inputSrc.ExpirationDate }