django-restit 4.2.44__py3-none-any.whl → 4.2.45__py3-none-any.whl

{django_restit-4.2.44.dist-info → django_restit-4.2.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.44
+Version: 4.2.45
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.44.dist-info → django_restit-4.2.45.dist-info}/RECORD

@@ -120,9 +120,10 @@ location/admin.py,sha256=6S97Rlgjkk0jM15sbT1OJRPZbgvKn2rn7duCSazOXq4,297
 location/geolocate.py,sha256=UgV129vmSxnqYFBYJD2RQVOcC1-lJJ1zUaxDqOJRbG4,1694
 location/migrations/0001_initial.py,sha256=E0Kekah0vfp7VGKGYRHFEIFjFRTkd8QnFGSHNFllVv0,7000
 location/migrations/0002_geoip_subnet_alter_geoip_ip.py,sha256=n-oJrEnIqN9VnMhiZsr34LF-EXBluPm1lz1zusaMkx8,576
+location/migrations/0003_address_postalcode_suffix.py,sha256=DT8voJeMiSQyUhH-69NHK9YywaChAvIJn1ztL7fCI30,443
 location/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 location/models/__init__.py,sha256=rZhldkoKmoJQXjBAK1IIQn7K_OOJvFtIGOGVl_szqbE,230
-location/models/address.py,sha256=GFMyGg9md0y6Szj6bue7sx7ucVjhOgpwJAaz6lYtQEs,2028
+location/models/address.py,sha256=oTPQiLdg2QkfPorlm16re1OoR6TJf4Of2Ew1slun2r8,2596
 location/models/ip.py,sha256=ZaBFdW1tL1Q3bnS5gIY9SseiQ5xeeP_oyP1hp3czFeA,5984
 location/models/legacy.py,sha256=8ROsUSZrjGQkUyXeJvoxPdKAWaKfUH-AL9TIeJb7krg,1994
 location/models/location.py,sha256=01dJPJecbp5orExsIGWOsBC_KkwFRIW0rGDIwyx1r0w,2316
@@ -359,7 +360,7 @@ pushit/utils.py,sha256=IeTCGa-164nmB1jIsK1lu1O1QzUhS3BKfuXHGjCW-ck,2121
 rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
 rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
-rest/__init__.py,sha256=D1F9OsFxtJr7AuWmena-TkvTjJPlbM2SRa6S8jjJtkk,121
+rest/__init__.py,sha256=1X-W3BH6L-ujXvvzyMW1tIIeqHcQOhgRzb6isSAl9mY,121
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -492,7 +493,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.44.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.44.dist-info/METADATA,sha256=ZgC_TvH6w7_xLrj9Anw73cJI9jNaC_dJ8AfuybTH6mw,7594
-django_restit-4.2.44.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.44.dist-info/RECORD,,
+django_restit-4.2.45.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.45.dist-info/METADATA,sha256=sjprDnHaz3wHRJMOMfpI0y3UMinbPipZ0aB8mboJGdI,7594
+django_restit-4.2.45.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.45.dist-info/RECORD,,

location/migrations/0003_address_postalcode_suffix.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2024-02-20 21:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('location', '0002_geoip_subnet_alter_geoip_ip'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='address',
+            name='postalcode_suffix',
+            field=models.CharField(blank=True, default=None, max_length=32, null=True),
+        ),
+    ]

location/models/address.py

@@ -27,6 +27,7 @@ class Address(models.Model, rm.RestModel):
     county = models.CharField(max_length=127, blank=True, null=True, default=None)
     country = models.CharField(max_length=16, blank=True, null=True, default=None)
     postalcode = models.CharField(max_length=32, blank=True, null=True, default=None)
+    postalcode_suffix = models.CharField(max_length=32, blank=True, null=True, default=None)
     lat = models.FloatField(default=0.0, blank=True)
     lng = models.FloatField(default=0.0, blank=True)
 
@@ -35,14 +36,27 @@ class Address(models.Model, rm.RestModel):
             return geolocate.getTimeZone(self.lat, self.lng)
         return None
 
+    def lookup(self):
+        res = geolocate.search("{}, {}, {}".format(self.line1, self.city, self.state))
+        if isinstance(res, list) and len(res):
+            return res[0]
+        return None
+
     def refresh(self):
         try:
-            res = geolocate.search("{}, {}, {}".format(self.line1, self.city, self.state))
-            self.county = res.county
-            self.country = res.short_country
-            self.lat = res.latitude
-            self.lng = res.longitude
-            super(Address, self).save()
+            addr = self.lookup()
+            if addr:
+                if addr.county:
+                    self.county = addr.county
+                self.country = addr.country
+                if addr.lat:
+                    self.lat = addr.lat
+                    self.lng = addr.lng
+                if not self.postalcode and addr.postal_code:
+                    self.postalcode = addr.postal_code
+                if addr.postal_code_suffix:
+                    self.postalcode_suffix = addr.postal_code_suffix
+                super(Address, self).save()
         except Exception:
             rh.log_exception("address.refresh")
 

rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.44"
+__version__ = "4.2.45"