Added member profile #130

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

@@ -45,6 +45,10 @@ class UserJoinedVoiceChannel(TableABC):
     def user(self) -> User:
         return self._user
 
+    @property
+    def time(self) -> float:
+        return round((self.leaved_on - self.joined_on).total_seconds() / 3600, 2)
+
     @property
     def joined_on(self) -> datetime:
         return self._joined_on

kdb-bot/src/bot_graphql/model/userJoinedVoiceChannel.gql

@@ -3,6 +3,7 @@ type UserJoinedVoiceChannel implements TableQuery {
     channelId: String
     channelName: String
     user: User
+    time: Float
     joinedOn: String
     leavedOn: String
 

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

@@ -37,12 +37,12 @@ class UserMutation(QueryABC):
         user = self._users.get_user_by_id(input["id"])
         self._can_user_mutate_data(user.server, UserRoleEnum.moderator)
 
-        user.xp = input["xp"] if "xp" in input else user.xp
-
         if "levelId" in input:
             level = self._levels.get_level_by_id(input["levelId"])
             user.xp = level.min_xp
 
+        user.xp = input["xp"] if "xp" in input else user.xp
+
         self._users.update_user(user)
         self._db.save_changes()
         self._level_service.set_level(user)

kdb-bot/src/bot_graphql/queries/user_joined_voice_channel_query.py

@@ -14,6 +14,7 @@ class UserJoinedVoiceChannelQuery(DataQueryABC):
         self.set_field("channelId", self.resolve_channel_id)
         self.set_field("channelName", self.resolve_channel_name)
         self.set_field("user", self.resolve_user)
+        self.set_field("time", self.resolve_time)
         self.set_field("joinedOn", self.resolve_joined_on)
         self.set_field("leavedOn", self.resolve_leaved_on)
 
@@ -33,6 +34,10 @@ class UserJoinedVoiceChannelQuery(DataQueryABC):
     def resolve_user(x: UserJoinedVoiceChannel, *_):
         return x.user
 
+    @staticmethod
+    def resolve_time(x: UserJoinedVoiceChannel, *_):
+        return x.time
+
     @staticmethod
     def resolve_joined_on(x: UserJoinedVoiceChannel, *_):
         return x.joined_on

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

@@ -72,10 +72,8 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
             join = self._user_joins_vc.get_active_user_joined_voice_channel_by_user_id(user.id)
             join.leaved_on = datetime.now()
 
-            # ontime as hours
-            ontime = round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2)
             old_xp = user.xp
-            user.xp += round(ontime * settings.xp_per_ontime_hour)
+            user.xp += round(join.time * settings.xp_per_ontime_hour)
 
             self._user_joins_vc.update_user_joined_voice_channel(join)
             self._users.update_user(user)
@@ -83,7 +81,7 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
 
             self._logger.debug(
                 __name__,
-                f"User {user} leaved_on {join.leaved_on}. Ontime: {ontime}h | xp: from {old_xp} to {user.xp}",
+                f"User {user} leaved_on {join.leaved_on}. Ontime: {join.time}h | xp: from {old_xp} to {user.xp}",
             )
         except Exception as e:
             self._logger.error(__name__, f"Ontime validation failed", e)