feat(contact): Standardize info output with flat postal keys

Author: seebeen

docs/api-contact.md

@@ -52,6 +52,16 @@ array{
   id: string|null,
   roid: string|null,
   statuses: list<string>,
+  postalType: string|null,
+  postalName: string|null,
+  postalOrganization: string|null,
+  postalStreet1: string|null,
+  postalStreet2: string|null,
+  postalStreet3: string|null,
+  postalCity: string|null,
+  postalCountryCode: string|null,
+  postalProvince: string|null,
+  postalPostalCode: string|null,
   postalInfo: array{
     type: string,
     name: string,

src/Contact/ContactResponseMapper.php

@@ -42,6 +42,16 @@ public function mapCreateResponse(ContactCreateResponse $response): array
      *   id: string|null,
      *   roid: string|null,
      *   statuses: list<string>,
+     *   postalType: string|null,
+     *   postalName: string|null,
+     *   postalOrganization: string|null,
+     *   postalStreet1: string|null,
+     *   postalStreet2: string|null,
+     *   postalStreet3: string|null,
+     *   postalCity: string|null,
+     *   postalCountryCode: string|null,
+     *   postalProvince: string|null,
+     *   postalPostalCode: string|null,
      *   postalInfo: array{
      *     type: string,
      *     name: string,
@@ -75,8 +85,29 @@ public function mapCreateResponse(ContactCreateResponse $response): array
     public function mapInfoResponse(ContactInfoResponse $response): array
     {
         $postalInfo = null;
+        $postalType = null;
+        $postalName = null;
+        $postalOrganization = null;
+        $postalStreet1 = null;
+        $postalStreet2 = null;
+        $postalStreet3 = null;
+        $postalCity = null;
+        $postalCountryCode = null;
+        $postalProvince = null;
+        $postalPostalCode = null;
 
         if (null !== $response->postalInfo) {
+            $postalType = $response->postalInfo->type;
+            $postalName = $response->postalInfo->name;
+            $postalOrganization = $response->postalInfo->organization;
+            $postalStreet1 = $response->postalInfo->address->streets[0] ?? null;
+            $postalStreet2 = $response->postalInfo->address->streets[1] ?? null;
+            $postalStreet3 = $response->postalInfo->address->streets[2] ?? null;
+            $postalCity = $response->postalInfo->address->city;
+            $postalCountryCode = $response->postalInfo->address->countryCode;
+            $postalProvince = $response->postalInfo->address->province;
+            $postalPostalCode = $response->postalInfo->address->postalCode;
+
             $postalInfo = [
                 'address' => [
                     'city' => $response->postalInfo->address->city,
@@ -104,7 +135,17 @@ public function mapInfoResponse(ContactInfoResponse $response): array
             'identExpiry' => $response->identExpiry,
             'identKind' => $response->identKind,
             'legalEntity' => $response->legalEntity,
+            'postalCity' => $postalCity,
+            'postalCountryCode' => $postalCountryCode,
             'postalInfo' => $postalInfo,
+            'postalName' => $postalName,
+            'postalOrganization' => $postalOrganization,
+            'postalPostalCode' => $postalPostalCode,
+            'postalProvince' => $postalProvince,
+            'postalStreet1' => $postalStreet1,
+            'postalStreet2' => $postalStreet2,
+            'postalStreet3' => $postalStreet3,
+            'postalType' => $postalType,
             'roid' => $response->roid,
             'statuses' => $response->statuses,
             'transferDate' => $response->transferDate,

tests/Unit/Contact/ContactResponseMapperTest.php

@@ -75,6 +75,16 @@ public function testMapInfoResponse(): void
 
         self::assertSame('C-300', $mapped['id']);
         self::assertSame('ok', $mapped['statuses'][0]);
+        self::assertSame('loc', $mapped['postalType']);
+        self::assertSame('Person Example', $mapped['postalName']);
+        self::assertNull($mapped['postalOrganization']);
+        self::assertSame('Main 1', $mapped['postalStreet1']);
+        self::assertNull($mapped['postalStreet2']);
+        self::assertNull($mapped['postalStreet3']);
+        self::assertSame('Belgrade', $mapped['postalCity']);
+        self::assertSame('RS', $mapped['postalCountryCode']);
+        self::assertNull($mapped['postalProvince']);
+        self::assertNull($mapped['postalPostalCode']);
         self::assertSame('Belgrade', $mapped['postalInfo']['address']['city']);
         self::assertSame('12345', $mapped['ident']);
     }

tests/Unit/Contact/ContactServiceTest.php

@@ -177,6 +177,13 @@ public function readFrame(): string
         self::assertStringContainsString('<contact:info', $transport->writtenPayload);
         self::assertSame('C-300', $result['id']);
         self::assertSame('ok', $result['statuses'][0]);
+        self::assertSame('loc', $result['postalType']);
+        self::assertSame('Person Example', $result['postalName']);
+        self::assertSame('Main 1', $result['postalStreet1']);
+        self::assertNull($result['postalStreet2']);
+        self::assertNull($result['postalStreet3']);
+        self::assertSame('Belgrade', $result['postalCity']);
+        self::assertSame('RS', $result['postalCountryCode']);
         self::assertSame('Belgrade', $result['postalInfo']['address']['city']);
         self::assertSame('12345', $result['ident']);
     }