Merge pull request #4389 from hotosm/develop

v4.4.2

backend/services/messaging/message_service.py

@@ -245,7 +245,7 @@ def send_message_after_comment(
             messages = []
             for user_id in contributed_users:
                 try:
-                    user = UserService.get_user_dto_by_id(user_id)
+                    user = UserService.get_user_by_id(user_id)
                     # if user was mentioned, a message has already been sent to them,
                     # so we can skip
                     if user.username in usernames:
@@ -430,7 +430,7 @@ def send_message_after_chat(chat_from: int, chat: str, project_id: int):
                 messages = []
                 for user_id in users_to_notify:
                     try:
-                        user = UserService.get_user_dto_by_id(user_id)
+                        user = UserService.get_user_by_id(user_id)
                     except NotFound:
                         continue  # If we can't find the user, keep going no need to fail
                     message = Message()
@@ -468,7 +468,7 @@ def send_favorite_project_activities(user_id: int):
                 > datetime.date.today() - datetime.timedelta(days=300)
             )
         )
-        user = UserService.get_user_dto_by_id(user_id)
+        user = UserService.get_user_by_id(user_id)
         messages = []
         for project in recently_updated_projects:
             activity_message = []

backend/services/users/user_service.py

@@ -181,12 +181,13 @@ def get_user_dto_by_username(
         return requested_user.as_dto(logged_in_user.username)
 
     @staticmethod
-    def get_user_dto_by_id(requested_user: int, logged_in_user: int) -> UserDTO:
+    def get_user_dto_by_id(user: int, request_user: int) -> UserDTO:
         """Gets user DTO for supplied user id """
-        requested_user = UserService.get_user_by_id(requested_user)
-        logged_in_user = UserService.get_user_by_id(logged_in_user)
-
-        return requested_user.as_dto(logged_in_user.username)
+        user = UserService.get_user_by_id(user)
+        if request_user:
+            request_username = UserService.get_user_by_id(request_user).username
+            return user.as_dto(request_username)
+        return user.as_dto()
 
     @staticmethod
     def get_interests_stats(user_id):