Merge pull request 'support' (#381 ) from support into master

Reviewed-on: sh-edraft.de/kd_discord_bot#381
Set version
2023-09-28 20:03:31 +02:00 · 2023-09-28 19:59:26 +02:00 · 2023-09-28 19:51:23 +02:00 · 2023-09-28 19:51:02 +02:00 · 2023-09-28 19:32:36 +02:00 · 2023-09-28 19:13:20 +02:00
4 changed files with 6 additions and 6 deletions
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -5,7 +5,7 @@ volumes:
 services:
  kdb_bot_staging_1:
-    image: sh-edraft.de/kdb-bot:1.1.6
+    image: sh-edraft.de/kdb-bot:1.1.7
    container_name: kdb_bot_staging_1
    depends_on:
      - kdb_db_staging_1
@@ -32,7 +32,7 @@ services:
          memory: 1024M
  kdb_web_staging_1:
-    image: sh-edraft.de/kdb-web:1.1.6
+    image: sh-edraft.de/kdb-web:1.1.7
    container_name: kdb_web_staging_1
    depends_on:
      - kdb_bot_staging_1
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ volumes:
 services:
    kdb_bot_prod_1:
-        image: sh-edraft.de/kdb-bot:1.1.6
+        image: sh-edraft.de/kdb-bot:1.1.7
        depends_on:
            - kdb_db_prod_1
        networks:
@@ -30,7 +30,7 @@ services:
              memory: 1024M
    kdb_web_prod_1:
-        image: sh-edraft.de/kdb-web:1.1.6
+        image: sh-edraft.de/kdb-web:1.1.7
        depends_on:
            - kdb_bot_prod_1
        networks:
--- a/kdb-bot/cpl-workspace.json
+++ b/kdb-bot/cpl-workspace.json
@@ -16,7 +16,7 @@
      "level": "src/modules/level/level.json",
      "permission": "src/modules/permission/permission.json",
      "technician": "src/modules/technician/technician.json",
-      "short-role-name": "src/modules/_short_role_name/modules/short-role-name.json",
+      "short-role-name": "src/modules/short_role_name/short-role-name.json",
      "checks": "tools/checks/checks.json",
      "get-version": "tools/get_version/get-version.json",
      "post-build": "tools/post_build/post-build.json",
--- a/kdb-bot/src/bot_graphql/mutations/short_role_name_mutation.py
+++ b/kdb-bot/src/bot_graphql/mutations/short_role_name_mutation.py
@@ -42,7 +42,7 @@ class ShortRoleNameMutation(QueryABC):
        )
        result = self._short_role_names.find_short_role_names_by_role_id(short_role_name.role_id)
-        if result is not None:
+        if result.count() > 0:
            raise ValueError("Short name for role already exists")
        self._short_role_names.add_short_role_name(short_role_name)
Author	SHA1	Message	Date
Sven Heidemann	0dd9558f33	Merge pull request 'support' (#381 ) from support into master All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 3m12s Details Reviewed-on: sh-edraft.de/kd_discord_bot#381	2023-09-28 20:03:31 +02:00
Sven Heidemann	7acd850e68	Set version All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 3m23s Details	2023-09-28 19:59:26 +02:00
Sven Heidemann	ecd3ea96b1	Merge pull request 'Fixed mutation' (#380 ) from 1.1.7 into support All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 4m10s Details Reviewed-on: sh-edraft.de/kd_discord_bot#380	2023-09-28 19:51:23 +02:00
Sven Heidemann	d869bcfd3a	Fixed mutation	2023-09-28 19:51:02 +02:00
Sven Heidemann	818e021761	Merge pull request 'Fixed post script' (#379 ) from 1.1.7 into support All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 4m6s Details Reviewed-on: sh-edraft.de/kd_discord_bot#379	2023-09-28 19:32:36 +02:00
Sven Heidemann	b286322247	Merge branch 'support' into 1.1.7	2023-09-28 19:13:20 +02:00
Sven Heidemann	661b057e85	Fixed workspace	2023-09-28 19:13:10 +02:00
Sven Heidemann	25137c6923	Merge pull request 'Fixed action' (#373 ) from support into master All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 3m58s Details Reviewed-on: sh-edraft.de/kd_discord_bot#373	2023-09-27 20:59:21 +02:00
Sven Heidemann	74f3ee2f08	Merge pull request 'support into master' (#371 ) from support into master Some checks failed Deploy dev on push / on-push-deploy_sh-edraft (push) Failing after 1m6s Details Reviewed-on: sh-edraft.de/kd_discord_bot#371 Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de> Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>	2023-09-27 20:46:54 +02:00
Sven Heidemann	2e0c1babe4	Merge pull request 'support in master' (#356 ) from support into master Reviewed-on: sh-edraft.de/kd_discord_bot#356 Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com> Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>	2023-09-10 18:23:38 +02:00