Merge branch 'develop' into feat/userDetails

Arquisoft · Apr 14, 2024 · 074fdea · 074fdea
2 parents 5a9ba95 + c535cdc
commit 074fdea
Show file tree

Hide file tree

Showing 27 changed files with 1,059 additions and 359 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,135 +1,151 @@
-name: Deploy on release
-
-on:
-  release:
-    types: [published]
-jobs:
-  unit-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - uses: actions/checkout@v4
-      - run: npm --prefix webapp ci
-      - run: npm --prefix webapp test -- --coverage
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - run: mvn clean verify
-        working-directory: api
-        env:
-          DATABASE_USER: ${{ secrets.DATABASE_USER }}
-          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
-          JWT_SECRET: ${{ secrets.JWT_SECRET }}
-      - name: Analyze with SonarCloud
-        uses: sonarsource/sonarcloud-github-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  e2e-tests:
-    needs: [ unit-tests ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - run: npm --prefix webapp install
-      - run: npm --prefix webapp run build
-      # - run: npm --prefix webapp run test:e2e
-  docker-push-api:
-    runs-on: ubuntu-latest
-    needs: [ e2e-tests ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Publish to Registry
-        uses: elgohr/Publish-Docker-Github-Action@v5
-        env:
-          DATABASE_USER: ${{ secrets.DATABASE_USER }}
-          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
-          JWT_SECRET: ${{ secrets.JWT_SECRET }}
-        with:
-          name: arquisoft/wiq_en2b/api
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: ghcr.io
-          workdir: api
-          buildargs: |
-            DATABASE_USER
-            DATABASE_PASSWORD
-            JWT_SECRET
-  docker-push-webapp:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [ e2e-tests ]
-    steps:
-
-      - uses: actions/checkout@v4
-
-      - name: Create .env file
-        run: echo "REACT_APP_API_ENDPOINT=http://${{ secrets.DEPLOY_HOST }}:8080" > webapp/.env
-
-      - name: Publish to Registry
-        uses: elgohr/Publish-Docker-Github-Action@v5
-        env:
-          REACT_APP_API_ENDPOINT: http://${{ secrets.DEPLOY_HOST }}:8080
-          teamname: wiq_en2b
-        with:
-          name: arquisoft/wiq_en2b/webapp
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: ghcr.io
-          workdir: webapp
-          buildargs: |
-            REACT_APP_API_ENDPOINT
-  docker-push-question-generator:
-    runs-on: ubuntu-latest
-    needs: [ e2e-tests ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Publish to Registry
-        uses: elgohr/Publish-Docker-Github-Action@v5
-        env:
-          DATABASE_USER: ${{ secrets.DATABASE_USER }}
-          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
-        with:
-          name: arquisoft/wiq_en2b/question-generator
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: ghcr.io
-          workdir: questiongenerator
-          buildargs: |
-            DATABASE_USER
-            DATABASE_PASSWORD
-  deploy:
-    name: Deploy over SSH
-    runs-on: ubuntu-latest
-    needs: [docker-push-api, docker-push-webapp, docker-push-question-generator]
-    steps:
-    - name: Deploy over SSH
-      uses: fifsky/ssh-action@master
-      env:
-        API_URI: ${{ secrets.DEPLOY_HOST }}
-        DATABASE_USER: ${{ secrets.DATABASE_USER }}
-        DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
-        JWT_SECRET: ${{ secrets.JWT_SECRET }}
-      with:
-        host: ${{ secrets.DEPLOY_HOST }}
-        user: ${{ secrets.DEPLOY_USER }}
-        key: ${{ secrets.DEPLOY_KEY }}
-        command: |
-          wget https://raw.githubusercontent.com/arquisoft/wiq_en2b/master/docker-compose.yml -O docker-compose.yml
-          wget https://raw.githubusercontent.com/arquisoft/wiq_en2b/master/.env -O .env
-          echo "DATABASE_USER=${{ secrets.DATABASE_USER }}" >> .env
-          echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env
-          echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> .env
-          echo "API_URI=http://${{ secrets.DEPLOY_HOST }}:8080" >> .env
-          docker compose --profile prod down
-          docker compose --profile prod up -d --pull always
+name: Deploy on release
+
+on:
+  release:
+    types: [published]
+jobs:
+  unit-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - uses: actions/checkout@v4
+      - run: npm --prefix webapp ci
+      - run: npm --prefix webapp test -- --coverage
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - run: mvn clean verify
+        working-directory: api
+        env:
+          DATABASE_USER: ${{ secrets.DATABASE_USER }}
+          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+      - name: Analyze with SonarCloud
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  e2e-tests:
+    needs: [ unit-tests ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: npm --prefix webapp install
+      - run: npm --prefix webapp run build
+      # - run: npm --prefix webapp run test:e2e
+  docker-push-api:
+    runs-on: ubuntu-latest
+    needs: [ e2e-tests ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@v5
+        env:
+          DATABASE_USER: ${{ secrets.DATABASE_USER }}
+          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+          SSL_PASSWORD: ${{ secrets.SSL_PASSWORD }}
+        with:
+          name: arquisoft/wiq_en2b/api
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io
+          workdir: api
+          buildargs: |
+            DATABASE_USER
+            DATABASE_PASSWORD
+            JWT_SECRET
+            SSL_PASSWORD
+  docker-push-kiwiq:
+    runs-on: ubuntu-latest
+    needs: [ e2e-tests ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@v5
+        with:
+          name: arquisoft/wiq_en2b/kiwiq
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io
+          workdir: nginx_conf
+  docker-push-webapp:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [ e2e-tests ]
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - name: Create .env file
+        run: echo "REACT_APP_API_ENDPOINT=https://${{ secrets.DEPLOY_HOST }}:8443" > webapp/.env
+
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@v5
+        env:
+          REACT_APP_API_ENDPOINT: https://${{ secrets.DEPLOY_HOST }}:8443
+          teamname: wiq_en2b
+        with:
+          name: arquisoft/wiq_en2b/webapp
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io
+          workdir: webapp
+          buildargs: |
+            REACT_APP_API_ENDPOINT
+  docker-push-question-generator:
+    runs-on: ubuntu-latest
+    needs: [ e2e-tests ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@v5
+        env:
+          DATABASE_USER: ${{ secrets.DATABASE_USER }}
+          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+        with:
+          name: arquisoft/wiq_en2b/question-generator
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io
+          workdir: questiongenerator
+          buildargs: |
+            DATABASE_USER
+            DATABASE_PASSWORD
+  deploy:
+    name: Deploy over SSH
+    runs-on: ubuntu-latest
+    needs: [docker-push-api, docker-push-webapp, docker-push-question-generator, docker-push-kiwiq]
+    steps:
+    - name: Deploy over SSH
+      uses: fifsky/ssh-action@master
+      env:
+        API_URI: ${{ secrets.DEPLOY_HOST }}
+        DATABASE_USER: ${{ secrets.DATABASE_USER }}
+        DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+        JWT_SECRET: ${{ secrets.JWT_SECRET }}
+      with:
+        host: ${{ secrets.DEPLOY_HOST }}
+        user: ${{ secrets.DEPLOY_USER }}
+        key: ${{ secrets.DEPLOY_KEY }}
+        command: |
+          wget https://raw.githubusercontent.com/arquisoft/wiq_en2b/master/docker-compose.yml -O docker-compose.yml
+          wget https://raw.githubusercontent.com/arquisoft/wiq_en2b/master/.env -O .env
+          echo "DATABASE_USER=${{ secrets.DATABASE_USER }}" >> .env
+          echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env
+          echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> .env
+          echo "API_URI=https://${{ secrets.DEPLOY_HOST }}:8443" >> .env
+          echo "SSL_PASSWORD=${{ secrets.SSL_PASSWORD }}" >> .env
+          docker compose --profile prod down
+          docker compose --profile prod up -d --pull always
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,8 @@ docs/build
 .idea
 .vscode
 .DS_Store
+
+*.crt
+*.key
+*.pem
+.env
diff --git a/api/src/main/java/lab/en2b/quizapi/commons/utils/GameModeUtils.java b/api/src/main/java/lab/en2b/quizapi/commons/utils/GameModeUtils.java
@@ -0,0 +1,57 @@
+package lab.en2b.quizapi.commons.utils;
+
+import lab.en2b.quizapi.game.Game;
+import lab.en2b.quizapi.game.GameMode;
+import lab.en2b.quizapi.questions.question.QuestionCategory;
+
+import java.util.List;
+
+import static lab.en2b.quizapi.game.GameMode.KIWI_QUEST;
+
+public class GameModeUtils {
+    public static List<QuestionCategory> getQuestionCategoriesForGamemode(GameMode gamemode, List<QuestionCategory> questionCategoriesForCustom){
+        if(gamemode == null){
+            gamemode = KIWI_QUEST;
+        }
+        return switch (gamemode) {
+            case KIWI_QUEST -> List.of(QuestionCategory.ART, QuestionCategory.MUSIC, QuestionCategory.GEOGRAPHY);
+            case FOOTBALL_SHOWDOWN -> List.of(QuestionCategory.SPORTS);
+            case GEO_GENIUS -> List.of(QuestionCategory.GEOGRAPHY);
+            case VIDEOGAME_ADVENTURE -> List.of(QuestionCategory.VIDEOGAMES);
+            case ANCIENT_ODYSSEY -> List.of(QuestionCategory.MUSIC,QuestionCategory.ART);
+            case RANDOM -> List.of(QuestionCategory.values());
+            case CUSTOM -> questionCategoriesForCustom;
+        };
+    }
+    public static void setGamemodeParams(Game game){
+        switch(game.getGamemode()){
+            case KIWI_QUEST:
+                game.setRounds(9L);
+                game.setRoundDuration(30);
+                break;
+            case FOOTBALL_SHOWDOWN:
+                game.setRounds(9L);
+                game.setRoundDuration(30);
+                break;
+            case GEO_GENIUS:
+                game.setRounds(9L);
+                game.setRoundDuration(30);
+                break;
+            case VIDEOGAME_ADVENTURE:
+                game.setRounds(9L);
+                game.setRoundDuration(30);
+                break;
+            case ANCIENT_ODYSSEY:
+                game.setRounds(9L);
+                game.setRoundDuration(30);
+                break;
+            case RANDOM:
+                game.setRounds(9L);
+                game.setRoundDuration(30);
+                break;
+            default:
+                game.setRounds(9L);
+                game.setRoundDuration(30);
+        }
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,8 @@ docs/build @@
     .idea
     .vscode
     .DS_Store
+    *.crt
+    *.key
+    *.pem
+    .env