Skip to content

Refactor/#413 코드리뷰 반영 #433

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
juri123123 merged 3 commits into from
May 6, 2026
Merged

Refactor/#413 코드리뷰 반영 #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
767e09f
refactor: #413 task 취소 관리
juri123123 May 5, 2026
d969ebe
fix: #431 사용하지 않는 의존성 제거
juri123123 May 5, 2026
51b818a
refactor: #413 AI 응답 판단 후 로직 repository -> usecase 이동
juri123123 May 5, 2026
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
45 changes: 20 additions & 25 deletions ByeBoo-iOS/ByeBoo-iOS/Data/Repository/QuestsRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,24 +122,23 @@ struct DefaultQuestRepository: QuestsInterface {
.emptyAnswerStub()
}

func fetchAIAnswer(questID: Int, isAnswerExists: Bool) async throws -> AIAnswerEntity {
let result: AIAnswerResponseDTO

if isAnswerExists {
result = try await network.request(
QuestAPI.fetchAIAnswer(questID: questID),
decodingType: AIAnswerResponseDTO.self
)
} else {
result = try await network.request(
QuestAPI.createAIAnswer(questID: questID),
decodingType: AIAnswerResponseDTO.self
)
}
func fetchAIAnswer(questID: Int) async throws -> AIAnswerEntity {
Copy link
Copy Markdown
Collaborator

@dev-domo dev-domo May 6, 2026

Choose a reason for hiding this comment

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

답장 존재 유무와 상관없이 계속 create을 하게 되나요?

Copy link
Copy Markdown
Collaborator Author

@juri123123 juri123123 May 6, 2026

Choose a reason for hiding this comment

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

답장 존재 유무를 판단하고 fetch 할지 create 할지 결정하는 역할을 usecase로 넘겼습니다 !

let result: AIAnswerResponseDTO = try await network.request(
QuestAPI.createAIAnswer(questID: questID),
decodingType: AIAnswerResponseDTO.self
)

return result.toEntity()
}

func createAIAnswer(questID: Int) async throws -> AIAnswerEntity {
let result = try await network.request(
QuestAPI.createAIAnswer(questID: questID),
decodingType: AIAnswerResponseDTO.self
)
return result.toEntity()
}

// MARK: private function

private func makeSignedURL(imageKey: String) async throws -> String {
Expand Down Expand Up @@ -188,14 +187,6 @@ struct DefaultQuestRepository: QuestsInterface {
QuestAPI.editActive(questID: questID, request: editQuestActiveDTO)
)
}

private func createAIAnswer(questID: Int) async throws -> AIAnswerEntity {
let result = try await network.request(
QuestAPI.createAIAnswer(questID: questID),
decodingType: AIAnswerResponseDTO.self
)
return result.toEntity()
}
}

final class MockQuestsRepository: QuestsInterface {
Expand Down Expand Up @@ -258,9 +249,13 @@ final class MockQuestsRepository: QuestsInterface {
.emptyAnswerStub()
}

func fetchAIAnswer(questID: Int, isAnswerExists: Bool) async throws -> AIAnswerEntity {
func fetchAIAnswer(questID: Int) async throws -> AIAnswerEntity {
// throw ByeBooError.unknownError
Copy link
Copy Markdown
Member

@y-eonee y-eonee May 5, 2026

Choose a reason for hiding this comment

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

요 주석은 무엇인가용??

Copy link
Copy Markdown
Collaborator Author

@juri123123 juri123123 May 6, 2026

Choose a reason for hiding this comment

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

요 주석은 error를 던지는 경우를 테스트하기 위함입니닷!!!!

.stub()
}

func createAIAnswer(questID: Int) async throws -> AIAnswerEntity {
try await Task.sleep(for: .seconds(2))
throw ByeBooError.unknownError
// .stub()
return .stub()
}
}
3 changes: 2 additions & 1 deletion ByeBoo-iOS/ByeBoo-iOS/Domain/Interface/QuestsInterface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ protocol QuestsInterface {
imageKey: String,
isImageChanged: Bool) async throws
func fetchCommoncQuest(date: String) async throws -> CommonQuestAnswersEntity
func fetchAIAnswer(questID: Int, isAnswerExists: Bool) async throws -> AIAnswerEntity
func fetchAIAnswer(questID: Int) async throws -> AIAnswerEntity
func createAIAnswer(questID: Int) async throws -> AIAnswerEntity
}
6 changes: 5 additions & 1 deletion ByeBoo-iOS/ByeBoo-iOS/Domain/UseCase/FetchAIAnswerUseCase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ struct DefaultFetchAIAnswerUseCase: FetchAIAnswerUseCase {
}

