Skip to content

[Refactor] 뷰잇 모델 수정 #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JinUng41 merged 4 commits into from
Sep 12, 2025
Merged

[Refactor] 뷰잇 모델 수정 #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afe58b7
[Refactor] #274 - 뷰잇 모델에 Likable 적용
JinUng41 Sep 5, 2025
14a90c6
[Chore] #274 - 지역 변수명 수정
JinUng41 Sep 5, 2025
1581903
[Chore] #274 - 개행 추가
JinUng41 Sep 5, 2025
8fc4ad5
[Chore] #274 - 삼항 연산자로 코드 수정
JinUng41 Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Wable-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@
DE6459CF2D97AA9D005569B8 /* AppDelegate+InjectDependency.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE6459CE2D97AA9D005569B8 /* AppDelegate+InjectDependency.swift */; };
DE6459D52D97B8C2005569B8 /* InformationNotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE6459D42D97B8C2005569B8 /* InformationNotificationViewController.swift */; };
DE64D7CA2DCBA2D700F55859 /* CreateViewitUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE64D7C92DCBA2D700F55859 /* CreateViewitUseCase.swift */; };
DE67A9EB2D7211070021BDE1 /* Like.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE67A9EA2D7211070021BDE1 /* Like.swift */; };
DE67A9EF2D7213D90021BDE1 /* Opacity.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE67A9EE2D7213D90021BDE1 /* Opacity.swift */; };
DE6C3E3E2D91A8E00046DB30 /* NewsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE6C3E3D2D91A8E00046DB30 /* NewsViewModel.swift */; };
DE7004842D8E87DC00B7AB71 /* RankListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE7004832D8E87DC00B7AB71 /* RankListViewController.swift */; };
Expand Down Expand Up @@ -661,7 +660,6 @@
DE6459CE2D97AA9D005569B8 /* AppDelegate+InjectDependency.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+InjectDependency.swift"; sourceTree = "<group>"; };
DE6459D42D97B8C2005569B8 /* InformationNotificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InformationNotificationViewController.swift; sourceTree = "<group>"; };
DE64D7C92DCBA2D700F55859 /* CreateViewitUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateViewitUseCase.swift; sourceTree = "<group>"; };
DE67A9EA2D7211070021BDE1 /* Like.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Like.swift; sourceTree = "<group>"; };
DE67A9EE2D7213D90021BDE1 /* Opacity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Opacity.swift; sourceTree = "<group>"; };
DE6C3E3D2D91A8E00046DB30 /* NewsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsViewModel.swift; sourceTree = "<group>"; };
DE7004832D8E87DC00B7AB71 /* RankListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankListViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1259,7 +1257,6 @@
DD2967EA2D6DAC3100143851 /* AccountInfo.swift */,
DD2967ED2D6DAC3100143851 /* UserProfile.swift */,
DE67A9EE2D7213D90021BDE1 /* Opacity.swift */,
DE67A9EA2D7211070021BDE1 /* Like.swift */,
DD2967EF2D6DAC3100143851 /* Content.swift */,
DD9980DA2D834CA900EBBFBC /* Comment.swift */,
DD2967F02D6DAC3100143851 /* Notification.swift */,
Expand Down Expand Up @@ -2939,7 +2936,6 @@
DE6C3E3E2D91A8E00046DB30 /* NewsViewModel.swift in Sources */,
DD29681A2D6DAD0200143851 /* ViewitRepository.swift in Sources */,
DE833B9B2DE22A8500812A80 /* Publishers+UIControlEvent.swift in Sources */,
DE67A9EB2D7211070021BDE1 /* Like.swift in Sources */,
DDFB22422D8BA9D200FEA24A /* LCKTeamViewController.swift in Sources */,
DD765D9D2D8747950029A317 /* SplashViewController.swift in Sources */,
DD29681B2D6DAD0200143851 /* ProfileRepository.swift in Sources */,
Expand Down
35 changes: 14 additions & 21 deletions Wable-iOS/Data/Mapper/ViewitMapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,28 @@ extension ViewitMapper {
dateFormatter.dateFormat = ""
dateFormatter.timeZone = TimeZone(abbreviation: "KST")

return response.map { content in
let userProfileURL = URL(string: content.memberProfileURL)
let thumbnailURL = URL(string: content.viewitImage ?? "")
let videoURL = URL(string: content.viewitLink ?? "")
let time = dateFormatter.date(from: content.time)
return response.map { viewit in
let userProfileURL = URL(string: viewit.memberProfileURL)
let thumbnailURL = URL(string: viewit.viewitImage ?? "")
let videoURL = URL(string: viewit.viewitLink ?? "")
let time = dateFormatter.date(from: viewit.time)

let postStatus: PostStatus
if content.isBlind {
postStatus = .blind
} else {
postStatus = .normal
}
let postStatus: PostStatus = viewit.isBlind ? .blind : .normal

return Viewit(
userID: content.memberID,
userNickname: content.memberNickname,
userID: viewit.memberID,
userNickname: viewit.memberNickname,
userProfileURL: userProfileURL,
id: content.viewitID,
id: viewit.viewitID,
thumbnailURL: thumbnailURL,
siteURL: videoURL,
siteName: content.viewitName,
title: content.viewitTitle,
text: content.viewitText,
siteName: viewit.viewitName,
title: viewit.viewitTitle,
text: viewit.viewitText,
time: time,
status: postStatus,
like: Like(
status: content.isLiked,
count: content.likedNumber
)
isLiked: viewit.isLiked,
likeCount: viewit.likedNumber
)
}
}
Expand Down
15 changes: 10 additions & 5 deletions Wable-iOS/Data/RepositoryImpl/ViewitRepositoryImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ struct MockViewitRepository: ViewitRepository {
text: "요즘 개발자들에게 꼭 필요한 iOS 최신 기능들! 이 영상 완전 추천해요~",
time: Date(),
status: .blind,
like: Like(status: false, count: 24)
isLiked: false,
likeCount: 24
),
Viewit(
userID: 2,
Expand All @@ -130,7 +131,8 @@ struct MockViewitRepository: ViewitRepository {
text: "Swift 언어의 최신 기능들이 정말 잘 정리되어 있어요. 초보자부터 숙련자까지 모두에게 도움이 될 듯!",
time: Date().addingTimeInterval(-3600 * 24),
status: .normal,
like: Like(status: true, count: 56)
isLiked: true,
likeCount: 56
),
Viewit(
userID: 3,
Expand All @@ -144,7 +146,8 @@ struct MockViewitRepository: ViewitRepository {
text: "최신 트렌드는 SwiftUI지만 아직 UIKit이 필요한 상황들이 많이 있어요. 이 영상이 그 이유를 잘 설명해줍니다.",
time: Date().addingTimeInterval(-3600 * 48),
status: .normal,
like: Like(status: false, count: 42)
isLiked: false,
likeCount: 42
),
Viewit(
userID: 4,
Expand All @@ -158,7 +161,8 @@ struct MockViewitRepository: ViewitRepository {
text: "앱 디자인 트렌드가 어떻게 변하고 있는지 정말 잘 보여주는 영상입니다. 개발자와 디자이너 모두에게 추천!",
time: Date().addingTimeInterval(-3600 * 72),
status: .blind,
like: Like(status: false, count: 18)
isLiked: false,
likeCount: 18
),
Viewit(
userID: 5,
Expand All @@ -172,7 +176,8 @@ struct MockViewitRepository: ViewitRepository {
text: "MVVM, Clean Architecture에 대해 정말 쉽게 설명해주는 영상이에요. 구현 예제도 있어서 바로 적용할 수 있어요!",
time: Date().addingTimeInterval(-3600 * 96),
status: .normal,
like: Like(status: true, count: 103)
isLiked: true,
likeCount: 103
)
]

Expand Down
27 changes: 0 additions & 27 deletions Wable-iOS/Domain/Entity/Like.swift
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions Wable-iOS/Domain/Entity/Viewit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation

// MARK: - 뷰잇 정보

struct Viewit: Identifiable, Hashable {
struct Viewit: Identifiable, Hashable, Likable {
let userID: Int
let userNickname: String
let userProfileURL: URL?
Expand All @@ -23,5 +23,6 @@ struct Viewit: Identifiable, Hashable {
let time: Date?

var status: PostStatus
var like: Like
var isLiked: Bool
var likeCount: Int
}
4 changes: 2 additions & 2 deletions Wable-iOS/Domain/UseCase/Viewit/LikeViewitUseCase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ final class LikeViewitUseCaseImpl: LikeViewitUseCase {
return repository.postViewitLiked(viewitID: viewit.id)
.map {
var likedViewit = viewit
likedViewit.like.like()
likedViewit.like()
return likedViewit
}
.eraseToAnyPublisher()
Expand All @@ -30,7 +30,7 @@ final class LikeViewitUseCaseImpl: LikeViewitUseCase {
return repository.deleteViewitLiked(viewitID: viewit.id)
.map {
var unlikedViewit = viewit
unlikedViewit.like.unlike()
unlikedViewit.unlike()
Copy link
Member

@youz2me youz2me Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이건 그냥 저도 리팩토링하면서 느꼈던 의문점인데 toggle()로 구현하지 않고 like()와 unlike()를 분리하신 이유가 있을까요?
아무래도 안정성 때문일까요..?

Copy link
Collaborator Author

@JinUng41 JinUng41 Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

조금 시간이 지나서 자세히 기억나지 않네요.
금요일에 말씀드리도록 하겠습니다.

return unlikedViewit
}
.eraseToAnyPublisher()
Expand Down
4 changes: 2 additions & 2 deletions Wable-iOS/Presentation/Viewit/List/View/ViewitListViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ private extension ViewitListViewController {
thumbnailImageURL: item.thumbnailURL,
title: item.title,
siteName: item.siteName,
isLiked: item.like.status,
likeCount: item.like.count,
isLiked: item.isLiked,
likeCount: item.likeCount,
isBlind: item.status == .blind
)

Expand Down
2 changes: 1 addition & 1 deletion Wable-iOS/Presentation/Viewit/List/ViewModel/ViewitListViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private extension ViewitListViewModel {
.withUnretained(self)
.flatMap { owner, index -> AnyPublisher<(Int, Viewit), Never> in
let viewit = owner.viewitListRelay.value[index]
let likePublisher: AnyPublisher<Viewit?, WableError> = viewit.like.status
let likePublisher: AnyPublisher<Viewit?, WableError> = viewit.isLiked
? owner.likeUseCase.unlike(viewit: viewit)
: owner.likeUseCase.like(viewit: viewit)

Expand Down