updated docker build

Author: TechWithTy

.github/codecov.yml

@@ -0,0 +1,75 @@
+# Codecov configuration with flags for different parts of the application
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+  status:
+    project:
+      default:
+        target: auto
+        threshold: 1%
+    patch:
+      default:
+        target: 90%
+
+# Define flag management rules
+flag_management:
+  default_rules:
+    carryforward: true
+    statuses:
+      - type: project
+        target: auto
+        threshold: 1%
+      - type: patch
+        target: 80%
+  individual_flags:
+    - name: backend
+      paths:
+        - backend/
+      carryforward: true
+      statuses:
+        - type: project
+          target: auto
+          threshold: 1%
+        - type: patch
+          target: 80%
+    - name: caching_celary_redis
+      paths:
+        - backend/apps/core/
+      carryforward: true
+    - name: credits
+      paths:
+        - backend/apps/credits/
+      carryforward: true
+    - name: monitoring
+      paths:
+        - backend/apps/monitoring/
+      carryforward: true
+    - name: stripe
+      paths:
+        - backend/apps/stripe_home/
+      carryforward: true
+    - name: users
+      paths:
+        - backend/apps/users/
+      carryforward: true
+    - name: supabase_home
+      paths:
+        - backend/apps/supabase_home/
+      carryforward: true
+
+# Ignore patterns
+ignore:
+  - "**/migrations/**"
+  - "**/admin.py"
+  - "**/__init__.py"
+  - "**/apps.py"
+
+# Comment behavior on pull requests
+comment:
+  layout: "reach, diff, flags, files"
+  behavior: default
+  require_changes: false
+  require_base: no
+  require_head: yes

.github/workflows/ci-cd.yml

@@ -135,6 +135,7 @@ jobs:
         run: |
           cd backend
           # Clear cache before tests to ensure proper isolation
+<<<<<<< HEAD
           DJANGO_SETTINGS_MODULE=config.settings python -c "import django; django.setup(); from django.core.cache import cache; cache.clear()"
 
           # Run all backend tests and generate combined coverage
@@ -145,6 +146,18 @@ jobs:
 
           # Run integration tests
           DJANGO_SETTINGS_MODULE=config.settings python -m pytest tests/test_integration.py --cov=. --cov-report=xml:integration-coverage.xml --junitxml=integration-junit.xml -o junit_family=legacy
+=======
+          python -c "import django; django.setup(); from django.core.cache import cache; cache.clear()"
+          
+          # Run all backend tests and generate combined coverage
+          python -m pytest --cov=. --cov-report=xml:coverage.xml --junitxml=junit.xml -o junit_family=legacy
+          
+          # Run API-specific tests
+          python -m pytest api/ --cov=api --cov-report=xml:api-coverage.xml --junitxml=api-junit.xml -o junit_family=legacy
+          
+          # Run integration tests
+          python -m pytest tests/test_integration.py --cov=. --cov-report=xml:integration-coverage.xml --junitxml=integration-junit.xml -o junit_family=legacy
+>>>>>>> e98d056 (updated docker build)
 
           # Ensure all coverage files exist (create empty if needed)
           for file in coverage.xml api-coverage.xml integration-coverage.xml; do
@@ -153,9 +166,12 @@ jobs:
             fi
           done
 
+<<<<<<< HEAD
           # Clear cache after tests to ensure clean state for next run
           DJANGO_SETTINGS_MODULE=config.settings python -c "import django; django.setup(); from django.core.cache import cache; cache.clear()"
 
+=======
+>>>>>>> e98d056 (updated docker build)
       - name: Upload Coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
@@ -226,8 +242,8 @@ jobs:
           file: ./docker/Dockerfile
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ steps.set-env.outputs.env }}
-            ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ github.sha }}
+            ghcr.io/${{ steps.repo-vars.outputs.repo_owner }}/${{ steps.repo-vars.outputs.repo_name }}:${{ steps.set-env.outputs.env }}
+            ghcr.io/${{ steps.repo-vars.outputs.repo_owner }}/${{ steps.repo-vars.outputs.repo_name }}:${{ github.sha }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
           build-args: |