Convert Nightscout command to coroutines #202
Merged
Conversation
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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -109,7 +107,7 @@ | |||
| * @param event Command event which called this command | |||
| * @return A nightscout DTO and an embed based on it | |||
| */ | |||
| private fun getUnstoredData(event: CommandEvent): Mono<Tuple2<NightscoutDTO, MessageEmbed>> { | |||
| private suspend fun getUnstoredData(event: CommandEvent): NightscoutUserDTO { | |||
Check warning
Code scanning / detekt
Excessive nesting leads to hidden complexity. Prefer extracting code to make it easier to understand. Warning
| @@ -177,71 +171,72 @@ | |||
| * @param event Command event which called this command | |||
| * @return NS user DTO for this domain. This will be a generic DTO if there was no data found. | |||
| */ | |||
| private fun getDataFromDomain(domain: String, event: CommandEvent): Mono<NightscoutUserDTO> { | |||
| val userDtos = getUsersForDomain(domain) | |||
| private suspend fun getDataFromDomain(domain: String, event: CommandEvent): NightscoutUserDTO { | |||
Check warning
Code scanning / detekt
Restrict the number of return statements in methods. Warning
...c/main/java/com/dongtronic/diabot/platforms/discord/commands/nightscout/NightscoutCommand.kt
Dismissed
Show dismissed
Hide dismissed
cascer1
approved these changes
Nov 2, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is the biggest command Diabot has (by line count), so I felt it would benefit the most from converting to coroutines first. Using coroutines allows the code to look similar to standard blocking code, and typically results in better readability.
Some parts of this could probably be improved more, but would require converting our existing frameworks (database I/O and Nightscout API) to coroutines.
This PR technically flags detekt, but these rules were already being broken with the original code. I tried to refactor it as much as I could to avoid triggering it, but I wasn't sure how to resolve the nesting one in
getUnstoredData()cleanly. The nested block depth is the same as the old code as far as I could tell, but it wasn't being flagged for some reason.