Merge branch 'develop' into refactor/#122

Team-HMH · Nov 28, 2024 · 5ef0fe9 · 5ef0fe9
2 parents 035c574 + 7f95d05
commit 5ef0fe9
Show file tree

Hide file tree

Showing 111 changed files with 3,387 additions and 706 deletions.
diff --git a/...ist_iOS/HMH-Tuist-iOS.xcworkspace/xcshareddata/xcschemes/HMH-Tuist-iOS-Workspace.xcscheme b/...ist_iOS/HMH-Tuist-iOS.xcworkspace/xcshareddata/xcschemes/HMH-Tuist-iOS-Workspace.xcscheme
@@ -496,6 +496,20 @@
                ReferencedContainer = "container:Projects/Modules/Networks/Networks.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3362BE21290F237818FBDE2C"
+               BuildableName = "NetworksDemo.app"
+               BlueprintName = "NetworksDemo"
+               ReferencedContainer = "container:Projects/Modules/Networks/Networks.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"

diff --git a/HMH_Tuist_iOS/Plugins/ConfigPlugin/ProjectDescriptionHelpers/Configurations.swift b/HMH_Tuist_iOS/Plugins/ConfigPlugin/ProjectDescriptionHelpers/Configurations.swift
@@ -43,7 +43,7 @@ public extension Configuration {
                 xcconfig: XCConfig.path(for: .dev)
             )
         case .qa:
-            return .release(
+            return .debug(
                 name: "QA",
                 xcconfig: XCConfig.path(for: .qa)
             )

diff --git a/HMH_Tuist_iOS/Plugins/EnvPlugin/ProjectDescriptionHelpers/InfoPlist.swift b/HMH_Tuist_iOS/Plugins/EnvPlugin/ProjectDescriptionHelpers/InfoPlist.swift
@@ -24,7 +24,8 @@ public extension Project {
         "NSAppTransportSecurity": [
             "NSAllowsArbitraryLoads": true
         ],
-        "UIAppFonts": ["Pretendard-Regular.otf", "Pretendard-SemiBold.otf", "Pretendard-Medium.otf"]
+        "UIAppFonts": ["Pretendard-Regular.otf", "Pretendard-SemiBold.otf", "Pretendard-Medium.otf"],
+        "UILaunchStoryboardName": "LaunchScreen"
     ]
 
 
@@ -42,7 +43,8 @@ public extension Project {
         "NSAppTransportSecurity": [
             "NSAllowsArbitraryLoads": true
         ],
-        "UIAppFonts": ["Pretendard-Regular.otf", "Pretendard-SemiBold.otf", "Pretendard-Medium.otf"]
+        "UIAppFonts": ["Pretendard-Regular.otf", "Pretendard-SemiBold.otf", "Pretendard-Medium.otf"],
+        "UILaunchStoryboardName": "LaunchScreen"
     ]
 
     static let deviceActivityMonitorInfoPlist: [String: Plist.Value] = [

diff --git a/HMH_Tuist_iOS/Projects/App/Derived/InfoPlists/HMH-iOS-Info.plist b/HMH_Tuist_iOS/Projects/App/Derived/InfoPlists/HMH-iOS-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/HMH_Tuist_iOS/Projects/Core/Derived/InfoPlists/CoreDemo-Info.plist b/HMH_Tuist_iOS/Projects/Core/Derived/InfoPlists/CoreDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/HMH_Tuist_iOS/Projects/Core/Sources/Extension/Combine+/Mapper.swift b/HMH_Tuist_iOS/Projects/Core/Sources/Extension/Combine+/Mapper.swift
@@ -29,4 +29,3 @@ public extension Publisher {
             .eraseToAnyPublisher()
     }
 }
-
diff --git a/HMH_Tuist_iOS/Projects/Core/Sources/Extension/Date+.swift b/HMH_Tuist_iOS/Projects/Core/Sources/Extension/Date+.swift
@@ -21,4 +21,20 @@ public extension String {
         formatter.dateFormat = format
         return formatter.date(from: self)
     }
+
+
+  func challengeHeaderFormattd() -> String? {
+    let inputDateFormatter = DateFormatter()
+    inputDateFormatter.dateFormat = "yyyy-MM-dd"
+    guard let date = inputDateFormatter.date(from: self) else {
+      return nil
+    }
+
+    let outputDateFormatter = DateFormatter()
+    outputDateFormatter.dateFormat = "M월 d일"
+    let formattedDateString = outputDateFormatter.string(from: date)
+
+    return formattedDateString
+  }
+
 }
