filipizydorczyk/backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made ASsignm,ents Conmtroller more readable

Browse Source
This commit is contained in:
Filip Izydorczyk
2020-10-08 16:41:13 +02:00
parent 9d97306e5c
commit f97e22fa5f
5 changed files with 90 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
restservice/src/main/java/com/plannaplan/controllers/AssignmentsController.java
View File

@ -4,17 +4,15 @@ import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
import java.util.Optional;
import com.plannaplan.App;
import com.plannaplan.entities.Assignment;
import com.plannaplan.entities.Commision;
import com.plannaplan.entities.Groups;
import com.plannaplan.entities.User;
import com.plannaplan.responses.mappers.AssignmentResponseMappers;
import com.plannaplan.responses.models.AssignmentResponse;
import com.plannaplan.services.AssignmentService;
import com.plannaplan.services.CommisionService;
@ -35,30 +33,14 @@ public class AssignmentsController extends TokenBasedController {
private AssignmentService assignmentService;
@GetMapping("/getCurrentAssignments")
public ResponseEntity<List<Object>> getCurrentAssignments() throws Exception {
User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException());
public ResponseEntity<List<AssignmentResponse>> getCurrentAssignments() throws Exception {
User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException("User not found"));
Optional<Commision> com = this.commisionService.getNewestCommision(user);
if (com.isPresent()) {
List<Assignment> respone = this.assignmentService.getCommisionAssignments(com.get());
List<Object> finalResponse = new ArrayList<>();
for (Assignment a : respone) {
Dictionary<String, Object> elem = new Hashtable<>();
Dictionary<String, Object> groupInfo = new Hashtable<>();
elem.put("id", a.getId());
Groups g = a.getGroup();
groupInfo.put("id", g.getId());
groupInfo.put("day", g.getDay().label);
groupInfo.put("time", g.getTimeString());
groupInfo.put("lecturer", g.getLecturer().toString());
groupInfo.put("room", g.getRoom());
groupInfo.put("capacity", g.getCapacity());
groupInfo.put("type", g.getType());
elem.put("group", groupInfo);
finalResponse.add(elem);
}
return new ResponseEntity<>(finalResponse, HttpStatus.OK);
return new ResponseEntity<>(AssignmentResponseMappers.mapAssignmentsListToAssignmentResponseList(respone),
HttpStatus.OK);
}
return new ResponseEntity<>(null, HttpStatus.OK);