ob-dj-store 0.0.12.7__tar.gz → 0.0.12.9__tar.gz

{ob-dj-store-0.0.12.7 → ob-dj-store-0.0.12.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-dj-store
-Version: 0.0.12.7
+Version: 0.0.12.9
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes

{ob-dj-store-0.0.12.7 → ob-dj-store-0.0.12.9}/config/settings.py

@@ -85,6 +85,7 @@ THIRD_PARTY_APPS = [
     "drf_yasg",
     "leaflet",
     "django_auto_prefetching",
+    "silk",
 ]
 
 LOCAL_APPS = [
@@ -100,6 +101,7 @@ INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#middleware
 MIDDLEWARE = [
+    "silk.middleware.SilkyMiddleware",
     "corsheaders.middleware.CorsMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
@@ -352,7 +354,6 @@ DIGITAL_PRODUCTS_REQUIRED_KEYS = (
     "email",
     "phone_number",
     "name",
-    "message",
 )
 
 

{ob-dj-store-0.0.12.7 → ob-dj-store-0.0.12.9}/config/urls.py

@@ -27,5 +27,6 @@ urlpatterns = [
     path("ecom/", include("ob_dj_store.apis.stores.urls")),
     path("tap/", include("ob_dj_store.apis.tap.urls")),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+urlpatterns += [path("silk/", include("silk.urls", namespace="silk"))]
 
 urlpatterns += staticfiles_urlpatterns()

{ob-dj-store-0.0.12.7 → ob-dj-store-0.0.12.9}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -845,9 +845,11 @@ class StoreSerializer(FavoriteMixin, serializers.ModelSerializer):
 
     def get_in_range_delivery(self, obj):
         user_location = self.context["request"].query_params.get("point")
-        in_range_method = obj.shipping_methods.filter(
-            type=ShippingMethod.ShippingType.DELIVERY
-        ).exists()
+        in_range_method = False
+        for shipping_method in obj.shipping_methods.all():
+            if shipping_method.type == ShippingMethod.ShippingType.DELIVERY:
+                in_range_method = True
+                break
         if not in_range_method:
             return True
         if user_location and obj.poly:
@@ -900,9 +902,7 @@ class StoreSerializer(FavoriteMixin, serializers.ModelSerializer):
             return f"{ds}{unit}"
 
     def get_phone_contacts(self, obj):
-        phone_contacts = obj.phone_contacts.filter(is_active=True).order_by(
-            "-is_default"
-        )
+        phone_contacts = obj.phone_contacts.all()
         return PhoneContactSerializer(phone_contacts, many=True).data
 
     def get_current_day_opening_hours(self, obj):

{ob-dj-store-0.0.12.7 → ob-dj-store-0.0.12.9}/ob_dj_store/apis/stores/views.py

@@ -63,6 +63,7 @@ from ob_dj_store.core.stores.models import (
     Order,
     Payment,
     PaymentMethod,
+    PhoneContact,
     Product,
     ProductVariant,
     ShippingMethod,
@@ -100,8 +101,20 @@ class StoreView(
         return super(StoreView, self).get_permissions()
 
     def get_queryset(self):
-        queryset = super().get_queryset()
-        queryset = queryset.prefetch_related("opening_hours", "shipping_methods")
+        queryset = (
+            super()
+            .get_queryset()
+            .prefetch_related(
+                "shipping_methods",
+                "opening_hours",
+                Prefetch(
+                    "phone_contacts",
+                    queryset=PhoneContact.objects.filter(is_active=True).order_by(
+                        "-is_default"
+                    ),
+                ),
+            )
+        )
         if self.action == "favorites":
             favorite_store_ids = Favorite.objects.favorites_for_model(
                 Store, self.request.user
@@ -261,6 +274,7 @@ class StoreView(
                     "DELIVERED",
                 ],
             )
+            .distinct()
             .count()
         )
         nearby_count = super().get_queryset().count()
@@ -572,7 +586,7 @@ class ProductView(
                     inventories__store__pk=self.kwargs["store_pk"]
                 ).distinct(),
             ),
-        )
+        ).distinct()
 
     def get_queryset(self):
         queryset = super().get_queryset()
@@ -583,7 +597,7 @@ class ProductView(
 
             queryset = self.queryset.filter(pk__in=favorite_product_ids)
         queryset = self.apply_prefetch(queryset)
-        return queryset.distinct()
+        return queryset
 
     def get_object(self):
         queryset = super().get_queryset()
@@ -1104,7 +1118,7 @@ class WalletViewSet(
     def transactions(
         self, request: Request, *args: typing.Any, **kwargs: typing.Any
     ) -> Response:
-        queryset = self.get_object().transactions.all()
+        queryset = self.get_object().transactions.all().order_by("-created_at")
         page = self.paginate_queryset(queryset)
         if page is not None:
             serializer = self.get_serializer(page, many=True)

{ob-dj-store-0.0.12.7 → ob-dj-store-0.0.12.9}/ob_dj_store.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-dj-store
-Version: 0.0.12.7
+Version: 0.0.12.9
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes