-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
[PC-000] suspendRunCatching 추가 #26
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.puzzle.common | ||
|
||
import kotlin.coroutines.cancellation.CancellationException | ||
|
||
suspend inline fun <T, R> T.suspendRunCatching(crossinline block: suspend T.() -> R): Result<R> { | ||
return try { | ||
Result.success(block()) | ||
} catch (e: CancellationException) { | ||
throw e | ||
} catch (t: Throwable) { | ||
Result.failure(t) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
package com.puzzle.data.repository | ||
|
||
import com.puzzle.common.suspendRunCatching | ||
import com.puzzle.database.model.terms.TermEntity | ||
import com.puzzle.database.source.term.LocalTermDataSource | ||
import com.puzzle.domain.model.terms.Term | ||
|
@@ -12,7 +13,7 @@ class TermsRepositoryImpl @Inject constructor( | |
private val termDataSource: TermDataSource, | ||
private val localTermDataSource: LocalTermDataSource, | ||
) : TermsRepository { | ||
override suspend fun loadTerms(): Result<Unit> = runCatching { | ||
override suspend fun loadTerms(): Result<Unit> = suspendRunCatching { | ||
val terms = termDataSource.loadTerms() | ||
.getOrThrow() | ||
.toDomain() | ||
|
@@ -31,8 +32,8 @@ class TermsRepositoryImpl @Inject constructor( | |
localTermDataSource.clearAndInsertTerms(termsEntity) | ||
} | ||
|
||
override suspend fun getTerms(): Result<List<Term>> = runCatching { | ||
override suspend fun getTerms(): Result<List<Term>> = suspendRunCatching { | ||
localTermDataSource.getTerms() | ||
.map { it.toDomain() } | ||
.map(TermEntity::toDomain) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 👍 |
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
저번 PR에서 제가 달았던 코멘트의 의미는 get보다 의미 범위가 조금 더 좁은 단어를 말하는 거였어요!ㅎㅎ 제가 요즘 여기저기서 스코프라는 단어를 쓸 일이 좀 있었는데, 아무 생각없이 스코프라는 단어를 썼던 것 같아요 허허... 다음 PR부턴 조금 더 명확한 표현을 쓰도록 할게요...!!!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
아하 괜찮습니다!!
좀 더 좁은 의미가 흠.. 네이밍이 생각이 ㅠㅠㅠㅠㅠㅠㅠㅠㅠㅠㅠㅠㅠㅠ