[Feat] #400 - 솝탬프 신고 기능 및 네트워크 오류 모달 추가

SOPT-iOS/Projects/Core/Sources/Extension/Foundation+/String+.swift

@@ -114,7 +114,7 @@ public extension String {
 
         // 앞쪽에 띄어쓰기가 없으면, 중간 인덱스 뒷쪽의 첫번째 인덱스
         if spaceIndex == nil {
-            spaceIndex = self[middleIndex...endIndex].firstIndex(of: " ")
+            spaceIndex = self[middleIndex..<endIndex].firstIndex(of: " ")
         }
 
         var result: String = ""

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

@@ -28,6 +28,10 @@ public struct UserDefaultKeyList {
     public struct AppNotice {
         @UserDefaultWrapper<String>(key: "checkedAppVersion") public static var checkedAppVersion
     }
+
+    public struct Soptamp {
+        @UserDefaultWrapper<String>(key: "reportUrl") public static var reportUrl
+    }
 }
 
 extension UserDefaultKeyList {

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

@@ -18,14 +18,21 @@ public class MainRepository {
     private let configService: ConfigService
     private let descriptionService: DescriptionService
     private let pokeService: PokeService
+    private let stampService: StampService
 
     private let cancelBag = CancelBag()
 
-    public init(userService: UserService, configService: ConfigService, descriptionService: DescriptionService, pokeService: PokeService) {
+    public init(userService: UserService, 
+                configService: ConfigService,
+                descriptionService: DescriptionService,
+                pokeService: PokeService,
+                stampService: StampService
+    ) {
         self.userService = userService
         self.configService = configService
         self.descriptionService = descriptionService
         self.pokeService = pokeService
+        self.stampService = stampService
     }
 }
 
@@ -98,4 +105,10 @@ extension MainRepository: MainRepositoryInterface {
             .map { $0.toDomain() }
             .eraseToAnyPublisher()
     }
+
+    public func getReportUrl() -> AnyPublisher<SoptampReportUrlModel, Error> {
+        stampService.getReportUrl()
+            .map { $0.toDomain() }
+            .eraseToAnyPublisher()
+    }
 }

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

@@ -31,6 +31,7 @@ public class MissionListRepository {
 }
 
 extension MissionListRepository: MissionListRepositoryInterface {
+
   public func fetchMissionList(type: MissionListFetchType, userName: String?) -> AnyPublisher<[MissionListModel], Error> {
     guard let userName else {
       return fetchMissionList(type: type)

SOPT-iOS/Projects/Data/Sources/Transform/MissionListTransform.swift

@@ -28,3 +28,9 @@ public extension MissionListEntity {
         }
     }
 }
+
+extension SoptampReportUrlEntity {
+    func toDomain() -> SoptampReportUrlModel {
+        return SoptampReportUrlModel(reportUrl: reportUrl)
+    }
+}

SOPT-iOS/Projects/Demo/Sources/Dependency/RegisterDependencies.swift

@@ -40,7 +40,8 @@ extension AppDelegate {
                     userService: DefaultUserService(),
                     configService: DefaultConfigService(),
                     descriptionService: DefaultDescriptionService(),
-                    pokeService: DefaultPokeService()
+                    pokeService: DefaultPokeService(),
+                    stampService: DefaultStampService()
                 )
             }
         )

SOPT-iOS/Projects/Domain/Sources/Model/SoptampReportUrlModel.swift

@@ -0,0 +1,19 @@
+//
+//  SoptampReportURLModel.swift
+//  Domain
+//
+//  Created by Jae Hyun Lee on 10/14/24.
+//  Copyright © 2024 SOPT-iOS. All rights reserved.
+//
+
+import Foundation
+
+// MARK: - SoptampReportURLModel
+
+public struct SoptampReportUrlModel: Codable {
+    public let reportUrl: String
+
+    public init(reportUrl: String) {
+        self.reportUrl = reportUrl
+    }
+}

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

@@ -18,4 +18,5 @@ public protocol MainRepositoryInterface {
     func checkPokeNewUser() -> AnyPublisher<Bool, Error>
     func appService() -> AnyPublisher<[AppServiceModel], Error>
     func hotBoard() -> AnyPublisher<HotBoardModel, Error>
+    func getReportUrl() -> AnyPublisher<SoptampReportUrlModel, Error>
 }

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

@@ -26,6 +26,7 @@ public protocol MainUseCase {
   func checkPokeNewUser()
   func getAppService()
   func getHotBoard()
+  func getReportUrl()
 }
 
 public class DefaultMainUseCase {
@@ -140,4 +141,14 @@ extension DefaultMainUseCase: MainUseCase {
       }
       .store(in: cancelBag)
   }
+
+  public func getReportUrl() {
+    repository.getReportUrl()
+      .withUnretained(self)
+      .sink { event in
+          print("GetReportUrl State: \(event)")
+      } receiveValue: { owner, resultModel in
+          UserDefaultKeyList.Soptamp.reportUrl = resultModel.reportUrl
+      }.store(in: cancelBag)
+  }
 }

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

