diff --git a/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java b/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java index 30a703f..ee12862 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java @@ -88,6 +88,14 @@ public class ExchangeController extends TokenBasedController { final Assignment assignmentInstance = assignment.get(); final Groups groupInstance = group.get(); + if (assignmentInstance.getGroup().getCourseId().getId() != groupInstance.getCourseId().getId()) { + return new ResponseEntity<>("You can performe exchange only within one course.", HttpStatus.BAD_REQUEST); + } + + if (assignmentInstance.getGroup().getType() != groupInstance.getType()) { + return new ResponseEntity<>("You can't exchange lecture to class and otherwise.", HttpStatus.BAD_REQUEST); + } + if (!(assignmentInstance.getCommision().getCommisionOwner().getId().equals(asker.getId()) && assignmentInstance.isAccepted())) { return new ResponseEntity<>(