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

Little refactor

Browse Source
This commit is contained in:
Filip Izydorczyk
2020-10-13 17:13:43 +02:00
parent 148d7a31c6
commit 932e1a8830
9 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,8 +39,7 @@ public class AssignmentsController extends TokenBasedController {
if (com.isPresent()) {
List<Assignment> respone = this.assignmentService.getCommisionAssignments(com.get());
return new ResponseEntity<>(AssignmentResponseMappers.mapAssignmentsListToAssignmentResponseList(respone),
HttpStatus.OK);
return new ResponseEntity<>(AssignmentResponseMappers.mapToResponse(respone), HttpStatus.OK);
}
return new ResponseEntity<>(null, HttpStatus.OK);

25
restservice/src/main/java/com/plannaplan/controllers/CoursesController.java
View File

@ -27,7 +27,7 @@ public class CoursesController {
@GetMapping("/getCourses")
public ResponseEntity<List<GetCoursesResponse>> getMethodName() {
List<Course> courses = this.courseService.getAllCourses();
List<GetCoursesResponse> response = CoursesResponseMappers.mapCoursesListToCoursesResponseList(courses);
List<GetCoursesResponse> response = CoursesResponseMappers.mapToGetCoursesResponse(courses);
return new ResponseEntity<>(response, HttpStatus.OK);
}
@ -35,30 +35,9 @@ public class CoursesController {
public ResponseEntity<List<GetCoursesWithGroupsResponse>> getCoursesWithGroups() {
final List<Course> courses = this.courseService.getAllCourses();
final List<GetCoursesWithGroupsResponse> response = CoursesResponseMappers
.mapCoursesWithGrtoupsListToCoursesResponseList(courses);
.mapToGetCoursesWithGroupsResponse(courses);
return new ResponseEntity<>(response, HttpStatus.OK);
// for (Course c : courses) {
// Dictionary<String, Object> element = new Hashtable<>();
// element.put("id", c.getId());
// element.put("name", c.getName());
// List<Dictionary<String, Object>> groups = new ArrayList<>();
// for (Groups g : c.getGroups()) {
// Dictionary<String, Object> group = new Hashtable<>();
// group.put("id", g.getId());
// group.put("day", g.getDay().label);
// group.put("time", g.getTimeString());
// group.put("lecturer", g.getLecturer().toString());
// group.put("room", g.getRoom());
// group.put("type", g.getType());
// groups.add(group);
// }
// element.put("groups", groups);
// response.add(element);
// }
// return new ResponseEntity<>(response, HttpStatus.OK);
}
}