[RELEASE]squashing 'feature-MOVE-1354_dpe_meeting' into 'development'

felleslosninger · Apr 29, 2019 · 6c77698 · 6c77698
1 parent c83d42b
commit 6c77698
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ jacoco.exec
 /integrasjonspunkt/activemq-data/
 /integrasjonspunkt/node_modules/
 /integrasjonspunkt/upload/
+/integrasjonspunkt/messages/
 /integrasjonspunkt/bootstrap.properties
 /integrasjonspunkt/receipt.mv.db
 /integrasjonspunkt/receipt.trace.db

diff --git a/...sjonspunkt/src/main/java/no/difi/meldingsutveksling/nextmove/DpeConversationStrategy.java b/...sjonspunkt/src/main/java/no/difi/meldingsutveksling/nextmove/DpeConversationStrategy.java
@@ -10,6 +10,7 @@
 
 import static java.lang.String.format;
 import static no.difi.meldingsutveksling.nextmove.logging.ConversationResourceMarkers.markerFrom;
+import static no.difi.meldingsutveksling.nextmove.logging.ConversationResourceMarkers.serviceIdentifierLoggingOverride;
 
 @Component
 public class DpeConversationStrategy implements ConversationStrategy {
@@ -37,7 +38,7 @@ public void send(ConversationResource conversationResource) throws NextMoveExcep
         }
         serviceBus.putMessage(conversationResource);
         Audit.info(format("Message [id=%s, serviceIdentifier=%s] sent to service bus",
-                conversationResource.getConversationId(), conversationResource.getServiceIdentifier()),
+                conversationResource.getConversationId(), serviceIdentifierLoggingOverride(conversationResource)),
                 markerFrom(conversationResource));
     }
 

diff --git a/...grasjonspunkt/src/main/java/no/difi/meldingsutveksling/nextmove/MessageOutController.java b/...grasjonspunkt/src/main/java/no/difi/meldingsutveksling/nextmove/MessageOutController.java
@@ -49,6 +49,7 @@
 import static no.difi.meldingsutveksling.nextmove.ConversationDirection.INCOMING;
 import static no.difi.meldingsutveksling.nextmove.ConversationDirection.OUTGOING;
 import static no.difi.meldingsutveksling.nextmove.logging.ConversationResourceMarkers.markerFrom;
+import static no.difi.meldingsutveksling.nextmove.logging.ConversationResourceMarkers.serviceIdentifierLoggingOverride;
 
 @RestController
 @Api
@@ -173,7 +174,7 @@ public ResponseEntity createResource(
         cr = outRepo.save(cr);
         conversationService.registerConversation(cr);
         log.info(markerFrom(cr), "Created new conversation resource [id={}, serviceIdentifier={}]",
-                cr.getConversationId(), cr.getServiceIdentifier());
+                cr.getConversationId(), serviceIdentifierLoggingOverride(cr));
 
         return ResponseEntity.ok(cr);
     }

diff --git a/integrasjonspunkt/src/main/java/no/difi/meldingsutveksling/nextmove/NextMoveQueue.java b/integrasjonspunkt/src/main/java/no/difi/meldingsutveksling/nextmove/NextMoveQueue.java
@@ -28,6 +28,7 @@
 
 import static no.difi.meldingsutveksling.nextmove.ConversationDirection.INCOMING;
 import static no.difi.meldingsutveksling.nextmove.logging.ConversationResourceMarkers.markerFrom;
+import static no.difi.meldingsutveksling.nextmove.logging.ConversationResourceMarkers.serviceIdentifierLoggingOverride;
 
 @Component
 public class NextMoveQueue {
@@ -88,7 +89,7 @@ public Optional<ConversationResource> enqueueEduDocument(EduDocument eduDocument
         Conversation c = conversationService.registerConversation(message);
         conversationService.registerStatus(c, MessageStatus.of(GenericReceiptStatus.INNKOMMENDE_MOTTATT));
         Audit.info(String.format("Message [id=%s, serviceIdentifier=%s] put on local queue",
-                message.getConversationId(), message.getServiceIdentifier()), markerFrom(message));
+                message.getConversationId(), serviceIdentifierLoggingOverride(message)), markerFrom(message));
         return Optional.of(message);
     }
 

diff --git a/integrasjonspunkt/src/main/java/no/difi/meldingsutveksling/nextmove/NextMoveServiceBus.java b/integrasjonspunkt/src/main/java/no/difi/meldingsutveksling/nextmove/NextMoveServiceBus.java
@@ -42,6 +42,7 @@
 import static no.difi.meldingsutveksling.ServiceIdentifier.DPE_INNSYN;
 import static no.difi.meldingsutveksling.nextmove.ServiceBusQueueMode.DATA;
 import static no.difi.meldingsutveksling.nextmove.ServiceBusQueueMode.INNSYN;
