Merge d826f3e into 5fd159b

CJSCommonPlatform · Sep 20, 2019 · 21955d5 · 21955d5
2 parents 5fd159b + d826f3e
commit 21955d5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.../justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulator.java b/.../justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulator.java
@@ -10,9 +10,9 @@
 
 public class EventLogTriggerManipulator {
 
-    private static final String TRIGGER_NAME = "queue_publish_event";
+    private static final String TRIGGER_NAME = "update_pre_publish_queue";
     private static final String TABLE_NAME = "event_log";
-    private static final String ACTION = "EXECUTE PROCEDURE update_publish_queue()";
+    private static final String ACTION = "EXECUTE PROCEDURE update_pre_publish_queue()";
 
     @Inject
     private EventStoreTriggerManipulatorProvider eventStoreTriggerManipulatorProvider;

diff --git a/...tice/services/eventstore/management/untrigger/process/EventLogTriggerManipulatorTest.java b/...tice/services/eventstore/management/untrigger/process/EventLogTriggerManipulatorTest.java
@@ -37,12 +37,12 @@ public void shouldAddTriggerToEventLogTable() throws Exception {
         final DatabaseTriggerManipulator databaseTriggerManipulator = mock(DatabaseTriggerManipulator.class);
 
         when(eventStoreTriggerManipulatorProvider.getDatabaseTriggerManipulator()).thenReturn(databaseTriggerManipulator);
-        when(databaseTriggerManipulator.findTriggerOnTable("queue_publish_event", "event_log")).thenReturn(empty());
+        when(databaseTriggerManipulator.findTriggerOnTable("update_pre_publish_queue", "event_log")).thenReturn(empty());
 
         eventLogTriggerManipulator.addTriggerToEventLogTable();
 
-        verify(databaseTriggerManipulator).addInsertTriggerToTable("queue_publish_event", "event_log", "EXECUTE PROCEDURE update_publish_queue()");
-        verify(logger).info("Trigger 'queue_publish_event' successfully added to event_log table");
+        verify(databaseTriggerManipulator).addInsertTriggerToTable("update_pre_publish_queue", "event_log", "EXECUTE PROCEDURE update_pre_publish_queue()");
+        verify(logger).info("Trigger 'update_pre_publish_queue' successfully added to event_log table");
     }
 
     @Test
@@ -52,11 +52,11 @@ public void shouldNotAddTriggerIfItAlreadyExists() throws Exception {
         final DatabaseTriggerManipulator databaseTriggerManipulator = mock(DatabaseTriggerManipulator.class);
 
         when(eventStoreTriggerManipulatorProvider.getDatabaseTriggerManipulator()).thenReturn(databaseTriggerManipulator);
-        when(databaseTriggerManipulator.findTriggerOnTable("queue_publish_event", "event_log")).thenReturn(of(triggerData));
+        when(databaseTriggerManipulator.findTriggerOnTable("update_pre_publish_queue", "event_log")).thenReturn(of(triggerData));
 
         eventLogTriggerManipulator.addTriggerToEventLogTable();
 
-        verify(logger).warn("Trigger 'queue_publish_event' already exists on event_log table");
+        verify(logger).warn("Trigger 'update_pre_publish_queue' already exists on event_log table");
         verify(databaseTriggerManipulator, never()).addInsertTriggerToTable(anyString(), anyString(), anyString());
     }
 
@@ -67,12 +67,12 @@ public void shouldRemoveTriggerFromEventLogTable() throws Exception {
         final TriggerData triggerData = mock(TriggerData.class);
 
         when(eventStoreTriggerManipulatorProvider.getDatabaseTriggerManipulator()).thenReturn(databaseTriggerManipulator);
-        when(databaseTriggerManipulator.findTriggerOnTable("queue_publish_event", "event_log")).thenReturn(of(triggerData));
+        when(databaseTriggerManipulator.findTriggerOnTable("update_pre_publish_queue", "event_log")).thenReturn(of(triggerData));
 
         eventLogTriggerManipulator.removeTriggerFromEventLogTable();
 
-        verify(databaseTriggerManipulator).removeTriggerFromTable("queue_publish_event", "event_log");
-        verify(logger).info("Removed trigger 'queue_publish_event' from event_log table");
+        verify(databaseTriggerManipulator).removeTriggerFromTable("update_pre_publish_queue", "event_log");
+        verify(logger).info("Removed trigger 'update_pre_publish_queue' from event_log table");
     }
 
     @Test
@@ -81,11 +81,11 @@ public void shouldNotRemoveTriggerIfItNoTriggerExists() throws Exception {
         final DatabaseTriggerManipulator databaseTriggerManipulator = mock(DatabaseTriggerManipulator.class);
 
         when(eventStoreTriggerManipulatorProvider.getDatabaseTriggerManipulator()).thenReturn(databaseTriggerManipulator);
-        when(databaseTriggerManipulator.findTriggerOnTable("queue_publish_event", "event_log")).thenReturn(empty());
+        when(databaseTriggerManipulator.findTriggerOnTable("update_pre_publish_queue", "event_log")).thenReturn(empty());
 
         eventLogTriggerManipulator.removeTriggerFromEventLogTable();
 
-        verify(logger).warn("No trigger named 'queue_publish_event' found on event_log table");
+        verify(logger).warn("No trigger named 'update_pre_publish_queue' found on event_log table");
         verify(databaseTriggerManipulator, never()).removeTriggerFromTable(anyString(), anyString());
     }
 }
diff --git a/...uk/gov/justice/services/eventsourcing/util/sql/triggers/DatabaseTriggerManipulatorIT.java b/...uk/gov/justice/services/eventsourcing/util/sql/triggers/DatabaseTriggerManipulatorIT.java
@@ -70,7 +70,7 @@ public void dropTemporaryTable()throws Exception {
     public void shouldAddRemoveAndListTriggersOnTable() throws Exception {
 
         final String triggerName = "temp_trigger";
-        final String action = "EXECUTE PROCEDURE update_publish_queue()";
+        final String action = "EXECUTE PROCEDURE update_pre_publish_queue()";
 
         assertThat(databaseTriggerManipulator.listTriggersOnTable(TEMPORARY_TABLE_NAME).isEmpty(), is(true));
 
@@ -94,7 +94,7 @@ public void shouldAddRemoveAndListTriggersOnTable() throws Exception {
     public void shouldFindTriggerByItsName() throws Exception {
 
         final String triggerName = "temp_trigger";
-        final String action = "EXECUTE PROCEDURE update_publish_queue()";
+        final String action = "EXECUTE PROCEDURE update_pre_publish_queue()";
 
         assertThat(databaseTriggerManipulator.listTriggersOnTable(TEMPORARY_TABLE_NAME).isEmpty(), is(true));