Merge pull request #119 from wafflestudio/feat/admin

fix: period event errors

Author: subir-sh

hangsha/batch/src/main/kotlin/com/team1/hangsha/batch/crawler/ExtraSnuCrawler.kt

@@ -67,14 +67,11 @@ class ExtraSnuCrawler(
             .filter { !it.title.isNullOrBlank() }
     }
 
-    /**
-     * ✅ 상세 크롤링 (조건부 실행 지원)
-     * - init 모드에서 "모집마감" 스킵 같은 정책을 main에서 람다로 주입 가능
-     */
     fun enrichDetails(
         events: List<ProgramEvent>,
         ociUploadService: OciUploadService,
-        shouldFetch: (ProgramEvent) -> Boolean = { true }
+        shouldFetch: (ProgramEvent) -> Boolean = { true },
+        shouldUseDetailSessions: (ProgramEvent) -> Boolean = { true },
     ): List<ProgramEvent> {
         return events.map { e ->
             val dataSeq = e.dataSeq
@@ -88,7 +85,9 @@ class ExtraSnuCrawler(
                 cookieHeader = buildCookieHeader()
             )
 
-            if (parsed.sessions.isEmpty()) { // fallback once
+            val useDetailSessions = shouldUseDetailSessions(e)
+
+            if (useDetailSessions && parsed.sessions.isEmpty()) {
                 val html2 = fetchDetailPageByPlaywright(dataSeq)
                 if (html2 != null) {
                     parsed = parseDetailData(
@@ -100,7 +99,11 @@ class ExtraSnuCrawler(
             }
 
             if (delayMsBetweenDetails > 0) Thread.sleep(delayMsBetweenDetails)
-            e.copy(detailSessions = parsed.sessions, mainContentHtml = parsed.mainContentHtml)
+
+            e.copy(
+                mainContentHtml = parsed.mainContentHtml,
+                detailSessions = if (useDetailSessions) parsed.sessions else emptyList()
+            )
         }
     }
 

hangsha/batch/src/main/kotlin/com/team1/hangsha/batch/job/ExtraSnuSyncRunner.kt

@@ -52,9 +52,12 @@ class ExtraSnuSyncRunner(
                 val events = if (!opt.withDetails) {
                     baseEvents
                 } else {
-                    crawler.enrichDetails(baseEvents, ociUploadService) { e ->
-                        !e.isPeriodEventFromList()
-                    }
+                    crawler.enrichDetails(
+                        events = baseEvents,
+                        ociUploadService = ociUploadService,
+                        shouldFetch = { true },
+                        shouldUseDetailSessions = { e -> !e.isPeriodEventFromList() }
+                    )
                 }
 
                 // dumpOnly 여부와 상관없이 이미지 업로드는 항상 수행한다.
@@ -148,8 +151,10 @@ private fun ProgramEvent.isPeriodEventFromList(): Boolean {
     )
 }
 
-private fun ProgramEvent.toCrawledProgramEvent(): CrawledProgramEvent =
-    CrawledProgramEvent(
+private fun ProgramEvent.toCrawledProgramEvent(): CrawledProgramEvent {
+    val isPeriodEvent = isPeriodEventFromList()
+
+    return CrawledProgramEvent(
         dataSeq = dataSeq,
         majorTypes = majorTypes,
         title = title,
@@ -164,8 +169,14 @@ private fun ProgramEvent.toCrawledProgramEvent(): CrawledProgramEvent =
         imageUrl = imageUrl,
         tags = tags,
         mainContentHtml = mainContentHtml,
-        detailSessions = detailSessions.map { it.toCrawledDetailSession() }
+        isPeriodEvent = isPeriodEvent,
+        detailSessions = if (isPeriodEvent) {
+            emptyList()
+        } else {
+            detailSessions.map { it.toCrawledDetailSession() }
+        }
     )
+}
 
 private fun DetailSession.toCrawledDetailSession(): CrawledDetailSession =
     CrawledDetailSession(

hangsha/common/src/main/kotlin/com/team1/hangsha/event/dto/core/CrawledDtos.kt

@@ -17,6 +17,7 @@ data class CrawledProgramEvent(
     val imageUrl: String? = null,
     val tags: List<String> = emptyList(),
     val mainContentHtml: String? = null,
+    val isPeriodEvent: Boolean? = null,
     val detailSessions: List<CrawledDetailSession> = emptyList(),
 )
 

hangsha/common/src/main/kotlin/com/team1/hangsha/event/service/EventSyncService.kt

@@ -54,7 +54,11 @@ class EventSyncService(
             val applyStart = e.applyStart?.let { dateStart(it) }
             val applyEnd = e.applyEnd?.let { dateEnd(it) }
 
-            val sessions = patchSessionTimesFromMainContent(e.detailSessions, e.mainContentHtml)
+            val sessions = if (e.isPeriodEvent == true) {
+                emptyList()
+            } else {
+                patchSessionTimesFromMainContent(e.detailSessions, e.mainContentHtml)
+            }
             val hasExistingForApplyLink = eventRepository.existsByApplyLink(applyLink)
 
             data class UnitSpec(
@@ -110,11 +114,12 @@ class EventSyncService(
                     .toList()
 
                 val title = e.title!!.trim()
-                val isPeriodEvent = EventPeriodPolicy.isPeriodEvent(
-                    title = title,
-                    eventStart = eventStart,
-                    eventEnd = eventEnd,
-                )
+                val isPeriodEvent =
+                    e.isPeriodEvent == true || EventPeriodPolicy.isPeriodEvent(
+                        title = title,
+                        eventStart = eventStart,
+                        eventEnd = eventEnd,
+                    )
 
                 val model = Event(
                     id = existing?.id,