Refactored accounts.models

accounts/models.py

@@ -9,6 +9,7 @@
 from django.utils.text import slugify
 from contacts.models import Contact
 from teams.models import Teams
+from common import utils
 
 
 class Tags(models.Model):
@@ -80,36 +81,19 @@ class Meta:
         ordering = ["-created_on"]
 
     def get_complete_address(self):
+        """Concatenates complete address."""
         address = ""
-        if self.billing_address_line:
-            address += self.billing_address_line
-        if self.billing_street:
-            if address:
-                address += ", " + self.billing_street
-            else:
-                address += self.billing_street
-        if self.billing_city:
-            if address:
-                address += ", " + self.billing_city
-            else:
-                address += self.billing_city
-        if self.billing_state:
-            if address:
-                address += ", " + self.billing_state
-            else:
-                address += self.billing_state
-        if self.billing_postcode:
-            if address:
-                address += ", " + self.billing_postcode
-            else:
-                address += self.billing_postcode
-        if self.billing_country:
-            if address:
-                address += ", " + self.get_billing_country_display()
-            else:
-                address += self.get_billing_country_display()
+        add_to_address = [
+            self.billing_street,
+            self.billing_city,
+            self.billing_state,
+            self.billing_postcode,
+            self.get_billing_country_display(),
+        ]
+        address = utils.append_str_to(address, *add_to_address)
         return address
 
+
     @property
     def created_on_arrow(self):
         return arrow.get(self.created_on).humanize()

common/utils.py

@@ -588,3 +588,22 @@ def convert_to_custom_timezone(custom_date, custom_timezone, to_utc=False):
         custom_date = user_time_zone.localize(custom_date.replace(tzinfo=None))
         user_time_zone = pytz.UTC
     return custom_date.astimezone(user_time_zone)
+
+
+def append_str_to(append_to: str, *args, sep=", ", **kwargs):
+    """Concatenate to a string.
+
+    Args:
+        append_to(str): The string to append to.
+        args(list): list of string characters to concatenate.
+        sep(str): Seperator to use between concatenated strings.
+        kwargs(dict): Mapping of variables with intended string values.
+
+    Returns:
+        str, joined strings seperated
+    """
+    append_to = append_to or ""
+    result_list = [append_to] + list(args) + list(kwargs.values())
+    return f"{sep}".join(filter(len, result_list))
+
+