v0.3.5: update proguard-rules.pro

app/build.gradle.kts

@@ -24,8 +24,8 @@ android {
  applicationId = "com.hotdeal.alarm"
  minSdk = 31
  targetSdk = 35
-        versionCode = 29
-        versionName = "0.2.9"
+        versionCode = 35
+        versionName = "0.3.5"
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
  vectorDrawables {

app/proguard-rules.pro

@@ -1,8 +1,40 @@
 # Add project specific ProGuard rules here.
 -keepattributes Signature
 -keepattributes *Annotation*
+
+# Data Entities & Models
 -keep class com.hotdeal.alarm.data.local.db.entity.** { *; }
 -keep class com.hotdeal.alarm.domain.model.** { *; }
+-keep class com.hotdeal.alarm.data.local.preferences.** { *; }
+
+# Room Database & DAOs
+-keep class * extends androidx.room.RoomDatabase
+-keep class com.hotdeal.alarm.data.local.db.dao.** { *; }
+-dontwarn androidx.room.paging.**
+
+# WorkManager & Hilt Worker
+-keep class androidx.work.** { *; }
+-keep class androidx.hilt.work.** { *; }
+-keep class com.hotdeal.alarm.worker.** { *; }
+-keep class * extends androidx.work.ListenableWorker {
+    public <init>(android.content.Context, androidx.work.WorkerParameters);
+}
+-keep class * extends androidx.work.Worker {
+    public <init>(android.content.Context, androidx.work.WorkerParameters);
+}
+-keep class * extends androidx.work.CoroutineWorker {
+    public <init>(android.content.Context, androidx.work.WorkerParameters);
+}
+
+# Dagger & Hilt
+-keep class com.hotdeal.alarm.di.** { *; }
+-keep class * extends android.app.Application
+-keep class * extends android.app.Service
+-keep class * extends android.content.BroadcastReceiver
+-keep class com.hotdeal.alarm.receiver.** { *; }
+
+# Scrapers & Remote Data
+-keep class com.hotdeal.alarm.data.remote.scraper.** { *; }
 
 # OkHttp
 -dontwarn okhttp3.**
@@ -19,4 +51,3 @@
 
 # JSpecify annotations (for Jsoup compatibility)
 -dontwarn org.jspecify.annotations.**
-

app/src/main/AndroidManifest.xml

@@ -14,8 +14,9 @@
     <!-- Notifications (Android 13+) -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
-    <!-- Exact Alarms (Android 12+) -->
+    <!-- Exact Alarms (Android 12+, Android 13+) -->
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
 
     <!-- Boot Completed -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -65,9 +66,28 @@
             android:exported="false"
             android:foregroundServiceType="dataSync" />
 
-    <!-- Boot Receiver -->
+        <!-- Polling Alarm Receiver: 정확한 주기 알람 수신 및 핫딜 스크래핑 트리거 -->
+        <receiver
+            android:name=".receiver.PollingAlarmReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.hotdeal.alarm.ACTION_POLL_ALARM" />
+            </intent-filter>
+        </receiver>
 
-    <!-- Widget -->
+        <!-- Boot Receiver: 부팅/앱 업데이트 후 백그라운드 폴링 자동 재등록 -->
+        <receiver
+            android:name=".receiver.BootReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
+
+        <!-- Widget Receiver -->
         <receiver
             android:name=".widget.HotDealWidget"
             android:exported="true">
@@ -84,11 +104,12 @@
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
+            tools:replace="android:authorities"
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
-</application>
+    </application>
 
 </manifest>

app/src/main/java/com/hotdeal/alarm/HotDealApplication.kt

@@ -1,9 +1,17 @@
 package com.hotdeal.alarm
 
 import android.app.Application
+import android.util.Log
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
+import com.hotdeal.alarm.data.local.preferences.AppSettings
+import com.hotdeal.alarm.worker.WorkerScheduler
 import dagger.hilt.android.HiltAndroidApp
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltAndroidApp
@@ -12,13 +20,41 @@ class HotDealApplication : Application(), Configuration.Provider {
     @Inject
     lateinit var workerFactory: HiltWorkerFactory
 
+    @Inject
+    lateinit var workerScheduler: WorkerScheduler
+
+    @Inject
+    lateinit var appSettings: AppSettings
+
+    private val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+
     override val workManagerConfiguration: Configuration
         get() = Configuration.Builder()
             .setWorkerFactory(workerFactory)
+            .setMinimumLoggingLevel(Log.DEBUG)
             .build()
 
     override fun onCreate() {
         super.onCreate()
-        // Application initialization
+        // 앱 시작 시 백그라운드 폴링 즉시 등록/갱신
+        ensurePollingScheduled()
+    }
+
+    /**
+     * 앱이 시작될 때마다 백그라운드 폴링이 등록되어 있는지 확인하고,
+     * 없으면 즉시 등록합니다. UPDATE 정책으로 항상 최신 Worker가 동작합니다.
+     */
+    private fun ensurePollingScheduled() {
+        applicationScope.launch {
+            try {
+                val interval = appSettings.pollingInterval.first()
+                Log.d("HotDealApp", "백그라운드 폴링 등록/갱신: ${interval}분 간격")
+                workerScheduler.schedulePeriodicPolling(interval.toLong())
+            } catch (e: Exception) {
+                Log.e("HotDealApp", "폴링 스케줄 등록 실패: ${e.message}", e)
+                // 기본값으로 폴백
+                workerScheduler.schedulePeriodicPolling(WorkerScheduler.DEFAULT_INTERVAL_MINUTES)
+            }
+        }
     }
 }

app/src/main/java/com/hotdeal/alarm/data/local/db/dao/HotDealDao.kt

@@ -121,4 +121,10 @@ interface HotDealDao {
  */
  @Query("UPDATE hot_deals SET isFavorite = :isFavorite WHERE id = :id")
  suspend fun setFavorite(id: String, isFavorite: Boolean)
+
+ /**
+  * 인기글 상태 업데이트 (기존 데이터도 HOT 마킹 가능하도록)
+  */
+ @Query("UPDATE hot_deals SET isPopular = 1 WHERE id IN (:ids)")
+ suspend fun markAsPopular(ids: List<String>)
 }

app/src/main/java/com/hotdeal/alarm/data/remote/scraper/PpomppuScraper.kt

@@ -3,6 +3,7 @@ package com.hotdeal.alarm.data.remote.scraper
 import android.util.Log
 import com.hotdeal.alarm.domain.model.HotDeal
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
@@ -13,6 +14,8 @@ import kotlin.random.Random
 
 /**
  * 뽐뿌 스크래퍼
+ * - hotlist_flag=999 페이지와 일반 게시판을 병렬 스크래핑하여 HOT 뱃지 신속 감지
+ * - 기존 hotpop_bg_color CSS 클래스도 폴백으로 감지
  */
 class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
     
@@ -28,69 +31,57 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
             val url = getBoardUrl(board)
             Log.d("Ppomppu", "스크래핑 시작: $url")
 
-            // 요청 간격 랜덤화 (2~4초) - 차단 방지
-            val delayTime = Random.nextLong(2000, 4000)
-            Log.d("Ppomppu", "요청 대기: ${delayTime}ms")
+            // 1. 인기글 목록과 일반 게시판을 병렬(async)로 동시에 요청하여 딜레이 최소화
+            val hotPostIdsDeferred = async { fetchHotPostIds(board) }
+            
+            val delayTime = Random.nextLong(500, 1500)
             delay(delayTime)
             
-            // Jsoup으로 직접 연결 (User-Agent 회전)
             val userAgent = getRandomUserAgent()
-            Log.d("Ppomppu", "User-Agent: $userAgent")
-            
             val doc: Document = Jsoup.connect(url)
                 .userAgent(userAgent)
                 .header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
                 .header("Accept-Language", "ko-KR,ko;q=0.9,en-US;q=0.8,en;q=0.7")
                 .header("Accept-Charset", "utf-8,ISO-8859-1")
                 .header("Referer", "https://www.ppomppu.co.kr/")
-                .timeout(30000)
+                .timeout(12000)
                 .followRedirects(true)
                 .get()
 
-            Log.d("Ppomppu", "문서 파싱 성공, 길이: ${doc.html().length}")
+            val hotPostIds = hotPostIdsDeferred.await()
+            Log.d("Ppomppu", "인기글 ID ${hotPostIds.size}개 수집됨: $hotPostIds")
             
             val deals = mutableListOf<HotDeal>()
-
- // 셀렉터로 요소 찾기 - 인기 게시물 감지를 위해 tr 요소 선택
             val rowElements: Elements = doc.select("tr.baseList")
             Log.d("Ppomppu", "찾은 행 요소: ${rowElements.size}개")
 
- // 최대 20개까지만 처리
             var count = 0
             rowElements.forEach { row ->
- if (count >= 20) return@forEach
+                if (count >= 25) return@forEach
 
                 try {
- // 인기 게시물 여부 확인 (hotpop_bg_color 클래스 존재 여부)
- val isPopular = row.hasClass("hotpop_bg_color")
-
- // 제목 링크 찾기
- val titleElement = row.selectFirst("a.baseList-title")
- if (titleElement == null) return@forEach
-
+                    val titleElement = row.selectFirst("a.baseList-title") ?: return@forEach
                     val title = titleElement.text().trim()
                     if (title.isEmpty()) return@forEach
 
                     val href = titleElement.attr("href")
-
- // 공지사항 제외
                     if (href.contains("regulation") || href.contains("notice")) return@forEach
 
- val dealUrl = resolveUrl(baseUrl, href)
-
- // postId 추출
                     val postId = extractPostId(href)
                     if (postId.isEmpty()) {
                         Log.w("Ppomppu", "postId 추출 실패: href=$href")
                         return@forEach
                     }
 
+                    // 인기글 판단: hotlist 페이지에 포함되어 있거나 CSS 클래스로 감지
+                    val isPopular = postId in hotPostIds || row.hasClass("hotpop_bg_color")
+
                     val deal = HotDeal(
                         id = HotDeal.generateId(siteName, postId),
                         siteName = siteName,
                         boardName = board,
                         title = title,
- url = dealUrl,
+                        url = resolveUrl(baseUrl, href),
                         createdAt = System.currentTimeMillis(),
                         isPopular = isPopular
                     )
@@ -103,7 +94,7 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
                 }
             }
 
-            Log.d("Ppomppu", "파싱 완료: ${deals.size}개")
+            Log.d("Ppomppu", "파싱 완료: ${deals.size}개 (인기: ${deals.count { it.isPopular }}개)")
             Result.success(deals)
         } catch (e: Exception) {
             Log.e("Ppomppu", "스크래핑 실패: ${e.message}", e)
@@ -111,6 +102,38 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
         }
     }
 
