munawwirul_jamal/simrsx-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #153 from dikstub-rssa/feat/improve-uploads-154

Browse Source 
Feat/improve uploads 154
This commit is contained in:
Dwi Atmoko Purbo Sakti
2025-11-14 12:11:16 +07:00
committed by GitHub
parent 37e03c72d2 c80633240c
commit 86ff6bd2ee
8 changed files with 131 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/domain/references/upload/upload.go
+11 -8
View File
@@ -8,13 +8,16 @@ type (
)
const (
UCPRN UploadCode = "person-resident-number" // Person Resident Number
UCPDL UploadCode = "person-driver-license" // Person Driver License
UCPP UploadCode = "person-passport" // Person Passport
UCPFC UploadCode = "person-family-card" // Person Family Card
UCMIR UploadCode = "mcu-item-result" // Mcu Item Result
UCSEP UploadCode = "vclaim-sep" // SEP
UCSIPP UploadCode = "vclaim-sipp" // SIPP
UCPRN UploadCode = "person-resident-number" // Person Resident Number
UCPDL UploadCode = "person-driver-license" // Person Driver License
UCPP UploadCode = "person-passport" // Person Passport
UCPFC UploadCode = "person-family-card" // Person Family Card
UCMIR UploadCode = "mcu-item-result" // Mcu Item Result
UCEnPatient UploadCode = "encounter-patient"
UCEnSupport UploadCode = "encounter-support"
UcEnOther UploadCode = "encounter-other"
UCSEP UploadCode = "vclaim-sep" // SEP
UCSIPP UploadCode = "vclaim-sipp" // SIPP
ETCPerson EntityTypeCode = "person"
ETCEncounter EntityTypeCode = "encounter"
@@ -26,7 +29,7 @@ var validUploadCodesByEntity = map[EntityTypeCode][]UploadCode{
UCPRN, UCPDL, UCPP, UCPFC,
},
ETCEncounter: {
UCSEP, UCSIPP,
UCSEP, UCSIPP, UCEnPatient, UCEnSupport, UcEnOther,
},
ETCMCU: {
UCMIR,
internal/interface/main-handler/encounter-document/handler.go
+80
View File
@@ -0,0 +1,80 @@
package encounter_document
import (
"net/http"
d "github.com/karincake/dodol"
rw "github.com/karincake/risoles"
sf "github.com/karincake/semprit"
e "simrs-vx/internal/domain/main-entities/encounter-document"
u "simrs-vx/internal/use-case/main-use-case/encounter-document"
)
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)
if dto.Encounter_Id == nil {
rw.DataResponse(w, nil, d.FieldError{
Code: "data-validation-fail",
Message: "filter encounter-id required",
})
return
}
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 = uint16(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 = uint16(id)
res, err := u.Delete(dto)
rw.DataResponse(w, res, err)
}
internal/interface/main-handler/main-handler.go
+2 -1
View File
@@ -16,6 +16,7 @@ import (
deviceorder "simrs-vx/internal/interface/main-handler/device-order"
deviceorderitem "simrs-vx/internal/interface/main-handler/device-order-item"
encounter "simrs-vx/internal/interface/main-handler/encounter"
encounterdocument "simrs-vx/internal/interface/main-handler/encounter-document"
internalreference "simrs-vx/internal/interface/main-handler/internal-reference"
materialorder "simrs-vx/internal/interface/main-handler/material-order"
materialorderitem "simrs-vx/internal/interface/main-handler/material-order-item"
@@ -36,7 +37,6 @@ import (
upload "simrs-vx/internal/interface/main-handler/upload"
/******************** actor ********************/
authpartner "simrs-vx/internal/interface/main-handler/auth-partner"
doctor "simrs-vx/internal/interface/main-handler/doctor"
employee "simrs-vx/internal/interface/main-handler/employee"
@@ -275,6 +275,7 @@ func SetRoutes() http.Handler {
hc.RegCrud(r, "/v1/therapy-protocol", therapyprotocol.O)
hc.RegCrud(r, "/v1/chemo-protocol", chemoprotocol.O)
hc.RegCrud(r, "/v1/upload", upload.O)
hc.RegCrud(r, "/v1/encounter-document", encounterdocument.O)
/******************** actor ********************/
hc.RegCrud(r, "/v1/person", person.O)
internal/interface/main-handler/upload/handler.go
+3 -3
View File
@@ -4,13 +4,12 @@ import (
"net/http"
"strconv"
eru "simrs-vx/internal/domain/references/upload"
d "github.com/karincake/dodol"
rw "github.com/karincake/risoles"
e "simrs-vx/internal/domain/main-entities/upload"
eru "simrs-vx/internal/domain/references/upload"
e "simrs-vx/internal/domain/main-entities/upload"
u "simrs-vx/internal/use-case/main-use-case/upload"
)
@@ -86,4 +85,5 @@ func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
}
func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
}
internal/interface/simgos-sync-handler/installation/handler.go
+8 -11
View File
@@ -2,7 +2,6 @@ package installation
import (
"net/http"
"strconv"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
@@ -35,8 +34,8 @@ func (obj myBase) CreateLog(w http.ResponseWriter, r *http.Request) {
}
func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
id := rw.ValidateString(w, "id", r.PathValue("id"))
if id == "" {
id := rw.ValidateInt(w, "id", r.PathValue("id"))
if id <= 0 {
return
}
@@ -45,24 +44,22 @@ func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
return
}
val, _ := strconv.ParseUint(id, 10, 16)
valUint := uint16(val)
dto.Id = &valUint
val := uint16(id)
dto.Id = &val
res, err := u.Update(dto)
rw.DataResponse(w, res, err)
}
func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
id := rw.ValidateString(w, "id", r.PathValue("id"))
if id == "" {
id := rw.ValidateInt(w, "id", r.PathValue("id"))
if id <= 0 {
return
}
dto := e.DeleteDto{}
val, _ := strconv.ParseUint(id, 10, 16)
valUint := uint16(val)
dto.Id = &valUint
val := uint16(id)
dto.Id = &val
res, err := u.Delete(dto)
rw.DataResponse(w, res, err)
internal/interface/simgos-sync-handler/simgos-sync-handler.go
+2 -1
View File
@@ -34,7 +34,8 @@ func SetRoutes() http.Handler {
r.HandleFunc("/", home.Home)
/******************** Source ******************/
hk.GroupRoutes("/new-to-old/v1/installation", r, hk.MapHandlerFunc{
prefix := "/new-to-old"
hk.GroupRoutes(prefix+"/v1/installation", r, hk.MapHandlerFunc{
"POST /": installation.O.Create,
"POST /log": installation.O.CreateLog,
"PATCH /{id}": installation.O.Update,
internal/use-case/main-use-case/encounter-document/case.go
-13
View File
@@ -244,13 +244,6 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
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 := removeUploadedFile(string(eru.ETCEncounter), *data.FilePath, &event); err != nil {
return err
}
@@ -259,12 +252,6 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
return err
}
mwRunner.setMwType(pu.MWTPost)
// Run post-middleware
if err := mwRunner.RunDeleteMiddleware(readDetailPostMw, &rdDto, data); err != nil {
return err
}
return nil
})
internal/use-case/main-use-case/upload/helper.go
+25 -19
View File
@@ -164,29 +164,35 @@ func setEncounterDocument(input e.CreateDto, event *pl.Event, tx *gorm.DB) (*ee.
Upload_Employee_Id: input.Upload_Employee_Id,
}
if len(dataUpload) > 0 {
if err := removeUploadedFile(string(input.EntityType_Code), *dataUpload[0].FilePath, *dataUpload[0].Encounter_Id, event); err != nil {
return nil, err
}
if input.Type_Code == eru.UCSEP || input.Type_Code == eru.UCSIPP {
if len(dataUpload) > 0 {
data = dataUpload[0]
// update data
err = ue.UpdateData(ee.UpdateDto{
Id: uint16(dataUpload[0].Id),
CreateDto: createDto}, &dataUpload[0], event, tx)
if err != nil {
return nil, err
}
// remove file
if err := removeUploadedFile(string(input.EntityType_Code), *data.FilePath, *data.Encounter_Id, event); err != nil {
return nil, err
}
data = dataUpload[0]
data.FilePath = &input.FilePath
} else {
// insert data
resData, err := ue.CreateData(createDto, event, tx)
if err != nil {
return nil, err
// update data
err = ue.UpdateData(ee.UpdateDto{
Id: uint16(data.Id),
CreateDto: createDto}, &data, event, tx)
if err != nil {
return nil, err
}
data.FilePath = &input.FilePath
return &data, nil
}
data = *resData
}
// insert data
resData, err := ue.CreateData(createDto, event, tx)
if err != nil {
return nil, err
}
data = *resData
return &data, nil
}