Merge pull request #790 from zalando/aruha-1335

aruha-1335: take all timelines not only active
zalando · Dec 5, 2017 · ab5b42f · ab5b42f
2 parents 11ab774 + cf52676
commit ab5b42f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/main/java/org/zalando/nakadi/service/timeline/TimelineService.java b/src/main/java/org/zalando/nakadi/service/timeline/TimelineService.java
@@ -271,7 +271,7 @@ public Multimap<TopicRepository, String> deleteAllTimelinesForEventType(final St
             NoSuchEventTypeException {
         LOG.info("Deleting all timelines for event type {}", eventTypeName);
         final Multimap<TopicRepository, String> topicsToDelete = ArrayListMultimap.create();
-        for (final Timeline timeline : getActiveTimelinesOrdered(eventTypeName)) {
+        for (final Timeline timeline : getAllTimelinesOrdered(eventTypeName)) {
             topicsToDelete.put(getTopicRepository(timeline), timeline.getTopic());
             timelineDbRepository.deleteTimeline(timeline.getId());
         }

diff --git a/src/test/java/org/zalando/nakadi/service/timeline/TimelineServiceTest.java b/src/test/java/org/zalando/nakadi/service/timeline/TimelineServiceTest.java
@@ -33,6 +33,7 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.zalando.nakadi.utils.TestUtils.buildDefaultEventType;
 
 public class TimelineServiceTest {
 
@@ -119,4 +120,20 @@ public void shouldDeleteTopicWhenTimelineCreationFails() throws Exception {
         Mockito.verify(repository, Mockito.times(1)).deleteTopic(any());
     }
 
+    @Test
+    public void shouldDeleteAllTimelinesWhenOneTimelineWasMarkedAsDeleted() throws Exception {
+        final EventType eventType = buildDefaultEventType();
+        final Timeline t1 = Timeline.createTimeline(eventType.getName(), 1, null, "topic1", new Date());
+        t1.setDeleted(true);
+        t1.setSwitchedAt(new Date());
+        final Timeline t2 = Timeline.createTimeline(eventType.getName(), 2, null, "topic2", new Date());
+        t2.setSwitchedAt(new Date());
+        Mockito.when(eventTypeCache.getTimelinesOrdered(eventType.getName()))
+                .thenReturn(ImmutableList.of(t1, t2));
+
+        timelineService.deleteAllTimelinesForEventType(eventType.getName());
+
+        Mockito.verify(timelineDbRepository, Mockito.times(2)).deleteTimeline(Mockito.any());
+    }
+
 }