From 3ecf6a3663a9289e737fb024ac80a875d3452028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Bolbo=C8=99enco?= <alex.bolbosenco@gmail.com>
Date: Wed, 8 Jan 2020 15:52:34 +0200
Subject: [PATCH] [AAE-1336] add version on completeTaskForm (#5354)

* add version on completeTaskForm

* fix test
---
 .../src/lib/form/components/form-cloud.component.spec.ts      | 4 +++-
 .../src/lib/form/components/form-cloud.component.ts           | 2 +-
 .../src/lib/form/services/form-cloud.service.spec.ts          | 4 ++--
 .../src/lib/form/services/form-cloud.service.ts               | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts
index e2521efb48..5b9e2dd43d 100644
--- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts
+++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts
@@ -608,6 +608,7 @@ describe('FormCloudComponent', () => {
         formComponent.formCompleted.subscribe(() => completed = true);
 
         const taskId = '123-223';
+        const appVersion = 1;
         const appName = 'test-app';
         const processInstanceId = '333-444';
 
@@ -620,13 +621,14 @@ describe('FormCloudComponent', () => {
             ]
         });
 
+        formComponent.appVersion = appVersion;
         formComponent.form = formModel;
         formComponent.taskId = taskId;
         formComponent.appName = appName;
         formComponent.processInstanceId = processInstanceId;
         formComponent.completeTaskForm(outcome);
 
-        expect(formCloudService.completeTaskForm).toHaveBeenCalledWith(appName, formModel.taskId, processInstanceId, formModel.id, formModel.values, outcome);
+        expect(formCloudService.completeTaskForm).toHaveBeenCalledWith(appName, formModel.taskId, processInstanceId, formModel.id, formModel.values, outcome, appVersion);
         expect(completed).toBeTruthy();
     });
 
diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts
index bfd06e4942..009afe2e09 100644
--- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts
@@ -291,7 +291,7 @@ export class FormCloudComponent extends FormBaseComponent implements OnChanges,
     completeTaskForm(outcome?: string) {
         if (this.form && this.appName && this.taskId) {
             this.formCloudService
-                .completeTaskForm(this.appName, this.taskId, this.processInstanceId, `${this.form.id}`, this.form.values, outcome)
+                .completeTaskForm(this.appName, this.taskId, this.processInstanceId, `${this.form.id}`, this.form.values, outcome, this.appVersion)
                 .pipe(takeUntil(this.onDestroy$))
                 .subscribe(
                     () => {
diff --git a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts
index 2cf711f8fa..b36be6199e 100644
--- a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts
+++ b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts
@@ -174,11 +174,11 @@ describe('Form Cloud service', () => {
             oauth2Auth.callCustomApi.and.returnValue(Promise.resolve(responseBody));
             const formId = 'form-id';
 
-            service.completeTaskForm(appName, taskId, processInstanceId, formId, {}, '').subscribe((result: any) => {
+            service.completeTaskForm(appName, taskId, processInstanceId, formId, {}, '', 1).subscribe((result: any) => {
                 expect(result).toBeDefined();
                 expect(result.id).toBe('id');
                 expect(result.name).toBe('name');
-                expect(oauth2Auth.callCustomApi.calls.mostRecent().args[0].endsWith(`${appName}/form/v1/forms/${formId}/submit`)).toBeTruthy();
+                expect(oauth2Auth.callCustomApi.calls.mostRecent().args[0].endsWith(`${appName}/form/v1/forms/${formId}/submit/versions/1`)).toBeTruthy();
                 expect(oauth2Auth.callCustomApi.calls.mostRecent().args[1]).toBe('POST');
                 done();
             });
diff --git a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts
index 61c2ba91f5..2722c30fb7 100644
--- a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts
+++ b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts
@@ -112,8 +112,8 @@ export class FormCloudService extends BaseCloudService {
      * @param outcome Form outcome
      * @returns Updated task details
      */
-    completeTaskForm(appName: string, taskId: string, processInstanceId: string, formId: string, formValues: FormValues, outcome: string): Observable<TaskDetailsCloudModel> {
-        const apiUrl = `${this.getBasePath(appName)}/form/v1/forms/${formId}/submit`;
+    completeTaskForm(appName: string, taskId: string, processInstanceId: string, formId: string, formValues: FormValues, outcome: string, version: number): Observable<TaskDetailsCloudModel> {
+        const apiUrl = `${this.getBasePath(appName)}/form/v1/forms/${formId}/submit/versions/${version}`;
         const completeFormRepresentation = <CompleteFormRepresentation> {values: formValues, taskId: taskId, processInstanceId: processInstanceId};
         if (outcome) {
             completeFormRepresentation.outcome = outcome;