From ea04f33ad15b488366a5f9f3c633dd7006c31a65 Mon Sep 17 00:00:00 2001
From: Khafid Prayoga <khafidp@pm.me>
Date: Fri, 10 Oct 2025 13:51:21 +0700
Subject: [PATCH] refactor(address): update address models and forms to use
 standardized fields

- Add preload relationships to address-related models
- Rename postalCode to postalCode_code for consistency
- Simplify location type handling with hidden fields
- Update validation schemas and form components
- Improve address display in patient preview
---
 app/components/app/patient/preview.vue        | 26 ++++----
 .../person-address/_common/select-postal.vue  |  9 +--
 .../person-address/entry-form-relative.vue    | 65 +++++++------------
 .../app/person-address/entry-form.vue         | 43 ++++--------
 app/components/content/patient/entry.vue      |  8 +--
 app/lib/constants.ts                          | 18 +++--
 app/models/district.ts                        |  4 ++
 app/models/person-address.ts                  | 27 +++++++-
 app/models/person.ts                          |  6 ++
 app/models/postal-code.ts                     |  5 +-
 app/models/regency.ts                         |  5 +-
 app/models/village.ts                         |  4 ++
 app/schemas/person-address-relative.schema.ts |  6 +-
 app/schemas/person-address.schema.ts          |  5 +-
 14 files changed, 122 insertions(+), 109 deletions(-)

diff --git a/app/components/app/patient/preview.vue b/app/components/app/patient/preview.vue
index 79eba5a3..ef24c771 100644
--- a/app/components/app/patient/preview.vue
+++ b/app/components/app/patient/preview.vue
@@ -1,13 +1,11 @@
 <script setup lang="ts">
 import type { Person } from '~/models/person'
-import type { PersonAddress } from '~/models/person-address'
-import type { PersonContact } from '~/models/person-contact'
-import type { PersonRelative } from '~/models/person-relative'
-
 import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
 import DetailSection from '~/components/pub/my-ui/form/view/detail-section.vue'