@@ -18,6 +18,7 @@ public protocol MissionListUseCase {
 
   var missionListModelsFetched: PassthroughSubject<[MissionListModel], Error> { get set }
   var usersActiveGenerationInfo: PassthroughSubject<UsersActiveGenerationStatusViewResponse, Error> { get set }
+  var errorOccurred: PassthroughSubject<Void, Never> { get set }
 }
 
 public class DefaultMissionListUseCase {
@@ -26,17 +27,22 @@ public class DefaultMissionListUseCase {
   private var cancelBag = CancelBag()
   public var missionListModelsFetched = PassthroughSubject<[MissionListModel], Error>()
   public var usersActiveGenerationInfo = PassthroughSubject<UsersActiveGenerationStatusViewResponse, Error>()
-
+  public var errorOccurred = PassthroughSubject<Void, Never>()
+
   public init(repository: MissionListRepositoryInterface) {
     self.repository = repository
   }
 }
 
 extension DefaultMissionListUseCase: MissionListUseCase {
+
   public func fetchMissionList(type: MissionListFetchType) {
     repository.fetchMissionList(type: type, userName: nil)
       .sink(receiveCompletion: { event in
         print("completion: \(event)")
+        if case Subscribers.Completion.failure = event {
+          self.errorOccurred.send()
+        }
       }, receiveValue: { model in
         self.missionListModelsFetched.send(model)
       })
@@ -73,3 +79,4 @@ extension DefaultMissionListUseCase: MissionListUseCase {
       }).store(in: self.cancelBag)
   }
 }
+

SOPT-iOS/Projects/Features/BaseFeatureDependency/Sources/Alert/AlertVCTheme.swift

@@ -68,7 +68,7 @@ extension AlertVC.AlertTheme {
         case .main:
             return isNetworkErr ? DSKitAsset.Colors.white100.color : DSKitAsset.Colors.gray600.color
         case .soptamp:
-            return isNetworkErr ? DSKitAsset.Colors.soptampError200.color : DSKitAsset.Colors.soptampGray300.color
+            return isNetworkErr ? DSKitAsset.Colors.black60.color : DSKitAsset.Colors.soptampGray300.color
         }
     }
 

SOPT-iOS/Projects/Features/DailySoptuneFeature/Sources/Components/DailySoptuneProfileImageView.swift

