Skip to content

Commit 05361ef

Browse files
h4kunah4kuna
committed
Data: add district
1 parent 7bcfb44 commit 05361ef

16 files changed

+73
-7
lines changed

‎src/Ares/Core/Data.php

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ class Data implements JsonSerializable, Stringable
3939

4040
public ?string $street;
4141

42+
public ?string $district;
43+
4244
/**
4345
* <prefix>DIČ
4446
* @todo https://github.com/h4kuna/ares/issues/30#issuecomment-1719170527

‎src/Ares/Core/JsonToDataTransformer.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public function transform(stdClass $json): Data
2929
$data->street = Strings::trimNull($json->sidlo->nazevUlice ?? null);
3030
$data->city = Strings::trimNull($json->sidlo->nazevObce ?? null);
3131
$data->city_post = Strings::trimNull($json->sidlo->nazevMestskeCastiObvodu ?? null);
32-
$data->city_district = Strings::trimNull($json->sidlo->nazevOkresu ?? $json->sidlo->nazevCastiObce ?? null);
32+
$data->city_district = Strings::trimNull($json->sidlo->nazevCastiObce ?? null);
33+
$data->district = Strings::trimNull($json->sidlo->nazevOkresu ?? null);
3334
$data->house_number = Helper::houseNumber((string) ($json->sidlo->cisloDomovni ?? ''), (string) ($json->sidlo->cisloOrientacni ?? ''), $json->sidlo->cisloOrientacniPismeno ?? '');
3435

3536
if ($data->zip === null && $data->street === null && $data->house_number === null && $data->city === null && isset($json->sidlo->textovaAdresa)) {

‎tests/fixtures/ares/02445344.json

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"legal_form_code": 121,
1212
"house_number": "682\/34a",
1313
"street": "K\u0159i\u017e\u00edkova",
14+
"district": null,
1415
"tin": null,
1516
"vat_payer": null,
1617
"zip": "18600",
@@ -43,6 +44,7 @@
4344
"stavZdrojeRcns": "NEEXISTUJICI",
4445
"stavZdrojeSzr": "NEEXISTUJICI",
4546
"stavZdrojeDph": true,
47+
"stavZdrojeSd": "NEEXISTUJICI",
4648
"stavZdrojeIr": "NEEXISTUJICI",
4749
"stavZdrojeCeu": "NEEXISTUJICI",
4850
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/fixtures/ares/02491427.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
"company": "Z\u00e1pado\u010desk\u00e1 spole\u010dnost, o.s.",
55
"created": "2013-12-27T00:00:00+01:00",
66
"dissolved": null,
7-
"city_district": "P\u00edsek",
7+
"city_district": "Bud\u011bjovick\u00e9 P\u0159edm\u011bst\u00ed",
88
"city_post": null,
99
"in": "02491427",
1010
"is_person": false,
1111
"legal_form_code": 706,
1212
"house_number": "105\/4",
1313
"street": "Budovcova",
14+
"district": "P\u00edsek",
1415
"tin": null,
1516
"vat_payer": false,
1617
"zip": "39701",
@@ -28,6 +29,7 @@
2829
"stavZdrojeRcns": "NEEXISTUJICI",
2930
"stavZdrojeSzr": "NEEXISTUJICI",
3031
"stavZdrojeDph": "NEEXISTUJICI",
32+
"stavZdrojeSd": "NEEXISTUJICI",
3133
"stavZdrojeIr": "NEEXISTUJICI",
3234
"stavZdrojeCeu": "NEEXISTUJICI",
3335
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/fixtures/ares/05560438.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
"company": "Ond\u0159ej Soch\u016frek",
55
"created": "2016-11-11T00:00:00+01:00",
66
"dissolved": null,
7-
"city_district": "Praha-v\u00fdchod",
7+
"city_district": "Brtnice",
88
"city_post": null,
99
"in": "05560438",
1010
"is_person": true,
1111
"legal_form_code": 101,
1212
"house_number": "94",
1313
"street": "Na Dlaskov\u011b",
14+
"district": "Praha-v\u00fdchod",
1415
"tin": "CZ8702080024",
1516
"vat_payer": false,
1617
"zip": "25169",
@@ -29,6 +30,7 @@
2930
"stavZdrojeRcns": "NEEXISTUJICI",
3031
"stavZdrojeSzr": "NEEXISTUJICI",
3132
"stavZdrojeDph": true,
33+
"stavZdrojeSd": "NEEXISTUJICI",
3234
"stavZdrojeIr": "NEEXISTUJICI",
3335
"stavZdrojeCeu": "NEEXISTUJICI",
3436
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/fixtures/ares/08975884.json

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"active": true,
3+
"city": "Vamberk",
4+
"company": "Martin Proch\u00e1zka",
5+
"created": "2020-02-21T00:00:00+01:00",
6+
"dissolved": null,
7+
"city_district": "Merklovice",
8+
"city_post": null,
9+
"in": "08975884",
10+
"is_person": true,
11+
"legal_form_code": 101,
12+
"house_number": "25",
13+
"street": null,
14+
"district": "Rychnov nad Kn\u011b\u017enou",
15+
"tin": null,
16+
"vat_payer": false,
17+
"zip": "51754",
18+
"country": "\u010cesk\u00e1 republika",
19+
"country_code": "CZ",
20+
"nace": [
21+
"620"
22+
],
23+
"sources": {
24+
"stavZdrojeVr": "NEEXISTUJICI",
25+
"stavZdrojeRes": true,
26+
"stavZdrojeRzp": true,
27+
"stavZdrojeNrpzs": "NEEXISTUJICI",
28+
"stavZdrojeRpsh": "NEEXISTUJICI",
29+
"stavZdrojeRcns": "NEEXISTUJICI",
30+
"stavZdrojeSzr": "NEEXISTUJICI",
31+
"stavZdrojeDph": "NEEXISTUJICI",
32+
"stavZdrojeSd": "NEEXISTUJICI",
33+
"stavZdrojeIr": "NEEXISTUJICI",
34+
"stavZdrojeCeu": "NEEXISTUJICI",
35+
"stavZdrojeRs": "NEEXISTUJICI",
36+
"stavZdrojeRed": "NEEXISTUJICI"
37+
}
38+
}

‎tests/fixtures/ares/16415345.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
"company": "Roman Koreck\u00fd",
55
"created": "1993-02-18T00:00:00+01:00",
66
"dissolved": null,
7-
"city_district": "Liberec",
7+
"city_district": "Liberec I-Star\u00e9 M\u011bsto",
88
"city_post": "Liberec (ne\u010dlen\u011bn\u00e9 m\u011bsto)",
99
"in": "16415345",
1010
"is_person": true,
1111
"legal_form_code": 101,
1212
"house_number": "319\/16a",
1313
"street": "Ruprechtick\u00e1",
14+
"district": "Liberec",
1415
"tin": "CZ6207141193",
1516
"vat_payer": false,
1617
"zip": "46001",
@@ -32,6 +33,7 @@
3233
"stavZdrojeRcns": "NEEXISTUJICI",
3334
"stavZdrojeSzr": "NEEXISTUJICI",
3435
"stavZdrojeDph": true,
36+
"stavZdrojeSd": "NEEXISTUJICI",
3537
"stavZdrojeIr": "NEEXISTUJICI",
3638
"stavZdrojeCeu": "NEEXISTUJICI",
3739
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/fixtures/ares/25110161.json

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"legal_form_code": 111,
1212
"house_number": "2428\/203",
1313
"street": "B\u011blohorsk\u00e1",
14+
"district": null,
1415
"tin": "CZ25110161",
1516
"vat_payer": true,
1617
"zip": "16900",
@@ -50,6 +51,7 @@
5051
"stavZdrojeRcns": "NEEXISTUJICI",
5152
"stavZdrojeSzr": "NEEXISTUJICI",
5253
"stavZdrojeDph": true,
54+
"stavZdrojeSd": true,
5355
"stavZdrojeIr": "NEEXISTUJICI",
5456
"stavZdrojeCeu": "NEEXISTUJICI",
5557
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/fixtures/ares/26713250.json

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"legal_form_code": 112,
1212
"house_number": "1213\/4",
1313
"street": "Barrandova",
14+
"district": null,
1415
"tin": "CZ26713250",
1516
"vat_payer": true,
1617
"zip": "14300",
@@ -32,6 +33,7 @@
3233
"stavZdrojeRcns": "NEEXISTUJICI",
3334
"stavZdrojeSzr": "NEEXISTUJICI",
3435
"stavZdrojeDph": true,
36+
"stavZdrojeSd": "NEEXISTUJICI",
3537
"stavZdrojeIr": "NEEXISTUJICI",
3638
"stavZdrojeCeu": "NEEXISTUJICI",
3739
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/fixtures/ares/27082440.json

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"legal_form_code": 121,
1212
"house_number": "1522\/53",
1313
"street": "Jankovcova",
14+
"district": null,
1415
"tin": "CZ27082440",
1516
"vat_payer": true,
1617
"zip": "17000",
@@ -41,6 +42,7 @@
4142
"stavZdrojeRcns": "NEEXISTUJICI",
4243
"stavZdrojeSzr": "NEEXISTUJICI",
4344
"stavZdrojeDph": true,
45+
"stavZdrojeSd": "NEEXISTUJICI",
4446
"stavZdrojeIr": "NEEXISTUJICI",
4547
"stavZdrojeCeu": "NEEXISTUJICI",
4648
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/fixtures/ares/49240901.json

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"legal_form_code": 121,
1212
"house_number": "1716\/2b",
1313
"street": "Hv\u011bzdova",
14+
"district": null,
1415
"tin": null,
1516
"vat_payer": null,
1617
"zip": "14000",
@@ -28,6 +29,7 @@
2829
"stavZdrojeRcns": "NEEXISTUJICI",
2930
"stavZdrojeSzr": "NEEXISTUJICI",
3031
"stavZdrojeDph": true,
32+
"stavZdrojeSd": "NEEXISTUJICI",
3133
"stavZdrojeIr": "NEEXISTUJICI",
3234
"stavZdrojeCeu": "NEEXISTUJICI",
3335
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/fixtures/ares/49812670.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
"company": "H. A. C. spol. s r.o.",
55
"created": "1993-09-06T00:00:00+02:00",
66
"dissolved": null,
7-
"city_district": "Pardubice",
7+
"city_district": "Semt\u00edn",
88
"city_post": "Pardubice VII",
99
"in": "49812670",
1010
"is_person": false,
1111
"legal_form_code": 112,
1212
"house_number": "97",
1313
"street": null,
14+
"district": "Pardubice",
1415
"tin": "CZ49812670",
1516
"vat_payer": true,
1617
"zip": "53353",
@@ -40,6 +41,7 @@
4041
"stavZdrojeRcns": "NEEXISTUJICI",
4142
"stavZdrojeSzr": "NEEXISTUJICI",
4243
"stavZdrojeDph": true,
44+
"stavZdrojeSd": "NEEXISTUJICI",
4345
"stavZdrojeIr": "NEEXISTUJICI",
4446
"stavZdrojeCeu": "NEEXISTUJICI",
4547
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/fixtures/ares/61682039.json

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"legal_form_code": 112,
1212
"house_number": "31",
1313
"street": "M\u011blnick\u00e1",
14+
"district": null,
1415
"tin": "CZ61682039",
1516
"vat_payer": true,
1617
"zip": "25002",
@@ -34,6 +35,7 @@
3435
"stavZdrojeRcns": "NEEXISTUJICI",
3536
"stavZdrojeSzr": "NEEXISTUJICI",
3637
"stavZdrojeDph": true,
38+
"stavZdrojeSd": "NEEXISTUJICI",
3739
"stavZdrojeIr": "NEEXISTUJICI",
3840
"stavZdrojeCeu": "NEEXISTUJICI",
3941
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/fixtures/ares/62413686.json

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"legal_form_code": 113,
1212
"house_number": "1609\/2",
1313
"street": "Lindnerova",
14+
"district": null,
1415
"tin": null,
1516
"vat_payer": false,
1617
"zip": "18000",
@@ -30,6 +31,7 @@
3031
"stavZdrojeRcns": "NEEXISTUJICI",
3132
"stavZdrojeSzr": "NEEXISTUJICI",
3233
"stavZdrojeDph": "NEEXISTUJICI",
34+
"stavZdrojeSd": "NEEXISTUJICI",
3335
"stavZdrojeIr": "NEEXISTUJICI",
3436
"stavZdrojeCeu": "NEEXISTUJICI",
3537
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/fixtures/ares/87744473.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
"company": "Milan Mat\u011bj\u010dek",
55
"created": "2011-04-04T00:00:00+02:00",
66
"dissolved": null,
7-
"city_district": "Mlad\u00e1 Boleslav",
7+
"city_district": "Doln\u00ed Bousov",
88
"city_post": null,
99
"in": "87744473",
1010
"is_person": true,
1111
"legal_form_code": 101,
1212
"house_number": "765",
1313
"street": "Dubov\u00e1",
14+
"district": "Mlad\u00e1 Boleslav",
1415
"tin": "CZ8612301071",
1516
"vat_payer": true,
1617
"zip": "29404",
@@ -32,6 +33,7 @@
3233
"stavZdrojeRcns": "NEEXISTUJICI",
3334
"stavZdrojeSzr": "NEEXISTUJICI",
3435
"stavZdrojeDph": true,
36+
"stavZdrojeSd": "NEEXISTUJICI",
3537
"stavZdrojeIr": "NEEXISTUJICI",
3638
"stavZdrojeCeu": "NEEXISTUJICI",
3739
"stavZdrojeRs": "NEEXISTUJICI",

‎tests/src/E2E/Ares/CoreTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ final class CoreTest extends TestCase
2121
protected function provideCore(): array
2222
{
2323
return [
24+
['61682039'],
25+
['08975884'], // address
2426
['2445344'], // Skanska Residential a.s., DIČ CZ699004845
2527
['2491427'], // o.s.
2628
['5560438'],
@@ -30,7 +32,6 @@ protected function provideCore(): array
3032
['27082440'], // a.s.
3133
['49240901'], // Raiffeisenbank a.s., DIČ CZ699003154
3234
['49812670'], // s.r.o.
33-
['61682039'],
3435
['62413686'], // k.s.
3536
['87744473'], // freelancer
3637
];

0 commit comments

Comments
 (0)