Skip to content

Commit

Permalink
[feat] #181 키워드 설정 기능 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
@stealmh
stealmh committed Jan 23, 2025
1 parent 87c5d63 commit dd90c80
Show file tree
Hide file tree
Showing 3 changed files with 105 additions and 59 deletions.
2 changes: 1 addition & 1 deletion Projects/Domain/Sources/PokitCategorySetting/PokitCategorySetting.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public struct PokitCategorySetting: Equatable {
public var categoryImage: BaseCategoryImage?
/// 카테고리 공개 여부(기본값: 공개)
public var openType: BaseOpenType
/// 카테고리 키워드(기본값: default - 미선택)
/// 유저가 선택한 카테고리 키워드(기본값: default - 미선택)
public var keywordType: BaseInterestType

public init(
Expand Down
148 changes: 94 additions & 54 deletions Projects/Feature/FeatureCategorySetting/Sources/PokitCategorySettingFeature.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public struct PokitCategorySettingFeature {
var pasteboard
@Dependency(CategoryClient.self)
var categoryClient
@Dependency(UserClient.self)
var userClient
/// - State
@ObservableState
public struct State: Equatable {
Expand All @@ -38,14 +40,21 @@ public struct PokitCategorySettingFeature {
get { domain.imageList }
}

var selectedKeywordType: BaseInterestType {
get { domain.keywordType }
set { domain.keywordType = newValue }
}

var isPublicType: Bool {
get { domain.openType == .공개 ? true : false }
set { domain.openType = newValue ? .공개 : .비공개 }
}

let type: SettingType
let shareType: ShareType
var keywordSelectType: KeywordSelectType = .normal
var isProfileSheetPresented: Bool = false
var isKeywordSheetPresented: Bool = false
var pokitNameTextInpuState: PokitInputStyle.State = .default
@Shared(.inMemory("SelectCategory")) var categoryId: Int?
/// - 포킷 수정 API / 추가 API
Expand Down Expand Up @@ -89,6 +98,8 @@ public struct PokitCategorySettingFeature {
case 저장_버튼_눌렀을때
case 뷰가_나타났을때
case 포킷명지우기_버튼_눌렀을때
case 키워드_바텀시트_활성화(Bool)
case 키워드_선택_버튼_눌렀을때(BaseInterestType)
}

public enum InnerAction: Equatable {
Expand Down Expand Up @@ -152,6 +163,12 @@ private extension PokitCategorySettingFeature {
/// - View Effect
func handleViewAction(_ action: Action.View, state: inout State) -> Effect<Action> {
switch action {
case .binding(\.isPublicType):
if !state.isPublicType {
state.selectedKeywordType = .default
state.keywordSelectType = .normal
}
return .none
case .binding:
return .none

Expand All @@ -163,66 +180,77 @@ private extension PokitCategorySettingFeature {
return .none

case .저장_버튼_눌렀을때:
return .run { [domain = state.domain,
type = state.type] send in
switch type {
case .추가:
guard let image = domain.categoryImage else { return }
let request = CategoryEditRequest(
categoryName: domain.categoryName,
categoryImageId: image.id,
openType: domain.openType.title,
keywordType: domain.keywordType.title
)
let response = try await categoryClient.카테고리_생성(request)
let responseToCategoryDomain = BaseCategoryItem(
id: response.categoryId,
userId: 0,
categoryName: response.categoryName,
categoryImage: BaseCategoryImage(
imageId: response.categoryImage.imageId,
imageURL: response.categoryImage.imageUrl
),
contentCount: 0,
createdAt: "",
//TODO: v2 property 수정
openType: domain.openType,
keywordType: domain.keywordType,
userCount: 0
)
await send(.inner(.카테고리_인메모리_저장(responseToCategoryDomain)))
await send(.delegate(.settingSuccess))

case .수정:
guard let categoryId = domain.categoryId else { return }
guard let image = domain.categoryImage else { return }
let request = CategoryEditRequest(
categoryName: domain.categoryName,
categoryImageId: image.id,
openType: domain.openType.title,
keywordType: domain.keywordType.title
)
let _ = try await categoryClient.카테고리_수정(categoryId, request)
await send(.delegate(.settingSuccess))

case .공유추가:
guard let categoryId = domain.categoryId else { return }
guard let image = domain.categoryImage else { return }
try await categoryClient.공유받은_카테고리_저장(
CopiedCategoryRequest(
originCategoryId: categoryId,
/// 전체공개 설정을 했는데 키워드 설정을 안했을 때
if state.domain.openType == .공개
&& state.domain.keywordType == .default {
state.keywordSelectType = .warnning
return .none
} else {
return .run { [domain = state.domain,
type = state.type] send in
switch type {
case .추가:
guard let image = domain.categoryImage else { return }
let request = CategoryEditRequest(
categoryName: domain.categoryName,
categoryImageId: image.id,
openType: domain.openType.title,
keywordType: domain.keywordType.title
)
let response = try await categoryClient.카테고리_생성(request)
let responseToCategoryDomain = BaseCategoryItem(
id: response.categoryId,
userId: 0,
categoryName: response.categoryName,
categoryImage: BaseCategoryImage(
imageId: response.categoryImage.imageId,
imageURL: response.categoryImage.imageUrl
),
contentCount: 0,
createdAt: "",
//TODO: v2 property 수정
openType: domain.openType,
keywordType: domain.keywordType,
userCount: 0
)
await send(.inner(.카테고리_인메모리_저장(responseToCategoryDomain)))
await send(.delegate(.settingSuccess))

case .수정:
guard let categoryId = domain.categoryId else { return }
guard let image = domain.categoryImage else { return }
let request = CategoryEditRequest(
categoryName: domain.categoryName,
categoryImageId: image.id
categoryImageId: image.id,
openType: domain.openType.title,
keywordType: domain.keywordType.title
)
)
await send(.delegate(.settingSuccess))
let _ = try await categoryClient.카테고리_수정(categoryId, request)
await send(.delegate(.settingSuccess))

case .공유추가:
guard let categoryId = domain.categoryId else { return }
guard let image = domain.categoryImage else { return }
try await categoryClient.공유받은_카테고리_저장(
CopiedCategoryRequest(
originCategoryId: categoryId,
categoryName: domain.categoryName,
categoryImageId: image.id
)
)
await send(.delegate(.settingSuccess))
}
} catch: { error, send in
guard let errorResponse = error as? ErrorResponse else { return }
await send(.inner(.포킷_오류_핸들링(BaseError(response: errorResponse))))
}
} catch: { error, send in
guard let errorResponse = error as? ErrorResponse else { return }
await send(.inner(.포킷_오류_핸들링(BaseError(response: errorResponse))))
}

case .뷰가_나타났을때:
let selectType = state.selectedKeywordType
if selectType != .default {
state.keywordSelectType = .select(keywordName: selectType.title)
}
/// 단순 조회API들의 나열이라 merge사용
return .merge(
.send(.async(.프로필_목록_조회_API)),
Expand All @@ -231,6 +259,18 @@ private extension PokitCategorySettingFeature {
case .포킷명지우기_버튼_눌렀을때:
state.domain.categoryName = ""
return .none

case let .키워드_바텀시트_활성화(isActive):
state.isKeywordSheetPresented = isActive
return .none

//TODO: 액션 마이그레이션 시 반영
case let .키워드_선택_버튼_눌렀을때(type):
state.domain.keywordType = type
state.keywordSelectType = .select(keywordName: type.title)
return .run { send in
await send(.view(.키워드_바텀시트_활성화(false)))
}
}
}

Expand Down
14 changes: 10 additions & 4 deletions Projects/Feature/FeatureCategorySetting/Sources/PokitCategorySettingView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import SwiftUI
import ComposableArchitecture
import Domain
import DSKit
import Util
import NukeUI

@ViewAction(for: PokitCategorySettingFeature.self)
Expand All @@ -17,7 +18,6 @@ public struct PokitCategorySettingView: View {
@Perception.Bindable
public var store: StoreOf<PokitCategorySettingFeature>
@FocusState private var isFocused: Bool
@State private var isOn = false

/// - Initializer
public init(store: StoreOf<PokitCategorySettingFeature>) {
Expand Down Expand Up @@ -51,6 +51,12 @@ public extension PokitCategorySettingView {
delegateSend: { store.send(.scope(.profile($0))) }
)
}
.sheet(isPresented: $store.isKeywordSheetPresented) {
PokitKeywordBottomSheet(
selectedKeywordType: store.selectedKeywordType,
action: { send(.키워드_선택_버튼_눌렀을때($0)) }
)
}
.task { await send(.뷰가_나타났을때).finish() }
}
}
Expand Down Expand Up @@ -170,17 +176,17 @@ private extension PokitCategorySettingView {
Group {
if store.isPublicType {
VStack(alignment: .leading, spacing: 4) {
Button(action: {}) {
Button(action: { send(.키워드_바텀시트_활성화(true)) }) {
Text("포킷 키워드")
.pokitFont(.b1(.b))
.foregroundStyle(.pokit(.text(.primary)))
Spacer()
Image(.icon(.arrowRight))
}
.buttonStyle(.plain)
Text("추천을 위해 포킷 키워드를 선택해 주세요.")
Text(store.keywordSelectType.label)
.pokitFont(.detail1)
.foregroundStyle(.pokit(.text(.tertiary)))
.foregroundStyle(store.keywordSelectType.fontColor)
}
.padding(.vertical, 12)
.padding(.leading, 8)
Expand Down

0 comments on commit dd90c80

Please sign in to comment.