ob-dj-store 0.0.12.1__py3-none-any.whl → 0.0.12.3__py3-none-any.whl

ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -464,12 +464,14 @@ class CartItemSerializer(InventoryValidationMixin, serializers.ModelSerializer):
     image = serializers.SerializerMethodField()
     inventory_quantity = serializers.SerializerMethodField()
     is_uncountable = serializers.SerializerMethodField()
+    product_id = serializers.SerializerMethodField()
 
     class Meta:
         model = CartItem
         fields = (
             "id",
             "product_variant",
+            "product_id",
             "quantity",
             "store",
             "unit_price",
@@ -488,6 +490,9 @@ class CartItemSerializer(InventoryValidationMixin, serializers.ModelSerializer):
             },
         }
 
+    def get_product_id(self, obj):
+        return obj.product_variant.product.id
+
     def get_inventory_quantity(self, obj):
         if obj.inventory:
             return obj.inventory.quantity
@@ -970,17 +975,17 @@ class GenericSerializer(serializers.Serializer):
         )
 
 
-class FavoriteExtraSerializer(serializers.ModelSerializer):
-    def get_favorite_extras_models():
-        extras_list = []
+def get_favorite_extras_models():
+    extras_list = []
+    for key, value in settings.FAVORITE_TYPES.items():
+        if "extras" in value:
+            extras_list.extend(value["extras"].keys())
+    return extras_list
 
-        for key, value in settings.FAVORITE_TYPES.items():
-            if "extras" in value:
-                extras_list.extend(value["extras"].keys())
-        return extras_list
 
+class FavoriteExtraSerializer(serializers.ModelSerializer):
     content_object = GenericSerializer(read_only=True)
-    object_id = serializers.IntegerField(min_value=1, write_only=True)
+    object_id = serializers.IntegerField(min_value=1)
     object_type = serializers.ChoiceField(
         write_only=True, choices=get_favorite_extras_models()
     )
@@ -994,14 +999,27 @@ class FavoriteExtraSerializer(serializers.ModelSerializer):
             "object_type",
         )
 
+    def to_representation(self, instance):
+        data = super().to_representation(instance)
+        extras = get_favorite_extras_models()
+        model_name = instance.content_type.model
+        for extra in extras:
+            if model_name == extra.lower():
+                data["object_type"] = extra
+                break
+        return data
+
 
 class FavoriteSerializer(serializers.ModelSerializer):
     content_object = GenericSerializer(read_only=True)
     extras = FavoriteExtraSerializer(many=True)
-    object_id = serializers.IntegerField(min_value=1, write_only=True)
+    object_id = serializers.IntegerField(min_value=1, required=False)
     object_type = serializers.ChoiceField(
-        write_only=True, choices=list(store_settings.FAVORITE_TYPES.keys())
+        write_only=True,
+        choices=list(store_settings.FAVORITE_TYPES.keys()),
+        required=False,
     )
+    is_available_in_store = serializers.SerializerMethodField()
 
     class Meta:
         model = Favorite
@@ -1012,11 +1030,36 @@ class FavoriteSerializer(serializers.ModelSerializer):
             "object_id",
             "object_type",
             "name",
+            "is_available_in_store",
         )
         extra_kwargs = {
             "name": {"required": True},
         }
 
+    def get_is_available_in_store(self, obj):
+        store_id = self.context["request"].query_params.get("store")
+        type = self.context["request"].query_params.get("type")
+        if type == "Product" and store_id:
+            content_type = ContentType.objects.get_for_model(ProductVariant)
+            try:
+                extra = obj.extras.get(content_type=content_type)
+                inventory = extra.content_object.inventories.get(store=store_id)
+                if inventory.is_uncountable:
+                    return True
+                return inventory.quantity > 0
+            except ObjectDoesNotExist:
+                return False
+        return None
+
+    def to_representation(self, instance):
+        data = super().to_representation(instance)
+        model_name = instance.content_type.model
+        for favorite in store_settings.FAVORITE_TYPES.keys():
+            if model_name == favorite.lower():
+                data["object_type"] = favorite
+                break
+        return data
+
     def _lookup_validation(self, data):
         content_type = ContentType.objects.get_for_model(data["content_object"])
         queryset = Favorite.objects.filter(
@@ -1024,18 +1067,18 @@ class FavoriteSerializer(serializers.ModelSerializer):
             object_id=data["content_object"].id,
             user=self.context["request"].user,
         ).prefetch_related("extras")
-
-        if not queryset.exists():
-            return
-
-        for favorite in queryset:
-            content_objects = [
-                instance.content_object for instance in favorite.extras.all()
-            ]
-            if data["extras"] == content_objects:
-                raise serializers.ValidationError(
-                    _(f"You cannot favorite the same item twice")
-                )
+        if self.instance:
+            queryset = queryset.exclude(pk=self.instance.pk)
+
+        if queryset.exists():
+            for favorite in queryset:
+                content_objects = [
+                    instance.content_object for instance in favorite.extras.all()
+                ]
+                if set(data["extras"]) == set(content_objects):
+                    raise serializers.ValidationError(
+                        _(f"You cannot favorite the same item twice")
+                    )
 
     def get_object(self, model: models.Model, id: int):
         try:
