feat: Update Dockerfile and docker-compose for Daphne, add presigned URL generation for profile photos, and enhance serializers for profile data

Author: ujjwalkar0

Dockerfile

@@ -16,4 +16,4 @@ COPY . .
 
 RUN python manage.py collectstatic --noinput
 
-CMD ["gunicorn", "mysite.wsgi:application", "--bind", "0.0.0.0:8000"]
+CMD ["daphne", "-b", "0.0.0.0", "-p", "8000", "mysite.asgi:application"]

accounts/views/login_view.py

@@ -4,24 +4,27 @@
 from rest_framework_simplejwt.tokens import RefreshToken
 from accounts.throttle.login_throttle import LoginThrottle
 from accounts.serializers import LoginSerializer
+from uploads.services import generate_presigned_view
 
 class LoginView(APIView):
     permission_classes = [permissions.AllowAny]
     serializer_class = LoginSerializer
     throttle_classes = [LoginThrottle]
 
     def post(self, request):
-        print("Login attempt", request.data)
         serializer = LoginSerializer(data=request.data)
-        print("Validating serializer")
         serializer.is_valid(raise_exception=True)
-        print("Serializer valid")
 
         user = serializer.validated_data["user"]
 
         # Generate JWT tokens
         refresh = RefreshToken.for_user(user)
 
+        # Get profile photo presigned URL
+        profile_photo = None
+        if hasattr(user, 'profile') and user.profile.avatar:
+            profile_photo = generate_presigned_view(user.profile.avatar)
+        
         return Response({
             "access": str(refresh.access_token),
             "refresh": str(refresh),
@@ -31,5 +34,6 @@ def post(self, request):
                 "email": user.email,
                 "first_name": user.first_name,
                 "last_name": user.last_name,
+                "profile_photo": profile_photo,
             }
         }, status=status.HTTP_200_OK)

accounts/views/token_validate_view.py

@@ -2,6 +2,7 @@
 from rest_framework.response import Response
 from rest_framework import permissions, status
 from accounts.serializers import TokenValidateSerializer
+from uploads.services import generate_presigned_view
 
 
 class TokenValidateView(APIView):
@@ -22,6 +23,11 @@ def post(self, request):
 
         user = serializer.validated_data["user"]
 
+        # Get profile photo presigned URL
+        profile_photo = None
+        if hasattr(user, 'profile') and user.profile.avatar:
+            profile_photo = generate_presigned_view(user.profile.avatar)
+
         return Response(
             {
                 "valid": True,
@@ -31,6 +37,7 @@ def post(self, request):
                     "email": user.email,
                     "first_name": user.first_name,
                     "last_name": user.last_name,
+                    "profile_photo": profile_photo,
                 },
             },
             status=status.HTTP_200_OK,

docker-compose.yml

@@ -7,7 +7,7 @@ services:
       sh -c "
       python manage.py migrate &&
       python manage.py collectstatic --noinput &&
-      gunicorn mysite.wsgi:application --bind 0.0.0.0:8000
+      daphne -b 0.0.0.0 -p 8000 --access-log - --verbosity 1 mysite.asgi:application
       "
     ports:
       - "8000:8000"   # ✅ only required exposed port
@@ -26,9 +26,9 @@ services:
       - REDIS_HOST=redis
 
       # S3 (MinIO)
-      - AWS_ACCESS_KEY_ID=minioadmin
-      - AWS_SECRET_ACCESS_KEY=minioadmin
-      - AWS_S3_ENDPOINT_URL=http://minio:9000
+      - AWS_ACCESS_KEY_ID=bizbuch_admin
+      - AWS_SECRET_ACCESS_KEY=bizbuch_secret_key
+      - AWS_S3_ENDPOINT_URL=http://172.28.0.13:9000
       - AWS_S3_BUCKET=bizbuch
       - AWS_DEFAULT_REGION=us-east-1
       - AWS_S3_USE_SSL=False
@@ -42,6 +42,9 @@ services:
         condition: service_started
       minio_init:
         condition: service_completed_successfully
+    networks:
+      bizbuch_network:
+        ipv4_address: 172.28.0.10
 
   db:
     image: postgres:15
@@ -50,33 +53,60 @@ services:
       POSTGRES_DB: bizbuch
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
+    # Optional: expose Postgres port only if needed for external access
+    ports:
+      - "5432:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres -d bizbuch"]
       interval: 5s
       timeout: 3s
       retries: 20
+    networks:
+      bizbuch_network:
+        ipv4_address: 172.28.0.11
 
   redis:
     image: redis:7-alpine
     restart: always
+    # Optional: expose Redis port only if needed for external access
+    # ports:
+    #   - "6379:6379"
+    networks:
+      bizbuch_network:
+        ipv4_address: 172.28.0.12
+
+  redisinsight:
+    image: redis/redisinsight:latest
+    container_name: redisinsight
+    restart: always
+    ports:
+      - "5540:5540"
+    depends_on:
+      - redis
+    networks:
+      bizbuch_network:
+        ipv4_address: 172.28.0.17
 
   minio:
     image: minio/minio:latest
     container_name: minio
     restart: always
     environment:
-      MINIO_ROOT_USER: minioadmin
-      MINIO_ROOT_PASSWORD: minioadmin
+      MINIO_ROOT_USER: bizbuch_admin
+      MINIO_ROOT_PASSWORD: bizbuch_secret_key
     command: server /data --console-address ":9001"
     volumes:
       - minio_data:/data
 
     # Optional: expose MinIO ports only if needed for UI/debugging
-    # ports:
-    #   - "9000:9000"
-    #   - "9001:9001"
+    ports:
+      - "9000:9000"
+      - "9001:9001"
+    networks:
+      bizbuch_network:
+        ipv4_address: 172.28.0.13
 
   minio_init:
     image: minio/mc:latest
@@ -85,12 +115,53 @@ services:
     restart: "no"
     entrypoint: >
       /bin/sh -c "
-      until (/usr/bin/mc alias set myminio http://minio:9000 minioadmin minioadmin) do sleep 2; done;
+      until (/usr/bin/mc alias set myminio http://minio:9000 bizbuch_admin bizbuch_secret_key) do sleep 2; done;
       /usr/bin/mc mb -p myminio/bizbuch || true;
       /usr/bin/mc anonymous set download myminio/bizbuch || true;
       exit 0;
       "
+    networks:
+      bizbuch_network:
+        ipv4_address: 172.28.0.14
+
+  pgadmin:
+    image: dpage/pgadmin4:latest
+    container_name: pgadmin
+    restart: always
+    environment:
+      PGADMIN_DEFAULT_EMAIL: admin@admin.com
+      PGADMIN_DEFAULT_PASSWORD: admin
+      PGADMIN_CONFIG_SERVER_MODE: "False"
+      PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: "False"
+    ports:
+      - "5050:80"
+    volumes:
+      - ./pgadmin/servers.json:/pgadmin4/servers.json:ro
+    depends_on:
+      - db
+    networks:
+      bizbuch_network:
+        ipv4_address: 172.28.0.16
+
+  # Uncomment the following section to enable Cloudflare Tunnel
+  # tunnel:
+  #   image: cloudflare/cloudflared:latest
+  #   command: tunnel --no-autoupdate --url http://web:8000
+  #   restart: always
+  #   depends_on:
+  #     - web
+  #   networks:
+  #     bizbuch_network:
+  #       ipv4_address: 172.28.0.15
 
 volumes:
   postgres_data:
   minio_data:
+
+networks:
+  bizbuch_network:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.28.0.0/16
+          gateway: 172.28.0.1