Re-structured applications

Author: Yosef-AlSabbah

.gitignore

@@ -1,3 +1,4 @@
 .venv
 .idea
-Notes
+Notes
+.env

api/Pagination.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import User, Profile, Category, Product
+from .models import User, Profile
 
 
 @admin.register(User)
@@ -16,19 +16,3 @@ class ProfileAdmin(admin.ModelAdmin):
     list_display = ('user', 'location', 'birth_date')
     search_fields = ('user__username', 'location')
     list_filter = ('birth_date',)
-
-
-@admin.register(Category)
-class CategoryAdmin(admin.ModelAdmin):
-    list_display = ('name', 'slug')
-    search_fields = ('name',)
-    prepopulated_fields = {'slug': ('name',)}
-
-
-@admin.register(Product)
-class ProductAdmin(admin.ModelAdmin):
-    list_display = ('name', 'price', 'stock', 'category', 'slug')
-    list_filter = ('category', 'tags', 'price', 'stock')
-    search_fields = ('name', 'description', 'category__name', 'tags__name')
-    prepopulated_fields = {'slug': ('name',)}
-    autocomplete_fields = ('category',)

api/admin.py

@@ -1,11 +1,7 @@
-import uuid
-
 from django.contrib.auth.models import AbstractUser
 from django.db import models
-from django.utils.text import slugify
-from taggit.managers import TaggableManager
 
-from .utils import product_upload_to_unique, profile_upload_to_unique
+from .utils import profile_upload_to_unique
 
 
 class User(AbstractUser):
@@ -29,120 +25,3 @@ class Meta:
 
     def __str__(self):
         return f'{self.user.username} Profile'
-
-
-class Category(models.Model):
-    name = models.CharField(max_length=255)
-    slug = models.SlugField(max_length=255, unique=True)
-
-    class Meta:
-        verbose_name = "Category"
-        verbose_name_plural = "Categories"
-        indexes = [
-            models.Index(fields=['name']),
-        ]
-        ordering = ["name"]
-
-    def __str__(self):
-        return f"Category: {self.name}"
-
-
-class Product(models.Model):
-    product_id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
-    name = models.CharField(max_length=255)
-    slug = models.SlugField(max_length=255, unique=True)
-    description = models.TextField()
-    price = models.DecimalField(max_digits=10, decimal_places=2)
-    stock = models.IntegerField()
-    image = models.ImageField(
-        null=True,
-        blank=True,
-        upload_to=product_upload_to_unique
-    )
-    category = models.ForeignKey(
-        Category,
-        related_name="products",
-        on_delete=models.CASCADE,
-    )
-    tags = TaggableManager()
-
-    class Meta:
-        verbose_name = "Product"
-        verbose_name_plural = "Products"
-        indexes = [
-            models.Index(fields=['slug']),
-            models.Index(fields=['name']),
-            models.Index(fields=['category']),
-        ]
-        ordering = ["name"]
-
-    def save(self, *args, **kwargs):
-        # Auto-generate slug if not set or name changes
-        if not self.slug or self.name != self.__class__.objects.get(pk=self.pk).name:
-            self.slug = slugify(self.name)
-        super().save(*args, **kwargs)
-
-    def __str__(self):
-        return f"Product: {self.name} (ID: {self.product_id})"
-
-
-class Order(models.Model):
-    class Status(models.TextChoices):
-        PENDING = 'PE', 'Pending'
-        COMPLETED = 'CO', 'Completed'
-        CANCELLED = 'CA', 'Cancelled'
-
-    user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True)
-    quantity = models.IntegerField()
-    order_date = models.DateTimeField(auto_now_add=True)
-    status = models.CharField(max_length=10, choices=Status.choices, default=Status.PENDING)
-
-    class Meta:
-        verbose_name = "Order"
-        verbose_name_plural = "Orders"
-        indexes = [
-            models.Index(fields=['user']),
-            models.Index(fields=['order_date']),
-        ]
-        ordering = ["-order_date"]
-
-    @property
-    def total_price(self):
-        """
-        Calculate the total price of the order.
-
-        Returns:
-            Decimal: The total price, which is the sum of all order items' prices.
-        """
-        return sum(item.price for item in self.items.all())
-
-    def __str__(self):
-        return f"Order: {self.id} by {self.user.username if self.user else 'Deleted User'}"
-
-
-class OrderItem(models.Model):
-    order = models.ForeignKey(Order, related_name='items', on_delete=models.CASCADE)
-    product = models.ForeignKey(Product, on_delete=models.CASCADE)
-    quantity = models.PositiveSmallIntegerField()
-
-    class Meta:
-        verbose_name = "Order Item"
-        verbose_name_plural = "Order Items"
-        indexes = [
-            models.Index(fields=['order']),
-            models.Index(fields=['product']),
-        ]
-        ordering = ["order"]
-
-    @property
-    def price(self):
-        """
-        Calculate the total price for the order item.
-
-        Returns:
-            Decimal: The total price, which is the product of the item's price and quantity.
-        """
-        return self.product.price * self.quantity
-
-    def __str__(self):
-        return f"Order Item: {self.product.name} (Order ID: {self.order.id})"

