From 06fb41b5dd6e5abf8c3aba23c471d21a934ed306 Mon Sep 17 00:00:00 2001
From: Filip Izydorczyk <filip.izydorczyk@protonmail.com>
Date: Tue, 19 Jan 2021 09:32:57 +0100
Subject: [PATCH] commision controller not deleting fix

---
 .../com/plannaplan/services/AssignmentService.java    |  8 ++++++++
 .../plannaplan/controllers/CommisionController.java   | 11 ++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/buisnesslogic/src/main/java/com/plannaplan/services/AssignmentService.java b/buisnesslogic/src/main/java/com/plannaplan/services/AssignmentService.java
index a99d0ea..8103d35 100755
--- a/buisnesslogic/src/main/java/com/plannaplan/services/AssignmentService.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/services/AssignmentService.java
@@ -106,4 +106,12 @@ public class AssignmentService {
             this.emailService.sendAcceptationResult(e, new EmailAcceptedData(accepted, removed));
         });
     }
+
+    /**
+     * @param toSave list of entites to save to db
+     * @return list of assignments entities with ids from db
+     */
+    public List<Assignment> saveAll(List<Assignment> toSave) {
+        return this.repo.saveAll(toSave);
+    }
 }
diff --git a/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java b/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java
index 4c9ded1..1d9a7cd 100755
--- a/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java
+++ b/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java
@@ -110,14 +110,16 @@ public class CommisionController extends TokenBasedController {
 
                         final Optional<Commision> comPrev = this.commisionService.getNewestCommision(user);
                         final Commision com = new Commision(user, asker);
-                        this.commisionService.save(com);
 
                         final List<Long> addedGroups = new ArrayList<>();
+                        final List<Assignment> addedAssignments = new ArrayList<>();
+
                         groups.stream().forEach((groupId) -> {
                                 Groups group = this.groupServcicxe.getGroupById(groupId)
                                                 .orElseThrow(() -> new NullPointerException());
                                 Assignment a = new Assignment(group, com);
-                                this.assignmentService.save(a);
+                                addedAssignments.add(a);
+                                // this.assignmentService.save(a);
                                 addedGroups.add(groupId);
                         });
 
@@ -127,7 +129,7 @@ public class CommisionController extends TokenBasedController {
 
                                 while (it.hasNext() && !isBad) {
                                         final Assignment a = it.next();
-                                        if (a.isAccepted() && !addedGroups.contains(a.getId())) {
+                                        if (a.isAccepted() && !addedGroups.contains(a.getGroup().getId())) {
                                                 isBad = true;
                                         }
                                 }
@@ -139,6 +141,9 @@ public class CommisionController extends TokenBasedController {
                                                 HttpStatus.BAD_REQUEST);
                         }
 
+                        this.commisionService.save(com);
+                        this.assignmentService.saveAll(addedAssignments);
+
                         return new ResponseEntity<>("Succes", HttpStatus.OK);
                 } catch (UserNotFoundException exception) {
                         return new ResponseEntity<>(exception.getMessage(), HttpStatus.NOT_FOUND);