Merge pull request #62 from dikstub-rssa/fix/anything-moko
Fix/anything moko
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
-- Create "PostalRegion" table
|
||||
CREATE TABLE "public"."PostalRegion" (
|
||||
"Id" bigserial NOT NULL,
|
||||
"Village_Code" character varying(10) NULL,
|
||||
"Code" character varying(5) NULL,
|
||||
PRIMARY KEY ("Id"),
|
||||
CONSTRAINT "uni_PostalRegion_Code" UNIQUE ("Code"),
|
||||
CONSTRAINT "fk_PostalRegion_Village" FOREIGN KEY ("Village_Code") REFERENCES "public"."Village" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION
|
||||
);
|
||||
-- Rename a column from "PostalCode_Code" to "PostalRegion_Code"
|
||||
ALTER TABLE "public"."PersonAddress" RENAME COLUMN "PostalCode_Code" TO "PostalRegion_Code";
|
||||
-- Modify "PersonAddress" table
|
||||
ALTER TABLE "public"."PersonAddress" DROP CONSTRAINT "fk_PersonAddress_PostalCode", ADD COLUMN "LocationType_Code" character varying(10) NULL, ADD CONSTRAINT "fk_PersonAddress_PostalRegion" FOREIGN KEY ("PostalRegion_Code") REFERENCES "public"."PostalRegion" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION;
|
||||
-- Drop "PostalCode" table
|
||||
DROP TABLE "public"."PostalCode";
|
||||
@@ -0,0 +1,2 @@
|
||||
-- Modify "PersonAddress" table
|
||||
ALTER TABLE "public"."PersonAddress" ADD CONSTRAINT "fk_PersonAddress_Village" FOREIGN KEY ("Village_Code") REFERENCES "public"."Village" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION;
|
||||
@@ -1,4 +1,4 @@
|
||||
h1:tvJWAAI1ENRhCwoYTUekIO7b9RxtkQllUFwCYQ/S17w=
|
||||
h1:ZNIY96E0dkcsqT7l3071AqNKR/aee/WJFYKwNWcL+pw=
|
||||
20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k=
|
||||
20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0=
|
||||
20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI=
|
||||
@@ -34,4 +34,6 @@ h1:tvJWAAI1ENRhCwoYTUekIO7b9RxtkQllUFwCYQ/S17w=
|
||||
20251008073620.sql h1:6YsJp1W4SmQJ1lxpqF27BBlDC1zqhw7Yhc7pLzQTY6M=
|
||||
20251009042854.sql h1:nkBV+R6j0fg7/JY6wH3eb5Vv0asJLnXmb6lINfT/GLQ=
|
||||
20251009052657.sql h1:EPvdsib5rzCGPryd10HShGKvFPwM/R5S2lIVwtYxpms=
|
||||
20251010031743.sql h1:XGl/0//kV22jCXS+k+qZASm/zN6uapZjOCPBAGg7+yo=
|
||||
20251010031743.sql h1:T8IZmx8/btRFKLzTe78MzcBsPJNodnLvB0tby9QkirQ=
|
||||
20251010070721.sql h1:5NQUk/yOV6sABLCB7swx++YIOyJe6MnU+yt1nRzde5w=
|
||||
20251010072711.sql h1:0xPdW7LNs9vb0g6H4rkNlF4yjjP4rIT6a5rZnDxWBxM=
|
||||
|
||||
@@ -12,7 +12,7 @@ type DivisionPosition struct {
|
||||
Division *ed.Division `json:"division" gorm:"foreignKey:Division_Id"`
|
||||
Code string `json:"code" gorm:"unique;size:10"`
|
||||
Name string `json:"name" gorm:"size:50"`
|
||||
HeadStatus bool `json:"head_status"`
|
||||
HeadStatus bool `json:"headStatus"`
|
||||
Employee_Id *uint `json:"employee_id"`
|
||||
Employee *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
|
||||
}
|
||||
|
||||
@@ -2,16 +2,20 @@ package personaddress
|
||||
|
||||
import (
|
||||
ecore "simrs-vx/internal/domain/base-entities/core"
|
||||
epc "simrs-vx/internal/domain/main-entities/postal-code"
|
||||
epr "simrs-vx/internal/domain/main-entities/postal-region"
|
||||
ev "simrs-vx/internal/domain/main-entities/village"
|
||||
|
||||
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"`
|
||||
PostalCode_Code string `json:"postalCode_code" validate:"maxLength=6"`
|
||||
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 {
|
||||
@@ -40,24 +44,28 @@ 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"`
|
||||
PostalCode_Code string `json:"postalCode_code"`
|
||||
PostalCode *epc.PostalCode `json:"postalCode,omitempty"`
|
||||
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"`
|
||||
Village *ev.Village `json:"village,omitempty"`
|
||||
}
|
||||
|
||||
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,
|
||||
PostalRegion_Code: d.PostalRegion_Code,
|
||||
PostalRegion: d.PostalRegion,
|
||||
Village_Code: d.Village_Code,
|
||||
Village: d.Village,
|
||||
}
|
||||
resp.Main = d.Main
|
||||
return resp
|
||||
|
||||
@@ -2,16 +2,21 @@ package personaddress
|
||||
|
||||
import (
|
||||
ecore "simrs-vx/internal/domain/base-entities/core"
|
||||
epc "simrs-vx/internal/domain/main-entities/postal-code"
|
||||
epr "simrs-vx/internal/domain/main-entities/postal-region"
|
||||
ev "simrs-vx/internal/domain/main-entities/village"
|
||||
|
||||
erp "simrs-vx/internal/domain/references/person"
|
||||
)
|
||||
|
||||
type PersonAddress struct {
|
||||
ecore.Main // adjust this according to the needs
|
||||
Person_Id uint `json:"person_id"`
|
||||
Address string `json:"address" gorm:"size:150"`
|
||||
Rt string `json:"rt" gorm:"size:2"`
|
||||
Rw string `json:"rw" gorm:"size:2"`
|
||||
PostalCode_Code string `json:"postalCode_code" gorm:"size:6"`
|
||||
PostalCode *epc.PostalCode `json:"postalCode,omitempty" gorm:"foreignKey:PostalCode_Code;references:Code"`
|
||||
Village_Code string `json:"village_code" gorm:"size:10"`
|
||||
ecore.Main // adjust this according to the needs
|
||||
Person_Id uint `json:"person_id"`
|
||||
Address string `json:"address" gorm:"size:150"`
|
||||
LocationType_Code erp.AddressLocationTypeCode `json:"locationType_code" gorm:"size:10"`
|
||||
Rt string `json:"rt" gorm:"size:2"`
|
||||
Rw string `json:"rw" gorm:"size:2"`
|
||||
PostalRegion_Code *string `json:"postalRegion_code" gorm:"size:6"`
|
||||
PostalRegion *epr.PostalRegion `json:"postalRegion,omitempty" gorm:"foreignKey:PostalRegion_Code;references:Code"`
|
||||
Village_Code *string `json:"village_code" gorm:"size:10"`
|
||||
Village *ev.Village `json:"village,omitempty" gorm:"foreignKey:Village_Code;references:Code"`
|
||||
}
|
||||
|
||||
+1
-1
@@ -7,5 +7,5 @@ type Basic struct {
|
||||
}
|
||||
|
||||
func (Basic) TableName() string {
|
||||
return "PostalCode"
|
||||
return "PostalRegion"
|
||||
}
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package postalcode
|
||||
package postalregion
|
||||
|
||||
import (
|
||||
ecore "simrs-vx/internal/domain/base-entities/core"
|
||||
@@ -51,7 +51,7 @@ type ResponseDto struct {
|
||||
Code string `json:"code"`
|
||||
}
|
||||
|
||||
func (d PostalCode) ToResponse() ResponseDto {
|
||||
func (d PostalRegion) ToResponse() ResponseDto {
|
||||
resp := ResponseDto{
|
||||
Id: d.Id,
|
||||
Village_Code: d.Village_Code,
|
||||
@@ -61,7 +61,7 @@ func (d PostalCode) ToResponse() ResponseDto {
|
||||
return resp
|
||||
}
|
||||
|
||||
func ToResponseList(data []PostalCode) []ResponseDto {
|
||||
func ToResponseList(data []PostalRegion) []ResponseDto {
|
||||
resp := make([]ResponseDto, len(data))
|
||||
for i, u := range data {
|
||||
resp[i] = u.ToResponse()
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package postalcode
|
||||
package postalregion
|
||||
|
||||
import (
|
||||
ep "simrs-vx/internal/domain/main-entities/postal-code/base"
|
||||
ep "simrs-vx/internal/domain/main-entities/postal-region/base"
|
||||
ev "simrs-vx/internal/domain/main-entities/village"
|
||||
)
|
||||
|
||||
type PostalCode struct {
|
||||
type PostalRegion struct {
|
||||
ep.Basic
|
||||
Village *ev.Village `json:"village,omitempty" gorm:"foreignKey:Village_Code;references:Code"`
|
||||
}
|
||||
@@ -3,7 +3,7 @@ package village
|
||||
import (
|
||||
ecore "simrs-vx/internal/domain/base-entities/core"
|
||||
ed "simrs-vx/internal/domain/main-entities/district"
|
||||
epb "simrs-vx/internal/domain/main-entities/postal-code/base"
|
||||
epb "simrs-vx/internal/domain/main-entities/postal-region/base"
|
||||
evb "simrs-vx/internal/domain/main-entities/village/base"
|
||||
)
|
||||
|
||||
@@ -50,15 +50,15 @@ type MetaDto struct {
|
||||
|
||||
type ResponseDto struct {
|
||||
evb.Basic
|
||||
District *ed.District `json:"district,omitempty"`
|
||||
PostalCodes []epb.Basic `json:"postalCodes,omitempty"`
|
||||
District *ed.District `json:"district,omitempty"`
|
||||
PostalRegions []epb.Basic `json:"postalRegions,omitempty"`
|
||||
}
|
||||
|
||||
func (d Village) ToResponse() ResponseDto {
|
||||
resp := ResponseDto{
|
||||
Basic: d.Basic,
|
||||
District: d.District,
|
||||
PostalCodes: d.PostalCodes,
|
||||
Basic: d.Basic,
|
||||
District: d.District,
|
||||
PostalRegions: d.PostalRegions,
|
||||
}
|
||||
return resp
|
||||
}
|
||||
|
||||
@@ -2,12 +2,12 @@ package village
|
||||
|
||||
import (
|
||||
ed "simrs-vx/internal/domain/main-entities/district"
|
||||
epb "simrs-vx/internal/domain/main-entities/postal-code/base"
|
||||
epb "simrs-vx/internal/domain/main-entities/postal-region/base"
|
||||
evb "simrs-vx/internal/domain/main-entities/village/base"
|
||||
)
|
||||
|
||||
type Village struct {
|
||||
evb.Basic
|
||||
District *ed.District `json:"district,omitempty" gorm:"foreignKey:District_Code;references:Code"`
|
||||
PostalCodes []epb.Basic `json:"postalCodes,omitempty" gorm:"foreignKey:Village_Code;references:Code"`
|
||||
District *ed.District `json:"district,omitempty" gorm:"foreignKey:District_Code;references:Code"`
|
||||
PostalRegions []epb.Basic `json:"postalRegions,omitempty" gorm:"foreignKey:Village_Code;references:Code"`
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ type (
|
||||
RelativeCode string
|
||||
ContactTypeCode string
|
||||
RelationshipCode string
|
||||
AddressLocationTypeCode string
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -109,6 +110,9 @@ const (
|
||||
RCNephew RelationshipCode = "nephew" // Keponakan
|
||||
RCGdChild RelationshipCode = "gd-child" // Cucu
|
||||
RCOther RelationshipCode = "other" // Lainnya
|
||||
|
||||
ALTCIdn AddressLocationTypeCode = "identity" // Sesuai Identitas
|
||||
ALTCDom AddressLocationTypeCode = "domicile" // Sesuai Domisili
|
||||
)
|
||||
|
||||
// func GetGenderCodes() map[GenderCode]string {
|
||||
|
||||
@@ -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-region", postalregion.O)
|
||||
|
||||
/////
|
||||
return cmw.SetCors(handlerlogger.SetLog(r))
|
||||
|
||||
+3
-3
@@ -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{}
|
||||
@@ -57,7 +57,7 @@ import (
|
||||
personrelative "simrs-vx/internal/domain/main-entities/person-relative"
|
||||
pharmacist "simrs-vx/internal/domain/main-entities/pharmacist"
|
||||
pharmacycompany "simrs-vx/internal/domain/main-entities/pharmacy-company"
|
||||
postalcode "simrs-vx/internal/domain/main-entities/postal-code"
|
||||
postalregion "simrs-vx/internal/domain/main-entities/postal-region"
|
||||
practiceschedule "simrs-vx/internal/domain/main-entities/practice-schedule"
|
||||
prescription "simrs-vx/internal/domain/main-entities/prescription"
|
||||
prescriptionitem "simrs-vx/internal/domain/main-entities/prescription-item"
|
||||
@@ -150,6 +150,6 @@ func getMainEntities() []any {
|
||||
&consultation.Consultation{},
|
||||
&chemo.Chemo{},
|
||||
&midwife.Midwife{},
|
||||
&postalcode.PostalCode{},
|
||||
&postalregion.PostalRegion{},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -101,8 +101,8 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
|
||||
Preload("Person.Language").
|
||||
Preload("Person.Contacts").
|
||||
Preload("Person.Relatives.Village.District.Regency.Province").
|
||||
Preload("Person.Addresses").
|
||||
Preload("Person.Addresses.PostalCode.Village.District.Regency.Province")
|
||||
Preload("Person.Addresses.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 {
|
||||
|
||||
@@ -18,9 +18,10 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.PersonAddress) {
|
||||
}
|
||||
|
||||
data.Person_Id = inputSrc.Person_Id
|
||||
data.LocationType_Code = inputSrc.LocationType_Code
|
||||
data.Address = inputSrc.Address
|
||||
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
|
||||
}
|
||||
|
||||
+9
-9
@@ -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{
|
||||
+3
-3
@@ -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
|
||||
+11
-11
@@ -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 {
|
||||
+7
-7
@@ -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
-1
@@ -1,4 +1,4 @@
|
||||
package postalcode
|
||||
package postalregion
|
||||
|
||||
// example of middleware
|
||||
// func init() {
|
||||
+5
-5
@@ -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
|
||||
Reference in New Issue
Block a user