Skip to content
Merged

Dev #400

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/controllers/evaluationController.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ function mapToFrontendFields(backendData) {
if (frontendData.reviewee_username) {
frontendData.target_member_name = frontendData.reviewee_username;
}
if (frontendData.reviewee_task) {
frontendData.target_member_task = frontendData.reviewee_task;
}
if (frontendData.created_at) {
frontendData.evaluated_at = frontendData.created_at;
}
Expand Down
2 changes: 2 additions & 0 deletions src/services/reviewService.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ class ReviewService {
r.review_id,
r.reviewee_id,
u.username as reviewee_username,
pm.task as reviewee_task,
r.ability,
r.effort,
r.commitment,
Expand All @@ -120,6 +121,7 @@ class ReviewService {
r.created_at
FROM reviews r
JOIN users u ON r.reviewee_id = u.user_id
LEFT JOIN project_members pm ON pm.project_id = r.project_id AND pm.user_id = r.reviewee_id
WHERE r.project_id = :project_id AND r.reviewer_id = :reviewer_id
ORDER BY r.created_at DESC`,
{
Expand Down