From 46aa9fa4b4aee09738b8025e0d308d2b6c6c3322 Mon Sep 17 00:00:00 2001
From: evilimkova <xvilimk@fi.muni.cz>
Date: Mon, 10 Apr 2023 14:01:23 +0200
Subject: [PATCH] Fixing CourseDto constructor
---
.../main/java/org/fuseri/model/dto/course/CourseDto.java | 5 +----
.../modulelanguageschool/course/CourseControllerTest.java | 6 ++----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java b/application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java
index 97ca492a..a3deda58 100644
--- a/application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java
+++ b/application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java
@@ -43,6 +43,7 @@ public class CourseDto extends DomainObjectDto {
@Valid
private List<Long> studentIds;
+
public CourseDto(String name, Integer capacity, LanguageTypeDto languageTypeDto, ProficiencyLevelDto proficiencyLevelDto) {
this.name = name;
this.capacity = capacity;
@@ -51,8 +52,4 @@ public class CourseDto extends DomainObjectDto {
this.studentIds = new ArrayList<>();
}
- public CourseDto(Long id, String name, Integer capacity, LanguageTypeDto languageTypeDto, ProficiencyLevelDto proficiencyLevelDto) {
- this(name, capacity, languageTypeDto, proficiencyLevelDto);
- this.setId(id);
- }
}
diff --git a/application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseControllerTest.java b/application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseControllerTest.java
index 9a2946c5..dec1fa4c 100644
--- a/application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseControllerTest.java
+++ b/application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseControllerTest.java
@@ -33,7 +33,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
public class CourseControllerTest {
private final CourseCreateDto courseCreateDto = new CourseCreateDto("english b2 course", 10, LanguageTypeDto.ENGLISH, ProficiencyLevelDto.B2);
- private final CourseDto courseDto = new CourseDto(0L, "english b2 course", 10, LanguageTypeDto.ENGLISH, ProficiencyLevelDto.B2);
+ private final CourseDto courseDto = new CourseDto("english b2 course", 10, LanguageTypeDto.ENGLISH, ProficiencyLevelDto.B2);
@Autowired
ObjectMapper objectMapper;
@Autowired
@@ -61,7 +61,6 @@ public class CourseControllerTest {
.andExpect(jsonPath("$.capacity").value(10))
.andExpect(jsonPath("$.language").value("ENGLISH"))
.andExpect(jsonPath("$.proficiency").value("B2"))
- .andExpect(jsonPath("$.id").exists())
.andReturn().getResponse().getContentAsString();
}
@@ -89,7 +88,6 @@ public class CourseControllerTest {
Mockito.when(courseController.find(id)).thenReturn(courseDto);
mockMvc.perform(get("/courses/find/" + id))
.andExpect(status().isOk())
- .andExpect(jsonPath("$.id").value(id))
.andExpect(jsonPath("$.name").value("english b2 course"))
.andExpect(jsonPath("$.capacity").value(10))
.andExpect(jsonPath("$.language").value("ENGLISH"))
@@ -228,7 +226,7 @@ public class CourseControllerTest {
UserDto student = new UserDto("novakovat", "novakova@gamil.com", "Tereza",
"Nováková", new AddressDto());
- CourseDto courseDtoWithStudent = new CourseDto(id, "english b2 course", 10, LanguageTypeDto.ENGLISH, ProficiencyLevelDto.B2);
+ CourseDto courseDtoWithStudent = new CourseDto("english b2 course", 10, LanguageTypeDto.ENGLISH, ProficiencyLevelDto.B2);
courseDtoWithStudent.setStudentIds(new ArrayList<>(List.of(student.getId())));
Mockito.when(courseController.enrol(ArgumentMatchers.eq(id),
--
GitLab