Enable submission via ODK Web Forms #1370
Conversation
sadiqkhoja
force-pushed
the
wf23_formsettings-webform-enabler-backend
branch
2 times, most recently
from
17cac2e to
a5ac918
Compare
sadiqkhoja
changed the title
sadiqkhoja
force-pushed
the
wf23_formsettings-webform-enabler-backend
branch
from
d5adc9f to
2acd51d
Compare
| select ${fields} from forms | ||
| left outer join form_defs on ${versionJoinCondition(version)} | ||
| ${enketoId ? sql`join` : sql`left outer join`} form_defs on ${versionJoinCondition(version, enketoId)} |
There was a problem hiding this comment.
This is necessary to fetch the correct form_def. Provided enketoId can belong to the published Form or the draft one.
Another approach I was considering was to create a new function to first find out for which version provided enketoId belongs and then fetch that Form. If the current change is making already complicated query more complicated then I am open for creating separate query.
There was a problem hiding this comment.
It's ok with me for now - it's a more succinct change than I expected and like that.
* skip failing migration test as they have already served their purpose
* revert changes to sqlEqual * added a new rest-endpoint to submit using draftToken * Updated API doc
sadiqkhoja
force-pushed
the
wf23_formsettings-webform-enabler-backend
branch
from
2acd51d to
84241c2
Compare
| select ${fields} from forms | ||
| left outer join form_defs on ${versionJoinCondition(version)} | ||
| ${enketoId ? sql`join` : sql`left outer join`} form_defs on ${versionJoinCondition(version, enketoId)} |
There was a problem hiding this comment.
It's ok with me for now - it's a more succinct change than I expected and like that.
| @@ -611,7 +611,7 @@ describe.skip('database migrations from 20230406: altering entities and entity_d | |||
| describe('database migrations from 20230512: adding entity_def_sources table', function () { | |||
| this.timeout(20000); | |||
|
|
|||
| it('should backfill entityId and entityDefId in audit log', testServiceFullTrx(async (service, container) => { | |||
| it.skip('should backfill entityId and entityDefId in audit log', testServiceFullTrx(async (service, container) => { | |||
There was a problem hiding this comment.
I'm assuming these are skipped because there is something about the application code that has gotten enough out of sync that these migration tests no longer work.
Towards getodk/web-forms#23 and getodk/central#883
Changes
What has been done to verify that this works as intended?
Added tests.
Why is this the best possible solution? Were any other approaches considered?
Generally uses the existing approach. There's one inline comment regarding filtering by EnketoId, I am open to changing that approach.
The URL for the new endpoint to retrieve Form via EnketoId was discuss in the weekly meeting.
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?
None
Does this change require updates to the API documentation? If so, please update docs/api.yaml as part of this PR.
API Doc has been updated as well.
Before submitting this PR, please make sure you have:
make testand confirmed all checks still pass OR confirm CircleCI build passes