Merge pull request sopt-makers#345 from lsj8706/fix/sopt-makers#344-P…

…oke-QA-반영

[Fix] sopt-makers#344- 콕 찌르기 1차 QA 반영

SOPT-iOS/Projects/Core/Sources/Literals/NotiList.swift

@@ -11,7 +11,7 @@ import Foundation
 /// enum형 NotiList를 Notification.Name으로 return
 /// - ex) NotificationCenter.default.post(name: NotiList.makeNotiName(list: <NotiList>), object: <>, userInfo: <>)
 public enum NotiList: String {
-    case sample
+    case pokedResponse
 
     public static func makeNotiName(list: NotiList) -> NSNotification.Name {
         return Notification.Name(String(describing: list))

SOPT-iOS/Projects/Core/Sources/Literals/StringLiterals.swift

@@ -327,7 +327,8 @@ public struct I18N {
         public static let pokeMyFriends = "내 친구를 찔러보세요"
         public static let pokeNearbyFriends = "내 친구의 친구를 찔러보세요"
         public static let emptyFriendDescription = "아직 없어요 T.T\n내 친구가 더 많은 친구가 생길 때까지 기다려주세요"
-        public static let refreshGuide = "화면을 밑으로 당기면\n다른 친구를 볼 수 있어요"
+        public static let refreshGuide = "화면을 당기면\n다른 친구를 볼 수 있어요"
+        public static let pokeSuccess = "콕 찌르기를 완료했어요"
         public static func makingFriendCompleted(name: String) -> String {
             return "찌르기 답장으로\n\(name)님과 친구가 되었어요!"
         }

SOPT-iOS/Projects/Data/Sources/Repository/PokeMainRepository.swift

@@ -48,4 +48,10 @@ extension PokeMainRepository: PokeMainRepositoryInterface {
             .map { $0.toDomain() }
             .eraseToAnyPublisher()
     }
+
+    public func checkPokeNewUser() -> AnyPublisher<Bool, Error> {
+        pokeService.isNewUser()
+            .map { $0.isNew }
+            .eraseToAnyPublisher()
+    }
 }

SOPT-iOS/Projects/Data/Sources/Repository/PokeOnboardingRepository.swift

@@ -31,7 +31,7 @@ extension PokeOnboardingRepository: PokeOnboardingRepositoryInterface {
     public func getMesseageTemplates(type: PokeMessageType) -> AnyPublisher<PokeMessagesModel, Error> {
         self.pokeService
             .getPokeMessages(messageType: type.rawValue)
-            .map { $0.messages.map { $0.toDomain() } }
+            .map { $0.toDomain() }
             .eraseToAnyPublisher()
     }
 

SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/PokeMainRepositoryInterface.swift

@@ -12,4 +12,5 @@ public protocol PokeMainRepositoryInterface: PokeRepositoryInterface {
     func getWhoPokeToMe() -> AnyPublisher<PokeUserModel?, Error>
     func getFriend() -> AnyPublisher<[PokeUserModel], Error>
     func getFriendRandomUser() -> AnyPublisher<[PokeFriendRandomUserModel], Error>
+    func checkPokeNewUser() -> AnyPublisher<Bool, Error>
 }

SOPT-iOS/Projects/Domain/Sources/UseCase/PokeMainUseCase.swift

@@ -17,11 +17,13 @@ public protocol PokeMainUseCase {
     var pokedResponse: PassthroughSubject<PokeUserModel, Never> { get }
     var madeNewFriend: PassthroughSubject<PokeUserModel, Never> { get }
     var errorMessage: PassthroughSubject<String?, Never> { get }
-
+    var isPokeNewUser: PassthroughSubject<Bool, Never> { get set }
+
     func getWhoPokedToMe()
     func getFriend()
     func getFriendRandomUser()
     func poke(userId: Int, message: PokeMessageModel, willBeNewFriend: Bool)
+    func checkPokeNewUser()
 }
 
 public class DefaultPokeMainUseCase {
@@ -34,7 +36,8 @@ public class DefaultPokeMainUseCase {
     public let pokedResponse = PassthroughSubject<PokeUserModel, Never>()
     public let madeNewFriend = PassthroughSubject<PokeUserModel, Never>()
     public let errorMessage = PassthroughSubject<String?, Never>()
-
+    public var isPokeNewUser = PassthroughSubject<Bool, Never>()
+
     public init(repository: PokeMainRepositoryInterface) {
         self.repository = repository
     }
@@ -85,4 +88,14 @@ extension DefaultPokeMainUseCase: PokeMainUseCase {
                 }
             }.store(in: self.cancelBag)
     }
+
+    public func checkPokeNewUser() {
+        repository.checkPokeNewUser()
+            .catch { error in
+                print("CheckPokeNewUser State: \(error)")
+                return Just(false)
+            }.sink { [weak self] isNewUser in
+                self?.isPokeNewUser.send(isNewUser)
+            }.store(in: cancelBag)
+    }
 }

SOPT-iOS/Projects/Domain/Sources/UseCase/PokeOnboardingUsecase.swift

@@ -16,6 +16,7 @@ public protocol PokeOnboardingUsecase {
 
     var randomAcquaintances: PassthroughSubject<[PokeUserModel], Never> { get }
     var pokedResponse: PassthroughSubject<PokeUserModel, Never> { get }
+    var errorMessage: PassthroughSubject<String?, Never> { get }
 }
 
 public final class DefaultPokeOnboardingUsecase {
@@ -24,6 +25,7 @@ public final class DefaultPokeOnboardingUsecase {
 
     public let randomAcquaintances = PassthroughSubject<[PokeUserModel], Never>()
     public let pokedResponse = PassthroughSubject<PokeUserModel, Never>()
+    public let errorMessage = PassthroughSubject<String?, Never>()
 
     public init(repository: PokeOnboardingRepositoryInterface) {
         self.repository = repository
@@ -45,6 +47,11 @@ extension DefaultPokeOnboardingUsecase: PokeOnboardingUsecase {
     public func poke(userId: Int, message: PokeMessageModel) {
         self.repository
             .poke(userId: userId, message: message.content)
+            .catch { [weak self] error in
+                let message = error.toastMessage
+                self?.errorMessage.send(message)
+                return Empty<PokeUserModel, Never>()
+            }
             .sink(
                 receiveCompletion: { _ in },
                 receiveValue: { [weak self] value in

SOPT-iOS/Projects/Features/AttendanceFeature/Sources/Coordinator/AttendanceModalDeepLink.swift

@@ -13,6 +13,7 @@ import Domain
 public struct AttendanceModalDeepLink: DeepLinkExecutable {
     public let name = "attendance-modal"
     public let children: [DeepLinkExecutable] = []
+    public var isDestination: Bool = false
 
     public init() {}
 

SOPT-iOS/Projects/Features/BaseFeatureDependency/Sources/Coordinator/DeepLink/DeepLinkExecutable.swift

@@ -11,6 +11,7 @@ import Foundation
 public protocol DeepLinkTreeNode {
     var name: String { get }
     var children: [DeepLinkExecutable] { get }
+    var isDestination: Bool { get set }
     func findChild(name: String) -> DeepLinkExecutable?
 }
 

SOPT-iOS/Projects/Features/NotificationFeature/Sources/Coordinator/NotificationDetailDeepLink.swift

@@ -12,6 +12,7 @@ import BaseFeatureDependency
 public struct NotificationDetailDeepLink: DeepLinkExecutable {
     public let name = "detail"
     public let children: [DeepLinkExecutable] = []
+    public var isDestination: Bool = false
 
     public init() {}
 

SOPT-iOS/Projects/Features/PokeFeature/Interface/Sources/PokeFeatureBuildable.swift

@@ -11,7 +11,7 @@ import Foundation
 import Domain
 
 public protocol PokeFeatureBuildable {
-    func makePokeMain() -> PokeMainPresentable
+    func makePokeMain(isRouteFromRoot: Bool) -> PokeMainPresentable
     func makePokeMyFriends() -> PokeMyFriendsPresentable
     func makePokeMyFriendsList(relation: PokeRelation) -> PokeMyFriendsListPresentable
     func makePokeOnboarding() -> PokeOnboardingPresentable

SOPT-iOS/Projects/Features/PokeFeature/Interface/Sources/PokeMainPresentable.swift

@@ -19,6 +19,7 @@ public protocol PokeMainCoordinatable {
     var onProfileImageTapped: ((Int) -> Void)? { get set }
     var onPokeButtonTapped: ((PokeUserModel) -> Driver<(PokeUserModel, PokeMessageModel)>)? { get set }
     var onNewFriendMade: ((String) -> Void)? { get set }
+    var switchToOnboarding: (() -> Void)? { get set }
 }
 
 public typealias PokeMainViewModelType = ViewModelType & PokeMainCoordinatable

SOPT-iOS/Projects/Features/PokeFeature/Sources/Coordinator/DeepLinks/PokeNotificationListDeepLink.swift

@@ -0,0 +1,26 @@
+//
+//  PokeNotificationListDeepLink.swift
+//  PokeFeature
+//
+//  Created by sejin on 12/30/23.
+//  Copyright © 2023 SOPT-iOS. All rights reserved.
+//
+
+import Foundation
+import BaseFeatureDependency
+
+public struct PokeNotificationListDeepLink: DeepLinkExecutable {
+    public let name = "notification-list"
+    public let children: [DeepLinkExecutable] = []
+    public var isDestination: Bool = false
+
+    public init() {}
+
+    public func execute(with coordinator: Coordinator, queryItems: [URLQueryItem]?) -> Coordinator? {
+        guard let coordinator = coordinator as? PokeCoordinator else { return nil }
+
+        coordinator.runPokeNotificationListFlow()
+
+        return nil
+    }
+}

SOPT-iOS/Projects/Features/PokeFeature/Sources/Coordinator/PokeBuilder.swift

@@ -20,9 +20,9 @@ public final class PokeBuilder {
 }
 
 extension PokeBuilder: PokeFeatureBuildable {
-    public func makePokeMain() -> PokeFeatureInterface.PokeMainPresentable {
+    public func makePokeMain(isRouteFromRoot: Bool) -> PokeFeatureInterface.PokeMainPresentable {
         let useCase = DefaultPokeMainUseCase(repository: pokeMainRepository)
-        let viewModel = PokeMainViewModel(useCase: useCase)
+        let viewModel = PokeMainViewModel(useCase: useCase, isRouteFromRoot: isRouteFromRoot)
         let pokeMainVC = PokeMainVC(viewModel: viewModel)
         return (pokeMainVC, viewModel)
     }

SOPT-iOS/Projects/Features/PokeFeature/Sources/Coordinator/PokeCoordinator.swift

@@ -28,11 +28,11 @@ final class PokeCoordinator: DefaultCoordinator {
     }
 
     public override func start() {
-        showPokeMain()
+        showPokeMain(isRouteFromRoot: false)
     }
 
-    private func showPokeMain() {
-        var pokeMain = factory.makePokeMain()
+    public func showPokeMain(isRouteFromRoot: Bool) {
+        var pokeMain = factory.makePokeMain(isRouteFromRoot: isRouteFromRoot)
 
         pokeMain.vm.onNaviBackTap = { [weak self] in
             self?.router.dismissModule(animated: true)
@@ -66,14 +66,36 @@ final class PokeCoordinator: DefaultCoordinator {
             pokeMain.vc.viewController.present(pokeMakingFriendCompletedVC, animated: false)
         }
 
+        pokeMain.vm.switchToOnboarding = { [weak self] in
+            guard let self = self else { return }
+            self.runPokeOnboardingFlow()
+        }
+
         rootController = pokeMain.vc.asNavigationController
         router.present(rootController, animated: true, modalPresentationSytle: .overFullScreen)
     }
 
-    private func runPokeNotificationListFlow() {
+    internal func runPokeOnboardingFlow() {
+        let pokeOnboardingCoordinator = PokeOnboardingCoordinator(
+            router: Router(
+                rootController: rootController ?? self.router.asNavigationController
+            ),
+            factory: factory
+        )
+
+        pokeOnboardingCoordinator.finishFlow = { [weak self, weak pokeOnboardingCoordinator] in
+            pokeOnboardingCoordinator?.childCoordinators = []
+            self?.removeDependency(pokeOnboardingCoordinator)
+        }
+
+        addDependency(pokeOnboardingCoordinator)
+        pokeOnboardingCoordinator.switchToPokeOnboardingView()
+    }
+
+    internal func runPokeNotificationListFlow() {
         let pokeNotificationListCoordinator = PokeNotificationListCoordinator(
             router: Router(
-                rootController: rootController!
+                rootController: rootController ?? self.router.asNavigationController
             ),
             factory: factory
         )

SOPT-iOS/Projects/Features/PokeFeature/Sources/Coordinator/PokeOnboardingCoordinator.swift

@@ -32,6 +32,20 @@ public final class PokeOnboardingCoordinator: DefaultCoordinator {
 
 extension PokeOnboardingCoordinator {
     private func showPokeOnboardingView() {
+        var pokeOnboarding = makePokeOnboardingView()
+
+        self.rootController = pokeOnboarding.vc.asNavigationController
+        self.router.present(self.rootController, animated: true, modalPresentationSytle: .overFullScreen)
+    }
+
+    func switchToPokeOnboardingView() {
+        var pokeOnboarding = makePokeOnboardingView()
+
+        self.rootController = router.asNavigationController
+        self.router.setRootModule(pokeOnboarding.vc, hideBar: true, animated: false)
+    }
+
+    func makePokeOnboardingView() -> PokeOnboardingPresentable {
         var pokeOnboarding = self.factory.makePokeOnboarding()
 
         pokeOnboarding.vm.onNaviBackTapped = { [weak self] in
@@ -71,8 +85,7 @@ extension PokeOnboardingCoordinator {
             let webView = SOPTWebView(startWith: url)
             self?.rootController?.pushViewController(webView, animated: true)
         }
-
-        self.rootController = pokeOnboarding.vc.asNavigationController
-        self.router.present(self.rootController, animated: true, modalPresentationSytle: .overFullScreen)
+
+        return pokeOnboarding
     }
 }

SOPT-iOS/Projects/Features/PokeFeature/Sources/PokeMainScene/VC/PokeMainVC.swift

@@ -291,5 +291,10 @@ extension PokeMainVC {
                     pokeUserView.changeUIAfterPoke(newUserModel: updatedUser)
                 }
             }.store(in: cancelBag)
+
+        output.isLoading
+            .sink { [weak self] isLoading in
+                isLoading ? self?.showLoading() : self?.stopLoading()
+            }.store(in: self.cancelBag)
     }
 }