Improved can see permission for admin and technician

Reviewed-on: sh-edraft.de/kd_discord_bot#388

.gitea/issue_template.md

@@ -0,0 +1,17 @@
+#### Beschreibung
+
+Als Produktmanager muss ich nun dieses Ticket ausfüllen.
+
+#### Aktuelles Verhalten
+
+* Was macht die Software aktuell?
+
+#### Gewünschtes Verhalten
+
+* Was soll die Software anders machen?
+
+#### Akzeptanzkriterien
+
+* Was muss erfüllt sein, damit das Ticket als abgeschlossen angesehen werden kann?
+
+#### Anmerkungen

.gitea/pull_request_template.md

@@ -0,0 +1,7 @@
+#### Ticket Referenz:
+
+#1
+
+#### Gibt es etwas beim Review zu beachten?
+
+Nein

.gitea/workflows/deploy_dev.yaml

@@ -3,7 +3,7 @@ run-name: Deploy dev on push
 on:
   push:
     branches:
-      - support
+      - dev
 
 jobs:
   on-push-deploy_sh-edraft:

docker-compose.staging.yml

@@ -5,7 +5,7 @@ volumes:
 
 services:
   kdb_bot_staging_1:
-    image: sh-edraft.de/kdb-bot:1.1.7
+    image: sh-edraft.de/kdb-bot:1.1.8
     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.7
+    image: sh-edraft.de/kdb-web:1.1.8
     container_name: kdb_web_staging_1
     depends_on:
       - kdb_bot_staging_1

docker-compose.yml

@@ -5,7 +5,7 @@ volumes:
 
 services:
     kdb_bot_prod_1:
-        image: sh-edraft.de/kdb-bot:1.1.7
+        image: sh-edraft.de/kdb-bot:1.1.8
         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.7
+        image: sh-edraft.de/kdb-web:1.1.8
         depends_on:
             - kdb_bot_prod_1
         networks:

kdb-bot/src/bot_graphql/abc/query_abc.py

@@ -79,6 +79,14 @@ class QueryABC(ObjectType):
         permissions: PermissionService = services.get_service(PermissionService)
         bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC)
 
+        if user.auth_role == AuthRoleEnum.admin:
+            return True
+
+        for u in user.users:
+            guild = bot.get_guild(u.server.discord_id)
+            if permissions.is_member_technician(guild.get_member(u.discord_id)):
+                return True
+
         access = False
         if type(element) == Achievement:
             element: Achievement = element

kdb-bot/src/modules/auto_role/command/auto_role_group.py

@@ -220,7 +220,7 @@ class AutoRoleGroup(DiscordCommandABC):
     ) -> TList[app_commands.Choice[str]]:
         return await self._auto_role_auto_complete(interaction, current)
 
-    @auto_role.command("react")
+    @auto_role.command()
     @commands.guild_only()
     @CommandChecks.check_is_ready()
     @CommandChecks.check_is_member_moderator()
@@ -244,11 +244,9 @@ class AutoRoleGroup(DiscordCommandABC):
             return
 
         for rule in self._auto_roles.get_auto_role_rules_by_auto_role_id(auto_role_from_db.id):
-            self._bot.loop.create_task(
             await self._client_utils.react_to_message_by_auto_role_rule(
                 auto_role_from_db.discord_channel_id, auto_role_from_db.discord_message_id, rule, ctx.guild
             )
-            )
 
         await self._message_service.send_ctx_msg(
             ctx,
@@ -256,7 +254,7 @@ class AutoRoleGroup(DiscordCommandABC):
         )
         self._logger.trace(__name__, f"Finished command auto-role react")
 
-    @remove.autocomplete("auto_role")
+    @react.autocomplete("auto_role")
     async def react_autocomplete(
         self, interaction: discord.Interaction, current: str
     ) -> TList[app_commands.Choice[str]]:

kdb-bot/src/modules/base/events/base_on_member_join_event.py

@@ -17,6 +17,7 @@ from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.known_user import KnownUser
+from bot_data.model.server_config import ServerConfig
 from bot_data.model.user import User
 from bot_data.model.user_joined_server import UserJoinedServer
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
@@ -72,18 +73,6 @@ class BaseOnMemberJoinEvent(OnMemberJoinABC):
             member,
         )
 
-        for admin in self._permission_service.get_admins(member.guild.id):
-            await self._messenger.send_dm_message(
-                self._t.transform("modules.base.welcome_message_for_team").format(member.mention),
-                admin,
-            )
-
-        for moderator in self._permission_service.get_moderators(member.guild.id):
-            await self._messenger.send_dm_message(
-                self._t.transform("modules.base.welcome_message_for_team").format(member.mention),
-                moderator,
-            )
-
         try:
             server = self._servers.get_server_by_discord_id(member.guild.id)
             user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
@@ -101,9 +90,21 @@ class BaseOnMemberJoinEvent(OnMemberJoinABC):
         except Exception as e:
             self._logger.error(__name__, f"Cannot get user {member.id}", e)
 
+    async def _notify_team(self, member: discord.Member):
+        self._logger.debug(__name__, f"Notify team that a member left")
+        settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{member.guild.id}")
+        channel = member.guild.get_channel(settings.team_channel_id)
+        await self._messenger.send_channel_message(
+            channel,
+            self._t.transform("modules.base.welcome_message_for_team").format(member.mention),
+            is_persistent=True,
+        )
+        self._logger.trace(__name__, f"Notified team that a member left")
+
     @EventChecks.check_is_ready()
     async def on_member_join(self, member: discord.Member):
         self._logger.debug(__name__, f"Module {type(self)} started")
         await self._client_utils.check_default_role(member)
         self._check_for_known_user(member)
         await self._add_if_not_exists_user_async(member)
+        await self._notify_team(member)

kdb-bot/src/modules/technician/command/sync_xp_command.py

@@ -19,6 +19,7 @@ from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.server_config import ServerConfig
 from bot_data.model.technician_config import TechnicianConfig
 from bot_data.model.user import User
+from modules.level.service.level_service import LevelService
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
@@ -36,6 +37,7 @@ class SyncXpGroup(DiscordCommandABC):
         permissions: PermissionServiceABC,
         settings: TechnicianConfig,
         db: DatabaseContextABC,
+        level_service: LevelService,
     ):
         DiscordCommandABC.__init__(self)
 
@@ -50,6 +52,7 @@ class SyncXpGroup(DiscordCommandABC):
         self._permissions = permissions
         self._settings = settings
         self._db = db
+        self._level_service = level_service
 
         self._logger.trace(__name__, f"Loaded command service: {type(self).__name__}")
 
@@ -93,6 +96,7 @@ class SyncXpGroup(DiscordCommandABC):
                 user.xp = user_on_other_server.xp
                 self._users.update_user(user)
                 self._db.save_changes()
+                await self._level_service.check_level(ctx.guild.get_member(user.discord_id))
             except Exception as e:
                 self._logger.error(__name__, f"Cannot sync user {user.name}", e)
 
@@ -144,6 +148,7 @@ class SyncXpGroup(DiscordCommandABC):
             self._logger.error(__name__, f"Cannot sync user {user.name}", e)
 
         await self._message_service.send_ctx_msg(ctx, self._t.transform("modules.technician.synced_message"))
+        await self._level_service.check_level(member)
         self._logger.trace(__name__, f"Finished sync xp command")
 
     @by_member.autocomplete("server_id")