From ee387291451e199e4b38ecb1e4a8e51363dae6df Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 10 Oct 2024 15:54:30 +0100 Subject: [PATCH 1/2] Initial draft --- 103976/ts_103976.schema.json | 32 +++++++- .../ts_103976_ETSIDictionaryDefinitions.xml | 73 +++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 103976/ts_103976_ETSIDictionaryDefinitions.xml diff --git a/103976/ts_103976.schema.json b/103976/ts_103976.schema.json index 008c083..2094883 100644 --- a/103976/ts_103976.schema.json +++ b/103976/ts_103976.schema.json @@ -123,7 +123,37 @@ "LocationRecordReason" : { "$ref" : "ts_103280_2017_07#/$defs/LongString" } }, "required" : ["Location", "TimeOfLocation"] - }, + }, + "VINtoPartNumberRecord" : { + "type" : "object", + "properties" : { + "PartNumber" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" }, + "PartType" : { "$ref" : "ts_103120_Common_2016_02#/$defs/DictionaryEntry"}, + "PartTypeFreeText" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" } + }, + "required" : ["PartNumber"] + }, + "PartNumbertoVINRecord" : { + "type" : "object", + "properties" : { + "VIN" : { "$ref" : "ts_103280_2017_07#/$defs/VIN" } + }, + "required" : ["VIN"] + }, + "VINtoSubscribedServicesRecord" : { + "type" : "object", + "properties" : { + "NameOfService" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" }, + "FirstPaymentDate" : { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, + "MostRecentPaymentDate" : { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, + "TerminationDate" : { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, + "UserID" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" }, + "CustomerName" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" }, + "CustomerAddress": { "$ref" : "ts_103280_2017_07#/$defs/LongString" }, + "TypeOfPaymentMethod" : { "$ref" : "ts_103120_Common_2016_02#/$defs/DictionaryEntry"} + }, + "required" : [] + }, "ResultRecords" : { "type" : "object", "properties" : { diff --git a/103976/ts_103976_ETSIDictionaryDefinitions.xml b/103976/ts_103976_ETSIDictionaryDefinitions.xml new file mode 100644 index 0000000..e69e9f1 --- /dev/null +++ b/103976/ts_103976_ETSIDictionaryDefinitions.xml @@ -0,0 +1,73 @@ + + + + ETSI + TS103976RequestType + + + VINtoCommsID + VINtoCommsID request, as defined in clause 7.2. + + + CommsIDtoVIN + CommsIDtoVIN request, as defined in clause 7.3. + + + VINtoLocation + VINtoLocation request, as defined in clause 7.4. + + + VINtoPartNumber + VINtoPartNumber request, as defined in clause 7.5 + + + PartNumbertoVIN + PartNumbertoVIN request, as defined in clause 7.6 + + + VINtoSubscribedServices + VINtoSubscribedServices request, as defined in clause 7.7 + + + + + ETSI + PartType + + + Gearbox + Part that the RPS considers to be a gearbox + + + Engine + Part that the RPS considers to be an engine + + + Airbag + Part that the RPS considers to be an airbag + + + Multimedia + Components of the vehicle used for providing information or entertainment capabilities, including an automotive head unit. + + + Other + Component not meeting any of the other entries of this list. + + + + + ETSI + TypeOfPayment + + + CreditCard + Payment made using credit card + + + Other + Item not covered by other entries in this dictionary + + + + -- GitLab From bbbb81b20292c23c8a5c22d3924dde7de266e9cc Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 16 Oct 2024 08:34:59 +0100 Subject: [PATCH 2/2] Fixing dictionaries and adding response records --- 103976/ts_103976.schema.json | 23 +++++++++++++++---- .../ts_103976_ETSIDictionaryDefinitions.xml | 12 +++++----- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/103976/ts_103976.schema.json b/103976/ts_103976.schema.json index 2094883..8ebe01f 100644 --- a/103976/ts_103976.schema.json +++ b/103976/ts_103976.schema.json @@ -1,5 +1,6 @@ { "$id": "ts_103976_core", + "$schema" : "https://json-schema.org/draft/2020-12/schema", "$defs": { "AssociationPeriod" : { "type" : "object", @@ -124,16 +125,16 @@ }, "required" : ["Location", "TimeOfLocation"] }, - "VINtoPartNumberRecord" : { + "VINtoUniquePartNumberRecord" : { "type" : "object", "properties" : { - "PartNumber" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" }, + "UniquePartNumber" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" }, "PartType" : { "$ref" : "ts_103120_Common_2016_02#/$defs/DictionaryEntry"}, "PartTypeFreeText" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" } }, - "required" : ["PartNumber"] + "required" : ["UniquePartNumber"] }, - "PartNumbertoVINRecord" : { + "UniquePartNumbertoVINRecord" : { "type" : "object", "properties" : { "VIN" : { "$ref" : "ts_103280_2017_07#/$defs/VIN" } @@ -168,7 +169,19 @@ "VINtoLocationRecords" : { "type" : "array", "items" : { "$ref" : "#/$defs/VINtoLocationRecord"} - } + }, + "VINtoUniquePartNumberRecords" : { + "type" : "array", + "items" : { "$ref" : "#/$defs/VINtoUniquePartNumberRecord"} + }, + "UniquePartNumbertoVINRecords" : { + "type" : "array", + "items" : { "$ref" : "#/$defs/UniquePartNumbertoVINRecord"} + }, + "VINtoSubscribedServicesRecords" : { + "type" : "array", + "items" : { "$ref" : "#/$defs/VINtoSubscribedServicesRecord"} + } } } }, diff --git a/103976/ts_103976_ETSIDictionaryDefinitions.xml b/103976/ts_103976_ETSIDictionaryDefinitions.xml index e69e9f1..9aa4e48 100644 --- a/103976/ts_103976_ETSIDictionaryDefinitions.xml +++ b/103976/ts_103976_ETSIDictionaryDefinitions.xml @@ -17,12 +17,12 @@ VINtoLocation request, as defined in clause 7.4. - VINtoPartNumber - VINtoPartNumber request, as defined in clause 7.5 + VINtoUniquePartNumber + VINtoUniquePartNumber request, as defined in clause 7.5 - PartNumbertoVIN - PartNumbertoVIN request, as defined in clause 7.6 + UniquePartNumbertoVIN + UniquePartNumbertoVIN request, as defined in clause 7.6 VINtoSubscribedServices @@ -32,7 +32,7 @@ ETSI - PartType + TS103976PartType Gearbox @@ -58,7 +58,7 @@ ETSI - TypeOfPayment + TS103976TypeOfPayment CreditCard -- GitLab