+import { type PersonAddress, formatAddress } from '~/models/person-address'
 
 import {
+  addressLocationTypeCode,
   educationCodes,
   genderCodes,
   occupationCodes,
@@ -37,16 +35,16 @@ const relationshipOptions = mapToComboboxOptList(relationshipCodes)
 const personContactTypeOptions = mapToComboboxOptList(personContactTypes)
 
 // Computed addresses from nested data
-const residentAddress = computed(() => {
+const domicileAddress = computed(() => {
   const addresses = props.person.addresses
-  const resident = addresses?.find((addr) => addr.locationType === 'resident')
-  return resident?.address || 'Jl. Puncak Borobudur Blok M No. 321, Lowokwaru, Kota Malang, Jawa Timur'
+  const resident = addresses?.find((addr) => addr.locationType === 'domicile')
+  return formatAddress(resident)
 })
 
-const primaryAddress = computed(() => {
+const identityAddress = computed(() => {
   const addresses = props.person.addresses
-  const primary = addresses?.find((addr) => addr.locationType === 'primary')
-  return primary?.address || 'Perumahan Araya Cluster B, No 22, Blimbing, Kota Malang, Jawa Timur'
+  const primary = addresses?.find((addr) => addr.locationType === 'identity')
+  return formatAddress(primary)
 })
 
 const patientAge = computed(() => {
@@ -68,6 +66,7 @@ const patientAge = computed(() => {
 // #endregion
 
 // #region Functions
+
 // #endregion region
 
 // #region Utilities & event handlers
@@ -83,10 +82,9 @@ function onClick(type: string) {
 <template>
   <DetailSection title="Data Pasien">
     <DetailRow label="Nomor ID">{{ person.id || '-' }}</DetailRow>
-    <DetailRow label="Sapaan">{{ '-' }}</DetailRow>
     <DetailRow label="Nama Lengkap">{{ person.name || '-' }}</DetailRow>
     <DetailRow label="Tempat, tanggal lahir">
-      {{ person.birthRegency_code || '-' }},
+      {{ person.birthRegency?.name || '-' }},
       {{ person.birthDate ? new Date(person.birthDate).toLocaleDateString() : '-' }}
     </DetailRow>
     <DetailRow label="Usia">{{ patientAge || '-' }}</DetailRow>
@@ -117,8 +115,8 @@ function onClick(type: string) {
   </DetailSection>
 
   <DetailSection title="Alamat">
-    <DetailRow label="Alamat Domisili">{{ residentAddress || '-' }}</DetailRow>
-    <DetailRow label="Alamat KTP">{{ primaryAddress || '-' }}</DetailRow>
+    <DetailRow :label="addressLocationTypeCode.domicile || 'Alamat Domisili'">{{ domicileAddress || '-' }}</DetailRow>
+    <DetailRow :label="addressLocationTypeCode.identity || 'Alamat KTP'">{{ identityAddress || '-' }}</DetailRow>
   </DetailSection>
   <DetailSection title="Kontak">
     <template v-if="person.contacts && person.contacts.length > 0">
diff --git a/app/components/app/person-address/_common/select-postal.vue b/app/components/app/person-address/_common/select-postal.vue
index 66eb3c5e..3539ba23 100644
--- a/app/components/app/person-address/_common/select-postal.vue
+++ b/app/components/app/person-address/_common/select-postal.vue
@@ -18,14 +18,7 @@ const props = defineProps<{
   isRequired?: boolean
 }>()
 
-const {
-  fieldName = 'zipCode',
-  placeholder = 'Kode Pos',
-  errors,
-  class: containerClass,
-  selectClass,
-  fieldGroupClass,
-} = props
+const { fieldName = 'zipCode', placeholder = 'Kode Pos', errors, class: containerClass, fieldGroupClass } = props
 
 const villageCodeRef = toRef(props, 'villageCode')
 const { postalCodeOptions, isLoading, error } = usePostalCodes(villageCodeRef)
diff --git a/app/components/app/person-address/entry-form-relative.vue b/app/components/app/person-address/entry-form-relative.vue
index ed08fbd2..dd9b5834 100644
--- a/app/components/app/person-address/entry-form-relative.vue
+++ b/app/components/app/person-address/entry-form-relative.vue
@@ -43,7 +43,7 @@ const fieldStates: Record<string, { dependsOn?: string; placeholder: string }> =
   regency_code: { dependsOn: 'province_code', placeholder: 'Pilih provinsi dahulu' },
   district_code: { dependsOn: 'regency_code', placeholder: 'Pilih kabupaten/kota dahulu' },
   village_code: { dependsOn: 'district_code', placeholder: 'Pilih kecamatan dahulu' },
-  postalCode: { dependsOn: 'village_code', placeholder: 'Pilih kelurahan dahulu' },
+  postalCode_code: { dependsOn: 'village_code', placeholder: 'Pilih kelurahan dahulu' },
   address: { placeholder: 'Masukkan alamat' },
   rt: { placeholder: '001' },
   rw: { placeholder: '002' },
@@ -73,7 +73,7 @@ function getFieldState(field: string) {
     const isDisabledByDependency = !dependencyValue
 
     // Jika isSame, semua field location disabled
-    if (isSame && ['regency_code', 'district_code', 'village_code', 'postalCode'].includes(field)) {
+    if (isSame && ['regency_code', 'district_code', 'village_code', 'postalCode_code'].includes(field)) {
       return { placeholder: '-', disabled: true }
     }
 
@@ -83,7 +83,7 @@ function getFieldState(field: string) {
   }
 
   // Jika isSame dan field location, disabled
-  if (isSame && ['regency_code', 'district_code', 'village_code', 'postalCode'].includes(field)) {
+  if (isSame && ['regency_code', 'district_code', 'village_code', 'postalCode_code'].includes(field)) {
     return { placeholder: '-', disabled: true }
   }
 
@@ -108,7 +108,7 @@ watch(
           regency_code: undefined,
           district_code: undefined,
           village_code: undefined,
-          postalCode: undefined,
+          postalCode_code: undefined,
         },
         false,
       )
@@ -133,7 +133,7 @@ watch(
         {
           district_code: undefined,
           village_code: undefined,
-          postalCode: undefined,
+          postalCode_code: undefined,
         },
         false,
       )
@@ -157,7 +157,7 @@ watch(
       formRef.value.setValues(
         {
           village_code: undefined,
-          postalCode: undefined,
+          postalCode_code: undefined,
         },
         false,
       )
@@ -180,7 +180,7 @@ watch(
 
       formRef.value.setValues(
         {
-          postalCode: undefined,
+          postalCode_code: undefined,
         },
         false,
       )
@@ -214,7 +214,7 @@ watch(
         if (updatedValues.regency_code === '') updatedValues.regency_code = undefined
         if (updatedValues.district_code === '') updatedValues.district_code = undefined
         if (updatedValues.village_code === '') updatedValues.village_code = undefined
-        if (updatedValues.postalCode === '') updatedValues.postalCode = undefined
+        if (updatedValues.postalCode_code === '') updatedValues.postalCode_code = undefined
         if (updatedValues.address === '') updatedValues.address = undefined
 
         // Update values dan trigger validasi
@@ -235,7 +235,7 @@ watch(
         formRef.value?.setFieldError('regency_code', undefined)
         formRef.value?.setFieldError('district_code', undefined)
         formRef.value?.setFieldError('village_code', undefined)
-        formRef.value?.setFieldError('postalCode', undefined)
+        formRef.value?.setFieldError('postalCode_code', undefined)
         formRef.value?.setFieldError('address', undefined)
         formRef.value?.setFieldError('rt', undefined)
         formRef.value?.setFieldError('rw', undefined)
@@ -255,7 +255,7 @@ watch(
     :validation-schema="formSchema"
     :validate-on-mount="false"
     validation-mode="onSubmit"
-    :initial-values="initialValues ?? { isSameAddress: '1' }"
+    :initial-values="initialValues ?? { isSameAddress: '1', locationType: 'identity' }"
   >
     <div>
       <p
@@ -267,34 +267,17 @@ watch(
     </div>
     <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
       <div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-2">
-        <!-- LocationType -->
-        <FieldGroup v-if="conf?.withAddressName">
-          <Label label-for="locationType">Jenis Alamat</Label>
-          <Field
-            id="locationType"
-            :errors="errors"
-          >
-            <FormField
-              v-slot="{ componentField }"
-              name="locationType"
-            >
-              <FormItem>
-                <FormControl>
-                  <Select
-                    id="locationType"
-                    v-bind="componentField"
-                    :items="[
-                      { label: 'Rumah', value: 'rumah' },
-                      { label: 'Kantor', value: 'kantor' },
-                      { label: 'Lainnya', value: 'lainnya' },
-                    ]"
-                  />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            </FormField>
-          </Field>
-        </FieldGroup>
+        <!-- LocationType - Hidden field with default value 'identity' -->
+        <FormField
+          v-slot="{ componentField }"
+          name="locationType"
+        >
+          <input
+            type="hidden"
+            v-bind="componentField"
+            value="primary"
+          />
+        </FormField>
         <FieldGroup class="radio-group-field">
           <Label
             size="fit"
@@ -420,10 +403,10 @@ watch(
 
           <div class="min-w-0 flex-[2]">
             <SelectPostal
-              field-name="postalCode"
+              field-name="postalCode_code"
               :village-code="values.village_code"
-              :placeholder="getFieldState('postalCode').placeholder"
-              :is-disabled="getFieldState('postalCode').disabled || !values.village_code"
+              :placeholder="getFieldState('postalCode_code').placeholder"
+              :is-disabled="getFieldState('postalCode_code').disabled || !values.village_code"
             />
           </div>
         </div>
diff --git a/app/components/app/person-address/entry-form.vue b/app/components/app/person-address/entry-form.vue
index ffb01eaf..c12ed0c0 100644
--- a/app/components/app/person-address/entry-form.vue
+++ b/app/components/app/person-address/entry-form.vue
@@ -160,7 +160,7 @@ watch(
     :validation-schema="formSchema"
     :validate-on-mount="false"
     validation-mode="onSubmit"
-    :initial-values="initialValues ? initialValues : {}"
+    :initial-values="initialValues ? { locationType: 'domicile', ...initialValues } : { locationType: 'domicile' }"
   >
     <div>
       <p
@@ -172,34 +172,17 @@ watch(
     </div>
     <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
       <div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-2">
-        <!-- LocationType -->
-        <FieldGroup v-if="conf?.withAddressName">
-          <Label label-for="locationType">Jenis Alamat</Label>
-          <Field
-            id="locationType"
-            :errors="errors"
-          >
-            <FormField
-              v-slot="{ componentField }"
-              name="locationType"
-            >
-              <FormItem>
-                <FormControl>
-                  <Select
-                    id="locationType"
-                    v-bind="componentField"
-                    :items="[
-                      { label: 'Rumah', value: 'rumah' },
-                      { label: 'Kantor', value: 'kantor' },
-                      { label: 'Lainnya', value: 'lainnya' },
-                    ]"
-                  />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            </FormField>
-          </Field>
-        </FieldGroup>
+        <!-- LocationType - Hidden field with default value 'domicile' -->
+        <FormField
+          v-slot="{ componentField }"
+          name="locationType"
+        >
+          <input
+            type="hidden"
+            v-bind="componentField"
+            value="resident"
+          />
+        </FormField>
 
         <div class="flex-row gap-2 md:flex">
           <div class="min-w-0 flex-1">
@@ -268,7 +251,7 @@ watch(
 
           <div class="min-w-0 flex-[2]">
             <SelectPostal
-              field-name="postalCode"
+              field-name="postalCode_code"
               placeholder="Pilih kelurahan dahulu"
               :village-code="values.village_code"
               :is-disabled="!values.village_code"
diff --git a/app/components/content/patient/entry.vue b/app/components/content/patient/entry.vue
index 85d65c3d..6aac59f6 100644
--- a/app/components/content/patient/entry.vue
+++ b/app/components/content/patient/entry.vue
@@ -50,7 +50,7 @@ onMounted(() => {
             regency_code: currentAddressValues.regency_code || undefined,
             district_code: currentAddressValues.district_code || undefined,
             village_code: currentAddressValues.village_code || undefined,
-            postalCode: currentAddressValues.postalCode || undefined,
+            postalCode_code: currentAddressValues.postalCode_code || undefined,
             address: currentAddressValues.address || undefined,
             rt: currentAddressValues.rt || undefined,
             rw: currentAddressValues.rw || undefined,
@@ -141,7 +141,7 @@ watch(
                 regency_code: currentAddressValues.regency_code || undefined,
                 district_code: currentAddressValues.district_code || undefined,
                 village_code: currentAddressValues.village_code || undefined,
-                postalCode: currentAddressValues.postalCode || undefined,
+                postalCode_code: currentAddressValues.postalCode_code || undefined,
                 address: currentAddressValues.address || undefined,
                 rt: currentAddressValues.rt || undefined,
                 rw: currentAddressValues.rw || undefined,
@@ -172,7 +172,7 @@ watch(
           regency_code: newAddressValues.regency_code || undefined,
           district_code: newAddressValues.district_code || undefined,
           village_code: newAddressValues.village_code || undefined,
-          postalCode: newAddressValues.postalCode || undefined,
+          postalCode_code: newAddressValues.postalCode_code || undefined,
           address: newAddressValues.address || undefined,
           rt: newAddressValues.rt || undefined,
           rw: newAddressValues.rw || undefined,
@@ -202,7 +202,7 @@ watch(
           regency_code: currentAddressValues.regency_code || undefined,
           district_code: currentAddressValues.district_code || undefined,
           village_code: currentAddressValues.village_code || undefined,
-          postalCode: currentAddressValues.postalCode || undefined,
+          postalCode_code: currentAddressValues.postalCode_code || undefined,
           address: currentAddressValues.address || undefined,
           rt: currentAddressValues.rt || undefined,
           rw: currentAddressValues.rw || undefined,
diff --git a/app/lib/constants.ts b/app/lib/constants.ts
index b09647d7..526ca4b8 100644
--- a/app/lib/constants.ts
+++ b/app/lib/constants.ts
@@ -334,10 +334,18 @@ export const infraGroupCodes: Record<string, string> = {
   warehouse: 'Gudang / Depo',
   room: 'Ruang',
   chamber: 'Kamar',
-  bed: 'Ranjang'
+  bed: 'Ranjang',
 }
 
-export const infraGroupCodesKeys: Record<string, string> = Object.keys(infraGroupCodes).reduce((acc, key) => {
-  acc[key] = key
-  return acc
-}, {} as Record<string, string>)
+export const infraGroupCodesKeys: Record<string, string> = Object.keys(infraGroupCodes).reduce(
+  (acc, key) => {
+    acc[key] = key
+    return acc
+  },
+  {} as Record<string, string>,
+)
+
+export const addressLocationTypeCode: Record<string, string> = {
+  identity: 'Alamat KTP',
+  domicile: 'Alamat Domisili',
+}
diff --git a/app/models/district.ts b/app/models/district.ts
index a052ebd3..611f4435 100644
--- a/app/models/district.ts
+++ b/app/models/district.ts
@@ -1,9 +1,13 @@
 import { type Base, genBase } from './_base'
+import type { Regency } from './regency'
 
 export interface District extends Base {
   regency_code: string
   code: string
   name: string
+
+  // preload
+  regency?: Regency | null
 }
 
 export function genDistrict(): District {
diff --git a/app/models/person-address.ts b/app/models/person-address.ts
index e177d292..841c6318 100644
--- a/app/models/person-address.ts
+++ b/app/models/person-address.ts
@@ -1,4 +1,6 @@
 import { type Base, genBase } from './_base'
+import type { PostalCode } from './postal-code'
+import { toTitleCase } from '~/lib/utils'
 
 export interface PersonAddress extends Base {
   person_id: number
@@ -6,8 +8,11 @@ export interface PersonAddress extends Base {
   address: string
   rt?: string
   rw?: string
-  postalCode?: string
+  postalCode_code?: string
   village_code: string
+
+  // preload
+  postalCode?: PostalCode | null
 }
 
 export function genPersonAddress(): PersonAddress {
@@ -19,3 +24,23 @@ export function genPersonAddress(): PersonAddress {
     village_code: '',
   }
 }
+
+export function formatAddress(builder?: PersonAddress) {
+  if (!builder) return ''
+
+  const village = builder?.postalCode?.village
+  const district = village?.district
+  const regency = district?.regency
+  const province = regency?.province
+
+  const parts = [
+    builder?.address,
+    village?.name,
+    district?.name,
+    toTitleCase(regency?.name || ''),
+    toTitleCase(province?.name || ''),
+    builder?.postalCode_code,
+  ].filter(Boolean)
+
+  return parts.join(', ')
+}
diff --git a/app/models/person.ts b/app/models/person.ts
index 46850ec5..9615b09f 100644
--- a/app/models/person.ts
+++ b/app/models/person.ts
@@ -1,7 +1,10 @@
 import { type Base, genBase } from './_base'
+import type { Ethnic } from './ethnic'
+import type { Language } from './language'
 import type { PersonAddress } from './person-address'
 import type { PersonContact } from './person-contact'
 import type { PersonRelative } from './person-relative'
+import type { Regency } from './regency'
 
 export interface Person extends Base {
   name: string
@@ -29,9 +32,12 @@ export interface Person extends Base {
   familyIdentityFileUrl?: string
 
   // preload data for detail patient
+  birthRegency?: Regency | null
   addresses?: PersonAddress[] | null
   contacts?: PersonContact[] | null
   relatives?: PersonRelative[] | null
+  ethnic?: Ethnic | null
+  language?: Language | null
 }
 
 export function genPerson(): Person {
diff --git a/app/models/postal-code.ts b/app/models/postal-code.ts
index 9f185b9c..b03115c4 100644
--- a/app/models/postal-code.ts
+++ b/app/models/postal-code.ts
@@ -1,8 +1,11 @@
 import { type Base, genBase } from './_base'
-
+import type { Village } from './village'
 export interface PostalCode extends Base {
   code: string
   village_code: string
+
+  // preload
+  village?: Village | null
 }
 
 export function genPostalCode(): PostalCode {
diff --git a/app/models/regency.ts b/app/models/regency.ts
index 494f256e..09418a52 100644
--- a/app/models/regency.ts
+++ b/app/models/regency.ts
@@ -1,9 +1,12 @@
-import { type Base, genBase } from "./_base"
+import { type Base, genBase } from './_base'
+import type { Province } from './province'
 
 export interface Regency extends Base {
   code: string
   name: string
   province_code: string
+
+  province?: Province | null
 }
 
 export function genRegency(): Regency {
diff --git a/app/models/village.ts b/app/models/village.ts
index d7977fc4..6e36636f 100644
--- a/app/models/village.ts
+++ b/app/models/village.ts
@@ -1,9 +1,13 @@
 import { type Base, genBase } from './_base'
+import type { District } from './district'
 
 export interface Village extends Base {
   district_code: string
   code: string
   name: string
+
+  // preload
+  district?: District | null
 }
 
 export function genVillage(): Village {
diff --git a/app/schemas/person-address-relative.schema.ts b/app/schemas/person-address-relative.schema.ts
index e37fb89c..64f75f5e 100644
--- a/app/schemas/person-address-relative.schema.ts
+++ b/app/schemas/person-address-relative.schema.ts
@@ -22,8 +22,8 @@ const PersonAddressRelativeSchema = z
         'regency_code',
         'district_code',
         'village_code',
-        'postalCode',
-        'address'
+        'postalCode_code',
+        'address',
       ]
 
       requiredFields.forEach((field) => {
@@ -48,7 +48,7 @@ function getRequiredMessage(field: string): string {
     regency_code: 'Mohon pilih kabupaten/kota',
     district_code: 'Mohon pilih kecamatan',
     village_code: 'Mohon pilih kelurahan',
-    postalCode: 'Mohon lengkapi kode pos',
+    postalCode_code: 'Mohon lengkapi kode pos',
     address: 'Mohon lengkapi alamat',
   }
   return messages[field] || `${field} wajib diisi`
diff --git a/app/schemas/person-address.schema.ts b/app/schemas/person-address.schema.ts
index f314e921..7a17696b 100644
--- a/app/schemas/person-address.schema.ts
+++ b/app/schemas/person-address.schema.ts
@@ -1,6 +1,9 @@
 import { z } from 'zod'
 
 const PersonAddressSchema = z.object({
+  locationType: z.string({
+    required_error: 'Mohon pilih jenis alamat',
+  }),
   address: z.string({
     required_error: 'Mohon lengkapi alamat',
   }),
@@ -16,7 +19,7 @@ const PersonAddressSchema = z.object({
   village_code: z.string({
     required_error: 'Mohon pilih kelurahan',
   }),
-  postalCode: z.string({
+  postalCode_code: z.string({
     required_error: 'Mohon lengkapi kode pos',
   }),
   // .min(5, 'Kode pos harus berupa angka 5 digit')