Fixed gql types

Reviewed-on: #431

.gitea/workflows/deploy_dev.yaml

@@ -8,15 +8,8 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: catthehacker/ubuntu:act-latest
+    container: sh-edraft.de/act-runner:latest
     steps:
-      - name: Setup Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10.12"
-          token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
-      - run: python -v
-
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v
@@ -30,7 +23,7 @@ jobs:
       - name: Prepare bot build
         run: |
           cd bot
-          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
           cpl i
 
       - name: Setup node

.gitea/workflows/deploy_prod.yaml

@@ -8,15 +8,8 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: catthehacker/ubuntu:act-latest
+    container: sh-edraft.de/act-runner:latest
     steps:
-      - name: Setup Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10.12"
-          token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
-      - run: python -v
-
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v
@@ -30,7 +23,7 @@ jobs:
       - name: Prepare bot build
         run: |
           cd bot
-          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
           cpl i
 
       - name: Setup node

.gitea/workflows/deploy_staging.yaml

@@ -8,15 +8,8 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: catthehacker/ubuntu:act-latest
+    container: sh-edraft.de/act-runner:latest
     steps:
-      - name: Setup Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10.12"
-          token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
-      - run: python -v
-
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v
@@ -30,7 +23,7 @@ jobs:
       - name: Prepare bot build
         run: |
           cd bot
-          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
           cpl i
 
       - name: Setup node

bot/docker

@@ -1 +1 @@
-Subproject commit 8063944d871d88a1400e45d3fdac29ee69485eb5
+Subproject commit 9c0dc595348f9ccd58409cc21171456d9ba85758

bot/src/bot_core/service/data_integrity_service.py

@@ -398,6 +398,9 @@ class DataIntegrityService:
                 if user is None:
                     continue
 
+                for join in self._user_joins.get_user_joined_servers_by_user_id(user.id):
+                    self._user_joins.delete_user_joined_server(join)
+
                 self._user_joins_vc.delete_user_joined_voice_channel_by_user_id(user.id)
                 self._users.delete_user(user)
                 self._db_context.save_changes()

bot/src/bot_data/model/user_joined_server.py

@@ -124,6 +124,6 @@ class UserJoinedServer(TableABC):
         return str(
             f"""
             DELETE FROM `UserJoinedServers`
-            WHERE `Id` = {self._join_id};
+            WHERE `JoinId` = {self._join_id};
         """
         )

bot/src/bot_graphql/graphql/serverStatistic.gql

@@ -6,10 +6,10 @@ type ServerStatistic {
     activeUserCount: Int
 
     userJoinedVoiceChannelCount: Int
-    userJoinedVoiceChannelOntime: Int
+    userJoinedVoiceChannelOntime: Float
 
     userJoinedGameServerCount: Int
-    userJoinedGameServerOntime: Int
+    userJoinedGameServerOntime: Float
 
     userWarningCount: Int