🛠 :: 컴플릭트

Team-return · Aug 31, 2024 · 75f9198 · 75f9198
1 parent 2a9c905
commit 75f9198
Show file tree

Hide file tree

Showing 11 changed files with 313 additions and 1 deletion.
diff --git a/Projects/Data/Sources/DI/UseCaseAssembly.swift b/Projects/Data/Sources/DI/UseCaseAssembly.swift
@@ -35,7 +35,7 @@ public final class UseCaseAssembly: Assembly {
             )
         }
 
-        // Students
+        // Studentsz
         container.register(ChangePasswordUseCase.self) { reslover in
             ChangePasswordUseCase(
                 studentsRepository: reslover.resolve(StudentsRepository.self)!
@@ -228,6 +228,11 @@ public final class UseCaseAssembly: Assembly {
                 notificationsRepository: resolver.resolve(NotificationsRepository.self)!
             )
         }
+<<<<<<< Updated upstream
+=======
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
         container.register(SubscribeNotificationUseCase.self) { resolver in
             SubscribeNotificationUseCase(
                 notificationsRepository: resolver.resolve(NotificationsRepository.self)!
@@ -238,5 +243,19 @@ public final class UseCaseAssembly: Assembly {
                 notificationsRepository: resolver.resolve(NotificationsRepository.self)!
             )
         }
+<<<<<<< Updated upstream
+=======
+        container.register(UnsubscribeNotificationUseCase.self) { resolver in
+            UnsubscribeNotificationUseCase(
+                notificationsRepository: resolver.resolve(NotificationsRepository.self)!
+            )
+        }
+        container.register(UnsubscribeAllNotificationUseCase.self) { resolver in
+            UnsubscribeAllNotificationUseCase(
+                notificationsRepository: resolver.resolve(NotificationsRepository.self)!
+            )
+        }
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
     }
 }
diff --git a/Projects/Data/Sources/DataSource/API/NotificationsAPI.swift b/Projects/Data/Sources/DataSource/API/NotificationsAPI.swift
@@ -5,8 +5,18 @@ import Domain
 public enum NotificationsAPI {
     case fetchNotificationList
     case patchReadNotification(id: Int)
+<<<<<<< Updated upstream
     case subscriptNotification(token: String, notificationType: NotificationType)
     case subscriptAllNotification(token: String)
+=======
+<<<<<<< Updated upstream
+=======
+    case subscriptNotification(token: String, notificationType: NotificationType)
+    case subscriptAllNotification(token: String)
+    case unsubscriptNotification(token: String, notificationType: NotificationType)
+    case unsubscriptAllNotification(token: String)
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
 }
 
 extension NotificationsAPI: JobisAPI {
@@ -23,12 +33,27 @@ extension NotificationsAPI: JobisAPI {
 
         case let .patchReadNotification(id):
             return "/\(id)"
+<<<<<<< Updated upstream
+=======
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
 
         case .subscriptNotification:
             return "/topic"
 
         case .subscriptAllNotification:
             return ""
+<<<<<<< Updated upstream
+=======
+
+        case .unsubscriptNotification:
+            return "/topic"
+
+        case .unsubscriptAllNotification:
+            return ""
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
         }
     }
 
@@ -39,9 +64,21 @@ extension NotificationsAPI: JobisAPI {
 
         case .patchReadNotification:
             return .patch
+<<<<<<< Updated upstream
 
         case .subscriptNotification, .subscriptAllNotification:
             return .post
+=======
+<<<<<<< Updated upstream
+=======
+
+        case .subscriptNotification, .subscriptAllNotification:
+            return .post
+
+        case .unsubscriptNotification, .unsubscriptAllNotification:
+            return .delete
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
         }
     }
 
@@ -53,6 +90,11 @@ extension NotificationsAPI: JobisAPI {
 //                  // TODO: 추후 읽음와 안읽음 분기처리 필요
                     ["is_new": ""],
                 encoding: URLEncoding.queryString)
+<<<<<<< Updated upstream
+=======
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
 
         case let .subscriptNotification(token, notificationType):
             return .requestParameters(
@@ -71,6 +113,27 @@ extension NotificationsAPI: JobisAPI {
                 encoding: URLEncoding.queryString
             )
 
+<<<<<<< Updated upstream
+=======
+        case let .unsubscriptNotification(token, notificationType):
+            return .requestParameters(
+                parameters: [
+                    "token": token,
+                    "topic": notificationType.rawValue
+                ],
+                encoding: URLEncoding.queryString
+            )
+
+        case let .unsubscriptAllNotification(token):
+            return .requestParameters(
+                parameters: [
+                    "token": token
+                ],
+                encoding: URLEncoding.queryString
+            )
+
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
         default:
             return .requestPlain
         }

