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

feat/order-things: adjust package-room case

Browse Source
This commit is contained in:
munawwirul_jamal
2025-12-02 20:56:00 +07:00
parent 51e2527985
commit 118aa098ce
9 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/use-case/main-use-case/infra/case.go
+3 -3
View File
@@ -37,7 +37,7 @@ func Create(input e.CreateDto) (*d.Data, error) {
return err return err
} }
if input.InfraGroup_Code == ero.IFGCRoom { if input.InfraGroup_Code == ero.IFGCProcedureRoom {
if input.Parent_Code == nil { if input.Parent_Code == nil {
event.Status = "failed" event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{ event.ErrInfo = pl.ErrorInfo{
@@ -58,9 +58,9 @@ func Create(input e.CreateDto) (*d.Data, error) {
data = *resData data = *resData
} }
if input.InfraGroup_Code == ero.IFGCRoom { if input.InfraGroup_Code == ero.IFGCProcedureRoom {
input.Infra_Code = &data.Code input.Infra_Code = &data.Code
if err := createRoom(&input, &event, tx); err != nil { if err := createProcedureRoom(&input, &event, tx); err != nil {
return err return err
} }
} }
internal/use-case/main-use-case/infra/helper.go
+4 -3
View File
@@ -7,10 +7,10 @@ package infra
import ( import (
e "simrs-vx/internal/domain/main-entities/infra" e "simrs-vx/internal/domain/main-entities/infra"
ei "simrs-vx/internal/domain/main-entities/item" ei "simrs-vx/internal/domain/main-entities/item"
er "simrs-vx/internal/domain/main-entities/room" er "simrs-vx/internal/domain/main-entities/procedure-room"
ero "simrs-vx/internal/domain/references/organization" ero "simrs-vx/internal/domain/references/organization"
ui "simrs-vx/internal/use-case/main-use-case/item" ui "simrs-vx/internal/use-case/main-use-case/item"
ur "simrs-vx/internal/use-case/main-use-case/room" ur "simrs-vx/internal/use-case/main-use-case/procedure-room"
pl "simrs-vx/pkg/logger" pl "simrs-vx/pkg/logger"
pu "simrs-vx/pkg/use-case-helper" pu "simrs-vx/pkg/use-case-helper"
@@ -53,8 +53,9 @@ func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
return nil return nil
} }
func createRoom(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error { func createProcedureRoom(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
roomCreate := er.CreateDto{ roomCreate := er.CreateDto{
Code: input.Infra_Code,
Infra_Code: input.Infra_Code, Infra_Code: input.Infra_Code,
Unit_Code: input.Unit_Code, Unit_Code: input.Unit_Code,
Specialist_Code: input.Specialist_Code, Specialist_Code: input.Specialist_Code,
internal/use-case/main-use-case/infra/lib.go
+1 -1
View File
@@ -129,7 +129,7 @@ func UpdateData(input e.UpdateDto, data *e.Infra, event *pl.Event, dbx ...*gorm.
// data.Parent = nil // data.Parent = nil
data.Childrens = nil data.Childrens = nil
data.Item = nil data.Item = nil
data.Rooms = nil data.ProcedureRooms = nil
if err := tx.Save(&data).Error; err != nil { if err := tx.Save(&data).Error; err != nil {
event.Status = "failed" event.Status = "failed"
internal/use-case/main-use-case/room/case.go → internal/use-case/main-use-case/procedure-room/case.go
+8 -8
View File
@@ -1,7 +1,7 @@
package room package procedureroom
import ( import (
e "simrs-vx/internal/domain/main-entities/room" e "simrs-vx/internal/domain/main-entities/procedure-room"
"strconv" "strconv"
dg "github.com/karincake/apem/db-gorm-pg" dg "github.com/karincake/apem/db-gorm-pg"
@@ -16,7 +16,7 @@ import (
const source = "specialist" const source = "specialist"
func Create(input e.CreateDto) (*d.Data, error) { func Create(input e.CreateDto) (*d.Data, error) {
data := e.Room{} data := e.ProcedureRoom{}
event := pl.Event{ event := pl.Event{
Feature: "Create", Feature: "Create",
@@ -66,8 +66,8 @@ func Create(input e.CreateDto) (*d.Data, error) {
} }
func ReadList(input e.ReadListDto) (*d.Data, error) { func ReadList(input e.ReadListDto) (*d.Data, error) {
var data *e.Room var data *e.ProcedureRoom
var dataList []e.Room var dataList []e.ProcedureRoom
var metaList *e.MetaDto var metaList *e.MetaDto
var err error var err error
@@ -119,7 +119,7 @@ func ReadList(input e.ReadListDto) (*d.Data, error) {
} }
func ReadDetail(input e.ReadDetailDto) (*d.Data, error) { func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
var data *e.Room var data *e.ProcedureRoom
var err error var err error
event := pl.Event{ event := pl.Event{
@@ -167,7 +167,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
func Update(input e.UpdateDto) (*d.Data, error) { func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)} rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
var data *e.Room var data *e.ProcedureRoom
var err error var err error
event := pl.Event{ event := pl.Event{
@@ -223,7 +223,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
func Delete(input e.DeleteDto) (*d.Data, error) { func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)} rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
var data *e.Room var data *e.ProcedureRoom
var err error var err error
event := pl.Event{ event := pl.Event{
internal/use-case/main-use-case/room/helper.go → internal/use-case/main-use-case/procedure-room/helper.go
+4 -3
View File
@@ -2,13 +2,13 @@
DESCRIPTION: DESCRIPTION:
Any functions that are used internally by the use-case Any functions that are used internally by the use-case
*/ */
package room package procedureroom
import ( import (
e "simrs-vx/internal/domain/main-entities/room" e "simrs-vx/internal/domain/main-entities/procedure-room"
) )
func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Room) { func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.ProcedureRoom) {
var inputSrc *e.CreateDto var inputSrc *e.CreateDto
if inputT, ok := any(input).(*e.CreateDto); ok { if inputT, ok := any(input).(*e.CreateDto); ok {
inputSrc = inputT inputSrc = inputT
@@ -17,6 +17,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Room) {
inputSrc = &inputTemp.CreateDto inputSrc = &inputTemp.CreateDto
} }
data.Code = *inputSrc.Infra_Code
data.Infra_Code = inputSrc.Infra_Code data.Infra_Code = inputSrc.Infra_Code
data.Unit_Code = inputSrc.Unit_Code data.Unit_Code = inputSrc.Unit_Code
data.Specialist_Code = inputSrc.Specialist_Code data.Specialist_Code = inputSrc.Specialist_Code
internal/use-case/main-use-case/room/lib.go → internal/use-case/main-use-case/procedure-room/lib.go
+11 -11
View File
@@ -1,7 +1,7 @@
package room package procedureroom
import ( import (
e "simrs-vx/internal/domain/main-entities/room" e "simrs-vx/internal/domain/main-entities/procedure-room"
plh "simrs-vx/pkg/lib-helper" plh "simrs-vx/pkg/lib-helper"
pl "simrs-vx/pkg/logger" pl "simrs-vx/pkg/logger"
@@ -12,10 +12,10 @@ import (
"gorm.io/gorm" "gorm.io/gorm"
) )
func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.Room, error) { func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.ProcedureRoom, error) {
pl.SetLogInfo(event, nil, "started", "DBCreate") pl.SetLogInfo(event, nil, "started", "DBCreate")
data := e.Room{} data := e.ProcedureRoom{}
setData(&input, &data) setData(&input, &data)
var tx *gorm.DB var tx *gorm.DB
@@ -33,9 +33,9 @@ func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.Room, e
return &data, nil return &data, nil
} }
func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Room, *e.MetaDto, error) { func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.ProcedureRoom, *e.MetaDto, error) {
pl.SetLogInfo(event, input, "started", "DBReadList") pl.SetLogInfo(event, input, "started", "DBReadList")
data := []e.Room{} data := []e.ProcedureRoom{}
pagination := gh.Pagination{} pagination := gh.Pagination{}
count := int64(0) count := int64(0)
meta := e.MetaDto{} meta := e.MetaDto{}
@@ -48,7 +48,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ro
} }
tx = tx. tx = tx.
Model(&e.Room{}). Model(&e.ProcedureRoom{}).
Scopes(gh.Preload(input.Includes)). Scopes(gh.Preload(input.Includes)).
Scopes(gh.Filter(input.FilterDto)). Scopes(gh.Filter(input.FilterDto)).
Count(&count). Count(&count).
@@ -70,9 +70,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ro
return data, &meta, nil return data, &meta, nil
} }
func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.Room, error) { func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.ProcedureRoom, error) {
pl.SetLogInfo(event, input, "started", "DBReadDetail") pl.SetLogInfo(event, input, "started", "DBReadDetail")
data := e.Room{} data := e.ProcedureRoom{}
var tx *gorm.DB var tx *gorm.DB
if len(dbx) > 0 { if len(dbx) > 0 {
@@ -91,7 +91,7 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
return &data, nil return &data, nil
} }
func UpdateData(input e.UpdateDto, data *e.Room, event *pl.Event, dbx ...*gorm.DB) error { func UpdateData(input e.UpdateDto, data *e.ProcedureRoom, event *pl.Event, dbx ...*gorm.DB) error {
pl.SetLogInfo(event, data, "started", "DBUpdate") pl.SetLogInfo(event, data, "started", "DBUpdate")
setData(&input, data) setData(&input, data)
@@ -116,7 +116,7 @@ func UpdateData(input e.UpdateDto, data *e.Room, event *pl.Event, dbx ...*gorm.D
return nil return nil
} }
func DeleteData(data *e.Room, event *pl.Event, dbx ...*gorm.DB) error { func DeleteData(data *e.ProcedureRoom, event *pl.Event, dbx ...*gorm.DB) error {
pl.SetLogInfo(event, data, "started", "DBDelete") pl.SetLogInfo(event, data, "started", "DBDelete")
var tx *gorm.DB var tx *gorm.DB
if len(dbx) > 0 { if len(dbx) > 0 {
internal/use-case/main-use-case/room/middleware-runner.go → internal/use-case/main-use-case/procedure-room/middleware-runner.go
+7 -7
View File
@@ -1,7 +1,7 @@
package room package procedureroom
import ( import (
e "simrs-vx/internal/domain/main-entities/room" e "simrs-vx/internal/domain/main-entities/procedure-room"
pl "simrs-vx/pkg/logger" pl "simrs-vx/pkg/logger"
pu "simrs-vx/pkg/use-case-helper" pu "simrs-vx/pkg/use-case-helper"
@@ -23,7 +23,7 @@ func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner {
} }
// ExecuteCreateMiddleware executes create middleware // ExecuteCreateMiddleware executes create middleware
func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.Room) error { func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.ProcedureRoom) error {
for _, middleware := range middlewares { for _, middleware := range middlewares {
logData := pu.GetLogData(input, data) logData := pu.GetLogData(input, data)
@@ -38,7 +38,7 @@ func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e
return nil return nil
} }
func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.Room) error { func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.ProcedureRoom) error {
for _, middleware := range middlewares { for _, middleware := range middlewares {
logData := pu.GetLogData(input, data) logData := pu.GetLogData(input, data)
@@ -53,7 +53,7 @@ func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, inpu
return nil return nil
} }
func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Room) error { func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ProcedureRoom) error {
for _, middleware := range middlewares { for _, middleware := range middlewares {
logData := pu.GetLogData(input, data) logData := pu.GetLogData(input, data)
@@ -68,7 +68,7 @@ func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw,
return nil return nil
} }
func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Room) error { func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ProcedureRoom) error {
for _, middleware := range middlewares { for _, middleware := range middlewares {
logData := pu.GetLogData(input, data) logData := pu.GetLogData(input, data)
@@ -83,7 +83,7 @@ func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, inpu
return nil return nil
} }
func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Room) error { func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ProcedureRoom) error {
for _, middleware := range middlewares { for _, middleware := range middlewares {
logData := pu.GetLogData(input, data) logData := pu.GetLogData(input, data)
internal/use-case/main-use-case/room/middleware.go → internal/use-case/main-use-case/procedure-room/middleware.go
+1 -1
View File
@@ -1,4 +1,4 @@
package room package procedureroom
// example of middleware // example of middleware
// func init() { // func init() {
internal/use-case/main-use-case/room/tycovar.go → internal/use-case/main-use-case/procedure-room/tycovar.go
+5 -5
View File
@@ -6,27 +6,27 @@ 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 middleware to separate from main use-case which has the basic CRUD
functionality. The purpose of this is to make the code more maintainable. functionality. The purpose of this is to make the code more maintainable.
*/ */
package room package procedureroom
import ( import (
"gorm.io/gorm" "gorm.io/gorm"
e "simrs-vx/internal/domain/main-entities/room" e "simrs-vx/internal/domain/main-entities/procedure-room"
) )
type createMw struct { type createMw struct {
Name string Name string
Func func(input *e.CreateDto, data *e.Room, tx *gorm.DB) error Func func(input *e.CreateDto, data *e.ProcedureRoom, tx *gorm.DB) error
} }
type readListMw struct { type readListMw struct {
Name string Name string
Func func(input *e.ReadListDto, data *e.Room, tx *gorm.DB) error Func func(input *e.ReadListDto, data *e.ProcedureRoom, tx *gorm.DB) error
} }
type readDetailMw struct { type readDetailMw struct {
Name string Name string
Func func(input *e.ReadDetailDto, data *e.Room, tx *gorm.DB) error Func func(input *e.ReadDetailDto, data *e.ProcedureRoom, tx *gorm.DB) error
} }
type UpdateMw = readDetailMw type UpdateMw = readDetailMw