nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-733 - Modify response deleteWorkbasket

This commit is contained in:
Jose Ignacio Recuerda Cambil 2018-10-15 17:25:34 +02:00 committed by Martin Rojas Miguel Angel
parent efd99b61a3
commit 55e8135cc8
5 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java
View File

@ -754,10 +754,10 @@ public class WorkbasketServiceImpl implements WorkbasketService {
if (numTasksInWorkbasket == 0) {
workbasketMapper.delete(workbasketId);
return false;
return true;
} else {
markWorkbasketForDeletion(workbasketId);
return true;
return false;
}
} finally {
taskanaEngine.returnConnection();

3
lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java
View File

@ -2,6 +2,7 @@ package acceptance.workbasket;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@ -213,7 +214,7 @@ public class DeleteWorkbasketAccTest extends AbstractAccTest {
taskService.forceCompleteTask(task.getId());
markedForDeletion = workbasketService.deleteWorkbasket(wb.getId());
assertTrue(markedForDeletion);
assertFalse(markedForDeletion);
wb = workbasketService.getWorkbasket(wb.getId());
assertTrue(wb.isMarkedForDeletion());

5
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java
View File

@ -146,10 +146,7 @@ public class WorkbasketController extends AbstractPagingController {
public ResponseEntity<?> markWorkbasketForDeletion(@PathVariable(value = "workbasketId") String workbasketId)
throws NotAuthorizedException, InvalidArgumentException,
WorkbasketNotFoundException, WorkbasketInUseException {
if (!workbasketService.deleteWorkbasket(workbasketId)) {
return new ResponseEntity<>("It not possible to mark the workbasket for deletion", HttpStatus.BAD_REQUEST);
}
return ResponseEntity.status(HttpStatus.ACCEPTED).build();
return new ResponseEntity<>(workbasketService.deleteWorkbasket(workbasketId), HttpStatus.ACCEPTED);
}
@PostMapping

21
web/src/app/administration/workbasket/details/information/workbasket-information.component.ts
View File

@ -278,18 +278,17 @@ export class WorkbasketInformationComponent
response => {
this.requestInProgressService.setRequestInProgress(false);
this.workbasketService.triggerWorkBasketSaved();
this.alertService.triggerAlert(
new AlertModel(
AlertType.SUCCESS,
'The Workbasket ' +
this.workbasket.workbasketId +
' has been marked for deletion'
)
);
if (response) {
this.errorModalService.triggerError(
new ErrorModel('There was an error marking workbasket for deletion',
'It not possible to mark the workbasket for deletion, It has been deleted.')
);
} else {
this.alertService.triggerAlert(
new AlertModel(AlertType.SUCCESS, 'The Workbasket ' + this.workbasket.workbasketId + ' has been marked for deletion')
);
}
this.router.navigate(['administration/workbaskets']);
},
error => {
this.requestInProgressService.setRequestInProgress(false);
}
);
}

5
web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.ts
View File

@ -30,10 +30,7 @@ export class HttpClientInterceptor implements HttpInterceptor {
new ErrorModel('You have no access to this resource ', error));
} else if (error instanceof HttpErrorResponse && (error.status === 404) && error.url.indexOf('environment-information.json')) {
// ignore this error message
} if (error.status === 400 && error.error.indexOf('mark')) {
this.errorModalService.triggerError(
new ErrorModel('There was error marking workbasket for deletion', error.error))
} else {
} else {
this.errorModalService.triggerError(
new ErrorModel('There was error, please contact with your administrator ', error))
}