api/models.py

@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from .models import Category, Product, User, Profile, Order, OrderItem
+from .models import User, Profile
 
 
 class UserSerializer(serializers.ModelSerializer):
@@ -14,75 +14,3 @@ class Meta:
     class Meta:
         model = User
         fields = ['username', 'profile', 'first_name', 'last_name']
-
-
-class CategorySerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Category
-        fields = ['name', 'slug']
-        extra_kwargs = {'slug': {'read_only': True}}  # Make the slug field read-only
-
-
-class ProductSerializer(serializers.ModelSerializer):
-    category = CategorySerializer()
-
-    tags = serializers.ListField(
-        child=serializers.CharField(),
-        source='tags.names',
-        required=False,
-    )
-
-    def to_internal_value(self, data):
-        if self.instance is None and 'category' not in data:
-            raise serializers.ValidationError(
-                {'category': 'This field is required when creating a product.'}
-            )
-        return super().to_internal_value(data)
-
-    def create(self, validated_data):
-        # Custom create method to handle tags
-        instance = super().create(**validated_data)  # Create the Product instance
-        tags = validated_data.pop('tags', None)  # Extract tags from validated data
-        if tags:
-            instance.tags.set(*tags)  # Assign tags to the product
-        return instance
-
-    def update(self, instance, validated_data):
-        # Custom update method to handle tags
-        tags = validated_data.pop('tags', None)  # Extract tags from validated data
-        if tags:
-            instance.tags.set(*tags)  # Replace existing tags with new ones
-        else:
-            instance.tags.clear()  # Clear tags if none are provided
-
-        return super().update(instance, validated_data)
-
-    class Meta:
-        model = Product
-        fields = [
-            'product_id',
-            'name',
-            'slug',
-            'description',
-            'price',
-            'stock',
-            'image',
-            'category',
-            'tags'
-        ]
-
-
-class OrderSerializer(serializers.ModelSerializer):
-    class OrderItemSerializer(serializers.ModelSerializer):
-        product = ProductSerializer(many=False, read_only=True)
-
-        class Meta:
-            model = OrderItem
-            fields = ['product', 'quantity', 'price']
-
-    order_items = OrderItemSerializer(many=True, read_only=True)
-
-    class Meta:
-        model = Order
-        fields = ['user', 'quantity', 'order_date', 'order_items', 'total_price']
-        read_only_fields = ['user', 'order_date']

api/serializers.py

@@ -1,26 +1,11 @@
-import os
-import uuid
+from ecommerce_api.utils.file_handling import upload_to_unique
 
 
-def upload_to_uniqe(instance, filename, directory):
-    ext = filename.split('.')[-1]
-    return os.path.join(f"{directory}/", f"{uuid.uuid4()}.{ext}")
-
-
-def product_upload_to_unique(instance, filename):
-    """
-    Generate a unique file name for the product image.
-    :param instance:
-    :param filename:
-    :return:
-    """
-    return upload_to_uniqe(instance, filename, directory="products/")
-
 def profile_upload_to_unique(instance, filename):
     """
     Generate a unique file name for the profile image.
     :param instance:
     :param filename:
     :return:
     """
-    return upload_to_uniqe(instance, filename, directory="profiles/")
+    return upload_to_unique(instance, filename, directory="profiles/")