func execute(questID: Int, isAnswerExists: Bool) async throws -> AIAnswerEntity {
try await repository.fetchAIAnswer(questID: questID, isAnswerExists: isAnswerExists)
if isAnswerExists {
return try await repository.fetchAIAnswer(questID: questID)
} else {
return try await repository.createAIAnswer(questID: questID)
}
}
}
6 changes: 6 additions & 0 deletions ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/AIAnswerViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ final class AIAnswerViewController: BaseViewController {
)
)
}

override func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated)

viewModel.action(.viewDidDisappear)
}
}

extension AIAnswerViewController {
Expand Down
14 changes: 13 additions & 1 deletion ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewModel/AIAnswerViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ final class AIAnswerViewModel {
private var questID: Int = 1
private var isAnswerExists: Bool = false

private var fetchAIAnswerTask: Task<Void, Never>?

init(fetchAIAnswerUseCase: FetchAIAnswerUseCase) {
self.fetchAIAnswerUseCase = fetchAIAnswerUseCase

Expand All @@ -34,6 +36,7 @@ final class AIAnswerViewModel {
extension AIAnswerViewModel: ViewModelType {
enum Input {
case viewDidLoad(questID: Int, isAIAnswerExists: Bool)
case viewDidDisappear
}

struct Output {
Expand All @@ -48,13 +51,17 @@ extension AIAnswerViewModel: ViewModelType {
self.isAnswerExists = isExists

fetchAIAnswer()
case .viewDidDisappear:
cancelTask()
}
}
}

extension AIAnswerViewModel {
private func fetchAIAnswer() {
Task {
fetchAIAnswerTask?.cancel()
Copy link
Copy Markdown
Collaborator

@dev-domo dev-domo May 6, 2026

Choose a reason for hiding this comment

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

fetchAIAnswerTask?.cancel() 대신 만들어놓은 cancelTask를 호출하는 방법도 괜찮을 것 같아요!

Copy link
Copy Markdown
Collaborator Author

@juri123123 juri123123 May 6, 2026

Choose a reason for hiding this comment

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

좋은 의견 감사합니다 !!!
추후 fetch하는 task가 많아질 경우 cancelTask 내부에 task들을 취소하는 로직을 모두 넣을 예정이라 통일성을 위해 분리해서 사용할 수 있도록 이렇게 작성했습니닷 !


fetchAIAnswerTask = Task {
do {
AILoadingSubject.send(true)

Expand All @@ -74,4 +81,9 @@ extension AIAnswerViewModel {
}
}
}

private func cancelTask() {
fetchAIAnswerTask?.cancel()
fetchAIAnswerTask = nil
}
Comment on lines +85 to +88
Copy link
Copy Markdown
Member

@y-eonee y-eonee May 5, 2026

Choose a reason for hiding this comment

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

우와..저도 이번 스프린트부터 적용해보겠습니다!!

}
5 changes: 1 addition & 4 deletions ByeBoo-iOS/ByeBoo-iOS/Presentation/PresentationDependencyAssembler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ struct PresentationDependencyAssembler: DependencyAssembler {
}

DIContainer.shared.register(type: ArchiveQuestViewModel.self) { container in
guard let questAnswerUseCase = container.resolve(type: QuestAnswerUseCase.self),
let fetchAIAnswerUseCase = container.resolve(type: FetchAIAnswerUseCase.self)
else {
guard let questAnswerUseCase = container.resolve(type: QuestAnswerUseCase.self) else {
ByeBooLogger.error(ByeBooError.DIFailedError)
return
}
Expand All @@ -103,7 +101,6 @@ struct PresentationDependencyAssembler: DependencyAssembler {
)
}


DIContainer.shared.register(type: HomeViewModel.self) { container in
guard let characterUseCase = container.resolve(type: FetchCharacterDialogueUseCase.self),
let questStatusUseCase = container.resolve(type: FetchQuestStatusUseCase.self),
Expand Down
Loading