This commit is contained in:
dpurbosakti
2025-10-10 14:26:15 +07:00
parent ace549b418
commit dc0b492951
12 changed files with 70 additions and 61 deletions
@@ -2,14 +2,19 @@ package personaddress
import (
ecore "simrs-vx/internal/domain/base-entities/core"
epr "simrs-vx/internal/domain/main-entities/postal-region"
erp "simrs-vx/internal/domain/references/person"
)
type CreateDto struct {
Person_Id uint `json:"person_id"`
Address string `json:"address" validate:"maxLength=150"`
Rt string `json:"rt" validate:"maxLength=2"`
Rw string `json:"rw" validate:"maxLength=2"`
Village_Code *string `json:"village_code" validate:"maxLength=10"`
Person_Id uint `json:"person_id"`
LocationType_Code erp.AddressLocationTypeCode `json:"locationType_code" validate:"maxLength=10"`
Address string `json:"address" validate:"maxLength=150"`
Rt string `json:"rt" validate:"maxLength=2"`
Rw string `json:"rw" validate:"maxLength=2"`
PostalRegion_Code *string `json:"postalRegion_code" validate:"maxLength=6"`
Village_Code *string `json:"village_code" validate:"maxLength=10"`
}
type ReadListDto struct {
@@ -38,22 +43,26 @@ type MetaDto struct {
type ResponseDto struct {
ecore.Main
Person_Id uint `json:"person_id"`
Address string `json:"address"`
Rt string `json:"rt"`
Rw string `json:"rw"`
Village_Code *string `json:"village_code"`
Person_Id uint `json:"person_id"`
LocationType_Code erp.AddressLocationTypeCode `json:"locationType_code"`
Address string `json:"address"`
Rt string `json:"rt"`
Rw string `json:"rw"`
PostalRegion_Code *string `json:"postalRegion_code"`
PostalRegion *epr.PostalRegion `json:"postalRegion,omitempty"`
Village_Code *string `json:"village_code"`
}
func (d PersonAddress) ToResponse() ResponseDto {
resp := ResponseDto{
Person_Id: d.Person_Id,
Address: d.Address,
Rt: d.Rt,
Rw: d.Rw,
Village_Code: d.Village_Code,
PostalCode_Code: d.PostalCode_Code,
PostalCode: d.PostalCode,
Person_Id: d.Person_Id,
LocationType_Code: d.LocationType_Code,
Address: d.Address,
Rt: d.Rt,
Rw: d.Rw,
Village_Code: d.Village_Code,
PostalRegion_Code: d.PostalRegion_Code,
PostalRegion: d.PostalRegion,
}
resp.Main = d.Main
return resp
@@ -7,5 +7,5 @@ type Basic struct {
}
func (Basic) TableName() string {
return "PostalCode"
return "PostalRegion"
}
@@ -87,7 +87,7 @@ import (
uom "simrs-vx/internal/interface/main-handler/uom"
district "simrs-vx/internal/interface/main-handler/district"
postalcode "simrs-vx/internal/interface/main-handler/postal-code"
postalregion "simrs-vx/internal/interface/main-handler/postal-region"
province "simrs-vx/internal/interface/main-handler/province"
regency "simrs-vx/internal/interface/main-handler/regency"
village "simrs-vx/internal/interface/main-handler/village"
@@ -293,7 +293,7 @@ func SetRoutes() http.Handler {
hc.RegCrud(r, "/v1/district", district.O)
hc.RegCrud(r, "/v1/regency", regency.O)
hc.RegCrud(r, "/v1/province", province.O)
hc.RegCrud(r, "/v1/postal-code", postalcode.O)
hc.RegCrud(r, "/v1/postal-code", postalregion.O)
/////
return cmw.SetCors(handlerlogger.SetLog(r))
@@ -1,4 +1,4 @@
package postalcode
package postalregion
import (
"net/http"
@@ -8,8 +8,8 @@ import (
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/postal-code"
u "simrs-vx/internal/use-case/main-use-case/postal-code"
e "simrs-vx/internal/domain/main-entities/postal-region"
u "simrs-vx/internal/use-case/main-use-case/postal-region"
)
type myBase struct{}
@@ -102,7 +102,7 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
Preload("Person.Contacts").
Preload("Person.Relatives.Village.District.Regency.Province").
Preload("Person.Addresses").
Preload("Person.Addresses.PostalCode.Village.District.Regency.Province")
Preload("Person.Addresses.PostalRegion.Village.District.Regency.Province")
if err := tx.First(&data, input.Id).Error; err != nil {
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
@@ -22,5 +22,5 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.PersonAddress) {
data.Rt = inputSrc.Rt
data.Rw = inputSrc.Rw
data.Village_Code = inputSrc.Village_Code
data.PostalCode_Code = inputSrc.PostalCode_Code
data.PostalRegion_Code = inputSrc.PostalRegion_Code
}
@@ -1,7 +1,7 @@
package postalcode
package postalregion
import (
e "simrs-vx/internal/domain/main-entities/postal-code"
e "simrs-vx/internal/domain/main-entities/postal-region"
"strconv"
dg "github.com/karincake/apem/db-gorm-pg"
@@ -13,10 +13,10 @@ import (
"gorm.io/gorm"
)
const source = "postal-code"
const source = "postal-region"
func Create(input e.CreateDto) (*d.Data, error) {
data := e.PostalCode{}
data := e.PostalRegion{}
event := pl.Event{
Feature: "Create",
@@ -66,8 +66,8 @@ func Create(input e.CreateDto) (*d.Data, error) {
}
func ReadList(input e.ReadListDto) (*d.Data, error) {
var data *e.PostalCode
var dataList []e.PostalCode
var data *e.PostalRegion
var dataList []e.PostalRegion
var metaList *e.MetaDto
var err error
@@ -122,7 +122,7 @@ func ReadList(input e.ReadListDto) (*d.Data, error) {
}
func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
var data *e.PostalCode
var data *e.PostalRegion
var err error
event := pl.Event{
@@ -170,7 +170,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
var data *e.PostalCode
var data *e.PostalRegion
var err error
event := pl.Event{
@@ -226,7 +226,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
var data *e.PostalCode
var data *e.PostalRegion
var err error
event := pl.Event{
@@ -2,13 +2,13 @@
DESCRIPTION:
Any functions that are used internally by the use-case
*/
package postalcode
package postalregion
import (
e "simrs-vx/internal/domain/main-entities/postal-code"
e "simrs-vx/internal/domain/main-entities/postal-region"
)
func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.PostalCode) {
func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.PostalRegion) {
var inputSrc *e.CreateDto
if inputT, ok := any(input).(*e.CreateDto); ok {
inputSrc = inputT
@@ -1,7 +1,7 @@
package postalcode
package postalregion
import (
e "simrs-vx/internal/domain/main-entities/postal-code"
e "simrs-vx/internal/domain/main-entities/postal-region"
plh "simrs-vx/pkg/lib-helper"
pl "simrs-vx/pkg/logger"
@@ -12,10 +12,10 @@ import (
"gorm.io/gorm"
)
func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.PostalCode, error) {
func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.PostalRegion, error) {
pl.SetLogInfo(event, nil, "started", "DBCreate")
data := e.PostalCode{}
data := e.PostalRegion{}
setData(&input, &data)
var tx *gorm.DB
@@ -33,9 +33,9 @@ func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.PostalC
return &data, nil
}
func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.PostalCode, *e.MetaDto, error) {
func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.PostalRegion, *e.MetaDto, error) {
pl.SetLogInfo(event, input, "started", "DBReadList")
data := []e.PostalCode{}
data := []e.PostalRegion{}
pagination := gh.Pagination{}
count := int64(0)
meta := e.MetaDto{}
@@ -54,7 +54,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Po
}
tx = tx.
Model(&e.PostalCode{}).
Model(&e.PostalRegion{}).
Scopes(gh.Filter(input.FilterDto)).
Count(&count).
Scopes(gh.Paginate(input, &pagination)).
@@ -81,9 +81,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Po
return data, &meta, nil
}
func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.PostalCode, error) {
func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.PostalRegion, error) {
pl.SetLogInfo(event, input, "started", "DBReadDetail")
data := e.PostalCode{}
data := e.PostalRegion{}
var tx *gorm.DB
if len(dbx) > 0 {
@@ -107,7 +107,7 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
return &data, nil
}
func UpdateData(input e.UpdateDto, data *e.PostalCode, event *pl.Event, dbx ...*gorm.DB) error {
func UpdateData(input e.UpdateDto, data *e.PostalRegion, event *pl.Event, dbx ...*gorm.DB) error {
pl.SetLogInfo(event, data, "started", "DBUpdate")
setData(&input, data)
@@ -132,7 +132,7 @@ func UpdateData(input e.UpdateDto, data *e.PostalCode, event *pl.Event, dbx ...*
return nil
}
func DeleteData(data *e.PostalCode, event *pl.Event, dbx ...*gorm.DB) error {
func DeleteData(data *e.PostalRegion, event *pl.Event, dbx ...*gorm.DB) error {
pl.SetLogInfo(event, data, "started", "DBDelete")
var tx *gorm.DB
if len(dbx) > 0 {
@@ -1,7 +1,7 @@
package postalcode
package postalregion
import (
e "simrs-vx/internal/domain/main-entities/postal-code"
e "simrs-vx/internal/domain/main-entities/postal-region"
pl "simrs-vx/pkg/logger"
pu "simrs-vx/pkg/use-case-helper"
@@ -23,7 +23,7 @@ func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner {
}
// ExecuteCreateMiddleware executes create middleware
func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.PostalCode) error {
func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.PostalRegion) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
@@ -38,7 +38,7 @@ func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e
return nil
}
func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.PostalCode) error {
func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.PostalRegion) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
@@ -53,7 +53,7 @@ func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, inpu
return nil
}
func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.PostalCode) error {
func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.PostalRegion) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
@@ -68,7 +68,7 @@ func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw,
return nil
}
func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.PostalCode) error {
func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.PostalRegion) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
@@ -83,7 +83,7 @@ func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, inpu
return nil
}
func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.PostalCode) error {
func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.PostalRegion) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
@@ -1,4 +1,4 @@
package postalcode
package postalregion
// example of middleware
// func init() {
@@ -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
functionality. The purpose of this is to make the code more maintainable.
*/
package postalcode
package postalregion
import (
"gorm.io/gorm"
e "simrs-vx/internal/domain/main-entities/postal-code"
e "simrs-vx/internal/domain/main-entities/postal-region"
)
type createMw struct {
Name string
Func func(input *e.CreateDto, data *e.PostalCode, tx *gorm.DB) error
Func func(input *e.CreateDto, data *e.PostalRegion, tx *gorm.DB) error
}
type readListMw struct {
Name string
Func func(input *e.ReadListDto, data *e.PostalCode, tx *gorm.DB) error
Func func(input *e.ReadListDto, data *e.PostalRegion, tx *gorm.DB) error
}
type readDetailMw struct {
Name string
Func func(input *e.ReadDetailDto, data *e.PostalCode, tx *gorm.DB) error
Func func(input *e.ReadDetailDto, data *e.PostalRegion, tx *gorm.DB) error
}
type UpdateMw = readDetailMw