Merge branch 'develop'

.github/workflows/deploy.yaml

@@ -1,23 +0,0 @@
-name: deploy-docker
-run-name: deploy-docker ${{ github.actor }} 
-on:
-  workflow_dispatch:
-jobs:
-  # https://github.com/appleboy/ssh-action
-  # act -W .github/workflows/deploy.yaml -j remote-deploy -s SSH_PASSWORD
-  remote-deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Remote Deployment
-        uses: appleboy/ssh-action@v0.1.8
-        with:
-          host: frappet.com
-          username: frappet
-          password: ${{ secrets.SSH_PASSWORD }}
-          port: 22
-          script: |
-            cd /home/frappet/docker/bma-ehr-recruit-qualifying-exam
-            docker-compose pull
-            docker-compose up -d
-            touch success
-

.github/workflows/local-build.yaml

@@ -1,34 +0,0 @@
-
-name: local-build
-run-name: local-build ${{ github.actor }} 
-on:
-  # push:
-  #   tags:
-  #     - v1.**
-  #   branches:
-  #     - 'main'
-  #   branches:
-  #     - 'release-*'
-
-  # Allow run workflow manually from Action tab
-  workflow_dispatch:
-env:
-  REGISTRY: docker.frappet.com
-  CMS_IMAGE_NAME: demo/qualifying-exam-cms
-  CMS_IMAGE_TAG: 0.1.1
-jobs:
-  # act -W .github/workflows/local-build.yaml -j local-image 
-  local-image:  
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Check out code"
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-      - name: Build and push docker image
-        uses: docker/build-push-action@v3
-        with: 
-          context: cms
-          load: true
-          tags: ${{env.REGISTRY}}/${{env.CMS_IMAGE_NAME}}:${{env.CMS_IMAGE_TAG}},${{env.REGISTRY}}/${{env.CMS_IMAGE_NAME}}:latest

.github/workflows/release-dev.yaml

@@ -1,72 +0,0 @@
-name: releaseDev
-run-name: releaseDev ${{ github.actor }} 
-on:
-  # push:
-  #   tags:
-  #     - 'v[0-9]+.[0-9]+.[0-9]+'
-  #   tags-ignore:
-  #     - '2.*'
-  # Allow run workflow manually from Action tab
-  workflow_dispatch:
-    inputs:
-      IMAGE_VER:
-        description: "version for build image"
-        type: string
-env:
-  REGISTRY: docker.frappet.com
-  IMAGE_NAME: demo/test-fe-exam
-jobs:
-  # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=v0.2.1-dev -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd
-  releaseDev:
-    runs-on: ubuntu-latest
-    steps:
-      # https://thekevinwang.com/2022/06/13/github-actions-survival-skills/
-      - name: Check out code # checkout only cms is possible but I checkout all
-        uses: actions/checkout@v3
-      - name: Gen Version
-        id: gen_ver
-        run: |
-          if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
-            IMAGE_VER='${GITHUB_REF/refs\/tags\//}'
-          else
-            IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
-          fi
-          if [[ $IMAGE_VER == '' ]]; then
-            IMAGE_VER='beta'
-          fi
-      #    echo "{\"version\":\"$IMAGE_VER\", \"builddate\":\"$(date +"%Y-%m-%d_%T")\",\"ref_name\":\"$GITHUB_REF\" }" > ./cms/src/lib/ver.json
-      #    cat ./cms/src/lib/ver.json
-          echo '::set-output name=image_ver::'$IMAGE_VER
-      - name: Test Version
-        run: |
-          echo $GITHUB_REF
-          echo ${{ steps.gen_ver.outputs.image_ver }}
-      #    cat ./cms/src/lib/ver.json
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2        
-      - name: Login in to registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{env.REGISTRY}}
-          username: ${{secrets.DOCKER_USER}}
-          password: ${{secrets.DOCKER_PASS}}
-      - name: Build and push docker image
-        uses: docker/build-push-action@v3
-        with: 
-          context: ./
-          # platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest
-      # - name: Remote Deployment
-      #   uses: appleboy/ssh-action@v0.1.8
-      #   with:
-      #     host: frappet.com
-      #     username: frappet
-      #     password: ${{ secrets.SSH_PASSWORD }}
-      #     port: 22
-      #     script: |
-      #       cd /home/frappet/docker/bma-ehr-recruit-qualifying-exam
-      #       docker-compose pull
-      #       docker-compose up -d
-      #       touch success
-

.github/workflows/release.yaml

@@ -1,12 +1,9 @@
-name: release-dev
+name: release
-run-name: release-dev ${{ github.actor }}
+run-name: release ${{ github.actor }}
 on:
-    # push:
+    push:
-    #   tags:
+        tags:
-    #     - 'v[0-9]+.[0-9]+.[0-9]+'
+            - "version-[0-9]+.[0-9]+.[0-9]+"
-    # tags-ignore:
-    #   - '2.*'
-    # Allow run workflow manually from Action tab
     workflow_dispatch:
 env:
     REGISTRY: docker.frappet.com
