Merge pull request #26 from hisanhunais/subscription-workflow-fix

[1.1.x branch] Fix Workflow Issue When Subscribing to a Monetization Enabled API

pom.xml

@@ -42,7 +42,7 @@
     </repositories>
 
     <properties>
-        <carbon.apimgt.version>6.6.163</carbon.apimgt.version>
+        <carbon.apimgt.version>6.7.206</carbon.apimgt.version>
         <commons.lang.version>2.6</commons.lang.version>
         <stripe.version>9.8.0</stripe.version>
     </properties>

src/main/java/org.wso2.apim.monetization/impl/workflow/StripeSubscriptionCreationWorkflowExecutor.java

@@ -89,12 +89,17 @@ public List<WorkflowDTO> getWorkflowDetails(String workflowStatus) throws Workfl
     @Override
     public WorkflowResponse execute(WorkflowDTO workflowDTO) throws WorkflowException {
 
+        SubscriptionWorkflowDTO subsWorkflowDTO = (SubscriptionWorkflowDTO) workflowDTO;
+        workflowDTO.setProperties("apiName", subsWorkflowDTO.getApiName());
+        workflowDTO.setProperties("apiVersion", subsWorkflowDTO.getApiVersion());
+        workflowDTO.setProperties("subscriber", subsWorkflowDTO.getSubscriber());
+        workflowDTO.setProperties("applicationName", subsWorkflowDTO.getApplicationName());
         super.execute(workflowDTO);
         workflowDTO.setStatus(WorkflowStatus.APPROVED);
         WorkflowResponse workflowResponse = complete(workflowDTO);
         super.publishEvents(workflowDTO);
 
-        return new GeneralWorkflowResponse();
+        return workflowResponse;
     }
 
     /**
@@ -474,6 +479,8 @@ public MonetizationPlatformCustomer createMonetizationPlatformCutomer(Subscriber
     @Override
     public WorkflowResponse complete(WorkflowDTO workflowDTO) throws WorkflowException {
 
+        workflowDTO.setUpdatedTime(System.currentTimeMillis());
+        super.complete(workflowDTO);
         ApiMgtDAO apiMgtDAO = ApiMgtDAO.getInstance();
         try {
             apiMgtDAO.updateSubscriptionStatus(Integer.parseInt(workflowDTO.getWorkflowReference()),