alow a list of ids to be acked or rolled back

Maps-Messaging · Jan 7, 2025 · 5508c05 · 5508c05
1 parent 312c990
commit 5508c05
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/main/java/io/mapsmessaging/rest/api/impl/messaging/MessagingApi.java b/src/main/java/io/mapsmessaging/rest/api/impl/messaging/MessagingApi.java
@@ -101,7 +101,7 @@ public StatusResponse subscribeToTopic(@Valid SubscriptionRequestDTO subscriptio
   public StatusResponse commitMessages(@Valid TransactionData transactionData) {
     hasAccess(RESOURCE);
     RestMessageListener messageListener = (RestMessageListener) getSession().getAttribute("restListener");
-    messageListener.ackReceived(transactionData.getDestinationName(), transactionData.getEventId());
+    messageListener.ackReceived(transactionData.getDestinationName(), transactionData.getEventIds());
     return new StatusResponse("Successfully committed messages");
   }
 
@@ -116,7 +116,7 @@ public StatusResponse commitMessages(@Valid TransactionData transactionData) {
   public StatusResponse abortMessages(@Valid TransactionData transactionData) {
     hasAccess(RESOURCE);
     RestMessageListener messageListener = (RestMessageListener) getSession().getAttribute("restListener");
-    messageListener.nakReceived(transactionData.getDestinationName(), transactionData.getEventId());
+    messageListener.nakReceived(transactionData.getDestinationName(), transactionData.getEventIds());
     return new StatusResponse("Successfully aborted messages");
   }
 

diff --git a/src/main/java/io/mapsmessaging/rest/api/impl/messaging/impl/RestMessageListener.java b/src/main/java/io/mapsmessaging/rest/api/impl/messaging/impl/RestMessageListener.java
@@ -62,17 +62,21 @@ public synchronized void sendMessage(@NotNull @NonNull MessageEvent messageEvent
     }
   }
 
-  public void ackReceived(String destination, long messageId) {
+  public void ackReceived(String destination, List<Long> messageId) {
     SubscribedEventManager subscribedEventManager = subscribedEventManagerMap.get(destination);
     if (subscribedEventManager != null) {
-      subscribedEventManager.ackReceived(messageId);
+      for (long id : messageId) {
+        subscribedEventManager.ackReceived(id);
+      }
     }
   }
 
-  public void nakReceived(String destination, long messageId) {
+  public void nakReceived(String destination, List<Long> messageId) {
     SubscribedEventManager subscribedEventManager = subscribedEventManagerMap.get(destination);
     if (subscribedEventManager != null) {
-      subscribedEventManager.rollbackReceived(messageId);
+      for (long id : messageId) {
+        subscribedEventManager.rollbackReceived(id);
+      }
     }
   }
 

diff --git a/src/main/java/io/mapsmessaging/rest/responses/TransactionData.java b/src/main/java/io/mapsmessaging/rest/responses/TransactionData.java
@@ -4,10 +4,12 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class TransactionData {
   private String destinationName;
-  private long eventId;
+  private List<Long> eventIds;
 }