Merge pull request #312 from DurianPy-Davao-Python-User-Group/main

chore: merge durianpy diff

Author: ASPactores

.github/workflows/FE-deploy-stage-to-prod-pipeline.yml

@@ -0,0 +1,50 @@
+name: Deploy stage to main
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deploy-stage-to-main:
+    name: Deploy stage to main
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./frontend
+    permissions:
+      issues: write
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: stage
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22.15"
+          cache: "npm"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Check Code Format
+        run: npm run format:check:ci
+
+      - name: Build Project
+        run: npm run build:dummy
+
+      - name: Await Manual Approval
+        uses: trstringer/manual-approval@v1
+        with:
+          secret: ${{ secrets.GITHUB_TOKEN }}
+          approvers: ArJSarmiento,ASPactores,seangaaab
+          minimum-approvals: 1
+          issue-title: "Deploying stage to main"
+          issue-body: "Please approve or deny the deployment."
+
+      - name: Sync stage to main
+        uses: connor-baer/action-sync-branch@main
+        with:
+          branch: main
+          token: ${{ secrets.GITHUB_TOKEN }}
+          force: true

.github/workflows/FE-pr-and-deploy-to-stage-pipeline.yml

@@ -0,0 +1,37 @@
+name: Build and Deploy PR to stage
+
+on:
+  push:
+    branches: [stage]
+  pull_request:
+    branches: [stage]
+  workflow_dispatch:
+
+jobs:
+  build-and-deploy:
+    name: Build and Deploy PR to stage
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./frontend
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22.15"
+          cache: "npm"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Check Code Format
+        run: npm run format:check:ci
+
+      - name: Build Project
+        run: npm run build:dummy
+
+      - name: Deploy to Amplify
+        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+        run: |
+          curl -X POST -d '{}' "${{ secrets.AMPLIFY_WEBHOOK_URL }}" -H "Content-Type:application/json"

.github/workflows/deploy_backend.yml

@@ -1,11 +1,16 @@
-name: Deploy SPARCS Events Service
+name: Deploy DurianPy Events Service
 on:
   push:
     paths:
       - backend/**
     branches:
       - main
       - stage
+  workflow_dispatch:
+
+permissions:
+  id-token: write
+  contents: read
 
 jobs:
   deploy:
@@ -15,36 +20,50 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+      - name: Set ARN for Role to Assume
+        run: |
+          if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+            echo "AWS_OIDC_ROLE_ARN=${{ secrets.AWS_OIDC_ROLE_ARN_PROD }}" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/stage" ]]; then
+            echo "AWS_OIDC_ROLE_ARN=${{ secrets.AWS_OIDC_ROLE_ARN_STAGE }}" >> $GITHUB_ENV
+          fi
 
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4.1.0
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          audience: sts.amazonaws.com
           aws-region: ap-southeast-1
+          role-to-assume: ${{ env.AWS_OIDC_ROLE_ARN }}
+          role-session-name: GithubActionSession
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version-file: "backend/.python-version"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
 
       - name: Install dependencies
         run: |
-          python3 -m pip install pipenv==2023.4.29
-          pipenv install
+          uv sync --locked --all-extras --dev
         working-directory: backend
 
       - name: Install Serverless Framework
         run: |
           npm install
-          npm install -g serverless@3.39.0
+          npm install -g serverless@3.40.0
+        working-directory: backend
+
+      - name: Create requirements.txt
+        run: uv export --format requirements-txt --no-hashes --output-file requirements.txt --no-dev
         working-directory: backend
 
-      - name: Deploy with Serverless
+      - name: Deploy with Serverless v3
         run: |
           if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
           sls deploy --stage prod --verbose
           elif [[ "${{ github.ref }}" == "refs/heads/stage" ]]; then
-          sls deploy --stage dev --verbose
+          sls deploy --stage staging --verbose
           fi
         working-directory: backend

.github/workflows/formatting_backend.yml

@@ -25,7 +25,5 @@ jobs:
 
       - name: Run Formatters
         run: |
-            flake8 --max-line-length=120 --ignore=E203,E266,E501,W503,F403,F401,E402,F841,C901,F722,F405,F811
-            black --check . --line-length=120 --skip-string-normalization
             ruff check .
         working-directory: backend

.github/workflows/formatting_frontend.yml

@@ -8,3 +8,6 @@ my.secrets
 .DS_STORE
 
 .ruff_cache
+.DS_Store
+
+*.xlsx

.gitignore

@@ -1,2 +1,2 @@
 [settings]
-known_third_party = aws,boto3,botocore,constants,controller,external_gateway,fastapi,fastapi_cloudauth,lambda_decorators,lambdawarmer,mangum,model,pydantic,pynamodb,pytz,repository,requests,starlette,ulid,usecase,utils
+known_third_party = PIL,aws,boto3,botocore,constants,controller,dotenv,external_gateway,fastapi,fastapi_cloudauth,httpx,lambda_decorators,lambdawarmer,mangum,model,openpyxl,pandas,pydantic,pynamodb,pytz,repository,requests,starlette,typing_extensions,ulid,usecase,utils

.isort.cfg

@@ -0,0 +1,34 @@
+version: 1
+applications:
+  - frontend:
+      phases:
+        preBuild:
+          commands:
+            - npm ci --cache .npm --prefer-offline
+            - |
+              if [ "$AWS_BRANCH" = "dev" ]; then
+                  STAGE=dev
+              elif [ "$AWS_BRANCH" = "stage" ]; then
+                  STAGE=staging
+              elif [ "$AWS_BRANCH" = "main" ]; then
+                  STAGE=prod
+              else
+                  STAGE=dev
+              fi
+              echo "Using STAGE=$STAGE (branch=$AWS_BRANCH, region=$AWS_REGION)"
+
+              npm run generate "$STAGE" --region "$AWS_REGION"
+        build:
+          commands:
+            - npm run build
+      artifacts:
+        baseDirectory: dist
+        files:
+          - "**/*"
+      cache:
+        paths:
+          - ".npm/**/*"
+          - node_modules/**/*
+        runtime-versions:
+          nodejs: 22.15
+    appRoot: frontend

amplify.yml

@@ -28,3 +28,23 @@ repos:
         args: [ --fix ]
       # Run the formatter.
       - id: ruff-format
+
+  # mypy
+  # - repo: https://github.com/pre-commit/mirrors-mypy
+  #   rev: 'v1.17.0'
+  #   hooks:
+  #     - id: mypy
+  # detect-secrets
+  - repo: https://github.com/Yelp/detect-secrets
+    rev: v1.5.0
+    hooks:
+    -   id: detect-secrets
+        args: ['--baseline', './backend/.secrets.baseline']
+        exclude: package.lock.json
+  # commitizen
+  - repo: https://github.com/commitizen-tools/commitizen
+    rev: v4.8.3
+    hooks:
+      - id: commitizen
+      - id: commitizen-branch
+        stages: [manual]

backend/.pre-commit-config.yaml

@@ -1 +1 @@
-3.8.10
+3.11