Update version 1.1.0

FiveGuyes/FiveGuyes.xcodeproj/project.pbxproj

@@ -18,6 +18,7 @@
 		1A27D9662CDB779000D1E14D /* TotalCalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A27D9652CDB779000D1E14D /* TotalCalendarView.swift */; };
 		1A54142B2CD9FEF400283FBD /* BookSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A54142A2CD9FEF400283FBD /* BookSearchView.swift */; };
 		1AA14A782CDDA30D00B763A6 /* TotalCalendarTextBubble.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AA14A772CDDA30D00B763A6 /* TotalCalendarTextBubble.swift */; };
+		1AA14A7A2CDDD96200B763A6 /* NotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AA14A792CDDD96200B763A6 /* NotificationManager.swift */; };
 		24360D482CD8BAF100E83D2B /* EmptyNotiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24360D472CD8BAF100E83D2B /* EmptyNotiView.swift */; };
 		24360D4A2CD8BE3C00E83D2B /* FinishGoalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24360D492CD8BE3C00E83D2B /* FinishGoalView.swift */; };
 		24360D532CD9F3AF00E83D2B /* DailyProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24360D522CD9F3AF00E83D2B /* DailyProgressView.swift */; };
@@ -39,6 +40,7 @@
 		26EBDE262CDE3C6000B3A2BC /* BookSettingInputModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EBDE252CDE3C6000B3A2BC /* BookSettingInputModel.swift */; };
 		26EBDE2A2CDF33D900B3A2BC /* Date+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EBDE292CDF33D900B3A2BC /* Date+Extension.swift */; };
 		26EBDE2C2CE1341800B3A2BC /* UserBook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EBDE2B2CE1341800B3A2BC /* UserBook.swift */; };
+		26EBDE2F2CE3856900B3A2BC /* NotificationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EBDE2E2CE3856900B3A2BC /* NotificationType.swift */; };
 		26F19A682CD9EFD800F41D6D /* MainHomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26F19A672CD9EFD800F41D6D /* MainHomeView.swift */; };
 		26F19A6A2CD9FE5C00F41D6D /* WeeklyReadingProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26F19A692CD9FE5C00F41D6D /* WeeklyReadingProgressView.swift */; };
 		26F19A6C2CDA0A2B00F41D6D /* CompletionListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26F19A6B2CDA0A2B00F41D6D /* CompletionListView.swift */; };
@@ -47,7 +49,6 @@
 		26F19A742CDB271E00F41D6D /* NavigationRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26F19A732CDB271E00F41D6D /* NavigationRootView.swift */; };
 		26F19A782CDB5D0100F41D6D /* BookDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26F19A772CDB5D0100F41D6D /* BookDetails.swift */; };
 		26F19A7A2CDB5F3900F41D6D /* ReadingScheduleCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26F19A792CDB5F3900F41D6D /* ReadingScheduleCalculator.swift */; };
