Update JSON view example with call to save() (#300)

* Update JSON view example with call to save()

* Update controller to actually use student view repo for create

---------

Co-authored-by: Gerald Venzl <gerald.venzl@oracle.com>

Author: radovanradic

java/micronaut-jsonview-demo-app/src/main/java/com/example/micronaut/Application.java

@@ -48,10 +48,10 @@ public static void main(String[] args) {
     @EventListener
     public void init(StartupEvent startupEvent) {
         // Clear the existing tables
+        studentCourseRepository.deleteAll();
         courseRepository.deleteAll();
         studentRepository.deleteAll();
         teacherRepository.deleteAll();
-        studentCourseRepository.deleteAll();
 
         // Use relational operations to insert three new rows in the STUDENT table
         Student dennis = studentRepository.save(new Student("Denis", 8.5));

java/micronaut-jsonview-demo-app/src/main/java/com/example/micronaut/controller/StudentController.java

@@ -7,15 +7,16 @@
 
 package com.example.micronaut.controller;
 
+import java.util.List;
 import java.util.Optional;
 
 import com.example.micronaut.dto.CreateStudentDto;
-import com.example.micronaut.entity.Student;
-import com.example.micronaut.entity.StudentCourse;
+import com.example.micronaut.entity.Course;
+import com.example.micronaut.entity.view.CourseView;
+import com.example.micronaut.entity.view.StudentScheduleView;
 import com.example.micronaut.entity.view.StudentView;
+import com.example.micronaut.entity.view.TeacherView;
 import com.example.micronaut.repository.CourseRepository;
-import com.example.micronaut.repository.StudentCourseRepository;
-import com.example.micronaut.repository.StudentRepository;
 import com.example.micronaut.repository.view.StudentViewRepository;
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.http.HttpStatus;
@@ -31,18 +32,14 @@
 public final class StudentController {
 
     private final CourseRepository courseRepository;
-    private final StudentRepository studentRepository;
-    private final StudentCourseRepository studentCourseRepository;
     private final StudentViewRepository studentViewRepository;
 
-    public StudentController(CourseRepository courseRepository, StudentRepository studentRepository, StudentCourseRepository studentCourseRepository, StudentViewRepository studentViewRepository) { // <2>
+    public StudentController(CourseRepository courseRepository, StudentViewRepository studentViewRepository) { // <2>
         this.courseRepository = courseRepository;
-        this.studentRepository = studentRepository;
-        this.studentCourseRepository = studentCourseRepository;
         this.studentViewRepository = studentViewRepository;
     }
 
-    @Get("/") // <3>
+    @Get // <3>
     public Iterable<StudentView> findAll() {
         return studentViewRepository.findAll();
     }
@@ -75,15 +72,16 @@ public Optional<StudentView> updateStudent(Long id, @NonNull String student) {
         });
     }
 
-    @Post("/") // <8>
+    @Post// <8>
     @Status(HttpStatus.CREATED) 
-    public Optional<StudentView> create(@NonNull @Body CreateStudentDto createDto) {
-      // Use a relational operation to insert a new row in the STUDENT table
-      Student student = studentRepository.save(new Student(createDto.student(), createDto.averageGrade()));
-      // For each of the courses in createDto parameter, insert a row in the STUDENT_COURSE table
-      courseRepository.findByNameIn(createDto.courses()).stream()
-          .forEach(course -> studentCourseRepository.save(new StudentCourse(student, course)));
-      return studentViewRepository.findByStudent(student.name());
+    public StudentView create(@NonNull @Body CreateStudentDto createDto) {
+        // Must initialize data for student view by given courses
+        List<Course> courses = courseRepository.findByNameIn(createDto.courses());
+        List<StudentScheduleView> scheduleViews = courses.stream()
+                .map(c -> new StudentScheduleView(null, new CourseView(c.id(), c.name(), new TeacherView(c.teacher().id(), c.teacher().name()), c.room(), c.time()))).toList();
+        StudentView studentView = new StudentView(createDto.student(), createDto.averageGrade(),
+                scheduleViews);
+        return studentViewRepository.save(studentView);
     }
 
     @Delete("/{id}") // <9>

java/micronaut-jsonview-demo-app/src/main/resources/application.yml

@@ -11,7 +11,7 @@ datasources:
 test-resources:
   containers:
     oracle:
-      image-name: gvenzl/oracle-free:latest-faststart
+      image-name: gvenzl/oracle-free:latest
       startup-timeout: 360s
       db-name: test
 flyway:

java/micronaut-jsonview-demo-app/src/test/java/com/example/micronaut/ApplicationTest.java

@@ -7,12 +7,19 @@
 
 package com.example.micronaut;
 
+import com.example.micronaut.dto.CreateStudentDto;
+import com.example.micronaut.entity.view.StudentView;
 import com.example.micronaut.repository.view.StudentViewRepository;
 import io.micronaut.runtime.server.EmbeddedServer;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @MicronautTest
@@ -23,4 +30,30 @@ void testStartup(EmbeddedServer embeddedServer, StudentViewRepository viewReposi
         assertTrue(viewRepository.count() > 0);
         assertFalse(viewRepository.findAll().isEmpty());
     }
+
+    @Test
+    void testCrud(StudentClient studentClient) {
+        // initially created
+        List<StudentView> studentViews = studentClient.findAll();
+        assertFalse(studentViews.isEmpty());
+        assertEquals(3, studentViews.size());
+
+        // Create new
+        CreateStudentDto createStudentDto = new CreateStudentDto("Aniko", 8.5, List.of("Math", "English"));
+        StudentView studentView = studentClient.save(createStudentDto);
+        assertNotNull(studentView);
+        assertEquals("Aniko", studentView.student());
+        // Student has two courses
+        assertEquals(2, studentView.schedule().size());
+
+        // Find by name
+        Optional<StudentView> optStudentView = studentClient.findByStudent("Aniko");
+        assertTrue(optStudentView.isPresent());
+        studentView = optStudentView.get();
+        assertEquals(8.5, studentView.averageGrade());
+
+        studentViews = studentClient.findAll();
+        // There is one more now
+        assertEquals(4, studentViews.size());
+    }
 }

java/micronaut-jsonview-demo-app/src/test/java/com/example/micronaut/StudentClient.java

@@ -0,0 +1,47 @@
+package com.example.micronaut;
+
+import com.example.micronaut.dto.CreateStudentDto;
+import com.example.micronaut.entity.view.StudentView;
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.http.HttpStatus;
+import io.micronaut.http.annotation.Body;
+import io.micronaut.http.annotation.Delete;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.Post;
+import io.micronaut.http.annotation.Put;
+import io.micronaut.http.annotation.Status;
+import io.micronaut.http.client.annotation.Client;
+import jakarta.validation.Valid;
+
+import java.util.List;
+import java.util.Optional;
+
+@SuppressWarnings("unused")
+@Client("/students")
+interface StudentClient {
+
+    @Get
+    List<StudentView> findAll();
+
+    @Get("/student/{student}")
+    Optional<StudentView> findByStudent(String student);
+
+    @Get("/{id}")
+    Optional<StudentView> findById(Long id);
+
+    @Put("/{id}/average_grade/{averageGrade}")
+    Optional<StudentView> updateAverageGrade(Long id, @NonNull Double averageGrade);
+
+    @Put("/{id}/student/{student}")
+    Optional<StudentView> updateStudent(Long id, @NonNull String student);
+
+    @Post
+    StudentView save(@Valid @Body CreateStudentDto createStudentDto);
+
+    @Delete("/{id}")
+    @Status(HttpStatus.NO_CONTENT)
+    void delete(Long id);
+
+    @Get("/max_average_grade")
+    Optional<Double> findMaxAverageGrade();
+}