Fix types and tests

Author: gavlyukovskiy

src/test/java/net/hackyourfuture/coursehub/CourseControllerEndToEndTest.java

@@ -1,6 +1,8 @@
 package net.hackyourfuture.coursehub;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.IntNode;
+import com.fasterxml.jackson.databind.node.TextNode;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.server.LocalServerPort;
@@ -10,6 +12,7 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 
+import static io.micrometer.common.util.StringUtils.isNotEmpty;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -45,18 +48,23 @@ void shouldReturnJsonResponseWithDemoData() throws Exception {
 
             assertThat(response.body()).isNotNull();
             var jsonNode = objectMapper.readTree(response.body());
-            assertThat(jsonNode)
-                    .extracting(node -> node.get("courses"))
+            assertThat(jsonNode.get("courses"))
                     .isNotEmpty()
                     .anySatisfy(course -> {
                         assertThat(course.get("name").asText()).isEqualTo("Introduction to Calculus");
                         assertThat(course.get("description").asText()).isEqualTo("Fundamental concepts of calculus including limits, derivatives, and integrals.");
                         assertThat(course.get("instructor").asText()).isEqualTo("Alan Murray");
+                        assertThat(course.get("startDate").asText()).isEqualTo("2024-09-01");
+                        assertThat(course.get("endDate").asText()).isEqualTo("2024-12-15");
+                        assertThat(course.get("maxEnrollments").asInt()).isEqualTo(30);
                     })
                     .anySatisfy(course -> {
                         assertThat(course.get("name").asText()).isEqualTo("General Physics I");
                         assertThat(course.get("description").asText()).isEqualTo("Mechanics, motion, energy, and basic physical laws.");
                         assertThat(course.get("instructor").asText()).isEqualTo("Brenda Stone");
+                        assertThat(course.get("startDate").asText()).isEqualTo("2024-09-01");
+                        assertThat(course.get("endDate").asText()).isEqualTo("2024-12-15");
+                        assertThat(course.get("maxEnrollments").asInt()).isEqualTo(28);
                     });
         }
     }

src/test/java/net/hackyourfuture/coursehub/service/CourseServiceIntegrationTest.java

@@ -57,13 +57,13 @@ void setUp() {
         courseRepository.insertCourse(
                 new CourseEntity(
                         null, "Test Course 1", "Description 1", instructor1.instructorId(),
-                        LocalDate.now(), LocalDate.now().plusDays(30)
+                        LocalDate.now(), LocalDate.now().plusDays(30), 30
                 ));
 
         courseRepository.insertCourse(
                 new CourseEntity(
                         null, "Test Course 2", "Description 2", instructor2.instructorId(),
-                        LocalDate.now(), LocalDate.now().plusDays(60)
+                        LocalDate.now(), LocalDate.now().plusDays(60), 50
                 ));
     }
 
@@ -75,12 +75,18 @@ void shouldReturnCourses() {
                 .contains(new CourseDto(
                         "Test Course 1",
                         "Description 1",
-                        "Test Instructor 1"
+                        "Test Instructor 1",
+                        LocalDate.now(),
+                        LocalDate.now().plusDays(30),
+                        30
                 ))
                 .contains(new CourseDto(
                         "Test Course 2",
                         "Description 2",
-                        "Test Instructor 2"
+                        "Test Instructor 2",
+                        LocalDate.now(),
+                        LocalDate.now().plusDays(60),
+                        50
                 ));
     }
 }

src/test/java/net/hackyourfuture/coursehub/service/CourseServiceTest.java

@@ -35,30 +35,30 @@ void shouldReturnCoursesWithInstructorNames() {
         CourseService courseService = new CourseService(courseRepository, instructorRepository);
 
         when(courseRepository.findAll()).thenReturn(List.of(
-            new CourseEntity(1L, "Testing course", "A course about testing", 1L, LocalDate.of(2026, Month.JANUARY, 15), LocalDate.of(2026, Month.MARCH, 1)),
-            new CourseEntity(2L, "Spring course", "A course about using Spring Boot", 2L, LocalDate.of(2026, Month.MAY, 1), LocalDate.of(2026, Month.SEPTEMBER, 1))
+            new CourseEntity(1, "Testing course", "A course about testing", 1, LocalDate.of(2026, Month.JANUARY, 15), LocalDate.of(2026, Month.MARCH, 1), 30),
+            new CourseEntity(2, "Spring course", "A course about using Spring Boot", 2, LocalDate.of(2026, Month.MAY, 1), LocalDate.of(2026, Month.SEPTEMBER, 1), 50)
         ));
-        when(instructorRepository.findById(1L))
-                .thenReturn(new InstructorEntity(1L, "Alice", "Smith", "[email protected]"));
-        when(instructorRepository.findById(2L))
-                .thenReturn(new InstructorEntity(1L, "Bob", "Johnson", "[email protected]"));
+        when(instructorRepository.findById(1))
+                .thenReturn(new InstructorEntity(1, "Alice", "Smith", "[email protected]"));
+        when(instructorRepository.findById(2))
+                .thenReturn(new InstructorEntity(1, "Bob", "Johnson", "[email protected]"));
 
         var courses = courseService.getAllCourses();
 
         assertThat(courses)
                 .hasSize(2)
-                .contains(new CourseDto("Testing course", "A course about testing", "Alice Smith"))
-                .contains(new CourseDto("Spring course", "A course about using Spring Boot", "Bob Johnson"));
+                .contains(new CourseDto("Testing course", "A course about testing", "Alice Smith", LocalDate.of(2026, Month.JANUARY, 15), LocalDate.of(2026, Month.MARCH, 1), 30))
+                .contains(new CourseDto("Spring course", "A course about using Spring Boot", "Bob Johnson", LocalDate.of(2026, Month.MAY, 1), LocalDate.of(2026, Month.SEPTEMBER, 1), 50));
     }
 
     @Test
     void shouldFailIfCourseExistsWithoutAnInstructor() {
         CourseService courseService = new CourseService(courseRepository, instructorRepository);
 
         when(courseRepository.findAll()).thenReturn(List.of(
-                new CourseEntity(1L, "Testing course", "A course about testing", 1L, LocalDate.of(2026, Month.JANUARY, 15), LocalDate.of(2026, Month.MARCH, 1))
+                new CourseEntity(1, "Testing course", "A course about testing", 1, LocalDate.of(2026, Month.JANUARY, 15), LocalDate.of(2026, Month.MARCH, 1), 30)
         ));
-        when(instructorRepository.findById(1L)).thenReturn(null);
+        when(instructorRepository.findById(1)).thenReturn(null);
 
         assertThatThrownBy(courseService::getAllCourses)
                 .hasMessage("Instructor with id 1 not found");