Change task comment api

app/api/dao/task_comment.py

@@ -3,6 +3,7 @@
 from app import messages
 from app.database.models.mentorship_relation import MentorshipRelationModel
 from app.database.models.task_comment import TaskCommentModel
+from app.database.models.user import UserModel
 from app.utils.decorator_utils import email_verification_required
 from app.utils.enum_utils import MentorshipRelationState
 
@@ -103,7 +104,15 @@ def get_all_task_comments_by_task_id(user_id, task_id, relation_id):
             return is_valid
 
         comments_list = TaskCommentModel.find_all_by_task_id(task_id, relation_id)
-        return [comment.json() for comment in comments_list]
+        response = []
+        for comment in comments_list:
+            user_details = UserModel.find_by_id(comment.user_id)
+            comment = comment.json()
+            del comment["user_id"]
+            comment["user"] = user_details
+            response.append(comment)
+
+        return response
 
     @staticmethod
     @email_verification_required

app/api/models/mentorship_relation.py

@@ -3,7 +3,8 @@
 from app.utils.enum_utils import MentorshipRelationState
 
 from .task import create_task_request_body, list_tasks_response_body
-from .task_comment import task_comment_model, task_comments_model
+
+# from .task_comment import task_comment_model, task_comments_model
 
 
 def add_models_to_namespace(api_namespace):
@@ -20,8 +21,6 @@ def add_models_to_namespace(api_namespace):
         mentorship_request_response_body_for_user_dashboard_body.name
     ] = mentorship_request_response_body_for_user_dashboard_body
     api_namespace.models[user_dashboard_user_details.name] = user_dashboard_user_details
-    api_namespace.models[task_comment_model.name] = task_comment_model
-    api_namespace.models[task_comments_model.name] = task_comments_model
 
 
 send_mentorship_request_body = Model(

app/api/models/task_comment.py

@@ -1,4 +1,5 @@
-from flask_restx import Model, fields
+from flask_restx import fields, Model
+from app.api.models.user import public_user_api_model
 
 
 def add_models_to_namespace(api_namespace):
@@ -15,7 +16,7 @@ def add_models_to_namespace(api_namespace):
     "Task comments model",
     {
         "id": fields.Integer(required=True, description="Task comment's id."),
-        "user_id": fields.Integer(required=True, description="User's id."),
+        "user": fields.Nested(public_user_api_model),
         "task_id": fields.Integer(required=True, description="Task's id."),
         "relation_id": fields.Integer(required=True, description="Relation's id."),
         "creation_date": fields.Float(

tests/task_comments/test_dao.py

@@ -3,6 +3,7 @@
 
 from app import messages
 from app.api.dao.task_comment import TaskCommentDAO
+from app.database.models.user import UserModel
 from tests.tasks.tasks_base_setup import TasksBaseTestCase
 
 
@@ -30,7 +31,11 @@ def test_dao_find_by_task_id(self):
         task_comments = TaskCommentDAO.get_all_task_comments_by_task_id(
             user_id=1, task_id=1, relation_id=2
         )[0]
-        task_comment = TaskCommentDAO.get_task_comment(1, 1)[0].json()
+        task_comment = TaskCommentDAO.get_task_comment(1, 1)[0]
+        user_details = UserModel.find_by_id(1).json()
+        task_comment = task_comment.json()
+        del task_comment["user_id"]
+        task_comment["user"] = user_details
         self.assertEqual(task_comment, task_comments)
 
     def test_dao_find_by_user_id(self):