From 999ccfde3d87d524e147ba51a33d351ad44193a8 Mon Sep 17 00:00:00 2001
From: Martin Rojas Miguel Angel <MiguelAngel.MartinRojas@novatec-gmbh.de>
Date: Tue, 12 Mar 2019 15:50:11 +0100
Subject: [PATCH] bug/829 Fix unable to edit twice a task due to wrong
 modification date format

---
 .../sampledata/SampleDataGenerator.java       |   2 +-
 .../taskana/rest/TaskControllerIntTest.java   |   2 +-
 .../app/workplace/services/task.service.ts    |  17 +--
 .../taskdetails/taskdetails.component.html    |   4 +-
 .../taskdetails/taskdetails.component.ts      | 103 ++++++++++++------
 5 files changed, 73 insertions(+), 55 deletions(-)

diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java b/rest/taskana-rest-spring-base/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
index cebb173ee..db2b84f98 100644
--- a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
+++ b/rest/taskana-rest-spring-base/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
@@ -48,7 +48,7 @@ public class SampleDataGenerator {
 
     private static final String RELATIVE_DATE_REGEX = "RELATIVE_DATE\\((-?\\d+)\\)";
     private static final Pattern RELATIVE_DATE_PATTERN = Pattern.compile(RELATIVE_DATE_REGEX);
-    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
 
     private DataSource dataSource;
     private ScriptRunner runner;
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java
index 214a2f010..b2409fb3f 100644
--- a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java
+++ b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java
@@ -331,7 +331,7 @@ public class TaskControllerIntTest {
         String created = jsonNode.get("created").asText();
         assertFalse(response.contains("\"attachments\":[]"));
         assertTrue(
-            created.matches("\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\d([+-][0-2]\\d:[0-5]\\d|Z)"));
+            created.matches("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}Z"));
     }
 
     @Test
