From 8b804645fc031edbaa0a9e207b8324c3737cabac Mon Sep 17 00:00:00 2001
From: 13on4rd <116517713+13on4rd@users.noreply.github.com>
Date: Sat, 14 Dec 2024 17:28:17 +0100
Subject: [PATCH] Fixed import/export functionality  (#63)

fixed import and export for all minigame configs
---
 .nginx/compose/nginx-dev.conf                 |  9 +++-
 .nginx/compose/nginx.conf                     |  8 ++++
 docker-compose-dev.yaml                       | 47 ++++++++++++++++++-
 .../EditChickenshockConfigurationModal.vue    | 11 ++++-
 .../EditCrosswordpuzzleModal.vue              |  3 +-
 .../EditFinitequizConfigurationModal.vue      |  3 +-
 .../EditMemoryConfigurationModal.vue          | 11 ++++-
 .../EditMinigameModals/EditRegexGameModal.vue | 37 +++++++++------
 .../EditTowerDefenseConfigurationModal.vue    |  3 +-
 .../EditTowercrushConfigurationModal.vue      |  3 +-
 src/ts/import-configuration.ts                |  2 +-
 src/ts/models/regexgame-models.ts             | 12 +++--
 src/ts/rest-clients/regexgame-rest-client.ts  |  4 +-
 13 files changed, 124 insertions(+), 29 deletions(-)

diff --git a/.nginx/compose/nginx-dev.conf b/.nginx/compose/nginx-dev.conf
index dd95c0c..4f79692 100644
--- a/.nginx/compose/nginx-dev.conf
+++ b/.nginx/compose/nginx-dev.conf
@@ -16,7 +16,6 @@ server {
         proxy_pass      http://keycloak/keycloak/;
     }
 
-
     location /minigames/bugfinder/api/ {
         proxy_pass      http://bugfinder-backend/api/;
     }
@@ -41,6 +40,10 @@ server {
         proxy_pass      http://regexgame-backend/api/;
     }
 
+    location /minigames/towercrush/api/ {
+        proxy_pass      http://towercrush-backend/api/;
+    }
+
     location /minigames/towerdefense/api/ {
         proxy_pass      http://towerdefense-backend/api/;
     }
@@ -77,6 +80,10 @@ server {
         proxy_pass      http://regexgame/;
     }
 
+    location /minigames/towercrush/ {
+        proxy_pass      http://towercrush/;
+    }
+
     location /minigames/towerdefense/ {
         proxy_pass      http://towerdefense/;
     }
diff --git a/.nginx/compose/nginx.conf b/.nginx/compose/nginx.conf
index 4aebc31..69cd48f 100644
--- a/.nginx/compose/nginx.conf
+++ b/.nginx/compose/nginx.conf
@@ -44,6 +44,10 @@ server {
         proxy_pass      http://regexgame-backend/api/;
     }
 
+    location /minigames/towercrush/api/ {
+        proxy_pass      http://towercrush-backend/api/;
+    }
+
     location /minigames/towerdefense/api/ {
         proxy_pass      http://towerdefense-backend/api/;
     }
@@ -76,6 +80,10 @@ server {
         proxy_pass      http://regexgame/;
     }
 
+    location /minigames/towercrush/ {
+        proxy_pass      http://towercrush/;
+    }
+
     location /minigames/towerdefense/ {
         proxy_pass      http://towerdefense/;
     }
diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
index 5216cb0..a2e2ff8 100644
--- a/docker-compose-dev.yaml
+++ b/docker-compose-dev.yaml
@@ -95,6 +95,16 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
 
+  towercrush-db:
+    container_name: towercrush-db
+    image: postgres:14-alpine
+    restart: always
+    expose:
+      - "5432"
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+
   towerdefense-db:
     container_name: towerdefense-db
     image: postgres:14-alpine
@@ -145,6 +155,8 @@ services:
       - FINITEQUIZ_URL=http://finitequiz-backend/api/v1
       - BUGFINDER_URL=http://bugfinder-backend/api/v1
       - MEMORY_URL=http://memory-backend/api/v1
+      - TOWERCURSH_URL=http://towercrush-backend/api/v1
+      - TOWERDEFENSE=http://towerdefense-backend/api/v1
       - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT
       - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT
 
@@ -249,6 +261,23 @@ services:
       - OVERWORLD_URL=http://overworld-backend/api/v1
       - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT
       - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT
+  
+  towercrush-backend:
+    container_name: towercrush-backend
+    image: ghcr.io/gamify-it/towercrush-backend:main
+    restart: always
+    pull_policy: always
+    expose:
+      - "80"
+    depends_on:
+      - towercrush-db
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_URL=postgresql://towercrush-db:5432/postgres
+      - OVERWORLD_URL=http://overworld-backend/api/v1
+      - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT
+      - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT
 
   towerdefense-backend:
     container_name: towerdefense-backend
@@ -262,7 +291,7 @@ services:
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
-      - POSTGRES_URL=postgresql://regexgame-db:5432/postgres
+      - POSTGRES_URL=postgresql://towerdefense-db:5432/postgres
       - OVERWORLD_URL=http://overworld-backend/api/v1
       - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT
       - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT
@@ -331,6 +360,22 @@ services:
     restart: always
     expose:
       - "80"
+    
+  towercrush:
+    container_name: towercrush
+    image: ghcr.io/gamify-it/towercrush:main
+    pull_policy: always
+    restart: always
+    expose:
+      - "80" 
+    
+  towerdefense:
+    container_name: towerdefense
+    image: ghcr.io/gamify-it/towerdefense:main
+    pull_policy: always
+    restart: always
+    expose:
+      - "80" 
 
   # reverse-proxy
   reverse-proxy:
diff --git a/src/components/EditMinigameModals/EditChickenshockConfigurationModal.vue b/src/components/EditMinigameModals/EditChickenshockConfigurationModal.vue
index df11114..09d0972 100644
--- a/src/components/EditMinigameModals/EditChickenshockConfigurationModal.vue
+++ b/src/components/EditMinigameModals/EditChickenshockConfigurationModal.vue
@@ -1,6 +1,14 @@
 <script setup lang="ts">
 import { saveAs } from "file-saver";
-import { arrayOf, defaultValue, int, object, string } from "checkeasy";
+import {
+  arrayOf,
+  object,
+  optional,
+  string,
+  int,
+  nullable,
+  defaultValue,
+} from "checkeasy";
 import { importConfiguration } from "@/ts/import-configuration";
 import { defineEmits, defineProps, ref, watch } from "vue";
 import {
@@ -250,6 +258,7 @@ async function importFile(event: any) {
         wrongAnswers: arrayOf(string()),
       })
     ),