+    /**
+     * hotlist_flag=999 페이지에서 인기 게시물의 postId 목록을 수집
+     */
+    private suspend fun fetchHotPostIds(board: String): Set<String> {
+        return try {
+            val hotUrl = "${baseUrl}zboard.php?id=$board&hotlist_flag=999"
+            Log.d("Ppomppu", "인기글 페이지 조회: $hotUrl")
+
+            val doc = Jsoup.connect(hotUrl)
+                .userAgent(getRandomUserAgent())
+                .header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
+                .header("Accept-Language", "ko-KR,ko;q=0.9,en-US;q=0.8,en;q=0.7")
+                .header("Referer", "https://www.ppomppu.co.kr/")
+                .timeout(8000)
+                .followRedirects(true)
+                .get()
+
+            val ids = mutableSetOf<String>()
+            doc.select("tr.baseList a.baseList-title").forEach { link ->
+                val href = link.attr("href")
+                val postId = extractPostId(href)
+                if (postId.isNotEmpty()) {
+                    ids.add(postId)
+                }
+            }
+            ids
+        } catch (e: Exception) {
+            Log.w("Ppomppu", "인기글 목록 조회 실패 (폴백으로 계속): ${e.message}")
+            emptySet()
+        }
+    }
+
     private fun extractPostId(href: String): String {
         val afterNo = href.substringAfter("no=", "")
         if (afterNo.isEmpty()) return ""

app/src/main/java/com/hotdeal/alarm/domain/usecase/HotDealScraperManager.kt

@@ -0,0 +1,175 @@
+package com.hotdeal.alarm.domain.usecase
+
+import android.content.Context
+import android.util.Log
+import com.hotdeal.alarm.data.local.db.dao.HotDealDao
+import com.hotdeal.alarm.data.local.db.dao.KeywordDao
+import com.hotdeal.alarm.data.local.db.dao.SiteConfigDao
+import com.hotdeal.alarm.data.local.db.entity.HotDealEntity
+import com.hotdeal.alarm.data.local.db.entity.KeywordEntity
+import com.hotdeal.alarm.data.local.db.entity.SiteConfigEntity
+import com.hotdeal.alarm.data.remote.scraper.ScraperFactory
+import com.hotdeal.alarm.domain.model.HotDeal
+import com.hotdeal.alarm.service.NotificationService
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * 핫딜 스크래핑, DB 저장, 키워드 매칭, 알림 발송을 총괄하는 핵심 매니저
+ * 
+ * 포그라운드(앱 진입/새로고침), 백그라운드(AlarmReceiver), WorkManager 모두에서
+ * 공통으로 직접 호출하여 지연 없이 즉시 수집 및 알림을 발송합니다.
+ */
+@Singleton
+class HotDealScraperManager @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val scraperFactory: ScraperFactory,
+    private val notificationService: NotificationService,
+    private val dealDao: HotDealDao,
+    private val siteConfigDao: SiteConfigDao,
+    private val keywordDao: KeywordDao
+) {
+    companion object {
+        private const val TAG = "HotDealScraperManager"
+    }
+
+    // 중복 동시 실행 방지 뮤텍스
+    private val mutex = Mutex()
+
+    /**
+     * 핫딜 수집 및 키워드 알림 발송 전체 프로세스 실행
+     * @return 수집된 새로운 핫딜 목록
+     */
+    suspend fun fetchAndProcessDeals(): List<HotDeal> = withContext(Dispatchers.IO) {
+        mutex.withLock {
+            try {
+                Log.d(TAG, "===== 🚀 핫딜 수집 프로세스 시작 =====")
+
+                // 1. 활성화된 사이트 설정 조회
+                val enabledConfigs = siteConfigDao.getEnabledConfigs()
+                Log.d(TAG, "활성화된 사이트 설정: ${enabledConfigs.size}개")
+
+                if (enabledConfigs.isEmpty()) {
+                    Log.w(TAG, "활성화된 사이트 설정이 없습니다.")
+                    return@withContext emptyList()
+                }
+
+                // 2. 활성화된 키워드 조회
+                val keywords = keywordDao.getEnabledKeywords()
+                Log.d(TAG, "활성화된 키워드: ${keywords.size}개 (${keywords.map { it.keyword }})")
+
+                // 3. 각 사이트/게시판 병렬 스크래핑
+                val allDeals = enabledConfigs.map { config ->
+                    async { scrapeSite(config) }
+                }.awaitAll().flatten()
+
+                Log.d(TAG, "스크래핑 완료: 총 ${allDeals.size}개 핫딜 수집됨")
+                if (allDeals.isEmpty()) {
+                    return@withContext emptyList()
+                }
+
+                // 4. 새로운 핫딜 필터링 (기존 DB에 없는 것)
+                val newDeals = filterNewDeals(allDeals)
+                Log.d(TAG, "새로운 핫딜: ${newDeals.size}개")
+
+                // 5. 인기글 상태 일괄 업데이트 (기존 + 신규 모두)
+                val popularDealIds = allDeals.filter { it.isPopular }.map { it.id }
+                if (popularDealIds.isNotEmpty()) {
+                    dealDao.markAsPopular(popularDealIds)
+                    Log.d(TAG, "🔥 인기글 마킹: ${popularDealIds.size}개")
+                }
+
+                if (newDeals.isNotEmpty()) {
+                    // 6. 키워드 매칭
+                    val keywordMatchedDeals = if (keywords.isNotEmpty()) {
+                        filterByKeywords(newDeals, keywords).also {
+                            Log.d(TAG, "⭐ 키워드 매칭 핫딜: ${it.size}개 -> ${it.map { d -> d.title }}")
+                        }
+                    } else {
+                        emptyList()
+                    }
+
+                    // 7. DB에 새 핫딜 저장
+                    var insertedCount = 0
+                    newDeals.forEach { deal ->
+                        try {
+                            val entity = HotDealEntity.fromDomain(deal)
+                            dealDao.insertDeal(entity)
+                            insertedCount++
+                        } catch (e: Exception) {
+                            Log.w(TAG, "핫딜 저장 실패: ${deal.id}")
+                        }
+                    }
+                    Log.d(TAG, "DB 저장 완료: $insertedCount 개")
+
+                    // 8. 키워드 매칭 알림 즉시 발송! (시스템바 노티피케이션)
+                    if (keywordMatchedDeals.isNotEmpty()) {
+                        Log.d(TAG, "🔔 키워드 매칭 알림 발송: ${keywordMatchedDeals.size}개")
+                        notificationService.showKeywordMatchNotification(keywordMatchedDeals)
+                        dealDao.markAsKeywordMatch(keywordMatchedDeals.map { it.id })
+                    }
+
+                    // 9. 알림 발송 상태 업데이트
+                    dealDao.markAsNotified(newDeals.map { it.id })
+                }
+
+                // 10. 오래된 데이터 정리 (3일 이상)
+                val threshold = System.currentTimeMillis() - (3 * 24 * 60 * 60 * 1000L)
+                dealDao.deleteOldDeals(threshold)
+
+                Log.d(TAG, "===== ✅ 핫딜 수집 프로세스 종료 =====")
+                newDeals
+            } catch (e: Exception) {
+                Log.e(TAG, "핫딜 수집 오류: ${e.message}", e)
+                emptyList()
+            }
+        }
+    }
+
+    private suspend fun scrapeSite(config: SiteConfigEntity): List<HotDeal> {
+        val scraper = scraperFactory.getScraper(config.siteName) ?: return emptyList()
+        val result = scraper.scrape(config.boardName)
+
+        result.fold(
+            onSuccess = { deals ->
+                try {
+                    siteConfigDao.updateLastScrapedAt(config.siteBoardKey, System.currentTimeMillis())
+                } catch (e: Exception) {
+                    // 무시
+                }
+            },
+            onFailure = { error ->
+                Log.e(TAG, "${config.siteName}/${config.boardName} 실패: ${error.message}")
+            }
+        )
+
+        return result.getOrElse { emptyList() }
+    }
+
+    private suspend fun filterNewDeals(deals: List<HotDeal>): List<HotDeal> {
+        return deals.filter { deal ->
+            val existingByUrl = dealDao.getDealByUrl(deal.url)
+            if (existingByUrl != null) return@filter false
+
+            val existingById = dealDao.getDealById(deal.id)
+            if (existingById != null) return@filter false
+
+            true
+        }
+    }
+
+    private fun filterByKeywords(deals: List<HotDeal>, keywords: List<KeywordEntity>): List<HotDeal> {
+        return deals.filter { deal ->
+            keywords.any { keyword ->
+                deal.title.contains(keyword.keyword, ignoreCase = true)
+            }
+        }
+    }
+}

