Skip to content

Commit 686d833

Browse files
committed
[fix] #187 default 관심사 나오는 문제 수정
1 parent 3cc0034 commit 686d833

File tree

5 files changed

+28
-7
lines changed

5 files changed

+28
-7
lines changed

Projects/Domain/Sources/Base/BaseInterest.swift

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Foundation
99

1010
public struct BaseInterest: Equatable, Identifiable, Hashable {
1111
public let id = UUID()
12-
public let code: String
12+
public let code: Code
1313
public let description: String
1414

1515
public func hash(into hasher: inout Hasher) {
@@ -20,8 +20,28 @@ public struct BaseInterest: Equatable, Identifiable, Hashable {
2020
lhs.code == rhs.code
2121
}
2222

23-
public init(code: String, description: String) {
23+
public init(code: Code, description: String) {
2424
self.code = code
2525
self.description = description
2626
}
2727
}
28+
29+
extension BaseInterest {
30+
public enum Code: String {
31+
case `default` = "DEFAULT"
32+
case 스포츠_레저 = "SPORTS"
33+
case 문구_오피스 = "OFFICE"
34+
case 패션 = "FASHION"
35+
case 여행 = "TRAVEL"
36+
case 경제_시사 = "ECONOMY"
37+
case 영화_드라마 = "MOVIE_DRAMA"
38+
case 맛집 = "RESTAURANT"
39+
case 인테리어 = "INTERIOR"
40+
case IT = "IT"
41+
case 디자인 = "DESIGN"
42+
case 자기계발 = "SELF_IMPROVEMENT"
43+
case 유머 = "HUMOR"
44+
case 음악 = "MUSIC"
45+
case 취업정보 = "JOB_INFO"
46+
}
47+
}

Projects/Domain/Sources/DTO/Base/BaseInterest+Extension.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import CoreKit
1212
public extension InterestResponse {
1313
func toDomian() -> BaseInterest {
1414
return BaseInterest(
15-
code: self.code,
15+
code: BaseInterest.Code(rawValue: self.code) ?? .default,
1616
description: self.description
1717
)
1818
}

Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendFeature.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@ private extension RecommendFeature {
223223
interests.forEach { state.selectedInterestList.insert($0) }
224224
return .none
225225
case let .관심사_조회_API_반영(interests):
226-
state.domain.interests = interests
226+
state.domain.interests = interests.filter({ interest in
227+
interest.code != .default
228+
})
227229
state.showKeywordSheet = true
228230
return .none
229231
}

Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendKeywordBottomSheet.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ extension RecommendKeywordBottomSheet {
115115

116116
RecommendKeywordBottomSheet(
117117
selectedInterests: $selectedInterests,
118-
interests: BaseInterestType.allCases.map {
119-
BaseInterest(code: "", description: $0.title)
120-
}
118+
interests: []
121119
) { }
122120
}

Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ private extension RecommendView {
136136
.id(interest.description)
137137
}
138138
}
139+
.animation(.pokitDissolve, value: store.myInterestList)
139140
}
140141

141142
@ViewBuilder

0 commit comments

Comments
 (0)