feat: add account activation direct endpoint, custom category caching, and Stripe CLI integration

•  Added a direct URL for account activation and template (activate.html)
•  Improved category cache invalidation logic and logging in shop/signals.py
•  Refactored CategoryViewSet to use a custom cache key and removed the cache_page decorator
•  Updated ReviewSerializer to include the review ID
•  Enhanced ChatConsumer for safer async user loading
•  Integrated Stripe CLI service to docker-compose.yml for webhook forwarding
•  Minor fixes and import updates across API and account modules

Author: Yosef-AlSabbah

account/views.py

@@ -372,3 +372,4 @@ def get(self, request, uid, token):
                 'token': token,
             }
         )
+

chat/consumers.py

@@ -43,14 +43,17 @@ async def connect(self):
         from shop.models import Product  # Import Product here
 
         try:
-            self.product = await Product.objects.aget(product_id=self.product_id)
+            # Use async database operations
+            self.product = await Product.objects.select_related('user').aget(product_id=self.product_id)
         except Product.DoesNotExist:
             await self.close()
             return
 
         # Create a unique room name for the seller-buyer-product combination
         # Sort user IDs to ensure same room name regardless of who connects first
-        user_ids = sorted([str(self.user.id), str(self.product.user.id)])
+        # Use sync_to_async to safely access the product.user.id
+        product_user_id = await sync_to_async(lambda: self.product.user.id)()
+        user_ids = sorted([str(self.user.id), str(product_user_id)])
         self.room_name = f'chat_product_{self.product_id}_users_{"_".join(user_ids)}'
         self.room_group_name = f'chat_{self.room_name}'
 

docker-compose.yml

@@ -42,8 +42,33 @@ services:
       - cache
       - database
 
+  stripe-cli:
+    image: stripe/stripe-cli:latest
+    container_name: stripe-cli
+    restart: "no"
+    env_file:
+      - .env
+    environment:
+      - STRIPE_API_KEY=${STRIPE_SECRET_KEY}
+      - STRIPE_DEVICE_NAME=docker-stripe-cli
+    volumes:
+      - stripe_config:/root/.config/stripe
+    entrypoint: ["/bin/sh", "-c"]
+    command: >
+      "while ! nc -z web 8000; do
+        echo 'Waiting for web service on port 8000...';
+        sleep 2;
+      done;
+      echo 'Web service is ready!';
+      stripe login --api-key $${STRIPE_SECRET_KEY} &&
+      stripe listen --forward-to web:8000/payment/webhook/"
+    depends_on:
+      - web
+    networks:
+      - default
 
 volumes:
   database:
   static_volume:
-  media_volume:
+  media_volume:
+  stripe_config:

ecommerce_api/urls.py

@@ -26,6 +26,7 @@
 
 from shop.feeds import TrendingProductsFeed
 from shop.sitemaps import ProductSitemap
