ob-dj-store 0.0.11.3__py3-none-any.whl → 0.0.11.10__py3-none-any.whl

ob_dj_store/apis/stores/views.py

@@ -4,6 +4,8 @@ import typing
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Prefetch
+from django.http import Http404
+from django.shortcuts import get_object_or_404
 from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext_lazy as _
 from django_auto_prefetching import AutoPrefetchViewSetMixin, prefetch
@@ -24,6 +26,7 @@ from ob_dj_store.apis.stores.filters import (
     FavoriteFilter,
     InventoryFilter,
     OrderFilter,
+    PaymentMethodFilter,
     ProductFilter,
     StoreFilter,
     VariantFilter,
@@ -45,6 +48,8 @@ from ob_dj_store.apis.stores.rest.serializers.serializers import (
     ShippingMethodSerializer,
     StoreSerializer,
     TaxSerializer,
+    WalletSerializer,
+    WalletTopUpSerializer,
 )
 from ob_dj_store.core.stores.models import (
     Cart,
@@ -60,6 +65,7 @@ from ob_dj_store.core.stores.models import (
     ShippingMethod,
     Store,
     Tax,
+    Wallet,
 )
 from ob_dj_store.core.stores.models._inventory import Inventory
 
@@ -80,9 +86,10 @@ class StoreView(
     queryset = Store.objects.active()
     distance_ordering_filter_field = "location"
     filter_backends = [DistanceToPointOrderingFilter, DjangoFilterBackend]
+    lookup_value_regex = "[0-9]+"
 
     def get_permissions(self):
-        if self.action in ["favorites", "favorite", "recently_ordered_from"]:
+        if self.action in ["favorites", "favorite", "recently_ordered_from", "count"]:
             return [
                 permissions.IsAuthenticated(),
             ]
@@ -90,7 +97,7 @@ class StoreView(
 
     def get_queryset(self):
         queryset = super().get_queryset()
-        queryset.select_related("opening_hours")
+        queryset = queryset.prefetch_related("opening_hours")
         if self.action == "favorites":
             favorite_store_ids = Favorite.objects.favorites_for_model(
                 Store, self.request.user
@@ -185,29 +192,6 @@ class StoreView(
         serializer = self.get_serializer(page, many=True)
         return self.get_paginated_response(serializer.data)
 
-    @swagger_auto_schema(
-        operation_summary="Add or Remove Store from Favorites",
-        operation_description="""
-            Add or Remove Store from Favorites
-        """,
-        tags=[
-            "Store",
-        ],
-    )
-    @action(
-        detail=True,
-        methods=["GET"],
-        url_path="favorite",
-    )
-    def favorite(self, request, *args, **kwargs):
-        instance = self.get_object()
-        try:
-            Favorite.objects.favorite_for_user(instance, request.user).delete()
-        except Favorite.DoesNotExist:
-            Favorite.add_favorite(instance, request.user)
-        serializer = StoreSerializer(instance=instance, context={"request": request})
-        return Response(serializer.data)
-
     @swagger_auto_schema(
         operation_summary="Retrieve count of store's products",
         operation_description="""
@@ -228,10 +212,13 @@ class StoreView(
             product_variants__inventories__store=store
         ).values_list("id", flat=True)
         content_type = ContentType.objects.get_for_model(Product)
-        favorites_count = Favorite.objects.filter(
-            content_type=content_type,
-            object_id__in=products_ids,
-        ).count()
+        favorites_count = (
+            Favorite.objects.filter(
+                content_type=content_type, object_id__in=products_ids, user=request.user
+            ).count()
+            if request.user.id
+            else 0
+        )
         menu = Product.objects.filter(
             product_variants__inventories__store=store,
             category__isnull=False,
@@ -244,6 +231,45 @@ class StoreView(
         }
         return Response(data, status=status.HTTP_200_OK)
 
+    @swagger_auto_schema(
+        operation_summary="Retrieve count of stores",
+        operation_description="""
+            Retrieve count of stores (Nearby,previous,favorites)
+        """,
+        tags=[
+            "Store",
+        ],
+    )
+    @action(
+        detail=False,
+        methods=["GET"],
+        url_path="count",
+    )
+    def count(self, request, *args, **kwargs):
+        previous_count = (
+            super()
+            .get_queryset()
+            .filter(
+                orders__customer=self.request.user,
+                orders__status__in=[
+                    "PAID",
+                    "DELIVERED",
+                ],
+            )
+            .count()
+        )
+        nearby_count = super().get_queryset().count()
+        favorite_store_ids = Favorite.objects.favorites_for_model(
+            Store, self.request.user
+        ).values_list("object_id", flat=True)
+        favorites_count = self.queryset.filter(pk__in=favorite_store_ids).count()
+        data = {
+            "previous_count": previous_count,
+            "nearby_count": nearby_count,
+            "favorites_count": favorites_count,
+        }
+        return Response(data, status=status.HTTP_200_OK)
+
 
 class CartView(
     mixins.RetrieveModelMixin, mixins.UpdateModelMixin, viewsets.GenericViewSet
@@ -293,6 +319,7 @@ class CartItemView(
         permissions.IsAuthenticated,
     ]
     queryset = CartItem.objects.all()
+    lookup_value_regex = "[0-9]+"
 
     @swagger_auto_schema(
         operation_summary="Retrieve Cart Item",
@@ -522,10 +549,12 @@ class ProductView(
             queryset = self.queryset.filter(pk__in=favorite_product_ids)
         return queryset
 
-    def get_serializer_class(self):
-        # # TODO: Replace If logic with dict lookup
-        # Listing Serializer
-        return ProductListSerializer if self.action == "list" else ProductSerializer
+    def get_object(self):
+
+        instance = self.get_queryset().filter(pk=self.kwargs["pk"]).distinct().first()
+        if not instance:
+            raise Http404("No Product matches the given query.")
+        return instance
 
     @swagger_auto_schema(
         operation_summary="Retrieve A Product",
@@ -624,6 +653,41 @@ class CategoryViewSet(
     permission_classes = (permissions.AllowAny,)
     queryset = Category.objects.active()
     filterset_class = CategoryFilter
+    lookup_value_regex = "[0-9]+"
+
+    def get_queryset(self):
+        return super().get_queryset().prefetch_related("products__images")
+
+    def get_object(self):
+        store_id = self.request.query_params.get("store", None)
+        instance_pk = self.kwargs["pk"]
+        if not store_id:
+            return get_object_or_404(Category, pk=instance_pk, is_active=True)
+        try:
+            product_queryset = Product.objects.filter(
+                product_variants__inventories__store=store_id,
+                is_active=True,
+            )
+            instance = self.queryset.prefetch_related(
+                Prefetch(
+                    "subcategories",
+                    queryset=Category.objects.filter(
+                        products__product_variants__inventories__store=store_id
+                    ).distinct(),
+                ),
+                Prefetch(
+                    "subcategories__products",
+                    queryset=product_queryset.distinct(),
+                ),
+                Prefetch(
+                    "products",
+                    queryset=product_queryset.distinct(),
+                ),
+                "subcategories__products__images",
+            ).get(pk=instance_pk)
+        except Category.DoesNotExist:
+            raise Http404("No Category matches the given query.")
+        return instance
 
     @method_decorator(
         name="retrieve",
@@ -698,7 +762,7 @@ class TransactionsViewSet(
     def get_queryset(self):
         return Payment.objects.filter(
             user=self.request.user, status=Payment.PaymentStatus.SUCCESS.value
-        ).order_by("payment_post_at")
+        ).order_by("-payment_post_at")
 
     @swagger_auto_schema(
         operation_summary="List Users's Captured Transactions",
@@ -721,14 +785,9 @@ class PaymentMethodViewSet(
     permission_classes = [
         permissions.IsAuthenticated,
     ]
-    queryset = PaymentMethod.objects.all()
-
-    def get_queryset(self):
-        try:
-            store = Store.objects.get(pk=self.kwargs["store_pk"])
-        except ObjectDoesNotExist:
-            raise ValidationError(_(f"Store does not Exist"))
-        return store.payment_methods.filter(is_active=True)
+    queryset = PaymentMethod.objects.filter(is_active=True)
+    filterset_class = PaymentMethodFilter
+    lookup_value_regex = "[0-9]+"
 
     @swagger_auto_schema(
         operation_summary="List Payment Methods",
@@ -870,3 +929,84 @@ class FavoriteViewSet(
     )
     def destroy(self, request, *args, **kwargs):
         return super().destroy(request, *args, **kwargs)
+
+
+class WalletViewSet(
+    mixins.ListModelMixin,
+    mixins.RetrieveModelMixin,
+    mixins.UpdateModelMixin,
+    viewsets.GenericViewSet,
+):
+    queryset = Wallet.objects.all()
+    serializer_class = WalletSerializer
+    permission_classes = [
+        permissions.IsAuthenticated,
+    ]
+
+    def get_queryset(self):
+        return Wallet.objects.filter(user=self.request.user)
+
+    @swagger_auto_schema(
+        operation_summary="Get User Wallet",
+        operation_description="""
+                Get User Wallet
+            """,
+        tags=[
+            "Wallet",
+        ],
+    )
+    def retrieve(
+        self, request: Request, *args: typing.Any, **kwargs: typing.Any
+    ) -> Response:
+        return super().retrieve(request=request, *args, **kwargs)
+
+    @swagger_auto_schema(
+        operation_summary="Update user wallet",
+        operation_description="""
+            Update a wallet
+        """,
+        tags=[
+            "Wallet",
+        ],
+    )
+    def partial_update(self, request: Request, *args: typing.Any, **kwargs: typing.Any):
+        return super().partial_update(request, *args, **kwargs)
+
+    @swagger_auto_schema(
+        operation_summary="List User Wallets",
+        operation_description="""
+                List User Wallets
+            """,
+        tags=[
+            "Wallet",
+        ],
+    )
+    def list(
+        self, request: Request, *args: typing.Any, **kwargs: typing.Any
+    ) -> Response:
+        return super().list(request=request, *args, **kwargs)
+
+    @swagger_auto_schema(
+        operation_summary="top up a wallet",
+        operation_description="""
+                top up a user wallet with tap payment
+            """,
+        tags=[
+            "Wallet",
+        ],
+    )
+    @action(
+        methods=["POST"],
+        detail=True,
+        url_path="top-up",
+        url_name="top-up",
+        serializer_class=WalletTopUpSerializer,
+    )
+    def top_up_wallet(
+        self, request: Request, *args: typing.Any, **kwargs: typing.Any
+    ) -> Response:
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        instance = self.get_object()
+        payment_url = serializer.top_up_wallet(instance)
+        return Response({"payment_url": payment_url}, status=status.HTTP_200_OK)

ob_dj_store/core/stores/admin.py

@@ -99,7 +99,6 @@ class CategoryAdmin(admin.ModelAdmin):
     list_display = ["name", "is_active", "parent", "image"]
     search_fields = [
         "name",
-        "parent__name",
     ]
     list_filter = [
         "is_active",
@@ -117,6 +116,9 @@ class ProductVariantAdmin(admin.ModelAdmin):
     ]
     search_fields = ["name", "product__name", "sku"]
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).prefetch_related("inventories")
+
 
 class ProductAdmin(admin.ModelAdmin):
     list_display = ["id", "name", "category", "type", "is_active"]
@@ -221,7 +223,7 @@ class PaymentAdmin(admin.ModelAdmin):
         "method__payment_provider",
         "status",
     ]
-    search_fields = ["orders", "user__email"]
+    search_fields = ["orders__store__name", "user__email"]
 
 
 class InventoryAdmin(admin.ModelAdmin):
@@ -244,6 +246,9 @@ class InventoryAdmin(admin.ModelAdmin):
         "is_uncountable",
     ]
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).prefetch_related("store")
+
 
 class TaxAdmin(admin.ModelAdmin):
     list_display = [
@@ -272,7 +277,7 @@ class WalletTransactionAdmin(admin.ModelAdmin):
         "type",
     ]
     search_fields = [
-        "wallet__user_email",
+        "wallet__user__email",
     ]
 
 

ob_dj_store/core/stores/admin_inlines.py

@@ -22,10 +22,10 @@ class InventoryInlineAdmin(admin.TabularInline):
     extra = 1
 
     def get_queryset(self, request):
-        qs = super().get_queryset(request)
-        return qs.select_related(
-            "store",
-            "variant",
+        return (
+            super()
+            .get_queryset(request)
+            .select_related("variant", "store", "variant__product")
         )
 
 

ob_dj_store/core/stores/gateway/tap/models.py

@@ -93,7 +93,7 @@ class TapPayment(models.Model):
 
     @property
     def amount(self):
-        return self.payment.amount
+        return self.payment.total_payment
 
     def callback_update(self, tap_payload):
         if self.status == self.Status.INITIATED:

ob_dj_store/core/stores/gateway/tap/utils.py

@@ -32,7 +32,7 @@ def initiate_payment(
     callback_url = f"{settings.WEBSITE_URI}{callback_path}"
 
     payload = {
-        "amount": "%.3f" % payment.amount,
+        "amount": "%.3f" % payment.total_payment,
         "currency": currency_code,
         "source": {"id": source},
         "customer": {
@@ -59,15 +59,15 @@ def initiate_payment(
         url=f"{settings.TAP_API_URL}{url}", method=method, data=payload, headers=headers
     )
     tap_response = response.json()
-    payment_url = tap_response.get("transaction").get("url")
+    payment_transaction = tap_response.get("transaction", None)
     charge_id = tap_response.get("id")
-    if not payment_url or not charge_id:
+    if not payment_transaction or not charge_id:
         # TODO: How does this issue occur and is this the best way to handle it?
         logger.error(
             f"Failed to create charge request no payment_url or charge_id returned."
         )
         raise TapException(payload)
-
+    payment_url = payment_transaction.get("url")
     status = tap_response.get("status")
     source = tap_response.get("source").get("id") if source else ""
 

ob_dj_store/core/stores/managers.py

@@ -6,7 +6,6 @@ from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 from config import settings
-from ob_dj_store.core.stores.utils import get_country_by_currency
 
 
 class ActiveMixin:
@@ -48,11 +47,15 @@ class PaymentMethodManager(ActiveMixin, models.Manager):
 
 
 class PaymentManager(models.Manager):
-    def create(self, *args: typing.Any, **kwargs: typing.Any):
+    def create(self, currency: str, *args: typing.Any, **kwargs: typing.Any):
         from ob_dj_store.core.stores.gateway.tap.models import TapPayment
         from ob_dj_store.core.stores.models import Tax, WalletTransaction
 
-        orders = kwargs.pop("orders", [])
+        orders = kwargs.pop("orders", None)
+        if not orders:
+            raise ValidationError(
+                {"order", _("You cannot perform payment without items")}
+            )
         try:
             kwargs["payment_tax"] = Tax.objects.get(is_active=True)
         except ObjectDoesNotExist:
@@ -61,7 +64,7 @@ class PaymentManager(models.Manager):
         method = kwargs.get("method", None)
         if method:
             gateway = method.payment_provider
-        instance: "models.Payment" = super().create(*args, **kwargs)
+        instance: "models.Payment" = super().create(currency=currency, *args, **kwargs)
         instance.orders.set(orders)
         if gateway in [settings.TAP_CREDIT_CARD, settings.TAP_KNET, settings.TAP_ALL]:
             source = gateway
@@ -73,8 +76,7 @@ class PaymentManager(models.Manager):
             return instance
         elif gateway == settings.WALLET:
             try:
-                country = get_country_by_currency(kwargs["currency"])
-                wallet = kwargs["user"].wallets.get(country=country)
+                wallet = kwargs["user"].wallets.get(currency=currency)
             except ObjectDoesNotExist:
                 raise ValidationError({"wallet": _("Wallet Not Found")})
             WalletTransaction.objects.create(

ob_dj_store/core/stores/migrations/0056_auto_20230213_2224.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.1.14 on 2023-02-13 19:24
+
+from django.db import migrations, models
+
+import ob_dj_store.utils.helpers
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0055_store_image"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="category",
+            name="image_thumbnail",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                upload_to=ob_dj_store.utils.helpers.category_media_upload_to,
+            ),
+        ),
+        migrations.AddField(
+            model_name="productmedia",
+            name="image_thumbnail",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                upload_to=ob_dj_store.utils.helpers.product_media_upload_to,
+            ),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0057_auto_20230214_1724.py

@@ -0,0 +1,37 @@
+# Generated by Django 3.1.14 on 2023-02-14 14:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0056_auto_20230213_2224"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="productattribute",
+            name="max",
+            field=models.PositiveSmallIntegerField(default=1),
+        ),
+        migrations.AddField(
+            model_name="productattribute",
+            name="min",
+            field=models.PositiveSmallIntegerField(default=1),
+        ),
+        migrations.AlterField(
+            model_name="productattribute",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("ONE_CHOICE", "one choice"),
+                    ("MULTIPLE_CHOICES", "multiple choices"),
+                    ("LIST_CHOICES", "list choices"),
+                    ("INCREMENT_CHOICE", "increment choice"),
+                ],
+                default="ONE_CHOICE",
+                max_length=32,
+            ),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0058_attributechoice_is_default.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.8 on 2023-02-17 12:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0057_auto_20230214_1724"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="attributechoice",
+            name="is_default",
+            field=models.BooleanField(default=False),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0059_auto_20230217_2006.py

@@ -0,0 +1,41 @@
+# Generated by Django 3.2.8 on 2023-02-17 17:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0058_attributechoice_is_default"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="category",
+            name="image_thumbnail",
+        ),
+        migrations.RemoveField(
+            model_name="productmedia",
+            name="image_thumbnail",
+        ),
+        migrations.AddField(
+            model_name="category",
+            name="image_thumbnail_medium",
+            field=models.ImageField(blank=True, null=True, upload_to="category_media/"),
+        ),
+        migrations.AddField(
+            model_name="category",
+            name="image_thumbnail_small",
+            field=models.ImageField(blank=True, null=True, upload_to="category_media/"),
+        ),
+        migrations.AddField(
+            model_name="productmedia",
+            name="image_thumbnail_medium",
+            field=models.ImageField(blank=True, null=True, upload_to="product_media/"),
+        ),
+        migrations.AddField(
+            model_name="productmedia",
+            name="image_thumbnail_small",
+            field=models.ImageField(blank=True, null=True, upload_to="product_media/"),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0060_alter_orderitem_product_variant.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.8 on 2023-02-22 16:56
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0059_auto_20230217_2006"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="orderitem",
+            name="product_variant",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="order_items",
+                to="stores.productvariant",
+            ),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0061_auto_20230223_1435.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.8 on 2023-02-23 11:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0060_alter_orderitem_product_variant"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="attributechoice",
+            name="label",
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name="productattribute",
+            name="label",
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name="product",
+            name="name",
+            field=models.CharField(help_text="Name", max_length=200, unique=True),
+        ),
+    ]