Merge c6348c6 into 02a2fe9

CJSCommonPlatform · Jan 8, 2019 · 00b9f16 · 00b9f16
2 parents 02a2fe9 + c6348c6
commit 00b9f16
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [1.1.0-M8] - 2019-01-08
+### Fixed
+- Fixed error of two subscriptions created in database for each subscription
+
 ## [1.1.0-M7] - 2019-01-03
 ### Changed
 - Fix checksum issue with liquibase scripts

diff --git a/...va/uk/gov/justice/services/event/sourcing/subscription/manager/EventCatchupProcessor.java b/...va/uk/gov/justice/services/event/sourcing/subscription/manager/EventCatchupProcessor.java
@@ -36,7 +36,7 @@ public void performEventCatchup(final Subscription subscription) {
 
         logger.info("Event catchup started");
         logger.info("Performing catchup of events...");
-        final long eventNumber = subscriptionsRepository.getOrInitialiseCurrentEventNumber(subscription.getName());
+        final long eventNumber = subscriptionsRepository.getOrInitialiseCurrentEventNumber(subscription.getEventSourceName());
 
         final int totalEventsProcessed = eventSource.findEventsSince(eventNumber)
                 .mapToInt(transactionalEventProcessor::processWithEventBuffer)

diff --git a/...k/gov/justice/services/event/sourcing/subscription/manager/EventCatchupProcessorTest.java b/...k/gov/justice/services/event/sourcing/subscription/manager/EventCatchupProcessorTest.java
@@ -43,7 +43,6 @@ public class EventCatchupProcessorTest {
     @Test
     public void shouldFetchAllMissingEventsAndProcess() throws Exception {
 
-        final String subscriptionName = "subscriptionName";
         final String eventSourceName = "event source";
         final long eventNumber = 983745987L;
 
@@ -56,8 +55,7 @@ public void shouldFetchAllMissingEventsAndProcess() throws Exception {
 
         when(subscription.getEventSourceName()).thenReturn(eventSourceName);
         when(eventSourceProvider.getEventSource(eventSourceName)).thenReturn(eventSource);
-        when(subscription.getName()).thenReturn(subscriptionName);
-        when(subscriptionsRepository.getOrInitialiseCurrentEventNumber(subscriptionName)).thenReturn(eventNumber);
+        when(subscriptionsRepository.getOrInitialiseCurrentEventNumber(eventSourceName)).thenReturn(eventNumber);
         when(eventSource.findEventsSince(eventNumber)).thenReturn(Stream.of(event_1, event_2, event_3));
         when(transactionalEventProcessor.processWithEventBuffer(any(JsonEnvelope.class))).thenReturn(1);