diff --git a/web/src/app/workplace/services/task.service.ts b/web/src/app/workplace/services/task.service.ts
index 48dd64c03..092f84f51 100644
--- a/web/src/app/workplace/services/task.service.ts
+++ b/web/src/app/workplace/services/task.service.ts
@@ -60,12 +60,7 @@ export class TaskService {
   }
 
   getTask(id: string): Observable<Task> {
-    return this.httpClient.get<Task>(`${this.url}/${id}`)
-      .pipe(map(
-        (response: Task) => {
-          response = this.applyTaskDatesTimeZone(response);
-          return response;
-        }));
+    return this.httpClient.get<Task>(`${this.url}/${id}`);
   }
 
   completeTask(id: string): Observable<Task> {
@@ -93,16 +88,6 @@ export class TaskService {
     return this.httpClient.post<Task>(this.url, task);
   }
 
-  private applyTaskDatesTimeZone(task: Task): Task {
-    if (task.due) { task.due = TaskanaDate.applyTimeZone(task.due); }
-    if (task.modified) { task.modified = TaskanaDate.applyTimeZone(task.modified); }
-    if (task.completed) { task.completed = TaskanaDate.applyTimeZone(task.completed); }
-    if (task.planned) { task.planned = TaskanaDate.applyTimeZone(task.planned); }
-    if (task.claimed) { task.claimed = TaskanaDate.applyTimeZone(task.claimed); }
-    if (task.created) { task.created = TaskanaDate.applyTimeZone(task.created); }
-    return task;
-  }
-
   private convertTasksDatesToGMT(task: Task): Task {
     if (task.created) { task.created = new Date(task.created).toISOString(); }
     if (task.claimed) { task.claimed = new Date(task.claimed).toISOString(); }
diff --git a/web/src/app/workplace/taskdetails/taskdetails.component.html b/web/src/app/workplace/taskdetails/taskdetails.component.html
index a83703bb8..6807901da 100644
--- a/web/src/app/workplace/taskdetails/taskdetails.component.html
+++ b/web/src/app/workplace/taskdetails/taskdetails.component.html
@@ -44,7 +44,7 @@
           <span class="float-right pull-right material-icons md-20 blue">{{accordion2State?
             'expand_more':'expand_less'}}</span>
         </button>
-        <taskana-general-fields-extension [task]="task"></taskana-general-fields-extension>
+        <taskana-general-fields-extension [task]="taskClone"></taskana-general-fields-extension>
       </accordion-group>
       <accordion-group panelClass="customClass" (isOpenChange)="accordion3State = $event">
         <button class="btn  btn-block clearfix" accordion-heading>
@@ -72,4 +72,4 @@
       </accordion-group>
     </accordion>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/web/src/app/workplace/taskdetails/taskdetails.component.ts b/web/src/app/workplace/taskdetails/taskdetails.component.ts
index d23d813c5..ee127631d 100644
--- a/web/src/app/workplace/taskdetails/taskdetails.component.ts
+++ b/web/src/app/workplace/taskdetails/taskdetails.component.ts
@@ -1,21 +1,21 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { Subscription } from 'rxjs';
-import { ActivatedRoute, Router } from '@angular/router';
+import {Component, OnDestroy, OnInit} from '@angular/core';
+import {Subscription} from 'rxjs';
+import {ActivatedRoute, Router} from '@angular/router';
 
-import { TaskService } from 'app/workplace/services/task.service';
-import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service';
+import {TaskService} from 'app/workplace/services/task.service';
+import {RemoveConfirmationService} from 'app/services/remove-confirmation/remove-confirmation.service';
 
-import { Task } from 'app/workplace/models/task';
-import { MessageModal } from 'app/models/message-modal';
-import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
-import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
-import { AlertService } from 'app/services/alert/alert.service';
-import { AlertModel, AlertType } from 'app/models/alert';
-import { TaskanaDate } from 'app/shared/util/taskana.date';
-import { ObjectReference } from 'app/workplace/models/object-reference';
-import { Workbasket } from 'app/models/workbasket';
-import { WorkplaceService } from 'app/workplace/services/workplace.service';
-import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service';
+import {Task} from 'app/workplace/models/task';
+import {MessageModal} from 'app/models/message-modal';
+import {GeneralModalService} from 'app/services/general-modal/general-modal.service';
+import {RequestInProgressService} from 'app/services/requestInProgress/request-in-progress.service';
+import {AlertService} from 'app/services/alert/alert.service';
+import {AlertModel, AlertType} from 'app/models/alert';
+import {TaskanaDate} from 'app/shared/util/taskana.date';
+import {ObjectReference} from 'app/workplace/models/object-reference';
+import {Workbasket} from 'app/models/workbasket';
+import {WorkplaceService} from 'app/workplace/services/workplace.service';
+import {MasterAndDetailService} from 'app/services/masterAndDetail/master-and-detail.service';
 
 @Component({
   selector: 'taskana-task-details',
@@ -37,14 +37,14 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
   private deleteTaskSubscription: Subscription;
 
   constructor(private route: ActivatedRoute,
-    private taskService: TaskService,
-    private workplaceService: WorkplaceService,
-    private router: Router,
-    private removeConfirmationService: RemoveConfirmationService,
-    private requestInProgressService: RequestInProgressService,
-    private alertService: AlertService,
-    private generalModalService: GeneralModalService,
-    private masterAndDetailService: MasterAndDetailService) {
+              private taskService: TaskService,
+              private workplaceService: WorkplaceService,
+              private router: Router,
+              private removeConfirmationService: RemoveConfirmationService,
+              private requestInProgressService: RequestInProgressService,
+              private alertService: AlertService,
+              private generalModalService: GeneralModalService,
+              private masterAndDetailService: MasterAndDetailService) {
   }
 
   ngOnInit() {
@@ -66,10 +66,10 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
   }
 
   resetTask(): void {
-    this.task = { ...this.taskClone };
+    this.task = {...this.taskClone};
     this.task.customAttributes = this.taskClone.customAttributes.slice(0);
     this.task.callbackInfo = this.taskClone.callbackInfo.slice(0);
-    this.task.primaryObjRef = { ...this.taskClone.primaryObjRef };
+    this.task.primaryObjRef = {...this.taskClone.primaryObjRef};
     this.alertService.triggerAlert(new AlertModel(AlertType.INFO, 'Reset edited fields'));
   }
 
@@ -97,7 +97,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
 
 
   openTask() {
-    this.router.navigate([{ outlets: { detail: `task/${this.currentId}` } }], { relativeTo: this.route.parent });
+    this.router.navigate([{outlets: {detail: `task/${this.currentId}`}}], {relativeTo: this.route.parent});
   }
 
   workOnTaskDisabled(): boolean {
@@ -128,7 +128,30 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
   backClicked(): void {
     this.task = undefined;
     this.taskService.selectTask(this.task);
-    this.router.navigate(['./'], { relativeTo: this.route.parent });
+    this.router.navigate(['./'], {relativeTo: this.route.parent});
+  }
+
+
+  private applyTaskDatesTimeZone(task: Task): Task {
+    if (task.due) {
+      task.due = TaskanaDate.applyTimeZone(task.due);
+    }
+    if (task.modified) {
+      task.modified = TaskanaDate.applyTimeZone(task.modified);
+    }
+    if (task.completed) {
+      task.completed = TaskanaDate.applyTimeZone(task.completed);
+    }
+    if (task.planned) {
+      task.planned = TaskanaDate.applyTimeZone(task.planned);
+    }
+    if (task.claimed) {
+      task.claimed = TaskanaDate.applyTimeZone(task.claimed);
+    }
+    if (task.created) {
+      task.created = TaskanaDate.applyTimeZone(task.created);
+    }
+    return task;
   }
 
   private onSave() {
@@ -158,7 +181,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
       this.task = task;
       this.taskService.selectTask(this.task);
       this.taskService.publishUpdatedTask(task);
-      this.router.navigate(['../' + task.taskId], { relativeTo: this.route });
+      this.router.navigate(['../' + task.taskId], {relativeTo: this.route});
     }, err => {
       this.requestInProgressService.setRequestInProgress(false);
       this.alertService.triggerAlert(new AlertModel(AlertType.DANGER, 'There was an error while creating a new task.'))
@@ -172,16 +195,26 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
   }
 
   private cloneTask() {
-    this.taskClone = { ...this.task };
+    this.taskClone = {...this.task};
     this.taskClone.customAttributes = this.task.customAttributes.slice(0);
     this.taskClone.callbackInfo = this.task.callbackInfo.slice(0);
-    this.taskClone.primaryObjRef = { ...this.task.primaryObjRef };
+    this.taskClone.primaryObjRef = {...this.task.primaryObjRef};
+    this.taskClone = this.applyTaskDatesTimeZone(this.taskClone);
+
   }
 
   ngOnDestroy(): void {
-    if (this.routeSubscription) { this.routeSubscription.unsubscribe(); }
-    if (this.workbasketSubscription) { this.workbasketSubscription.unsubscribe(); }
-    if (this.masterAndDetailSubscription) { this.masterAndDetailSubscription.unsubscribe(); }
-    if (this.deleteTaskSubscription) { this.deleteTaskSubscription.unsubscribe(); }
+    if (this.routeSubscription) {
+      this.routeSubscription.unsubscribe();
+    }
+    if (this.workbasketSubscription) {
+      this.workbasketSubscription.unsubscribe();
+    }
+    if (this.masterAndDetailSubscription) {
+      this.masterAndDetailSubscription.unsubscribe();
+    }
+    if (this.deleteTaskSubscription) {
+      this.deleteTaskSubscription.unsubscribe();
+    }
   }
 }