@@ -14,31 +11,35 @@ env:
     DEPLOY_HOST: frappet.com
     DEPLOY_PORT: 10102
     COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-recruit-exam
-    TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
 
 jobs:
     # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd
-    release-dev:
+    release:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
             # skip Set up QEMU because it fail on act and container
+            # Gen Version try to get version from tag or inut
+            - name: Set output tags
+              id: vars
+              run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
             - name: Gen Version
               id: gen_ver
               run: |
-                  if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
+                if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
-                    IMAGE_VER='${GITHUB_REF/refs\/tags\//}'
+                  IMAGE_VER=${{ steps.vars.outputs.tag }}
-                  else
+                else
-                    IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
+                  IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
-                  fi
+                fi
-                  if [[ $IMAGE_VER == '' ]]; then
+                if [[ $IMAGE_VER == '' ]]; then
-                    IMAGE_VER='test-vBeta'
+                  IMAGE_VER='test-vBeta'
-                  fi
+                fi
-                  echo '::set-output name=image_ver::'$IMAGE_VER
+                echo '::set-output name=image_ver::'$IMAGE_VER
-            - name: Test Version
+            - name: Check Version
               run: |
                   echo $GITHUB_REF
                   echo ${{ steps.gen_ver.outputs.image_ver }}
+
             - name: Set up Docker Buildx
               uses: docker/setup-buildx-action@v2
             - name: Login in to registry
@@ -47,7 +48,7 @@ jobs:
                   registry: ${{env.REGISTRY}}
                   username: ${{secrets.DOCKER_USER}}
                   password: ${{secrets.DOCKER_PASS}}
-            - name: Build and load local docker image
+            - name: Build and push docker image
               uses: docker/build-push-action@v3
               with:
                   context: .
@@ -61,27 +62,46 @@ jobs:
                   host: ${{env.DEPLOY_HOST}}
                   username: frappet
                   password: ${{ secrets.SSH_PASSWORD }}
-                  port: ${{env.DEPLOY_PORT}}
+                  port: 10102
                   script: |
                       cd "${{env.COMPOSE_PATH}}"
                       docker compose pull
                       docker compose up -d
                       echo "${{ steps.gen_ver.outputs.image_ver }}"> success
-            - uses: snow-actions/line-notify@v1.1.0
+            - name: Notify Discord Success
               if: success()