-		26F19A822CDBE3A600F41D6D /* ReadingTestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26F19A812CDBE3A600F41D6D /* ReadingTestView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -63,6 +64,8 @@
 		1A27D9652CDB779000D1E14D /* TotalCalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalCalendarView.swift; sourceTree = "<group>"; };
 		1A54142A2CD9FEF400283FBD /* BookSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = BookSearchView.swift; path = FiveGuyes/Sources/Views/Screen/BookSetting/BookSearch/BookSearchView.swift; sourceTree = SOURCE_ROOT; };
 		1AA14A772CDDA30D00B763A6 /* TotalCalendarTextBubble.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalCalendarTextBubble.swift; sourceTree = "<group>"; };
+		1AA14A792CDDD96200B763A6 /* NotificationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationManager.swift; sourceTree = "<group>"; };
+		24360D452CD8A2F800E83D2B /* EmptyDataMainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyDataMainView.swift; sourceTree = "<group>"; };
 		24360D472CD8BAF100E83D2B /* EmptyNotiView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyNotiView.swift; sourceTree = "<group>"; };
 		24360D492CD8BE3C00E83D2B /* FinishGoalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FinishGoalView.swift; sourceTree = "<group>"; };
 		24360D522CD9F3AF00E83D2B /* DailyProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyProgressView.swift; sourceTree = "<group>"; };
@@ -85,6 +88,7 @@
 		26EBDE252CDE3C6000B3A2BC /* BookSettingInputModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookSettingInputModel.swift; sourceTree = "<group>"; };
 		26EBDE292CDF33D900B3A2BC /* Date+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Extension.swift"; sourceTree = "<group>"; };
 		26EBDE2B2CE1341800B3A2BC /* UserBook.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserBook.swift; sourceTree = "<group>"; };
+		26EBDE2E2CE3856900B3A2BC /* NotificationType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationType.swift; sourceTree = "<group>"; };
 		26F19A672CD9EFD800F41D6D /* MainHomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainHomeView.swift; sourceTree = "<group>"; };
 		26F19A692CD9FE5C00F41D6D /* WeeklyReadingProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeeklyReadingProgressView.swift; sourceTree = "<group>"; };
 		26F19A6B2CDA0A2B00F41D6D /* CompletionListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompletionListView.swift; sourceTree = "<group>"; };
@@ -93,7 +97,6 @@
 		26F19A732CDB271E00F41D6D /* NavigationRootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationRootView.swift; sourceTree = "<group>"; };
 		26F19A772CDB5D0100F41D6D /* BookDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookDetails.swift; sourceTree = "<group>"; };
 		26F19A792CDB5F3900F41D6D /* ReadingScheduleCalculator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadingScheduleCalculator.swift; sourceTree = "<group>"; };
-		26F19A812CDBE3A600F41D6D /* ReadingTestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadingTestView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -142,6 +145,7 @@
 				261714D32CDD27C900A3241D /* Config.xcconfig */,
 				26890B932CAE811A008DFF49 /* FiveGuyes */,
 				26890B922CAE811A008DFF49 /* Products */,
+				26EBDE2D2CE3307C00B3A2BC /* Recovered References */,
 			);
 			sourceTree = "<group>";
 		};
