Merge pull request #65 from druling/dev

Release 11-02-2025

Author: ayushsinghal90

.env.example

@@ -1,5 +1,5 @@
 PORT=3000
-ENV=dev
+ENV=
 DEBUG=True
 ALLOWED_HOSTS=localhost,127.0.0.1,
 
@@ -24,6 +24,11 @@ ACCESS_TOKEN_LIFETIME=3600
 
 # AWS Credentials
 AWS_DEFAULT_REGION=ap-south-1
+AWS_ACCESS_KEY_ID=test
+AWS_SECRET_ACCESS_KEY=test
 
 # AWS Credentials for Localstack
-LOCALSTACK_PORT=4566
+LOCALSTACK_HOST=localhost
+LOCALSTACK_PORT=4566
+
+INTERNAL_API_TOKEN='druldruldrul'

.github/workflows/build.yml

@@ -3,13 +3,15 @@ name: Build, Push, and Deploy
 on:
   push:
     branches:
-      - handle_bounce_email
+      - dev
+      - master
+      - gamma
 
 jobs:
   build-and-push:
     name: Build and Push
     runs-on: ubuntu-latest
-    environment: dev
+    environment: ${{ github.ref == 'refs/heads/master' && 'prod' || (github.ref == 'refs/heads/dev' && 'dev' || 'staging') }}
 
     permissions:
       id-token: write

build/stack/web/Dockerfile

@@ -7,8 +7,7 @@ ENV PYTHONUNBUFFERED 1        # Force the stdout and stderr streams to be unbuff
 
 # Install system dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    postgresql-client \
-    supervisor && \
+    postgresql-client && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Set the working directory in the container

commons/enums/BaseResourceEnum.py

@@ -7,11 +7,13 @@
 
 class BaseResourceEnum(Enum):
     def __str__(self):
-        return f"{env}-{self.value}"
+        base = f"{env}-" if env else ""
+        return f"{base}{self.value}"
 
     @property
     def value(self) -> str:
-        return f"{env}-{super().value}"
+        base = f"{env}-" if env else ""
+        return f"{base}{super().value}"
 
     @classmethod
     def choices(cls):

commons/middleware/__init__.py

@@ -0,0 +1,12 @@
+from .internal_auth import InternalTokenAuthentication, IsInternalRequest
+from .api_handler import api_handler
+from .api_validation import validate
+from .api_exception_handler import handle_exceptions
+
+__all__ = [
+    InternalTokenAuthentication,
+    IsInternalRequest,
+    api_handler,
+    validate,
+    handle_exceptions,
+]

commons/middleware/internal_auth.py

@@ -0,0 +1,21 @@
+from rest_framework.authentication import BaseAuthentication
+from rest_framework.exceptions import AuthenticationFailed
+from django.conf import settings
+from rest_framework.permissions import BasePermission
+
+
+class InternalTokenAuthentication(BaseAuthentication):
+    def authenticate(self, request):
+        token = request.headers.get("Internal-Token")
+        if not token:
+            return None
+
+        if token != settings.INTERNAL_API_TOKEN:
+            raise AuthenticationFailed("Invalid token")
+
+        return None, None
+
+
+class IsInternalRequest(BasePermission):
+    def has_permission(self, request, view):
+        return request.auth is None and request.user is None

commons/service/BaseService.py

@@ -11,15 +11,17 @@ class BaseService:
     def __init__(self, model):
         self.model = model
 
-    def get_by_id(self, id):
+    def get_by_id(self, id, filters=None):
         try:
-            return self.model.objects.get(id=id)
+            query = self.model.objects.filter(id=id)
+            if filters:
+                query = query.filter(**filters)
+            return query.get()
         except self.model.DoesNotExist:
             logger.error(f"{self.model.__name__} with ID {id} does not exist.")
             raise ObjectDoesNotExist(
                 f"{self.model.__name__} with ID {id} does not exist."
             )
-
         except Exception as e:
             logger.error(
                 f"An error occurred while fetching the {self.model.__name__}: {str(e)}",

resource_limit/__init__.py constants/__init__.pyresource_limit/__init__.py renamed to constants/__init__.py

@@ -0,0 +1,5 @@
+from plan.enum import Product, PlanType
+
+
+class Promotions:
+    NEW_USER = [{"product": Product.MENU, "plan": PlanType.BASIC}]