fix(bpmn-service): fix workflow model audit fields (#240)

sourcefuse · Jul 5, 2021 · 8558870 · 8558870
1 parent 792e14e
commit 8558870
Show file tree

Hide file tree

Showing 13 changed files with 291 additions and 18,904 deletions.
diff --git a/packages/user-onboarding/package-lock.json b/packages/user-onboarding/package-lock.json
diff --git a/packages/user-onboarding/package.json b/packages/user-onboarding/package.json
@@ -20,6 +20,7 @@
     "@angular/platform-browser": "~11.2.3",
     "@angular/platform-browser-dynamic": "~11.2.3",
     "@angular/router": "~11.2.3",
+    "@videogular/ngx-videogular": "^3.0.1",
     "json-server": "^0.16.3",
     "ngx-webstorage-service": "^4.1.0",
     "prettier": "^2.3.0",

diff --git a/sandbox/workflow-ms-example/src/application.ts b/sandbox/workflow-ms-example/src/application.ts
@@ -15,7 +15,6 @@ import {BPMTask} from '@sourceloop/bpmn-service/dist/bpm-task';
 import path from 'path';
 import {SayHelloCommand} from './commands/sayhello.command';
 import {BpmnProvider} from './providers/bpmn.provider';
-import {MySequence} from './sequence';
 
 export {ApplicationConfig};
 
@@ -26,7 +25,6 @@ export class WorkflowHelloworldApplication extends BootMixin(
     super(options);
 
     // Set up the custom sequence
-    this.sequence(MySequence);
 
     // Set up default home page
     this.static('/', path.join(__dirname, '../public'));
@@ -39,7 +37,7 @@ export class WorkflowHelloworldApplication extends BootMixin(
 
     this.bind(WorkflowServiceBindings.Config).toDynamicValue(() => {
       return {
-        useCustomSequence: true,
+        useCustomSequence: false,
         workflowEngineBaseUrl: process.env.CAMUNDA_URL,
       };
     });

diff --git a/sandbox/workflow-ms-example/src/providers/bpmn.provider.ts b/sandbox/workflow-ms-example/src/providers/bpmn.provider.ts
@@ -1,6 +1,8 @@
 import {bind, BindingScope, Provider, service} from '@loopback/core';
 import {AnyObject} from '@loopback/repository';
+import {HttpErrors} from '@loopback/rest';
 import {WorflowManager, Workflow, WorkflowDto} from '@sourceloop/bpmn-service';
+import {WorkflowVersion} from '../../../../services/bpmn-service/dist';
 import {CamundaService} from '../services/camunda.service';
 
 @bind({scope: BindingScope.TRANSIENT})
@@ -44,14 +46,18 @@ export class BpmnProvider implements Provider<WorflowManager> {
           Buffer.from(workflowDto.bpmnFile, 'utf-8'),
         );
         let version = 1;
-        let id = response.id;
+        let id;
         if (response.deployedProcessDefinitions) {
           const processDefinition = Object.values(
             //NOSONAR
             response.deployedProcessDefinitions, //NOSONAR
           )[0] as AnyObject; //NOSONAR
           version = processDefinition.version;
           id = processDefinition.id;
+        } else {
+          throw new HttpErrors.BadRequest(
+            'Workflow with same name and definition already exists',
+          );
         }
         return {
           version: version,
@@ -86,10 +92,19 @@ export class BpmnProvider implements Provider<WorflowManager> {
           fileRef: workflowDto.bpmnFile,
         };
       },
-      deleteWorkflowById: async workflow => {
-        await this.camunda.delete(workflow.externalIdentifier);
+      deleteWorkflowById: async (workflow: Workflow) => {
+        await this.camunda.delete(
+          workflow.workflowVersions.map(
+            (version: WorkflowVersion) => version.externalWorkflowId as string,
+          ),
+        );
         return workflow;
       },
+
+      deleteWorkflowVersionById: async (version: WorkflowVersion) => {
+        await this.camunda.deleteVersion(version.externalWorkflowId);
+        return version;
+      },
     };
   }
 }
diff --git a/sandbox/workflow-ms-example/src/services/camunda.service.ts b/sandbox/workflow-ms-example/src/services/camunda.service.ts
@@ -19,9 +19,6 @@ export class CamundaService {
     this.baseUrl = config?.workflowEngineBaseUrl;
   }
 
-  /*
-   * Add service methods here
-   */
   async create(name: string, file: Buffer) {
     const form = new FormData();
     form.append(`${name}.bpmn`, file.toString('utf-8'), {
@@ -32,16 +29,24 @@ export class CamundaService {
     return this.http.postFormData(`${this.baseUrl}/deployment/create`, form);
   }
 
-  async delete(id: string, cascade = true) {
-    return this.http.delete(`${this.baseUrl}/deployment/${id}`, {
-      query: {
-        cascade: cascade,
-      },
-    });
+  async delete(ids: string[]) {
+    return Promise.all(
+      ids.map(id =>
+        this.http.delete(`${this.baseUrl}/process-definition/${id}`, {
+          query: {
+            cascade: true,
+          },
+        }),
+      ),
+    );
+  }
+
+  async deleteVersion(id: string) {
+    return this.http.delete(`${this.baseUrl}/process-definition/${id}`);
   }
 
   async get(id: string) {
-    return this.http.get(`${this.baseUrl}/deployment/${id}`);
+    return this.http.get(`${this.baseUrl}/process-definition/${id}`);
   }
 
   async execute(id: string, input: AnyObject) {

diff --git a/sandbox/workflow-ms-example/src/services/http.service.ts b/sandbox/workflow-ms-example/src/services/http.service.ts
@@ -69,7 +69,9 @@ export class HttpClientService {
 
   private async handleRes(res: Response) {
     if (res.status === STATUS_CODE.OK) {
-      return res.json();
+      return res.json().catch(e => ({}));
+    } else if (res.status === STATUS_CODE.NO_CONTENT) {
+      return {};
     } else {
       throw new HttpErrors.BadRequest(await res.text());
     }

diff --git a/services/bpmn-service/openapi.json b/services/bpmn-service/openapi.json
@@ -18,7 +18,7 @@
         ],
         "security": [
           {
-            "bearerAuth": []
+            "HTTPBearer": []
           }
         ],
         "responses": {
@@ -49,6 +49,44 @@
         "operationId": "WorkflowController.startWorkflow"
       }
     },
+    "/workflow/{id}/version/{version}": {
+      "delete": {
+        "x-controller-name": "WorkflowController",
+        "x-operation-name": "deleteVersionById",
+        "tags": [
+          "WorkflowController"
+        ],
+        "security": [
+          {
+            "HTTPBearer": []
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Workflow DELETE success"
+          }
+        },
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "schema": {
+              "type": "number"
+            },
+            "required": true
+          }
+        ],
+        "operationId": "WorkflowController.deleteVersionById"
+      }
+    },
     "/workflow/{id}": {
       "patch": {
         "x-controller-name": "WorkflowController",
@@ -58,7 +96,7 @@
         ],
         "security": [
           {
-            "bearerAuth": []
+            "HTTPBearer": []
           }
         ],
         "responses": {
@@ -95,7 +133,7 @@
         ],
         "security": [
           {
-            "bearerAuth": []
+            "HTTPBearer": []
           }
         ],
         "responses": {
@@ -123,7 +161,7 @@
         ],
         "security": [
           {
-            "bearerAuth": []
+            "HTTPBearer": []
           }
         ],
         "responses": {
@@ -153,7 +191,7 @@
         ],
         "security": [
           {
-            "bearerAuth": []
+            "HTTPBearer": []
           }
         ],
         "responses": {
@@ -187,7 +225,7 @@
         ],
         "security": [
           {
-            "bearerAuth": []
+            "HTTPBearer": []
           }
         ],
         "responses": {