Merge pull request #59 from joshsoftware/fix/show_sender_name

Fix/show_sender_name

Author: Smokashi23

internal/app/appreciation/helper.go

@@ -1,8 +1,6 @@
 package appreciation
 
 import (
-	"strconv"
-	"strings"
 	"github.com/joshsoftware/peerly-backend/internal/pkg/dto"
 	"github.com/joshsoftware/peerly-backend/internal/repository"
 )
@@ -53,11 +51,8 @@ func mapRepoGetAppreciationInfoToDTOGetAppreciationInfo(info repository.Apprecia
 		UpdatedAt:           info.UpdatedAt,
 	}
 
-	grade := strings.ToUpper(info.SenderGradeName)
-	if strings.HasPrefix(grade, "J") {
-		if n, err := strconv.Atoi(strings.TrimPrefix(grade, "J")); err == nil && n >= 3 && n <= 6 {
-			dtoApprResp.ByManagement = true
-		}
+	if info.SenderGradeID != 0 && info.SenderGradeID <= 6 {
+		dtoApprResp.ByManagement = true
 	}
 
 	return dtoApprResp

internal/repository/appreciation.go

@@ -46,7 +46,7 @@ type AppreciationResponse struct {
 	SenderImageURL      sql.NullString `db:"sender_image_url"`
 	SenderDesignation   string         `db:"sender_designation"`
 	SenderEmployeeID    string         `db:"sender_employee_id"`
-	SenderGradeName     string         `db:"sender_grade_name"`
+	SenderGradeID       int64          `db:"sender_grade_id"` // New field for grade ID
 	ReceiverID          int64          `db:"receiver_id"`
 	ReceiverFirstName   string         `db:"receiver_first_name"`
 	ReceiverLastName    string         `db:"receiver_last_name"`

internal/repository/postgresdb/appreciation.go

@@ -78,8 +78,6 @@ func (appr *appreciationsStore) GetAppreciationById(ctx context.Context, tx repo
 		return repository.AppreciationResponse{}, apperrors.InternalServer
 	}
 
-
-	// Build the SQL query
 	query, args, err := repository.Sq.Select(
 		"a.id",
 		"cv.name AS core_value_name",
@@ -93,7 +91,7 @@ func (appr *appreciationsStore) GetAppreciationById(ctx context.Context, tx repo
 		"u_sender.last_name AS sender_last_name",
 		"u_sender.profile_image_url AS sender_image_url",
 		"u_sender.designation AS sender_designation",
-		"g_sender.name AS sender_grade_name",
+		"u_sender.grade_id AS sender_grade_id",
 		"u_receiver.id AS receiver_id",
 		"u_receiver.first_name AS receiver_first_name",
 		"u_receiver.last_name AS receiver_last_name",
@@ -104,21 +102,20 @@ func (appr *appreciationsStore) GetAppreciationById(ctx context.Context, tx repo
 		"COUNT(r.id) AS total_rewards",
 		fmt.Sprintf(
 			`COALESCE((
-				SELECT SUM(r2.point) 
-				FROM rewards r2 
-				WHERE r2.appreciation_id = a.id AND r2.sender = %d
-			), 0) AS given_reward_point`, userID),
+					SELECT SUM(r2.point) 
+					FROM rewards r2 
+					WHERE r2.appreciation_id = a.id AND r2.sender = %d
+				), 0) AS given_reward_point`, userID),
 	).From(appr.AppreciationsTable+" a").
 		LeftJoin(appr.UsersTable+" u_sender ON a.sender = u_sender.id").
-		LeftJoin("grades g_sender ON u_sender.grade_id = g_sender.id").
 		LeftJoin(appr.UsersTable+" u_receiver ON a.receiver = u_receiver.id").
 		LeftJoin(appr.CoreValuesTable+" cv ON a.core_value_id = cv.id").
 		LeftJoin(appr.RewardsTable+" r ON a.id = r.appreciation_id").
 		Where(squirrel.And{
 			squirrel.Eq{"a.id": apprId},
 			squirrel.Eq{"a.is_valid": true},
 		}).
-		GroupBy("a.id", "cv.name", "cv.description", "u_sender.id", "g_sender.name", "u_receiver.id").
+		GroupBy("a.id", "cv.name", "cv.description", "u_sender.id", "u_receiver.id"). // Removed g_sender.name from GroupBy
 		ToSql()
 
 	if err != nil {
@@ -217,7 +214,7 @@ func (appr *appreciationsStore) ListAppreciations(ctx context.Context, tx reposi
 		"u_sender.profile_image_url AS sender_image_url",
 		"u_sender.designation AS sender_designation",
 		"u_sender.employee_id AS sender_employee_id",
-		"g_sender.name AS sender_grade_name",
+		"u_sender.grade_id AS sender_grade_id", // Select grade_id directly
 		"u_receiver.id AS receiver_id",
 		"u_receiver.first_name AS receiver_first_name",
 		"u_receiver.last_name AS receiver_last_name",
@@ -234,9 +231,8 @@ func (appr *appreciationsStore) ListAppreciations(ctx context.Context, tx reposi
 				WHERE r2.appreciation_id = a.id AND r2.sender = %d
 			), 0) AS given_reward_point`, userID),
 	).
-		LeftJoin("grades g_sender ON u_sender.grade_id = g_sender.id").
 		LeftJoin("rewards r ON a.id = r.appreciation_id").
-		GroupBy("a.id", "cv.name", "cv.description", "u_sender.id", "g_sender.name", "u_receiver.id")
+		GroupBy("a.id", "cv.name", "cv.description", "u_sender.id", "u_receiver.id")
 
 	if filter.SortOrder != "" {
 		queryBuilder = queryBuilder.OrderBy(fmt.Sprintf("a.created_at %s", filter.SortOrder))