+    volumeLevel: optional(nullable(int())),
   });
   try {
     const result: ChickenshockConfiguration = await importConfiguration(
diff --git a/src/components/EditMinigameModals/EditCrosswordpuzzleModal.vue b/src/components/EditMinigameModals/EditCrosswordpuzzleModal.vue
index bab0bdc..3709e23 100644
--- a/src/components/EditMinigameModals/EditCrosswordpuzzleModal.vue
+++ b/src/components/EditMinigameModals/EditCrosswordpuzzleModal.vue
@@ -2,7 +2,7 @@
 // compatible crosswordpuzzle versions: v0.0.6
 const compatibleVersions = ["v0.0.6"];
 import { saveAs } from "file-saver";
-import { arrayOf, object, optional, string } from "checkeasy";
+import { arrayOf, object, optional, string, int, nullable } from "checkeasy";
 import { importConfiguration } from "@/ts/import-configuration";
 import { defineEmits, defineProps, ref, watch } from "vue";
 import { ITask } from "@/ts/models/overworld-models";
@@ -198,6 +198,7 @@ async function importFile(event: any) {
         answer: string(),
       })
     ),
+    volumeLevel: optional(nullable(int())),
   });
   try {
     const result: CrosswordpuzzleConfiguration = await importConfiguration(
diff --git a/src/components/EditMinigameModals/EditFinitequizConfigurationModal.vue b/src/components/EditMinigameModals/EditFinitequizConfigurationModal.vue
index 4efad4c..c1870a3 100644
--- a/src/components/EditMinigameModals/EditFinitequizConfigurationModal.vue
+++ b/src/components/EditMinigameModals/EditFinitequizConfigurationModal.vue
@@ -2,7 +2,7 @@
 // compatible finitequiz versions: v0.0.1
 const compatibleVersions = ["v0.0.1"];
 import { saveAs } from "file-saver";
-import { arrayOf, object, string } from "checkeasy";
+import { arrayOf, object, string, optional, int, nullable } from "checkeasy";
 import { importConfiguration } from "@/ts/import-configuration";
 import { defineEmits, defineProps, ref, watch } from "vue";
 import { ITask } from "@/ts/models/overworld-models";
@@ -250,6 +250,7 @@ async function importFile(event: any) {
         wrongAnswers: arrayOf(string()),
       })
     ),
