Refactor Entities.createVersion #1013
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
2 tasks
ktuite
force-pushed
the
ktuite/entity_exploration
branch
from
9b3acdf
to
242bd29
Compare
ktuite
force-pushed
the
ktuite/entity_create_version
branch
from
c111d6b
to
20573bd
Compare
ktuite
force-pushed
the
ktuite/entity_create_version
branch
from
d0f0680
to
7f59e5d
Compare
ktuite
commented
Oct 4, 2023
lib/model/query/entities.js
Outdated
| @@ -37,15 +49,13 @@ const nextval = sql`nextval(pg_get_serial_sequence('entities', 'id'))`; | |||
| const createNew = (dataset, partial, subDef, sourceId, userAgentIn) => ({ one, context }) => { | |||
| let creatorId; | |||
| let userAgent; | |||
| let subDefId; | |||
|
|
|||
| // Set creatorId and userAgent from submission def if it exists | |||
| if (subDef != null && subDef.id != null) | |||
There was a problem hiding this comment.
Look into why subDef.id != null is checked in the first place. If it is needed, it should be needed in the audit function, too.
lib/model/query/entities.js
Outdated
| let userAgent; | ||
|
|
||
| // Set creatorId and userAgent from submission def if it exists | ||
| if (subDef != null && subDef.id != null) |
There was a problem hiding this comment.
Check if this is needed subDef.id != null here, too.
| @@ -845,6 +845,14 @@ describe('worker: entity', () => { | |||
| person.currentVersion.version.should.equal(2); | |||
| }); | |||
|
|
|||
| await asAlice.get('/v1/projects/1/datasets/people/entities/12345678-1234-4123-8234-123456789abc/audits') | |||
There was a problem hiding this comment.
This test of audit log content deserves its own test/set of tests.
matthew-white
approved these changes
Oct 4, 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.
Addresses some clunkiness in #1005 but I wanted to put it in a separate PR so the meaning of #1005 would be clearer.
There's a 2x2 square of situations and I tried to make the via submission vs. API cases more similar.
[creating entities, updating entities] x [via submission, via API]
Via API:
createNew.auditandcreateVersion.audit, which checks that submission def was not providedVia submission:
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.md as part of this PR.
Before submitting this PR, please make sure you have:
make test-fulland confirmed all checks still pass OR confirm CircleCI build passes