Issue 685

app/api/models/mentorship_relation.py

@@ -18,6 +18,7 @@ def add_models_to_namespace(api_namespace):
     ] = 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[user_detail.name] = user_detail
     api_namespace.models[task_comments_model.name] = task_comments_model
 
 
@@ -164,11 +165,19 @@ def add_models_to_namespace(api_namespace):
     {"comment": fields.String(required=True, description="Task comment.")},
 )
 
+user_detail = Model(
+    "User model.",
+    {"id": fields.Integer(required=True, description="User's id."),
+    "name": fields.String(required=True, description="User's name.")},
+)
+
 task_comments_model = Model(
     "Task comments model.",
     {
         "id": fields.Integer(required=True, description="Task comment's id."),
-        "user_id": fields.Integer(required=True, description="User's id."),
+        "sent_by_me":fields.Boolean(
+            required=True, description="Comment is done by current user indication"),
+        "user": fields.Nested(user_detail),
         "task_id": fields.Integer(required=True, description="Task's id."),
         "relation_id": fields.Integer(required=True, description="Relation's id."),
         "creation_date": fields.Float(

app/api/resources/mentorship_relation.py

@@ -836,12 +836,18 @@ def get(cls, relation_id, task_id):
         """
         Lists the task comments.
         """
+        user_id = get_jwt_identity()
 
         response = TaskCommentDAO.get_all_task_comments_by_task_id(
-            get_jwt_identity(), task_id, relation_id
+            user_id, task_id, relation_id
         )
 
         if isinstance(response, tuple):
             return response
+
+        for task in response:
+            task['user'] = userDAO.get_user(task['user_id'])
+            task['sent_by_me'] = user_id==task['user_id'] 
+
         else:
             return marshal(response, task_comments_model), HTTPStatus.OK