Skip to content

Commit ce7d336

Browse files
JustSteveKingJustSteveKing
committed
Fixing inconsistencies from API
1 parent d5ea90a commit ce7d336

File tree

8 files changed

+75
-37
lines changed

8 files changed

+75
-37
lines changed

‎src/DTO/AccountingReference.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class AccountingReference extends DataTransferObject
2828
public static function hydrate(array $item): self
2929
{
3030
return new self(
31-
day: $item['day'],
32-
month: $item['month'],
31+
day: $item['day'] ?? null,
32+
month: $item['month'] ?? null,
3333
);
3434
}
3535
}

‎src/DTO/Accounts.php‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,28 @@ class Accounts extends DataTransferObject
4949
public static function hydrate(array $item): self
5050
{
5151
return new self(
52-
overdue: $item['overdue'],
53-
nextDue: Carbon::parse($item['next_due']),
54-
nextMadeUpTo: Carbon::parse($item['next_made_up_to']),
55-
nextAccounts: NextAccounts::hydrate(
56-
item: $item['next_accounts'],
57-
),
58-
lastAccounts: LastAccounts::hydrate(
59-
item: $item['last_accounts'],
60-
),
61-
accountingReferenceDate: AccountingReference::hydrate(
62-
item: $item['accounting_reference_date'],
63-
),
52+
overdue: $item['overdue'] ?? null,
53+
nextDue: isset($item['next_due'])
54+
? Carbon::parse($item['next_due'])
55+
: null,
56+
nextMadeUpTo: isset($item['next_made_up_to'])
57+
? Carbon::parse($item['next_made_up_to'])
58+
: null,
59+
nextAccounts: isset($item['next_accounts'])
60+
? NextAccounts::hydrate(
61+
item: $item['next_accounts'],
62+
)
63+
: null,
64+
lastAccounts: isset($item['last_accounts'])
65+
? LastAccounts::hydrate(
66+
item: $item['last_accounts'],
67+
)
68+
: null,
69+
accountingReferenceDate: isset($item['accounting_reference_date'])
70+
? AccountingReference::hydrate(
71+
item: $item['accounting_reference_date'],
72+
)
73+
: null,
6474
);
6575
}
6676
}

‎src/DTO/Company.php‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,24 @@ public static function hydrate(array $item): self
109109
insolvencyHistory: $item['has_insolvency_history'] ?? null,
110110
jurisdiction: $item['jurisdiction'] ?? null,
111111
status: $item['company_status'] ?? null,
112-
createdAt: Carbon::parse($item['date_of_creation']),
112+
createdAt: isset($item['date_of_creation'])
113+
? Carbon::parse($item['date_of_creation'])
114+
: null,
113115
sicCodes: $item['sic_codes'] ?? null,
114116
officeInDispute: $item['registered_office_is_in_dispute'] ?? null,
115-
address: Address::hydrate($item['registered_office_address']),
116-
confirmationStatement: ConfirmationStatement::hydrate(
117-
item: $item['confirmation_statement'],
118-
),
119-
accounts: Accounts::hydrate(
120-
item: $item['accounts']
121-
),
117+
address: isset($item['registered_office_address'])
118+
? Address::hydrate($item['registered_office_address'])
119+
: null,
120+
confirmationStatement: isset($item['confirmation_statement'])
121+
? ConfirmationStatement::hydrate(
122+
item: $item['confirmation_statement'],
123+
)
124+
: null,
125+
accounts: isset($item['accounts'])
126+
? Accounts::hydrate(
127+
item: $item['accounts']
128+
)
129+
: null,
122130
);
123131
}
124132
}

‎src/DTO/ConfirmationStatement.php‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,16 @@ class ConfirmationStatement extends DataTransferObject
3939
public static function hydrate(array $item): self
4040
{
4141
return new self(
42-
overdue: $item['overdue'],
43-
nextDue: Carbon::parse($item['next_due']),
44-
lastMadeUpTo: Carbon::parse($item['last_made_up_to']),
45-
nextMadeUpTo: Carbon::parse($item['next_made_up_to']),
42+
overdue: $item['overdue'] ?? null,
43+
nextDue: isset($item['next_due'])
44+
? Carbon::parse($item['next_due'])
45+
: null,
46+
lastMadeUpTo: isset($item['last_made_up_to'])
47+
? Carbon::parse($item['last_made_up_to'])
48+
: null,
49+
nextMadeUpTo: isset($item['next_made_up_to'])
50+
? Carbon::parse($item['next_made_up_to'])
51+
: null,
4652
);
4753
}
4854
}

‎src/DTO/LastAccounts.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,16 @@ class LastAccounts extends DataTransferObject
3939
public static function hydrate(array $item): self
4040
{
4141
return new self(
42-
periodStartOn: Carbon::parse($item['period_start_on']),
43-
periodEndOn: Carbon::parse($item['period_end_on']),
42+
periodStartOn: isset($item['period_start_on'])
43+
? Carbon::parse($item['period_start_on'])
44+
: null,
45+
periodEndOn: isset($item['period_end_on'])
46+
? Carbon::parse($item['period_end_on'])
47+
: null,
4448
type: $item['type'] ?? null,
45-
madeUpTo: Carbon::parse($item['made_up_to']),
49+
madeUpTo: isset($item['made_up_to'])
50+
? Carbon::parse($item['made_up_to'])
51+
: null,
4652
);
4753
}
4854
}

‎src/DTO/NextAccounts.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,15 @@ public static function hydrate(array $item): self
4040
{
4141
return new self(
4242
overdue: $item['overdue'],
43-
dueOn: Carbon::parse($item['due_on']),
44-
periodEndOn: Carbon::parse($item['period_end_on']),
45-
periodStartOn: Carbon::parse($item['period_start_on']),
43+
dueOn: isset($item['due_on'])
44+
? Carbon::parse($item['due_on'])
45+
: null,
46+
periodEndOn: isset($item['period_end_on'])
47+
? Carbon::parse($item['period_end_on'])
48+
: null,
49+
periodStartOn: isset($item['period_start_on'])
50+
? Carbon::parse($item['period_start_on'])
51+
: null,
4652
);
4753
}
4854
}

‎src/DTO/Officer.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,12 @@ public static function hydrate(array $item): self
7171
nationality: $item['nationality'] ?? null,
7272
countryOfResidence: $item['country_of_residence'] ?? null,
7373
appointmentId: static::getAppointmentIdFromLinks($item['links']),
74-
appointedOn: Carbon::parse($item['appointed_on']),
75-
address: Address::hydrate(
74+
appointedOn: isset($item['appointed_on'])
75+
? Carbon::parse($item['appointed_on'])
76+
: null,
77+
address: isset($item['address']) ? Address::hydrate(
7678
item: $item['address'],
77-
),
79+
) : null,
7880
dateOfBirth: DateOfBirth::hydrate(
7981
item: $item['date_of_birth'] ?? null,
8082
),

‎src/DTO/SearchResultOfficer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ public static function hydrate(array $item): self
7171
addressSnippet: $item['address_snippet'] ?? null,
7272
link: $item['links']['self'] ?? null,
7373
appointmentCount: $item['appointment_count'] ?? null,
74-
address: Address::hydrate(
74+
address: isset($item['address']) ? Address::hydrate(
7575
item: $item['address'],
76-
),
76+
) : null,
7777
);
7878
}
7979
}

0 commit comments

Comments
 (0)