Merge pull request #183 from purplship/purplship-2022.1

[patch] Purplship 2022.1

Author: danh91

insiders/server/orders/purplship/server/orders/apps.py

@@ -1,9 +1,11 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
 
 
 class OrdersConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
     name = "purplship.server.orders"
+    verbose_name = _("Orders")
+    default_auto_field = "django.db.models.BigAutoField"
 
     def ready(self):
         from purplship.server.orders import signals

insiders/server/orders/purplship/server/orders/signals.py

@@ -1,6 +1,8 @@
 import logging
+from attr import has
 from django.db.models import signals
 
+from purplship.server.conf import settings
 from purplship.server.core.utils import failsafe
 from purplship.server.events.serializers import EventTypes
 from purplship.server.orders.serializers.order import compute_order_status
@@ -68,16 +70,15 @@ def shipment_updated(
                 logger.info("shipment related order successfully updated")
 
 
-def order_updated(
-    sender, instance, created, raw, using, update_fields, *args, **kwargs
-):
+def order_updated(sender, instance, *args, **kwargs):
     """Order related events:
     - order created
     - order status changed (in-transit, delivered or blocked)
     """
-    changes = update_fields or []
+    created = kwargs.get("created", False)
+    changes = kwargs.get("update_fields") or []
 
-    if created:
+    if created or "created_at" in changes:
         event = EventTypes.order_created.value
     elif "status" not in changes:
         return
@@ -95,7 +96,14 @@ def order_updated(
     test_mode = instance.test_mode
     context = dict(
         user_id=failsafe(lambda: instance.created_by.id),
-        org_id=getattr(getattr(instance, "org", None), "id", None),
+        org_id=failsafe(
+            lambda: instance.org.first().id if hasattr(instance, "org") else None
+        ),
     )
 
-    tasks.notify_webhooks(event, data, event_at, context, test_mode)
+    if settings.MULTI_ORGANIZATIONS and context["org_id"] is None:
+        return
+
+    tasks.notify_webhooks(
+        event, data, event_at, context, test_mode, schema=settings.schema
+    )

insiders/server/orders/purplship/server/settings/orders.py

@@ -1,6 +1,5 @@
-from typing import List
 from purplship.server.settings.base import *
 
 
-PURPLSHIP_URLS: List[str] = [*PURPLSHIP_URLS, "purplship.server.orders.urls"]  # noqa
-INSTALLED_APPS: List[str] = [*INSTALLED_APPS, "purplship.server.orders"]  # noqa
+PURPLSHIP_URLS += ["purplship.server.orders.urls"]
+INSTALLED_APPS += ["purplship.server.orders"]

insiders/server/orders/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="purplship.server.orders",
-    version="2022.1",
+    version="2022.1.3",
     description="Multi-carrier shipping API orders module",
     long_description=long_description,
     long_description_content_type="text/markdown",

insiders/server/orgs/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="purplship.server.orgs",
-    version="2022.1",
+    version="2022.1.3",
     description="Multi-carrier shipping API organization module",
     long_description=long_description,
     long_description_content_type="text/markdown",

insiders/server/tenants/purplship/server/settings/tenants.py

@@ -2,52 +2,43 @@
 from purplship.server.settings.base import *
 
 
-DATABASES["default"]["ENGINE"] = 'django_tenants.postgresql_backend'
+DATABASES["default"]["ENGINE"] = "django_tenants.postgresql_backend"
 
 MIDDLEWARE = [
-    'django_tenants.middleware.main.TenantMainMiddleware',
+    "django_tenants.middleware.main.TenantMainMiddleware",
     *MIDDLEWARE,
 ]
 
-DATABASE_ROUTERS = (
-    'django_tenants.routers.TenantSyncRouter',
-)
+DATABASE_ROUTERS = ("django_tenants.routers.TenantSyncRouter",)
 
 SHARED_APPS = [
-    'constance',
+    "constance",
     "django_tenants",
     "purplship.server.tenants",
-
     *BASE_APPS,
-
-    'constance.backends.database',
+    "constance.backends.database",
 ]
 
-EXCLUDED_TENANT_APPS = ['constance', 'constance.backends.database']
+EXCLUDED_TENANT_APPS = ["constance", "constance.backends.database"]
 
 TENANT_APPS = [app for app in INSTALLED_APPS if app not in EXCLUDED_TENANT_APPS]
 
-INSTALLED_APPS = [
-    "django_tenants",
-    "purplship.server.tenants",
-
-    *INSTALLED_APPS
-]
+INSTALLED_APPS = ["django_tenants", "purplship.server.tenants", *INSTALLED_APPS]
 
 
 TENANT_MODEL = "tenants.Client"  # app.Model
 TENANT_DOMAIN_MODEL = "tenants.Domain"  # app.Model
 
-PUBLIC_SCHEMA_NAME = 'public'
-PUBLIC_SCHEMA_URLCONF = 'purplship.server.tenants.urls'
+PUBLIC_SCHEMA_NAME = "public"
+PUBLIC_SCHEMA_URLCONF = "purplship.server.tenants.urls"
 TENANT_LIMIT_SET_CALLS = True
 TENANT_COLOR_ADMIN_APPS = False
 
 # Storage config
-MEDIA_ROOT = BASE_DIR / '/media'
-MEDIA_URL = '/media/'
-DEFAULT_FILE_STORAGE = 'django_tenants.storage.TenantFileSystemStorage'
+MEDIA_ROOT = BASE_DIR / "/media"
+MEDIA_URL = "/media/"
+DEFAULT_FILE_STORAGE = "django_tenants.storage.TenantFileSystemStorage"
 
 # Cache config
-CACHES["default"]['KEY_FUNCTION'] = 'django_tenants.cache.make_key'
-CACHES["default"]['REVERSE_KEY_FUNCTION'] = 'django_tenants.cache.reverse_key'
+CACHES["default"]["KEY_FUNCTION"] = "django_tenants.cache.make_key"
+CACHES["default"]["REVERSE_KEY_FUNCTION"] = "django_tenants.cache.reverse_key"

insiders/server/tenants/purplship/server/tenants/admin.py

@@ -3,6 +3,7 @@
 from django.contrib.auth.models import Group
 from django.contrib.auth.admin import GroupAdmin
 from django_tenants.admin import TenantAdminMixin
+from constance.admin import ConstanceAdmin, Config
 
 from purplship.server.user.admin import UserAdmin
 import purplship.server.tenants.models as models
@@ -15,11 +16,13 @@ class TenantsAdmin(AdminSite):
 
 
 class ClientAdmin(TenantAdminMixin, ModelAdmin):
-        list_display = ('name', )
+    list_display = ("name",)
 
 
-site = TenantsAdmin(name='system')
+site = TenantsAdmin(name="system")
 site.register(get_user_model(), UserAdmin)
 site.register(Group, GroupAdmin)
 site.register(models.Client, ClientAdmin)
 site.register(models.Domain)
+
+site.register([Config], ConstanceAdmin)

insiders/server/tenants/purplship/server/tenants/apps.py

@@ -2,20 +2,4 @@
 
 
 class TenantsConfig(AppConfig):
-    name = 'purplship.server.tenants'
-
-    def ready(self):
-        # Setup signal for tenant creation update
-        from django_tenants.signals import post_schema_sync
-        from purplship.server.tenants.models import Client
-        from purplship.server.tenants.signals import created_default_admin
-        post_schema_sync.connect(created_default_admin, sender=Client)
-
-        # Init Constance for all tenants
-        # from django_tenants.utils import tenant_context
-        # for client in Client.objects.all():
-        #     with tenant_context(client):
-        #         import constance
-        #         from purplship.server.core.signals import update_settings
-        #         update_settings(constance.config)
-
+    name = "purplship.server.tenants"

insiders/server/tenants/purplship/server/tenants/urls.py

@@ -13,10 +13,16 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
-from django.urls import path
+from django.conf import settings
+from django.urls import path, include
 from purplship.server.tenants import admin as tenants_admin
 
 
+BASE_PATH = getattr(settings, "BASE_PATH", "")
 urlpatterns = [
-    path('', tenants_admin.site.urls, name='tenants_admin')
+    path(
+        BASE_PATH,
+        include([path("", tenants_admin.site.urls, name="tenants_admin")]),
+        name="purplship:tenats:index",
+    ),
 ]

insiders/server/tenants/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="purplship.server.tenants",
-    version="2021.11",
+    version="2022.1.3",
     description="Multi-carrier shipping API muti-tenant module",
     long_description=long_description,
     long_description_content_type="text/markdown",