Cm Subscription: PENDING logic handling in NCMP

[cps.git] / cps-ncmp-service / src / main / java / org / onap / cps / ncmp / api / impl / events / cmsubscription / CmSubscriptionNcmpOutEventPublisher.java

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/CmSubscriptionNcmpOutEventPublisher.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/CmSubscriptionNcmpOutEventPublisher.java
index 38cc724..473538c 100644 (file)
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/CmSubscriptionNcmpOutEventPublisher.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/CmSubscriptionNcmpOutEventPublisher.java
@@ -32,7 +32,8 @@ import org.onap.cps.ncmp.api.impl.subscriptions.SubscriptionPersistence;
 import org.onap.cps.ncmp.api.impl.subscriptions.SubscriptionStatus;
 import org.onap.cps.ncmp.api.impl.utils.DataNodeHelper;
 import org.onap.cps.ncmp.api.impl.utils.SubscriptionOutcomeCloudMapper;
-import org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.CmSubscriptionDmiOutEvent;
+import org.onap.cps.ncmp.api.models.CmSubscriptionEvent;
+import org.onap.cps.ncmp.api.models.CmSubscriptionStatus;
 import org.onap.cps.ncmp.events.cmsubscription1_0_0.ncmp_to_client.CmSubscriptionNcmpOutEvent;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -46,8 +47,8 @@ public class CmSubscriptionNcmpOutEventPublisher {
 
     private final EventsPublisher<CloudEvent> outcomeEventsPublisher;
 
-    private final CmSubscriptionDmiOutEventToCmSubscriptionNcmpOutEventMapper
-            cmSubscriptionDmiOutEventToCmSubscriptionNcmpOutEventMapper;
+    private final CmSubscriptionEventToCmSubscriptionNcmpOutEventMapper
+            cmSubscriptionEventToCmSubscriptionNcmpOutEventMapper;
 
     private final SubscriptionOutcomeCloudMapper subscriptionOutcomeCloudMapper;
 
@@ -57,54 +58,48 @@ public class CmSubscriptionNcmpOutEventPublisher {
     /**
      * This is for construction of outcome message to be published for client apps.
      *
-     * @param cmSubscriptionDmiOutEvent event produced by Dmi Plugin
+     * @param cmSubscriptionEvent event produced by Dmi Plugin
      */
-    public void sendResponse(final CmSubscriptionDmiOutEvent cmSubscriptionDmiOutEvent, final String eventKey) {
+    public void sendResponse(final CmSubscriptionEvent cmSubscriptionEvent, final String eventType) {
         final CmSubscriptionNcmpOutEvent cmSubscriptionNcmpOutEvent =
-                formCmSubscriptionNcmpOutEvent(cmSubscriptionDmiOutEvent);
-        final String subscriptionClientId = cmSubscriptionDmiOutEvent.getData().getClientId();
-        final String subscriptionName = cmSubscriptionDmiOutEvent.getData().getSubscriptionName();
+                formCmSubscriptionNcmpOutEvent(cmSubscriptionEvent);
+        final String subscriptionClientId = cmSubscriptionEvent.getClientId();
+        final String subscriptionName = cmSubscriptionEvent.getSubscriptionName();
         final String subscriptionEventId = subscriptionClientId + subscriptionName;
         final CloudEvent subscriptionOutcomeCloudEvent =
                 subscriptionOutcomeCloudMapper.toCloudEvent(cmSubscriptionNcmpOutEvent,
-                subscriptionEventId, eventKey);
+                subscriptionEventId, eventType);
         outcomeEventsPublisher.publishCloudEvent(subscriptionOutcomeEventTopic,
                 subscriptionEventId, subscriptionOutcomeCloudEvent);
     }
 
     private CmSubscriptionNcmpOutEvent formCmSubscriptionNcmpOutEvent(
-            final CmSubscriptionDmiOutEvent cmSubscriptionDmiOutEvent) {
+            final CmSubscriptionEvent cmSubscriptionEvent) {
         final Map<String, Map<String, String>> cmHandleIdToStatusAndDetailsAsMap =
                 DataNodeHelper.cmHandleIdToStatusAndDetailsAsMapFromDataNode(
                         subscriptionPersistence.getCmHandlesForSubscriptionEvent(
-                                cmSubscriptionDmiOutEvent.getData().getClientId(),
-                                cmSubscriptionDmiOutEvent.getData().getSubscriptionName()));
-        final List<org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.SubscriptionStatus>
-                subscriptionStatusList =
+                                cmSubscriptionEvent.getClientId(),
+                                cmSubscriptionEvent.getSubscriptionName()));
+        final List<CmSubscriptionStatus> cmSubscriptionStatusList =
                 mapCmHandleIdStatusDetailsMapToSubscriptionStatusList(cmHandleIdToStatusAndDetailsAsMap);
-        cmSubscriptionDmiOutEvent.getData().setSubscriptionStatus(subscriptionStatusList);
-        return fromDmiOutEvent(cmSubscriptionDmiOutEvent,
+        cmSubscriptionEvent.setCmSubscriptionStatus(cmSubscriptionStatusList);
+        return fromCmSubscriptionEvent(cmSubscriptionEvent,
                 decideOnNcmpEventResponseCodeForSubscription(cmHandleIdToStatusAndDetailsAsMap));
     }
 
-    private static List<org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.SubscriptionStatus>
-        mapCmHandleIdStatusDetailsMapToSubscriptionStatusList(
+    private static List<CmSubscriptionStatus> mapCmHandleIdStatusDetailsMapToSubscriptionStatusList(
             final Map<String, Map<String, String>> cmHandleIdToStatusAndDetailsAsMap) {
         return cmHandleIdToStatusAndDetailsAsMap.entrySet()
                 .stream().map(entryset -> {
-                    final org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.SubscriptionStatus
-                            subscriptionStatus = new org.onap.cps.ncmp.events.cmsubscription1_0_0
-                            .dmi_to_ncmp.SubscriptionStatus();
+                    final CmSubscriptionStatus cmSubscriptionStatus = new CmSubscriptionStatus();
                     final String cmHandleId = entryset.getKey();
                     final Map<String, String> statusAndDetailsMap = entryset.getValue();
                     final String status = statusAndDetailsMap.get("status");
                     final String details = statusAndDetailsMap.get("details");
-                    subscriptionStatus.setId(cmHandleId);
-                    subscriptionStatus.setStatus(
-                            org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp
-                                    .SubscriptionStatus.Status.fromValue(status));
-                    subscriptionStatus.setDetails(details);
-                    return subscriptionStatus;
+                    cmSubscriptionStatus.setId(cmHandleId);
+                    cmSubscriptionStatus.setStatus(SubscriptionStatus.fromString(status));
+                    cmSubscriptionStatus.setDetails(details);
+                    return cmSubscriptionStatus;
                 }).collect(Collectors.toList());
     }
 
@@ -138,13 +133,13 @@ public class CmSubscriptionNcmpOutEventPublisher {
                 .allMatch(entryset -> entryset.containsValue(subscriptionStatus.toString()));
     }
 
-    private CmSubscriptionNcmpOutEvent fromDmiOutEvent(
-            final CmSubscriptionDmiOutEvent cmSubscriptionDmiOutEvent,
+    private CmSubscriptionNcmpOutEvent fromCmSubscriptionEvent(
+            final CmSubscriptionEvent cmSubscriptionEvent,
             final NcmpEventResponseCode ncmpEventResponseCode) {
 
         final CmSubscriptionNcmpOutEvent cmSubscriptionNcmpOutEvent =
-                cmSubscriptionDmiOutEventToCmSubscriptionNcmpOutEventMapper.toCmSubscriptionNcmpOutEvent(
-                        cmSubscriptionDmiOutEvent);
+                cmSubscriptionEventToCmSubscriptionNcmpOutEventMapper.toCmSubscriptionNcmpOutEvent(
+                        cmSubscriptionEvent);
         cmSubscriptionNcmpOutEvent.getData().setStatusCode(Integer.parseInt(ncmpEventResponseCode.getStatusCode()));
         cmSubscriptionNcmpOutEvent.getData().setStatusMessage(ncmpEventResponseCode.getStatusMessage());