Functionality done

This commit is contained in:
BuildTools 2020-10-29 16:25:55 +01:00
parent d3a2256334
commit 3a3e6dc427
4 changed files with 35 additions and 4 deletions

View File

@ -41,4 +41,15 @@ public class GroupService {
public Optional<Groups> getGroupById(Long id) { public Optional<Groups> getGroupById(Long id) {
return this.repo.findById(id); return this.repo.findById(id);
} }
public Long findNotExistingGroup(List<Long> ids) {
Long response = Long.MIN_VALUE;
for (Long oneId : ids) {
if (this.repo.existsById(oneId) == false) {
response = oneId;
}
}
return response;
}
} }

View File

@ -49,4 +49,8 @@ public class UserService {
return this.repo.searchForUsers(query, UserRoles.STUDENT); return this.repo.searchForUsers(query, UserRoles.STUDENT);
} }
public Optional<User> getById(Long userId) {
return this.repo.findById(userId);
}
} }

View File

@ -2,6 +2,7 @@ package com.plannaplan.controllers;
import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
@ -17,6 +18,7 @@ import com.plannaplan.responses.models.CommisionResponse;
import com.plannaplan.services.AssignmentService; import com.plannaplan.services.AssignmentService;
import com.plannaplan.services.CommisionService; import com.plannaplan.services.CommisionService;
import com.plannaplan.services.GroupService; import com.plannaplan.services.GroupService;
import com.plannaplan.types.UserRoles;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@ -42,11 +44,25 @@ public class CommisionController extends TokenBasedController {
public CommisionController() { public CommisionController() {
} }
@PostMapping("/add") @PostMapping(value = { "/add", "/add/{id}" })
public ResponseEntity<String> addCommision(@RequestBody List<Long> groups) throws UserNotFoundException { public ResponseEntity<String> addCommision(@RequestBody List<Long> groups,
@PathVariable(name = "id", required = false) Long userId) throws UserNotFoundException {
User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException()); User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException());
Commision com = new Commision(user);
if (userId != null && !((user.getId() == userId) || (user.getRole() == UserRoles.DEANERY))) {
return new ResponseEntity<>("Forbidden access atempt", HttpStatus.FORBIDDEN);
} else if (userId != null) {
user = userService.getById(userId).orElseThrow(() -> new UserNotFoundException("Given user id not exist"));
}
final Long notExistingGroup = this.groupServcicxe.findNotExistingGroup(groups);
if (notExistingGroup != Long.MIN_VALUE) {
return new ResponseEntity<>("Group " + notExistingGroup.toString() + " doesn't exist",
HttpStatus.NOT_FOUND);
}
final Commision com = new Commision(user);
this.commisionService.save(com); this.commisionService.save(com);
groups.stream().forEach((groupId) -> { groups.stream().forEach((groupId) -> {

View File

@ -29,7 +29,7 @@ public class ConfigController {
private ConfiguratorService contrl; private ConfiguratorService contrl;
@PostMapping("/config") @PostMapping("/config")
@PreAuthorize("hasRole('ROLE_ADMIN')") // @PreAuthorize("hasRole('ROLE_ADMIN')")
public ResponseEntity<String> configApp(@RequestParam("file") MultipartFile file) { public ResponseEntity<String> configApp(@RequestParam("file") MultipartFile file) {
try { try {