Merge branch 'main' into 5oappy/feature/calculator-v2

TechlauncherFireApp · Sep 27, 2024 · feb24f6 · feb24f6
2 parents 88cb8ba + 7e961fe
commit feb24f6
Show file tree

Hide file tree

Showing 15 changed files with 281 additions and 143 deletions.
diff --git a/.github/workflows/deploy.yaml → .github/workflows/build.yml b/.github/workflows/deploy.yaml → .github/workflows/build.yml
@@ -3,14 +3,13 @@ name: Build
 on:
   push:
     branches: [ main ]
-  workflow_dispatch:
+  pull_request:
 
 jobs:
   version:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.gitversion.outputs.semVer }}
-
     steps:
       - name: Check out code
         uses: actions/checkout@v2
@@ -30,10 +29,10 @@ jobs:
       - name: Display SemVer
         run: |
           echo "SemVer: ${{ steps.gitversion.outputs.semVer }}"
-
   release:
     runs-on: ubuntu-latest
     needs: version
+    if: github.event_name != 'pull_request'
     permissions:
       contents: write
     steps:
@@ -61,7 +60,6 @@ jobs:
           asset_path: ./fireapp-${{ needs.version.outputs.version }}.zip
           asset_name: fireapp-${{ needs.version.outputs.version }}.zip
           asset_content_type: application/zip
-
   docker:
     runs-on: ubuntu-latest
     needs: version
@@ -75,12 +73,17 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+      - name: Lowercase Repository
+        run: |
+          echo "REPOSITORY_LC=${REPOSITORY,,}" >> ${GITHUB_ENV}
+        env:
+          REPOSITORY: '${{ github.repository }}'
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: |
-            ghcr.io/techlauncherfireapp/backend
+            ghcr.io/${{ env.REPOSITORY_LC }}
           tags: |
             type=schedule
             type=ref,event=branch
@@ -95,13 +98,27 @@ jobs:
           registry: https://ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - run: |
+          if [[ "${{ github.event_name != 'pull_request' }}" == "true" ]]; then
+            echo "TAGS=${{ steps.meta.outputs.tags }}
+            ghcr.io/${{ env.REPOSITORY_LC }}:latest
+            ghcr.io/${{ env.REPOSITORY_LC }}:${{ needs.version.outputs.version }}" >> $GITHUB_ENV
+          else
+            echo "TAGS=ghcr.io/${{ env.REPOSITORY_LC }}:${{ needs.version.outputs.version }}" >> $GITHUB_ENV
+          fi
+        id: tag
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
           context: .
           platforms: linux/amd64, linux/arm64, linux/riscv64, linux/arm/v7, linux/arm/v6
           push: true
           tags: |
-            ${{ steps.meta.outputs.tags }}
-            ghcr.io/techlauncherfireapp/backend:latest
-            ghcr.io/techlauncherfireapp/backend:${{ needs.version.outputs.version }}
+            ${{ env.TAGS }}
+  call_test:
+    needs:
+      - docker
+      - version
+    uses: ./.github/workflows/test.yml
+    with:
+      version: ${{ needs.version.outputs.version }}
diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,58 +1,65 @@
 name: Test
 
 on:
-  workflow_run:
-    workflows:
-      - deploy
-      - "Build"
-    branches:
-      - main
-    types:
-      - completed
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        type: string
 
 jobs:
-  version:
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.gitversion.outputs.semVer }}
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: '0'
-      - name: Install GitVersion
-        uses: gittools/actions/gitversion/[email protected]
-        with:
-          versionSpec: '5.x'
-      - name: Use GitVersion
-        id: gitversion # step id used as reference for output values
-        uses: gittools/actions/gitversion/[email protected]
-        with:
-          useConfigFile: true
-          showConfig: true
-          configFilePath: ./GitVersion.yml
-      - name: Display SemVer
-        run: |
-          echo "SemVer: ${{ steps.gitversion.outputs.semVer }}"
   smoke:
     runs-on: ubuntu-latest
-    needs:
-      - version
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+      - name: Lowercase Repository
+        run: |
+          echo "REPOSITORY_LC=${REPOSITORY,,}" >> ${GITHUB_ENV}
+        env:
+          REPOSITORY: '${{ github.repository }}'
       - name: Download docker compose config
-        run: wget https://raw.githubusercontent.com/TechlauncherFireApp/docker/main/docker-compose.frontend.yml
+        run: wget https://raw.githubusercontent.com/${{ github.repository_owner }}/docker/main/docker-compose.frontend.yml
       - name: Find and Replace
         uses: jacobtomlinson/gha-find-replace@v3
         with:
-          find: "ghcr.io/techlauncherfireapp/backend:latest"
-          replace: "ghcr.io/techlauncherfireapp/backend:${{ needs.version.outputs.version }}"
+          find: "ghcr.io/${{ env.REPOSITORY_LC }}:latest"
+          replace: "ghcr.io/${{ env.REPOSITORY_LC }}:${{ inputs.version }}"
           regex: false
+      - name: Inject google-credentials.json
+        run: echo "$GOOGLE_CREDENTIALS" >> google-credentials.json
+        env:
+          GOOGLE_CREDENTIALS: ${{secrets.FCM_CREDENTIALS}}
       - name: Docker Compose version
         run: docker compose version
       - name: Start containers
         run: docker compose -f "docker-compose.frontend.yml" up -d --wait
       - name: Test container
-        run: docker run --network container:backend-fireapp-1 appropriate/curl -s --retry 10 --retry-connrefused http://localhost:5000/
+        run: 
+          docker run --network container:backend-fireapp-1 appropriate/curl -s --retry 10 --retry-connrefused http://localhost:5000/
+  pytest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Inject google-credentials.json
+        run: echo "$GOOGLE_CREDENTIALS" >> google-credentials.json
+        env:
+          GOOGLE_CREDENTIALS: ${{secrets.FCM_CREDENTIALS}}
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.10"
+      - name: Install snapd
+        run: |
+          sudo apt update
+          sudo apt install snapd
+      - name: Install MiniZinc
+        run: |
+          sudo snap install minizinc --classic
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pytest
+          pip install minizinc
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+      - name: Test with pytest
+        run: |
+          pytest
diff --git a/Dockerfile b/Dockerfile
@@ -15,6 +15,8 @@ COPY . /app
 WORKDIR /app
 RUN pipenv install --system --deploy --ignore-pipfile
 
+VOLUME [/app/google-credentials.json]
+
 # Expose web server port & execute
 EXPOSE 5000
 CMD ["gunicorn", "-b", "0.0.0.0:5000", "--workers=2", "--threads=2", "--timeout=1800", "--log-level=debug", "--pythonpath", "/", "application:app"]
diff --git a/controllers/v2/__init__.py b/controllers/v2/__init__.py
@@ -3,4 +3,5 @@
 from .diet import *
 from .v2_blueprint import v2_api, v2_bp
 from .unavailability import *
-from .shift import *
+from .shift import *
+from .fcm_tokens import *
diff --git a/controllers/v2/fcm_tokens/__init__.py b/controllers/v2/fcm_tokens/__init__.py
@@ -0,0 +1 @@
+from .api import FCMToken