-              with:
+              run: |
-                  access_token: ${{ env.TOKEN_LINE }}
+                curl -H "Content-Type: application/json" \
-                  message: |
+                -X POST \
-                      -Success✅✅✅
+                -d '{
-                      Image: ${{env.IMAGE_NAME}}
+                  "embeds": [{
-                      Version: ${{ github.event.inputs.IMAGE_VER }}
+                    "title": "✅ Deployment Success!",
-                      By: ${{secrets.DOCKER_USER}}
+                    "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
-            - uses: snow-actions/line-notify@v1.1.0
+                    "color": 3066993,
+                    "footer": {
+                      "text": "Release Notification",
+                      "icon_url": "https://example.com/success-icon.png"
+                    },
+                    "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+                  }]
+                }' \
+                ${{ secrets.DISCORD_WEBHOOK }}
+
+            - name: Notify Discord Failure
               if: failure()
-              with:
+              run: |
-                  access_token: ${{ env.TOKEN_LINE }}
+                curl -H "Content-Type: application/json" \
-                  message: |
+                -X POST \
-                      -Failure❌❌❌
+                -d '{
-                      Image: ${{env.IMAGE_NAME}}
+                  "embeds": [{
-                      Version: ${{ github.event.inputs.IMAGE_VER }}
+                    "title": "❌ Deployment Failed!",
-                      By: ${{secrets.DOCKER_USER}}
+                    "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
+                    "color": 15158332,
+                    "footer": {
+                      "text": "Release Notification",
+                      "icon_url": "https://example.com/failure-icon.png"
+                    },
+                    "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+                  }]
+                }' \
+                ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/release2.yaml

@@ -1,63 +0,0 @@
-name: release-dev
-run-name: release-dev ${{ github.actor }}
-on:
-    # push:
-    #   tags:
-    #     - 'v[0-9]+.[0-9]+.[0-9]+'
-    # tags-ignore:
-    #   - '2.*'
-    # Allow run workflow manually from Action tab
-    workflow_dispatch:
-env:
-    REGISTRY: docker.frappet.com
-    IMAGE_NAME: demo/bma-ehr-recruit-exam-service
-jobs:
-    # act workflow_dispatch -W .github/workflows/release2.yaml --input IMAGE_VER=v0.2.1-dev -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd
-    release-dev:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            # skip Set up QEMU because it fail on act and container
-            - name: Gen Version
-              id: gen_ver
-              run: |
-                  if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
-                    IMAGE_VER='${GITHUB_REF/refs\/tags\//}'
-                  else
-                    IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
-                  fi
-                  if [[ $IMAGE_VER == '' ]]; then
-                    IMAGE_VER='beta'
-                  fi
-                  echo '::set-output name=image_ver::'$IMAGE_VER
-            - name: Test Version
-              run: |
-                  echo $GITHUB_REF
-                  echo ${{ steps.gen_ver.outputs.image_ver }}
-
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v2
-            - name: Login in to registry
-              uses: docker/login-action@v2
-              with:
-                  registry: ${{env.REGISTRY}}
-                  username: ${{secrets.DOCKER_USER}}
-                  password: ${{secrets.DOCKER_PASS}}
-            - name: Build and push docker image
-              uses: docker/build-push-action@v3
-              with:
-                  context: ./
-                  push: true
-                  tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest
-            - name: Remote Deployment
-              uses: appleboy/ssh-action@v0.1.8
-              with:
-                  host: frappet.com
-                  username: frappet
-                  password: ${{ secrets.SSH_PASSWORD }}
-                  port: 22
-                  script: |
-                      cd /home/frappet/docker/bma-ehr-recruit-exam
-                      docker-compose pull
-                      docker-compose up -d
-                      touch success

.github/workflows/remote-build.yaml

@@ -1,55 +0,0 @@
-name: remote-build
-run-name: remote-build ${{ github.actor }} 
-on:
-  # push:
-  #   tags:
-  #     - 'v[0-9]+.[0-9]+.[0-9]+'
-    # tags-ignore:
-    #   - '2.*'
-  # Allow run workflow manually from Action tab
-  workflow_dispatch:
-env:
-  REGISTRY: docker.frappet.com
-  CMS_IMAGE_NAME: demo/test-fe-exam
-  CMS_IMAGE_TAG: 0.2.1
-jobs:
-  # act --workflows .github/workflows/build.yaml --job remote-image -s DOCKER_USER -s DOCKER_PASS -s SSH_PASSWORD
-  # act -W .github/workflows/remote-build.yaml -j remote-image -s DOCKER_USER -s DOCKER_PASS -s SSH_PASSWORD
-  remote-image:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      # skip Set up QEMU because it fail on act and container
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2        
-      - name: Login in to registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{env.REGISTRY}}
-          username: ${{secrets.DOCKER_USER}}
-          password: ${{secrets.DOCKER_PASS}}
-      # Node no need because use 2 state build
-      # - uses: actions/setup-node@v3
-      #   with:
-      #     node-version: '18'
-      - name: Build and push docker image
-        uses: docker/build-push-action@v3
-        with: 
-          context: ./
-          # platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{env.REGISTRY}}/${{env.CMS_IMAGE_NAME}}:${{env.CMS_IMAGE_TAG}},${{env.REGISTRY}}/${{env.CMS_IMAGE_NAME}}:latest
-      # - name: Remote Deployment
-      #   uses: appleboy/ssh-action@v0.1.8
-      #   with:
-      #     host: frappet.com
-      #     username: frappet
-      #     password: ${{ secrets.SSH_PASSWORD }}
-      #     port: 22
-      #     script: |
-      #       cd /home/frappet/docker/bma-ehr-recruit-qualifying-exam
-      #       docker-compose pull
-      #       docker-compose up -d
-      #       touch success
-
-

Program.cs

@@ -62,12 +62,12 @@ ConfigureLogs();
 builder.Host.UseSerilog();
 
 // Register DbContext
-var defaultConnection = builder.Configuration.GetConnectionString("DefaultConnection");
+var examConnection = builder.Configuration.GetConnectionString("ExamConnection");
 builder.Services.AddDbContext<ApplicationDbContext>(options =>
-                options.UseMySql(defaultConnection, ServerVersion.AutoDetect(defaultConnection)));
+                options.UseMySql(examConnection, ServerVersion.AutoDetect(examConnection)));
-var metadataConnection = builder.Configuration.GetConnectionString("MetadataConnection");
+var defaultConnection = builder.Configuration.GetConnectionString("DefaultConnection");
 builder.Services.AddDbContext<MetadataDbContext>(options =>
-                options.UseMySql(metadataConnection, ServerVersion.AutoDetect(metadataConnection)));
+                options.UseMySql(defaultConnection, ServerVersion.AutoDetect(defaultConnection)));
 
 // Add config CORS
 builder.Services.AddCors(options => options.AddDefaultPolicy(builder =>

appsettings.json

@@ -14,10 +14,8 @@
     "AllowedHosts": "*",
     "ConnectionStrings": {
         "MongoConnection": "mongodb://admin:adminVM123@127.0.0.1:27017",
-        // "DefaultConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
+        "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
-        "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
+        "ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
-        // "MetadataConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
-        "MetadataConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
     },
     "Jwt": {
         "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",