Merge pull request #349 from apeun-gidaechi/refactor/#346

�Fix :: 캐시 매니저 제거 및 grade 타입 변경
apeun-gidaechi · Nov 26, 2024 · aa025e0 · aa025e0
2 parents 25421af + 980f9e3
commit aa025e0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/kotlin/com/seugi/api/domain/schedule/domain/mapper/ScheduleMapper.kt b/src/main/kotlin/com/seugi/api/domain/schedule/domain/mapper/ScheduleMapper.kt
@@ -17,7 +17,7 @@ class ScheduleMapper : Mapper<Schedule, ScheduleEntity> {
             date = entity.date,
             eventName = entity.eventName,
             eventContent = entity.eventContent,
-            grade = entity.grade
+            grade = entity.grade.toList()
         )
     }
 
@@ -27,7 +27,7 @@ class ScheduleMapper : Mapper<Schedule, ScheduleEntity> {
             date = domain.date!!,
             eventName = domain.eventName ?: "",
             eventContent = domain.eventContent ?: "",
-            grade = domain.grade ?: emptySet()
+            grade = domain.grade?.toSet() ?: emptySet()
         )
     }
 
@@ -47,7 +47,7 @@ class ScheduleMapper : Mapper<Schedule, ScheduleEntity> {
                 date = SchoolDateConvertor.dateFormat(scheduleRow.aaYmd),
                 eventName = scheduleRow.eventNm,
                 eventContent = scheduleRow.eventCntnt,
-                grade = grade
+                grade = grade.toList()
             )
         }
     }

diff --git a/src/main/kotlin/com/seugi/api/domain/schedule/domain/model/Schedule.kt b/src/main/kotlin/com/seugi/api/domain/schedule/domain/model/Schedule.kt
@@ -6,5 +6,5 @@ data class Schedule(
     val date: String? = null,
     val eventName: String? = null,
     val eventContent: String? = null,
-    val grade: Set<Int>? = null,
+    val grade: List<Int>? = null,
 )
diff --git a/src/main/kotlin/com/seugi/api/domain/schedule/service/ScheduleServiceImpl.kt b/src/main/kotlin/com/seugi/api/domain/schedule/service/ScheduleServiceImpl.kt
@@ -49,15 +49,15 @@ class ScheduleServiceImpl(
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(value = ["schedules"] , key = "#workspaceId", cacheManager = "contentCacheManager")
+    @Cacheable(value = ["schedules"] , key = "#workspaceId")
     override fun getSchoolSchedules(userId: Long, workspaceId: String): List<Schedule> {
         return if (!scheduleRepository.existsByWorkspaceId(workspaceId)) resetSchedule(workspaceId, userId)
         else scheduleRepository.findByWorkspaceId(workspaceId).map { scheduleMapper.toDomain(it) }
 
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(value = ["schedules"] , key = "#workspaceId", cacheManager = "contentCacheManager")
+    @Cacheable(value = ["schedules"] , key = "#workspaceId")
     override fun getMonthSchoolSchedules(userId: Long, workspaceId: String, month: Int): List<Schedule> {
         return if (!scheduleRepository.existsByWorkspaceId(workspaceId)) {
             resetSchedule(workspaceId, userId).filter { sc ->