Log create-as-update as a conflict #1319
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
ktuite
force-pushed
the
ktuite/createAsUpdateConflict
branch
from
8d6512c to
7ed2b18
Compare
ktuite
commented
Dec 6, 2024
lib/model/query/entities.js
Outdated
| submission: { instanceId: submissionDef.instanceId } | ||
| submission: { | ||
| instanceId: submissionDef.instanceId, | ||
| ...createSubAsUpdate ? { action: 'create' } : {} |
There was a problem hiding this comment.
Maybe go outside of submission because this is like a Submission object.
lib/data/entity.js
Outdated
Comment on lines
510
to
511
| if (createAsUpdate) | ||
| v.conflictingProperties = Object.keys(v.dataReceived); |
There was a problem hiding this comment.
Look at how conflictingProperties is computed and saved in the database over here: https://github.com/getodk/central-backend/blob/master/lib/model/query/entities.js#L307-L320
Don't artificially make up conflicting properties!
| .expect(200) | ||
| .then(({ body }) => { | ||
| body.map(v => v.conflict).should.eql([null, 'hard']); | ||
| body[1].conflictingProperties.should.eql(['age', 'label', 'status', 'first_name']); |
There was a problem hiding this comment.
These will probably change
| // Check that entity as a whole is a conflict | ||
| await asAlice.get('/v1/projects/1/datasets/people/entities/12345678-1234-4123-8234-123456789ddd') | ||
| .then(({ body }) => { | ||
| body.conflict.should.equal('soft'); |
matthew-white
approved these changes
Dec 6, 2024
|
soft conflict case 
|
matthew-white
approved these changes
Dec 7, 2024
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.
Closes getodk/central#815
From here:
What has been done to verify that this works as intended?
Why is this the best possible solution? Were any other approaches considered?
How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?
Does this change require updates to the API documentation? If so, please update docs/api.yaml as part of this PR.
Before submitting this PR, please make sure you have:
make testand confirmed all checks still pass OR confirm CircleCI build passes