Merge branch 'staging' into hotfix/deployment

internal/processor/campaign_processor.go

@@ -70,7 +70,7 @@ func (p *campaignProcessor) ListCampaigns(ctx context.Context, req *contract.Lis
 		Page:      req.Page,
 		Limit:     req.Limit,
 		Search:    req.Search,
-		Type:      req.Type,
+		Type:      string(entities.NormalizeCampaignType(req.Type)),
 		IsActive:  req.IsActive,
 		ShowOnApp: req.ShowOnApp,
 		StartDate: req.StartDate,
@@ -178,7 +178,7 @@ func (p *campaignRuleProcessor) CreateCampaignRule(ctx context.Context, req *con
 		CampaignID:     req.CampaignID,
 		RuleType:       entities.RuleType(req.RuleType),
 		ConditionValue: req.ConditionValue,
-		RewardType:     entities.CampaignRewardType(req.RewardType),
+		RewardType:     entities.NormalizeCampaignRewardType(req.RewardType),
 		RewardValue:    req.RewardValue,
 		RewardSubtype:  (*entities.RewardSubtype)(req.RewardSubtype),
 		RewardRefID:    req.RewardRefID,
@@ -218,7 +218,7 @@ func (p *campaignRuleProcessor) ListCampaignRules(ctx context.Context, req *cont
 		Limit:      req.Limit,
 		CampaignID: req.CampaignID,
 		RuleType:   req.RuleType,
-		RewardType: req.RewardType,
+		RewardType: string(entities.NormalizeCampaignRewardType(req.RewardType)),
 	}
 
 	// Get from repository
@@ -247,7 +247,7 @@ func (p *campaignRuleProcessor) UpdateCampaignRule(ctx context.Context, req *con
 		CampaignID:     req.CampaignID,
 		RuleType:       entities.RuleType(req.RuleType),
 		ConditionValue: req.ConditionValue,
-		RewardType:     entities.CampaignRewardType(req.RewardType),
+		RewardType:     entities.NormalizeCampaignRewardType(req.RewardType),
 		RewardValue:    req.RewardValue,
 		RewardSubtype:  (*entities.RewardSubtype)(req.RewardSubtype),
 		RewardRefID:    req.RewardRefID,

internal/processor/game_play_processor.go

@@ -99,6 +99,10 @@ func (p *GamePlayProcessor) ListGamePlays(ctx context.Context, query *models.Lis
 	}
 
 	offset := (query.Page - 1) * query.Limit
+	// The column was renamed; the old name still sorts the same way.
+	if query.SortBy == "token_used" {
+		query.SortBy = "coins_used"
+	}
 
 	// Get game plays from repository
 	gamePlays, total, err := p.gamePlayRepo.List(