Fix conditionally required fields (#61)

isabelle-dr · web-flow · commit 4b1f5a4d2435 · 2021-11-25T08:02:45.000-05:00
* fix conditionally required fields

* fix vehicle_types

* fix typo
diff --git a/v1.1/system_information.json b/v1.1/system_information.json
@@ -116,9 +116,7 @@
                   "format": "uri"
                 }
               },
-              "dependencies": {
-                "android": ["store_uri", "discovery_uri"]
-              }
+              "required": ["store_uri", "discovery_uri"]
             },
             "ios": {
               "description":
@@ -138,9 +136,7 @@
                   "format": "uri"
                 }
               },
-              "dependencies": {
-                "ios": ["store_uri", "discovery_uri"]
-              }
+              "required": ["store_uri", "discovery_uri"]
             }
           }
         }
diff --git a/v2.0/system_information.json b/v2.0/system_information.json
@@ -116,9 +116,7 @@
                   "format": "uri"
                 }
               },
-              "dependencies": {
-                "android": ["store_uri", "discovery_uri"]
-              }
+              "required": ["store_uri", "discovery_uri"]
             },
             "ios": {
               "description":
@@ -138,9 +136,7 @@
                   "format": "uri"
                 }
               },
-              "dependencies": {
-                "ios": ["store_uri", "discovery_uri"]
-              }
+              "required": ["store_uri", "discovery_uri"]
             }
           }
         }
diff --git a/v2.1/station_status.json b/v2.1/station_status.json
@@ -61,7 +61,8 @@
                       "type": "integer",
                       "minimum": 0
                     }
-                  }
+                  },
+                  "required": ["vehicle_type_id", "count"]
                 }
               },
               "num_bikes_disabled": {
@@ -121,10 +122,8 @@
                       "type": "integer",
                       "minimum": 0
                     }
-                  }
-                },
-                "dependencies": {
-                  "vehicle_docks_available": ["vehicle_type_ids", "count"]
+                  },
+                  "required": ["vehicle_type_ids", "count"]
                 }
               }
             },
diff --git a/v2.1/system_information.json b/v2.1/system_information.json
@@ -116,9 +116,7 @@
                   "format": "uri"
                 }
               },
-              "dependencies": {
-                "android": ["store_uri", "discovery_uri"]
-              }
+              "required": ["store_uri", "discovery_uri"]
             },
             "ios": {
               "description":
@@ -138,9 +136,7 @@
                   "format": "uri"
                 }
               },
-              "dependencies": {
-                "ios": ["store_uri", "discovery_uri"]
-              }
+              "required": ["store_uri", "discovery_uri"]
             }
           }
         }
diff --git a/v2.2/station_status.json b/v2.2/station_status.json
@@ -61,7 +61,8 @@
                       "type": "integer",
                       "minimum": 0
                     }
-                  }
+                  },
+                  "required": ["vehicle_type_id", "count"]
                 }
               },
               "num_bikes_disabled": {
@@ -121,10 +122,8 @@
                       "type": "integer",
                       "minimum": 0
                     }
-                  }
-                },
-                "dependencies": {
-                  "vehicle_docks_available": ["vehicle_type_ids", "count"]
+                  },
+                  "required": ["vehicle_type_ids", "count"]
                 }
               }
             },
diff --git a/v2.2/system_information.json b/v2.2/system_information.json
@@ -116,9 +116,7 @@
                   "format": "uri"
                 }
               },
-              "dependencies": {
-                "android": ["store_uri", "discovery_uri"]
-              }
+              "required": ["store_uri", "discovery_uri"]
             },
             "ios": {
               "description":
@@ -138,9 +136,7 @@
                   "format": "uri"
                 }
               },
-              "dependencies": {
-                "ios": ["store_uri", "discovery_uri"]
-              }
+              "required": ["store_uri", "discovery_uri"]
             }
           }
         }
diff --git a/v2.2/system_pricing_plans.json b/v2.2/system_pricing_plans.json
@@ -98,10 +98,8 @@
                       "type": "integer",
                       "minimum": 0
                     }
-                  }
-                },
-                "dependencies": {
-                  "per_km_pricing": ["start", "rate", "interval"]
+                  },
+                  "required": ["start", "rate", "interval"]
                 }
               },
               "per_min_pricing": {
@@ -134,10 +132,8 @@
                       "type": "integer",
                       "minimum": 0
                     }
-                  }
-                },
-                "dependencies": {
-                  "per_min_pricing": ["start", "rate", "interval"]
+                  },
+                  "required": ["start", "rate", "interval"]
                 }
               },
               "surge_pricing": {
diff --git a/v2.3-RC/station_status.json b/v2.3-RC/station_status.json
@@ -61,7 +61,8 @@
                       "type": "integer",
                       "minimum": 0
                     }
-                  }
+                  },
+                  "required": ["vehicle_type_id", "count"],
                 }
               },
               "num_bikes_disabled": {
@@ -121,10 +122,8 @@
                       "type": "integer",
                       "minimum": 0
                     }
-                  }
-                },
-                "dependencies": {
-                  "vehicle_docks_available": ["vehicle_type_ids", "count"]
+                  },
+                  "required": ["vehicle_type_ids", "count"]
                 }
               }
             },
diff --git a/v2.3-RC/system_information.json b/v2.3-RC/system_information.json
@@ -124,9 +124,7 @@
               "pattern": "^#([a-fA-F0-9]{6})$"
             }
           },
-          "dependencies":{
-                  "brand_assets": ["brand_last_modified", "brand_image_url"]
-          }
+          "required": ["brand_last_modified", "brand_image_url"]
         },
         "terms_url": {
           "description":
@@ -175,9 +173,7 @@
                   "format": "uri"
                 }
               },
