revise upload
This commit is contained in:
@@ -1,162 +0,0 @@
|
||||
package file_attachment
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
eru "simrs-vx/internal/domain/references/upload"
|
||||
"strconv"
|
||||
|
||||
d "github.com/karincake/dodol"
|
||||
rw "github.com/karincake/risoles"
|
||||
sf "github.com/karincake/semprit"
|
||||
|
||||
// ua "github.com/karincake/tumpeng/auth/svc"
|
||||
|
||||
e "simrs-vx/internal/domain/main-entities/file-attachment"
|
||||
u "simrs-vx/internal/use-case/main-use-case/file-attachement"
|
||||
)
|
||||
|
||||
type myBase struct{}
|
||||
|
||||
var O myBase
|
||||
|
||||
func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
|
||||
err := r.ParseMultipartForm(10 << 20) // 10 MB
|
||||
if err != nil {
|
||||
rw.DataResponse(w, nil, err)
|
||||
return
|
||||
}
|
||||
|
||||
file, header, err := r.FormFile("content")
|
||||
if err != nil {
|
||||
rw.DataResponse(w, nil, err)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
refIDStr := r.FormValue("ref_id")
|
||||
var refID *uint
|
||||
if refIDStr != "" {
|
||||
if id64, err := strconv.ParseUint(refIDStr, 10, 32); err == nil {
|
||||
id := uint(id64)
|
||||
refID = &id
|
||||
}
|
||||
}
|
||||
|
||||
employeeIdStr := r.FormValue("upload_employee_id")
|
||||
var employeeId *uint
|
||||
if employeeIdStr != "" {
|
||||
if id64, err := strconv.ParseUint(employeeIdStr, 10, 32); err == nil {
|
||||
id := uint(id64)
|
||||
employeeId = &id
|
||||
}
|
||||
}
|
||||
|
||||
dto := e.CreateDto{
|
||||
EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")),
|
||||
Ref_Id: refID,
|
||||
Type_Code: eru.UploadCode(r.FormValue("type_code")),
|
||||
Name: r.FormValue("name"),
|
||||
Upload_Employee_Id: employeeId,
|
||||
File: file,
|
||||
FileHeader: header,
|
||||
Filename: header.Filename,
|
||||
Size: header.Size,
|
||||
MimeType: header.Header.Get("Content-Type"),
|
||||
}
|
||||
|
||||
dataFail := validateCreate(dto)
|
||||
if dataFail != "" {
|
||||
rw.DataResponse(w, nil, d.FieldError{
|
||||
Code: "data-validation-fail",
|
||||
Message: dataFail,
|
||||
})
|
||||
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{}
|
||||
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
|
||||
}
|
||||
|
||||
err := r.ParseMultipartForm(10 << 20) // 10 MB
|
||||
if err != nil {
|
||||
rw.DataResponse(w, nil, err)
|
||||
return
|
||||
}
|
||||
|
||||
file, header, err := r.FormFile("content")
|
||||
if err != nil {
|
||||
rw.DataResponse(w, nil, err)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
refIDStr := r.FormValue("ref_id")
|
||||
var refID *uint
|
||||
if refIDStr != "" {
|
||||
if id64, err := strconv.ParseUint(refIDStr, 10, 32); err == nil {
|
||||
id := uint(id64)
|
||||
refID = &id
|
||||
}
|
||||
}
|
||||
|
||||
employeeIdStr := r.FormValue("upload_employee_id")
|
||||
var employeeId *uint
|
||||
if employeeIdStr != "" {
|
||||
if id64, err := strconv.ParseUint(employeeIdStr, 10, 32); err == nil {
|
||||
id := uint(id64)
|
||||
employeeId = &id
|
||||
}
|
||||
}
|
||||
|
||||
dto := e.CreateDto{
|
||||
EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")),
|
||||
Ref_Id: refID,
|
||||
Type_Code: eru.UploadCode(r.FormValue("type_code")),
|
||||
Name: r.FormValue("name"),
|
||||
Upload_Employee_Id: employeeId,
|
||||
File: file,
|
||||
FileHeader: header,
|
||||
Filename: header.Filename,
|
||||
Size: header.Size,
|
||||
MimeType: header.Header.Get("Content-Type"),
|
||||
}
|
||||
|
||||
res, err := u.Update(e.UpdateDto{Id: uint16(id), CreateDto: 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)
|
||||
}
|
||||
@@ -16,7 +16,6 @@ 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"
|
||||
fileattachment "simrs-vx/internal/interface/main-handler/file-attachment"
|
||||
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"
|
||||
@@ -34,6 +33,7 @@ import (
|
||||
responsibledoctorhist "simrs-vx/internal/interface/main-handler/responsible-doctor-hist"
|
||||
sbar "simrs-vx/internal/interface/main-handler/sbar"
|
||||
soapi "simrs-vx/internal/interface/main-handler/soapi"
|
||||
upload "simrs-vx/internal/interface/main-handler/upload"
|
||||
|
||||
/******************** actor ********************/
|
||||
|
||||
@@ -269,7 +269,7 @@ func SetRoutes() http.Handler {
|
||||
hc.RegCrud(r, "/v1/adm-employee-hist", admemployeehist.O)
|
||||
hc.RegCrud(r, "/v1/therapy-protocol", therapyprotocol.O)
|
||||
hc.RegCrud(r, "/v1/chemo-protocol", chemoprotocol.O)
|
||||
hc.RegCrud(r, "/v1/upload", fileattachment.O)
|
||||
hc.RegCrud(r, "/v1/upload", upload.O)
|
||||
|
||||
/******************** actor ********************/
|
||||
hc.RegCrud(r, "/v1/person", person.O)
|
||||
|
||||
@@ -1,56 +1,89 @@
|
||||
package upload
|
||||
|
||||
// "net/http"
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
// uh "simrs-vx/pkg/upload-helper"
|
||||
eru "simrs-vx/internal/domain/references/upload"
|
||||
|
||||
// uploadHandler handles single file upload requests
|
||||
// func uploadHandler(w http.ResponseWriter, r *http.Request) {
|
||||
d "github.com/karincake/dodol"
|
||||
rw "github.com/karincake/risoles"
|
||||
|
||||
// if r.Method == "OPTIONS" {
|
||||
// w.WriteHeader(http.StatusNoContent)
|
||||
// return
|
||||
// }
|
||||
e "simrs-vx/internal/domain/main-entities/upload"
|
||||
|
||||
// if r.Method != "POST" {
|
||||
// writeJSONResponse(w, http.StatusMethodNotAllowed, uh.UploadResponse{
|
||||
// Success: false,
|
||||
// Message: "Method not allowed. Use POST.",
|
||||
// })
|
||||
// return
|
||||
// }
|
||||
u "simrs-vx/internal/use-case/main-use-case/upload"
|
||||
)
|
||||
|
||||
// // Parse multipart form (32MB max memory)
|
||||
// err := r.ParseMultipartForm(32 << 20)
|
||||
// if err != nil {
|
||||
// writeJSONResponse(w, http.StatusBadRequest, uh.UploadResponse{
|
||||
// Success: false,
|
||||
// Message: "Failed to parse multipart form",
|
||||
// })
|
||||
// return
|
||||
// }
|
||||
type myBase struct{}
|
||||
|
||||
// // Get file from form
|
||||
// file, header, err := r.FormFile("file")
|
||||
// if err != nil {
|
||||
// writeJSONResponse(w, http.StatusBadRequest, uh.UploadResponse{
|
||||
// Success: false,
|
||||
// Message: "No file uploaded or invalid file field name. Use 'file' as field name.",
|
||||
// })
|
||||
// return
|
||||
// }
|
||||
// defer file.Close()
|
||||
var O myBase
|
||||
|
||||
// // Upload file
|
||||
// response, err := service.UploadFile(file, header.Filename, header.Size)
|
||||
// if err != nil {
|
||||
// writeJSONResponse(w, http.StatusInternalServerError, *response)
|
||||
// return
|
||||
// }
|
||||
func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
|
||||
err := r.ParseMultipartForm(10 << 20) // 10 MB
|
||||
if err != nil {
|
||||
rw.DataResponse(w, nil, err)
|
||||
return
|
||||
}
|
||||
|
||||
// if response.Success {
|
||||
// writeJSONResponse(w, http.StatusOK, *response)
|
||||
// } else {
|
||||
// writeJSONResponse(w, http.StatusBadRequest, *response)
|
||||
// }
|
||||
// }
|
||||
file, header, err := r.FormFile("content")
|
||||
if err != nil {
|
||||
rw.DataResponse(w, nil, err)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
refIDStr := r.FormValue("ref_id")
|
||||
var refID *uint
|
||||
if refIDStr != "" {
|
||||
if id64, err := strconv.ParseUint(refIDStr, 10, 32); err == nil {
|
||||
id := uint(id64)
|
||||
refID = &id
|
||||
}
|
||||
}
|
||||
|
||||
employeeIdStr := r.FormValue("upload_employee_id")
|
||||
var employeeId *uint
|
||||
if employeeIdStr != "" {
|
||||
if id64, err := strconv.ParseUint(employeeIdStr, 10, 32); err == nil {
|
||||
id := uint(id64)
|
||||
employeeId = &id
|
||||
}
|
||||
}
|
||||
|
||||
dto := e.CreateDto{
|
||||
EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")),
|
||||
Ref_Id: refID,
|
||||
Type_Code: eru.UploadCode(r.FormValue("type_code")),
|
||||
Name: r.FormValue("name"),
|
||||
Upload_Employee_Id: employeeId,
|
||||
File: file,
|
||||
FileHeader: header,
|
||||
Filename: header.Filename,
|
||||
Size: header.Size,
|
||||
MimeType: header.Header.Get("Content-Type"),
|
||||
}
|
||||
|
||||
dataFail := validateCreate(dto)
|
||||
if dataFail != "" {
|
||||
rw.DataResponse(w, nil, d.FieldError{
|
||||
Code: "data-validation-fail",
|
||||
Message: dataFail,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
res, err := u.Upload(dto)
|
||||
rw.DataResponse(w, res, err)
|
||||
}
|
||||
|
||||
func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package file_attachment
|
||||
package upload
|
||||
|
||||
import (
|
||||
e "simrs-vx/internal/domain/main-entities/file-attachment"
|
||||
e "simrs-vx/internal/domain/main-entities/upload"
|
||||
)
|
||||
|
||||
func validateCreate(dto e.CreateDto) string {
|
||||
Reference in New Issue
Block a user