PIE-176 integrate recent changes #5
Closed
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
puellanivis
requested review from
GrigoriyMikhalkin,
robodenitro,
jfk-sixt,
dejan-kosak,
vivekr-nitk and
abhimoondra
|
Just this one file alone has so many changes 😰 … probably going to consider a narrow reimplementation of the WKTs… --- /Users/cbayer/tmp/proto-jsonschema/ABRResolverRequestData.jsonschema 2024-09-13 13:58:17
+++ proto-jsonschema/ABRResolverRequestData.jsonschema 2024-09-13 14:41:57
@@ -1,7 +1,222 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
- "properties": {
- "meta": {
+ "$ref": "#/definitions/ABRResolverRequestData",
+ "definitions": {
+ "ABRResolverRequestData": {
"properties": {
+ "meta": {
+ "$ref": "#/definitions/schema.Meta",
+ "additionalProperties": true,
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {}
+ ]
+ },
+ "request_id": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "type": "string"
+ }
+ ]
+ },
+ "requestId": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "type": "string"
+ }
+ ]
+ },
+ "pickup_branch": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "pickupBranch": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "pool_id": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "poolId": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "region_id": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "regionId": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "country": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "type": "string"
+ }
+ ]
+ },
+ "airport": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "type": "boolean"
+ }
+ ]
+ },
+ "pickup_date": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "type": "string"
+ }
+ ]
+ },
+ "pickupDate": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "type": "string"
+ }
+ ]
+ },
+ "length_of_rent": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "lengthOfRent": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "customer_corporate_number": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "customerCorporateNumber": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "filter": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "type": "string"
+ }
+ ]
+ },
+ "variation": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "type": "string"
+ }
+ ]
+ },
+ "bucket": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ }
+ },
+ "additionalProperties": true,
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "type": "object"
+ }
+ ],
+ "title": "Abrresolver Request Data"
+ },
+ "schema.Meta": {
+ "properties": {
"name": {
"oneOf": [
\ No newline at end of file
@@ -89,239 +304,8 @@
{
"type": "object"
- }
- ]
- },
- "request_id": {
- "oneOf": [
- {
- "type": "null"
- },
- {
- "type": "string"
}
- ]
- },
- "requestId": {
- "oneOf": [
- {
- "type": "null"
- },
- {
- "type": "string"
- }
- ]
- },
- "pickup_branch": {
- "oneOf": [
- {
- "type": "integer"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ]
- },
- "pickupBranch": {
- "oneOf": [
- {
- "type": "integer"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ]
- },
- "pool_id": {
- "oneOf": [
- {
- "type": "integer"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ]
- },
- "poolId": {
- "oneOf": [
- {
- "type": "integer"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ]
- },
- "region_id": {
- "oneOf": [
- {
- "type": "integer"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ]
- },
- "regionId": {
- "oneOf": [
- {
- "type": "integer"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ]
- },
- "country": {
- "oneOf": [
- {
- "type": "null"
- },
- {
- "type": "string"
- }
- ]
- },
- "airport": {
- "oneOf": [
- {
- "type": "null"
- },
- {
- "type": "boolean"
- }
- ]
- },
- "pickup_date": {
- "oneOf": [
- {
- "type": "null"
- },
- {
- "type": "string"
- }
- ]
- },
- "pickupDate": {
- "oneOf": [
- {
- "type": "null"
- },
- {
- "type": "string"
- }
- ]
- },
- "length_of_rent": {
- "oneOf": [
- {
- "type": "integer"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ]
- },
- "lengthOfRent": {
- "oneOf": [
- {
- "type": "integer"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ]
- },
- "customer_corporate_number": {
- "oneOf": [
- {
- "type": "integer"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ]
- },
- "customerCorporateNumber": {
- "oneOf": [
- {
- "type": "integer"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ]
- },
- "filter": {
- "oneOf": [
- {
- "type": "null"
- },
- {
- "type": "string"
- }
- ]
- },
- "variation": {
- "oneOf": [
- {
- "type": "null"
- },
- {
- "type": "string"
- }
- ]
- },
- "bucket": {
- "oneOf": [
- {
- "type": "integer"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ]
+ ],
+ "title": "Meta"
}
- },
- "additionalProperties": true,
- "oneOf": [
- {
- "type": "null"
- },
- {
- "type": "object"
- }
- ]
+ }
}
\ No newline at end of file |
|
I’m merging instead a minimal change through #6 the changes here are significant, and cannot be cchecked reasonably. |
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.
DO NOT MERGE
I don’t know if we want to drag in all of these changes.