Update declaration payload to match FieldValue (#1138)

* update toolkit

* fix: update test data

* fix: update toolkit

* update toolkit

* update toolkit(#a29215b)

* fix: add admin area in test data address

Author: Nil20

package.json

@@ -69,7 +69,7 @@
     "@hapi/boom": "^9.1.1",
     "@hapi/hapi": "^20.0.1",
     "@hapi/inert": "^6.0.3",
-    "@opencrvs/toolkit": "1.9.0-rc.891a767",
+    "@opencrvs/toolkit": "1.9.0-rc.a29215b",
     "@types/chalk": "^2.2.0",
     "@types/csv2json": "^1.4.0",
     "@types/fhir": "^0.0.30",

src/api/notification/testData.ts

@@ -137,9 +137,7 @@ const RequestBirthNotificationAction = {
     'mother.address': {
       country: 'FAR',
       addressType: 'DOMESTIC',
-      province: '05cbe3a1-9020-47bd-b558-807607c2f119',
-      district: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284',
-      urbanOrRural: 'URBAN'
+      administrativeArea: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284'
     },
     'informant.email': '[email protected]',
     'informant.phoneNo': '0734231245',
@@ -175,9 +173,7 @@ const RequestBirthDeclarationAction = {
     'mother.address': {
       country: 'FAR',
       addressType: 'DOMESTIC',
-      province: '05cbe3a1-9020-47bd-b558-807607c2f119',
-      district: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284',
-      urbanOrRural: 'URBAN'
+      administrativeArea: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284'
     },
     'informant.email': '[email protected]',
     'informant.phoneNo': '0734231245',
@@ -213,9 +209,7 @@ const BirthDeclarationAction = {
     'mother.address': {
       country: 'FAR',
       addressType: 'DOMESTIC',
-      province: '05cbe3a1-9020-47bd-b558-807607c2f119',
-      district: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284',
-      urbanOrRural: 'URBAN'
+      administrativeArea: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284'
     },
     'informant.email': '[email protected]',
     'informant.phoneNo': '0734231245',
@@ -284,9 +278,7 @@ const RequestDeathNotificationAction = {
     'deceased.address': {
       country: 'FAR',
       addressType: 'DOMESTIC',
-      province: '05cbe3a1-9020-47bd-b558-807607c2f119',
-      district: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284',
-      urbanOrRural: 'URBAN'
+      administrativeArea: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284'
     },
     'informant.relation': 'SPOUSE'
   },
@@ -311,13 +303,13 @@ const RequestDeathDeclarationAction = {
   createdByRole: 'LOCAL_REGISTRAR',
   createdAtLocation: '9e069dda-0d83-4f67-a4f2-9adbf5658e2e' as unknown as UUID,
   declaration: {
-    'spouse.age': { age: '41', asOfDateRef: 'eventDetails.date' },
+    'spouse.age': { age: 41, asOfDateRef: 'eventDetails.date' },
     'spouse.name': {
       firstname: 'Toki',
       surname: 'Kozuki',
       middlename: ''
     },
-    'deceased.age': { age: '31', asOfDateRef: 'eventDetails.date' },
+    'deceased.age': { age: 31, asOfDateRef: 'eventDetails.date' },
     'deceased.name': {
       firstname: 'Oden',
       surname: 'Kozuki',
@@ -332,9 +324,7 @@ const RequestDeathDeclarationAction = {
     'deceased.address': {
       country: 'FAR',
       addressType: 'DOMESTIC',
-      province: '05cbe3a1-9020-47bd-b558-807607c2f119',
-      district: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284',
-      urbanOrRural: 'URBAN'
+      administrativeArea: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284'
     },
     'eventDetails.date': '2025-08-19',
     'spouse.dobUnknown': true,
@@ -367,13 +357,13 @@ const DeathDeclarationAction = {
   createdByRole: 'LOCAL_REGISTRAR',
   createdAtLocation: '9e069dda-0d83-4f67-a4f2-9adbf5658e2e' as unknown as UUID,
   declaration: {
-    'spouse.age': { age: '41', asOfDateRef: 'eventDetails.date' },
+    'spouse.age': { age: 41, asOfDateRef: 'eventDetails.date' },
     'spouse.name': {
       firstname: 'Toki',
       surname: 'Kozuki',
       middlename: ''
     },
-    'deceased.age': { age: '31', asOfDateRef: 'eventDetails.date' },
+    'deceased.age': { age: 31, asOfDateRef: 'eventDetails.date' },
     'deceased.name': {
       firstname: 'Oden',
       surname: 'Kozuki',
@@ -388,9 +378,7 @@ const DeathDeclarationAction = {
     'deceased.address': {
       country: 'FAR',
       addressType: 'DOMESTIC',
-      province: '05cbe3a1-9020-47bd-b558-807607c2f119',
-      district: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284',
-      urbanOrRural: 'URBAN'
+      administrativeArea: 'afaead2b-7ef5-4adb-b4bf-3d2b8437c284'
     },
     'eventDetails.date': '2025-08-19',
     'spouse.dobUnknown': true,

yarn.lock

@@ -834,10 +834,10 @@
   dependencies:
     "@octokit/openapi-types" "^18.0.0"
 
-"@opencrvs/[email protected].891a767":
-  version "1.9.0-rc.891a767"
-  resolved "https://registry.yarnpkg.com/@opencrvs/toolkit/-/toolkit-1.9.0-rc.891a767.tgz#fb73a78c6f5f98068f3eb9ef595dec707a92d61e"
-  integrity sha512-Qc8K3C5Yppb9gLulMRJ6A6JYno/Br89/13yPN1Yr41DkHvR+tPdpi8fDRtzo6Z1d7Zyab4JbAv9nOgYe1TIk2w==
+"@opencrvs/[email protected].a29215b":
+  version "1.9.0-rc.a29215b"
+  resolved "https://registry.yarnpkg.com/@opencrvs/toolkit/-/toolkit-1.9.0-rc.a29215b.tgz#38e3f97650b66d59ef65b22d9173574e975f9629"
+  integrity sha512-Kx6Q4jQhvBAkm54lIkTV7aaZGb/+pu86F3D2an59HcOUaifXlMunqVPxMR38t5O0IuBU64qyUGF/Vzh5l7aCUg==
   dependencies:
     "@trpc/client" "11.4.3"
     "@trpc/server" "11.4.3"
@@ -5166,7 +5166,7 @@ string-argv@^0.0.2:
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
   integrity sha512-p6/Mqq0utTQWUeGMi/m0uBtlLZEwXSY3+mXzeRRqw7fz5ezUb28Wr0R99NlfbWaMmL/jCyT9be4jpn7Yz8IO8w==
 
-"string-width-cjs@npm:string-width@^4.2.0":
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -5192,15 +5192,6 @@ string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^4.1.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -5226,7 +5217,7 @@ stringify-object@^3.2.2:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -5247,13 +5238,6 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"