Hent aktør-IDer for tråder i ClearHenvendelseCacheQueueable

Author: frodehoen

src/integration/henvendelse-cache/classes/handlers/ConvNoteCacheHandler.cls

@@ -14,10 +14,7 @@ global class ConvNoteCacheHandler extends MyTriggers {
 
         if (!convNoteIds.isEmpty()) {
             System.enqueueJob(
-                new ClearHenvendelseCacheQueueable(
-                    convNoteIds,
-                    'Conversation_Note__c'
-                )
+                new ClearHenvendelseCacheQueueable(convNoteIds, null)
             );
         }
     }
@@ -50,10 +47,7 @@ global class ConvNoteCacheHandler extends MyTriggers {
         }
         if (!convNoteIds.isEmpty()) {
             System.enqueueJob(
-                new ClearHenvendelseCacheQueueable(
-                    convNoteIds,
-                    'Conversation_Note__c'
-                )
+                new ClearHenvendelseCacheQueueable(convNoteIds, null)
             );
         }
     }

src/integration/henvendelse-cache/classes/handlers/MessageCacheHandler.cls

@@ -11,7 +11,7 @@ global class MessageCacheHandler extends MyTriggers {
 
         if (!threadIds.isEmpty()) {
             System.enqueueJob(
-                new ClearHenvendelseCacheQueueable(threadIds, 'Message__c')
+                new ClearHenvendelseCacheQueueable(null, threadIds)
             );
         }
     }
@@ -29,7 +29,7 @@ global class MessageCacheHandler extends MyTriggers {
         }
         if (!threadIds.isEmpty()) {
             System.enqueueJob(
-                new ClearHenvendelseCacheQueueable(threadIds, 'Message__c')
+                new ClearHenvendelseCacheQueueable(null, threadIds)
             );
         }
     }

src/integration/henvendelse-cache/classes/handlers/ThreadCacheHandler.cls

@@ -27,7 +27,7 @@ global class ThreadCacheHandler extends MyTriggers {
         }
         if (!threadIds.isEmpty()) {
             System.enqueueJob(
-                new ClearHenvendelseCacheQueueable(threadIds, 'Thread__c')
+                new ClearHenvendelseCacheQueueable(null, threadIds)
             );
         }
     }

src/integration/henvendelse-cache/classes/queueable/ClearHenvendelseCacheQueueable.cls

@@ -1,14 +1,14 @@
 public with sharing class ClearHenvendelseCacheQueueable implements Queueable, Database.AllowsCallouts {
     private Set<Id> conversationNoteIds;
-    private String objectType;
+    private Set<Id> threadIds;
     private LoggerUtility logger = new LoggerUtility('HenvendelseCache');
 
     public ClearHenvendelseCacheQueueable(
         Set<Id> conversationNoteIds,
-        String objectType
+        Set<Id> threadIds
     ) {
         this.conversationNoteIds = conversationNoteIds;
-        this.objectType = objectType;
+        this.threadIds = threadIds;
     }
 
     public void execute(QueueableContext context) {
@@ -17,9 +17,20 @@ public with sharing class ClearHenvendelseCacheQueueable implements Queueable, D
 
     @TestVisible
     private void sendActorIdsToHenvendelseDbApi() {
-        Set<String> actorIds = ConvNoteCacheFilterHelper.getActorIds(
-            conversationNoteIds
-        );
+        Set<String> actorIds;
+        Set<Id> recordIds;
+
+        if (conversationNoteIds != null && !conversationNoteIds.isEmpty()) {
+            actorIds = ConvNoteCacheFilterHelper.getActorIds(
+                conversationNoteIds
+            );
+            recordIds = conversationNoteIds;
+        }
+
+        if (threadIds != null && !threadIds.isEmpty()) {
+            actorIds = ThreadCacheFilterHelper.getActorIds(threadIds);
+            recordIds = threadIds;
+        }
 
         if (actorIds.isEmpty()) {
             return;
@@ -33,7 +44,9 @@ public with sharing class ClearHenvendelseCacheQueueable implements Queueable, D
                 'Failed to clear henvendelse cache for acotorIds ' +
                     actorIds.toString() +
                     ' ' +
-                    response.getBody(),
+                    response.getBody() +
+                    ' triggered by ' +
+                    recordIds.toString(),
                 null,
                 CRM_ApplicationDomain.Domain.NKS
             );
@@ -42,7 +55,7 @@ public with sharing class ClearHenvendelseCacheQueueable implements Queueable, D
                 'Clear cahce for actorIds ' +
                     actorIds.toString() +
                     ' triggered by ' +
-                    objectType,
+                    recordIds.toString(),
                 null,
                 CRM_ApplicationDomain.Domain.NKS
             );

src/integration/henvendelse-cache/classes/queueable/tests/ClearHenvendelseCacheQueueableTest.cls

@@ -42,7 +42,7 @@ private class ClearHenvendelseCacheQueueableTest {
         Test.startTest();
         ClearHenvendelseCacheQueueable queueable = new ClearHenvendelseCacheQueueable(
             new Set<Id>{ 'a1P1I0000001a1aUAA' },
-            'Message__c'
+            null
         );
         System.enqueueJob(queueable);
         Test.stopTest();
@@ -51,7 +51,7 @@ private class ClearHenvendelseCacheQueueableTest {
     }
 
     @isTest
-    static void shouldPostOneConversationNoteSuccessfully() {
+    static void shouldPostOneConversationNoteSuccessfullyForConversationNote() {
         Id convNoteId = [SELECT Id FROM Conversation_Note__c LIMIT 1].Id;
 
         ApiMock.setTestMock(
@@ -61,10 +61,33 @@ private class ClearHenvendelseCacheQueueableTest {
         );
 
         Test.startTest();
-        new ClearHenvendelseCacheQueueable(
-                new Set<Id>{ convNoteId },
-                'Conversation_Note__c'
-            )
+        new ClearHenvendelseCacheQueueable(new Set<Id>{ convNoteId }, null)
+            .sendActorIdsToHenvendelseDbApi();
+
+        Test.stopTest();
+
+        System.assertEquals(
+            0,
+            [
+                SELECT COUNT()
+                FROM Application_Log__c
+                WHERE Log_Level__c = 'Error'
+            ]
+        );
+    }
+
+    @isTest
+    static void shouldPostOneConversationNoteSuccessfullyForThread() {
+        Id threadId = [SELECT Id FROM Thread__c LIMIT 1].Id;
+
+        ApiMock.setTestMock(
+            HenvendelseCacheCalloutService.SERVICES.DELETE_HENVENDELSE_CACHE_API.name(),
+            200,
+            'OK'
+        );
+
+        Test.startTest();
+        new ClearHenvendelseCacheQueueable(null, new Set<Id>{ threadId })
             .sendActorIdsToHenvendelseDbApi();
 
         Test.stopTest();
@@ -90,10 +113,7 @@ private class ClearHenvendelseCacheQueueableTest {
         );
 
         Test.startTest();
-        new ClearHenvendelseCacheQueueable(
-                new Set<Id>{ convNoteId },
-                'Conversation_Note__c'
-            )
+        new ClearHenvendelseCacheQueueable(new Set<Id>{ convNoteId }, null)
             .sendActorIdsToHenvendelseDbApi();
 
         Test.stopTest();