@@ -218,7 +222,6 @@
 		26D852FB2CCE40BC0016239A /* Screen */ = {
 			isa = PBXGroup;
 			children = (
-				26F19A832CDC970D00F41D6D /* Testing */,
 				26F19A662CD9EF9400F41D6D /* Main */,
 				1A27D95E2CDA155B00D1E14D /* BookSetting */,
 				24360D4F2CD9F2D800E83D2B /* BookProgress */,
@@ -264,6 +267,8 @@
 				26F19A772CDB5D0100F41D6D /* BookDetails.swift */,
 				26EBDE2B2CE1341800B3A2BC /* UserBook.swift */,
 				26F19A792CDB5F3900F41D6D /* ReadingScheduleCalculator.swift */,
+				26EBDE2E2CE3856900B3A2BC /* NotificationType.swift */,
+				1AA14A792CDDD96200B763A6 /* NotificationManager.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -300,20 +305,20 @@
 			path = BookSearch;
 			sourceTree = "<group>";
 		};
-		26F19A662CD9EF9400F41D6D /* Main */ = {
+		26EBDE2D2CE3307C00B3A2BC /* Recovered References */ = {
 			isa = PBXGroup;
 			children = (
-				26F19A672CD9EFD800F41D6D /* MainHomeView.swift */,
+				24360D452CD8A2F800E83D2B /* EmptyDataMainView.swift */,
 			);
-			path = Main;
+			name = "Recovered References";
 			sourceTree = "<group>";
 		};
-		26F19A832CDC970D00F41D6D /* Testing */ = {
+		26F19A662CD9EF9400F41D6D /* Main */ = {
 			isa = PBXGroup;
 			children = (
-				26F19A812CDBE3A600F41D6D /* ReadingTestView.swift */,
+				26F19A672CD9EFD800F41D6D /* MainHomeView.swift */,
 			);
-			path = Testing;
+			path = Main;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -394,7 +399,6 @@
 			files = (
 				1A54142B2CD9FEF400283FBD /* BookSearchView.swift in Sources */,
 				26F19A782CDB5D0100F41D6D /* BookDetails.swift in Sources */,
-				26F19A822CDBE3A600F41D6D /* ReadingTestView.swift in Sources */,
 				1A010EAE2CD8A86E00FBE3B3 /* APIStore.swift in Sources */,
 				24A2063F2CDB180000964FBB /* CompletionCalendarView.swift in Sources */,
 				1A010EBE2CD8DA2400FBE3B3 /* BookListView.swift in Sources */,
@@ -416,6 +420,7 @@
 				24360D4A2CD8BE3C00E83D2B /* FinishGoalView.swift in Sources */,
 				26F19A682CD9EFD800F41D6D /* MainHomeView.swift in Sources */,
 				26F19A742CDB271E00F41D6D /* NavigationRootView.swift in Sources */,
+				1AA14A7A2CDDD96200B763A6 /* NotificationManager.swift in Sources */,
 				264440502CD8A3AC0031A290 /* CompletionReviewView.swift in Sources */,
 				264440502CD8A3AC0031A290 /* CompletionReviewView.swift in Sources */,
 				26890B952CAE811A008DFF49 /* FiveGuyesApp.swift in Sources */,
@@ -425,6 +430,7 @@
 				264440572CD8E0D20031A290 /* CustomTextEditorStyle.swift in Sources */,
 				264440552CD8E0100031A290 /* KeyboardObserver.swift in Sources */,
 				26F19A6C2CDA0A2B00F41D6D /* CompletionListView.swift in Sources */,
+				26EBDE2F2CE3856900B3A2BC /* NotificationType.swift in Sources */,
 				1A27D9662CDB779000D1E14D /* TotalCalendarView.swift in Sources */,
 				2644404E2CD8A39E0031A290 /* CompletionCelebrationView.swift in Sources */,
 				26EBDE262CDE3C6000B3A2BC /* BookSettingInputModel.swift in Sources */,

FiveGuyes/FiveGuyes/Sources/Models/NotificationManager.swift

@@ -0,0 +1,88 @@
+//
+//  NotificationManager.swift
+//  FiveGuyes
+//
+//  Created by Shim Hyeonhee on 11/8/24.
+//
+
+import UserNotifications
+
+final class NotificationManager {
+    private let notificationCenter = UNUserNotificationCenter.current()
+    private var isGranted: Bool = false
+
+    func setupNotifications(notificationType: NotificationType) async {
+        await requestAuthorization()
+
+        if isGranted {
+            await scheduleReminderNotification(notificationType: notificationType)
+        }
+    }
+
+    /// 요청한 Noticifation을 모두 지우는 함수
+    func clearRequests() {
+        notificationCenter.removeAllPendingNotificationRequests()
+    }
+
+    /// Notification 권한 요청 함수
+    private func requestAuthorization() async {
+        do {
+            try await notificationCenter
+                .requestAuthorization(options: [.sound, .badge, .alert])
+        } catch {
+            print("❌ NotificationManager/requestAuthorization: \(error.localizedDescription)")
+        }
+
+        await getCurrentSettings()
+    }
+
+    /// 현재 Notification 권한 설정을 가져오는 함수
+    private func getCurrentSettings() async {
+        let currentSettings = await notificationCenter.notificationSettings()
+
+        isGranted = (currentSettings.authorizationStatus == .authorized)
+    }
+
+    private func scheduleReminderNotification(notificationType: NotificationType) async {
+        // dateContent가 nil일 경우 알림을 보내지 않음
+        guard let date = notificationType.dateContent() else {
+            print("❌ NotificationManager: 다음 읽기 날짜가 없어 알림을 생성하지 않습니다.")
+            return
+        }
+
+        let dateComponents = makeDateComponents(date: date, notificationType)
+        let content = makeNotificationContent(notificationType)
+
+        let identifier = notificationType.identifier()
+
+        // 설정대로 트리거, 요청 셋팅
+        let trigger = UNCalendarNotificationTrigger(dateMatching: dateComponents, repeats: false)
+        let request = UNNotificationRequest(identifier: identifier, content: content, trigger: trigger)
+
+        do {
+            try await notificationCenter.add(request)
+            print("💯 노티 설정 완료")
+        } catch {
+            print("❌ NotificationManager/schedule: \(error.localizedDescription)")
+        }
+    }
+
+    private func makeDateComponents(date: Date, _ notificationType: NotificationType) -> DateComponents {
+        let calendar = Calendar.current
+        let day = calendar.component(.day, from: date)
+        let month = calendar.component(.month, from: date)
+        let year = calendar.component(.year, from: date)
+        let (hour, minute) = notificationType.timeContent()
+        print("💯노티 설정: \(date) \(hour): \(minute)")
+        return DateComponents(year: year, month: month, day: day, hour: hour, minute: minute)
+    }
+
+    private func makeNotificationContent(_ notificationType: NotificationType) -> UNMutableNotificationContent {
+        let content = UNMutableNotificationContent()
+        let (title, body) = notificationType.descriptionContent()
+        content.title = title
+        content.body = body
+
+        return content
+    }
+}

FiveGuyes/FiveGuyes/Sources/Models/NotificationType.swift

@@ -0,0 +1,53 @@
+//
+//  NotificationType.swift
+//  FiveGuyes
+//
+//  Created by zaehorang on 11/12/24.
+//
+
+import Foundation
+
+enum NotificationType {
+    case morning(readingBook: UserBook)
+    case night(readingBook: UserBook)
+
+    func descriptionContent() -> (title: String, body: String) {
+        switch self {
+        case .morning(let readingBook):
+            let title = "오늘의 한입, 준비됐나요?"
+            let body = "오늘은 \(readingBook.findNextReadingPagesPerDay())페이지만 읽으면 돼요 멍멍!"
+            return (title, body)
+
+        case .night:
+            let title = "오늘의 한입독서를 놓치고 계신가요?"
+            let body = "오늘 완독하지 않았어요!\n완독이가 물어버릴거에요 🥎 왕왕"
+            return (title, body)
+        }
+    }
+
+    func dateContent() -> Date? {
+        switch self {
+        case .morning(let readingBook), .night(let readingBook):
+            return readingBook.findNextReadingDay()
+        }
+    }
+
+    func timeContent() -> (hour: Int, minute: Int) {
+        switch self {
+        case .morning:
+            return (11, 0)
+        case .night:
+            return (23, 0)
+        }
+    }
+
+    /// 고유 identifier 생성 메서드
+    func identifier() -> String {
+        switch self {
+        case .morning(let readingBook):
+            return "\(readingBook.book.title)-morning"
+        case .night(let readingBook):
+            return "\(readingBook.book.title)-night"
+        }
+    }    
+}

FiveGuyes/FiveGuyes/Sources/Models/ReadingScheduleCalculator.swift

@@ -24,8 +24,7 @@ struct ReadingScheduleCalculator {
 
     // MARK: 첫날을 기준으로 읽어야하는 페이지를 할당하는 메서드 (초기 페이지 계산)
     func calculateInitialDailyTargets(for currentReadingBook: UserBook) {
-        let pagesPerDay = firstCalculatePagesPerDay(for: currentReadingBook)
-        let remainderPages = firstCalculateRemainderPages(for: currentReadingBook)
+        let (pagesPerDay, remainderPages) = firstCalculatePagesPerDay(for: currentReadingBook)
 
         var targetDate = currentReadingBook.book.startDate
         var remainderOffset = remainderPages
@@ -78,7 +77,7 @@ struct ReadingScheduleCalculator {
         }
     }
 
-    //MARK: 더 읽거나, 덜 읽으면 이후 날짜의 할당량을 다시 계산한다.
+    // MARK: 더 읽거나, 덜 읽으면 이후 날짜의 할당량을 다시 계산한다.
     func adjustFutureTargets(for currentReadingBook: UserBook, from date: Date) {
         let totalRemainingPages = calculateRemainingPages(for: currentReadingBook)
         print("❌: \(totalRemainingPages)")
@@ -126,16 +125,10 @@ struct ReadingScheduleCalculator {
     func reassignPagesFromLastReadDate(for currentReadingBook: UserBook) {
         // 이미 읽었으면 재분배 x
         if hasReadPagesToday(for: currentReadingBook) { return }
-
-        // 몇 페이지 남음?
-        let totalRemainingPages = calculateRemainingPages(for: currentReadingBook)
-        print("❌re: \(totalRemainingPages)")
-        // 오늘부터 며칠 남음?
-        let remainingDays = calculateRemainingReadingDays(for: currentReadingBook)
-        print("🐶re: \(remainingDays)")
-        // 남은 페이지와 날짜를 기준으로 새롭게 할당량 계산
-        let pagesPerDay = totalRemainingPages / remainingDays
-        var remainderOffset = totalRemainingPages % remainingDays
+
+        // 남은 페이지와 일수를 기준으로 새롭게 할당량 계산
+        let (pagesPerDay, remainderPages) = calculatePagesPerDay(for: currentReadingBook)
+        var remainderOffset = remainderPages
         var cumulativePages = currentReadingBook.lastPagesRead
 
         var targetDate = Date() // 오늘 날짜부터 새로 할당 시작
@@ -187,16 +180,12 @@ struct ReadingScheduleCalculator {
     }
 
     // 하루에 몇 페이지 읽는지 계산
-    func firstCalculatePagesPerDay(for currentReadingBook: UserBook) -> Int {
-        let totalReadingDays = firstCalculateTotalReadingDays(for: currentReadingBook)
-        return currentReadingBook.book.totalPages / totalReadingDays
-    }
-
-
-    // 하루에 몇 페이지 읽는지 계산하고 딱 떨어지지 않는 페이지 수 구하는 메서드
-    func firstCalculateRemainderPages(for currentReadingBook: UserBook) -> Int {
+    func firstCalculatePagesPerDay(for currentReadingBook: UserBook) -> (pagesPerDay: Int, remainder: Int) {
         let totalReadingDays = firstCalculateTotalReadingDays(for: currentReadingBook)
-        return currentReadingBook.book.totalPages % totalReadingDays
+        let pagesPerDay = currentReadingBook.book.totalPages / totalReadingDays
+        let remainder = currentReadingBook.book.totalPages % totalReadingDays
+
+        return (pagesPerDay, remainder)
     }
 
     // MARK: - 남은 양을 다시 계산할 때 사용하는 메서드
@@ -220,6 +209,19 @@ struct ReadingScheduleCalculator {
         return remainingDays
     }
 
+    // 남은 페이지와 날짜를 기반으로 일일 할당량을 계산하는 메서드
+    func calculatePagesPerDay(for currentReadingBook: UserBook) -> (pagesPerDay: Int, remainder: Int) {
+        let totalRemainingPages = calculateRemainingPages(for: currentReadingBook)
+        let remainingDays = calculateRemainingReadingDays(for: currentReadingBook)
+
+        let pagesPerDay = totalRemainingPages / remainingDays
+        let remainder = totalRemainingPages % remainingDays
+
+        print("❌읽는 중: \(totalRemainingPages)")
+        print("🐶읽는 중: \(remainingDays)")
+
+        return (pagesPerDay, remainder)
+    }
 
     // 특정 날의 묙표량과 실제 읽은 페이지의 수를 가져오는 메서드
     func getReadingRecord(for currentReadingBook: UserBook, for date: Date) -> ReadingRecord? {
@@ -228,4 +230,3 @@ struct ReadingScheduleCalculator {
         return currentReadingBook.readingRecords[dateKey]
     }
 }
-