diff --git a/Projects/Data/Sources/DataSource/Remote/RemoteNotificationsDataSource.swift b/Projects/Data/Sources/DataSource/Remote/RemoteNotificationsDataSource.swift
@@ -5,8 +5,18 @@ import Domain
 public protocol RemoteNotificationsDataSource {
     func fetchNotificationList() -> Single<[NotificationEntity]>
     func patchReadNotification(id: Int) -> Completable
+<<<<<<< Updated upstream
     func subscriptNotification(token: String, notificationType: NotificationType) -> Completable
     func subscriptAllNotification(token: String) -> Completable
+=======
+<<<<<<< Updated upstream
+=======
+    func subscriptNotification(token: String, notificationType: NotificationType) -> Completable
+    func subscriptAllNotification(token: String) -> Completable
+    func unsubscriptNotification(token: String, notificationType: NotificationType) -> Completable
+    func unsubscriptAllNotification(token: String) -> Completable
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
 }
 
 final class RemoteNotificationsDataSourceImpl: RemoteBaseDataSource<NotificationsAPI>, RemoteNotificationsDataSource {
@@ -20,14 +30,37 @@ final class RemoteNotificationsDataSourceImpl: RemoteBaseDataSource<Notification
         request(.patchReadNotification(id: id))
             .asCompletable()
     }
+<<<<<<< Updated upstream
+=======
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
 
     func subscriptNotification(token: String, notificationType: NotificationType) -> Completable {
         request(.subscriptNotification(token: token, notificationType: notificationType))
             .asCompletable()
     }
+<<<<<<< Updated upstream
 
+=======
+
+>>>>>>> Stashed changes
     func subscriptAllNotification(token: String) -> Completable {
         request(.subscriptAllNotification(token: token))
             .asCompletable()
     }
+<<<<<<< Updated upstream
+=======
+
+    func unsubscriptNotification(token: String, notificationType: Domain.NotificationType) -> RxSwift.Completable {
+        request(.subscriptNotification(token: token, notificationType: notificationType))
+            .asCompletable()
+    }
+
+    func unsubscriptAllNotification(token: String) -> RxSwift.Completable {
+        request(.unsubscriptAllNotification(token: token))
+            .asCompletable()
+    }
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
 }
diff --git a/Projects/Data/Sources/Repositories/NotificationsRepositoryImpl.swift b/Projects/Data/Sources/Repositories/NotificationsRepositoryImpl.swift
@@ -17,12 +17,33 @@ struct NotificationsRepositoryImpl: NotificationsRepository {
     func patchReadNotification(id: Int) -> Completable {
         remoteNotificationsDataSource.patchReadNotification(id: id)
     }
+<<<<<<< Updated upstream
+=======
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
 
     func subscriptNotification(token: String, notificationType: NotificationType) -> Completable {
         remoteNotificationsDataSource.subscriptNotification(token: token, notificationType: notificationType)
     }
+<<<<<<< Updated upstream
 
     func subscriptAllNotification(token: String) -> Completable {
         remoteNotificationsDataSource.subscriptAllNotification(token: token)
     }
+=======
+
+    func subscriptAllNotification(token: String) -> Completable {
+        remoteNotificationsDataSource.subscriptAllNotification(token: token)
+    }
+
+    func unsubscriptNotification(token: String, notificationType: NotificationType) -> Completable {
+        remoteNotificationsDataSource.unsubscriptNotification(token: token, notificationType: notificationType)
+    }
+
+    func unsubscriptAllNotification(token: String) -> Completable {
+        remoteNotificationsDataSource.unsubscriptAllNotification(token: token)
+    }
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
 }
diff --git a/Projects/Domain/Sources/Repositories/NotificationsRepository.swift b/Projects/Domain/Sources/Repositories/NotificationsRepository.swift
@@ -3,6 +3,16 @@ import RxSwift
 public protocol NotificationsRepository {
     func fetchNotificationsList() -> Single<[NotificationEntity]>
     func patchReadNotification(id: Int) -> Completable
+<<<<<<< Updated upstream
     func subscriptNotification(token: String, notificationType: NotificationType) -> Completable
     func subscriptAllNotification(token: String) -> Completable
+=======
+<<<<<<< Updated upstream
+=======
+    func subscriptNotification(token: String, notificationType: NotificationType) -> Completable
+    func subscriptAllNotification(token: String) -> Completable
+    func unsubscriptNotification(token: String, notificationType: NotificationType) -> Completable
+    func unsubscriptAllNotification(token: String) -> Completable
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
 }
diff --git a/Projects/Domain/Sources/UseCases/Notifications/UnsubscribeAllNotificationUseCase.swift b/Projects/Domain/Sources/UseCases/Notifications/UnsubscribeAllNotificationUseCase.swift
@@ -0,0 +1,13 @@
+import RxSwift
+
+public struct UnsubscribeAllNotificationUseCase {
+    private let notificationsRepository: NotificationsRepository
+
+    public init(notificationsRepository: NotificationsRepository) {
+        self.notificationsRepository = notificationsRepository
+    }
+
+    public func execute(token: String) -> Completable {
+        notificationsRepository.unsubscriptAllNotification(token: token)
+    }
+}
diff --git a/Projects/Domain/Sources/UseCases/Notifications/UnsubscribeNotificationUseCase.swift b/Projects/Domain/Sources/UseCases/Notifications/UnsubscribeNotificationUseCase.swift
@@ -0,0 +1,13 @@
+import RxSwift
+
+public struct UnsubscribeNotificationUseCase {
+    private let notificationsRepository: NotificationsRepository
+
+    public init(notificationsRepository: NotificationsRepository) {
+        self.notificationsRepository = notificationsRepository
+    }
+
+    public func execute(token: String, notificationType: NotificationType) -> Completable {
+        notificationsRepository.unsubscriptNotification(token: token, notificationType: notificationType)
+    }
+}
diff --git a/Projects/Presentation/Sources/DI/PresentationAssembly.swift b/Projects/Presentation/Sources/DI/PresentationAssembly.swift
@@ -148,6 +148,11 @@ public final class PresentationAssembly: Assembly {
             RenewalPasswordViewController(resolver.resolve(RenewalPasswordViewModel.self)!)
         }
 