+import static no.difi.meldingsutveksling.nextmove.ServiceBusQueueMode.MEETING;
 
 @Component
 public class NextMoveServiceBus {
@@ -104,18 +105,24 @@ public void putMessage(ConversationResource resource) throws NextMoveException {
             marshaller.marshal(sbd, os);
 
             String queue = NEXTMOVE_QUEUE_PREFIX + resource.getReceiverId();
-            switch (resource.getServiceIdentifier()) {
-                case DPE_INNSYN:
-                    queue = queue + INNSYN.fullname();
-                    break;
-                case DPE_DATA:
-                    queue = queue + DATA.fullname();
-                    break;
-                case DPE_RECEIPT:
-                    queue = queue + receiptTarget();
-                    break;
-                default:
-                    throw new NextMoveException("ServiceBus has no queue for ServiceIdentifier=" + resource.getServiceIdentifier());
+            if (resource.getCustomProperties() != null &&
+                    resource.getCustomProperties().containsKey(MEETING.fullname()) &&
+                    "true".equals(resource.getCustomProperties().get(MEETING.fullname()))) {
+                queue = queue + MEETING.fullname();
+            } else {
+                switch (resource.getServiceIdentifier()) {
+                    case DPE_INNSYN:
+                        queue = queue + INNSYN.fullname();
+                        break;
+                    case DPE_DATA:
+                        queue = queue + DATA.fullname();
+                        break;
+                    case DPE_RECEIPT:
+                        queue = queue + receiptTarget();
+                        break;
+                    default:
+                        throw new NextMoveException("ServiceBus has no queue for ServiceIdentifier=" + resource.getServiceIdentifier());
+                }
             }
             serviceBusClient.sendMessage(os.toByteArray(), queue);
 
@@ -198,6 +205,9 @@ private String receiptTarget() {
         if (!isNullOrEmpty(props.getNextmove().getServiceBus().getReceiptQueue())) {
             return props.getNextmove().getServiceBus().getReceiptQueue();
         }
+        if (MEETING.fullname().equals(props.getNextmove().getServiceBus().getMode())) {
+            return INNSYN.fullname();
+        }
         if (INNSYN.fullname().equals(props.getNextmove().getServiceBus().getMode())) {
             return DATA.fullname();
         }

diff --git a/integrasjonspunkt/src/main/java/no/difi/meldingsutveksling/nextmove/ServiceBusQueueMode.java b/integrasjonspunkt/src/main/java/no/difi/meldingsutveksling/nextmove/ServiceBusQueueMode.java
@@ -2,7 +2,8 @@
 
 public enum ServiceBusQueueMode {
     INNSYN("innsyn"),
-    DATA("data");
+    DATA("data"),
+    MEETING("meeting");
 
     private String fullname;
 

diff --git a/...ove/src/main/java/no/difi/meldingsutveksling/nextmove/DpeReceiptConversationResource.java b/...ove/src/main/java/no/difi/meldingsutveksling/nextmove/DpeReceiptConversationResource.java
@@ -21,6 +21,7 @@ private DpeReceiptConversationResource(String conversationId, String senderId, S
     public static DpeReceiptConversationResource of(ConversationResource cr) {
         DpeReceiptConversationResource dpeCr = new DpeReceiptConversationResource(cr.getConversationId(), cr.getReceiverId(), cr.getSenderId());
         dpeCr.setFileRefs(Maps.newHashMap());
+        dpeCr.setCustomProperties(Maps.newHashMap());
         return dpeCr;
     }
 }
diff --git a/...rc/main/java/no/difi/meldingsutveksling/nextmove/logging/ConversationResourceMarkers.java b/...rc/main/java/no/difi/meldingsutveksling/nextmove/logging/ConversationResourceMarkers.java
@@ -14,7 +14,21 @@ public static LogstashMarker markerFrom(ConversationResource resource) {
         final LogstashMarker conversationIdMarker = MarkerFactory.conversationIdMarker(resource.getConversationId());
         final LogstashMarker senderIdMarker = MarkerFactory.senderMarker(resource.getSenderId());
         final LogstashMarker receiverMarker = MarkerFactory.receiverMarker(resource.getReceiverId());
-        final LogstashMarker messagetypeIdMarker = MarkerFactory.messageTypeMarker(resource.getServiceIdentifier().toString());
+        final LogstashMarker messagetypeIdMarker = MarkerFactory.messageTypeMarker(serviceIdentifierLoggingOverride(resource));
         return conversationIdMarker.and(senderIdMarker).and(receiverMarker).and(messagetypeIdMarker);
     }
+
+    /**
+     * Override for service identifier logging, in case of meeting message. Should be removed with the next version of NextMove.
+     * @param cr ConversationResource
+     * @return serviceIdentifier used for logging
+     */
+    public static String serviceIdentifierLoggingOverride(ConversationResource cr) {
+        if (cr.getCustomProperties() != null &&
+                cr.getCustomProperties().containsKey("meeting") &&
+                "true".equals(cr.getCustomProperties().get("meeting"))) {
+            return "DPE_MEETING";
+        }
+        return cr.getServiceIdentifier().toString();
+    }
 }