app/src/main/java/com/hotdeal/alarm/presentation/components/DragDropListState.kt

@@ -1,11 +1,6 @@
 package com.hotdeal.alarm.presentation.components
 
-import androidx.compose.animation.core.Animatable
-import androidx.compose.animation.core.Spring
-import androidx.compose.animation.core.spring
 import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
-import androidx.compose.foundation.gestures.scrollBy
-import androidx.compose.foundation.lazy.LazyListItemInfo
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
@@ -13,126 +8,110 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.zIndex
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 
 /**
- * Compose LazyColumn Drag & Drop Reordering State
+ * Key 기반 드래그 앤 드롭 Reorder 시스템
+ *
+ * - 각 아이템에 item-level long-press 제스처를 적용하여 드래그 시작
+ * - 드래그 중 다른 아이템의 중심점과 겹치면 swap 실행
+ * - swap 시 delta 보정으로 시각적 점프 방지
+ * - 비드래그 아이템은 animateItemPlacement()로 부드러운 슬라이드
  */
 @Composable
-fun rememberDragDropListState(
-    lazyListState: LazyListState,
-    onMove: (Int, Int) -> Unit,
-    onDragEnd: () -> Unit = {}
-): DragDropListState {
-    val scope = rememberCoroutineScope()
-    val state = remember(lazyListState) {
-        DragDropListState(
-            lazyListState = lazyListState,
-            onMove = onMove,
-            onDragEnd = onDragEnd,
-            scope = scope
-        )
+fun rememberReorderState(
+    listState: LazyListState,
+    onSwap: (fromListIndex: Int, toListIndex: Int) -> Boolean
+): ReorderState {
+    return remember(listState) {
+        ReorderState(listState, onSwap)
     }
-    return state
 }
 
-class DragDropListState(
-    val lazyListState: LazyListState,
-    private val onMove: (Int, Int) -> Unit,
-    private val onDragEnd: () -> Unit,
-    private val scope: CoroutineScope
+@Stable
+class ReorderState(
+    val listState: LazyListState,
+    private val onSwap: (Int, Int) -> Boolean
 ) {
-    var initiallyDraggedElement by mutableStateOf<LazyListItemInfo?>(null)
+    /** 현재 드래그 중인 아이템의 key (null이면 드래그 없음) */
+    var draggedKey by mutableStateOf<Any?>(null)
         private set
 
-    var currentIndexOfDraggedItem by mutableStateOf<Int?>(null)
+    /** 누적 드래그 Y축 오프셋 */
+    var dragDelta by mutableFloatStateOf(0f)
         private set
 
-    private val dragOffset = Animatable(0f)
-
-    val elementOffset: Float
-        get() = dragOffset.value
-
-    fun onDragStart(offset: Offset) {
-        lazyListState.layoutInfo.visibleItemsInfo
-            .firstOrNull { item -> offset.y.toInt() in item.offset..(item.offset + item.size) }
-            ?.also { item ->
-                currentIndexOfDraggedItem = item.index
-                initiallyDraggedElement = item
-            }
+    fun startDrag(key: Any) {
+        draggedKey = key
+        dragDelta = 0f
     }
 
-    fun onDragInterrupted() {
-        initiallyDraggedElement = null
-        currentIndexOfDraggedItem = null
-        scope.launch {
-            dragOffset.snapTo(0f)
-        }
+    fun updateDrag(delta: Offset) {
+        if (draggedKey == null) return
+        dragDelta += delta.y
+        checkOverlap()
     }
 
-    fun onDrag(change: Offset) {
-        scope.launch {
-            dragOffset.snapTo(dragOffset.value + change.y)
+    fun endDrag() {
+        draggedKey = null
+        dragDelta = 0f
+    }
 
-            val currentElement = initiallyDraggedElement ?: return@launch
-            val startOffset = currentElement.offset + dragOffset.value
-            val endOffset = startOffset + currentElement.size
+    private fun checkOverlap() {
+        val dragged = listState.layoutInfo.visibleItemsInfo
+            .firstOrNull { it.key == draggedKey } ?: return
 
-            val hoveredItem = lazyListState.layoutInfo.visibleItemsInfo
+        val draggedMid = dragged.offset + dragged.size / 2f + dragDelta
+
+        val target = listState.layoutInfo.visibleItemsInfo
             .firstOrNull { item ->
-                    val itemMid = item.offset + item.size / 2
-                    val isMidInRange = itemMid in startOffset.toInt()..endOffset.toInt()
-                    isMidInRange && item.index != currentIndexOfDraggedItem
-                }
+                item.key != draggedKey &&
+                draggedMid >= item.offset.toFloat() &&
+                draggedMid < (item.offset + item.size).toFloat()
+            } ?: return
 
-            if (hoveredItem != null) {
-                val currentIndex = currentIndexOfDraggedItem ?: return@launch
-                val targetIndex = hoveredItem.index
-                onMove(currentIndex, targetIndex)
-                currentIndexOfDraggedItem = targetIndex
-            }
-        }
-    }
+        if (dragged.index == target.index) return
 
-    fun onDragStop() {
-        onDragEnd()
-        scope.launch {
-            dragOffset.animateTo(0f, spring(stiffness = Spring.StiffnessMediumLow))
-            initiallyDraggedElement = null
-            currentIndexOfDraggedItem = null
+        val swapped = onSwap(dragged.index, target.index)
+        if (swapped) {
+            // swap 후 아이템이 새 위치로 이동하므로, 시각적 점프를 막기 위해 delta 보정
+            dragDelta += if (dragged.index < target.index) {
+                -target.size.toFloat()
+            } else {
+                target.size.toFloat()
+            }
         }
     }
 }
 
-fun Modifier.dragDropGesture(
-    dragDropState: DragDropListState
-): Modifier = this.pointerInput(dragDropState) {
-    detectDragGesturesAfterLongPress(
-        onDragStart = { offset -> dragDropState.onDragStart(offset) },
-        onDragEnd = { dragDropState.onDragStop() },
-        onDragCancel = { dragDropState.onDragInterrupted() },
-        onDrag = { change, dragAmount ->
-            change.consume()
-            dragDropState.onDrag(dragAmount)
-        }
-    )
-}
-
-fun Modifier.dragDropItem(
-    index: Int,
-    dragDropState: DragDropListState
-): Modifier = this.then(
-    if (index == dragDropState.currentIndexOfDraggedItem) {
-        Modifier
-            .zIndex(10f)
+/**
+ * 개별 아이템에 부착하는 드래그 핸들 + 시각 효과 Modifier
+ * - 길게 누르면 드래그 시작
+ * - 드래그 중 아이템이 떠오르며 그림자 및 스케일업
+ */
+fun Modifier.reorderableItem(
+    state: ReorderState,
+    key: Any
+): Modifier {
+    val isDragged = state.draggedKey == key
+    return this
+        .zIndex(if (isDragged) 10f else 0f)
         .graphicsLayer {
-                translationY = dragDropState.elementOffset
+            if (isDragged) {
+                translationY = state.dragDelta
                 scaleX = 1.03f
                 scaleY = 1.03f
-                shadowElevation = 8f
+                shadowElevation = 16f
             }
-    } else {
-        Modifier
         }
-)
+        .pointerInput(key) {
+            detectDragGesturesAfterLongPress(
+                onDragStart = { state.startDrag(key) },
+                onDrag = { change, dragAmount ->
+                    change.consume()
+                    state.updateDrag(dragAmount)
+                },
+                onDragEnd = { state.endDrag() },
+                onDragCancel = { state.endDrag() }
+            )
+        }
+}

app/src/main/java/com/hotdeal/alarm/presentation/deallist/DealListScreen.kt

@@ -62,7 +62,7 @@ fun DealListScreen(
 
     // Pull to Refresh
     val pullToRefreshState = rememberPullToRefreshState(positionalThreshold = 40.dp)
-    var isRefreshing by remember { mutableStateOf(false) }
+    val isRefreshingByVm by viewModel.isRefreshing.collectAsStateWithLifecycle()
 
     val listState = rememberLazyListState()
     val scope = rememberCoroutineScope()
@@ -70,9 +70,8 @@ fun DealListScreen(
         derivedStateOf { listState.firstVisibleItemIndex > 3 }
     }
 
-    LaunchedEffect(uiState) {
-        if (uiState !is MainUiState.Loading) {
-            isRefreshing = false
+    LaunchedEffect(isRefreshingByVm) {
+        if (!isRefreshingByVm) {
             pullToRefreshState.endRefresh()
         }
     }
@@ -407,24 +406,20 @@ fun DealListScreen(
             }
 
             // Pull to Refresh 인디케이터
-            val progress = pullToRefreshState.progress
-            val showIndicator = pullToRefreshState.isRefreshing || progress > 0
+            val topPadding = paddingValues.calculateTopPadding()
 
-            if (showIndicator) {
             PullToRefreshContainer(
                 state = pullToRefreshState,
                 modifier = Modifier
                     .align(Alignment.TopCenter)
-                        .padding(top = 50.dp)
+                    .padding(top = topPadding)
                     .zIndex(999f),
                 containerColor = MaterialTheme.colorScheme.surfaceVariant,
                 contentColor = MaterialTheme.colorScheme.primary
             )
-            }
 
             LaunchedEffect(pullToRefreshState.isRefreshing) {
                 if (pullToRefreshState.isRefreshing) {
-                    isRefreshing = true
                     viewModel.refresh()
                 }
             }

app/src/main/java/com/hotdeal/alarm/presentation/main/MainActivity.kt

@@ -40,6 +40,9 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var workerScheduler: WorkerScheduler
 
+    @Inject
+    lateinit var scraperManager: com.hotdeal.alarm.domain.usecase.HotDealScraperManager
+
     private var downloadReceiver: BroadcastReceiver? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -216,7 +219,13 @@ class MainActivity : ComponentActivity() {
     override fun onResume() {
         super.onResume()
         if (isInBackground) {
-            workerScheduler.executeOnce()
+            lifecycleScope.launch {
+                try {
+                    scraperManager.fetchAndProcessDeals()
+                } catch (e: Exception) {
+                    // 무시
+                }
+            }
         }
         isInBackground = false
     }

app/src/main/java/com/hotdeal/alarm/presentation/main/MainViewModel.kt

@@ -10,6 +10,7 @@ import com.hotdeal.alarm.data.local.db.entity.SiteConfigEntity
 import com.hotdeal.alarm.data.local.preferences.AppSettings
 import com.hotdeal.alarm.domain.model.Keyword
 import com.hotdeal.alarm.domain.model.SiteType
+import com.hotdeal.alarm.domain.usecase.HotDealScraperManager
 import com.hotdeal.alarm.worker.WorkerScheduler
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.*
@@ -21,6 +22,7 @@ class MainViewModel @Inject constructor(
     private val hotDealDao: HotDealDao,
     private val siteConfigDao: SiteConfigDao,
     private val keywordDao: KeywordDao,
+    private val scraperManager: HotDealScraperManager,
     private val workerScheduler: WorkerScheduler,
     private val appSettings: AppSettings
 ) : ViewModel() {
@@ -28,6 +30,10 @@ class MainViewModel @Inject constructor(
     private val _uiState = MutableStateFlow<MainUiState>(MainUiState.Loading)
     val uiState: StateFlow<MainUiState> = _uiState.asStateFlow()
 
+    // 새로고침 진행 상태
+    private val _isRefreshing = MutableStateFlow(false)
+    val isRefreshing: StateFlow<Boolean> = _isRefreshing.asStateFlow()
+
     // 폴링 주기
     val pollingInterval: StateFlow<Int> = appSettings.pollingInterval
         .stateIn(viewModelScope, SharingStarted.Eagerly, 2)
@@ -44,11 +50,19 @@ class MainViewModel @Inject constructor(
     }
 
     private fun initializeApp() {
+        // 1. 사이트 설정 초기화 후 DB Flow 구독 (별도 코루틴 — collect는 지속 실행)
         viewModelScope.launch {
             initializeDefaultSiteConfigs()
             loadState()
+        }
+
+        // 2. 백그라운드 폴링 등록 + 앱 진입 즉시 직접 1회 스크래핑 실행
+        viewModelScope.launch {
             val savedInterval = appSettings.pollingInterval.first()
-            startPolling(savedInterval.toLong())
+            workerScheduler.schedulePeriodicPolling(savedInterval.toLong())
+            
+            // 지연 없는 직접 스크래핑 실행 -> Room Flow를 통해 메인화면에 즉시 반영됨!
+            refresh()
         }
     }
 
@@ -63,7 +77,7 @@ class MainViewModel @Inject constructor(
                     siteName = site.name,
                     boardName = board.id,
                     displayName = "${site.displayName} - ${board.displayName}",
-                    isEnabled = false
+                    isEnabled = true // 기본 활성화 (설치 즉시 수집 가동)
                 )
             }
         }
@@ -81,7 +95,6 @@ class MainViewModel @Inject constructor(
             keywordDao.observeAllKeywords(),
             appSettings.keywordOrder
         ) { deals, configs, keywords, keywordOrder ->
-            // 사용자가 설정한 키워드 순서에 따라 정렬
             val domainKeywords = keywords.map { it.toDomain() }
             val sortedKeywords = if (keywordOrder.isEmpty()) {
                 domainKeywords
@@ -105,15 +118,19 @@ class MainViewModel @Inject constructor(
     fun toggleSiteConfig(siteBoardKey: String, enabled: Boolean) {
         viewModelScope.launch {
             siteConfigDao.updateEnabled(siteBoardKey, enabled)
+            // 사이트 활성화 변경 시 즉시 새 핫딜 갱신
+            if (enabled) {
+                refresh()
+            }
         }
     }
 
     fun reorderSites(fromIndex: Int, toIndex: Int) {
-        viewModelScope.launch {
         val current = siteOrder.value.toMutableList()
         if (fromIndex in current.indices && toIndex in current.indices) {
             val item = current.removeAt(fromIndex)
             current.add(toIndex, item)
+            viewModelScope.launch {
                 appSettings.setSiteOrder(current)
             }
         }
@@ -128,10 +145,11 @@ class MainViewModel @Inject constructor(
                     isEnabled = true
                 )
             )
-            // 키워드 순서 맨 앞에 추가
             val currentOrder = appSettings.keywordOrder.first().toMutableList()
             currentOrder.add(0, newId)
             appSettings.setKeywordOrder(currentOrder)
+            // 키워드 등록 후 매칭 검사를 위해 즉시 갱신
+            refresh()
         }
     }
 
@@ -147,16 +165,20 @@ class MainViewModel @Inject constructor(
     fun toggleKeyword(id: Long, enabled: Boolean) {
         viewModelScope.launch {
             keywordDao.updateEnabled(id, enabled)
+            if (enabled) {
+                refresh()
+            }
         }
     }
 
     fun reorderKeywords(fromIndex: Int, toIndex: Int) {
-        val state = uiState.value as? MainUiState.Success ?: return
-        viewModelScope.launch {
+        val state = _uiState.value as? MainUiState.Success ?: return
         val current = state.keywords.toMutableList()
         if (fromIndex in current.indices && toIndex in current.indices) {
             val item = current.removeAt(fromIndex)
             current.add(toIndex, item)
+            _uiState.value = state.copy(keywords = current)
+            viewModelScope.launch {
                 appSettings.setKeywordOrder(current.map { it.id })
             }
         }
@@ -174,8 +196,20 @@ class MainViewModel @Inject constructor(
         }
     }
 
+    /**
+     * 직접 즉시 스크래핑 실행 (WorkManager 큐 대기 지연 없이 UI 및 DB 즉시 갱신)
+     */
     fun refresh() {
-        workerScheduler.executeOnce()
+        viewModelScope.launch {
+            _isRefreshing.value = true
+            try {
+                scraperManager.fetchAndProcessDeals()
+            } catch (e: Exception) {
+                // 에러 발생 시 무시 (UI는 DB Flow로 유지)
+            } finally {
+                _isRefreshing.value = false
+            }
+        }
     }
 
     fun startPolling(intervalMinutes: Long = WorkerScheduler.DEFAULT_INTERVAL_MINUTES) {

app/src/main/java/com/hotdeal/alarm/receiver/BootReceiver.kt

@@ -0,0 +1,48 @@
+package com.hotdeal.alarm.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.hotdeal.alarm.data.local.preferences.AppSettings
+import com.hotdeal.alarm.worker.WorkerScheduler
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+/**
+ * 부팅 완료 시 백그라운드 폴링을 자동으로 재등록하는 리시버
+ */
+@AndroidEntryPoint
+class BootReceiver : BroadcastReceiver() {
+
+    @Inject
+    lateinit var workerScheduler: WorkerScheduler
+
+    @Inject
+    lateinit var appSettings: AppSettings
+
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == Intent.ACTION_BOOT_COMPLETED ||
+            intent.action == Intent.ACTION_MY_PACKAGE_REPLACED
+        ) {
+            Log.d("BootReceiver", "부팅/업데이트 감지 → 백그라운드 폴링 재등록")
+            scope.launch {
+                try {
+                    val interval = appSettings.pollingInterval.first()
+                    workerScheduler.schedulePeriodicPolling(interval.toLong())
+                    Log.d("BootReceiver", "폴링 재등록 완료: ${interval}분 간격")
+                } catch (e: Exception) {
+                    Log.e("BootReceiver", "폴링 재등록 실패: ${e.message}")
+                    workerScheduler.schedulePeriodicPolling(WorkerScheduler.DEFAULT_INTERVAL_MINUTES)
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/hotdeal/alarm/receiver/PollingAlarmReceiver.kt

@@ -0,0 +1,71 @@
+package com.hotdeal.alarm.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.hotdeal.alarm.data.local.preferences.AppSettings
+import com.hotdeal.alarm.domain.usecase.HotDealScraperManager
+import com.hotdeal.alarm.worker.AlarmScheduler
+import com.hotdeal.alarm.worker.WorkerScheduler
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+/**
+ * 주기적 알람 수신 시 백그라운드 스크래핑을 즉시 실행하고 다음 알람을 예약하는 리시버
+ * 
+ * goAsync()를 사용하여 WorkManager의 Doze 지연 없이 백그라운드에서 즉시 핫딜을 수집하고 알림을 발송합니다.
+ */
+@AndroidEntryPoint
+class PollingAlarmReceiver : BroadcastReceiver() {
+
+    companion object {
+        private const val TAG = "PollingAlarmReceiver"
+    }
+
+    @Inject
+    lateinit var scraperManager: HotDealScraperManager
+
+    @Inject
+    lateinit var alarmScheduler: AlarmScheduler
+
+    @Inject
+    lateinit var appSettings: AppSettings
+
+    private val receiverScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == AlarmScheduler.ACTION_POLL_ALARM) {
+            Log.d(TAG, "⏰ [실시간 알람 수신] 백그라운드 스크래핑 즉시 시작 및 다음 알람 예약")
+
+            val pendingResult = goAsync()
+
+            receiverScope.launch {
+                try {
+                    // 1. 백그라운드에서 직접 스크래핑, DB 저장, 키워드 알림 즉시 발송!
+                    val newDeals = scraperManager.fetchAndProcessDeals()
+                    Log.d(TAG, "⏰ [스크래핑 완료] 신규 핫딜 ${newDeals.size}개 처리됨")
+                } catch (e: Exception) {
+                    Log.e(TAG, "알람 처리 중 오류: ${e.message}", e)
+                } finally {
+                    // 2. 다음 주기 알람 예약 (Self-rescheduling)
+                    try {
+                        val interval = appSettings.pollingInterval.first().toLong()
+                        alarmScheduler.scheduleAlarm(interval)
+                        Log.d(TAG, "⏰ 다음 폴링 알람 예약 완료: ${interval}분 후")
+                    } catch (e: Exception) {
+                        Log.e(TAG, "다음 알람 예약 실패: ${e.message}")
+                        alarmScheduler.scheduleAlarm(WorkerScheduler.DEFAULT_INTERVAL_MINUTES)
+                    }
+
+                    pendingResult.finish()
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/hotdeal/alarm/worker/AlarmScheduler.kt

@@ -0,0 +1,116 @@
+package com.hotdeal.alarm.worker
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.util.Log
+import com.hotdeal.alarm.receiver.PollingAlarmReceiver
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * 실시간 백그라운드 폴링을 위한 AlarmManager 스케줄러
+ * 
+ * WorkManager PeriodicWork의 15분 주기 제한 및 Doze 모드 지연을 극복하기 위해
+ * AlarmManager (setExactAndAllowWhileIdle / setAndAllowWhileIdle)를 사용하여
+ * 사용자가 설정한 주기(1분, 2분, 5분 등)대로 정확하게 백그라운드 수집을 보장합니다.
+ */
+@Singleton
+class AlarmScheduler @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    companion object {
+        private const val TAG = "AlarmScheduler"
+        const val ACTION_POLL_ALARM = "com.hotdeal.alarm.ACTION_POLL_ALARM"
+        private const val REQUEST_CODE = 2001
+    }
+
+    private val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+
+    /**
+     * 알람 예약 (Doze mode에서도 정확히 깨어남)
+     * @param intervalMinutes 폴링 간격 (분)
+     */
+    fun scheduleAlarm(intervalMinutes: Long) {
+        val safeInterval = intervalMinutes.coerceAtLeast(1L)
+        val triggerTime = System.currentTimeMillis() + (safeInterval * 60 * 1000L)
+
+        val intent = Intent(context, PollingAlarmReceiver::class.java).apply {
+            action = ACTION_POLL_ALARM
+        }
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            REQUEST_CODE,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                if (alarmManager.canScheduleExactAlarms()) {
+                    alarmManager.setExactAndAllowWhileIdle(
+                        AlarmManager.RTC_WAKEUP,
+                        triggerTime,
+                        pendingIntent
+                    )
+                    Log.d(TAG, "Exact Alarm 예약 완료: ${safeInterval}분 후 (${triggerTime})")
+                } else {
+                    alarmManager.setAndAllowWhileIdle(
+                        AlarmManager.RTC_WAKEUP,
+                        triggerTime,
+                        pendingIntent
+                    )
+                    Log.d(TAG, "Inexact Alarm 예약 완료: ${safeInterval}분 후 (권한 없음)")
+                }
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                alarmManager.setExactAndAllowWhileIdle(
+                    AlarmManager.RTC_WAKEUP,
+                    triggerTime,
+                    pendingIntent
+                )
+                Log.d(TAG, "Exact Alarm 예약 완료 (API < 31): ${safeInterval}분 후")
+            } else {
+                alarmManager.setExact(
+                    AlarmManager.RTC_WAKEUP,
+                    triggerTime,
+                    pendingIntent
+                )
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Alarm 예약 실패: ${e.message}", e)
+            try {
+                alarmManager.setAndAllowWhileIdle(
+                    AlarmManager.RTC_WAKEUP,
+                    triggerTime,
+                    pendingIntent
+                )
+            } catch (fallbackEx: Exception) {
+                Log.e(TAG, "Alarm 폴백 예약도 실패: ${fallbackEx.message}")
+            }
+        }
+    }
+
+    /**
+     * 알람 취소
+     */
+    fun cancelAlarm() {
+        val intent = Intent(context, PollingAlarmReceiver::class.java).apply {
+            action = ACTION_POLL_ALARM
+        }
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            REQUEST_CODE,
+            intent,
+            PendingIntent.FLAG_NO_CREATE or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        if (pendingIntent != null) {
+            alarmManager.cancel(pendingIntent)
+            pendingIntent.cancel()
+            Log.d(TAG, "Alarm 취소 완료")
+        }
+    }
+}

app/src/main/java/com/hotdeal/alarm/worker/HotDealPollingWorker.kt

@@ -6,33 +6,20 @@ import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
 import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
-import com.hotdeal.alarm.data.local.db.entity.HotDealEntity
-import com.hotdeal.alarm.data.local.db.entity.KeywordEntity
-import com.hotdeal.alarm.data.local.db.entity.SiteConfigEntity
-import com.hotdeal.alarm.data.remote.scraper.ScraperFactory
-import com.hotdeal.alarm.domain.model.HotDeal
+import com.hotdeal.alarm.domain.usecase.HotDealScraperManager
 import com.hotdeal.alarm.service.NotificationService
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.withContext
 
 /**
- * 핫딜 폴� Worker
- * 
- * 키워드 매칭된 핫딜만 알림 발송
+ * 핫딜 폴링 Worker (WorkManager 전용)
  */
 @HiltWorker
 class HotDealPollingWorker @AssistedInject constructor(
     @Assisted private val context: Context,
     @Assisted workerParams: WorkerParameters,
-    private val scraperFactory: ScraperFactory,
-    private val notificationService: NotificationService,
-    private val dealDao: com.hotdeal.alarm.data.local.db.dao.HotDealDao,
-    private val siteConfigDao: com.hotdeal.alarm.data.local.db.dao.SiteConfigDao,
-    private val keywordDao: com.hotdeal.alarm.data.local.db.dao.KeywordDao
+    private val scraperManager: HotDealScraperManager,
+    private val notificationService: NotificationService
 ) : CoroutineWorker(context, workerParams) {
     
     companion object {
@@ -40,146 +27,18 @@ class HotDealPollingWorker @AssistedInject constructor(
         const val TAG = "HotDealPolling"
     }
     
-    override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
-        try {
-            Log.d(TAG, "===== 핫딜 폴� 시작 =====")
-            
-            // 1. 활성화된 사이트 설정 조회
-            val enabledConfigs = siteConfigDao.getEnabledConfigs()
-            Log.d(TAG, "활성화된 사이트 설정: ${enabledConfigs.size}개")
-            
-            if (enabledConfigs.isEmpty()) {
-                Log.w(TAG, "활성화된 사이트 설정이 없습니다.")
-                return@withContext Result.success()
-            }
-
-            // 2. 활성화된 키워드 조회
-            val keywords = keywordDao.getEnabledKeywords()
-            Log.d(TAG, "활성화된 키워드: ${keywords.size}개")
-
-            // 3. 각 사이트/게시판 스크래핑 (병렬)
-            Log.d(TAG, "스크래핑 시작...")
-            val allDeals = enabledConfigs.map { config ->
-                async {
-                    scrapeSite(config)
-                }
-            }.awaitAll().flatten()
-
-            Log.d(TAG, "스크래핑 완료: 총 ${allDeals.size}개 핫딜")
-            
-            if (allDeals.isEmpty()) {
-                Log.w(TAG, "스크래핑된 핫딜이 없습니다.")
-                return@withContext Result.success()
-            }
-
-            // 4. 새로운 핫딜 필터링
-            val newDeals = filterNewDeals(allDeals)
-            Log.d(TAG, "새로운 핫딜: ${newDeals.size}개")
-
-            if (newDeals.isEmpty()) {
-                Log.d(TAG, "새로운 핫딜이 없습니다.")
-                return@withContext Result.success()
-            }
-
-            // 5. 키워드 매칭 (키워드가 있을 때만)
-            val keywordMatchedDeals = if (keywords.isNotEmpty()) {
-                filterByKeywords(newDeals, keywords).also {
-                    Log.d(TAG, "키워드 매칭 핫딜: ${it.size}개")
-                }
-            } else {
-                Log.d(TAG, "키워드가 없어 매칭 체크를 건�뜁니다.")
-                emptyList()
-            }
-
-            // 6. DB 저장
-            var insertedCount = 0
-            newDeals.forEach { deal ->
-                try {
-                    val entity = HotDealEntity.fromDomain(deal)
-                    dealDao.insertDeal(entity)
-                    insertedCount++
-                } catch (e: Exception) {
-                    Log.w(TAG, "핫딜 저장 실패 (무시됨): ${deal.id}")
-                }
-            }
-            Log.d(TAG, "DB 저장 완료: $insertedCount/${newDeals.size}개 저장됨")
-
-            // 7. 키워드 매칭 알림 발송 (키워드 매칭된 것만!)
-            if (keywordMatchedDeals.isNotEmpty()) {
-                Log.d(TAG, "키워드 매칭 알림 발송: ${keywordMatchedDeals.size}개")
-                notificationService.showKeywordMatchNotification(keywordMatchedDeals)
-                dealDao.markAsKeywordMatch(keywordMatchedDeals.map { it.id })
-            } else {
-                Log.d(TAG, "키워드 매칭된 핫딜이 없어 알림을 발송하지 않습니다.")
-            }
-
-            // 8. 알림 발송 상태 업데이트
-            dealDao.markAsNotified(newDeals.map { it.id })
-
- // 9. 오래된 데이터 정리 (3일 이상 - 배터리/데이터 절약)
- val threshold = System.currentTimeMillis() - (3 * 24 * 60 * 60 * 1000L)
- dealDao.deleteOldDeals(threshold)
-
-            Log.d(TAG, "===== 핫딜 폴� 완료 =====")
+    override suspend fun doWork(): Result {
+        Log.d(TAG, "WorkManager HotDealPollingWorker 실행됨")
+        return try {
+            scraperManager.fetchAndProcessDeals()
             Result.success()
         } catch (e: Exception) {
-            Log.e(TAG, "폴� 오류: ${e.message}", e)
-            if (runAttemptCount < 3) {
-                Result.retry()
-            } else {
-                Result.failure()
-            }
+            Log.e(TAG, "Worker 실행 실패: ${e.message}", e)
+            if (runAttemptCount < 3) Result.retry() else Result.failure()
         }
     }
     
     override suspend fun getForegroundInfo(): ForegroundInfo {
         return notificationService.createForegroundInfo()
     }
-    
-    private suspend fun scrapeSite(config: SiteConfigEntity): List<HotDeal> {
-        val scraper = scraperFactory.getScraper(config.siteName)
-        if (scraper == null) {
-            Log.w(TAG, "스크래퍼를 찾을 수 없음: ${config.siteName}")
-            return emptyList()
-        }
-
-        Log.d(TAG, "스크래핑: ${config.siteName}/${config.boardName}")
-        val result = scraper.scrape(config.boardName)
-        
-        result.fold(
-            onSuccess = { deals ->
-                Log.d(TAG, " ${config.siteName}: ${deals.size}개 핫딜 파싱됨")
-                try {
-                    siteConfigDao.updateLastScrapedAt(config.siteBoardKey, System.currentTimeMillis())
-                } catch (e: Exception) {
-                    Log.w(TAG, "lastScrapedAt 업데이트 실패: ${config.siteBoardKey}")
-                }
-            },
-            onFailure = { error ->
-                Log.e(TAG, " ${config.siteName} 스크래핑 실패: ${error.message}")
-            }
-        )
-
-        return result.getOrElse { emptyList() }
-    }
-    
-    private suspend fun filterNewDeals(deals: List<HotDeal>): List<HotDeal> {
-        return deals.filter { deal ->
-            val existingByUrl = dealDao.getDealByUrl(deal.url)
-            if (existingByUrl != null) return@filter false
-            
-            val existingById = dealDao.getDealById(deal.id)
-            if (existingById != null) return@filter false
-            
-            true
-        }
-    }
-    
-    private fun filterByKeywords(deals: List<HotDeal>, keywords: List<KeywordEntity>): List<HotDeal> {
-        return deals.filter { deal ->
-            keywords.any { keyword ->
-                deal.title.contains(keyword.keyword, ignoreCase = true)
-            }
-        }
-    }
 }

app/src/main/java/com/hotdeal/alarm/worker/WorkerScheduler.kt

@@ -1,6 +1,7 @@
 package com.hotdeal.alarm.worker
 
 import android.content.Context
+import android.util.Log
 import androidx.work.*
 import dagger.hilt.android.qualifiers.ApplicationContext
 import java.util.concurrent.TimeUnit
@@ -8,35 +9,40 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * Worker 스케줄러
+ * 실시간 백그라운드 폴링 통합 스케줄러
  * 
- * 기본 폴� 주기: 2분
- * 배터리/데이터 절약을 위해 최소 2분 권장
+ * 1. AlarmManager (AlarmScheduler): Doze Mode에서도 사용자가 지정한 정확한 주기(1분, 2분 등)로 즉시 실행
+ * 2. WorkManager (HotDealPollingWorker): OS 백그라운드 작업 관리 및 백업 실행
  */
 @Singleton
 class WorkerScheduler @Inject constructor(
-    @ApplicationContext private val context: Context
+    @ApplicationContext private val context: Context,
+    private val alarmScheduler: AlarmScheduler
 ) {
     companion object {
+        private const val TAG = "WorkerScheduler"
         const val DEFAULT_INTERVAL_MINUTES = 2L
         const val MIN_INTERVAL_MINUTES = 1L
         const val MAX_INTERVAL_MINUTES = 60L
     }
     
     /**
-     * 주기적 폴� 예약
-     * @param intervalMinutes 폴� 간격 (분) - 기본 2분
+     * 주기적 폴링 예약 (AlarmManager + WorkManager 이중 등록)
+     * @param intervalMinutes 폴링 간격 (분)
      */
     fun schedulePeriodicPolling(intervalMinutes: Long = DEFAULT_INTERVAL_MINUTES) {
-        // 최소/최대 값 제한
         val safeInterval = intervalMinutes.coerceIn(MIN_INTERVAL_MINUTES, MAX_INTERVAL_MINUTES)
+        Log.d(TAG, "주기적 폴링 예약 시작: ${safeInterval}분 간격")
 
+        // 1. AlarmManager 기반 정확한 주기 알람 예약 (Doze mode 관통)
+        alarmScheduler.scheduleAlarm(safeInterval)
+        
+        // 2. WorkManager 기반 백업 주기 작업 예약
         val constraints = Constraints.Builder()
             .setRequiredNetworkType(NetworkType.CONNECTED)
             .setRequiresDeviceIdle(false)
             .build()
         
-        // 유연한 실행 시간 (±25%)
         val flexTime = (safeInterval * 0.25).toLong().coerceAtLeast(1)
         
         val workRequest = PeriodicWorkRequestBuilder<HotDealPollingWorker>(
@@ -54,21 +60,23 @@ class WorkerScheduler @Inject constructor(
         
         WorkManager.getInstance(context).enqueueUniquePeriodicWork(
             HotDealPollingWorker.WORK_NAME,
-            ExistingPeriodicWorkPolicy.KEEP,
+            ExistingPeriodicWorkPolicy.UPDATE,
             workRequest
         )
     }
     
     /**
-     * 한 번만 실행
+     * 즉시 1회 실행 (메인화면 진입 / 새로고침 / 알람 수신 시)
      */
     fun executeOnce() {
+        Log.d(TAG, "즉시 1회 스크래핑 요청 (executeOnce)")
         val constraints = Constraints.Builder()
             .setRequiredNetworkType(NetworkType.CONNECTED)
             .build()
         
         val workRequest = OneTimeWorkRequestBuilder<HotDealPollingWorker>()
             .setConstraints(constraints)
+            .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
             .addTag(HotDealPollingWorker.TAG)
             .build()
         
@@ -76,22 +84,28 @@ class WorkerScheduler @Inject constructor(
     }
     
     /**
-     * 폴� 취소
+     * 폴링 취소
      */
     fun cancelPolling() {
+        Log.d(TAG, "폴링 전체 취소")
+        alarmScheduler.cancelAlarm()
         WorkManager.getInstance(context).cancelUniqueWork(HotDealPollingWorker.WORK_NAME)
     }
     
     /**
-     * 폴� 활성화 여부 확인
+     * 폴링 활성화 여부 확인
      */
     fun isPollingActive(): Boolean {
+        return try {
             val workInfos = WorkManager.getInstance(context)
                 .getWorkInfosForUniqueWork(HotDealPollingWorker.WORK_NAME)
                 .get()
             
-        return workInfos.any { 
+            workInfos.any { 
                 it.state == WorkInfo.State.RUNNING || it.state == WorkInfo.State.ENQUEUED 
             }
+        } catch (e: Exception) {
+            false
+        }
     }
 }

version.json

@@ -1,7 +1,7 @@
 {
-  "version": "0.2.9",
-  "versionCode": 29,
-  "updateUrl": "https://git.webpluss.net/sanjeok77/hotdeal_alarm/releases/download/v0.2.9/app-release.apk",
+  "version": "0.3.5",
+  "versionCode": 35,
+  "updateUrl": "https://git.webpluss.net/sanjeok77/hotdeal_alarm/releases/download/v0.3.5/app-release.apk",
   "changelog": [
     "사이트 및 키워드 순서 조절을 터치 드래그 앤 드롭(Drag & Drop) 방식으로 전면 업그레이드",
     "앱 내 업데이트 시 다운로드 완료 후 설치 화면으로 안 넘어가는 버그 수정",