From f64b8e2c6e8f450324f64408df1b28fb9e809d79 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 10 Oct 2025 10:58:23 +0700 Subject: [PATCH 1/6] migration from server --- cmd/main-migration/migrations/atlas.sum | 74 ++++++++++++------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/cmd/main-migration/migrations/atlas.sum b/cmd/main-migration/migrations/atlas.sum index fed6c077..741f4b48 100644 --- a/cmd/main-migration/migrations/atlas.sum +++ b/cmd/main-migration/migrations/atlas.sum @@ -1,37 +1,37 @@ -h1:tvJWAAI1ENRhCwoYTUekIO7b9RxtkQllUFwCYQ/S17w= -20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k= -20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0= -20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI= -20250908062323.sql h1:oXl6Z143tOpIl4EfP4B8JNU8LrMvVmHEtCgAfiB4gs8= -20250908073811.sql h1:m2aNXfnGxnLq1+rVWrh4f60q7fhyhV3gEwNu/OIqQlE= -20250908073839.sql h1:cPk54xjLdMs26uY8ZHjNWLuyfAMzV7Zb0/9oJQrsw04= -20250910055902.sql h1:5xwjAV6QbtZT9empTJKfhyAjdknbHzb15B0Ku5dzqtQ= -20250915123412.sql h1:D83xaU2YlDEd21HLup/YQpQ2easMToYCyy/oK6AFgQs= -20250916043819.sql h1:ekoTJsBqQZ8G8n0qJ03d13+eoNoc7sAUEQGA5D/CCxk= -20250917040616.sql h1:zoCnmcXuM7AVv85SmN7RmFglCgJnoDmpRWExH0LAc9Q= -20250917040751.sql h1:J1xyRrh32y1+lezwAyNwPcUQ6ABBSgbvzNLva4SVdQU= -20250917045138.sql h1:jKe1Z0uOLG4SGBYM+S/3P+/zMPztmgoderD5swnMuCg= -20250917093645.sql h1:cNI3Pbz1R3LxvIXLuexafJFCXUXrmuFCgXXJ2sG+FW0= -20250918073552.sql h1:RJ1SvMzP6aeWnoPVD3eVAmIQOkcp6Php8z3QRri6v4g= -20250918073742.sql h1:+cEsnJTJFybe2fR69ZoOiX2R6c6iITl4m6WTZ1hjyzY= -20250918074745.sql h1:2hNVQCXF/dVYXAh+T/7oBFgERGWxzVb2FXJjwkFWGCI= -20250923025134.sql h1:Ykz/qpHiGDXPsCsWTjydQFVSibZP2D+h2fIeb2h2JGA= -20250924051317.sql h1:yQuW6SwJxIOM5fcxeAaie5lSm1oLysU/C2hH2xNCVoQ= -20250929034321.sql h1:101FJ8VH12mrZWlt/X1gvKUGOhoiF8tFbjiapAjnHzg= -20250929034428.sql h1:i+pROD9p+g5dOmmZma6WF/0Hw5g3Ha28NN85iTo1K34= -20250930025550.sql h1:+F+CsCUXD/ql0tHGEow70GhPBX1ZybVn+bh/T4YMh7Y= -20250930140351.sql h1:9AAEG1AnOAH+o0+oHL5G7I8vqlWOhwRlCGyyCpT/y1Q= -20251002085604.sql h1:3xZ68eYp4urXRnvotNH1XvG2mYOSDV/j3zHEZ/txg5E= -20251003032030.sql h1:HB+mQ2lXMNomHDpaRhB/9IwYI9/YiDO5eOJ+nAQH/jw= -20251005060450.sql h1:LbtCE2b+8osM3CvnmQJH1uCPtn+d7WchsslBOz8bL3Q= -20251006041122.sql h1:MlS7f21z06sutnf9dIekt5fuHJr4lgcQ4uCuCXAGsfc= -20251006045658.sql h1:3FmGCPCzjgMPdWDRodZTsx3KVaodd9zB9ilib69aewk= -20251006045928.sql h1:Z5g31PmnzNwk/OKdODcxZGm8fjJQdMFK32Xfnt3bRHg= -20251007022859.sql h1:FO03zEfaNEk/aXwY81d5Lp3MoBB9kPQuXlXJ4BPiSR8= -20251008031337.sql h1:l+sxUAGvcTfj3I6kAFHo+T6AYodC9k9GkR+jaKO2xXc= -20251008031554.sql h1:AqrVfIhSzY3PCy8ZlP5W91wn2iznfIuj5qQfubp6/94= -20251008052346.sql h1:nxnXmooIJ6r1mmzwnw+6efxLfc/k9h2aE6RMptPRons= -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= +h1:xVhAIbHPOq5Fwkwi6TwtefKLWPqyyF3MQYD9VUB0gsM= +20250904105930.sql h1:Vv4vCurl7m7/ZB6TjRpkubHpQ4RYwSUn0QHdzfoGpzY= +20250904141448.sql h1:FYCHH9Os4KkrZMDu/jR8FMP+wLMRW+Mb0PkLU/9BRDg= +20250908062237.sql h1:oanBpKZd+akPu2I/xYhUSbd0G5tAFbXzKLER/Zs8ENI= +20250908062323.sql h1:miNG9COddXkD1jGTgaROMAZ618eT6oiLGiJhXWnQwhE= +20250908073811.sql h1:gOi5cnGG1htlpfizybYmUIT0vYjZTBfXiI0nPSYK2u8= +20250908073839.sql h1:cWNDA4YikjoOteAJuNLFILjQUJPFB6o8Wxreiek4QyI= +20250910055902.sql h1:nxxOGnU0BbH/v3IPgeIOXOwH8d3tKomw7h6FTeMnnBs= +20250915123412.sql h1:mz7SiWfrdf0qE1VTSAAnA/147d6gyp6ry5vZ2bR9SH0= +20250916043819.sql h1:RHXVtmMkB6wfv06HfPyHMBmUfIpFt1xveafNz0kwKnE= +20250917040616.sql h1:MYVDht+akBlzQGKNu2hTTTLPEcH1bxT/Q8MK6WEtuhs= +20250917040751.sql h1:J79YyS2JzWgh5oKXMTgh67uo3gLxKaAsxRiZmSIfjBs= +20250917045138.sql h1:/SM1N4O8X3yxpoJgMEARmS1uOkuLKsTOy4PLsRCOKaQ= +20250917093645.sql h1:PNBTGZ7s10e5b5+Tie8YfVQBN0zKtJ5T34oK1iOUEb4= +20250918073552.sql h1:jG7+g3i8ODYaJdcdZz12v3nbsZ5mB9wG6kWnGyTQIRI= +20250918073742.sql h1:j+rgw7puxE7s+phqPVZHmPk0af3rcaA56Itp86y1suY= +20250918074745.sql h1:rPmP4DXs6OnY4Vp+xO/z9jFpJt/RrJ52SJJjIIxeDvc= +20250923025134.sql h1:2r6pcwnBSU5Y9Czk1OHBoh4yZXiMtEca9X8843fTEX0= +20250924051317.sql h1:iUAk2gsGoEGIPQ0lEEUp8maMSId8emNbP+kP712ABIA= +20250929034321.sql h1:UlpALNVmdi95zOIT0yc6ZyTj9bBjQEIpZhvgrc52M+k= +20250929034428.sql h1:feF+H4nDyHh5bdx48Oiz0A1qecZfi6v3qTTdjzJ45Dg= +20250930025550.sql h1:6XT1kXI3Z3ZIxxmvT7poufZWWCW0QiejZPaFV5wBnjI= +20250930140351.sql h1:HxnmAbh9gCy8jwl/9ycGktiByaUripsjFFvohofY2CY= +20251002085604.sql h1:SjLPi+ZN6qDccK3DaEQCgNsZpPwr5kynWXwbwEsziCI= +20251003032030.sql h1:oHfxNSuqTxU8Zaf9H+h8TuUb1Da03wcyc6hZjDrUQ2s= +20251005060450.sql h1:GIuCcrd4MwjmXpvbzDzPYL18BV3QaZZ+Y2FmEzjvi0E= +20251006041122.sql h1:uNDQbSw0M08lYoMvUNlQtS3iDzpPM1ixT13ugSAoWjE= +20251006045658.sql h1:z+t7yCK54Q4SSiF9kUyUhkYB2F+kzSW9TB7ogxd9wzw= +20251006045928.sql h1:1lATLFLp4BWwGZqAjZdP0Dc6ypNXiYcwjoNkqGa8NFE= +20251007022859.sql h1:HXXwWrkyvzJzJGAt9mGskCRBBV/c1JfPmfjDocmJhQ4= +20251008031337.sql h1:Ln5pCF3Hxa5foHZLcds+z/us2eH6VAhhEj3w0TAGlVs= +20251008031554.sql h1:aB4MUS2lmqG0//4HKUWorcPSpWya0VC4QItvGyskEVI= +20251008052346.sql h1:MI3AZgU5XcwZT2OvvlWAxdRtL0eJ3jjRwt56IY1+pRU= +20251008073620.sql h1:sztWXuSNYwpEraaSapSsYwno75LO5H/N7ob7OJQ8X/A= +20251009042854.sql h1:TnPXj+dCJls3IU//cuqJZymyBzZMKs7ayazfgtAFRxM= +20251009052657.sql h1:leXbs0CP8r5dRilmYyLRk1MICqak3ea1/LWMtFrijqQ= +20251010031743.sql h1:SgHNY/lQ88G2F4nZyMfiOkDntb+gtOR+nEQLqXBTwv4= From 738ee5b5173507b345597b319eb0e2129597282a Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Fri, 10 Oct 2025 14:05:59 +0700 Subject: [PATCH 2/6] change from postatlcode into postalregion, add location type into person address --- .../main-entities/division-position/entity.go | 2 +- .../main-entities/person-address/entity.go | 21 +++++++++++-------- .../base/entity.go | 0 .../{postal-code => postal-region}/dto.go | 6 +++--- .../{postal-code => postal-region}/entity.go | 6 +++--- internal/domain/main-entities/village/dto.go | 12 +++++------ .../domain/main-entities/village/entity.go | 6 +++--- internal/domain/references/person/person.go | 4 ++++ internal/interface/migration/main-entities.go | 4 ++-- 9 files changed, 34 insertions(+), 27 deletions(-) rename internal/domain/main-entities/{postal-code => postal-region}/base/entity.go (100%) rename internal/domain/main-entities/{postal-code => postal-region}/dto.go (89%) rename internal/domain/main-entities/{postal-code => postal-region}/entity.go (60%) diff --git a/internal/domain/main-entities/division-position/entity.go b/internal/domain/main-entities/division-position/entity.go index 3d1d2eca..5bb3160a 100644 --- a/internal/domain/main-entities/division-position/entity.go +++ b/internal/domain/main-entities/division-position/entity.go @@ -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"` } diff --git a/internal/domain/main-entities/person-address/entity.go b/internal/domain/main-entities/person-address/entity.go index f3fc3bac..47c3d6e4 100644 --- a/internal/domain/main-entities/person-address/entity.go +++ b/internal/domain/main-entities/person-address/entity.go @@ -2,16 +2,19 @@ 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" + + 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"` } diff --git a/internal/domain/main-entities/postal-code/base/entity.go b/internal/domain/main-entities/postal-region/base/entity.go similarity index 100% rename from internal/domain/main-entities/postal-code/base/entity.go rename to internal/domain/main-entities/postal-region/base/entity.go diff --git a/internal/domain/main-entities/postal-code/dto.go b/internal/domain/main-entities/postal-region/dto.go similarity index 89% rename from internal/domain/main-entities/postal-code/dto.go rename to internal/domain/main-entities/postal-region/dto.go index cb1e3d39..cb113c35 100644 --- a/internal/domain/main-entities/postal-code/dto.go +++ b/internal/domain/main-entities/postal-region/dto.go @@ -1,4 +1,4 @@ -package postalcode +package postalregion import ( ecore "simrs-vx/internal/domain/base-entities/core" @@ -42,7 +42,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, @@ -51,7 +51,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() diff --git a/internal/domain/main-entities/postal-code/entity.go b/internal/domain/main-entities/postal-region/entity.go similarity index 60% rename from internal/domain/main-entities/postal-code/entity.go rename to internal/domain/main-entities/postal-region/entity.go index 2825db9c..43f5971f 100644 --- a/internal/domain/main-entities/postal-code/entity.go +++ b/internal/domain/main-entities/postal-region/entity.go @@ -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"` } diff --git a/internal/domain/main-entities/village/dto.go b/internal/domain/main-entities/village/dto.go index 50f44a07..c56e60a5 100644 --- a/internal/domain/main-entities/village/dto.go +++ b/internal/domain/main-entities/village/dto.go @@ -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" ) @@ -42,15 +42,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 } diff --git a/internal/domain/main-entities/village/entity.go b/internal/domain/main-entities/village/entity.go index d7c549bc..ca5fb4af 100644 --- a/internal/domain/main-entities/village/entity.go +++ b/internal/domain/main-entities/village/entity.go @@ -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"` } diff --git a/internal/domain/references/person/person.go b/internal/domain/references/person/person.go index d21399d2..02d0f97e 100644 --- a/internal/domain/references/person/person.go +++ b/internal/domain/references/person/person.go @@ -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 { diff --git a/internal/interface/migration/main-entities.go b/internal/interface/migration/main-entities.go index fcb3db9e..fc3161fa 100644 --- a/internal/interface/migration/main-entities.go +++ b/internal/interface/migration/main-entities.go @@ -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{}, } } From a298f192d5f9f5f55336b0223a97739ae987577d Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Fri, 10 Oct 2025 14:12:05 +0700 Subject: [PATCH 3/6] switch fk for personaddress --- .../migrations/20251010070721.sql | 15 ++++ cmd/main-migration/migrations/atlas.sum | 75 ++++++++++--------- .../main-entities/person-address/dto.go | 20 ++--- .../main-entities/person-address/entity.go | 4 +- 4 files changed, 65 insertions(+), 49 deletions(-) create mode 100644 cmd/main-migration/migrations/20251010070721.sql diff --git a/cmd/main-migration/migrations/20251010070721.sql b/cmd/main-migration/migrations/20251010070721.sql new file mode 100644 index 00000000..ee030931 --- /dev/null +++ b/cmd/main-migration/migrations/20251010070721.sql @@ -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"; diff --git a/cmd/main-migration/migrations/atlas.sum b/cmd/main-migration/migrations/atlas.sum index 741f4b48..57b78283 100644 --- a/cmd/main-migration/migrations/atlas.sum +++ b/cmd/main-migration/migrations/atlas.sum @@ -1,37 +1,38 @@ -h1:xVhAIbHPOq5Fwkwi6TwtefKLWPqyyF3MQYD9VUB0gsM= -20250904105930.sql h1:Vv4vCurl7m7/ZB6TjRpkubHpQ4RYwSUn0QHdzfoGpzY= -20250904141448.sql h1:FYCHH9Os4KkrZMDu/jR8FMP+wLMRW+Mb0PkLU/9BRDg= -20250908062237.sql h1:oanBpKZd+akPu2I/xYhUSbd0G5tAFbXzKLER/Zs8ENI= -20250908062323.sql h1:miNG9COddXkD1jGTgaROMAZ618eT6oiLGiJhXWnQwhE= -20250908073811.sql h1:gOi5cnGG1htlpfizybYmUIT0vYjZTBfXiI0nPSYK2u8= -20250908073839.sql h1:cWNDA4YikjoOteAJuNLFILjQUJPFB6o8Wxreiek4QyI= -20250910055902.sql h1:nxxOGnU0BbH/v3IPgeIOXOwH8d3tKomw7h6FTeMnnBs= -20250915123412.sql h1:mz7SiWfrdf0qE1VTSAAnA/147d6gyp6ry5vZ2bR9SH0= -20250916043819.sql h1:RHXVtmMkB6wfv06HfPyHMBmUfIpFt1xveafNz0kwKnE= -20250917040616.sql h1:MYVDht+akBlzQGKNu2hTTTLPEcH1bxT/Q8MK6WEtuhs= -20250917040751.sql h1:J79YyS2JzWgh5oKXMTgh67uo3gLxKaAsxRiZmSIfjBs= -20250917045138.sql h1:/SM1N4O8X3yxpoJgMEARmS1uOkuLKsTOy4PLsRCOKaQ= -20250917093645.sql h1:PNBTGZ7s10e5b5+Tie8YfVQBN0zKtJ5T34oK1iOUEb4= -20250918073552.sql h1:jG7+g3i8ODYaJdcdZz12v3nbsZ5mB9wG6kWnGyTQIRI= -20250918073742.sql h1:j+rgw7puxE7s+phqPVZHmPk0af3rcaA56Itp86y1suY= -20250918074745.sql h1:rPmP4DXs6OnY4Vp+xO/z9jFpJt/RrJ52SJJjIIxeDvc= -20250923025134.sql h1:2r6pcwnBSU5Y9Czk1OHBoh4yZXiMtEca9X8843fTEX0= -20250924051317.sql h1:iUAk2gsGoEGIPQ0lEEUp8maMSId8emNbP+kP712ABIA= -20250929034321.sql h1:UlpALNVmdi95zOIT0yc6ZyTj9bBjQEIpZhvgrc52M+k= -20250929034428.sql h1:feF+H4nDyHh5bdx48Oiz0A1qecZfi6v3qTTdjzJ45Dg= -20250930025550.sql h1:6XT1kXI3Z3ZIxxmvT7poufZWWCW0QiejZPaFV5wBnjI= -20250930140351.sql h1:HxnmAbh9gCy8jwl/9ycGktiByaUripsjFFvohofY2CY= -20251002085604.sql h1:SjLPi+ZN6qDccK3DaEQCgNsZpPwr5kynWXwbwEsziCI= -20251003032030.sql h1:oHfxNSuqTxU8Zaf9H+h8TuUb1Da03wcyc6hZjDrUQ2s= -20251005060450.sql h1:GIuCcrd4MwjmXpvbzDzPYL18BV3QaZZ+Y2FmEzjvi0E= -20251006041122.sql h1:uNDQbSw0M08lYoMvUNlQtS3iDzpPM1ixT13ugSAoWjE= -20251006045658.sql h1:z+t7yCK54Q4SSiF9kUyUhkYB2F+kzSW9TB7ogxd9wzw= -20251006045928.sql h1:1lATLFLp4BWwGZqAjZdP0Dc6ypNXiYcwjoNkqGa8NFE= -20251007022859.sql h1:HXXwWrkyvzJzJGAt9mGskCRBBV/c1JfPmfjDocmJhQ4= -20251008031337.sql h1:Ln5pCF3Hxa5foHZLcds+z/us2eH6VAhhEj3w0TAGlVs= -20251008031554.sql h1:aB4MUS2lmqG0//4HKUWorcPSpWya0VC4QItvGyskEVI= -20251008052346.sql h1:MI3AZgU5XcwZT2OvvlWAxdRtL0eJ3jjRwt56IY1+pRU= -20251008073620.sql h1:sztWXuSNYwpEraaSapSsYwno75LO5H/N7ob7OJQ8X/A= -20251009042854.sql h1:TnPXj+dCJls3IU//cuqJZymyBzZMKs7ayazfgtAFRxM= -20251009052657.sql h1:leXbs0CP8r5dRilmYyLRk1MICqak3ea1/LWMtFrijqQ= -20251010031743.sql h1:SgHNY/lQ88G2F4nZyMfiOkDntb+gtOR+nEQLqXBTwv4= +h1:4FXkpgFh3UpHN247wDhhSP9RpYGEvS0rwSbd5mEeFZ4= +20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k= +20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0= +20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI= +20250908062323.sql h1:oXl6Z143tOpIl4EfP4B8JNU8LrMvVmHEtCgAfiB4gs8= +20250908073811.sql h1:m2aNXfnGxnLq1+rVWrh4f60q7fhyhV3gEwNu/OIqQlE= +20250908073839.sql h1:cPk54xjLdMs26uY8ZHjNWLuyfAMzV7Zb0/9oJQrsw04= +20250910055902.sql h1:5xwjAV6QbtZT9empTJKfhyAjdknbHzb15B0Ku5dzqtQ= +20250915123412.sql h1:D83xaU2YlDEd21HLup/YQpQ2easMToYCyy/oK6AFgQs= +20250916043819.sql h1:ekoTJsBqQZ8G8n0qJ03d13+eoNoc7sAUEQGA5D/CCxk= +20250917040616.sql h1:zoCnmcXuM7AVv85SmN7RmFglCgJnoDmpRWExH0LAc9Q= +20250917040751.sql h1:J1xyRrh32y1+lezwAyNwPcUQ6ABBSgbvzNLva4SVdQU= +20250917045138.sql h1:jKe1Z0uOLG4SGBYM+S/3P+/zMPztmgoderD5swnMuCg= +20250917093645.sql h1:cNI3Pbz1R3LxvIXLuexafJFCXUXrmuFCgXXJ2sG+FW0= +20250918073552.sql h1:RJ1SvMzP6aeWnoPVD3eVAmIQOkcp6Php8z3QRri6v4g= +20250918073742.sql h1:+cEsnJTJFybe2fR69ZoOiX2R6c6iITl4m6WTZ1hjyzY= +20250918074745.sql h1:2hNVQCXF/dVYXAh+T/7oBFgERGWxzVb2FXJjwkFWGCI= +20250923025134.sql h1:Ykz/qpHiGDXPsCsWTjydQFVSibZP2D+h2fIeb2h2JGA= +20250924051317.sql h1:yQuW6SwJxIOM5fcxeAaie5lSm1oLysU/C2hH2xNCVoQ= +20250929034321.sql h1:101FJ8VH12mrZWlt/X1gvKUGOhoiF8tFbjiapAjnHzg= +20250929034428.sql h1:i+pROD9p+g5dOmmZma6WF/0Hw5g3Ha28NN85iTo1K34= +20250930025550.sql h1:+F+CsCUXD/ql0tHGEow70GhPBX1ZybVn+bh/T4YMh7Y= +20250930140351.sql h1:9AAEG1AnOAH+o0+oHL5G7I8vqlWOhwRlCGyyCpT/y1Q= +20251002085604.sql h1:3xZ68eYp4urXRnvotNH1XvG2mYOSDV/j3zHEZ/txg5E= +20251003032030.sql h1:HB+mQ2lXMNomHDpaRhB/9IwYI9/YiDO5eOJ+nAQH/jw= +20251005060450.sql h1:LbtCE2b+8osM3CvnmQJH1uCPtn+d7WchsslBOz8bL3Q= +20251006041122.sql h1:MlS7f21z06sutnf9dIekt5fuHJr4lgcQ4uCuCXAGsfc= +20251006045658.sql h1:3FmGCPCzjgMPdWDRodZTsx3KVaodd9zB9ilib69aewk= +20251006045928.sql h1:Z5g31PmnzNwk/OKdODcxZGm8fjJQdMFK32Xfnt3bRHg= +20251007022859.sql h1:FO03zEfaNEk/aXwY81d5Lp3MoBB9kPQuXlXJ4BPiSR8= +20251008031337.sql h1:l+sxUAGvcTfj3I6kAFHo+T6AYodC9k9GkR+jaKO2xXc= +20251008031554.sql h1:AqrVfIhSzY3PCy8ZlP5W91wn2iznfIuj5qQfubp6/94= +20251008052346.sql h1:nxnXmooIJ6r1mmzwnw+6efxLfc/k9h2aE6RMptPRons= +20251008073620.sql h1:6YsJp1W4SmQJ1lxpqF27BBlDC1zqhw7Yhc7pLzQTY6M= +20251009042854.sql h1:nkBV+R6j0fg7/JY6wH3eb5Vv0asJLnXmb6lINfT/GLQ= +20251009052657.sql h1:EPvdsib5rzCGPryd10HShGKvFPwM/R5S2lIVwtYxpms= +20251010031743.sql h1:T8IZmx8/btRFKLzTe78MzcBsPJNodnLvB0tby9QkirQ= +20251010070721.sql h1:+tKik0+V3yNWiLX4rW3pxw93ceBCCtqXDFqSHyzwnXo= diff --git a/internal/domain/main-entities/person-address/dto.go b/internal/domain/main-entities/person-address/dto.go index 0fcd52df..3d91355b 100644 --- a/internal/domain/main-entities/person-address/dto.go +++ b/internal/domain/main-entities/person-address/dto.go @@ -5,11 +5,11 @@ import ( ) 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"` + 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"` } type ReadListDto struct { @@ -38,11 +38,11 @@ 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"` + Address string `json:"address"` + Rt string `json:"rt"` + Rw string `json:"rw"` + Village_Code *string `json:"village_code"` } func (d PersonAddress) ToResponse() ResponseDto { diff --git a/internal/domain/main-entities/person-address/entity.go b/internal/domain/main-entities/person-address/entity.go index 47c3d6e4..4b05634c 100644 --- a/internal/domain/main-entities/person-address/entity.go +++ b/internal/domain/main-entities/person-address/entity.go @@ -14,7 +14,7 @@ type PersonAddress struct { 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_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_Code *string `json:"village_code" gorm:"size:10"` } From dc0b4929519a86452d0e3bc157b5da0e7a4d6a71 Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Fri, 10 Oct 2025 14:26:15 +0700 Subject: [PATCH 4/6] wip --- .../main-entities/person-address/dto.go | 43 +++++++++++-------- .../postal-region/base/entity.go | 2 +- .../interface/main-handler/main-handler.go | 4 +- .../{postal-code => postal-region}/handler.go | 6 +-- .../use-case/main-use-case/patient/lib.go | 2 +- .../main-use-case/person-address/helper.go | 2 +- .../{postal-code => postal-region}/case.go | 18 ++++---- .../{postal-code => postal-region}/helper.go | 6 +-- .../{postal-code => postal-region}/lib.go | 22 +++++----- .../middleware-runner.go | 14 +++--- .../middleware.go | 2 +- .../{postal-code => postal-region}/tycovar.go | 10 ++--- 12 files changed, 70 insertions(+), 61 deletions(-) rename internal/interface/main-handler/{postal-code => postal-region}/handler.go (91%) rename internal/use-case/main-use-case/{postal-code => postal-region}/case.go (95%) rename internal/use-case/main-use-case/{postal-code => postal-region}/helper.go (81%) rename internal/use-case/main-use-case/{postal-code => postal-region}/lib.go (86%) rename internal/use-case/main-use-case/{postal-code => postal-region}/middleware-runner.go (86%) rename internal/use-case/main-use-case/{postal-code => postal-region}/middleware.go (90%) rename internal/use-case/main-use-case/{postal-code => postal-region}/tycovar.go (76%) diff --git a/internal/domain/main-entities/person-address/dto.go b/internal/domain/main-entities/person-address/dto.go index 82577910..271ec944 100644 --- a/internal/domain/main-entities/person-address/dto.go +++ b/internal/domain/main-entities/person-address/dto.go @@ -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 diff --git a/internal/domain/main-entities/postal-region/base/entity.go b/internal/domain/main-entities/postal-region/base/entity.go index 0ceeada7..6cec2766 100644 --- a/internal/domain/main-entities/postal-region/base/entity.go +++ b/internal/domain/main-entities/postal-region/base/entity.go @@ -7,5 +7,5 @@ type Basic struct { } func (Basic) TableName() string { - return "PostalCode" + return "PostalRegion" } diff --git a/internal/interface/main-handler/main-handler.go b/internal/interface/main-handler/main-handler.go index 0d9fd969..590aa27b 100644 --- a/internal/interface/main-handler/main-handler.go +++ b/internal/interface/main-handler/main-handler.go @@ -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)) diff --git a/internal/interface/main-handler/postal-code/handler.go b/internal/interface/main-handler/postal-region/handler.go similarity index 91% rename from internal/interface/main-handler/postal-code/handler.go rename to internal/interface/main-handler/postal-region/handler.go index d6c3dc1e..baf3b2d6 100644 --- a/internal/interface/main-handler/postal-code/handler.go +++ b/internal/interface/main-handler/postal-region/handler.go @@ -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{} diff --git a/internal/use-case/main-use-case/patient/lib.go b/internal/use-case/main-use-case/patient/lib.go index fb864f84..b7d2d966 100644 --- a/internal/use-case/main-use-case/patient/lib.go +++ b/internal/use-case/main-use-case/patient/lib.go @@ -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 { diff --git a/internal/use-case/main-use-case/person-address/helper.go b/internal/use-case/main-use-case/person-address/helper.go index 60712837..537afeac 100644 --- a/internal/use-case/main-use-case/person-address/helper.go +++ b/internal/use-case/main-use-case/person-address/helper.go @@ -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 } diff --git a/internal/use-case/main-use-case/postal-code/case.go b/internal/use-case/main-use-case/postal-region/case.go similarity index 95% rename from internal/use-case/main-use-case/postal-code/case.go rename to internal/use-case/main-use-case/postal-region/case.go index 0bdefae5..1c175e42 100644 --- a/internal/use-case/main-use-case/postal-code/case.go +++ b/internal/use-case/main-use-case/postal-region/case.go @@ -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{ diff --git a/internal/use-case/main-use-case/postal-code/helper.go b/internal/use-case/main-use-case/postal-region/helper.go similarity index 81% rename from internal/use-case/main-use-case/postal-code/helper.go rename to internal/use-case/main-use-case/postal-region/helper.go index 1217f5e9..65114fbe 100644 --- a/internal/use-case/main-use-case/postal-code/helper.go +++ b/internal/use-case/main-use-case/postal-region/helper.go @@ -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 diff --git a/internal/use-case/main-use-case/postal-code/lib.go b/internal/use-case/main-use-case/postal-region/lib.go similarity index 86% rename from internal/use-case/main-use-case/postal-code/lib.go rename to internal/use-case/main-use-case/postal-region/lib.go index abead91a..c6d2e998 100644 --- a/internal/use-case/main-use-case/postal-code/lib.go +++ b/internal/use-case/main-use-case/postal-region/lib.go @@ -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 { diff --git a/internal/use-case/main-use-case/postal-code/middleware-runner.go b/internal/use-case/main-use-case/postal-region/middleware-runner.go similarity index 86% rename from internal/use-case/main-use-case/postal-code/middleware-runner.go rename to internal/use-case/main-use-case/postal-region/middleware-runner.go index b06faf2b..8686be7d 100644 --- a/internal/use-case/main-use-case/postal-code/middleware-runner.go +++ b/internal/use-case/main-use-case/postal-region/middleware-runner.go @@ -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) diff --git a/internal/use-case/main-use-case/postal-code/middleware.go b/internal/use-case/main-use-case/postal-region/middleware.go similarity index 90% rename from internal/use-case/main-use-case/postal-code/middleware.go rename to internal/use-case/main-use-case/postal-region/middleware.go index a11c3e01..d96a57d3 100644 --- a/internal/use-case/main-use-case/postal-code/middleware.go +++ b/internal/use-case/main-use-case/postal-region/middleware.go @@ -1,4 +1,4 @@ -package postalcode +package postalregion // example of middleware // func init() { diff --git a/internal/use-case/main-use-case/postal-code/tycovar.go b/internal/use-case/main-use-case/postal-region/tycovar.go similarity index 76% rename from internal/use-case/main-use-case/postal-code/tycovar.go rename to internal/use-case/main-use-case/postal-region/tycovar.go index 2c307323..71278f43 100644 --- a/internal/use-case/main-use-case/postal-code/tycovar.go +++ b/internal/use-case/main-use-case/postal-region/tycovar.go @@ -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 From 1cc9ef024e1e21a5a64322544384a98e0e1ccd52 Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Fri, 10 Oct 2025 14:28:44 +0700 Subject: [PATCH 5/6] add fk village into person-address --- cmd/main-migration/migrations/20251010072711.sql | 2 ++ cmd/main-migration/migrations/atlas.sum | 5 +++-- internal/domain/main-entities/person-address/entity.go | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 cmd/main-migration/migrations/20251010072711.sql diff --git a/cmd/main-migration/migrations/20251010072711.sql b/cmd/main-migration/migrations/20251010072711.sql new file mode 100644 index 00000000..f4b24a4f --- /dev/null +++ b/cmd/main-migration/migrations/20251010072711.sql @@ -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; diff --git a/cmd/main-migration/migrations/atlas.sum b/cmd/main-migration/migrations/atlas.sum index 57b78283..a57cdcab 100644 --- a/cmd/main-migration/migrations/atlas.sum +++ b/cmd/main-migration/migrations/atlas.sum @@ -1,4 +1,4 @@ -h1:4FXkpgFh3UpHN247wDhhSP9RpYGEvS0rwSbd5mEeFZ4= +h1:ZNIY96E0dkcsqT7l3071AqNKR/aee/WJFYKwNWcL+pw= 20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k= 20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0= 20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI= @@ -35,4 +35,5 @@ h1:4FXkpgFh3UpHN247wDhhSP9RpYGEvS0rwSbd5mEeFZ4= 20251009042854.sql h1:nkBV+R6j0fg7/JY6wH3eb5Vv0asJLnXmb6lINfT/GLQ= 20251009052657.sql h1:EPvdsib5rzCGPryd10HShGKvFPwM/R5S2lIVwtYxpms= 20251010031743.sql h1:T8IZmx8/btRFKLzTe78MzcBsPJNodnLvB0tby9QkirQ= -20251010070721.sql h1:+tKik0+V3yNWiLX4rW3pxw93ceBCCtqXDFqSHyzwnXo= +20251010070721.sql h1:5NQUk/yOV6sABLCB7swx++YIOyJe6MnU+yt1nRzde5w= +20251010072711.sql h1:0xPdW7LNs9vb0g6H4rkNlF4yjjP4rIT6a5rZnDxWBxM= diff --git a/internal/domain/main-entities/person-address/entity.go b/internal/domain/main-entities/person-address/entity.go index 4b05634c..65d71912 100644 --- a/internal/domain/main-entities/person-address/entity.go +++ b/internal/domain/main-entities/person-address/entity.go @@ -3,6 +3,7 @@ package personaddress import ( ecore "simrs-vx/internal/domain/base-entities/core" epr "simrs-vx/internal/domain/main-entities/postal-region" + ev "simrs-vx/internal/domain/main-entities/village" erp "simrs-vx/internal/domain/references/person" ) @@ -17,4 +18,5 @@ type PersonAddress struct { 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"` } From 0b93070217cb9df566d7f7766d42e4341db88090 Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Fri, 10 Oct 2025 14:38:14 +0700 Subject: [PATCH 6/6] feat (patient): adjust read detail after postalcode renamed --- internal/domain/main-entities/person-address/dto.go | 5 ++++- internal/interface/main-handler/main-handler.go | 2 +- internal/use-case/main-use-case/patient/lib.go | 2 +- internal/use-case/main-use-case/person-address/helper.go | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/domain/main-entities/person-address/dto.go b/internal/domain/main-entities/person-address/dto.go index 271ec944..64be2822 100644 --- a/internal/domain/main-entities/person-address/dto.go +++ b/internal/domain/main-entities/person-address/dto.go @@ -3,6 +3,7 @@ package personaddress import ( ecore "simrs-vx/internal/domain/base-entities/core" epr "simrs-vx/internal/domain/main-entities/postal-region" + ev "simrs-vx/internal/domain/main-entities/village" erp "simrs-vx/internal/domain/references/person" ) @@ -51,6 +52,7 @@ type ResponseDto struct { 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 { @@ -60,9 +62,10 @@ func (d PersonAddress) ToResponse() ResponseDto { Address: d.Address, Rt: d.Rt, Rw: d.Rw, - Village_Code: d.Village_Code, PostalRegion_Code: d.PostalRegion_Code, PostalRegion: d.PostalRegion, + Village_Code: d.Village_Code, + Village: d.Village, } resp.Main = d.Main return resp diff --git a/internal/interface/main-handler/main-handler.go b/internal/interface/main-handler/main-handler.go index 590aa27b..5eb85084 100644 --- a/internal/interface/main-handler/main-handler.go +++ b/internal/interface/main-handler/main-handler.go @@ -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", postalregion.O) + hc.RegCrud(r, "/v1/postal-region", postalregion.O) ///// return cmw.SetCors(handlerlogger.SetLog(r)) diff --git a/internal/use-case/main-use-case/patient/lib.go b/internal/use-case/main-use-case/patient/lib.go index b7d2d966..4ead199c 100644 --- a/internal/use-case/main-use-case/patient/lib.go +++ b/internal/use-case/main-use-case/patient/lib.go @@ -101,7 +101,7 @@ 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.Village.District.Regency.Province"). Preload("Person.Addresses.PostalRegion.Village.District.Regency.Province") if err := tx.First(&data, input.Id).Error; err != nil { diff --git a/internal/use-case/main-use-case/person-address/helper.go b/internal/use-case/main-use-case/person-address/helper.go index 537afeac..f9b880b7 100644 --- a/internal/use-case/main-use-case/person-address/helper.go +++ b/internal/use-case/main-use-case/person-address/helper.go @@ -18,6 +18,7 @@ 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