Fix: Update process with same json #1533
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
lciolecki
force-pushed
the
fix/update-process-json
branch
2 times, most recently
from
5fd3b2d
to
556b9f3
Compare
mproch
reviewed
Apr 19, 2021
| @@ -98,12 +98,18 @@ class DBProcessRepository(val dbConfig: DbConfig, val modelVersion: ProcessingTy | |||
| case CustomProcess(mainClass) => (None, Some(mainClass)) | |||
| } | |||
|
|
|||
| def normalizeJsonString(jsonString: String) = jsonString.filterNot(_.isWhitespace) | |||
There was a problem hiding this comment.
let's compare parsed json instead (i.e. Json class). Otherwise we will still have possible issues - like changing order of fields in json object etc. I think we can actually pass Json instead of raw string in some places (although I would do large refactor ATM :))
lciolecki
force-pushed
the
fix/update-process-json
branch
2 times, most recently
from
e286144
to
e85f4c0
Compare
mproch
approved these changes
Apr 20, 2021
| user = loggedUser.username, modelVersion = modelVersion.forType(processingType) | ||
| ) | ||
|
|
||
| //In some reasons in lastVersion.json is string with whitespaces.. |
There was a problem hiding this comment.
"we compare Json representation to ignore formatting differences"?
| case (Some(version), _) if isLastVersionContainsSameJson(version, maybeJson) && version.mainClass == maybeMainClass => | ||
| Right(None) | ||
| case (_, Some(json)) => | ||
| normalizeJsonString(json) |
There was a problem hiding this comment.
I think we don't need this, as we normalize in isLastVersionContainsSameJson anyway?
lciolecki
force-pushed
the
fix/update-process-json
branch
2 times, most recently
from
140921a
to
ebdf315
Compare
lciolecki
force-pushed
the
fix/update-process-json
branch
from
ebdf315
to
3a3bd1c
Compare
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.
After moved rename to process properties we can observe that when we change name then system create new version.. In fact we always send rename request and update process request.. If we change 2-3 times name then we can observe that system creates new version of process - but in json we don't see differences.. I debug mode I saw that lastProcessVersion json contains white spaces like
\nbut in BE tests I couldn't reproduce it..This MR fix this situation.