0513 출시 전 prod 배포

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

@@ -7,12 +7,14 @@ import com.team1.hangsha.batch.crawler.ProgramEvent
 import com.team1.hangsha.common.upload.OciUploadService
 import com.team1.hangsha.event.dto.core.CrawledDetailSession
 import com.team1.hangsha.event.dto.core.CrawledProgramEvent
+import com.team1.hangsha.event.model.EventPeriodPolicy
 import com.team1.hangsha.event.service.EventSyncService
 import org.springframework.boot.ApplicationArguments
 import org.springframework.boot.ApplicationRunner
 import org.springframework.stereotype.Component
 import java.nio.file.Files
 import java.nio.file.Path
+import java.time.LocalDate
 import kotlin.system.exitProcess
 
 @Component
@@ -50,7 +52,12 @@ class ExtraSnuSyncRunner(
                 val events = if (!opt.withDetails) {
                     baseEvents
                 } else {
-                    crawler.enrichDetails(baseEvents, ociUploadService) // { e -> e.status != "모집마감" } // @TODO: 위의 0001, 0002, ... 와 같이 매직 넘버라, ENUM화?
+                    crawler.enrichDetails(
+                        events = baseEvents,
+                        ociUploadService = ociUploadService,
+                        shouldFetch = { true },
+                        shouldUseDetailSessions = { e -> !e.isPeriodEventFromList() }
+                    )
                 }
 
                 // dumpOnly 여부와 상관없이 이미지 업로드는 항상 수행한다.
@@ -132,8 +139,27 @@ private data class BatchArgs(
     }
 }
 
-private fun ProgramEvent.toCrawledProgramEvent(): CrawledProgramEvent =
-    CrawledProgramEvent(
+private fun String?.toLocalDateOrNull(): LocalDate? =
+    this?.trim()
+        ?.takeIf { it.isNotBlank() }
+        ?.let { runCatching { LocalDate.parse(it) }.getOrNull() }
+
+private fun ProgramEvent.isPeriodEventFromList(): Boolean {
+    val title = title?.trim().orEmpty()
+    val eventStart = activityStart.toLocalDateOrNull()?.atStartOfDay()
+    val eventEnd = activityEnd.toLocalDateOrNull()?.atTime(23, 59, 59)
+
+    return EventPeriodPolicy.isPeriodEvent(
+        title = title,
+        eventStart = eventStart,
+        eventEnd = eventEnd,
+    )
+}
+
+private fun ProgramEvent.toCrawledProgramEvent(): CrawledProgramEvent {
+    val isPeriodEvent = isPeriodEventFromList()
+
+    return CrawledProgramEvent(
         dataSeq = dataSeq,
         majorTypes = majorTypes,
         title = title,
@@ -148,8 +174,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/dto/request/EventCreateRequest.kt

@@ -0,0 +1,28 @@
+package com.team1.hangsha.event.dto.request
+
+import java.time.LocalDateTime
+
+data class EventCreateRequest(
+    val title: String,
+    val imageUrl: String? = null,
+    val operationMode: String? = null,
+
+    val tags: List<String>? = null,
+    val mainContentHtml: String? = null,
+
+    val statusId: Long? = null,
+    val eventTypeId: Long? = null,
+    val orgId: Long? = null,
+
+    val applyStart: LocalDateTime? = null,
+    val applyEnd: LocalDateTime? = null,
+    val eventStart: LocalDateTime? = null,
+    val eventEnd: LocalDateTime? = null,
+
+    val capacity: Int? = null,
+    val applyCount: Int? = null,
+
+    val organization: String? = null,
+    val location: String? = null,
+    val applyLink: String? = null,
+)

hangsha/common/src/main/kotlin/com/team1/hangsha/event/dto/request/EventOverrideUpdateRequest.kt

@@ -0,0 +1,6 @@
+package com.team1.hangsha.event.dto.request
+
+data class EventOverrideUpdateRequest(
+    val lockFields: List<String> = emptyList(),
+    val unlockFields: List<String> = emptyList(),
+)

hangsha/common/src/main/kotlin/com/team1/hangsha/event/model/AdminOverrideField.kt

@@ -0,0 +1,20 @@
+package com.team1.hangsha.event.model
+
+enum class AdminOverrideField {
+    TITLE,
+    IMAGE_URL,
+    OPERATION_MODE,
+    TAGS,
+    MAIN_CONTENT_HTML,
+    STATUS_ID,
+    EVENT_TYPE_ID,
+    ORG_ID,
+    APPLY_START,
+    APPLY_END,
+    EVENT_START,
+    EVENT_END,
+    CAPACITY,
+    APPLY_COUNT,
+    ORGANIZATION,
+    LOCATION,
+}

hangsha/common/src/main/kotlin/com/team1/hangsha/event/model/Event.kt

@@ -31,6 +31,9 @@ data class Event(
 
     val isPeriodEvent: Boolean = false,
 
+    val adminOverriddenFields: String? = null,
+    val adminDeleted: Boolean = false,
+
     val capacity: Int? = null,
     val applyCount: Int = 0,
 

hangsha/common/src/main/kotlin/com/team1/hangsha/event/repository/EventRepository.kt

@@ -32,9 +32,14 @@ interface EventRepository : CrudRepository<Event, Long> {
         """
     UPDATE events
     SET status_id = :closedStatusId
-    WHERE status_id = :recruitingStatusId
+    WHERE admin_deleted = false
+      AND status_id = :recruitingStatusId
       AND apply_end IS NOT NULL
       AND apply_end < :now
+      AND (
+        admin_overridden_fields IS NULL
+        OR JSON_CONTAINS(admin_overridden_fields, JSON_QUOTE('statusId')) = 0
+      )
     """
     )
     fun closeExpiredRecruitingEvents(
@@ -43,6 +48,43 @@ interface EventRepository : CrudRepository<Event, Long> {
         @Param("now") now: LocalDateTime,
     ): Int
 
+    @Query(
+        """
+    select count(*) > 0
+    from events
+    where apply_link = :applyLink
+      and admin_deleted = true
+    """
+    )
+    fun existsAdminDeletedByApplyLink(
+        @Param("applyLink") applyLink: String,
+    ): Boolean
+
+    @Query(
+        """
+    select *
+    from events
+    where id = :eventId
+      and admin_deleted = false
+    limit 1
+    """
+    )
+    fun findVisibleById(
+        @Param("eventId") eventId: Long,
+    ): Event?
+
+    @Modifying
+    @Query(
+        """
+    update events
+    set admin_deleted = true
+    where id = :eventId
+    """
+    )
+    fun softDeleteById(
+        @Param("eventId") eventId: Long,
+    ): Int
+
     @Modifying
     @Query("DELETE FROM events")
     fun deleteAllEventsRaw(): Int