fix: Merger PR cancels gamification for user - MEED-2441 - Meeds-io/M…

…IPs#64 (#99) Prior to this change, the PR merger was considered as closing a PR event and canceling a gamification
Meeds-io · Sep 14, 2023 · 0902705 · 0902705
1 parent ea16967
commit 0902705
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...es/src/main/java/org/exoplatform/gamification/github/plugin/PullRequestTriggerPlugin.java b/...es/src/main/java/org/exoplatform/gamification/github/plugin/PullRequestTriggerPlugin.java
@@ -32,7 +32,8 @@ public List<Event> getEvents(Map<String, Object> payload) {
     String objectId = extractSubItem(payload, PULL_REQUEST, HTML_URL);
     if (Objects.equals(extractSubItem(payload, ACTION), OPENED)) {
       return Collections.singletonList(new Event(CREATE_PULL_REQUEST_EVENT_NAME, null, userId, objectId, PR_TYPE));
-    } else if (Objects.equals(extractSubItem(payload, ACTION), CLOSED)) {
+    } else if (Objects.equals(extractSubItem(payload, ACTION), CLOSED)
+        && !Boolean.parseBoolean(extractSubItem(payload, PULL_REQUEST, MERGED))) {
       return Collections.singletonList(new Event(CLOSE_PULL_REQUEST_EVENT_NAME, null, userId, objectId, PR_TYPE));
     } else if (Objects.equals(extractSubItem(payload, ACTION), REVIEW_REQUESTED)) {
       String requestedReviewer = extractSubItem(payload, REQUESTED_REVIEWER, LOGIN);

diff --git a/...cation-github-services/src/main/java/org/exoplatform/gamification/github/utils/Utils.java b/...cation-github-services/src/main/java/org/exoplatform/gamification/github/utils/Utils.java
@@ -97,6 +97,8 @@ public class Utils {
 
   public static final String  UNLABELED                                  = "unlabeled";
 
+  public static final String  MERGED                                     = "merged";
+
   public static final String  REVIEW_REQUESTED                           = "review_requested";
 
   public static final String  REVIEW_REQUEST_REMOVED                     = "review_request_removed";