Setup alembic

.all-contributorsrc

@@ -3,9 +3,7 @@
   "projectOwner": "hotosm",
   "repoType": "github",
   "repoHost": "https://github.com",
-  "files": [
-    "README.md"
-  ],
+  "files": ["README.md"],
   "imageSize": 100,
   "badgeTemplate": "[![All Contributors](https://img.shields.io/badge/HOTOSM-Thanks%20for%20contributing!-red/github/all-contributors/hotosm/FMTM?color=red&style=flat-square)](#contributors)",
   "commit": true,
@@ -16,132 +14,91 @@
       "name": "Ivan Gayton",
       "avatar_url": "https://avatars.githubusercontent.com/u/5991943?v=4",
       "profile": "http://ivangayton.net",
-      "contributions": [
-        "projectManagement",
-        "code",
-        "review",
-        "ideas"
-      ]
+      "contributions": ["projectManagement", "code", "review", "ideas"]
     },
     {
       "login": "robsavoye",
       "name": "Rob Savoye",
       "avatar_url": "https://avatars.githubusercontent.com/u/71342768?v=4",
       "profile": "https://www.hotosm.org",
-      "contributions": [
-        "maintenance",
-        "mentoring",
-        "code",
-        "review",
-        "ideas"
-      ]
+      "contributions": ["maintenance", "mentoring", "code", "review", "ideas"]
     },
     {
       "login": "krtonga",
       "name": "krtonga",
       "avatar_url": "https://avatars.githubusercontent.com/u/7307817?v=4",
       "profile": "https://github.com/krtonga",
-      "contributions": [
-        "code",
-        "doc",
-        "tool",
-        "ideas"
-      ]
+      "contributions": ["code", "doc", "tool", "ideas"]
     },
     {
       "login": "spwoodcock",
       "name": "Sam",
       "avatar_url": "https://avatars.githubusercontent.com/u/78538841?v=4",
       "profile": "https://github.com/spwoodcock",
-      "contributions": [
-        "code",
-        "review",
-        "infra",
-        "ideas"
-      ]
+      "contributions": ["code", "review", "infra", "ideas"]
     },
     {
       "login": "petya-kangalova",
       "name": "Petya ",
       "avatar_url": "https://avatars.githubusercontent.com/u/98902727?v=4",
       "profile": "https://www.hotosm.org/people/petya-kangalova/",
-      "contributions": [
-        "doc",
-        "eventOrganizing",
-        "ideas"
-      ]
+      "contributions": ["doc", "eventOrganizing", "ideas"]
     },
     {
       "login": "Mudi-business",
       "name": "Mohamed Bakari Mohamed",
       "avatar_url": "https://avatars.githubusercontent.com/u/52991565?v=4",
       "profile": "http://zanrevenue.org",
-      "contributions": [
-        "code"
-      ]
+      "contributions": ["code"]
     },
     {
       "login": "biomassives",
       "name": "G. Willson",
       "avatar_url": "https://avatars.githubusercontent.com/u/4379874?v=4",
       "profile": "https://www.scdhub.org",
-      "contributions": [
-        "code"
-      ]
+      "contributions": ["code"]
     },
     {
       "login": "Ndacyayisenga-droid",
       "name": "Tayebwa Noah",
       "avatar_url": "https://avatars.githubusercontent.com/u/58124613?v=4",
       "profile": "https://github.com/Ndacyayisenga-droid",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     },
     {
       "login": "mohammadareeb95",
       "name": "Mohammad Areeb",
       "avatar_url": "https://avatars.githubusercontent.com/u/77102111?v=4",
       "profile": "https://github.com/mohammadareeb95",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     },
     {
       "login": "AugustHottie",
       "name": "AugustHottie",
       "avatar_url": "https://avatars.githubusercontent.com/u/96122635?v=4",
       "profile": "https://github.com/AugustHottie",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     },
     {
       "login": "Balofire",
       "name": "Ahmeed Etti-Balogun",
       "avatar_url": "https://avatars.githubusercontent.com/u/102294666?v=4",
       "profile": "https://github.com/Balofire",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     },
     {
       "login": "Roseford",
       "name": "Uju",
       "avatar_url": "https://avatars.githubusercontent.com/u/75838716?v=4",
       "profile": "https://github.com/Roseford",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     },
     {
       "login": "neelimagoogly",
       "name": "Neelima Mohanty",
       "avatar_url": "https://avatars.githubusercontent.com/u/97789856?v=4",
       "profile": "https://github.com/neelimagoogly",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -13,7 +13,6 @@ ODK_CENTRAL_PASSWD=fmtm
 URL_SCHEME=http
 API_URL=127.0.0.1:8000
 FRONTEND_MAIN_URL=127.0.0.1:8080
-FRONTEND_MAP_URL=127.0.0.1:8081
 # API_PREFIX=/api
 
 ### OSM ###
@@ -34,3 +33,6 @@ FMTM_DB_HOST=fmtm-db
 FMTM_DB_USER=fmtm
 FMTM_DB_PASSWORD=fmtm
 FMTM_DB_NAME=fmtm
+
+### Underpass (optional) ###
+# UNDERPASS_API_URL=

.github/workflows/build_and_deploy.yml

@@ -9,119 +9,141 @@ on:
       - development
     paths:
       # Workflow is triggered only if src changes
-      - "src/**"
+      - src/**
   # Allow manual trigger
   workflow_dispatch:
 
-env:
-  REGISTRY: ghcr.io
-  GIT_BRANCH: ${{ github.ref_name }}
-
 jobs:
-  build-and-push-images:
+  pytest:
+    uses: ./.github/workflows/r-pytest.yml
+    with:
+      image_tag: ci-${{ github.ref_name }}
+
+  frontend-tests:
+    uses: ./.github/workflows/r-frontend_tests.yml
+
+  extract-versions:
+    needs:
+      - pytest
+      - frontend-tests
+    uses: ./.github/workflows/r-extract_versions.yml
+
+  backend-build:
+    uses: ./.github/workflows/r-build_backend.yml
+    needs: extract-versions
+    with:
+      api_version: ${{ needs.extract-versions.outputs.api_version }}
+      build_target: prod
+      image_tags: |
+        "ghcr.io/hotosm/fmtm/backend:${{ needs.extract-versions.outputs.api_version }}-${{ github.ref_name }}"
+        "ghcr.io/hotosm/fmtm/backend:latest"
+
+  frontend-main-build:
+    uses: ./.github/workflows/r-build_frontend.yml
+    needs: extract-versions
+    with:
+      environment: ${{ github.ref_name }}
+      name: main
+      app_version: ${{ needs.extract-versions.outputs.frontend_main_version }}
+      build_target: prod
+      image_tags: |
+        "ghcr.io/hotosm/fmtm/frontend:${{ needs.extract-versions.outputs.frontend_main_version }}-${{ github.ref_name }}"
+        "ghcr.io/hotosm/fmtm/frontend:latest"
+
+  smoke-test-backend:
     runs-on: ubuntu-latest
+    needs:
+      - extract-versions
+      - backend-build
     environment:
       name: ${{ github.ref_name }}
-    permissions:
-      contents: read
-      packages: write
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Persist env vars
-        run: echo "${{ secrets.DOTENV }}" >> $GITHUB_ENV
-
-      - name: Extract api version
-        id: extract_api_version
+      - name: Environment to .env
+        env:
+          GIT_BRANCH: ${{ github.ref_name }}
+          API_VERSION: ${{ needs.extract-versions.outputs.api_version }}
+          FRONTEND_MAIN_VERSION: ${{ needs.extract-versions.outputs.frontend_main_version }}
         run: |
-          cd src/backend
-          echo "API_VERSION=$(python -c 'from app.__version__ import __version__; print(__version__)')" >> $GITHUB_ENV
+          echo "${{ secrets.DOTENV }}" > .env
+          echo "GIT_BRANCH=${GIT_BRANCH}" >> .env
+          echo "API_VERSION=${API_VERSION}" >> .env
+          echo "FRONTEND_MAIN_VERSION=${FRONTEND_MAIN_VERSION}" >> .env
 
-      - name: Extract frontend versions
-        id: extract_frontend_versions
+      - name: Backend smoke test
         run: |
-          cd src/frontend
-          echo "FRONTEND_MAIN_VERSION=$(jq -r '.version' main/package.json)" >> $GITHUB_ENV
-          echo "FRONTEND_MAP_VERSION=$(jq -r '.version' fmtm_openlayer_map/package.json)" >> $GITHUB_ENV
+          echo "Not implemented" 
+          # source .env
+          # docker network create fmtm
+
+          # docker pull "postgis/postgis:14-3.3-alpine"
+          # docker run --rm -d \
+          #   --name=fmtm-db \
+          #   --network=fmtm \
+          #   -e POSTGRES_USER=fmtm \
+          #   -e POSTGRES_PASSWORD=fmtm \
+          #   -e POSTGRES_DB=fmtm \
+          #   "postgis/postgis:14-3.3-alpine"
+
+          # docker pull "ghcr.io/hotosm/fmtm/backend:${API_VERSION}-${GIT_BRANCH}"
+          # docker run --rm -d \
+          #   --network=fmtm \
+          #   -p 8080:8080 \
+          #   -e FRONTEND_MAIN_URL="http://test.com" \
+          #   -e OSM_CLIENT_ID="test" \
+          #   -e OSM_CLIENT_SECRET="test" \
+          #   -e OSM_SECRET_KEY="test" \
+          #   "ghcr.io/hotosm/fmtm/backend:${API_VERSION}-${GIT_BRANCH}"
+
+          # # First wait 10 seconds for API
+          # sleep 10
+          # # Check the exit status of curl and exit the job if it fails
+          # if ! curl -f http://localhost:8080/docs; then
+          #   echo "curl failed to access http://localhost:8080/docs"
+          #   exit 1
+          # fi
+
+  smoke-test-frontend:
+    runs-on: ubuntu-latest
+    needs:
+      - extract-versions
+      - frontend-main-build
+    environment:
+      name: ${{ github.ref_name }}
 
-      - name: Build and push backend
-        uses: docker/build-push-action@v4
-        with:
-          context: src/backend
-          target: prod
-          push: true
-          tags: |
-            "ghcr.io/hotosm/fmtm/backend:${{ env.API_VERSION }}-${{ github.ref_name }}"
-            "ghcr.io/hotosm/fmtm/backend:latest"
-          build-args: |
-            APP_VERSION=${{ env.API_VERSION }}
-
-      - name: Build and push frontend main
-        uses: docker/build-push-action@v4
-        with:
-          context: src/frontend
-          file: src/frontend/prod.dockerfile
-          push: true
-          tags: "ghcr.io/hotosm/fmtm/frontend/main:${{ env.FRONTEND_MAIN_VERSION }}-${{ github.ref_name }}"
-          build-args: |
-            APP_NAME=main
-            APP_VERSION=${{ env.FRONTEND_MAIN_VERSION }}
-            API_URL=${{ env.URL_SCHEME }}://${{ env.API_URL }}
-            FRONTEND_MAIN_URL=${{ env.URL_SCHEME }}://${{ env.FRONTEND_MAIN_URL }}
-            FRONTEND_MAP_URL=${{ env.URL_SCHEME }}://${{ env.FRONTEND_MAP_URL }}
-
-      - name: Build and push frontend map
-        uses: docker/build-push-action@v4
-        with:
-          context: src/frontend
-          file: src/frontend/prod.dockerfile
-          push: true
-          tags: "ghcr.io/hotosm/fmtm/frontend/map:${{ env.FRONTEND_MAP_VERSION }}-${{ github.ref_name }}"
-          build-args: |
-            APP_NAME=fmtm_openlayer_map
-            APP_VERSION=${{ env.FRONTEND_MAP_VERSION }}
-            API_URL=${{ env.URL_SCHEME }}://${{ env.API_URL }}
-            FRONTEND_MAIN_URL=${{ env.URL_SCHEME }}://${{ env.FRONTEND_MAIN_URL }}
-            FRONTEND_MAP_URL=${{ env.URL_SCHEME }}://${{ env.FRONTEND_MAP_URL }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Frontend smoke test
+        run: echo "Not implemented"
 
   deploy-containers:
     runs-on: ubuntu-latest
-    needs: build-and-push-images
+    needs:
+      - extract-versions
+      - smoke-test-backend
+      - smoke-test-frontend
     environment:
       name: ${{ github.ref_name }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Extract api version
-        id: extract_api_version
-        run: |
-          cd src/backend
-          echo "API_VERSION=$(python -c 'from app.__version__ import __version__; print(__version__)')" >> $GITHUB_OUTPUT
-
-      - name: Extract frontend versions
-        id: extract_frontend_versions
-        run: |
-          cd src/frontend
-          echo "FRONTEND_MAIN_VERSION=$(jq -r '.version' main/package.json)" >> $GITHUB_OUTPUT
-          echo "FRONTEND_MAP_VERSION=$(jq -r '.version' fmtm_openlayer_map/package.json)" >> $GITHUB_OUTPUT
-
       - name: Environment to .env
+        env:
+          GIT_BRANCH: ${{ github.ref_name }}
+          API_VERSION: ${{ needs.extract-versions.outputs.api_version }}
+          FRONTEND_MAIN_VERSION: ${{ needs.extract-versions.outputs.frontend_main_version }}
         run: |
           echo "${{ secrets.DOTENV }}" > .env
-          echo "API_VERSION=${{ steps.extract_api_version.outputs.API_VERSION }}" >> .env
-          echo "FRONTEND_MAIN_VERSION=${{ steps.extract_frontend_versions.outputs.FRONTEND_MAIN_VERSION }}" >> .env
-          echo "FRONTEND_MAP_VERSION=${{ steps.extract_frontend_versions.outputs.FRONTEND_MAP_VERSION }}" >> .env
+          echo "GIT_BRANCH=${GIT_BRANCH}" >> .env
+          echo "API_VERSION=${API_VERSION}" >> .env
+          echo "FRONTEND_MAIN_VERSION=${FRONTEND_MAIN_VERSION}" >> .env
 
       - uses: webfactory/[email protected]
         with: