Added default role handling #360

kdb-bot/src/bot_data/migration/default_role_migration.py

@@ -4,7 +4,7 @@ from bot_data.db_context import DBContext
 
 
 class DefaultRoleMigration(MigrationABC):
-    name = "1.1.3_ConfigMigration"
+    name = "1.1.3_DefaultRoleMigration"
 
     def __init__(self, logger: DatabaseLogger, db: DBContext):
         MigrationABC.__init__(self)

kdb-bot/src/bot_data/model/server_config.py

@@ -247,6 +247,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     `HelpVoiceChannelId`,
                     `TeamChannelId`,
                     `LoginMessageChannelId`,
+                    `DefaultRoleId`,
                     `FeatureFlags`,
                     `ServerId`
                 ) VALUES (
@@ -263,6 +264,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     {self._help_voice_channel_id},
                     {self._team_channel_id},
                     {self._login_message_channel_id},
+                    {self._default_role_id},
                     '{json.dumps(self._feature_flags)}',
                     {self._server.id}
                 );
@@ -287,6 +289,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                 `HelpVoiceChannelId` = {self._help_voice_channel_id},
                 `TeamChannelId` = {self._team_channel_id},
                 `LoginMessageChannelId` = {self._login_message_channel_id},
+                `DefaultRoleId` = {self._default_role_id},
                 `FeatureFlags` = '{json.dumps(self._feature_flags)}',
                 `ServerId` = {self._server.id}
                 WHERE `Id` = {self._id};

kdb-bot/src/bot_data/service/server_config_repository_service.py

@@ -67,10 +67,10 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
             result[14],
             json.loads(result[15]),
             self._servers.get_server_by_id(result[16]),
-            self._get_afk_channel_ids(result[17]),
-            self._get_team_role_ids(result[18]),
-            result[19],
-            result[20],
+            self._get_afk_channel_ids(result[16]),
+            self._get_team_role_ids(result[16]),
+            result[17],
+            result[18],
             id=result[0],
         )
 

kdb-bot/src/bot_graphql/graphql/serverConfig.gql

@@ -44,6 +44,7 @@ type ServerConfigHistory implements HistoryTableQuery {
     helpVoiceChannelId: String
     teamChannelId: String
     loginMessageChannelId: String
+    defaultRoleId: String
     featureFlagCount: Int
     featureFlags: [FeatureFlag]
 
@@ -92,6 +93,7 @@ input ServerConfigInput {
     helpVoiceChannelId: String
     teamChannelId: String
     loginMessageChannelId: String
+    defaultRoleId: String
     featureFlags: [FeatureFlagInput]
 
     afkChannelIds: [String]

kdb-bot/src/bot_graphql/mutations/server_config_mutation.py

@@ -89,6 +89,9 @@ class ServerConfigMutation(QueryABC):
             if "loginMessageChannelId" in input
             else server_config.login_message_channel_id
         )
+        server_config.default_role_id = (
+            input["defaultRoleId"] if "defaultRoleId" in input else server_config.default_role_id
+        )
         server_config.feature_flags = (
             dict(zip([x["key"] for x in input["featureFlags"]], [x["value"] for x in input["featureFlags"]]))
             if "featureFlags" in input