Skip to content

Commit 8ce6bbb

Browse files
committed
Merge branch 'develop'
2 parents e041865 + 9b4f349 commit 8ce6bbb

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

dms-persistence/src/main/kotlin/team/aliens/dms/persistence/student/StudentPersistenceAdapter.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,13 @@ class StudentPersistenceAdapter(
375375
)
376376
.from(studentJpaEntity)
377377
.where(
378-
studentJpaEntity.user.school.id.eq(schoolId)
379-
.and(name?.let { studentJpaEntity.name.contains(it) })
378+
studentJpaEntity.user.school.id.eq(schoolId),
379+
name?.let { studentJpaEntity.name.contains(it) }
380+
)
381+
.orderBy(
382+
studentJpaEntity.grade.asc(),
383+
studentJpaEntity.classRoom.asc(),
384+
studentJpaEntity.number.asc()
380385
)
381386
.fetch()
382387
}

dms-presentation/src/main/kotlin/team/aliens/dms/domain/student/StudentWebAdapter.kt

-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ class StudentWebAdapter(
245245
)
246246
}
247247

248-
@Cacheable
249248
@GetMapping
250249
fun studentGetAllStudents(@RequestParam(required = false) name: String?): StudentsResponse {
251250
return studentGetAllStudentsUseCase.execute(name)

0 commit comments

Comments
 (0)