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

change from postatlcode into postalregion, add location type into person address

Browse Source
This commit is contained in:
dpurbosakti
2025-10-10 14:05:59 +07:00
parent f64b8e2c6e
commit 738ee5b517
9 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/domain/main-entities/division-position/entity.go
+1 -1
View File
@@ -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"`
}
internal/domain/main-entities/person-address/entity.go
+12 -9
View File
@@ -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"`
}
internal/domain/main-entities/postal-code/base/entity.go → internal/domain/main-entities/postal-region/base/entity.go
View File
internal/domain/main-entities/postal-code/dto.go → internal/domain/main-entities/postal-region/dto.go
+3 -3
View File
@@ -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()
internal/domain/main-entities/postal-code/entity.go → internal/domain/main-entities/postal-region/entity.go
+3 -3
View File
@@ -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"`
}
internal/domain/main-entities/village/dto.go
+6 -6
View File
@@ -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
}
internal/domain/main-entities/village/entity.go
+3 -3
View File
@@ -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"`
}
internal/domain/references/person/person.go
+4
View File
@@ -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 {
internal/interface/migration/main-entities.go
+2 -2
View File
@@ -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{},
}
}