[RELEASE] 2026-08-12 / v1.0.6

build.gradle

@@ -23,6 +23,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-webmvc'
+	implementation 'org.mnode.ical4j:ical4j:3.2.17'
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'org.postgresql:postgresql'
 	annotationProcessor 'org.projectlombok:lombok'

src/main/java/com/tryna/domain/event/entity/Events.java

@@ -321,4 +321,26 @@ public void resurrectExternalEvent(ExternalCalendars externalCalendar, String ti
         this.eventStatus = EventStatus.CONFIRMED;
         this.deletedAt = null;
     }
+
+    // 공휴일 전용 생성 정적 팩토리 메서드
+    public static Events createHolidayEvent(
+            String title,
+            LocalDate startDate,
+            String externalEventId
+    ) {
+        Events event = new Events();
+        event.title = title;
+        event.sourceText = title;
+        event.startDate = startDate;
+        event.endDate = startDate;
+        event.isAllDay = true;
+        event.isRecurring = false;
+        event.recurrenceType = RecurrenceType.NONE;
+        event.recurrenceDayOfWeek = RecurrenceDayOfWeek.NONE;
+        event.sourceType = SourceType.HOLIDAY;
+        event.eventStatus = EventStatus.CONFIRMED;
+        event.externalEventId = externalEventId;
+        event.provider = Provider.APPLE;
+        return event;
+    }
 }

src/main/java/com/tryna/domain/event/enums/SourceType.java

@@ -4,5 +4,6 @@ public enum SourceType {
     USER_NATURAL_LANGUAGE,
     USER_MANUAL_EDIT,
     EXTERNAL_CALENDAR,
-    EXTERNAL_BASED_INTERNAL
+    EXTERNAL_BASED_INTERNAL,
+    HOLIDAY
 }

src/main/java/com/tryna/domain/event/repository/EventsRepository.java

