Add types remove categories

.env.example

@@ -1,4 +1,5 @@
 DATABASE_URL=postgres://postgres:password@localhost:5432/database
-DATABASE_INIT_FILE=db.sql
-HTTP_SERVER_HOST=0.0.0.0
-HTTP_SERVER_PORT=8000
+HOST=0.0.0.0
+PORT=8000
+USERNAME=test
+PASSWORD=test

.github/workflows/prod.yml

@@ -1,47 +1,90 @@
-name: Build, Test Prod
+name: Production
 
-on:
-  push:
-    branches:
-      - main
+on: 
+  release:
+    types: [created]
+
+env:
+  AWS_REGION: us-east-1
+  ECR_REPOSITORY: issues-api
+  ECS_CLUSTER: production
+  ECS_SERVICE: issues-api
+  ECS_CONTAINER: issues-api
+  TASK_FILE: task.json
+  DOCKERHUB_REGISTRY: kudosportal/issues
+
+permissions:
+  id-token: write
+  contents: read
 
 jobs:
-  build:
+  production-deploy:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Cache dependencies
-      uses: actions/cache@v3
-      with:
-        path: |
-          ~/.cargo
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
-
-    - name: Install Rust
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        toolchain: stable
-
-    - name: Build and test code
-      run: |
-        cargo build --verbose
-        cargo test --verbose
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Build and push Docker image
-      run: |
-        docker build -t dontelmo/kudos_api:${{ github.sha }} -f Dockerfile .
-        docker push dontelmo/kudos_api:${{ github.sha }}
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.ECR_ROLE }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR Private
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Build, tag, and push docker image to Amazon ECR
+        id: build-image
+        env:
+          REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          REPOSITORY: issues-api
+        run: |
+          image=$REGISTRY/${{ env.ECR_REPOSITORY }}:${{ github.event.release.tag_name }}
+          docker build -t $image .
+          docker push $image
+          echo "image=$image" >> $GITHUB_OUTPUT
+
+      - name: Download task definition
+        run: |
+          aws ecs describe-task-definition --task-definition issues-api --query taskDefinition > ${{ env.TASK_FILE }}
+
+      - name: Fill in the new image ID in the Amazon ECS task definition
+        id: task-def
+        uses: aws-actions/amazon-ecs-render-task-definition@v1
+        with:
+          task-definition: ${{ env.TASK_FILE }}
+          container-name:  ${{ env.ECS_CONTAINER }}
+          image: ${{ steps.build-image.outputs.image }}
+
+      - name: Deploy Amazon ECS task definition
+        uses: aws-actions/amazon-ecs-deploy-task-definition@v2
+        with:
+          task-definition: ${{ steps.task-def.outputs.task-definition }}
+          service: ${{ env.ECS_SERVICE }}
+          cluster:  ${{ env.ECS_CLUSTER }}
+          wait-for-service-stability: true
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build, tag and push docker image to Docker Hub
+        id: build-dockerhub-image
+        run: |
+          image=${{ env.DOCKERHUB_REGISTRY }}:${{ github.event.release.tag_name }}
+          docker build -t $image .
+          docker push $image
+          echo "image=$image" >> $GITHUB_OUTPUT
+
+      - name: Deploy staging
+        run: |
+          image=docker.io/${{ steps.build-dockerhub-image.outputs.image }}
+          encoded_image=$(echo -n $image | jq -sRr @uri)
+          curl -f "${{ secrets.STAGE_DEPLOY_HOOK }}&imgURL=$encoded_image"

.github/workflows/stage.yml

@@ -0,0 +1,68 @@
+name: Stage
+
+on:
+  push:
+    branches:
+      - main
+
+env:
+  DOCKERHUB_REGISTRY: kudosportal/issues
+
+jobs:
+  stage-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+
+      - name: Run Clippy
+        run: |
+          cargo clippy --all-targets --all-features
+
+      - name: Build code
+        run: |
+          cargo build --verbose
+
+      - name: Test code
+        run: |
+          make test
+
+      # - name: Integration tests
+      #   run: |
+      #     make test-db
+      #   env:
+      #     DATABASE_URL: ${{ secrets.TESTS_DATABASE_URL }}
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build, tag and push docker image to Docker Hub
+        id: build-dockerhub-image
+        run: |
+          image=${{ env.DOCKERHUB_REGISTRY }}:${{ github.sha }}
+          docker build -t $image .
+          docker push $image
+          echo "image=$image" >> $GITHUB_OUTPUT
+
+      - name: Deploy staging
+        run: |
+          image=docker.io/${{ steps.build-dockerhub-image.outputs.image }}
+          encoded_image=$(echo -n $image | jq -sRr @uri)
+          curl -f "${{ secrets.STAGE_DEPLOY_HOOK }}&imgURL=$encoded_image"

.github/workflows/stage_cron.yaml

@@ -0,0 +1,12 @@
+name: Stage cron
+on:
+  schedule:
+    - cron: "*/15 * * * *"
+
+jobs:
+  stage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Wake up service
+        run: |
+          curl --fail ${{ vars.ISSUES_API_STAGE_URL }}/health

.github/workflows/tests.yml

@@ -0,0 +1,50 @@
+name: Lint and test
+
+on:
+  pull_request:
+    branches:
+      - main
+    types: [opened, synchronize]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+
+      - name: Run Clippy
+        run: |
+          cargo clippy --all-targets --all-features
+
+      - name: Build code
+        run: |
+          cargo build --verbose
+
+      - name: Test code
+        run: |
+          make test
+
+      # - name: Integration tests
+      #   run: |
+      #     make test-db
+      #   env:
+      #     DATABASE_URL: ${{ secrets.TESTS_DATABASE_URL }}
+
+      - name: Build docker image
+        run: |
+          docker build -t ${{ vars.DOCKER_REGISTRY }}:${{ github.sha }} -f Dockerfile .

.gitignore

@@ -1 +1,4 @@
-/target
+/target
+.vscode
+.env
+.test.env