+<<<<<<< Updated upstream
+=======
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
         container.register(WritableReviewViewModel.self) { resolver in
             WritableReviewViewModel(
                 postReviewUseCase: resolver.resolve(PostReviewUseCase.self)!
@@ -165,13 +170,26 @@ public final class PresentationAssembly: Assembly {
         }
 
         container.register(NotificationSettingViewModel.self) { resolver in
+<<<<<<< Updated upstream
             NotificationSettingViewModel()
+=======
+            NotificationSettingViewModel(
+                subscribeNotificationUseCase: resolver.resolve(SubscribeNotificationUseCase.self)!,
+                subscribeAllNotificationUseCase: resolver.resolve(SubscribeAllNotificationUseCase.self)!,
+                unsubscribeNotificationUseCase: resolver.resolve(UnsubscribeNotificationUseCase.self)!,
+                unsubscribeAllNotificationUseCase: resolver.resolve(UnsubscribeAllNotificationUseCase.self)!
+            )
+>>>>>>> Stashed changes
         }
 
         container.register(NotificationSettingViewController.self) { resolver in
             NotificationSettingViewController(resolver.resolve(NotificationSettingViewModel.self)!)
         }
 
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
         container.register(NoticeViewModel.self) { resolver in
             NoticeViewModel(
                 fetchNoticeListUseCase: resolver.resolve(FetchNoticeListUseCase.self)!

diff --git a/Projects/Presentation/Sources/NotificationSetting/Component/NotificationSectionView.swift b/Projects/Presentation/Sources/NotificationSetting/Component/NotificationSectionView.swift
@@ -8,6 +8,10 @@ import DesignSystem
 
 public final class NotificationSectionView: BaseView {
     public var disposeBag = DisposeBag()
+<<<<<<< Updated upstream
+=======
+    public let switchButtonIsToggle = PublishRelay<Bool>()
+>>>>>>> Stashed changes
 
     private let notificationTitleLabel = UILabel().then {
         $0.setJobisText(
@@ -46,10 +50,17 @@ public final class NotificationSectionView: BaseView {
                 self.notificationSwitchButton.isOn.toggle()
                 if self.notificationSwitchButton.isOn {
                     self.notificationSwitchButton.thumbTintColor = .white
+<<<<<<< Updated upstream
                     print("온!!")
                 } else {
                     self.notificationSwitchButton.thumbTintColor = nil
                     print("오프!!")
+=======
+                    self.switchButtonIsToggle.accept(true)
+                } else {
+                    self.notificationSwitchButton.thumbTintColor = nil
+                    self.switchButtonIsToggle.accept(false)
+>>>>>>> Stashed changes
                 }
             })
             .disposed(by: disposeBag)

diff --git a/Projects/Presentation/Sources/NotificationSetting/NotificationSettingViewController.swift b/Projects/Presentation/Sources/NotificationSetting/NotificationSettingViewController.swift
@@ -34,7 +34,10 @@ public final class NotificationSettingViewController: BaseViewController<Notific
 
     public override func addView() {
         [
+<<<<<<< Updated upstream
 //            noticeSwitchButton
+=======
+>>>>>>> Stashed changes
             titleLabel,
             allNotificationSwitchView,
             lineView,
@@ -89,6 +92,7 @@ public final class NotificationSettingViewController: BaseViewController<Notific
 
     public override func bind() {
         let input = NotificationSettingViewModel.Input(
+<<<<<<< Updated upstream
 
         )
         let ouput = viewModel.transform(input)
@@ -104,6 +108,19 @@ public final class NotificationSettingViewController: BaseViewController<Notific
 
     public override func configureNavigation() {
 //        self.setLargeTitle(title: "알림 설정")
+=======
+            allSwitchButtonIsTrue: allNotificationSwitchView.switchButtonIsToggle,
+            noticeSwitchButtonIsTrue: noticeSwitchView.switchButtonIsToggle,
+            applicationSwitchButtonIsTrue: applicationSwitchView.switchButtonIsToggle,
+            recruitmentSwitchButtonIsTrue: recruitmentSwitchView.switchButtonIsToggle
+        )
+        let _ = viewModel.transform(input)
+    }
+
+    public override func configureViewController() { }
+
+    public override func configureNavigation() {
+>>>>>>> Stashed changes
         self.navigationController?.navigationBar.prefersLargeTitles = false
         self.hideTabbar()
     }