@@ -17,19 +17,6 @@
 
 public interface EventsRepository extends JpaRepository<Events, Long> {
 
-    @Query(value = """
-            SELECT e.* 
-              FROM events e
-              JOIN user_events ue ON ue.event_id = e.event_id
-             WHERE e.external_calendar_id = :externalCalendarId
-               AND e.external_event_id IN :externalEventIds
-               AND e.source_type = 'EXTERNAL_CALENDAR'
-            """, nativeQuery = true)
-    List<Events> findAllIncludingDeletedByExternalCalendarIdAndExternalEventIdIn(
-            @Param("externalCalendarId") Long externalCalendarId,
-            @Param("externalEventIds") List<String> externalEventIds
-    );
-
     @Query("""
             SELECT COUNT(e) > 0
               FROM Events e
@@ -148,4 +135,33 @@ List<Events> findAllIncludingDeletedByUserIdAndExternalEventIdIn(
             @Param("userId") Long userId,
             @Param("externalEventIds") Collection<String> externalEventIds
     );
+
+    /**
+     * 특정 기간 내의 시스템 공휴일 일정만 단독으로 조회합니다.
+     */
+    @Query("""
+            SELECT e
+              FROM Events e
+             WHERE e.sourceType = com.tryna.domain.event.enums.SourceType.HOLIDAY
+               AND e.startDate IS NOT NULL
+               AND e.startDate <= :endDate
+               AND COALESCE(e.endDate, e.startDate) >= :startDate
+               AND e.deletedAt IS NULL
+            """)
+    List<Events> findHolidaysInRange(
+            @Param("startDate") LocalDate startDate,
+            @Param("endDate") LocalDate endDate
+    );
+
+    /**
+     * 공휴일 중복 삽입 방지를 위해 존재 여부를 확인합니다.
+     */
+    @Query("""
+            SELECT COUNT(e) > 0
+              FROM Events e
+             WHERE e.sourceType = com.tryna.domain.event.enums.SourceType.HOLIDAY
+               AND e.externalEventId = :externalEventId
+               AND e.deletedAt IS NULL
+            """)
+    boolean existsHolidayByExternalEventId(@Param("externalEventId") String externalEventId);
 }

src/main/java/com/tryna/domain/event/service/EventQueryService.java

@@ -51,6 +51,9 @@ public class EventQueryService {
             EventStatus.NEEDS_CONFIRMATION
     );
 
+    // 가상 라벨 ID 상수 추가
+    private static final Long HOLIDAY_LABEL_ID = -1L;
+
     private final EventsRepository eventsRepository;
     private final UserEventsRepository userEventsRepository;
     private final ActionItemsRepository actionItemsRepository;
@@ -66,7 +69,9 @@ public CalendarMainResponse getCalendarMain(Long userId, Integer year, Integer m
 
         CalendarMonthlyResponse monthlyCalendar = buildMonthlyCalendar(userId, year, month);
         CalendarDateEventsResponse dateEvents = buildDateEvents(userId, selectedDate);
-        boolean hasEvents = userEventsRepository.countVisibleEventsByUserId(userId, VISIBLE_EVENT_STATUSES) > 0;
+
+        // 개인 일정 여부를 명확히 구분
+        boolean hasPersonalEvents = userEventsRepository.countVisibleEventsByUserId(userId, VISIBLE_EVENT_STATUSES) > 0;
 
         List<CalendarMonthlyResponse.DayEventCount> monthlyEventDays = monthlyCalendar.days()
                 .stream()
@@ -78,14 +83,31 @@ public CalendarMainResponse getCalendarMain(Long userId, Integer year, Integer m
                 month,
                 monthlyCalendar.today(),
                 selectedDate,
-                hasEvents,
+                hasPersonalEvents, // 기존 DTO 필드를 활용하여 '개인 일정 여부(personal-event state)'로 사용
                 false,
-                resolveMainEmptyState(hasEvents, dateEvents),
+                // 이번 달력에 표시할 일정(공휴일 등)이 있는지도 Empty State 판단에 넘김
+                resolveMainEmptyState(hasPersonalEvents, !monthlyEventDays.isEmpty(), dateEvents),
                 monthlyEventDays,
                 dateEvents.events()
         );
     }
 
+    /**
+     * 개인 일정뿐만 아니라 공휴일을 포함해 캘린더 빈 화면 상태를 결정합니다.
+     */
+    private String resolveMainEmptyState(boolean hasPersonalEvents, boolean hasMonthlyEvents, CalendarDateEventsResponse dateEvents) {
+        // 선택한 날짜에 표시할 일정(공휴일 포함)이 단 하나라도 있다면 Empty State 해제
+        if (!dateEvents.events().isEmpty()) {
+            return null;
+        }
+        // 사용자가 작성한 개인 일정도 없고, 이번 달력에 그려줄 공휴일조차 완전히 없다면 글로벌 Empty State 반환
+        if (!hasPersonalEvents && !hasMonthlyEvents) {
+            return NO_EVENTS;
+        }
+        // 그 외 (달력에 공휴일은 있어서 렌더링해야 하지만, 선택한 날짜엔 아무것도 없는 경우)
+        return dateEvents.emptyStateType(); // -> NO_SELECTED_DATE_EVENTS
+    }
+
     /**
      * 제공된 연도에 사용자가 볼 수 있는(표시되는) 일정이 있는지 확인
      * 저장된 일정과 해당 범위 내에서 발생할 수 있는 반복 일정을 모두 고려합니다.
@@ -158,13 +180,6 @@ public CalendarDateEventsResponse getDateEvents(Long userId, String dateValue) {
         return buildDateEvents(userId, date);
     }
 
-    private String resolveMainEmptyState(boolean hasEvents, CalendarDateEventsResponse dateEvents) {
-        if (!hasEvents) {
-            return NO_EVENTS;
-        }
-        return dateEvents.emptyStateType();
-    }
-
     private CalendarDateEventsResponse buildDateEvents(Long userId, LocalDate date) {
         List<UserEvents> directUserEvents = userEventsRepository.findUserEventsByDate(
                 userId,
@@ -193,6 +208,12 @@ private CalendarDateEventsResponse buildDateEvents(Long userId, LocalDate date)
 
         occurrences.addAll(recurringOccurrences);
 
+        // 해당 날짜의 공휴일 별도 조회 후 병합
+        List<Events> holidays = eventsRepository.findHolidaysInRange(date, date);
+        holidays.forEach(holiday ->
+                occurrences.add(new EventOccurrence(holiday, holiday.getStartDate(), HOLIDAY_LABEL_ID))
+        );
+
         Set<DeletedOccurrenceKey> deletedOccurrences = findDeletedOccurrenceKeys(occurrences);
 
         List<CalendarDateEventsResponse.EventSummary> events = occurrences.stream()
@@ -409,6 +430,12 @@ private Map<LocalDate, List<EventOccurrence>> getOccurrencesByDate(Long userId,
             }
         }
 
+        // 공휴일 별도 조회 후 병합
+        List<Events> holidays = eventsRepository.findHolidaysInRange(startDate, endDate);
+        holidays.forEach(holiday ->
+                occurrences.add(new EventOccurrence(holiday, holiday.getStartDate(), HOLIDAY_LABEL_ID))
+        );
+
         Set<DeletedOccurrenceKey> deletedOccurrences = findDeletedOccurrenceKeys(occurrences);
         for (EventOccurrence occurrence : occurrences) {
             if (isDeletedOccurrence(

src/main/java/com/tryna/domain/event/service/HolidaySyncService.java

@@ -0,0 +1,145 @@
+package com.tryna.domain.event.service;
+
+import com.tryna.domain.event.entity.Events;
+import com.tryna.domain.event.repository.EventsRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import net.fortuna.ical4j.data.CalendarBuilder;
+import net.fortuna.ical4j.model.Calendar;
+import net.fortuna.ical4j.model.Component;
+import net.fortuna.ical4j.model.component.VEvent;
+import net.fortuna.ical4j.util.CompatibilityHints;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.GZIPInputStream;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class HolidaySyncService {
+
+    private final EventsRepository eventsRepository;
+
+    // 애플 캘린더 URL
+    private static final String APPLE_HOLIDAY_URL = "https://calendars.icloud.com/holidays/kr_ko.ics";
+
+    // 네트워크 타임아웃 설정 (10초)
+    private static final int TIMEOUT_MILLIS = 10_000;
+
+    @EventListener(ApplicationReadyEvent.class)
+    @Scheduled(cron = "0 0 4 * * *", zone = "Asia/Seoul")
+    public void syncAppleKoreanHolidays() {
+        System.setProperty("net.fortuna.ical4j.parser.relaxed", "true");
+        System.setProperty("net.fortuna.ical4j.relaxed.parsing.enabled", "true");
+        CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, true);
+        CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_UNFOLDING, true);
+
+        log.info("애플 공휴일 데이터 초기화 및 주기적 동기화(Sync)를 시작합니다.");
+
+        try {
+            URLConnection connection = new URL(APPLE_HOLIDAY_URL).openConnection();
+            // 타임아웃 지정 (무한 대기 방지)
+            connection.setConnectTimeout(TIMEOUT_MILLIS);
+            connection.setReadTimeout(TIMEOUT_MILLIS);
+
+            // 브라우저인 척 위장 (애플 서버 차단 방지)
+            connection.setRequestProperty("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)");
+
+            InputStream rawStream = connection.getInputStream();
+            String encoding = connection.getContentEncoding();
+
+            // 애플 서버가 데이터를 GZIP으로 압축해서 보냈을 경우 압축 해제 처리
+            InputStream finalStream = (encoding != null && encoding.equalsIgnoreCase("gzip"))
+                    ? new GZIPInputStream(rawStream)
+                    : rawScaleStreamCheck(rawStream); // 안전한 스트림 처리
+
+            List<ParsedHolidayDto> parsedHolidays = new ArrayList<>();
+            try (InputStream is = finalStream) {
+                CalendarBuilder builder = new CalendarBuilder();
+                Calendar calendar = builder.build(is);
+
+                log.info("애플 공휴일 캘린더 파싱 시작...");
+
+                for (Object component : calendar.getComponents(Component.VEVENT)) {
+                    VEvent event = (VEvent) component;
+
+                    // 필수값이 없는 데이터는 건너뛰기
+                    if (event.getUid() == null || event.getSummary() == null || event.getStartDate() == null) {
+                        continue;
+                    }
+
+                    String uid = event.getUid().getValue();
+                    String title = event.getSummary().getValue();
+                    String dateStr = event.getStartDate().getValue();
+
+                    LocalDate startDate;
+                    try {
+                        // 공휴일 포맷인 yyyyMMdd 만 파싱 시도
+                        startDate = LocalDate.parse(dateStr, DateTimeFormatter.ofPattern("yyyyMMdd"));
+                    } catch (Exception e) {
+                        continue; // 날짜 포맷이 이상하면 조용히 무시하고 다음 일정으로
+                    }
+
+                    parsedHolidays.add(new ParsedHolidayDto(title, startDate, uid));
+                }
+            }
+
+            // DB 저장 및 동시성 충돌 방지 로직 호출
+            saveHolidaysAtomically(parsedHolidays);
+
+        } catch (Exception e) {
+            log.error("공휴일 동기화 중 오류 발생", e);
+        }
+    }
+
+    private InputStream rawScaleStreamCheck(InputStream rawStream) {
+        return rawStream;
+    }
+
+    /**
+     * 개별 건별 존재 여부 확인 및 저장을 트랜잭션 단위로 안전하게 처리하여
+     * 다중 서버 환경(동시성 이슈)에서도 중복 삽입을 원천 방어합니다.
+     */
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void saveHolidaysAtomically(List<ParsedHolidayDto> parsedHolidays) {
+        int savedCount = 0;
+        for (ParsedHolidayDto dto : parsedHolidays) {
+            // 원자적(Atomic) 방어: 존재하지 않는 경우에만 안전하게 삽입
+            if (!eventsRepository.existsHolidayByExternalEventId(dto.uid())) {
+                try {
+                    Events holidayEvent = Events.createHolidayEvent(dto.title(), dto.startDate(), dto.uid());
+                    eventsRepository.save(holidayEvent);
+                    savedCount++;
+                } catch (Exception e) {
+                    // 동시 요청으로 인해 유니크 충돌 등이 발생할 경우 무시 (Race Condition 방어)
+                    log.debug("공휴일 동기화 중 중복 삽입 충돌 무시: uid={}", dto.uid());
+                }
+            }
+        }
+
+        if (savedCount > 0) {
+            log.info("새로운 공휴일 {}건 동기화 완료", savedCount);
+        } else {
+            log.info("추가할 새로운 공휴일이 없습니다.");
+        }
+    }
+
+    private record ParsedHolidayDto(
+            String title,
+            LocalDate startDate,
+            String uid
+    ) {
+    }
+}

src/main/java/com/tryna/domain/label/enums/LabelType.java

@@ -2,5 +2,6 @@
 
 public enum LabelType {
     USER,
-    EXTERNAL_CALENDAR
+    EXTERNAL_CALENDAR,
+    SYSTEM,
 }