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

Responses up[dated

Browse Source
This commit is contained in:
Filip Izydorczyk
2020-10-13 17:07:04 +02:00
parent bdd0278880
commit 148d7a31c6
12 changed files with 161 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ import com.plannaplan.entities.Assignment;
import com.plannaplan.entities.Commision;
import com.plannaplan.entities.User;
import com.plannaplan.responses.mappers.AssignmentResponseMappers;
import com.plannaplan.responses.models.AssignmentResponse;
import com.plannaplan.responses.models.GetCurrentAssignmentsResponse;
import com.plannaplan.services.AssignmentService;
import com.plannaplan.services.CommisionService;
@ -33,7 +33,7 @@ public class AssignmentsController extends TokenBasedController {
private AssignmentService assignmentService;
@GetMapping("/getCurrentAssignments")
public ResponseEntity<List<AssignmentResponse>> getCurrentAssignments() throws Exception {
public ResponseEntity<List<GetCurrentAssignmentsResponse>> getCurrentAssignments() throws Exception {
User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException("User not found"));
Optional<Commision> com = this.commisionService.getNewestCommision(user);