enhance get orchestration request

Enhance get orchestration request to include workflow step
Began working on adding call for activity name
Added call to return activity information
Updated to return last task executed
Added last task executed info to returned string
Updated mocks to fix failing unit tests
Added responses for mocks to Camunda for process and activity history
Added tests to cover taskName changes
Began adding tests to cover changes to RequestHandlerUtils
Added more unit tests for activity lookup
Updated error messages for taskName
Moved properties to application.yaml file
Added unit tests to add more coverage to task retrieval
Moved Camunda calls to CamundaRequestHandler class
Removed unused imports from RequestHandlerUtils
Fixed formatting of tests and removed handler where not used
Removed CamundaRequestHandler from JerseyConfiguration
Added retryTemplate for camunda calls

Issue-ID: SO-2142
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I09a82e3458e8f611e4bbaf3ce9ab5de36b1b060a

9 files changed, 537 insertions, 28 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/CamundaRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/CamundaRequestHandlerTest.java
new file mode 100644
index 0000000000..e6b5163f59
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/CamundaRequestHandlerTest.java
@@ -0,0 +1,327 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.apihandlerinfra;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import org.camunda.bpm.engine.impl.persistence.entity.HistoricActivityInstanceEntity;
+import org.camunda.bpm.engine.impl.persistence.entity.HistoricProcessInstanceEntity;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.so.apihandlerinfra.exceptions.ContactCamundaException;
+import org.onap.so.apihandlerinfra.exceptions.RequestDbFailureException;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpStatusCodeException;
+import org.springframework.web.client.ResourceAccessException;
+import org.springframework.web.client.RestTemplate;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CamundaRequestHandlerTest {
+
+    @Mock
+    private RestTemplate restTemplate;
+
+    @Mock
+    private Environment env;
+
+    @InjectMocks
+    @Spy
+    private CamundaRequestHandler camundaRequestHandler;
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private static final String REQUEST_ID = "eca3a1b1-43ab-457e-ab1c-367263d148b4";
+    private ResponseEntity<List<HistoricActivityInstanceEntity>> activityInstanceResponse = null;
+    private ResponseEntity<List<HistoricProcessInstanceEntity>> processInstanceResponse = null;
+    private List<HistoricActivityInstanceEntity> activityInstanceList = null;
+    private List<HistoricProcessInstanceEntity> processInstanceList = null;
+
+
+
+    @Before
+    public void setup() throws IOException {
+        ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        activityInstanceList = mapper.readValue(
+                new String(Files.readAllBytes(
+                        Paths.get("src/test/resources/OrchestrationRequest/ActivityInstanceHistoryResponse.json"))),
+                new TypeReference<List<HistoricActivityInstanceEntity>>() {});
+        processInstanceList = mapper.readValue(
+                new String(Files.readAllBytes(
+                        Paths.get("src/test/resources/OrchestrationRequest/ProcessInstanceHistoryResponse.json"))),
+                new TypeReference<List<HistoricProcessInstanceEntity>>() {});
+        processInstanceResponse =
+                new ResponseEntity<List<HistoricProcessInstanceEntity>>(processInstanceList, HttpStatus.ACCEPTED);
+        activityInstanceResponse =
+                new ResponseEntity<List<HistoricActivityInstanceEntity>>(activityInstanceList, HttpStatus.ACCEPTED);
+
+        doReturn("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_").when(env)
+                .getProperty("mso.camunda.rest.history.uri");
+        doReturn("/sobpmnengine/history/activity-instance?processInstanceId=").when(env)
+                .getProperty("mso.camunda.rest.activity.uri");
+        doReturn("auth").when(env).getRequiredProperty("mso.camundaAuth");
+        doReturn("key").when(env).getRequiredProperty("mso.msoKey");
+        doReturn("http://localhost:8089").when(env).getProperty("mso.camundaURL");
+    }
+
+    public HttpHeaders setHeaders() {
+        HttpHeaders headers = new HttpHeaders();
+        List<org.springframework.http.MediaType> acceptableMediaTypes = new ArrayList<>();
+        acceptableMediaTypes.add(org.springframework.http.MediaType.APPLICATION_JSON);
+        headers.setAccept(acceptableMediaTypes);
+        headers.add(HttpHeaders.AUTHORIZATION, "auth");
+
+        return headers;
+    }
+
+    @Test
+    public void getActivityNameTest() throws IOException {
+        String expectedActivityName = "Last task executed: BB to Execute";
+        String actualActivityName = camundaRequestHandler.getActivityName(activityInstanceList);
+
+        assertEquals(expectedActivityName, actualActivityName);
+    }
+
+    @Test
+    public void getActivityNameNullActivityNameTest() throws IOException {
+        String expectedActivityName = "Task name is null.";
+        HistoricActivityInstanceEntity activityInstance = new HistoricActivityInstanceEntity();
+        List<HistoricActivityInstanceEntity> activityInstanceList = new ArrayList<>();
+        activityInstanceList.add(activityInstance);
+
+        String actualActivityName = camundaRequestHandler.getActivityName(activityInstanceList);
+
+        assertEquals(expectedActivityName, actualActivityName);
+    }
+
+    @Test
+    public void getActivityNameNullListTest() throws IOException {
+        String expectedActivityName = "No results returned on activityInstance history lookup.";
+        List<HistoricActivityInstanceEntity> activityInstanceList = null;
+        String actualActivityName = camundaRequestHandler.getActivityName(activityInstanceList);
+
+        assertEquals(expectedActivityName, actualActivityName);
+    }
+
+    @Test
+    public void getActivityNameEmptyListTest() throws IOException {
+        String expectedActivityName = "No results returned on activityInstance history lookup.";
+        List<HistoricActivityInstanceEntity> activityInstanceList = new ArrayList<>();
+        String actualActivityName = camundaRequestHandler.getActivityName(activityInstanceList);
+
+        assertEquals(expectedActivityName, actualActivityName);
+    }
+
+    @Test
+    public void getTaskNameTest() throws IOException, ContactCamundaException {
+        doReturn(processInstanceResponse).when(camundaRequestHandler).getCamundaProcessInstanceHistory(REQUEST_ID);
+        doReturn(activityInstanceResponse).when(camundaRequestHandler)
+                .getCamundaActivityHistory("c4c6b647-a26e-11e9-b144-0242ac14000b", REQUEST_ID);
+        doReturn("Last task executed: BB to Execute").when(camundaRequestHandler).getActivityName(activityInstanceList);
+        String expectedTaskName = "Last task executed: BB to Execute";
+
+        String actualTaskName = camundaRequestHandler.getTaskName(REQUEST_ID);
+
+        assertEquals(expectedTaskName, actualTaskName);
+    }
+
+    @Test
+    public void getTaskNameNullProcessInstanceListTest() throws IOException, ContactCamundaException {
+        ResponseEntity<List<HistoricProcessInstanceEntity>> response = new ResponseEntity<>(null, HttpStatus.OK);
+        doReturn(response).when(camundaRequestHandler).getCamundaProcessInstanceHistory(REQUEST_ID);
+        String expected = "No processInstances returned for requestId: " + REQUEST_ID;
+
+        String actual = camundaRequestHandler.getTaskName(REQUEST_ID);
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getTaskNameNullProcessInstanceIdTest() throws IOException, ContactCamundaException {
+        HistoricProcessInstanceEntity processInstance = new HistoricProcessInstanceEntity();
+        List<HistoricProcessInstanceEntity> processInstanceList = new ArrayList<>();
+        processInstanceList.add(processInstance);
+        ResponseEntity<List<HistoricProcessInstanceEntity>> response =
+                new ResponseEntity<>(processInstanceList, HttpStatus.OK);
+        doReturn(response).when(camundaRequestHandler).getCamundaProcessInstanceHistory(REQUEST_ID);
+        String expected = "No processInstanceId returned for requestId: " + REQUEST_ID;
+
+        String actual = camundaRequestHandler.getTaskName(REQUEST_ID);
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getTaskNameProcessInstanceLookupFailureTest() throws IOException, ContactCamundaException {
+        doThrow(HttpClientErrorException.class).when(camundaRequestHandler)
+                .getCamundaProcessInstanceHistory(REQUEST_ID);
+
+        thrown.expect(ContactCamundaException.class);
+        camundaRequestHandler.getTaskName(REQUEST_ID);
+    }
+
+    @Test
+    public void getCamundaActivityHistoryTest() throws IOException, ContactCamundaException {
+        HttpHeaders headers = setHeaders();
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+        String targetUrl = "http://localhost:8089/sobpmnengine/history/activity-instance?processInstanceId="
+                + "c4c6b647-a26e-11e9-b144-0242ac14000b";
+        doReturn(activityInstanceResponse).when(restTemplate).exchange(targetUrl, HttpMethod.GET, requestEntity,
+                new ParameterizedTypeReference<List<HistoricActivityInstanceEntity>>() {});
+        doReturn(headers).when(camundaRequestHandler).setCamundaHeaders("auth", "key");
+        ResponseEntity<List<HistoricActivityInstanceEntity>> actualResponse =
+                camundaRequestHandler.getCamundaActivityHistory("c4c6b647-a26e-11e9-b144-0242ac14000b", REQUEST_ID);
+        assertEquals(activityInstanceResponse, actualResponse);
+    }
+
+    @Test
+    public void getCamundaActivityHistoryErrorTest() {
+        HttpHeaders headers = setHeaders();
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+        String targetUrl = "http://localhost:8089/sobpmnengine/history/activity-instance?processInstanceId="
+                + "c4c6b647-a26e-11e9-b144-0242ac14000b";
+        doThrow(new ResourceAccessException("IOException")).when(restTemplate).exchange(targetUrl, HttpMethod.GET,
+                requestEntity, new ParameterizedTypeReference<List<HistoricActivityInstanceEntity>>() {});
+        doReturn(headers).when(camundaRequestHandler).setCamundaHeaders("auth", "key");
+
+        try {
+            camundaRequestHandler.getCamundaActivityHistory("c4c6b647-a26e-11e9-b144-0242ac14000b", REQUEST_ID);
+        } catch (ContactCamundaException e) {
+            // Exception thrown after retries are completed
+        }
+
+        verify(restTemplate, times(4)).exchange(targetUrl, HttpMethod.GET, requestEntity,
+                new ParameterizedTypeReference<List<HistoricActivityInstanceEntity>>() {});
+    }
+
+    @Test
+    public void getCamundaProccesInstanceHistoryTest() throws IOException, ContactCamundaException {
+        HttpHeaders headers = setHeaders();
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+        String targetUrl =
+                "http://localhost:8089/sobpmnengine/history/process-instance?variables=mso-request-id_eq_" + REQUEST_ID;
+        doReturn(processInstanceResponse).when(restTemplate).exchange(targetUrl, HttpMethod.GET, requestEntity,
+                new ParameterizedTypeReference<List<HistoricProcessInstanceEntity>>() {});
+        doReturn(headers).when(camundaRequestHandler).setCamundaHeaders("auth", "key");
+
+        ResponseEntity<List<HistoricProcessInstanceEntity>> actualResponse =
+                camundaRequestHandler.getCamundaProcessInstanceHistory(REQUEST_ID);
+        assertEquals(processInstanceResponse, actualResponse);
+    }
+
+    @Test
+    public void getCamundaProccesInstanceHistoryRetryTest() {
+        HttpHeaders headers = setHeaders();
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+        String targetUrl =
+                "http://localhost:8089/sobpmnengine/history/process-instance?variables=mso-request-id_eq_" + REQUEST_ID;
+        doThrow(new ResourceAccessException("I/O error")).when(restTemplate).exchange(targetUrl, HttpMethod.GET,
+                requestEntity, new ParameterizedTypeReference<List<HistoricProcessInstanceEntity>>() {});
+        doReturn(headers).when(camundaRequestHandler).setCamundaHeaders("auth", "key");
+
+        try {
+            camundaRequestHandler.getCamundaProcessInstanceHistory(REQUEST_ID);
+        } catch (ResourceAccessException e) {
+            // Exception thrown after retries are completed
+        }
+        verify(restTemplate, times(4)).exchange(targetUrl, HttpMethod.GET, requestEntity,
+                new ParameterizedTypeReference<List<HistoricProcessInstanceEntity>>() {});
+    }
+
+    @Test
+    public void getCamundaProccesInstanceHistoryNoRetryTest() {
+        HttpHeaders headers = setHeaders();
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+        String targetUrl =
+                "http://localhost:8089/sobpmnengine/history/process-instance?variables=mso-request-id_eq_" + REQUEST_ID;
+        doThrow(HttpClientErrorException.class).when(restTemplate).exchange(targetUrl, HttpMethod.GET, requestEntity,
+                new ParameterizedTypeReference<List<HistoricProcessInstanceEntity>>() {});
+        doReturn(headers).when(camundaRequestHandler).setCamundaHeaders("auth", "key");
+
+        try {
+            camundaRequestHandler.getCamundaProcessInstanceHistory(REQUEST_ID);
+        } catch (HttpStatusCodeException e) {
+            // Exception thrown, no retries
+        }
+        verify(restTemplate, times(1)).exchange(targetUrl, HttpMethod.GET, requestEntity,
+                new ParameterizedTypeReference<List<HistoricProcessInstanceEntity>>() {});
+    }
+
+    @Test
+    public void getCamundaProccesInstanceHistoryFailThenSuccessTest() throws IOException, ContactCamundaException {
+        HttpHeaders headers = setHeaders();
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+        String targetUrl =
+                "http://localhost:8089/sobpmnengine/history/process-instance?variables=mso-request-id_eq_" + REQUEST_ID;
+        when(restTemplate.exchange(targetUrl, HttpMethod.GET, requestEntity,
+                new ParameterizedTypeReference<List<HistoricProcessInstanceEntity>>() {}))
+                        .thenThrow(new ResourceAccessException("I/O Exception")).thenReturn(processInstanceResponse);
+        doReturn(headers).when(camundaRequestHandler).setCamundaHeaders("auth", "key");
+
+        ResponseEntity<List<HistoricProcessInstanceEntity>> actualResponse =
+                camundaRequestHandler.getCamundaProcessInstanceHistory(REQUEST_ID);
+        assertEquals(processInstanceResponse, actualResponse);
+        verify(restTemplate, times(2)).exchange(targetUrl, HttpMethod.GET, requestEntity,
+                new ParameterizedTypeReference<List<HistoricProcessInstanceEntity>>() {});
+    }
+
+    @Test
+    public void setCamundaHeadersTest() throws ContactCamundaException, RequestDbFailureException {
+        String encryptedAuth = "015E7ACF706C6BBF85F2079378BDD2896E226E09D13DC2784BA309E27D59AB9FAD3A5E039DF0BB8408"; // user:password
+        String key = "07a7159d3bf51a0e53be7a8f89699be7";
+
+        HttpHeaders headers = camundaRequestHandler.setCamundaHeaders(encryptedAuth, key);
+        List<org.springframework.http.MediaType> acceptedType = headers.getAccept();
+
+        String expectedAcceptedType = "application/json";
+        assertEquals(expectedAcceptedType, acceptedType.get(0).toString());
+        String basicAuth = headers.getFirst(HttpHeaders.AUTHORIZATION);
+        String expectedBasicAuth = "Basic dXNlcjpwYXNzd29yZA==";
+
+        assertEquals(expectedBasicAuth, basicAuth);
+    }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java
index f82f5ac746..12f0ffcc11 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java
@@ -26,6 +26,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.shazam.shazamcrest.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
@@ -42,6 +43,7 @@ import java.util.Map;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import org.apache.http.HttpStatus;
+import org.junit.Before;
 import org.junit.Test;
 import org.onap.so.apihandler.common.ErrorNumbers;
 import org.onap.so.db.request.beans.InfraActiveRequests;
@@ -92,6 +94,21 @@ public class OrchestrationRequestsTest extends BaseTest {
         return list;
     }
 
+    @Before
+    public void setup() throws IOException {
+        wireMockServer.stubFor(get(urlMatching("/sobpmnengine/history/process-instance.*")).willReturn(aResponse()
+                .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                .withBody(new String(Files.readAllBytes(
+                        Paths.get("src/test/resources/OrchestrationRequest/ProcessInstanceHistoryResponse.json"))))
+                .withStatus(org.apache.http.HttpStatus.SC_OK)));
+        wireMockServer.stubFor(
+                get(("/sobpmnengine/history/activity-instance?processInstanceId=c4c6b647-a26e-11e9-b144-0242ac14000b"))
+                        .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                                .withBody(new String(Files.readAllBytes(Paths.get(
+                                        "src/test/resources/OrchestrationRequest/ActivityInstanceHistoryResponse.json"))))
+                                .withStatus(HttpStatus.SC_OK)));
+    }
+
     @Test
     public void testGetOrchestrationRequest() throws Exception {
         setupTestGetOrchestrationRequest();
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java
index fc548a715e..5023155768 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java
@@ -25,6 +25,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.doReturn;
 import javax.ws.rs.core.Response;
 import org.apache.commons.lang.StringUtils;
 import org.junit.Before;
@@ -55,6 +56,8 @@ public class OrchestrationRequestsUnitTest {
     private ResponseBuilder builder;
     @Mock
     private Response response;
+    @Mock
+    private CamundaRequestHandler camundaRequestHandler;
     @Rule
     public ExpectedException thrown = ExpectedException.none();
     @InjectMocks
@@ -68,6 +71,7 @@ public class OrchestrationRequestsUnitTest {
     private static final String FLOW_STATUS = "FlowStatus";
     private static final String RETRY_STATUS_MESSAGE = "RetryStatusMessage";
     private static final String ROLLBACK_STATUS_MESSAGE = "RollbackStatusMessage";
+    private static final String TASK_INFORMATION = " TASK INFORMATION: Last task executed: Call SDNC";
     private InfraActiveRequests iar;
     boolean includeCloudRequest = false;
     private static final String ROLLBACK_EXT_SYSTEM_ERROR_SOURCE = "SDNC";
@@ -79,14 +83,23 @@ public class OrchestrationRequestsUnitTest {
         iar.setRequestScope(SERVICE);
         iar.setRequestId(REQUEST_ID);
         iar.setServiceInstanceId(SERVICE_INSTANCE_ID);
+        iar.setExtSystemErrorSource(EXT_SYSTEM_ERROR_SOURCE);
+        iar.setRollbackExtSystemErrorSource(ROLLBACK_EXT_SYSTEM_ERROR_SOURCE);
+        iar.setFlowStatus(FLOW_STATUS);
+        iar.setRollbackStatusMessage(ROLLBACK_STATUS_MESSAGE);
+        iar.setRetryStatusMessage(RETRY_STATUS_MESSAGE);
     }
 
     @Test
     public void mapInfraActiveRequestToRequestWithOriginalRequestIdTest() throws ApiException {
+        doReturn("Last task executed: Call SDNC").when(camundaRequestHandler).getTaskName(REQUEST_ID);
         InstanceReferences instanceReferences = new InstanceReferences();
         instanceReferences.setServiceInstanceId(SERVICE_INSTANCE_ID);
         RequestStatus requestStatus = new RequestStatus();
         requestStatus.setRequestState(iar.getRequestStatus());
+        requestStatus.setStatusMessage(String.format("FLOW STATUS: %s RETRY STATUS: %s ROLLBACK STATUS: %s",
+                FLOW_STATUS + TASK_INFORMATION, RETRY_STATUS_MESSAGE, ROLLBACK_STATUS_MESSAGE));
+
         Request expected = new Request();
         expected.setRequestId(REQUEST_ID);
         expected.setOriginalRequestId(ORIGINAL_REQUEST_ID);
@@ -103,10 +116,13 @@ public class OrchestrationRequestsUnitTest {
 
     @Test
     public void mapInfraActiveRequestToRequestOriginalRequestIdNullTest() throws ApiException {
+        doReturn("Last task executed: Call SDNC").when(camundaRequestHandler).getTaskName(REQUEST_ID);
         InstanceReferences instanceReferences = new InstanceReferences();
         instanceReferences.setServiceInstanceId(SERVICE_INSTANCE_ID);
         RequestStatus requestStatus = new RequestStatus();
         requestStatus.setRequestState(iar.getRequestStatus());
+        requestStatus.setStatusMessage(String.format("FLOW STATUS: %s RETRY STATUS: %s ROLLBACK STATUS: %s",
+                FLOW_STATUS + TASK_INFORMATION, RETRY_STATUS_MESSAGE, ROLLBACK_STATUS_MESSAGE));
         Request expected = new Request();
         expected.setRequestId(REQUEST_ID);
         expected.setInstanceReferences(instanceReferences);
@@ -120,10 +136,13 @@ public class OrchestrationRequestsUnitTest {
 
     @Test
     public void mapRequestStatusAndExtSysErrSrcToRequestFalseTest() throws ApiException {
+        doReturn("Last task executed: Call SDNC").when(camundaRequestHandler).getTaskName(REQUEST_ID);
         InstanceReferences instanceReferences = new InstanceReferences();
         instanceReferences.setServiceInstanceId(SERVICE_INSTANCE_ID);
         RequestStatus requestStatus = new RequestStatus();
         requestStatus.setRequestState(iar.getRequestStatus());
+        requestStatus.setStatusMessage(String.format("FLOW STATUS: %s RETRY STATUS: %s ROLLBACK STATUS: %s",
+                FLOW_STATUS + TASK_INFORMATION, RETRY_STATUS_MESSAGE, ROLLBACK_STATUS_MESSAGE));
 
         Request expected = new Request();
         expected.setRequestId(REQUEST_ID);
@@ -140,6 +159,7 @@ public class OrchestrationRequestsUnitTest {
 
     @Test
     public void mapRequestStatusAndExtSysErrSrcToRequestStatusDetailTest() throws ApiException {
+        doReturn(null).when(camundaRequestHandler).getTaskName(REQUEST_ID);
         InstanceReferences instanceReferences = new InstanceReferences();
         instanceReferences.setServiceInstanceId(SERVICE_INSTANCE_ID);
         RequestStatus requestStatus = new RequestStatus();
@@ -157,11 +177,6 @@ public class OrchestrationRequestsUnitTest {
         expected.setRequestScope(SERVICE);
 
         includeCloudRequest = false;
-        iar.setExtSystemErrorSource(EXT_SYSTEM_ERROR_SOURCE);
-        iar.setRollbackExtSystemErrorSource(ROLLBACK_EXT_SYSTEM_ERROR_SOURCE);
-        iar.setFlowStatus(FLOW_STATUS);
-        iar.setRollbackStatusMessage(ROLLBACK_STATUS_MESSAGE);
-        iar.setRetryStatusMessage(RETRY_STATUS_MESSAGE);
 
         Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest,
                 OrchestrationRequestFormat.STATUSDETAIL.toString());
@@ -170,12 +185,13 @@ public class OrchestrationRequestsUnitTest {
 
     @Test
     public void mapRequestStatusAndExtSysErrSrcToRequestDetailTest() throws ApiException {
+        doReturn("Last task executed: Call SDNC").when(camundaRequestHandler).getTaskName(REQUEST_ID);
         InstanceReferences instanceReferences = new InstanceReferences();
         instanceReferences.setServiceInstanceId(SERVICE_INSTANCE_ID);
         RequestStatus requestStatus = new RequestStatus();
         requestStatus.setRequestState(iar.getRequestStatus());
         requestStatus.setStatusMessage(String.format("FLOW STATUS: %s RETRY STATUS: %s ROLLBACK STATUS: %s",
-                FLOW_STATUS, RETRY_STATUS_MESSAGE, ROLLBACK_STATUS_MESSAGE));
+                FLOW_STATUS + TASK_INFORMATION, RETRY_STATUS_MESSAGE, ROLLBACK_STATUS_MESSAGE));
 
         Request expected = new Request();
         expected.setRequestId(REQUEST_ID);
@@ -184,11 +200,78 @@ public class OrchestrationRequestsUnitTest {
         expected.setRequestScope(SERVICE);
 
         includeCloudRequest = false;
-        iar.setExtSystemErrorSource(EXT_SYSTEM_ERROR_SOURCE);
-        iar.setRollbackExtSystemErrorSource(ROLLBACK_EXT_SYSTEM_ERROR_SOURCE);
-        iar.setFlowStatus(FLOW_STATUS);
-        iar.setRollbackStatusMessage(ROLLBACK_STATUS_MESSAGE);
-        iar.setRetryStatusMessage(RETRY_STATUS_MESSAGE);
+
+        Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest,
+                OrchestrationRequestFormat.DETAIL.toString());
+
+        assertThat(actual, sameBeanAs(expected));
+    }
+
+    @Test
+    public void mapRequestStatusAndExtSysErrSrcToRequestNoFlowStatusTest() throws ApiException {
+        InstanceReferences instanceReferences = new InstanceReferences();
+        instanceReferences.setServiceInstanceId(SERVICE_INSTANCE_ID);
+        RequestStatus requestStatus = new RequestStatus();
+        requestStatus.setRequestState(iar.getRequestStatus());
+        requestStatus.setStatusMessage(
+                String.format("RETRY STATUS: %s ROLLBACK STATUS: %s", RETRY_STATUS_MESSAGE, ROLLBACK_STATUS_MESSAGE));
+
+        Request expected = new Request();
+        expected.setRequestId(REQUEST_ID);
+        expected.setInstanceReferences(instanceReferences);
+        expected.setRequestStatus(requestStatus);
+        expected.setRequestScope(SERVICE);
+
+        includeCloudRequest = false;
+        iar.setFlowStatus(null);
+
+        Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest,
+                OrchestrationRequestFormat.DETAIL.toString());
+
+        assertThat(actual, sameBeanAs(expected));
+    }
+
+    @Test
+    public void mapRequestStatusAndExtSysErrSrcToRequestFlowStatusSuccessfulCompletionTest() throws ApiException {
+        InstanceReferences instanceReferences = new InstanceReferences();
+        instanceReferences.setServiceInstanceId(SERVICE_INSTANCE_ID);
+        RequestStatus requestStatus = new RequestStatus();
+        requestStatus.setRequestState(iar.getRequestStatus());
+        requestStatus.setStatusMessage(String.format("FLOW STATUS: %s RETRY STATUS: %s ROLLBACK STATUS: %s",
+                "Successfully completed all Building Blocks", RETRY_STATUS_MESSAGE, ROLLBACK_STATUS_MESSAGE));
+
+        Request expected = new Request();
+        expected.setRequestId(REQUEST_ID);
+        expected.setInstanceReferences(instanceReferences);
+        expected.setRequestStatus(requestStatus);
+        expected.setRequestScope(SERVICE);
+
+        includeCloudRequest = false;
+        iar.setFlowStatus("Successfully completed all Building Blocks");
+
+        Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest,
+                OrchestrationRequestFormat.DETAIL.toString());
+
+        assertThat(actual, sameBeanAs(expected));
+    }
+
+    @Test
+    public void mapRequestStatusAndExtSysErrSrcToRequestFlowStatusSuccessfulRollbackTest() throws ApiException {
+        InstanceReferences instanceReferences = new InstanceReferences();
+        instanceReferences.setServiceInstanceId(SERVICE_INSTANCE_ID);
+        RequestStatus requestStatus = new RequestStatus();
+        requestStatus.setRequestState(iar.getRequestStatus());
+        requestStatus.setStatusMessage(String.format("FLOW STATUS: %s RETRY STATUS: %s ROLLBACK STATUS: %s",
+                "All Rollback flows have completed successfully", RETRY_STATUS_MESSAGE, ROLLBACK_STATUS_MESSAGE));
+
+        Request expected = new Request();
+        expected.setRequestId(REQUEST_ID);
+        expected.setInstanceReferences(instanceReferences);
+        expected.setRequestStatus(requestStatus);
+        expected.setRequestScope(SERVICE);
+
+        includeCloudRequest = false;
+        iar.setFlowStatus("All Rollback flows have completed successfully");
 
         Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest,
                 OrchestrationRequestFormat.DETAIL.toString());
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsTest.java
index 62a6f44a63..5306888570 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsTest.java
@@ -76,6 +76,9 @@ public class RequestHandlerUtilsTest extends BaseTest {
     @Autowired
     private RequestHandlerUtils requestHandlerUtils;
 
+    @Autowired
+    private CamundaRequestHandler camundaRequestHandler;
+
     @Value("${wiremock.server.port}")
     private String wiremockPort;
 
@@ -327,7 +330,7 @@ public class RequestHandlerUtilsTest extends BaseTest {
     public void setCamundaHeadersTest() throws ContactCamundaException, RequestDbFailureException {
         String encryptedAuth = "015E7ACF706C6BBF85F2079378BDD2896E226E09D13DC2784BA309E27D59AB9FAD3A5E039DF0BB8408"; // user:password
         String key = "07a7159d3bf51a0e53be7a8f89699be7";
-        HttpHeaders headers = requestHandlerUtils.setCamundaHeaders(encryptedAuth, key);
+        HttpHeaders headers = camundaRequestHandler.setCamundaHeaders(encryptedAuth, key);
         List<org.springframework.http.MediaType> acceptedType = headers.getAccept();
         String expectedAcceptedType = "application/json";
         assertEquals(expectedAcceptedType, acceptedType.get(0).toString());
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
index b72e5124d1..4b2644bc00 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
@@ -2917,19 +2917,6 @@ public class ServiceInstancesTest extends BaseTest {
     }
 
     @Test
-    public void setCamundaHeadersTest() throws ContactCamundaException, RequestDbFailureException {
-        String encryptedAuth = "015E7ACF706C6BBF85F2079378BDD2896E226E09D13DC2784BA309E27D59AB9FAD3A5E039DF0BB8408"; // user:password
-        String key = "07a7159d3bf51a0e53be7a8f89699be7";
-        HttpHeaders headers = requestHandlerUtils.setCamundaHeaders(encryptedAuth, key);
-        List<org.springframework.http.MediaType> acceptedType = headers.getAccept();
-        String expectedAcceptedType = "application/json";
-        assertEquals(expectedAcceptedType, acceptedType.get(0).toString());
-        String basicAuth = headers.getFirst(HttpHeaders.AUTHORIZATION);
-        String expectedBasicAuth = "Basic dXNlcjpwYXNzd29yZA==";
-        assertEquals(expectedBasicAuth, basicAuth);
-    }
-
-    @Test
     public void handleReplaceInstance_Test() throws JsonParseException, JsonMappingException, IOException {
         String replaceVfModule = inputStream("/ReplaceVfModule.json");
         ObjectMapper mapper = new ObjectMapper();
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/ActivityInstanceHistoryResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/ActivityInstanceHistoryResponse.json
new file mode 100644
index 0000000000..efd80f3347
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/ActivityInstanceHistoryResponse.json
@@ -0,0 +1,48 @@
+[
+   {
+      "id":"Call_BBToExecute:c4f603e4-a26e-11e9-b144-0242ac14000b",
+      "parentActivityInstanceId":"c4c6b647-a26e-11e9-b144-0242ac14000b",
+      "activityId":"Call_BBToExecute",
+      "activityName":"BB to Execute",
+      "activityType":"callActivity",
+      "processDefinitionKey":"ExecuteBuildingBlock",
+      "processDefinitionId":"ExecuteBuildingBlock:1:a46566de-a26b-11e9-b144-0242ac14000b",
+      "processInstanceId":"c4c6b647-a26e-11e9-b144-0242ac14000b",
+      "executionId":"c4f603e3-a26e-11e9-b144-0242ac14000b",
+      "taskId":null,
+      "calledProcessInstanceId":"c4f603e6-a26e-11e9-b144-0242ac14000b",
+      "calledCaseInstanceId":null,
+      "assignee":null,
+      "startTime":"2019-07-09T17:27:04.607+0000",
+      "endTime":"2019-07-09T17:27:05.545+0000",
+      "durationInMillis":938,
+      "canceled":true,
+      "completeScope":false,
+      "tenantId":null,
+      "removalTime":null,
+      "rootProcessInstanceId":"c2fd4066-a26e-11e9-b144-0242ac14000b"
+   },
+   {
+      "id":"EndEvent_0mvmk3i:c59b1d39-a26e-11e9-b144-0242ac14000b",
+      "parentActivityInstanceId":"SubProcess_0tv8zda:c5852427-a26e-11e9-b144-0242ac14000b",
+      "activityId":"EndEvent_0mvmk3i",
+      "activityName":null,
+      "activityType":"noneEndEvent",
+      "processDefinitionKey":"ExecuteBuildingBlock",
+      "processDefinitionId":"ExecuteBuildingBlock:1:a46566de-a26b-11e9-b144-0242ac14000b",
+      "processInstanceId":"c4c6b647-a26e-11e9-b144-0242ac14000b",
+      "executionId":"c5852426-a26e-11e9-b144-0242ac14000b",
+      "taskId":null,
+      "calledProcessInstanceId":null,
+      "calledCaseInstanceId":null,
+      "assignee":null,
+      "startTime":"2019-07-09T17:27:05.689+0000",
+      "endTime":"2019-07-09T17:27:05.689+0000",
+      "durationInMillis":0,
+      "canceled":false,
+      "completeScope":true,
+      "tenantId":null,
+      "removalTime":null,
+      "rootProcessInstanceId":"c2fd4066-a26e-11e9-b144-0242ac14000b"
+   }
+ ]
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json
index 3b2eca7ce2..96fed36d45 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json
@@ -61,7 +61,7 @@
         },
         "requestStatus": {
           "requestState": "COMPLETE",
-          "statusMessage": "STATUS: Vf Module has been deleted successfully. FLOW STATUS: Building blocks 1 of 3 completed. ROLLBACK STATUS: Rollback has been completed successfully.",
+          "statusMessage": "STATUS: Vf Module has been deleted successfully. FLOW STATUS: Building blocks 1 of 3 completed. TASK INFORMATION: Last task executed: BB to Execute ROLLBACK STATUS: Rollback has been completed successfully.",
           "percentProgress": 100,
           "timestamp": "Thu, 22 Dec 2016 08:30:28 GMT"
         }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json
index baddb21617..801841313a 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json
@@ -58,7 +58,7 @@
             },
             "requestStatus":{
                "requestState":"PENDING",
-               "statusMessage":"FLOW STATUS: Building blocks 1 of 3 completed. RETRY STATUS: Retry 2/5 will be started in 8 min. ROLLBACK STATUS: Rollback has been completed successfully.",
+               "statusMessage":"FLOW STATUS: Building blocks 1 of 3 completed. TASK INFORMATION: Last task executed: BB to Execute RETRY STATUS: Retry 2/5 will be started in 8 min. ROLLBACK STATUS: Rollback has been completed successfully.",
                "percentProgress":0,
                "timestamp": "Thu, 22 Dec 2016 08:30:28 GMT"
             }
@@ -321,7 +321,7 @@
             },
             "requestStatus":{
                "requestState":"PENDING",
-               "statusMessage":"STATUS: Adding members. FLOW STATUS: Building blocks 1 of 3 completed. RETRY STATUS: Retry 2/5 will be started in 8 min. ROLLBACK STATUS: Rollback has been completed successfully.",
+               "statusMessage":"STATUS: Adding members. FLOW STATUS: Building blocks 1 of 3 completed. TASK INFORMATION: Last task executed: BB to Execute RETRY STATUS: Retry 2/5 will be started in 8 min. ROLLBACK STATUS: Rollback has been completed successfully.",
                "percentProgress":0,
                "timestamp": "Thu, 22 Dec 2016 08:30:28 GMT"
             }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/ProcessInstanceHistoryResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/ProcessInstanceHistoryResponse.json
new file mode 100644
index 0000000000..faa283463b
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/ProcessInstanceHistoryResponse.json
@@ -0,0 +1,44 @@
+[
+   {
+      "id":"c2fd4066-a26e-11e9-b144-0242ac14000b",
+      "businessKey":"84eacc7b-b046-4333-9272-5e8513bdd4cc",
+      "processDefinitionId":"WorkflowActionBB:1:a461210d-a26b-11e9-b144-0242ac14000b",
+      "processDefinitionKey":"WorkflowActionBB",
+      "processDefinitionName":"WorkflowActionBB",
+      "processDefinitionVersion":1,
+      "startTime":"2019-07-09T17:27:01.299+0000",
+      "endTime":"2019-07-09T17:27:06.585+0000",
+      "removalTime":null,
+      "durationInMillis":5286,
+      "startUserId":null,
+      "startActivityId":"Start_WorkflowActionBB",
+      "deleteReason":null,
+      "rootProcessInstanceId":"c2fd4066-a26e-11e9-b144-0242ac14000b",
+      "superProcessInstanceId":null,
+      "superCaseInstanceId":null,
+      "caseInstanceId":null,
+      "tenantId":null,
+      "state":"COMPLETED"
+   },
+   {
+      "id":"c4c6b647-a26e-11e9-b144-0242ac14000b",
+      "businessKey":null,
+      "processDefinitionId":"ExecuteBuildingBlock:1:a46566de-a26b-11e9-b144-0242ac14000b",
+      "processDefinitionKey":"ExecuteBuildingBlock",
+      "processDefinitionName":"ExecuteBuildingBlock",
+      "processDefinitionVersion":1,
+      "startTime":"2019-07-09T17:27:04.298+0000",
+      "endTime":"2019-07-09T17:27:05.690+0000",
+      "removalTime":null,
+      "durationInMillis":1392,
+      "startUserId":null,
+      "startActivityId":"Start_ExecuteBuildingBlock",
+      "deleteReason":null,
+      "rootProcessInstanceId":"c2fd4066-a26e-11e9-b144-0242ac14000b",
+      "superProcessInstanceId":"c2fd4066-a26e-11e9-b144-0242ac14000b",
+      "superCaseInstanceId":null,
+      "caseInstanceId":null,
+      "tenantId":null,
+      "state":"COMPLETED"
+   }
+ ]
\ No newline at end of file