+from account.views import ActivateView
 
 sitemaps = {
     'products': ProductSitemap,
@@ -52,6 +53,7 @@ def api_root(request):
 urlpatterns = [
     path('', api_root, name='api-root'),  # Handle root path requests
     path('auth/', include('account.urls', namespace='auth')),
+    path('activate/<str:uid>/<str:token>/', ActivateView.as_view(), name='activate-direct'),
     path('api/schema/', SpectacularAPIView.as_view(), name='schema'),
     path('api/schema/swagger-ui/', SpectacularSwaggerView.as_view(url_name='schema'), name='swagger-ui'),
     path('api/schema/redoc/', SpectacularRedocView.as_view(url_name='schema'), name='redoc'),

shop/serializers.py

@@ -118,7 +118,7 @@ class ReviewSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Review
-        fields = ['user', 'rating', 'comment', 'created']
+        fields = ['id', 'user', 'rating', 'comment', 'created']
         read_only_fields = ['created']
 
 

shop/signals.py

@@ -7,15 +7,36 @@
 
 
 @receiver([post_save, post_delete], sender=Category)
-def invalidate_category_cache(sender, instance, **kwargs):
+def invalidate_category_cache(sender, instance, created=False, **kwargs):
     """
-    Invalidate the cache for the category list when a category is created or deleted.
+    Invalidate the cache for the category list when a category is created, updated or deleted.
     """
-    from django.core.cache import cache
+    import logging
+    logger = logging.getLogger(__name__)
 
-    # Clear the cache for the category list
-    cache.delete_pattern('*category_list*')
+    action = "created" if kwargs.get('created', False) else "updated" if sender == post_save else "deleted"
+    logger.info(f"Category {instance.name} was {action}, invalidating cache...")
 
+    # Clear the custom category cache key
+    try:
+        # Clear the specific cache key used in the views
+        cache.delete('category_list_custom')
+        logger.info("Category cache invalidated successfully")
+
+        # Also clear any cache_page patterns if they exist from other views
+        if hasattr(cache, 'delete_pattern'):
+            cache.delete_pattern('*category_list*')
+            cache.delete_pattern('*views.decorators.cache.cache_page*category_list*')
+            logger.info("Cache patterns also cleared")
+
+    except Exception as e:
+        logger.error(f"Error invalidating cache: {e}")
+        try:
+            # Fallback: Clear the entire cache if specific key deletion fails
+            cache.clear()
+            logger.info("Fallback: Entire cache cleared")
+        except Exception as fallback_e:
+            logger.error(f"Fallback cache clear also failed: {fallback_e}")
 
 @receiver(post_save, sender=Review)
 def update_rating_on_review_save(sender, instance, created, **kwargs):

shop/views.py

@@ -449,11 +449,31 @@ def get_permissions(self):
             self.permission_classes = [permissions.IsAdminUser]
         return super().get_permissions()
 
-    @method_decorator(cache_page(60 * 60 * 24, key_prefix=r'category_list'))
+    # Remove the cache_page decorator and implement custom caching
     def list(self, request, *args, **kwargs):
+        from django.core.cache import cache
         try:
             logger.info("Listing categories")
-            return super().list(request, *args, **kwargs)
+
+            # Create a custom cache key that we can easily invalidate
+            cache_key = 'category_list_custom'
+
+            # Check if we have cached data
+            cached_data = cache.get(cache_key)
+
+            if cached_data is None:
+                # If no cached data, get the response and cache it
+                response = super().list(request, *args, **kwargs)
+
+                # Cache the response data for 24 hours
+                cache.set(cache_key, response.data, 60 * 60 * 24)
+
+                return response
+            else:
+                # Return cached data
+                from rest_framework.response import Response
+                return Response(cached_data)
+
         except Exception as e:
             logger.error("Error listing categories: %s", e, exc_info=True)
             raise

templates/account/activate.html

@@ -0,0 +1,210 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Account Activation</title>
+    <style>
+        body {
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            margin: 0;
+            padding: 0;
+            min-height: 100vh;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+
+        .container {
+            background: white;
+            border-radius: 15px;
+            box-shadow: 0 15px 35px rgba(0, 0, 0, 0.1);
+            padding: 40px;
+            width: 100%;
+            max-width: 500px;
+            text-align: center;
+        }
+
+        .logo {
+            font-size: 28px;
+            font-weight: bold;
+            color: #667eea;
+            margin-bottom: 30px;
+        }
+
+        .icon {
+            font-size: 64px;
+            margin-bottom: 20px;
+            color: #667eea;
+        }
+
+        h1 {
+            color: #333;
+            margin-bottom: 20px;
+            font-size: 24px;
+        }
+
+        .description {
+            color: #666;
+            margin-bottom: 30px;
+            line-height: 1.6;
+        }
+
+        .btn {
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            color: white;
+            padding: 15px 30px;
+            border: none;
+            border-radius: 8px;
+            font-size: 16px;
+            font-weight: 600;
+            cursor: pointer;
+            transition: transform 0.2s;
+            width: 100%;
+            margin-top: 20px;
+        }
+
+        .btn:hover {
+            transform: translateY(-2px);
+        }
+
+        .btn:disabled {
+            opacity: 0.6;
+            cursor: not-allowed;
+            transform: none;
+        }
+
+        .alert {
+            padding: 15px;
+            border-radius: 8px;
+            margin-bottom: 20px;
+            font-weight: 500;
+            display: none;
+        }
+
+        .alert-success {
+            background: #d4edda;
+            color: #155724;
+            border: 1px solid #c3e6cb;
+        }
+
+        .alert-error {
+            background: #f8d7da;
+            color: #721c24;
+            border: 1px solid #f5c6cb;
+        }
+
+        .loading {
+            display: none;
+            margin-top: 20px;
+        }
+
+        .spinner {
+            border: 2px solid #f3f3f3;
+            border-top: 2px solid #667eea;
+            border-radius: 50%;
+            width: 20px;
+            height: 20px;
+            animation: spin 1s linear infinite;
+            display: inline-block;
+            margin-right: 10px;
+        }
+
+        @keyframes spin {
+            0% { transform: rotate(0deg); }
+            100% { transform: rotate(360deg); }
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="logo">🛍️ Hypex eCommerce</div>
+
+        <div class="icon">✅</div>
+
+        <h1>Account Activation</h1>
+
+        <div class="description">
+            Welcome! Click the button below to activate your account and start shopping.
+        </div>
+
+        <div id="messages" class="alert"></div>
+
+        <form id="activationForm" method="post" action="/auth/activate/">
+            {% csrf_token %}
+            <input type="hidden" name="uid" value="{{ uid }}">
+            <input type="hidden" name="token" value="{{ token }}">
+
+            <button type="submit" class="btn" id="activateBtn">
+                Activate Account
+            </button>
+
+            <div class="loading" id="loading">
+                <div class="spinner"></div>
+                Activating your account...
+            </div>
+        </form>
+    </div>
+
+    <script>
+        document.getElementById('activationForm').addEventListener('submit', async function(e) {
+            e.preventDefault();
+
+            const formData = new FormData(this);
+            const uid = formData.get('uid');
+            const token = formData.get('token');
+            const activateBtn = document.getElementById('activateBtn');
+            const loading = document.getElementById('loading');
+            const messages = document.getElementById('messages');
+
+            // Clear previous messages
+            messages.style.display = 'none';
+            messages.className = 'alert';
+
+            // Show loading state
+            activateBtn.disabled = true;
+            loading.style.display = 'block';
+
+            try {
+                const response = await fetch('/auth/activate/', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'X-CSRFToken': formData.get('csrfmiddlewaretoken')
+                    },
+                    body: JSON.stringify({ uid, token })
+                });
+
+                if (response.ok || response.status === 204) {
+                    messages.className = 'alert alert-success';
+                    messages.innerHTML = '🎉 Account activated successfully! Redirecting to login...';
+                    messages.style.display = 'block';
+
+                    // Redirect to login page after 2 seconds
+                    setTimeout(() => {
+                        window.location.href = '/admin/login/';
+                    }, 2000);
+
+                } else {
+                    const data = await response.json();
+                    const errorMessage = data.detail || data.error || 'Activation failed. Please try again.';
+                    messages.className = 'alert alert-error';
+                    messages.innerHTML = `❌ ${errorMessage}`;
+                    messages.style.display = 'block';
+                }
+
+            } catch (error) {
+                console.error('Activation error:', error);
+                messages.className = 'alert alert-error';
+                messages.innerHTML = '❌ Network error. Please check your connection and try again.';
+                messages.style.display = 'block';
+            } finally {
+                // Hide loading state
+                activateBtn.disabled = false;
+                loading.style.display = 'none';
+            }
+        });
+    </script>
+</body>
+</html>