diff --git a/...allengeFeature/Demo/Sources/Example.swift → .../Projects/Data/Demo/Sources/Example.swift b/...allengeFeature/Demo/Sources/Example.swift → .../Projects/Data/Demo/Sources/Example.swift
diff --git a/HMH_Tuist_iOS/Projects/Data/Derived/InfoPlists/DataDemo-Info.plist b/HMH_Tuist_iOS/Projects/Data/Derived/InfoPlists/DataDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/HMH_Tuist_iOS/Projects/Data/Sources/Mapper/Challenge/ChallengeSuccessInfoMapper.swift b/HMH_Tuist_iOS/Projects/Data/Sources/Mapper/Challenge/ChallengeSuccessInfoMapper.swift
@@ -16,3 +16,9 @@ extension FinishedDailyChallenge {
         return .init(challengeDate: challengeDate, isSuccess: isSuccess)
     }
 }
+
+extension ChallengeSuccessInfo {
+    func toDTO() -> FinishedDailyChallenge {
+        return .init(challengeDate: challengeDate, isSuccess: isSuccess)
+    }
+}
diff --git a/HMH_Tuist_iOS/Projects/Data/Sources/Repository/ChallengeRepository.swift b/HMH_Tuist_iOS/Projects/Data/Sources/Repository/ChallengeRepository.swift
@@ -26,8 +26,9 @@ public struct ChallengeRepository: ChallengeRepositoryType {
             .mapToDomainError(to: ChallengeError.self)
     }
 
