sopt-makers · yungu0010 · Oct 16, 2024 · Oct 11, 2024 · Oct 11, 2024 · Oct 11, 2024
diff --git a/SOPT-iOS/Projects/Core/Sources/Extension/Foundation+/Date+.swift b/SOPT-iOS/Projects/Core/Sources/Extension/Foundation+/Date+.swift
@@ -23,6 +23,8 @@ public extension Date {
         dateComponents.year = year
         dateComponents.month = month
         dateComponents.day = day
-        return calendar.date(from: dateComponents) ?? nil
+
+        let usaDate = calendar.date(from: dateComponents)
+        return usaDate!.addingTimeInterval(10 * 60 * 60)
     }
 }
diff --git a/SOPT-iOS/Projects/Data/Sources/Repository/AppMyPageRepository.swift b/SOPT-iOS/Projects/Data/Sources/Repository/AppMyPageRepository.swift
@@ -33,20 +33,6 @@ extension AppMyPageRepository: AppMyPageRepositoryInterface {
             .asDriver()
     }
 
-    public func getNotificationIsAllowed() -> Driver<Bool> {
-        self.userService
-            .getNotificationIsAllowed()
-            .map(\.isOptIn)
-            .asDriver()
-    }
-
-    public func optInPushNotificationInGeneral(to isOn: Bool) -> Driver<Bool> {
-        self.userService
-            .optInPushNotificationInGeneral(to: isOn)
-            .map(\.isOptIn)
-            .asDriver()
-    }
-
     public func deregisterPushToken(with token: String) -> AnyPublisher<Bool, Error> {
         self.userService.deregisterPushToken(with: token)
             .map {

diff --git a/SOPT-iOS/Projects/Data/Sources/Repository/MainRepository.swift b/SOPT-iOS/Projects/Data/Sources/Repository/MainRepository.swift
@@ -15,15 +15,13 @@ import Networks
 public class MainRepository {
 
     private let userService: UserService
-    private let configService: ConfigService
     private let descriptionService: DescriptionService
     private let pokeService: PokeService
 
     private let cancelBag = CancelBag()
 
-    public init(userService: UserService, configService: ConfigService, descriptionService: DescriptionService, pokeService: PokeService) {
+    public init(userService: UserService, descriptionService: DescriptionService, pokeService: PokeService) {
         self.userService = userService
-        self.configService = configService
         self.descriptionService = descriptionService
         self.pokeService = pokeService
     }
@@ -53,16 +51,6 @@ extension MainRepository: MainRepositoryInterface {
             .eraseToAnyPublisher()
     }
 
-    public func getServiceState() -> AnyPublisher<ServiceStateModel, MainError> {
-        configService.getServiceAvailability()
-            .mapError { error in
-                print(error)
-                return MainError.networkError(message: "GetServiceState 에러")
-            }
-            .map { $0.toDomain() }
-            .eraseToAnyPublisher()
-    }
-
     public func getMainViewDescription() -> AnyPublisher<MainDescriptionModel, MainError> {
         descriptionService.getMainViewDescription()
             .mapError { error in

diff --git a/SOPT-iOS/Projects/Data/Sources/Repository/SettingRepository.swift b/SOPT-iOS/Projects/Data/Sources/Repository/SettingRepository.swift
@@ -44,17 +44,6 @@ extension SettingRepository: SettingRepositoryInterface {
             .eraseToAnyPublisher()
     }
 
-    public func editNickname(nickname: String) -> AnyPublisher<Bool, Never> {
-        return userService.changeNickname(nickname: nickname)
-            .map { _ in true }
-            .replaceError(with: false)
-            .handleEvents(receiveOutput: { isSuccessed in
-                guard isSuccessed else { return }
-                UserDefaultKeyList.User.soptampName = nickname
-            })
-            .eraseToAnyPublisher()
-    }
-
     public func withdrawal() -> AnyPublisher<Bool, Never> {
         return userService.withdraw()
             .handleEvents(receiveOutput: { status in

diff --git a/SOPT-iOS/Projects/Data/Sources/Repository/SignUpRepository.swift b/SOPT-iOS/Projects/Data/Sources/Repository/SignUpRepository.swift
diff --git a/SOPT-iOS/Projects/Data/Sources/Transform/MainTransform.swift b/SOPT-iOS/Projects/Data/Sources/Transform/MainTransform.swift
@@ -17,9 +17,3 @@ extension MainEntity {
         return UserMainInfoModel.init(status: user.status, name: user.name, profileImage: user.profileImage, historyList: user.historyList, attendanceScore: operation?.attendanceScore, announcement: operation?.announcement, isAllConfirm: isAllConfirm)
     }
 }
-
-extension ServiceStateEntity {
-    public func toDomain() -> ServiceStateModel {
-        return ServiceStateModel(isAvailable: isAvailable)
-    }
-}
diff --git a/SOPT-iOS/Projects/Demo/Sources/Dependency/RegisterDependencies.swift b/SOPT-iOS/Projects/Demo/Sources/Dependency/RegisterDependencies.swift
@@ -38,7 +38,6 @@ extension AppDelegate {
             implement: {
                 MainRepository(
                     userService: DefaultUserService(),
-                    configService: DefaultConfigService(),
                     descriptionService: DefaultDescriptionService(),
                     pokeService: DefaultPokeService()
                 )
@@ -79,14 +78,6 @@ extension AppDelegate {
                 )
             }
         )
-        container.register(
-            interface: SignUpRepositoryInterface.self,
-            implement: {
-                SignUpRepository(
-                    service: DefaultUserService()
-                )
-            }
-        )
         container.register(
             interface: MissionListRepositoryInterface.self,
             implement: {

diff --git a/SOPT-iOS/Projects/Domain/Sources/Model/ServiceStateModel.swift b/SOPT-iOS/Projects/Domain/Sources/Model/ServiceStateModel.swift
diff --git a/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/AppMyPageRepositoryInterface.swift b/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/AppMyPageRepositoryInterface.swift
@@ -12,7 +12,5 @@ import Core
 
 public protocol AppMyPageRepositoryInterface {
     func resetStamp() -> Driver<Bool>
-    func getNotificationIsAllowed() -> Driver<Bool>
-    func optInPushNotificationInGeneral(to isOn: Bool) -> Driver<Bool>
     func deregisterPushToken(with token: String) -> AnyPublisher<Bool, Error>
 }
diff --git a/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/MainRepositoryInterface.swift b/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/MainRepositoryInterface.swift
@@ -12,7 +12,6 @@ import Combine
 
 public protocol MainRepositoryInterface {
     func getUserMainInfo() -> AnyPublisher<UserMainInfoModel?, MainError>
-    func getServiceState() -> AnyPublisher<ServiceStateModel, MainError>
     func getMainViewDescription() -> AnyPublisher<MainDescriptionModel, MainError>
     func registerPushToken(with token: String) -> AnyPublisher<Bool, Error>
     func checkPokeNewUser() -> AnyPublisher<Bool, Error>

diff --git a/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/SettingRepositoryInterface.swift b/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/SettingRepositoryInterface.swift
@@ -13,6 +13,5 @@ import Combine
 public protocol SettingRepositoryInterface {
     func resetStamp() -> Driver<Bool>
     func editSentence(sentence: String) -> AnyPublisher<Bool, Never>
-    func editNickname(nickname: String) -> AnyPublisher<Bool, Never>
     func withdrawal() -> AnyPublisher<Bool, Never>
 }
diff --git a/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/SignUpRepositoryInterface.swift b/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/SignUpRepositoryInterface.swift
diff --git a/SOPT-iOS/Projects/Domain/Sources/UseCase/AppMyPageUseCase.swift b/SOPT-iOS/Projects/Domain/Sources/UseCase/AppMyPageUseCase.swift
@@ -12,8 +12,6 @@ import Combine
 
 public protocol AppMyPageUseCase {
     func resetStamp()
-    func fetchUserNotificationIsAllowed()
-    func optInPushNotificationInGeneral(to isOn: Bool)
     func deregisterPushToken()
 
     var resetSuccess: PassthroughSubject<Bool, Error> { get }
@@ -46,22 +44,6 @@ extension DefaultAppMyPageUseCase: AppMyPageUseCase {
             }.store(in: self.cancelBag)
     }
 
-    public func fetchUserNotificationIsAllowed() {
-        self.repository
-            .getNotificationIsAllowed()
-            .sink { isAllowed in
-                self.originUserNotificationIsAllowedStatus.send(isAllowed)
-            }.store(in: self.cancelBag)
-    }
-
-    public func optInPushNotificationInGeneral(to isOn: Bool) {
-        self.repository
-            .optInPushNotificationInGeneral(to: isOn)
-            .sink { isOn in
-                self.optInPushNotificationResult.send(isOn)
-            }.store(in: self.cancelBag)
-    }
-
     public func deregisterPushToken() {
         guard let pushToken = UserDefaultKeyList.User.pushToken, !pushToken.isEmpty else { return }
 

diff --git a/SOPT-iOS/Projects/Domain/Sources/UseCase/MainUseCase.swift b/SOPT-iOS/Projects/Domain/Sources/UseCase/MainUseCase.swift
@@ -12,15 +12,13 @@ import Combine
 
 public protocol MainUseCase {
   var userMainInfo: PassthroughSubject<UserMainInfoModel?, Never> { get set }
-  var serviceState: PassthroughSubject<ServiceStateModel, Never> { get set }
   var mainDescription: PassthroughSubject<MainDescriptionModel, Never> { get set }
   var mainErrorOccurred: PassthroughSubject<MainError, Never> { get set }
   var isPokeNewUser: PassthroughSubject<Bool, Never> { get set }
   var appService: PassthroughSubject<[AppServiceModel], Never> { get set }
   var hotBoard: PassthroughSubject<HotBoardModel, Never> { get set }
 
   func getUserMainInfo()
-  func getServiceState()
   func getMainViewDescription()
   func registerPushToken()
   func checkPokeNewUser()
@@ -34,7 +32,6 @@ public class DefaultMainUseCase {
   private var cancelBag = CancelBag()
 
   public var userMainInfo = PassthroughSubject<UserMainInfoModel?, Never>()
-  public var serviceState = PassthroughSubject<ServiceStateModel, Never>()
   public var mainDescription = PassthroughSubject<MainDescriptionModel, Never>()
   public var mainErrorOccurred = PassthroughSubject<MainError, Never>()
   public var isPokeNewUser = PassthroughSubject<Bool, Never>()
@@ -61,18 +58,6 @@ extension DefaultMainUseCase: MainUseCase {
       }.store(in: self.cancelBag)
   }
 
-  public func getServiceState() {
-    repository.getServiceState()
-      .sink { [weak self] event in
-        print("MainUseCase getServiceState: \(event)")
-        if case Subscribers.Completion.failure = event {
-          self?.mainErrorOccurred.send(.networkError(message: "GetServiceState 실패"))
-        }
-      } receiveValue: { [weak self] serviceStateModel in
-        self?.serviceState.send(serviceStateModel)
-      }.store(in: self.cancelBag)
-  }
-
   public func getMainViewDescription() {
     repository.getMainViewDescription()
       .replaceError(with: .defaultDescription)

diff --git a/SOPT-iOS/Projects/Domain/Sources/UseCase/SettingUseCase.swift b/SOPT-iOS/Projects/Domain/Sources/UseCase/SettingUseCase.swift
@@ -12,9 +12,7 @@ import Core
 
 public protocol SettingUseCase {
     func resetStamp()
-    func editNickname(nickname: String)
     func withdrawal()
-    var editNicknameSuccess: PassthroughSubject<Bool, Error> { get set }
     var resetSuccess: PassthroughSubject<Bool, Error> { get set }
     var withdrawalSuccess: PassthroughSubject<Bool, Error> { get set }
 }
@@ -25,7 +23,6 @@ public class DefaultSettingUseCase {
     private var cancelBag = CancelBag()
 
     public var resetSuccess = PassthroughSubject<Bool, Error>()
-    public var editNicknameSuccess = PassthroughSubject<Bool, Error>()
     public var withdrawalSuccess = PassthroughSubject<Bool, Error>()
 
     public init(repository: SettingRepositoryInterface) {
@@ -42,14 +39,6 @@ extension DefaultSettingUseCase: SettingUseCase {
             }.store(in: self.cancelBag)
     }
 
-    public func editNickname(nickname: String) {
-        self.repository.editNickname(nickname: nickname)
-            .withUnretained(self)
-            .sink { owner, editSuccessed in
-                owner.editNicknameSuccess.send(editSuccessed)
-            }.store(in: self.cancelBag)
-    }
-
     public func resetStamp() {
         repository.resetStamp()
             .sink { success in

diff --git a/SOPT-iOS/Projects/Domain/Sources/UseCase/SignUpUseCase.swift b/SOPT-iOS/Projects/Domain/Sources/UseCase/SignUpUseCase.swift
diff --git a/SOPT-iOS/Projects/Domain/Tests/Sources/Mock/MockRepository/MockMainRepository.swift b/SOPT-iOS/Projects/Domain/Tests/Sources/Mock/MockRepository/MockMainRepository.swift
@@ -15,7 +15,6 @@ import Domain
 final class MockMainRepository: MainRepositoryInterface {
 
     var userInfoModelResponse: Result<UserMainInfoModel?, MainError>!
-    var serviceStateModelResponse: Result<ServiceStateModel, MainError>!
 
     private(set) var cancelBag = CancelBag()
 
@@ -33,19 +32,4 @@ final class MockMainRepository: MainRepositoryInterface {
         }
         .eraseToAnyPublisher()
     }
-
-    func getServiceState() -> AnyPublisher<Domain.ServiceStateModel, Domain.MainError> {
-        return Future { [weak self] promise in
-            guard let self = self else { return }
-            switch self.serviceStateModelResponse {
-            case .success(let model):
-                promise(.success(model))
-            case .failure(let error):
-                promise(.failure(error))
-            case .none:
-                XCTFail("Should Set serviceStateModelResponse")
-            }
-        }
-        .eraseToAnyPublisher()
-    }
 }