chore: add support for discard_deleted_activities

Author: itsmeadi

src/main/java/io/getstream/core/options/Filter.java

@@ -10,7 +10,8 @@ enum OpType {
     ID_GREATER_THAN("id_gt"),
     ID_LESS_THAN_OR_EQUAL("id_lte"),
     ID_LESS_THAN("id_lt"),
-    REFRESH("refresh");
+    REFRESH("refresh"),
+    DISCARD_DELETED_ACTIVITIES("discard_deleted_activities");
 
     private String operator;
 
@@ -46,6 +47,11 @@ public Filter idGreaterThanEqual(String id) {
     return this;
   }
 
+  public Filter discardDeletedActivities() {
+    ops.add(new OpEntry(OpType.DISCARD_DELETED_ACTIVITIES, "true"));
+    return this;
+  }
+
   public Filter idLessThan(String id) {
     ops.add(new OpEntry(OpType.ID_LESS_THAN, id));
     return this;

src/test/java/io/getstream/client/BatchDeleteActivitiesTest.java

@@ -2,17 +2,22 @@
 
 import static org.junit.Assert.*;
 
+import com.google.common.collect.Lists;
 import io.getstream.core.BatchDeleteActivities;
 import io.getstream.core.http.HTTPClient;
 import io.getstream.core.models.BatchDeleteActivitiesRequest;
 import io.getstream.core.models.BatchDeleteActivitiesRequest.ActivityToDelete;
 import io.getstream.core.models.Activity;
+import io.getstream.core.models.FeedID;
+import io.getstream.core.options.Filter;
+import io.getstream.core.options.Limit;
 import java8.util.concurrent.CompletableFuture;
 import org.junit.*;
 
 import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 
 public class BatchDeleteActivitiesTest {
 
@@ -35,26 +40,28 @@ public void setUp() throws Exception {
     @Test
     public void testDeleteActivities() throws Exception {
         BatchDeleteActivitiesClient batchDeleteClient = client.batchDeleteActivities();
+        String uuid1 = UUID.randomUUID().toString().replace("-", "");
+        FlatFeed feed = client.flatFeed("flat", uuid1);
 
         // Insert some activities
         Activity activity1 = Activity.builder()
                 .actor("user1")
                 .verb("post")
                 .object("object1")
                 .build();
-        Activity activity1Res = client.flatFeed("user", "user1").addActivity(activity1).join();
+        Activity activity1Res = feed.addActivity(activity1).join();
 
         Activity activity2 = Activity.builder()
                 .actor("user1")
                 .verb("like")
                 .object("object2")
                 .build();
-        Activity activity2Res = client.flatFeed("user", "user1").addActivity(activity2).join();
+        Activity activity2Res = feed.addActivity(activity2).join();
 
         // Create delete request
         List<ActivityToDelete> activities = Arrays.asList(
-                new ActivityToDelete(activity1Res.getID(), Arrays.asList("user1")),
-                new ActivityToDelete(activity2Res.getID(), Arrays.asList("user1"))
+                new ActivityToDelete(activity1Res.getID(), Arrays.asList("user:user1", "user:alice")),
+                new ActivityToDelete(activity2Res.getID(), Arrays.asList("user:user1"))
         );
         BatchClient clientBatch = Client.builder(apiKey, secret).build().batch();
 
@@ -80,4 +87,66 @@ public void testDeleteActivities() throws Exception {
         List<Activity> deletedActivity2 = clientBatch.getActivitiesByID(activity2Res.getID()).join();
         assertEquals(0, deletedActivity2.size());
     }
+
+    @Test
+    public void testDeleteActivitis() throws Exception {
+        BatchDeleteActivitiesClient batchDeleteClient = client.batchDeleteActivities();
+
+        // Insert some activities
+        String uuid1 = UUID.randomUUID().toString().replace("-", "");
+        String uuid2 = UUID.randomUUID().toString().replace("-", "");
+
+        FlatFeed feed = client.flatFeed("flat", uuid1);
+        FlatFeed feedAlice = client.flatFeed("flat", uuid2);
+        Activity activity1 = Activity.builder()
+                .actor("user1")
+                .verb("post")
+                .to(Lists.newArrayList(feedAlice.getID()))
+                .object("object1")
+                .build();
+        Activity activity1Res = feed.addActivity(activity1).join();
+
+        Activity activity2 = Activity.builder()
+                .actor("user1")
+                .verb("like")
+                .to(Lists.newArrayList(feedAlice.getID()))
+                .object("object2")
+                .build();
+        Activity activity2Res = feed.addActivity(activity2).join();
+
+        // Verify activities are inserted
+        List<Activity> activities =feed.getActivities(
+                new Limit(69), new Filter()).join();
+        assertEquals(2, activities.size());
+
+        // Create delete request
+        List<ActivityToDelete> activitiesToDelete = Arrays.asList(
+                new ActivityToDelete(activity1Res.getID(), Arrays.asList(feed.getID().toString())),
+                new ActivityToDelete(activity2Res.getID(), Arrays.asList(feedAlice.getID().toString()))
+        );
+        BatchDeleteActivitiesRequest request = new BatchDeleteActivitiesRequest(activitiesToDelete);
+        CompletableFuture<Object> future = batchDeleteClient.deleteActivities(request);
+        future.join();
+
+
+        // Verify activities are deleted by fetching by ID
+        BatchClient clientBatch = Client.builder(apiKey, secret).build().batch();
+        List<Activity> deletedActivity1 = clientBatch.getActivitiesByID(activity1Res.getID()).join();
+        assertEquals(0, deletedActivity1.size());
+
+        // read feeds
+        // without discardDeletedActivities
+        activities =feed.getActivities(
+                new Limit(69), new Filter()).join();
+        assertEquals(2, activities.size());
+
+
+        activities =feed.getActivities(
+                new Limit(10), new Filter().discardDeletedActivities()).join();
+        assertEquals(0, activities.size());
+
+        activities =feedAlice.getActivities(
+                new Limit(10), new Filter().discardDeletedActivities()).join();
+        assertEquals(1, activities.size());
+    }
 }