Hide number if it is a asterisk

luizalabs · Dec 14, 2020 · 6d252c6 · 6d252c6
1 parent c9d1fcc
commit 6d252c6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/correios/models/address.py b/correios/models/address.py
@@ -284,13 +284,21 @@ def zip_code_display(self) -> str:
 
  @property
  def basic_address(self) -> str:
- number = self.number
+ number = ""
+
+ if self.number:
+ number = ", {}".format(self.number)
+
  if self.complement:
- number = "{} - {}".format(self.number, self.complement)
+ number = "{} - {}".format(number, self.complement)
 
  if self.neighborhood:
- return capitalize_phrase("{}, {}, {}".format(self.street, number, self.neighborhood))
- return capitalize_phrase("{}, {}".format(self.street, number))
+ return capitalize_phrase("{}{}, {}".format(self.street, number, self.neighborhood))
+
+ if number:
+ return capitalize_phrase("{}{}".format(self.street, number))
+
+ return capitalize_phrase("{}".format(self.street))
 
  @property
  def label_address(self) -> str:
@@ -321,7 +329,9 @@ def filtered_number(self) -> str:
 
  @property
  def number(self) -> str:
- return self.filtered_number or "S/N"
+ number = self.filtered_number or "S/N"
+
+ return number.replace('*', '')
 
  @property
  def zip_complement(self) -> str:

diff --git a/tests/test_address_models.py b/tests/test_address_models.py
@@ -388,7 +388,7 @@ def test_basic_address_with_neighborhood_without_complement():
  ('km 5', '5', '5', '5'),
  ('s/n', '', 'S/N', '0'),
  ('S/N', '', 'S/N', '0'),
- ('*', '*', '*', '*'),
+ ('*', '*', '', '*'),
 ))
 def test_address_number_handling(raw, filtered, number, zip_complement):
  address = Address(