Update delete methods in daos #2593
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
marazmarci
reviewed
Jun 8, 2022
Comment on lines
-79
to
+84
| for (setting in allSettings) { | ||
| if (setting.value == "") | ||
| sensorDao.removeSetting(lastUpdate.id, setting.name) | ||
|
|
||
| val settingsToRemove = allSettings | ||
| .filter { setting -> setting.value == "" } | ||
| .map { setting -> setting.name } | ||
| if (settingsToRemove.isNotEmpty()) { | ||
| sensorDao.removeSettings(lastUpdate.id, settingsToRemove) |
There was a problem hiding this comment.
This change will cause a conflict with my open PR: #2585 Fix removing non-last list items from Last Update Trigger sensor's settings
See these lines in my changes.
We should decide on who and how to resolve it.
I think it would be easier to solve the conflict in your PR because I have several smaller commits which would be harder to rebase. And my PR is already reviewed (but not yet formally approved) by one person (@jpelgrom).
jpelgrom
approved these changes
Jun 9, 2022
JBassett
approved these changes
Jun 14, 2022
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.
Summary
Some additional work to make Dao methods run non-blocking using coroutines. Converted some methods to use coroutines and removed some unused methods.