@@ -1049,14 +1092,22 @@ class FavoriteSerializer(serializers.ModelSerializer):
     def validate(self, attrs):
         validated_data = super().validate(attrs)
         extras_data = {}
-        name = validated_data["name"]
-        object_type = validated_data["object_type"]
-        object_type_model = import_string(
-            store_settings.FAVORITE_TYPES[object_type]["path"]
-        )
-        object_instance = get_object_or_404(
-            object_type_model, pk=validated_data["object_id"]
-        )
+        if self.instance is None:
+            object_type = validated_data["object_type"]
+            object_type_model = import_string(
+                store_settings.FAVORITE_TYPES[object_type]["path"]
+            )
+            object_instance = get_object_or_404(
+                object_type_model, pk=validated_data["object_id"]
+            )
+        else:
+            # when update
+            model_name = self.instance.content_type.model
+            for favorite in store_settings.FAVORITE_TYPES.keys():
+                if model_name == favorite.lower():
+                    object_type = favorite
+            object_instance = self.instance.content_object
+
         for extra in validated_data["extras"]:
             if (
                 extra["object_type"]
@@ -1092,7 +1143,7 @@ class FavoriteSerializer(serializers.ModelSerializer):
         validated_data = {
             "content_object": object_instance,
             "extras": extras,
-            "name": name,
+            "name": validated_data["name"],
         }
         self._lookup_validation(validated_data)
         return validated_data
@@ -1109,6 +1160,16 @@ class FavoriteSerializer(serializers.ModelSerializer):
             raise serializers.ValidationError(detail=e.message_dict)
         return favorite
 
+    def update(self, instance, validated_data):
+        try:
+            favorite = instance.update_favorite(
+                validated_data["name"],
+                validated_data["extras"],
+            )
+        except ValidationError as e:
+            raise serializers.ValidationError(detail=e.message_dict)
+        return favorite
+
 
 class WalletMediaSerializer(serializers.ModelSerializer):
     class Meta:

ob_dj_store/apis/stores/views.py

@@ -23,7 +23,6 @@ from rest_framework_nested.viewsets import NestedViewSetMixin
 from config import settings as store_settings
 from ob_dj_store.apis.stores.filters import (
     CategoryFilter,
-    FavoriteFilter,
     InventoryFilter,
     OrderFilter,
     PaymentMethodFilter,
@@ -861,6 +860,7 @@ class FavoriteViewSet(
     mixins.ListModelMixin,
     mixins.CreateModelMixin,
     mixins.DestroyModelMixin,
+    mixins.UpdateModelMixin,
     viewsets.GenericViewSet,
 ):
     serializer_class = FavoriteSerializer
@@ -868,11 +868,11 @@ class FavoriteViewSet(
         permissions.IsAuthenticated,
     ]
     queryset = Favorite.objects.all()
-    filterset_class = FavoriteFilter
+    #    filterset_class = FavoriteFilter
 
     def get_queryset(self):
         model = self.request.query_params.get("type")
-        if self.action == "destroy":
+        if self.action in ["destroy", "update"]:
             return self.queryset.filter(user=self.request.user)
         if not model and model not in store_settings.FAVORITE_TYPES:
             raise ValidationError(_("You must provide the favorite type"))
@@ -894,7 +894,14 @@ class FavoriteViewSet(
                 type=openapi.TYPE_STRING,
                 enum=list(store_settings.FAVORITE_TYPES),
                 required=True,
-            )
+            ),
+            openapi.Parameter(
+                "store",
+                in_=openapi.IN_QUERY,
+                description="Store i of favorite products",
+                type=openapi.TYPE_INTEGER,
+                required=True,
+            ),
         ],
         tags=[
             "Favorite",
@@ -915,6 +922,18 @@ class FavoriteViewSet(
     def create(self, request, *args, **kwargs):
         return super().create(request, *args, **kwargs)
 
+    @swagger_auto_schema(
+        operation_summary="Update Item From Favorites",
+        operation_description="""
+            Update  Item From Favorites
+        """,
+        tags=[
+            "Favorite",
+        ],
+    )
+    def update(self, request, *args, **kwargs):
+        return super().update(request, *args, **kwargs)
+
     @swagger_auto_schema(
         operation_summary="Remove Item From Favorites",
         operation_description="""

ob_dj_store/core/stores/models/_favorite.py

@@ -52,6 +52,21 @@ class Favorite(DjangoModelCleanMixin, models.Model):
             )
         return favorite
 
+    def update_favorite(self, name, extras=[]):
+        from ob_dj_store.core.stores.models._favorite import FavoriteExtra
+
+        self.name = name
+        self.save()
+        FavoriteExtra.objects.filter(favorite=self).delete()
+        for extra in extras:
+            extra_content_type = ContentType.objects.get_for_model(type(extra))
+            self.extras.create(
+                content_type=extra_content_type,
+                object_id=extra.id,
+                content_object=extra,
+            )
+        return self
+
 
 class FavoriteExtra(DjangoModelCleanMixin, models.Model):
     favorite = models.ForeignKey(

{ob_dj_store-0.0.12.1.dist-info → ob_dj_store-0.0.12.3.dist-info}/METADATA

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

{ob_dj_store-0.0.12.1.dist-info → ob_dj_store-0.0.12.3.dist-info}/RECORD

@@ -2,8 +2,8 @@ ob_dj_store/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 ob_dj_store/apis/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/apis/stores/filters.py,sha256=18Sb8Id1mgCC0zAzTOQRfBaS7bkyD_sgM8_jAbf1ulE,6349
 ob_dj_store/apis/stores/urls.py,sha256=cPForgFpOgOGCUVAk6DZcZ7qOooMf1zpDIr1BA0L_8A,1593
-ob_dj_store/apis/stores/views.py,sha256=0MTOaEHAFR4nKKjOc_bdpo93sYHkp2JvkX7hRlK3GNs,31701
-ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=YUnGJeEg63hB2jIag9CqN5xBkRC9n093wTvVv2n_42g,38299
+ob_dj_store/apis/stores/views.py,sha256=GryrtvVY3W9EiVMTnQgTL1uXtzspB75GX6_qnrjM5S0,32301
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=ozazsEKATnmMD2Oc9lx9oIn-DxNOX3mjeLKrpvsFtD8,40720
 ob_dj_store/apis/tap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/apis/tap/serializers.py,sha256=KPrBK4h2-fWvEVf6vOj2ww5-USV9WqpyYicIqoHIiXI,1065
 ob_dj_store/apis/tap/urls.py,sha256=bnOTv6an11kxpo_FdqlhsizlGPLVpNxBjCyKcf3_C9M,367
@@ -101,7 +101,7 @@ ob_dj_store/core/stores/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 ob_dj_store/core/stores/models/__init__.py,sha256=fNB_sn6HM6EmTp_Z-Q7KXD8HDWVjG3qlayrWqvygvbw,1617
 ob_dj_store/core/stores/models/_address.py,sha256=qS5TQ9Z12zx_4CrrHvG8PoYVkdiOq_MtbKR14WKh3Hw,1661
 ob_dj_store/core/stores/models/_cart.py,sha256=qgjg5MXTMRIZRJJDx5BQ1pa9__ylfrnYMMRGbB2R53c,4555
-ob_dj_store/core/stores/models/_favorite.py,sha256=IA3p4u_-U0KcpofFMSkcuNWaI7C1hFkFdgMwQYYZGzw,2513
+ob_dj_store/core/stores/models/_favorite.py,sha256=J29ECDsotIgduPpmUmieYTndymReWHkfdsZyQzz6A4g,3042
 ob_dj_store/core/stores/models/_feedback.py,sha256=eCUVgprNK5hSRKOS4M_pdR7QH2-rqhoYevlpykhCOLg,1472
 ob_dj_store/core/stores/models/_inventory.py,sha256=vAXSpCyUdYDIWgUEUUObQfhAcCcQO6j6zATrHf5dPuQ,3928
 ob_dj_store/core/stores/models/_order.py,sha256=lizkG-HEsxsC7Xasi5nnAtUnBL4riXezR48LblX-Zsk,8246
@@ -113,7 +113,7 @@ ob_dj_store/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ob_dj_store/utils/helpers.py,sha256=FtXXJOD2PILqZTyuf80bmf0KuWW64hxbJG6naJdxI5w,1607
 ob_dj_store/utils/model.py,sha256=DV7hOhTaZL3gh9sptts2jTUFlTArKG3i7oPioq9HLFE,303
 ob_dj_store/utils/utils.py,sha256=8UVAFB56qUSjJJ5f9vnermtw638gdFy4CFRCuMbns_M,1342
-ob_dj_store-0.0.12.1.dist-info/METADATA,sha256=t2LJ9I_9WBYY2LmP438sKFBdIuL_QCzr1CGRKwmJ9nM,2827
-ob_dj_store-0.0.12.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-ob_dj_store-0.0.12.1.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.12.1.dist-info/RECORD,,
+ob_dj_store-0.0.12.3.dist-info/METADATA,sha256=_2kjr1NOwjQZVvrFct_JH1heumK1WJOv-6uBl6f0Jzs,2827
+ob_dj_store-0.0.12.3.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+ob_dj_store-0.0.12.3.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.12.3.dist-info/RECORD,,

{ob_dj_store-0.0.12.1.dist-info → ob_dj_store-0.0.12.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any