fix: Pending contributions are marked as deleted when they need to be…

…canceled - MEED-7461 - Meeds-io/meeds#2379 (#1732) Ensure the cancellation process for pending contributions.
Meeds-io · Sep 11, 2024 · 827fe7a · 827fe7a
1 parent af03711
commit 827fe7a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 30 deletions.
diff --git a/services/src/main/java/io/meeds/gamification/dao/RealizationDAO.java b/services/src/main/java/io/meeds/gamification/dao/RealizationDAO.java
@@ -289,24 +289,24 @@ public int countRealizationsInPeriod(String earnerIdentityId, long ruleId, Date
     }
   }
 
-  public Long findLastReadlizationByRuleIdAndEarnerIdAndReceiverAndObjectId(long ruleId,
-                                                                                         String earnerId,
-                                                                                         String receiverId,
-                                                                                         String objectId,
-                                                                                         String objectType) {
+  public Long findLastRealizationByRuleIdAndEarnerIdAndReceiverAndObjectId(long ruleId,
+                                                                           String earnerId,
+                                                                           String receiverId,
+                                                                           String objectId,
+                                                                           String objectType) {
     TypedQuery<Long> query =
-                                        getEntityManager().createNamedQuery("RealizationEntity.findReadlizationsByRuleIdAndEarnerIdAndReceiverAndObjectId",
-                                                                            Long.class);
+                           getEntityManager().createNamedQuery("RealizationEntity.findRealizationsByRuleIdAndEarnerIdAndReceiverAndObjectId",
+                                                               Long.class);
     query.setParameter(RULE_ID_PARAM_NAME, ruleId)
          .setParameter(EARNER_ID_PARAM_NAME, earnerId)
          .setParameter(RECEIVER_ID_PARAM_NAME, receiverId)
          .setParameter(OBJECT_ID_PARAM_NAME, objectId)
          .setParameter(OBJECT_TYPE_PARAM_NAME, objectType)
-         .setParameter(STATUS_PARAM_NAME, RealizationStatus.ACCEPTED);
+         .setParameter(STATUS_PARAM_NAME, List.of(RealizationStatus.ACCEPTED, RealizationStatus.PENDING));
     query.setMaxResults(1);
 
     List<Long> resultList = query.getResultList();
-    return CollectionUtils.isEmpty(resultList) ? null : resultList.get(0);
+    return CollectionUtils.isEmpty(resultList) ? null : resultList.getFirst();
   }
 
   public List<Long> getRealizationsByObjectIdAndObjectType(String objectId, String objectType) {

diff --git a/services/src/main/java/io/meeds/gamification/entity/RealizationEntity.java b/services/src/main/java/io/meeds/gamification/entity/RealizationEntity.java
@@ -189,15 +189,15 @@
       + " AND a.status = :status"
 )
 @NamedQuery(
-  name = "RealizationEntity.findReadlizationsByRuleIdAndEarnerIdAndReceiverAndObjectId",
-  query = "SELECT g.id FROM RealizationEntity g" +
-    " WHERE g.ruleEntity.id = :ruleId" +
-    " AND g.earnerId = :earnerId" +
-    " AND g.receiver = :receiverId" +
-    " AND g.objectId = :objectId" +
-    " AND g.objectType = :objectType" +
-    " AND g.status = :status" +
-    " ORDER BY g.id DESC"
+  name = "RealizationEntity.findRealizationsByRuleIdAndEarnerIdAndReceiverAndObjectId",
+  query = "SELECT g.id FROM RealizationEntity g"
+      + " WHERE g.ruleEntity.id = :ruleId"
+      + " AND g.earnerId = :earnerId"
+      + " AND g.receiver = :receiverId"
+      + " AND g.objectId = :objectId"
+      + " AND g.objectType = :objectType"
+      + " AND g.status IN (:status)"
+      + " ORDER BY g.id DESC"
 )
 @NamedQuery(
   name = "RealizationEntity.getRealizationsByObjectIdAndObjectType",

diff --git a/services/src/main/java/io/meeds/gamification/service/impl/RealizationServiceImpl.java b/services/src/main/java/io/meeds/gamification/service/impl/RealizationServiceImpl.java
@@ -340,7 +340,7 @@ public List<RealizationDTO> cancelRealizations(String event,
       return Collections.emptyList();
     }
     return rules.stream()
-                .map(rule -> realizationStorage.findLastReadlizationByRuleIdAndEarnerIdAndReceiverAndObjectId(rule.getId(),
+                .map(rule -> realizationStorage.findLastRealizationByRuleIdAndEarnerIdAndReceiverAndObjectId(rule.getId(),
                                                                                                               earnerIdentityId,
                                                                                                               receiverIdentityId,
                                                                                                               objectId,

diff --git a/services/src/main/java/io/meeds/gamification/storage/RealizationStorage.java b/services/src/main/java/io/meeds/gamification/storage/RealizationStorage.java
@@ -131,16 +131,16 @@ public Map<Long, Long> getScoresByIdentityIdsAndBetweenDates(List<String> earner
     return gamificationHistoryDAO.getScoreByIdentityIdsAndBetweenDates(earnersId, fromDate, toDate);
   }
 
-  public RealizationDTO findLastReadlizationByRuleIdAndEarnerIdAndReceiverAndObjectId(long ruleId,
-                                                                                      String earnerId,
-                                                                                      String receiverId,
-                                                                                      String objectId,
-                                                                                      String objectType) {
-    Long id = gamificationHistoryDAO.findLastReadlizationByRuleIdAndEarnerIdAndReceiverAndObjectId(ruleId,
-                                                                                                   earnerId,
-                                                                                                   receiverId,
-                                                                                                   objectId,
-                                                                                                   objectType);
+  public RealizationDTO findLastRealizationByRuleIdAndEarnerIdAndReceiverAndObjectId(long ruleId,
+                                                                                     String earnerId,
+                                                                                     String receiverId,
+                                                                                     String objectId,
+                                                                                     String objectType) {
+    Long id = gamificationHistoryDAO.findLastRealizationByRuleIdAndEarnerIdAndReceiverAndObjectId(ruleId,
+                                                                                                  earnerId,
+                                                                                                  receiverId,
+                                                                                                  objectId,
+                                                                                                  objectType);
     return id == null || id == 0 ? null : getRealizationById(id);
   }
 

diff --git a/services/src/test/java/io/meeds/gamification/dao/RealizationDAOTest.java b/services/src/test/java/io/meeds/gamification/dao/RealizationDAOTest.java
@@ -114,7 +114,7 @@ public void testGetLeaderboard() {
   public void testFindActionHistoryByActionTitleAndEarnerIdAndReceiverAndObjectId() {
     ProgramEntity domainEntity = newDomain();
     RealizationEntity realizationEntity = newRealizationEntity("rule", domainEntity.getId());
-    assertNotNull(realizationDAO.findLastReadlizationByRuleIdAndEarnerIdAndReceiverAndObjectId(realizationEntity.getRuleEntity()
+    assertNotNull(realizationDAO.findLastRealizationByRuleIdAndEarnerIdAndReceiverAndObjectId(realizationEntity.getRuleEntity()
                                                                                                                 .getId(),
                                                                                                TEST_USER_EARNER,
                                                                                                TEST_USER_EARNER,