@@ -59,7 +59,6 @@ |
||
59 | 59 | * |
60 | 60 | * @ORM\Column(name="cod_ibge", type="integer", nullable=true) |
61 | 61 | * @Groups({"city_read","logistic_read","order_read", "people_read", "address_read", "delivery_region_read"}) |
62 | - |
|
63 | 62 | */ |
64 | 63 | private $cod_ibge; |
65 | 64 | /** |
@@ -43,7 +43,6 @@ |
||
43 | 43 | * |
44 | 44 | * @ORM\Column(name="cod_ibge", type="integer", nullable=true) |
45 | 45 | * @Groups({"city_read","logistic_read","state_read", "order_read", "people_read", "address_read", "delivery_region_read"}) |
46 | - |
|
47 | 46 | */ |
48 | 47 | private $cod_ibge; |
49 | 48 | /** |
@@ -26,7 +26,6 @@ discard block |
||
26 | 26 | * @ORM\Id |
27 | 27 | * @ORM\GeneratedValue(strategy="IDENTITY") |
28 | 28 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
29 | - |
|
30 | 29 | */ |
31 | 30 | private $id; |
32 | 31 | /** |
@@ -34,7 +33,6 @@ discard block |
||
34 | 33 | * |
35 | 34 | * @ORM\Column(name="countryCode", type="string", length=3, nullable=false) |
36 | 35 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
37 | - |
|
38 | 36 | */ |
39 | 37 | private $countrycode; |
40 | 38 | /** |
@@ -49,7 +47,6 @@ discard block |
||
49 | 47 | * |
50 | 48 | * @ORM\Column(name="currencyCode", type="string", length=3, nullable=true) |
51 | 49 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
52 | - |
|
53 | 50 | */ |
54 | 51 | private $currencycode; |
55 | 52 | /** |
@@ -57,7 +54,6 @@ discard block |
||
57 | 54 | * |
58 | 55 | * @ORM\Column(name="population", type="integer", nullable=true) |
59 | 56 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
60 | - |
|
61 | 57 | */ |
62 | 58 | private $population; |
63 | 59 | /** |
@@ -65,7 +61,6 @@ discard block |
||
65 | 61 | * |
66 | 62 | * @ORM\Column(name="fipsCode", type="string", length=2, nullable=true) |
67 | 63 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
68 | - |
|
69 | 64 | */ |
70 | 65 | private $fipscode; |
71 | 66 | /** |
@@ -81,7 +76,6 @@ discard block |
||
81 | 76 | * |
82 | 77 | * @ORM\Column(name="north", type="string", length=30, nullable=true) |
83 | 78 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
84 | - |
|
85 | 79 | */ |
86 | 80 | private $north; |
87 | 81 | /** |
@@ -89,7 +83,6 @@ discard block |
||
89 | 83 | * |
90 | 84 | * @ORM\Column(name="south", type="string", length=30, nullable=true) |
91 | 85 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
92 | - |
|
93 | 86 | */ |
94 | 87 | private $south; |
95 | 88 | /** |
@@ -98,7 +91,6 @@ discard block |
||
98 | 91 | * @ORM\Column(name="east", type="string", length=30, nullable=true) |
99 | 92 | * |
100 | 93 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
101 | - |
|
102 | 94 | */ |
103 | 95 | private $east; |
104 | 96 | /** |
@@ -106,7 +98,6 @@ discard block |
||
106 | 98 | * |
107 | 99 | * @ORM\Column(name="west", type="string", length=30, nullable=true) |
108 | 100 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
109 | - |
|
110 | 101 | */ |
111 | 102 | private $west; |
112 | 103 | /** |
@@ -114,7 +105,6 @@ discard block |
||
114 | 105 | * |
115 | 106 | * @ORM\Column(name="capital", type="string", length=30, nullable=true) |
116 | 107 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
117 | - |
|
118 | 108 | */ |
119 | 109 | private $capital; |
120 | 110 | /** |
@@ -122,7 +112,6 @@ discard block |
||
122 | 112 | * |
123 | 113 | * @ORM\Column(name="continentName", type="string", length=15, nullable=true) |
124 | 114 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
125 | - |
|
126 | 115 | */ |
127 | 116 | private $continentname; |
128 | 117 | /** |
@@ -130,7 +119,6 @@ discard block |
||
130 | 119 | * |
131 | 120 | * @ORM\Column(name="continent", type="string", length=2, nullable=true) |
132 | 121 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
133 | - |
|
134 | 122 | */ |
135 | 123 | private $continent; |
136 | 124 | /** |
@@ -138,7 +126,6 @@ discard block |
||
138 | 126 | * |
139 | 127 | * @ORM\Column(name="areaInSqKm", type="string", length=20, nullable=true) |
140 | 128 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
141 | - |
|
142 | 129 | */ |
143 | 130 | private $areainsqkm; |
144 | 131 | /** |
@@ -146,7 +133,6 @@ discard block |
||
146 | 133 | * |
147 | 134 | * @ORM\Column(name="isoAlpha3", type="string", length=3, nullable=true) |
148 | 135 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
149 | - |
|
150 | 136 | */ |
151 | 137 | private $isoalpha3; |
152 | 138 | /** |
@@ -154,7 +140,6 @@ discard block |
||
154 | 140 | * |
155 | 141 | * @ORM\Column(name="geonameId", type="integer", nullable=true) |
156 | 142 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
157 | - |
|
158 | 143 | */ |
159 | 144 | private $geonameid; |
160 | 145 | /** |
@@ -162,7 +147,6 @@ discard block |
||
162 | 147 | * |
163 | 148 | * @ORM\OneToMany(targetEntity="ControleOnline\Entity\LanguageCountry", mappedBy="country") |
164 | 149 | * @Groups({"city_read","logistic_read","state_read", "people_read", "address_read"}) |
165 | - |
|
166 | 150 | */ |
167 | 151 | private $languageCountry; |
168 | 152 | /** |
@@ -66,7 +66,6 @@ |
||
66 | 66 | * |
67 | 67 | * @ORM\Column(name="background", type="integer", nullable=true) |
68 | 68 | * @Groups({"theme_read"}) |
69 | - |
|
70 | 69 | */ |
71 | 70 | private $background; |
72 | 71 | /** |
@@ -22,65 +22,65 @@ |
||
22 | 22 | |
23 | 23 | public function findOneByCityStateCountryOfPeople(string $city, string $state, string $country, People $people): ?Address |
24 | 24 | { |
25 | - $result = $this->createQueryBuilder('a') |
|
26 | - ->innerJoin ('a.street' , 's') |
|
27 | - ->innerJoin ('s.district', 'd') |
|
28 | - ->innerJoin ('d.city' , 'c') |
|
29 | - ->innerJoin ('c.state' , 'e') |
|
30 | - ->innerJoin ('e.country' , 'u') |
|
25 | + $result = $this->createQueryBuilder('a') |
|
26 | + ->innerJoin ('a.street' , 's') |
|
27 | + ->innerJoin ('s.district', 'd') |
|
28 | + ->innerJoin ('d.city' , 'c') |
|
29 | + ->innerJoin ('c.state' , 'e') |
|
30 | + ->innerJoin ('e.country' , 'u') |
|
31 | 31 | |
32 | - ->andWhere ('c.city = :city' ) |
|
33 | - ->andWhere ('e.uf = :state' ) |
|
34 | - ->andWhere ('u.countryname = :country') |
|
35 | - ->andWhere ('a.people = :people' ) |
|
32 | + ->andWhere ('c.city = :city' ) |
|
33 | + ->andWhere ('e.uf = :state' ) |
|
34 | + ->andWhere ('u.countryname = :country') |
|
35 | + ->andWhere ('a.people = :people' ) |
|
36 | 36 | |
37 | - ->setParameter ('city' , $city ) |
|
38 | - ->setParameter ('state' , $state ) |
|
39 | - ->setParameter ('country', $country) |
|
40 | - ->setParameter ('people' , $people) |
|
37 | + ->setParameter ('city' , $city ) |
|
38 | + ->setParameter ('state' , $state ) |
|
39 | + ->setParameter ('country', $country) |
|
40 | + ->setParameter ('people' , $people) |
|
41 | 41 | |
42 | - ->getQuery() |
|
43 | - ->getResult() |
|
44 | - ; |
|
42 | + ->getQuery() |
|
43 | + ->getResult() |
|
44 | + ; |
|
45 | 45 | |
46 | - if (empty($result)) |
|
46 | + if (empty($result)) |
|
47 | 47 | return null; |
48 | 48 | |
49 | - return $result[0]; |
|
49 | + return $result[0]; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | public function findPeopleAddressBy(People $people, array $criteria): ?Address |
53 | 53 | { |
54 | - $result = $this->createQueryBuilder('a') |
|
55 | - ->innerJoin ('a.street' , 's') |
|
56 | - ->innerJoin ('s.district', 'd') |
|
57 | - ->innerJoin ('d.city' , 'c') |
|
58 | - ->innerJoin ('c.state' , 'e') |
|
59 | - ->innerJoin ('e.country' , 'u') |
|
54 | + $result = $this->createQueryBuilder('a') |
|
55 | + ->innerJoin ('a.street' , 's') |
|
56 | + ->innerJoin ('s.district', 'd') |
|
57 | + ->innerJoin ('d.city' , 'c') |
|
58 | + ->innerJoin ('c.state' , 'e') |
|
59 | + ->innerJoin ('e.country' , 'u') |
|
60 | 60 | |
61 | - ->andWhere ('a.people = :people' ) |
|
62 | - ->andWhere ('u.countryname = :country' ) |
|
63 | - ->andWhere ('(e.uf = :state OR e.state = :state)') |
|
64 | - ->andWhere ('c.city = :city' ) |
|
65 | - ->andWhere ('d.district = :district') |
|
66 | - ->andWhere ('s.street = :street' ) |
|
67 | - ->andWhere ('a.number = :number' ) |
|
61 | + ->andWhere ('a.people = :people' ) |
|
62 | + ->andWhere ('u.countryname = :country' ) |
|
63 | + ->andWhere ('(e.uf = :state OR e.state = :state)') |
|
64 | + ->andWhere ('c.city = :city' ) |
|
65 | + ->andWhere ('d.district = :district') |
|
66 | + ->andWhere ('s.street = :street' ) |
|
67 | + ->andWhere ('a.number = :number' ) |
|
68 | 68 | |
69 | - ->setParameter ('people' , $people) |
|
70 | - ->setParameter ('country' , $criteria['country'] ) |
|
71 | - ->setParameter ('state' , $criteria['state'] ) |
|
72 | - ->setParameter ('city' , $criteria['city'] ) |
|
73 | - ->setParameter ('district', $criteria['district']) |
|
74 | - ->setParameter ('street' , $criteria['street'] ) |
|
75 | - ->setParameter ('number' , $criteria['number'] ) |
|
69 | + ->setParameter ('people' , $people) |
|
70 | + ->setParameter ('country' , $criteria['country'] ) |
|
71 | + ->setParameter ('state' , $criteria['state'] ) |
|
72 | + ->setParameter ('city' , $criteria['city'] ) |
|
73 | + ->setParameter ('district', $criteria['district']) |
|
74 | + ->setParameter ('street' , $criteria['street'] ) |
|
75 | + ->setParameter ('number' , $criteria['number'] ) |
|
76 | 76 | |
77 | - ->getQuery() |
|
78 | - ->getResult() |
|
79 | - ; |
|
77 | + ->getQuery() |
|
78 | + ->getResult() |
|
79 | + ; |
|
80 | 80 | |
81 | - if (empty($result)) |
|
81 | + if (empty($result)) |
|
82 | 82 | return null; |
83 | 83 | |
84 | - return $result[0]; |
|
84 | + return $result[0]; |
|
85 | 85 | } |
86 | 86 | } |