v1.1.0: 내 체험단 및 알림 탭 추가

v1.1.0: 내 체험단 및 알림 탭 추가

Author: NeoSelf1

cherrydan.xcodeproj/project.pbxproj

@@ -473,7 +473,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.teamSquid.cherrydan;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -506,7 +506,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.teamSquid.cherrydan;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

cherrydan.xcodeproj/project.xcworkspace/xcuserdata/gimhyeongseog.xcuserdatad/UserInterfaceState.xcuserstate

@@ -7,6 +7,7 @@ import UIKit
 import Firebase
 import FirebaseMessaging
 import UserNotifications
+import SwiftUI
 
 final class AppDelegate: NSObject, UIApplicationDelegate {
     private let notificationCenter = UNUserNotificationCenter.current()
@@ -87,6 +88,27 @@ private extension AppDelegate {
     func handleNotificationData(_ userInfo: [AnyHashable: Any], isAppActive: Bool = true) {
         guard let messageType = userInfo["type"] as? String else { return }
 
+        // 서버 타입 → 앱 탭 매핑
+        let targetTab: NotificationType?
+        switch messageType {
+        case "keyword_campaign":
+            targetTab = .custom
+        case "activity_reminder":
+            targetTab = .activity
+        default:
+            targetTab = nil
+        }
+        
+        if let targetTab {
+            NotificationCenter.default.post(
+                name: .didTapPushNotification,
+                object: nil,
+                userInfo: [PushRouteUserInfoKey.targetTab: targetTab]
+            )
+            return
+        }
+        
+        // 기존 기타 타입 처리 분기 (필요 시 확장)
         switch messageType {
         case "chat":
             handleChatNotification(userInfo, isAppActive: isAppActive)

cherrydan/Application/AppDelegate.swift

@@ -0,0 +1,45 @@
+import Foundation
+
+class ActivityRepository {
+    private let networkAPI: NetworkAPI
+    
+    init(networkAPI: NetworkAPI = NetworkAPI()) {
+        self.networkAPI = networkAPI
+    }
+    
+    // MARK: - Activity Alerts
+    func getActivityNotifications(page: Int = 0) async throws ->APIResponse<PageableResponse<ActivityNotification>> {
+        let query: [String:String] = [
+            "page": String(page),
+            "size": "20",
+            "sort": "alertDate,desc"
+        ]
+        
+        do {
+            return try await networkAPI.request(ActivityEndpoint.getActivityNotification, queryParameters: query)
+        } catch {
+            print("NotificationRepository Error: \(error)")
+            throw error
+        }
+    }
+    
+    /// 활동 알림 삭제
+    func deleteActivityAlerts(alertIds: [Int]) async throws {
+        let params = ["alertIds": alertIds]
+        let _: EmptyResult = try await networkAPI.request(
+            ActivityEndpoint.deleteActivityNotifications,
+            parameters: params
+        )
+    }
+    
+    /// 활동 알림 읽음 처리
+    func markActivityAlertsAsRead(alertIds: [Int]) async throws {
+        let params = ["alertIds": alertIds]
+        let _: EmptyResult = try await networkAPI.request(
+            ActivityEndpoint.markActivityAlertsAsRead,
+            parameters: params
+        )
+    }
+}
+
+

cherrydan/Data/Repositories/ActivityRepository.swift

@@ -1,4 +1,5 @@
 import Foundation
+import UIKit
 
 class AuthRepository {
     private let networkAPI: NetworkAPI
@@ -9,10 +10,14 @@ class AuthRepository {
 
     func socialLogin(_ provider: String,_ token: String, userInfo: UserInfo?) async throws -> SocialLoginResponse {
         let fcmToken = KeychainManager.shared.getFcmToken()
-        var params: [String: Any] = [
+        let deviceModel = UIDevice.current.modelName
+        var params: [String: String] = [
             "accessToken": token,
-            "fcmToken": fcmToken,
-            "deviceType": "iOS"
+            "fcmToken": fcmToken ?? "",
+            "deviceType": "iOS",
+            "deviceModel": deviceModel,
+            "osVersion": "\(ProcessInfo.processInfo.operatingSystemVersionString)",
+            "appVersion": "\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0")"
         ]
 
         // 사용자 정보가 있는 경우 추가

cherrydan/Data/Repositories/AuthRepository.swift

@@ -0,0 +1,57 @@
+import Foundation
+
+class BookmarkRepository {
+    private let networkAPI: NetworkAPI
+    
+    init(networkAPI: NetworkAPI = NetworkAPI()) {
+        self.networkAPI = networkAPI
+    }
+    
+    /// 북마크 추가
+    func addBookmark(campaignId: Int) async throws {
+        let _: EmptyResult = try await networkAPI.request(
+            BookmarkEndpoint.addBookmark(campaignId: campaignId)
+        )
+    }
+    
+    /// 북마크 취소 (is_active = false)
+    func cancelBookmark(campaignId: Int) async throws {
+        let _: EmptyResult = try await networkAPI.request(
+            BookmarkEndpoint.cancelBookmark(campaignId: campaignId)
+        )
+    }
+    
+    /// 북마크 완전 삭제
+    func deleteBookmark(campaignId: Int) async throws {
+        let _: EmptyResult = try await networkAPI.request(
+            BookmarkEndpoint.deleteBookmark(campaignId: campaignId)
+        )
+    }
+    
+    /// 내 북마크 목록 조회
+    func getOpenBookmarks(page: Int = 0) async throws -> PageableResponse<MyCampaignDTO> {
+        let query = [
+            "page": "\(page)",
+            "size": "20"
+        ]
+        
+        let response: APIResponse<PageableResponse<MyCampaignDTO>> = try await networkAPI.request(
+            BookmarkEndpoint.getOpenBookmarks,
+            queryParameters: query
+        )
+        return response.result
+    }
+    
+    func getClosedBookmarks(page: Int = 0) async throws -> PageableResponse<MyCampaignDTO> {
+        let query = [
+            "page": "\(page)",
+            "size": "20"
+        ]
+        
+        let response: APIResponse<PageableResponse<MyCampaignDTO>> = try await networkAPI.request(
+            BookmarkEndpoint.getClosedBookmarks,
+            queryParameters: query
+        )
+        return response.result
+    }
+}

cherrydan/Data/Repositories/BookmarkRepository.swift

@@ -56,6 +56,25 @@ class CampaignRepository {
         return response.result
     }
 
+    func getCampaignByReporter(
+        sort: SortType = .popular,
+        page: Int = 0
+    ) async throws -> PageableResponse<CampaignDTO> {
+        do {
+            let query: [String: String] = [
+                "sort": sort.rawValue,
+                "page": "\(page)",
+            ]
+            
+            let response: APIResponse<PageableResponse<CampaignDTO>> = try await networkAPI.request(CampaignEndpoint.getCampaignByReporter, queryParameters: query)
+            return response.result
+        } catch {
+            print("CampaignRepository Error: \(error)")
+            throw error
+        }
+    }
+    
+    
     /// - Note: HomeView 내부 `제품` 탭에서 호출합니다.
     func getCampaignByProduct(
         _ product: [ProductCategory] = [],
@@ -79,7 +98,7 @@ class CampaignRepository {
 
     /// - Note: HomeView 내부 `SNS 플랫폼` 탭에서 호출합니다.
     func getCampaignBySNSPlatform(
-        _ snsPlatform: [SocialPlatformType] = [],
+        _ snsPlatform: [SNSPlatformType] = [],
         sort: SortType = .popular,
         page: Int = 0
     ) async throws -> PageableResponse<CampaignDTO> {
@@ -100,7 +119,7 @@ class CampaignRepository {
 
     /// - Note: HomeView 내부 `캠페인 플랫폼` 탭에서 호출합니다.
     func getCampaignByCampaignPlatform(
-        _ campaignPlatform: [CampaignPlatformType] = [],
+        _ campaignPlatform: [CampaignPlatform] = [],
         sort: SortType = .popular,
         page: Int = 0
     ) async throws -> PageableResponse<CampaignDTO> {
@@ -110,7 +129,7 @@ class CampaignRepository {
         ]
 
         if !campaignPlatform.isEmpty {
-            query["platform"] = campaignPlatform.map { $0.imageName }.joined(separator: ",")
+            query["platform"] = campaignPlatform.map { $0.siteNameEn }.joined(separator: ",")
         } else {
             query["platform"] = "all"
         }
@@ -132,7 +151,6 @@ class CampaignRepository {
         }
     }
 
-    
     /// - Note: SearchView 내부 `검색 단계`에서 호출합니다.
     func searchCampaign(_ keyword: String) async throws -> [CampaignDTO] {
         let query = ["keyword": keyword]
@@ -154,8 +172,8 @@ class CampaignRepository {
         subRegions: [SubRegion] = [],
         local: [LocalCategory] = [],
         product: [ProductCategory] = [],
-        snsPlatform: [SocialPlatformType] = [],
-        campaignPlatform: [CampaignPlatformType] = [],
+        snsPlatform: [SNSPlatformType] = [],
+        campaignPlatform: [CampaignPlatform] = [],
         sort: SortType = .popular,
         page: Int = 0,
         focusedCategory: CampaignType? = nil,
@@ -204,7 +222,7 @@ class CampaignRepository {
             }
         case .campaignPlatform:
             if !campaignPlatform.isEmpty {
-                queryParameters["campaignPlatform"] = campaignPlatform.map { $0.imageName }.joined(separator: ",")
+                queryParameters["campaignPlatform"] = campaignPlatform.map { $0.siteNameEn }.joined(separator: ",")
             } else {
                 queryParameters["campaignPlatform"] = "all"
             }
@@ -225,7 +243,7 @@ class CampaignRepository {
                 queryParameters["snsPlatform"] = "all"
             }
             if !campaignPlatform.isEmpty {
-                queryParameters["campaignPlatform"] = campaignPlatform.map { $0.imageName }.joined(separator: ",")
+                queryParameters["campaignPlatform"] = campaignPlatform.map { $0.siteNameEn }.joined(separator: ",")
             } else {
                 queryParameters["campaignPlatform"] = "all"
             }

cherrydan/Data/Repositories/CampaignRepository.swift

@@ -0,0 +1,98 @@
+import Foundation
+
+class KeywordRepository {
+    private let networkAPI: NetworkAPI
+    
+    init(networkAPI: NetworkAPI = NetworkAPI()) {
+        self.networkAPI = networkAPI
+    }
+    
+    // MARK: - User Keywords
+    
+    /// 내 키워드 목록 조회
+    func getUserKeywords(page: Int = 0, size: Int = 20) async throws -> APIResponse<[UserKeywordResponseDTO]> {
+        let query: [String: String] = [
+            "page": String(page),
+            "size": String(size)
+        ]
+        
+        return try await networkAPI.request(
+            KeywordEndpoint.getUserKeywords,
+            queryParameters: query
+        )
+    }
+    
+    /// 내 키워드 등록
+    func addUserKeyword(keyword: String) async throws {
+        let query: [String: String] = [
+            "keyword": keyword
+        ]
+        
+        let _: EmptyResult = try await networkAPI.request(
+            KeywordEndpoint.addUserKeyword(keyword: keyword),
+        parameters: query
+        )
+    }
+    
+    /// 내 키워드 삭제
+    func deleteUserKeyword(keywordId: Int) async throws {
+        let _: EmptyResult = try await networkAPI.request(
+            KeywordEndpoint.deleteUserKeyword(keywordId: keywordId)
+        )
+    }
+    
+    // MARK: - Keyword Alerts
+    
+    /// 내 키워드 알림 목록 조회
+    func getKeywordNotifications(page: Int = 0) async throws -> APIResponse<PageableResponse<KeywordNotification>> {
+        let query: [String: String] = [
+            "page": String(page),
+            "size": "20",
+            "sort": "alertDate,desc"
+        ]
+        
+        return try await networkAPI.request(
+            KeywordEndpoint.getKeywordAlerts,
+            queryParameters: query
+        )
+    }
+    
+    /// 키워드 알림 삭제
+    func deleteKeywordAlerts(alertIds: [Int]) async throws {
+        let params = ["alertIds": alertIds]
+        let _: EmptyResult = try await networkAPI.request(
+            KeywordEndpoint.deleteKeywordAlerts,
+            parameters: params
+        )
+    }
+    
+    // 키워드 알림 읽음 처리
+    func markKeywordAlertsAsRead(alertIds: [Int]) async throws {
+        let params = ["alertIds": alertIds]
+        let _: EmptyResult = try await networkAPI.request(
+            KeywordEndpoint.markKeywordAlertsAsRead,
+            parameters: params
+        )
+    }
+    
+    // MARK: - Personalized Campaigns
+    
+    /// 특정 키워드로 맞춤형 캠페인 조회
+    func getPersonalizedCampaignsByKeyword(
+        keyword: String,
+        date: String,
+        page: Int = 0
+    ) async throws -> APIResponse<PageableResponse<CampaignDTO>> {
+        let query: [String: String] = [
+            "page": String(page),
+            "date": date,
+            "size": "20",
+            "keyword": keyword
+        ]
+        
+        return try await networkAPI.request(
+            KeywordEndpoint.getPersonalizedCampaignsByKeyword(keyword: keyword),
+            queryParameters: query
+        )
+    }
+}