Skip to content

Commit

Permalink
refactor: rename usecase and entities at presentation(depromeet#560)
Browse files Browse the repository at this point in the history
  • Loading branch information
akrudal committed Jun 14, 2024
1 parent a4d7408 commit 7a691bd
Show file tree
Hide file tree
Showing 27 changed files with 152 additions and 131 deletions.
2 changes: 1 addition & 1 deletion 14th-team5-iOS/App/Sources/Manager/DeepLinkManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ final class DeepLinkManager {
// 이번 3차 끝나고, postdetailviewcontroller에서 post 불러오는 형태로 바꿔보겠습니다.
let disposeBag: DisposeBag = DisposeBag()
let postRepository: PostListRepositoryProtocol = PostRepository()
lazy var postUseCase: PostListUseCaseProtocol = PostListUseCase(postListRepository: postRepository)
lazy var postUseCase: FetchPostListUseCaseProtocol = FetchPostListUseCase(postListRepository: postRepository)

private init() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public final class DailyCalendarViewController: BBNavigationViewController<Daily
.distinctUntilChanged()
.withUnretained(self)
.bind { owner, post in
let postListData = PostListData(
let postListData = PostEntity(
postId: post.postId,
author: ProfileData(memberId: post.authorId, name: ""),
commentCount: post.commentCount,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,8 @@ extension MainPostViewDIContainer {
private func makePostRepository() -> PostListRepositoryProtocol {
return PostRepository()
}

func makeUploadPostRepository() -> UploadPostRepositoryProtocol {
return PostUserDefaultsRepository()
}

func makePostUseCase() -> PostListUseCaseProtocol {
return PostListUseCase(postListRepository: makePostRepository(), uploadePostRepository: makeUploadPostRepository())
func makePostUseCase() -> FetchPostListUseCaseProtocol {
return FetchPostListUseCase(postListRepository: makePostRepository())
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public struct PostSection {
public typealias Model = SectionModel<Int, Item>

public enum Item {
case main(PostListData)
case main(PostEntity)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ final class MainPostCellReactor: Reactor {
}

struct State {
let postListData: PostListData
let postListData: PostEntity
var fetchedDisplayContent: [DisplayEditSectionModel] = [.displayKeyword([])]
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ final class MainPostViewReactor: Reactor {

let initialState: State
private let provider: GlobalStateProviderProtocol
private let postUseCase: PostListUseCaseProtocol
private let postUseCase: FetchPostListUseCaseProtocol

init(initialState: State, provider: GlobalStateProviderProtocol, postUseCase: PostListUseCaseProtocol) {
init(initialState: State, provider: GlobalStateProviderProtocol, postUseCase: FetchPostListUseCaseProtocol) {
self.initialState = initialState
self.provider = provider
self.postUseCase = postUseCase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ extension MainPostCollectionViewCell {
}

extension MainPostCollectionViewCell {
private func setCell(_ data: PostListData) {
private func setCell(_ data: PostEntity) {
if let url = URL(string: data.imageURL ) {
imageView.kf.setImage(with: url)
indicator.stopAnimating()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ final class PostDetailCellDIContainer {
return MemberUseCase(memberRepository: makeMemberRepository())
}

func makeReactor(type: PostDetailViewReactor.CellType = .home, post: PostListData) -> PostDetailViewReactor {
func makeReactor(type: PostDetailViewReactor.CellType = .home, post: PostEntity) -> PostDetailViewReactor {
return PostDetailViewReactor(
provider: globalState,
memberUserCase: makeMemberUseCase(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,8 @@ final class PostListsDIContainer {
return PostRepository()
}

func makeUploadPostRepository() -> UploadPostRepositoryProtocol {
return PostUserDefaultsRepository()
}

func makePostUseCase() -> PostListUseCaseProtocol {
return PostListUseCase(postListRepository: makePostRepository())
func makePostUseCase() -> FetchPostListUseCaseProtocol {
return FetchPostListUseCase(postListRepository: makePostRepository())
}

func makeEmojiRepository() -> ReactionRepositoryProtocol {
Expand All @@ -64,23 +60,13 @@ final class PostListsDIContainer {
return MissionContentUseCase(missionContentRepository: makeMissionRepository())
}

func makeEmojiUseCase() -> ReactionUseCaseProtocol {
return ReactionUseCase(reactionRepository: makeEmojiRepository())
}

func makeRealEmojiUseCase() -> RealEmojiUseCaseProtocol {
return RealEmojiUseCase(realEmojiRepository: makeRealEmojiRepository())
}

func makeReactor(
postLists: PostSection.Model,
selectedIndex: Int,
notificationDeepLink: NotificationDeepLink?
) -> Reactor {
return PostReactor(
provider: globalState,
realEmojiRepository: makeRealEmojiUseCase(),
emojiRepository: makeEmojiUseCase(),
missionUseCase: makeMissionUseCase(),
initialState: PostReactor.State(
selectedIndex: selectedIndex,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,19 @@ final class ReactionDIContainer {
return appDelegate.globalStateProvider
}

private func makeReactor(post: PostListData) -> ReactionViewReactor {
return ReactionViewReactor(provider: globalState, initialState: .init(type: type, postListData: post), emojiRepository: makeEmojiUseCase(), realEmojiRepository: makeRealEmojiUseCase())
private func makeReactor(post: PostEntity) -> ReactionViewReactor {
return ReactionViewReactor(
initialState: .init(type: type, postListData: post),
provider: globalState,
fetchReactionUseCase: makeFetchReactionListUseCase(),
createReactionUseCase: makeCreateReactionUseCase(),
removeReactionUseCase: makeRemoveReactionUseCase(),
fetchRealEmojiListUseCase: makeFetchRealEmojiListUseCase(),
createRealEmojiUseCase: makeCreateRealEmojiUseCase(),
removeRealEmojiUseCase: makeRemoveRealEmojiUseCase())
}

func makeViewController(post: PostListData) -> ReactionViewController {
func makeViewController(post: PostEntity) -> ReactionViewController {
return ReactionViewController(reactor: makeReactor(post: post))
}
}
Expand All @@ -43,8 +51,16 @@ extension ReactionDIContainer {
return RealEmojiRepository()
}

private func makeRealEmojiUseCase() -> RealEmojiUseCaseProtocol {
return RealEmojiUseCase(realEmojiRepository: makeRealEmojiRepository())
private func makeCreateRealEmojiUseCase() -> CreateRealEmojiUseCaseProtocol {
return CreateRealEmojiUseCase(realEmojiRepository: makeRealEmojiRepository())
}

private func makeRemoveRealEmojiUseCase() -> RemoveRealEmojiUseCaseProtocol {
return RemoveRealEmojiUseCase(realEmojiRepository: makeRealEmojiRepository())
}

private func makeFetchRealEmojiListUseCase() -> FetchRealEmojiListUseCaseProtocol {
return FetchRealEmojiListUseCase(realEmojiRepository: makeRealEmojiRepository())
}
}

Expand All @@ -53,7 +69,15 @@ extension ReactionDIContainer {
return ReactionRepository()
}

private func makeEmojiUseCase() -> ReactionUseCaseProtocol {
return ReactionUseCase(reactionRepository: makeReactionRepository())
private func makeCreateReactionUseCase() -> CreateReactionUseCaseProtocol {
return CreateReactionUseCase(reactionRepository: makeReactionRepository())
}

private func makeRemoveReactionUseCase() -> RemoveReactionUseCaseProtocol {
return RemoveReactionUseCase(reactionRepository: makeReactionRepository())
}

private func makeFetchReactionListUseCase() -> FetchReactionListUseCaseProtocol {
return FetchReactionListUseCase(reactionRepository: makeReactionRepository())
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ final class ReactionMemberDIContainer {
return FamilyUseCase(familyRepository: makeFamilyRepository())
}

func makeReactionMemberReactor(emojiData: FetchedEmojiData) -> ReactionMemberViewReactor {
func makeReactionMemberReactor(emojiData: RealEmojiEntity) -> ReactionMemberViewReactor {
return ReactionMemberViewReactor(initialState: .init(emojiData: emojiData), familyUseCase: makeFamilyUseCase())
}

func makeViewController(emojiData: FetchedEmojiData) -> ReactionMembersViewController {
func makeViewController(emojiData: RealEmojiEntity) -> ReactionMembersViewController {
return ReactionMembersViewController(reactor: makeReactionMemberReactor(emojiData: emojiData))
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ import RxSwift

final class SelectableEmojiDIContainer {
private func makeReactor(postId: String) -> SelectableEmojiReactor {
return SelectableEmojiReactor(postId: postId, emojiRepository: makeEmojiUseCase(), realEmojiRepository: makeRealEmojiUseCase())
return SelectableEmojiReactor(
postId: postId,
createReactionUseCase: makeCreateReactionUseCase(),
createRealEmojiUseCase: makeCreateRealEmojiUseCase(),
fetchMyRealEmojiUseCase: makeFetchMyRealEmojiUseCase())
}

func makeViewController(postId: String, subject: PublishSubject<Void>) -> SelectableEmojiViewController {
Expand All @@ -28,8 +32,12 @@ extension SelectableEmojiDIContainer {
return RealEmojiRepository()
}

private func makeRealEmojiUseCase() -> RealEmojiUseCaseProtocol {
return RealEmojiUseCase(realEmojiRepository: makeRealEmojiRepository())
private func makeCreateRealEmojiUseCase() -> CreateRealEmojiUseCaseProtocol {
return CreateRealEmojiUseCase(realEmojiRepository: makeRealEmojiRepository())
}

private func makeFetchMyRealEmojiUseCase() -> FetchMyRealEmojiUseCaseProtocol {
return FetchMyRealEmojiUseCase(realEmojiRepository: makeRealEmojiRepository())
}
}

Expand All @@ -38,7 +46,7 @@ extension SelectableEmojiDIContainer {
return ReactionRepository()
}

private func makeEmojiUseCase() -> ReactionUseCaseProtocol {
return ReactionUseCase(reactionRepository: makeReactionRepository())
private func makeCreateReactionUseCase() -> CreateReactionUseCaseProtocol {
return CreateReactionUseCase(reactionRepository: makeReactionRepository())
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ struct ReactionSection {
enum Item {
case addComment(Int)
case addReaction
case main(FetchedEmojiData)
case main(RealEmojiEntity)
}
}

Expand All @@ -33,7 +33,7 @@ struct SelectableReactionSection {

enum Item {
case standard(Emojis)
case realEmoji(MyRealEmoji?)
case realEmoji(MyRealEmojiEntity?)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ import Domain

import RxDataSources

typealias PostListSectionModel = SectionModel<String, PostListData>

struct SectionOfPostDetail {
var items: [PostData]

init(items: [PostData]) {
self.items = items
}
}

extension SectionOfPostDetail: SectionModelType {
typealias Item = PostData

init(original: SectionOfPostDetail, items: [PostData]) {
self = original
self.items = items
}
}
typealias PostListSectionModel = SectionModel<String, PostEntity>
//
//struct SectionOfPostDetail {
// var items: [BriefPostEntity]
//
// init(items: [BriefPostEntity]) {
// self.items = items
// }
//}
//
//extension SectionOfPostDetail: SectionModelType {
// typealias Item = BriefPostEntity
//
// init(original: SectionOfPostDetail, items: [BriefPostEntity]) {
// self = original
// self.items = items
// }
//}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ final class PostDetailViewReactor: Reactor {

struct State {
let type: CellType
let post: PostListData
let post: PostEntity

var missionContent: String = ""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@ final class PostReactor: Reactor {
let originPostLists: PostSection.Model

var isPop: Bool = false
var selectedPost: PostListData = .init(postId: "", author: .init(memberId: "", profileImageURL: "", name: ""), commentCount: 0, emojiCount: 0, imageURL: "", content: "", time: "")
var selectedPost: PostEntity = .init(postId: "", author: .init(memberId: "", profileImageURL: "", name: ""), commentCount: 0, emojiCount: 0, imageURL: "", content: "", time: "")

@Pulse var missionContent: MissionContentResponse? = nil
@Pulse var fetchedPost: PostData? = nil
@Pulse var reactionMemberIds: [String] = []
@Pulse var shouldPushProfileViewController: String?

Expand All @@ -42,22 +41,16 @@ final class PostReactor: Reactor {

let initialState: State

let realEmojiRepository: RealEmojiUseCaseProtocol
let emojiRepository: ReactionUseCaseProtocol
let missionUseCase: MissionContentUseCaseProtocol
let provider: GlobalStateProviderProtocol


init(
provider: GlobalStateProviderProtocol,
realEmojiRepository: RealEmojiUseCaseProtocol,
emojiRepository: ReactionUseCaseProtocol,
missionUseCase: MissionContentUseCaseProtocol,
initialState: State
) {
self.provider = provider
self.realEmojiRepository = realEmojiRepository
self.emojiRepository = emojiRepository
self.missionUseCase = missionUseCase
self.initialState = initialState
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ final class ReactionMemberViewReactor: Reactor {
}

struct State {
let emojiData: FetchedEmojiData
let emojiData: RealEmojiEntity
var memberDataSource: [FamilyMemberProfileSectionModel] = []
}

Expand Down
Loading

0 comments on commit 7a691bd

Please sign in to comment.