Fixes: add unregistered addresses fix

core/admin.py

@@ -19,6 +19,7 @@ from .models import (
     AttributeValue,
     Brand,
     Category,
+    CategoryTag,
     Feedback,
     Order,
     OrderProduct,
@@ -29,7 +30,7 @@ from .models import (
     Promotion,
     Stock,
     Vendor,
-    Wishlist, CategoryTag,
+    Wishlist,
 )
 
 

vibes_auth/managers.py

@@ -1,26 +1,50 @@
+import logging
+import traceback
+
 from django.contrib import auth
 from django.contrib.auth.base_user import BaseUserManager
 from django.contrib.auth.hashers import make_password
 
-from core.models import Order
+from core.models import Address, Order
+
+logger = logging.getLogger(__name__)
 
 
 class UserManager(BaseUserManager):
     use_in_migrations = True
 
+    @staticmethod
+    def handle_unregistered_entities(user):
+        try:
+            orders = set()
+            for order in Order.objects.filter(attributes__icontains=user.email):
+                if not order.user:
+                    order.user = user
+                    order.save()
+                    orders.add(order.uuid)
+            for order in Order.objects.filter(attributes__icontains=user.phone_number):
+                if not order.user:
+                    order.user = user
+                    order.save()
+                    orders.add(order.uuid)
+            for address in Address.objects.filter(billing_address_order__in=orders):
+                if not address.user:
+                    address.user = user
+                    address.save()
+            for address in Address.objects.filter(shipping_address_order__in=orders):
+                if not address.user:
+                    address.user = user
+                    address.save()
+        except Exception as e:
+            logger.error(e)
+            logger.error(traceback.format_exc())
+
         def _create_user(self, email, password, **extra_fields):
             email = self.normalize_email(email)
             user = self.model(email=email, **extra_fields)
             user.password = make_password(password)
             user.save(using=self._db)
-        for order in Order.objects.filter(attributes__icontains=user.email):
+            self.handle_unregistered_entities(user)
-            if not order.user:
-                order.user = user
-                order.save()
-        for order in Order.objects.filter(attributes__icontains=user.phone_number):
-            if not order.user:
-                order.user = user
-                order.save()
             return user
 
         def create_user(self, email=None, password=None, **extra_fields):