From d4e7981b1dcac6d46a3dcf9577ad1c103d16a644 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Tue, 23 Apr 2019 23:41:19 +0100
Subject: [PATCH] simpleapp rename

---
 e2e/resources/activiti7/simpleApp.zip | Bin 3184 -> 0 bytes
 e2e/util/resources.js                 |   2 +-
 scripts/check-activiti-env.js         |  19 ++++++++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 100644 e2e/resources/activiti7/simpleApp.zip

diff --git a/e2e/resources/activiti7/simpleApp.zip b/e2e/resources/activiti7/simpleApp.zip
deleted file mode 100644
index d27baa2f4e0f583e4e9bd11c23774656b304d3c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3184
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
TGYegfh4z%uN|sDh1b}}5vU>uL

diff --git a/e2e/util/resources.js b/e2e/util/resources.js
index de5bb79f6f..b831d960b8 100644
--- a/e2e/util/resources.js
+++ b/e2e/util/resources.js
@@ -520,7 +520,7 @@ exports.ACTIVITI7_APPS = {
     },
     SIMPLE_APP: {
         name: "simpleapp",
-        file_location: "/resources/activiti7/simpleApp.zip",
+        file_location: "/resources/activiti7/simpleapp.zip",
         processes: {
             processwithvariables: "processwithvariables",
             simpleProcess: "simpleProcess"
diff --git a/scripts/check-activiti-env.js b/scripts/check-activiti-env.js
index f87a0078a4..550b9aeb6c 100755
--- a/scripts/check-activiti-env.js
+++ b/scripts/check-activiti-env.js
@@ -69,17 +69,20 @@ async function checkIfAppIsReleased(apiService, absentApps) {
 
     for (let i = 0; i < absentApps.length; i++) {
         let currentAbsentApp = absentApps[i];
-        let isPresent = listAppsInModeler.find((currentApp) => {
+        let app = listAppsInModeler.find((currentApp) => {
             return currentAbsentApp.name === currentApp.entry.name;
         });
 
-        if (!isPresent) {
-            console.log(`uplodare ` + currentAbsentApp.name);
+
+        if (!app) {
             let uploadedApp = await importApp(apiService, currentAbsentApp);
             if (uploadedApp) {
                 await releaseApp(apiService, uploadedApp);
                 await deployApp(apiService, uploadedApp);
             }
+        }else{
+            await releaseApp(apiService, app);
+            await deployApp(apiService, app);
         }
     }
 }
@@ -124,15 +127,16 @@ async function importApp(apiService, app) {
         return await apiService.oauth2Auth.callCustomApi(url, 'POST', pathParams, queryParams, headerParams, formParams, bodyParam,
             contentTypes, accepts);
     } catch (error) {
-        console.log(`Not possible to upload the project ${app.name} ` + error);
-        process.exit(1);
+        if (error.status !== 409) {
+            console.log(`Not possible to upload the project ${app.name} ` + error.status);
+            process.exit(1);
+        }
     }
 
 }
 
 async function releaseApp(apiService, app) {
     const url = `${config.hostBpm}alfresco-modeling-service/v1/projects/${app.entry.id}/releases`;
-    console.log(url);
 
     const pathParams = {}, queryParams = {},
         headerParams = {}, formParams = {}, bodyParam = {},
@@ -142,7 +146,7 @@ async function releaseApp(apiService, app) {
         return await apiService.oauth2Auth.callCustomApi(url, 'POST', pathParams, queryParams, headerParams, formParams, bodyParam,
             contentTypes, accepts);
     } catch (error) {
-        console.log(`Not possible to release the project ${app.entry.name} ` + error);
+        console.log(`Not possible to release the project ${app.entry.name} ` + JSON.stringify(error));
         process.exit(1);
     }
 
@@ -159,6 +163,7 @@ async function getDeployedApplicationsByStatus(apiService, status) {
     try {
         data = await apiService.oauth2Auth.callCustomApi(url, 'GET', pathParams, queryParams, headerParams, formParams, bodyParam,
             contentTypes, accepts);
+
         return data.list.entries;
     } catch (error) {
         console.log(`Not possible get the application from alfresco-deployment-service` + error);