-    public func getSuccesChallenge() -> AnyPublisher<[String], ChallengeError> {
-        service.getSuccesChallenge()
+    public func postSuccesChallenge(sucessInfo: [ChallengeSuccessInfo]) -> AnyPublisher<[String], ChallengeError> {
+        let request = ChallengeSuccessRequest(finishedDailyChallenges: sucessInfo.map { $0.toDTO() })
+        return service.postSuccesChallenge(request: request)
             .map { $0.statuses }
             .mapToDomainError(to: ChallengeError.self)
     }

diff --git a/..._iOS/Projects/Data/Tests/Sources/ChallengeRepositoryTests/Base/MockChallengeService.swift b/..._iOS/Projects/Data/Tests/Sources/ChallengeRepositoryTests/Base/MockChallengeService.swift
@@ -30,7 +30,7 @@ final public class MockChallengeService: ChallengeServiceType {
         return getDailyChallengeResult
     }
 
-    public func getSuccesChallenge() -> AnyPublisher<ChallengeSuccessResult, HMHNetworkError> {
+    public func postSuccesChallenge() -> AnyPublisher<ChallengeSuccessResult, HMHNetworkError> {
         return getSuccesChallengeResult
     }
 

diff --git a/...ests/Sources/ChallengeRepositoryTests/GetSuccesChallengeTest/GetSuccesChallengeTest.swift b/...ests/Sources/ChallengeRepositoryTests/GetSuccesChallengeTest/GetSuccesChallengeTest.swift
@@ -25,7 +25,7 @@ extension ChallegeRepositoryTests {
                 .setFailureType(to: HMHNetworkError.self)
                 .eraseToAnyPublisher()
 
-            sut.getSuccesChallenge()
+            sut.postSuccesChallenge()
                 .sink(receiveCompletion: { completion in
                     if case .failure(let error) = completion {
                         XCTFail("챌린지 성공 여부 리스트 전송 API 변환 중 실패했습니다: 에러 \(error)")
@@ -45,7 +45,7 @@ extension ChallegeRepositoryTests {
         for expected in testCases {
             mockService.getSuccesChallengeResult = Fail(error: expected).eraseToAnyPublisher()
 
-            sut.getSuccesChallenge()
+            sut.postSuccesChallenge()
                 .sink(
                     receiveCompletion: handleCompletion(
                         expectedError: .networkError,

diff --git a/HMH_Tuist_iOS/Projects/Domain/Sources/Entity/Challenge/ChallengeDetail.swift b/HMH_Tuist_iOS/Projects/Domain/Sources/Entity/Challenge/ChallengeDetail.swift
@@ -8,24 +8,44 @@
 
 import Foundation
 
-@frozen public enum ChallengeStatus: String {
-    case EARNED
-    case FAILURE
-    case UNEARNED
-}
-
-public struct ChallengeDetail: Equatable {
-    let statuses: [String]
+public struct ChallengeDetail {
+    let statuses: [PointStatusEnum]
     let todayIndex: Int
     let startDate: String
     let challengeInfo: ChallengeInfo
 
-    public init(statuses: [String], todayIndex: Int, startDate: String, challengeInfo: ChallengeInfo) {
+    public enum InfoType {
+        case period
+        case goalTime
+    }
+
+    public init(statuses: [PointStatusEnum], todayIndex: Int, startDate: String, challengeInfo: ChallengeInfo) {
         self.statuses = statuses
         self.todayIndex = todayIndex
         self.startDate = startDate
         self.challengeInfo = challengeInfo
     }
+
+    public func getTodayIndex() -> Int {
+        return todayIndex
+    }
+
+    public func getStatuses() -> [PointStatusEnum] {
+        return statuses
+    }
+
+    public func getStartDate() -> String {
+        return startDate
+    }
+
+    public func getChallengeInfo(_ infoType: InfoType) -> Int {
+        switch infoType {
+        case .period:
+            return challengeInfo.period
+        case .goalTime:
+            return challengeInfo.goalTime
+        }
+    }
 }
 
 public struct ChallengeInfo: Equatable {
@@ -38,4 +58,8 @@ public struct ChallengeInfo: Equatable {
         self.goalTime = goalTime
         self.apps = apps
     }
+
+    public func getPeriod() -> Int {
+        return period
+    }
 }
diff --git a/HMH_Tuist_iOS/Projects/Domain/Sources/Entity/Challenge/ChallengeSuccessInfo.swift b/HMH_Tuist_iOS/Projects/Domain/Sources/Entity/Challenge/ChallengeSuccessInfo.swift
@@ -7,8 +7,8 @@
 //
 
 public struct ChallengeSuccessInfo {
-    let challengeDate: String
-    let isSuccess: Bool
+    public let challengeDate: String
+    public let isSuccess: Bool
 
     public init(challengeDate: String, isSuccess: Bool) {
         self.challengeDate = challengeDate

diff --git a/HMH_Tuist_iOS/Projects/Domain/Sources/Entity/Point/PointDetail.swift b/HMH_Tuist_iOS/Projects/Domain/Sources/Entity/Point/PointDetail.swift
@@ -18,15 +18,35 @@ public struct PointDetail: Equatable {
         self.period = period
         self.pointStatuses = pointStatuses
     }
+
+    public func getPoint() -> Int {
+        return point
+    }
+
+    public func getPeriod() -> Int {
+        return period
+    }
+
+    public func getPointStatuses() -> [PointStatuse] {
+        return pointStatuses
+    }
 }
 
 public struct PointStatuse: Equatable {
     let date: String
-    let status: String
+    let status: PointStatusEnum
 
     public init(date: String, status: String) {
         self.date = date
-        self.status = status
+        self.status = PointStatusEnum(rawValue: status) ?? .none
+    }
+
+    public func getDate() -> String {
+        return date
+    }
+
+    public func getStatus() -> PointStatusEnum {
+        return status
     }
 }
 

diff --git a/HMH_Tuist_iOS/Projects/Domain/Sources/Entity/Point/PointStatusEnum.swift b/HMH_Tuist_iOS/Projects/Domain/Sources/Entity/Point/PointStatusEnum.swift
@@ -0,0 +1,44 @@
+//
+//  PointStatusEnum.swift
+//  Domain
+//
+//  Created by 이지희 on 11/4/24.
+//  Copyright © 2024 HMH-iOS. All rights reserved.
+//
+
+import SwiftUI
+
+import DSKit
+
+public enum PointStatusEnum: String {
+  case unearned = "UNEARNED"
+  case earned = "EARNED"
+  case failure = "FAILURE"
+  case none = "NONE"
+
+  public var buttonColor: Color {
+    switch self {
+    case .unearned:
+      return DSKitAsset.bluePurpleButton.swiftUIColor
+    case .earned:
+      return DSKitAsset.bluePurpleOpacity22.swiftUIColor
+    case .failure:
+      return DSKitAsset.gray6.swiftUIColor
+    case .none:
+      return DSKitAsset.gray7.swiftUIColor
+    }
+  }
+
+  public var titleColor: Color {
+    switch self {
+    case .unearned:
+      return DSKitAsset.whiteBtn.swiftUIColor
+    case .earned:
+      return DSKitAsset.bluePurpleOpacity70.swiftUIColor
+    case .failure:
+      return DSKitAsset.gray2.swiftUIColor
+    case .none:
+      return DSKitAsset.gray3.swiftUIColor
+    }
+  }
+}
diff --git a/HMH_Tuist_iOS/Projects/Domain/Sources/RepositoryInterface/ChallengeRepositoryType.swift b/HMH_Tuist_iOS/Projects/Domain/Sources/RepositoryInterface/ChallengeRepositoryType.swift
@@ -11,7 +11,7 @@ import Combine
 
 public protocol ChallengeRepositoryType {
     func getdailyChallenge()  -> AnyPublisher<DailyChallengeInfo, ChallengeError>
-    func getSuccesChallenge() -> AnyPublisher<[String], ChallengeError>
+    func postSuccesChallenge(sucessInfo: [ChallengeSuccessInfo]) -> AnyPublisher<[String], ChallengeError>
     func createChallenge(period: Int, goalTime: Int) -> AnyPublisher<Void, ChallengeError>
     func getLockChallenge() -> AnyPublisher<Bool, ChallengeError>
     func postLockChallenge() -> AnyPublisher<Void, ChallengeError>