Intermediate commit: removed RabbitMQ and used Redis as a broker, removed nginx by now

Author: Yosef-AlSabbah

config/nginx/default.conf

@@ -24,26 +24,11 @@ services:
     ports:
       - "6379:6379"
 
-  rabbitmq:
-    image: rabbitmq:3-management
-    container_name: broker
-    restart: always
-    ports:
-      - "15672:15672"
-      - "5672:5672"
-    env_file:
-      - .env
-    healthcheck:
-      test: [ "CMD", "rabbitmq-diagnostics", "ping" ]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-
   web:
     build: .
     container_name: backend
     command: [ "./wait-for-it.sh", "database:5432", "--",
-               "sh", "-c", "python manage.py migrate && python manage.py collectstatic --noinput && ls -l /code/staticfiles/ && uvicorn ecommerce_api.asgi:application --host 0.0.0.0 --port 8000 --reload" ]
+               "sh", "-c", "python manage.py migrate && python manage.py collectstatic --noinput && uvicorn ecommerce_api.asgi:application --host 0.0.0.0 --port 8000 --reload" ]
     restart: always
     volumes:
       - .:/code
@@ -55,21 +40,8 @@ services:
       - .env
     depends_on:
       - cache
-      - rabbitmq
       - database
 
-  nginx:
-    image: nginx:1.27.4
-    container_name: nginx
-    restart: always
-    volumes:
-      - ./config/nginx/default.conf:/etc/nginx/conf.d/default.conf
-      - .:/code
-    ports:
-      - "80:80"
-    command: [ "/code/wait-for-it.sh", "web:8000", "--", "nginx", "-g", "daemon off;" ]
-    depends_on:
-      - web
 
 volumes:
   database:

config/nginx/default.conf.template

@@ -414,20 +414,29 @@
 
 TAGGIT_CASE_INSENSITIVE = True
 
-CELERY_BROKER_URL = f"amqp://{config('RABBITMQ_DEFAULT_USER')}:{config('RABBITMQ_DEFAULT_PASS')}@{config('RABBITMQ_HOST')}:5672/"
+# Celery Configuration using Redis
+CELERY_BROKER_URL = f"redis://{config('REDIS_HOST', default='cache')}:{config('REDIS_PORT', default='6379')}/0"
+CELERY_RESULT_BACKEND = f"redis://{config('REDIS_HOST', default='cache')}:{config('REDIS_PORT', default='6379')}/0"
+CELERY_ACCEPT_CONTENT = ['json']
+CELERY_TASK_SERIALIZER = 'json'
+CELERY_RESULT_SERIALIZER = 'json'
+CELERY_TIMEZONE = 'UTC'
 
 SESSION_ENGINE = "django.contrib.sessions.backends.cache"
 SESSION_CACHE_ALIAS = "default"
 
-# Session cookie settings for React frontend
-SESSION_COOKIE_SAMESITE = 'None'
+# Session cookie settings - Fixed for admin compatibility
+SESSION_COOKIE_SAMESITE = 'Lax'  # Changed from 'None' to 'Lax' for admin compatibility
 SESSION_COOKIE_SECURE = False  # Set to True in production with HTTPS
-SESSION_COOKIE_HTTPONLY = False
+SESSION_COOKIE_HTTPONLY = True  # Changed to True for security and admin compatibility
 SESSION_COOKIE_AGE = 1209600  # 2 weeks
+SESSION_SAVE_EVERY_REQUEST = True  # Ensure sessions are saved on every request
 
-# CSRF settings for API
-CSRF_COOKIE_SAMESITE = 'None'
+# CSRF settings - Updated for better compatibility
+CSRF_COOKIE_SAMESITE = 'Lax'  # Changed from 'None' to 'Lax'
 CSRF_COOKIE_SECURE = False  # Set to True in production with HTTPS
+CSRF_COOKIE_HTTPONLY = False  # Explicitly set for compatibility
 CSRF_TRUSTED_ORIGINS = [
     'http://localhost:3000',
+    'http://localhost:8000',  # Added for admin access
 ]

docker-compose.yml

@@ -18,7 +18,10 @@
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.sitemaps.views import sitemap
+from django.http import JsonResponse
 from django.urls import path, include
+from django.views.decorators.csrf import csrf_exempt
+from django.views.decorators.http import require_http_methods
 from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView, SpectacularSwaggerView
 
 from shop.feeds import TrendingProductsFeed
@@ -28,7 +31,26 @@
     'products': ProductSitemap,
 }
 
+
+@require_http_methods(["GET"])
+def api_root(request):
+    """Root API endpoint that provides information about available endpoints"""
+    return JsonResponse({
+        'message': 'E-commerce API',
+        'version': '1.0',
+        'status': 'healthy',
+        'endpoints': {
+            'auth': '/auth/',
+            'api': '/api/v1/',
+            'admin': '/admin/',
+            'payment': '/payment/',
+            'docs': '/api/schema/swagger-ui/',
+        }
+    })
+
+
 urlpatterns = [
+    path('', api_root, name='api-root'),  # Handle root path requests
     path('auth/', include('account.urls', namespace='auth')),
     path('api/schema/', SpectacularAPIView.as_view(), name='schema'),
     path('api/schema/swagger-ui/', SpectacularSwaggerView.as_view(url_name='schema'), name='swagger-ui'),
@@ -52,3 +74,4 @@
     from django.conf.urls.static import static
 
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)