PAE-769: New organisation schema overrides #601
Merged
Conversation
This file contains hidden or 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
…organisation-schema-overrides
…organisation-schema-overrides
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request introduces new Joi schema overrides for organisation, registration, and accreditation schemas to improve JSON Schema compatibility. The overrides handle issues with ID fields, date fields, nullable values, and conditional logic that don't translate well during conversion to JSON Schema.
Key changes:
- Added new schema override file that forks existing schemas with JSON Schema-friendly modifications
- Updated the schema generation script to use the new overrides instead of the original schema
- Added comprehensive test coverage for the new override schemas
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/repositories/organisations/schema/organisation-json-schema-overrides.js | New file implementing schema overrides with helper functions to handle ID fields, nullable values, date fields, and conditional logic for registrations and accreditations |
| src/repositories/organisations/schema/validation.test.js | Added new test suite for organisationJSONSchemaOverrides with tests covering ID fields, registration conditions, and accreditation conditions |
| scripts/generate-json-schemas/organisation.update.js | Updated to import and use organisationJSONSchemaOverrides instead of organisationReplaceSchema |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
src/repositories/organisations/schema/organisation-json-schema-overrides.js
Outdated
Show resolved
Hide resolved
src/repositories/organisations/schema/organisation-json-schema-overrides.js
Show resolved
Hide resolved
…-overrides.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
senthilinfy
reviewed
Jan 8, 2026
src/repositories/organisations/schema/organisation-json-schema-overrides.js
Outdated
Show resolved
Hide resolved
src/repositories/organisations/schema/organisation-json-schema-overrides.js
Outdated
Show resolved
Hide resolved
src/repositories/organisations/schema/organisation-json-schema-overrides.js
Outdated
Show resolved
Hide resolved
src/repositories/organisations/schema/organisation-json-schema-overrides.js
Outdated
Show resolved
Hide resolved
src/repositories/organisations/schema/organisation-json-schema-overrides.js
Show resolved
Hide resolved
…organisation-schema-overrides
…m:DEFRA/epr-backend into PAE-769-new-organisation-schema-overrides
|
senthilinfy
approved these changes
Jan 9, 2026
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.
Ticket: PAE-769
This pull request introduces a new Joi schema,
organisationJSONSchemaOverrides, to improve compatibility when converting organisation-related schemas to JSON Schema. It addresses issues with incompatible types and conditional logic, and includes comprehensive tests to ensure the new schema correctly validates various organisation data structures.Schema compatibility improvements:
organisationJSONSchemaOverridesinorganisation-json-schema-overrides.js, providing custom forks and conditional logic to handle fields (like IDs, dates, and nested objects) for JSON Schema compatibility, and applied these overrides to registrations and accreditations.generate-json-schemas/organisation.update.jsto useorganisationJSONSchemaOverridesinstead of the original schema, ensuring the generated JSON Schema reflects the new compatibility fixes.Testing enhancements:
validation.test.jsfororganisationJSONSchemaOverrides, verifying correct validation of required/optional fields, conditional requirements, and nullability for registrations and accreditations.validation.test.jsto include the new schema and relevant constants/builders.