diff --git a/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java b/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java index 9813008..be5a014 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java @@ -9,7 +9,7 @@ import com.plannaplan.App; import com.plannaplan.entities.Course; import com.plannaplan.entities.Groups; import com.plannaplan.responses.mappers.CoursesResponseMappers; -import com.plannaplan.responses.models.CoursesResponse; +import com.plannaplan.responses.models.GetCoursesResponse; import com.plannaplan.services.CourseService; import org.springframework.beans.factory.annotation.Autowired; @@ -28,9 +28,9 @@ public class CoursesController { private CourseService courseService; @GetMapping("/getCourses") - public ResponseEntity> getMethodName() { + public ResponseEntity> getMethodName() { List courses = this.courseService.getAllCourses(); - List response = CoursesResponseMappers.mapCoursesListToCoursesResponseList(courses); + List response = CoursesResponseMappers.mapCoursesListToCoursesResponseList(courses); return new ResponseEntity<>(response, HttpStatus.OK); } diff --git a/restservice/src/main/java/com/plannaplan/responses/mappers/CoursesResponseMappers.java b/restservice/src/main/java/com/plannaplan/responses/mappers/CoursesResponseMappers.java index 304018f..0e58eee 100755 --- a/restservice/src/main/java/com/plannaplan/responses/mappers/CoursesResponseMappers.java +++ b/restservice/src/main/java/com/plannaplan/responses/mappers/CoursesResponseMappers.java @@ -5,10 +5,10 @@ import java.util.Objects; import java.util.stream.Collectors; import com.plannaplan.entities.Course; -import com.plannaplan.responses.models.CoursesResponse; +import com.plannaplan.responses.models.GetCoursesResponse; public class CoursesResponseMappers { - public static final List mapCoursesListToCoursesResponseList(List courses) { - return courses.stream().filter(Objects::nonNull).map(CoursesResponse::new).collect(Collectors.toList()); + public static final List mapCoursesListToCoursesResponseList(List courses) { + return courses.stream().filter(Objects::nonNull).map(GetCoursesResponse::new).collect(Collectors.toList()); } } diff --git a/restservice/src/main/java/com/plannaplan/responses/models/CoursesResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/CoursesResponse.java index 092ea33..6e50258 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/CoursesResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/CoursesResponse.java @@ -2,7 +2,7 @@ package com.plannaplan.responses.models; import com.plannaplan.entities.Course; -public class CoursesResponse { +public abstract class CoursesResponse { private Long id; private String name; diff --git a/restservice/src/main/java/com/plannaplan/responses/models/GetCoursesResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/GetCoursesResponse.java new file mode 100755 index 0000000..eb9ffde --- /dev/null +++ b/restservice/src/main/java/com/plannaplan/responses/models/GetCoursesResponse.java @@ -0,0 +1,11 @@ +package com.plannaplan.responses.models; + +import com.plannaplan.entities.Course; + +public class GetCoursesResponse extends CoursesResponse { + + public GetCoursesResponse(Course course) { + super(course); + } + +} diff --git a/restservice/src/test/java/com/plannaplan/responses/mappers/CoursesResponseMappersTest.java b/restservice/src/test/java/com/plannaplan/responses/mappers/CoursesResponseMappersTest.java index 014fdff..5e99cce 100755 --- a/restservice/src/test/java/com/plannaplan/responses/mappers/CoursesResponseMappersTest.java +++ b/restservice/src/test/java/com/plannaplan/responses/mappers/CoursesResponseMappersTest.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.List; import com.plannaplan.entities.Course; -import com.plannaplan.responses.models.CoursesResponse; +import com.plannaplan.responses.models.GetCoursesResponse; import org.junit.Test; @@ -14,10 +14,10 @@ public class CoursesResponseMappersTest { @Test public void shouldMapListCoursesToResponseList() { final List courses = Arrays.asList(new Course(), new Course()); - final List response = CoursesResponseMappers.mapCoursesListToCoursesResponseList(courses); + final List response = CoursesResponseMappers.mapCoursesListToCoursesResponseList(courses); assertTrue(response.size() == 2); - assertTrue(response.get(0) instanceof CoursesResponse); + assertTrue(response.get(0) instanceof GetCoursesResponse); } } diff --git a/restservice/src/test/java/com/plannaplan/responses/models/CoursesResponseTest.java b/restservice/src/test/java/com/plannaplan/responses/models/GetCoursesResponseTest.java similarity index 75% rename from restservice/src/test/java/com/plannaplan/responses/models/CoursesResponseTest.java rename to restservice/src/test/java/com/plannaplan/responses/models/GetCoursesResponseTest.java index cb8cee4..39f8b72 100755 --- a/restservice/src/test/java/com/plannaplan/responses/models/CoursesResponseTest.java +++ b/restservice/src/test/java/com/plannaplan/responses/models/GetCoursesResponseTest.java @@ -6,11 +6,11 @@ import com.plannaplan.entities.Course; import org.junit.Test; -public class CoursesResponseTest { +public class GetCoursesResponseTest { @Test public void shouldMapFilledCourse() { final Course course = new Course("Test", "XD"); - final CoursesResponse response = new CoursesResponse(course); + final GetCoursesResponse response = new GetCoursesResponse(course); assertTrue(response.getId() == null); assertTrue(response.getName().equals("Test")); @@ -19,7 +19,7 @@ public class CoursesResponseTest { @Test public void shouldMapEmptyCourse() { final Course course = new Course(); - final CoursesResponse response = new CoursesResponse(course); + final GetCoursesResponse response = new GetCoursesResponse(course); assertTrue(response.getId() == null); assertTrue(response.getName().equals(""));