@@ -10,14 +10,7 @@ import UIKit
 import DSKit
 
 extension CustomProfileImageView {
-    public func setImage(with url: String) {
+    func setImage(with url: String) {
         self.setImage(with: url, placeholder: DSKitAsset.Assets.iconDefaultProfile.image)
     }
-
-    // 오늘의 솝마디에서는 Border가 들어가지 않는 것으로 통일
-    @discardableResult
-    public func setBorder() -> Self {
-        self.layer.borderWidth = 0
-        return self
-    }
 }

SOPT-iOS/Projects/Features/DailySoptuneFeature/Sources/DailySoptuneScene/Views/DailySoptuneResultPokeView.swift

@@ -20,8 +20,8 @@ public final class DailySoptuneResultPokeView: UIView {
         .asDriver()
 
     lazy var profileTap = self.profileImageView.gesture()
-        .filter { _ in self.user?.isAnonymous == false }
-        .map { _ in self.user }.asDriver()
+        .filter { [weak self] _ in self?.user?.isAnonymous == false }
+        .map { [weak self] _ in self?.user }.asDriver()
 
     // MARK: - Properties
 
@@ -151,7 +151,7 @@ extension DailySoptuneResultPokeView {
         self.nameLabel.text = model.name
         self.partLabel.text = "\(model.generation)기 \(model.part)"
         self.profileImageView.setImage(with: model.profileImage)
-        self.profileImageView.setBorder()
+        self.profileImageView.layer.borderWidth = 0
         self.kokButton.isEnabled = !model.isAlreadyPoke
     }
 

SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/ViewModel/MainViewModel.swift

@@ -152,6 +152,7 @@ extension MainViewModel {
         self.requestAuthorizationForNotification()
         self.useCase.getServiceState()
         self.trackAmplitude(event: .viewAppHome)
+        self.useCase.getReportUrl()
       }.store(in: cancelBag)
 
     input.hotBoardTapped

SOPT-iOS/Projects/Features/StampFeature/Interface/Sources/StampFeatureViewControllable.swift

@@ -18,6 +18,7 @@ public protocol MissionListCoordinatable {
   var onCurrentGenerationRankingButtonTap: ((RankingViewType) -> Void)? { get set }
   var onGuideTap: (() -> Void)? { get set }
   var onCellTap: ((MissionListModel, _ username: String?) -> Void)? { get set }
+  var onReportButtonTap: (() -> Void)? { get set }
 }
 public protocol ListDetailViewControllable: ViewControllable & ListDetailCoordinatable { }
 public protocol ListDetailCoordinatable {

SOPT-iOS/Projects/Features/StampFeature/Sources/Coordinator/StampCoordinator.swift

@@ -12,6 +12,7 @@ import Core
 import BaseFeatureDependency
 import StampFeatureInterface
 import Domain
+import SafariServices
 
 public
 final class StampCoordinator: DefaultCoordinator {
@@ -50,6 +51,12 @@ final class StampCoordinator: DefaultCoordinator {
         missionList.onCellTap = { [weak self] model, username in
             self?.runMissionDetailFlow(model, username)
         }
+        missionList.onReportButtonTap = { [weak self] in
+            guard let url = UserDefaultKeyList.Soptamp.reportUrl else { return }
+            let safariViewController = SFSafariViewController(url: URL(string: url)!)
+            safariViewController.playgroundStyle()
+            self?.rootController?.present(safariViewController, animated: true)
+        }
         rootController = missionList.asNavigationController
         router.present(rootController, animated: true, modalPresentationSytle: .overFullScreen)
     }

SOPT-iOS/Projects/Features/StampFeature/Sources/MissionListScene/VC/MissionListVC.swift

@@ -43,6 +43,7 @@ public class MissionListVC: UIViewController, MissionListViewControllable {
   public var onCurrentGenerationRankingButtonTap: ((RankingViewType) -> Void)?
   public var onGuideTap: (() -> Void)?
   public var onCellTap: ((MissionListModel, String?) -> Void)?
+  public var onReportButtonTap: (() -> Void)?
 
   private var usersActiveGenerationStatus: UsersActiveGenerationStatusViewResponse?
 
@@ -265,15 +266,22 @@ extension MissionListVC {
         owner.onSwiped?()
       }.store(in: self.cancelBag)
   }
-
+    
   private func bindViewModels() {
     let input = MissionListViewModel.Input(
       viewDidLoad: Driver<Void>.just(()),
       viewWillAppear: viewWillAppear.asDriver(),
       missionTypeSelected: missionTypeMenuSelected
     )
+
     let output = self.viewModel.transform(from: input, cancelBag: self.cancelBag)
 
+    naviBar.reportButtonTapped
+      .withUnretained(self)
+      .sink { owner, _ in
+          owner.onReportButtonTap?()
+      }.store(in: cancelBag)
+
     output.$missionListModel
       .compactMap { $0 }
       .sink { [weak self] model in
@@ -289,6 +297,12 @@ extension MissionListVC {
         self?.remakeButtonConstraint()
         self?.configureCurrentGenerationButton(with: String(describing: generationStatus.currentGeneration))
       }.store(in: self.cancelBag)
+
+    output.needNetworkAlert
+      .withUnretained(self)
+      .sink { owner, _ in
+          owner.showNetworkAlert()
+      }.store(in: self.cancelBag)
   }
 }
 
@@ -397,6 +411,13 @@ extension MissionListVC {
     attributedStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor.white, range: NSMakeRange(0, attributedStr.length))
     self.currentGenerationRankFloatingButton.setAttributedTitle(attributedStr, for: .normal)
   }
+
+  private func showNetworkAlert() {
+    AlertUtils.presentNetworkAlertVC(
+        theme: .soptamp,
+        animated: true
+    )
+  }
 }
 
 // MARK: - UICollectionViewDelegate

SOPT-iOS/Projects/Features/StampFeature/Sources/MissionListScene/ViewModel/MissionListViewModel.swift

@@ -31,6 +31,8 @@ public class MissionListViewModel: ViewModelType {
   public class Output: NSObject {
     @Published var missionListModel: [MissionListModel]?
     @Published var usersActivateGenerationStatus: UsersActiveGenerationStatusViewResponse?
+    @Published var reportUrl: SoptampReportUrlModel?
+    var needNetworkAlert = PassthroughSubject<Void, Never>()
   }
 
   // MARK: - init
@@ -65,7 +67,7 @@ extension MissionListViewModel {
       .sink { owner, fetchType in
         owner.useCase.fetchMissionList(type: fetchType)
       }.store(in: cancelBag)
-
+      
     return output
   }
 
@@ -100,5 +102,11 @@ extension MissionListViewModel {
       .sink { usersActivateGenerationStatus in
         output.usersActivateGenerationStatus = usersActivateGenerationStatus
       }.store(in: self.cancelBag)
+
+    self.useCase.errorOccurred
+      .asDriver()
+      .sink { _ in
+          output.needNetworkAlert.send()
+      }.store(in: cancelBag)
   }
 }

SOPT-iOS/Projects/Modules/DSKit/Resources/Assets.xcassets/Soptamp/icReport.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_report.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}