+    volumeLevel: optional(nullable(int())),
   });
   try {
     const result: FinitequizConfiguration = await importConfiguration(
diff --git a/src/components/EditMinigameModals/EditMemoryConfigurationModal.vue b/src/components/EditMinigameModals/EditMemoryConfigurationModal.vue
index 3cb6def..cdd221f 100644
--- a/src/components/EditMinigameModals/EditMemoryConfigurationModal.vue
+++ b/src/components/EditMinigameModals/EditMemoryConfigurationModal.vue
@@ -1,6 +1,14 @@
 <script setup lang="ts">
 import { saveAs } from "file-saver";
-import { arrayOf, object, oneOf, string } from "checkeasy";
+import {
+  arrayOf,
+  object,
+  oneOf,
+  string,
+  optional,
+  int,
+  nullable,
+} from "checkeasy";
 import { importConfiguration } from "@/ts/import-configuration";
 import { Ref, defineEmits, defineProps, ref, watch } from "vue";
 import {
@@ -278,6 +286,7 @@ async function importFile(event: any) {
         }),
       })
     ),
+    volumeLevel: optional(nullable(int())),
   });
   try {
     const result: MemoryConfiguration = await importConfiguration(
diff --git a/src/components/EditMinigameModals/EditRegexGameModal.vue b/src/components/EditMinigameModals/EditRegexGameModal.vue
index 698c704..e19cb94 100644
--- a/src/components/EditMinigameModals/EditRegexGameModal.vue
+++ b/src/components/EditMinigameModals/EditRegexGameModal.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { saveAs } from "file-saver";
-import { arrayOf, defaultValue, int, object, string } from "checkeasy";
+import { arrayOf, int, object, string, optional, nullable } from "checkeasy";
 import { importConfiguration } from "@/ts/import-configuration";
 import { defineEmits, defineProps, ref, watch } from "vue";
 import {
@@ -107,7 +107,7 @@ function setupModal() {
   Object.entries(RegexStructure)
     .filter((s) => typeof s[1] !== "string")
     .forEach((k) => {
-      structureCheckboxes.value[k[0]] = configuredStructures.includes(k[0]);
+      structureCheckboxes.value[k[0]] = configuredStructures.has(k[0]);
     });
 
   if (configuration.value.riddleTimeoutSeconds === 0) timeEnable.value = false;
@@ -122,7 +122,7 @@ function handleOk() {
       allowedRegexStructures.add(
         Object.entries(RegexStructure)
           .filter((s) => typeof s[1] !== "string")
-          .find((s) => s[0] === checkbox[0])![0]
+          .find((s) => s[0] === checkbox[0])?.[0]
       );
   });
   // eslint-disable-next-line
@@ -190,14 +190,11 @@ function downloadConfiguration() {
 async function importFile(event: any) {
   const file = event.target.files[0];
   const validator = object({
-    time: defaultValue(60, int()),
-    questions: arrayOf(
-      object({
-        text: string(),
-        rightAnswer: string(),
-        wrongAnswers: arrayOf(string()),
-      })
-    ),
+    allowedRegexStructures: arrayOf(string()),
+    minimumCompletedRounds: int(),
+    answerCount: int(),
+    riddleTimeoutSeconds: int(),
+    volumeLevel: optional(nullable(int())),
   });
   try {
     const result: RegexGameConfiguration = await importConfiguration(
@@ -205,6 +202,18 @@ async function importFile(event: any) {
       validator,
       toast
     );
+    // process allowedRegexStructures
+    const allowedStructuresSet = new Set(
+      result.allowedRegexStructures.map((structure: string) => {
+        return RegexStructure[structure as keyof typeof RegexStructure];
+      })
+    );
+    // update the checkboxes for the new values
+    Object.entries(RegexStructure)
+      .filter(([key, value]) => typeof value !== "string")
+      .forEach(([key, value]) => {
+        structureCheckboxes.value[key] = allowedStructuresSet.has(value);
+      });
     configuration.value = result;
   } catch (e) {
     console.log("Import was not successful.");
@@ -238,7 +247,7 @@ async function importFile(event: any) {
         <b-form-input
           v-if="timeEnable"
           id="time-input"
-          v-model="configuration.riddleTimeoutSeconds"
+          v-model.number="configuration.riddleTimeoutSeconds"
           :state="configuration.riddleTimeoutSeconds >= 1"
           type="number"
         />
@@ -250,7 +259,7 @@ async function importFile(event: any) {
       >
         <b-form-input
           id="answers-input"
-          v-model="configuration.answerCount"
+          v-model.number="configuration.answerCount"
           :state="configuration.answerCount > 0"
           type="number"
         />
@@ -262,7 +271,7 @@ async function importFile(event: any) {
       >
         <b-form-input
           id="completedRounds-input"
-          v-model="configuration.minimumCompletedRounds"
+          v-model.number="configuration.minimumCompletedRounds"
           :state="configuration.minimumCompletedRounds > 0"
           type="number"
         />
diff --git a/src/components/EditMinigameModals/EditTowerDefenseConfigurationModal.vue b/src/components/EditMinigameModals/EditTowerDefenseConfigurationModal.vue
index ffc18a1..bf67df9 100644
--- a/src/components/EditMinigameModals/EditTowerDefenseConfigurationModal.vue
+++ b/src/components/EditMinigameModals/EditTowerDefenseConfigurationModal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { saveAs } from "file-saver";
-import { arrayOf, object, string } from "checkeasy";
+import { arrayOf, object, string, optional, int, nullable } from "checkeasy";
 import { importConfiguration } from "@/ts/import-configuration";
 import { defineEmits, defineProps, ref, watch } from "vue";
 import {
@@ -249,6 +249,7 @@ async function importFile(event: any) {
         wrongAnswers: arrayOf(string()),
       })
     ),
+    volumeLevel: optional(nullable(int())),
   });
   try {
     const result: TowerDefenseConfiguration = await importConfiguration(
diff --git a/src/components/EditMinigameModals/EditTowercrushConfigurationModal.vue b/src/components/EditMinigameModals/EditTowercrushConfigurationModal.vue
index 37599ff..8e9eb1b 100644
--- a/src/components/EditMinigameModals/EditTowercrushConfigurationModal.vue
+++ b/src/components/EditMinigameModals/EditTowercrushConfigurationModal.vue
@@ -2,7 +2,7 @@
 // compatible towercrush versions: v0.0.1
 const compatibleVersions = ["v0.0.1"];
 import { saveAs } from "file-saver";
-import { arrayOf, object, string } from "checkeasy";
+import { arrayOf, object, string, optional, int, nullable } from "checkeasy";
 import { importConfiguration } from "@/ts/import-configuration";
 import { defineEmits, defineProps, ref, watch } from "vue";
 import { ITask } from "@/ts/models/overworld-models";
@@ -250,6 +250,7 @@ async function importFile(event: any) {
         wrongAnswers: arrayOf(string()),
       })
     ),
+    volumeLevel: optional(nullable(int())),
   });
   try {
     const result: TowercrushConfiguration = await importConfiguration(
diff --git a/src/ts/import-configuration.ts b/src/ts/import-configuration.ts
index 6d7a946..69d872a 100644
--- a/src/ts/import-configuration.ts
+++ b/src/ts/import-configuration.ts
@@ -20,7 +20,7 @@ export async function importConfiguration(
         toast.error(
           "Something went wrong while reading the configuration file!"
         );
-        reject();
+        reject(new Error("File read error"));
         return;
       }
       try {
diff --git a/src/ts/models/regexgame-models.ts b/src/ts/models/regexgame-models.ts
index 845c8fd..bc46fff 100644
--- a/src/ts/models/regexgame-models.ts
+++ b/src/ts/models/regexgame-models.ts
@@ -32,20 +32,24 @@ export const defaultRegexStructures: Set<RegexStructure> = new Set([
     .map((entry) => entry[1] as RegexStructure),
 ]);
 
-export class RegexGameConfiguration {
+export interface IRegexGameConfiguration {
   id?: string;
-
   allowedRegexStructures: Set<RegexStructure>;
+  minimumCompletedRounds: number;
+  riddleTimeoutSeconds: number;
+  answerCount: number;
+}
 
+export class RegexGameConfiguration implements IRegexGameConfiguration {
+  id?: string;
+  allowedRegexStructures: Set<RegexStructure>;
   minimumCompletedRounds = 20;
-
   /**
    * how many seconds the user has to solve a given riddle
    * the timeout will accumulate over the riddles,
    * so the remaining time will be carried over to the next riddle
    */
   riddleTimeoutSeconds = 10;
-
   answerCount = 3;
 
   constructor(
diff --git a/src/ts/rest-clients/regexgame-rest-client.ts b/src/ts/rest-clients/regexgame-rest-client.ts
index d941c89..aae443a 100644
--- a/src/ts/rest-clients/regexgame-rest-client.ts
+++ b/src/ts/rest-clients/regexgame-rest-client.ts
@@ -2,10 +2,10 @@ import axios, { AxiosResponse } from "axios";
 
 import config from "@/config";
 
-import { RegexGameConfiguration } from "@/ts/models/regexgame-models";
+import { IRegexGameConfiguration } from "@/ts/models/regexgame-models";
 
 export async function postRegexGameConfig(
-  regexgameConfig: RegexGameConfiguration
+  regexgameConfig: IRegexGameConfiguration
 ): Promise<AxiosResponse> {
   return axios.post(
     `${config.regexgameApiUrl}/configurations`,