-              "dependencies": {
-                "android": ["store_uri", "discovery_uri"]
-              }
+              "required": ["store_uri", "discovery_uri"]
             },
             "ios": {
               "description":
@@ -197,15 +193,13 @@
                   "format": "uri"
                 }
               },
-              "dependencies": {
-                "ios": ["store_uri", "discovery_uri"]
-              }
+              "required": ["store_uri", "discovery_uri"]
             }
           }
         }
       },
       "required": ["system_id", "language", "name", "timezone"],
-      "dependencies": {
+      "dependentRequired": {
         "terms_url": ["terms_last_updated"],
         "privacy_url": ["privacy_last_updated"]
       }
diff --git a/v2.3-RC/system_pricing_plans.json b/v2.3-RC/system_pricing_plans.json
@@ -98,10 +98,8 @@
                       "type": "integer",
                       "minimum": 0
                     }
-                  }
-                },
-                "dependencies": {
-                  "per_km_pricing": ["start", "rate", "interval"]
+                  },
+                  "required": ["start", "rate", "interval"]
                 }
               },
               "per_min_pricing": {
@@ -134,10 +132,8 @@
                       "type": "integer",
                       "minimum": 0
                     }
-                  }
-                },
-                "dependencies": {
-                  "per_min_pricing": ["start", "rate", "interval"]
+                  },
+                  "required": ["start", "rate", "interval"]
                 }
               },
               "surge_pricing": {
diff --git a/v2.3-RC/vehicle_types.json b/v2.3-RC/vehicle_types.json
@@ -107,9 +107,7 @@
                     }
                   }
                 },
-                "dependencies": {
-                  "vehicle_assets": ["icon_url", "icon_last_modified"]
-                }
+                "required": ["icon_url", "icon_last_modified"]
               }
             },
             "required": ["vehicle_type_id", "form_factor", "propulsion_type"],

Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,7 @@`
`116`	`116`	`"format": "uri"`
`117`	`117`	`}`
`118`	`118`	`},`
`119`		`- "dependencies": {`
`120`		`- "android": ["store_uri", "discovery_uri"]`
`121`		`- }`
	`119`	`+ "required": ["store_uri", "discovery_uri"]`
`122`	`120`	`},`
`123`	`121`	`"ios": {`
`124`	`122`	`"description":`
`@@ -138,9 +136,7 @@`
`138`	`136`	`"format": "uri"`
`139`	`137`	`}`
`140`	`138`	`},`
`141`		`- "dependencies": {`
`142`		`- "ios": ["store_uri", "discovery_uri"]`
`143`		`- }`
	`139`	`+ "required": ["store_uri", "discovery_uri"]`
`144`	`140`	`}`
`145`	`141`	`}`
`146`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@`
`61`	`61`	`"type": "integer",`
`62`	`62`	`"minimum": 0`
`63`	`63`	`}`
`64`		`- }`
	`64`	`+ },`
	`65`	`+ "required": ["vehicle_type_id", "count"]`
`65`	`66`	`}`
`66`	`67`	`},`
`67`	`68`	`"num_bikes_disabled": {`
`@@ -121,10 +122,8 @@`
`121`	`122`	`"type": "integer",`
`122`	`123`	`"minimum": 0`
`123`	`124`	`}`
`124`		`- }`
`125`		`- },`
`126`		`- "dependencies": {`
`127`		`- "vehicle_docks_available": ["vehicle_type_ids", "count"]`
	`125`	`+ },`
	`126`	`+ "required": ["vehicle_type_ids", "count"]`
`128`	`127`	`}`
`129`	`128`	`}`
`130`	`129`	`},`
Original file line number	Diff line number	Diff line change
`@@ -124,9 +124,7 @@`
`124`	`124`	`"pattern": "^#([a-fA-F0-9]{6})$"`
`125`	`125`	`}`
`126`	`126`	`},`
`127`		`- "dependencies":{`
`128`		`- "brand_assets": ["brand_last_modified", "brand_image_url"]`
`129`		`- }`
	`127`	`+ "required": ["brand_last_modified", "brand_image_url"]`
`130`	`128`	`},`
`131`	`129`	`"terms_url": {`
`132`	`130`	`"description":`
`@@ -175,9 +173,7 @@`
`175`	`173`	`"format": "uri"`
`176`	`174`	`}`
`177`	`175`	`},`
`178`		`- "dependencies": {`
`179`		`- "android": ["store_uri", "discovery_uri"]`
`180`		`- }`
	`176`	`+ "required": ["store_uri", "discovery_uri"]`
`181`	`177`	`},`
`182`	`178`	`"ios": {`
`183`	`179`	`"description":`
`@@ -197,15 +193,13 @@`
`197`	`193`	`"format": "uri"`
`198`	`194`	`}`
`199`	`195`	`},`
`200`		`- "dependencies": {`
`201`		`- "ios": ["store_uri", "discovery_uri"]`
`202`		`- }`
	`196`	`+ "required": ["store_uri", "discovery_uri"]`
`203`	`197`	`}`
`204`	`198`	`}`
`205`	`199`	`}`
`206`	`200`	`},`
`207`	`201`	`"required": ["system_id", "language", "name", "timezone"],`
`208`		`- "dependencies": {`
	`202`	`+ "dependentRequired": {`
`209`	`203`	`"terms_url": ["terms_last_updated"],`
`210`	`204`	`"privacy_url": ["privacy_last_updated"]`
`211`	`205`	`}`