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

@@ -69,11 +69,11 @@ class ApiKey(TableABC):
         return str(
             f"""
             INSERT INTO `ApiKeys` (
-                `Identifier`, `Key`, {"" if self._creator is None else "`CreatorId`,"} `CreatedAt`, `LastModifiedAt`
+                `Identifier`, `Key`, `CreatorId`, `CreatedAt`, `LastModifiedAt`
             ) VALUES (
                 '{self._identifier}',
                 '{self._key}',
-                {"" if self._creator is None else f"{self._creator.id},"}
+                {"NULL" if self._creator is None else self._creator.id},
                 '{self._created_at}',
                 '{self._modified_at}'
             );
@@ -87,7 +87,6 @@ class ApiKey(TableABC):
             UPDATE `ApiKeys`
             SET `Identifier` = '{self._identifier}',
             `Key` = '{self._key}',
-            {"" if self._creator is None else f"`CreatorId` = {self._creator.id},"}
             `LastModifiedAt` = '{self._modified_at}'
             WHERE `Id` = {self._id};
         """

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

@@ -215,10 +215,10 @@ class AuthUser(TableABC):
                 `EMail`,
                 `Password`,
                 `PasswordSalt`,
-                {"" if self._refresh_token is None else f"`RefreshToken`,"}
+                `RefreshToken`,
-                {"" if self._confirmation_id is None else f"`ConfirmationId`,"}
+                `ConfirmationId`,
-                {"" if self._forgot_password_id is None else f"`ForgotPasswordId`,"}
+                `ForgotPasswordId`,
-                {"" if self._oauth_id is None else f"`OAuthId`,"}
+                `OAuthId`,
                 `RefreshTokenExpiryTime`,
                 `AuthRole`,
                 `CreatedAt`,
@@ -230,10 +230,10 @@ class AuthUser(TableABC):
                     '{self._email}',
                     '{self._password}', 
                     '{self._password_salt}', 
-                {"" if self._refresh_token is None else f"'{self._refresh_token}',"}
+                    '{"NULL" if self._refresh_token is None else self._refresh_token}',
-                {"" if self._confirmation_id is None else f"'{self._confirmation_id}',"}
+                    '{"NULL" if self._confirmation_id is None else self._confirmation_id}',
-                {"" if self._forgot_password_id is None else f"'{self._forgot_password_id}',"}
+                    '{"NULL" if self._forgot_password_id is None else self._forgot_password_id}',
-                {"" if self._oauth_id is None else f"'{self._oauth_id}',"}
+                    '{"NULL" if self._oauth_id is None else self._oauth_id}',
                     '{self._refresh_token_expire_time.isoformat()}',
                     {self._auth_role_id.value},
                     '{self._created_at}', 
@@ -252,10 +252,10 @@ class AuthUser(TableABC):
             `EMail` = '{self._email}', 
             `Password` = '{self._password}', 
             `PasswordSalt` = '{self._password_salt}', 
-            {'' if self._refresh_token is None else f"`RefreshToken` = '{self._refresh_token}',"} 
+            `RefreshToken` = '{'null' if self._refresh_token is None else f'{self._refresh_token}'}', 
-            {'' if self._confirmation_id is None else f"'`ConfirmationId` = '{self._confirmation_id}',"} 
+            `ConfirmationId` = '{'null' if self._confirmation_id is None else f'{self._confirmation_id}'}', 
-            {'' if self._forgot_password_id is None else f"`ForgotPasswordId` = '{self._forgot_password_id}',"}
+            `ForgotPasswordId` = '{'null' if self._forgot_password_id is None else f'{self._forgot_password_id}'}',
-            {'' if self._oauth_id is None else f"`OAuthId` = '{self._oauth_id}',"} 
+            `OAuthId` = '{'null' if self._oauth_id is None else f'{self._oauth_id}'}',
             `RefreshTokenExpiryTime` = '{self._refresh_token_expire_time.isoformat()}',
             `AuthRole` = {self._auth_role_id.value},
             `LastModifiedAt` = '{self._modified_at}'

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

@@ -150,11 +150,11 @@ class User(TableABC):
         return str(
             f"""
             INSERT INTO `Users` (
-                `DiscordId`, `XP`, {"" if self._minecraft_id is None else "`MinecraftId`,"} `ServerId`, `CreatedAt`, `LastModifiedAt`
+                `DiscordId`, `XP`, `MinecraftId`, `ServerId`, `CreatedAt`, `LastModifiedAt`
             ) VALUES (
                 {self._discord_id},
                 {self._xp},
-                {"" if self._minecraft_id is None else f"'{self._minecraft_id}',"}
+                '{self._minecraft_id}',
                 {self._server.id},
                 '{self._created_at}',
                 '{self._modified_at}'
@@ -168,7 +168,7 @@ class User(TableABC):
             f"""
             UPDATE `Users`
             SET `XP` = {self._xp},
-            {"" if self._minecraft_id is None else f"`MinecraftId` = '{self._minecraft_id}',"}
+            `MinecraftId` = {'null' if self.minecraft_id is None else f'{self._minecraft_id}'},
             `LastModifiedAt` = '{self._modified_at}'
             WHERE `UserId` = {self._user_id};
         """

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

@@ -98,15 +98,30 @@ class UserJoinedGameServer(TableABC):
 
     @property
     def insert_string(self) -> str:
+        if self._leaved_on is not None:
             return str(
                 f"""
                 INSERT INTO `UserJoinedGameServer` (
-                `UserId`, `GameServer`, `JoinedOn`, {"" if self._leaved_on is None else "`LeavedOn`,"} `CreatedAt`, `LastModifiedAt`
+                    `UserId`, `GameServer`, `JoinedOn`, `LeavedOn`, `CreatedAt`, `LastModifiedAt`
+                ) VALUES (
+                    {self._user.id},
+                    '{self._game_server}',
+                    '{self._joined_on}',
+                    '{self._leaved_on}',
+                    '{self._created_at}',
+                    '{self._modified_at}'
+                );
+            """
+            )
+        else:
+            return str(
+                f"""
+                INSERT INTO `UserJoinedGameServer` (
+                    `UserId`, `GameServer`, `JoinedOn`, `CreatedAt`, `LastModifiedAt`
                 ) VALUES (
                     {self._user.id},
                     '{self._game_server}',
                     '{self._joined_on}',
-                {"" if self._leaved_on is None else f"'{self._leaved_on}',"}
                     '{self._created_at}',
                     '{self._modified_at}'
                 );
@@ -118,8 +133,7 @@ class UserJoinedGameServer(TableABC):
         return str(
             f"""
             UPDATE `UserJoinedGameServer`
-            SET
+            SET `LeavedOn` = '{self._leaved_on}',
-            {"" if self._leaved_on is None else f"`LeavedOn` = '{self._leaved_on}',"}
             `LastModifiedAt` = '{self._modified_at}'
             WHERE `Id` = {self._id};
         """

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

@@ -97,14 +97,28 @@ class UserJoinedServer(TableABC):
 
     @property
     def insert_string(self) -> str:
+        if self._leaved_on is not None:
             return str(
                 f"""
                 INSERT INTO `UserJoinedServers` (
-                `UserId`, `JoinedOn`, {"" if self._leaved_on is None else "`LeavedOn`,"} `CreatedAt`, `LastModifiedAt`
+                    `UserId`, `JoinedOn`, `LeavedOn`, `CreatedAt`, `LastModifiedAt`
+                ) VALUES (
+                    {self._user.id},
+                    '{self._joined_on}',
+                    '{self._leaved_on}',
+                    '{self._created_at}',
+                    '{self._modified_at}'
+                );
+            """
+            )
+        else:
+            return str(
+                f"""
+                INSERT INTO `UserJoinedServers` (
+                    `UserId`, `JoinedOn`, `CreatedAt`, `LastModifiedAt`
                 ) VALUES (
                     {self._user.id},
                     '{self._joined_on}',
-                {"" if self._leaved_on is None else f"'{self._leaved_on}',"}
                     '{self._created_at}',
                     '{self._modified_at}'
                 );
@@ -116,8 +130,7 @@ class UserJoinedServer(TableABC):
         return str(
             f"""
             UPDATE `UserJoinedServers`
-            SET
+            SET `LeavedOn` = '{self._leaved_on}',
-            {"" if self._leaved_on is None else f"`LeavedOn` = '{self._leaved_on}',"}
             `LastModifiedAt` = '{self._modified_at}'
             WHERE `UserId` = {self._user.id};
         """

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

@@ -105,15 +105,30 @@ class UserJoinedVoiceChannel(TableABC):
 
     @property
     def insert_string(self) -> str:
+        if self._leaved_on is not None:
             return str(
                 f"""
                 INSERT INTO `UserJoinedVoiceChannel` (
-                `UserId`, `DiscordChannelId`, `JoinedOn`, {"" if self._leaved_on is None else "`LeavedOn`,"} `CreatedAt`, `LastModifiedAt`
+                    `UserId`, `DiscordChannelId`, `JoinedOn`, `LeavedOn`, `CreatedAt`, `LastModifiedAt`
+                ) VALUES (
+                    {self._user.id},
+                    {self._channel_id},
+                    '{self._joined_on}',
+                    '{self._leaved_on}',
+                    '{self._created_at}',
+                    '{self._modified_at}'
+                );
+            """
+            )
+        else:
+            return str(
+                f"""
+                INSERT INTO `UserJoinedVoiceChannel` (
+                    `UserId`, `DiscordChannelId`, `JoinedOn`, `CreatedAt`, `LastModifiedAt`
                 ) VALUES (
                     {self._user.id},
                     {self._channel_id},
                     '{self._joined_on}',
-                {"" if self._leaved_on is None else f"'{self._leaved_on}',"}
                     '{self._created_at}',
                     '{self._modified_at}'
                 );
@@ -125,8 +140,7 @@ class UserJoinedVoiceChannel(TableABC):
         return str(
             f"""
             UPDATE `UserJoinedVoiceChannel`
-            SET
+            SET `LeavedOn` = '{self._leaved_on}',
-            {"" if self._leaved_on is None else f"`LeavedOn` = '{self._leaved_on}',"}
             `LastModifiedAt` = '{self._modified_at}'
             WHERE `JoinId` = {self._join_id};
         """