Merge branch 'develop'

team-aliens · Sep 21, 2024 · 8ce6bbb · 8ce6bbb
2 parents e041865 + 9b4f349
commit 8ce6bbb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...sistence/src/main/kotlin/team/aliens/dms/persistence/student/StudentPersistenceAdapter.kt b/...sistence/src/main/kotlin/team/aliens/dms/persistence/student/StudentPersistenceAdapter.kt
@@ -375,8 +375,13 @@ class StudentPersistenceAdapter(
             )
             .from(studentJpaEntity)
             .where(
-                studentJpaEntity.user.school.id.eq(schoolId)
-                    .and(name?.let { studentJpaEntity.name.contains(it) })
+                studentJpaEntity.user.school.id.eq(schoolId),
+                name?.let { studentJpaEntity.name.contains(it) }
+            )
+            .orderBy(
+                studentJpaEntity.grade.asc(),
+                studentJpaEntity.classRoom.asc(),
+                studentJpaEntity.number.asc()
             )
             .fetch()
     }

diff --git a/dms-presentation/src/main/kotlin/team/aliens/dms/domain/student/StudentWebAdapter.kt b/dms-presentation/src/main/kotlin/team/aliens/dms/domain/student/StudentWebAdapter.kt
@@ -245,7 +245,6 @@ class StudentWebAdapter(
         )
     }
 
-    @Cacheable
     @GetMapping
     fun studentGetAllStudents(@RequestParam(required = false) name: String?): StudentsResponse {
         return studentGetAllStudentsUseCase.execute(name)