From 24c7e4622305d6675407f2bec73c11445551d8ab Mon Sep 17 00:00:00 2001 From: Artsiom Tsybulko Date: Tue, 9 Sep 2025 16:59:50 +0300 Subject: [PATCH 1/2] 42085 - Deleted duplicate enum values --- e-rfid-data-group-type-tag.yml | 205 ++++++++------------------------- openapitools.json | 7 -- rt-rfid-binary-data.yml | 7 +- 3 files changed, 52 insertions(+), 167 deletions(-) delete mode 100644 openapitools.json diff --git a/e-rfid-data-group-type-tag.yml b/e-rfid-data-group-type-tag.yml index 3af858d0..87c21f8c 100644 --- a/e-rfid-data-group-type-tag.yml +++ b/e-rfid-data-group-type-tag.yml @@ -9,30 +9,9 @@ components: application, with prefix EID_ – those of eID application, with prefix EDL_ – eDL application" enum: + - 83 - 96 - 97 - - 117 - - 99 - - 118 - - 101 - - 102 - - 103 - - 104 - - 105 - - 106 - - 107 - - 108 - - 109 - - 110 - - 111 - - 112 - - 119 - - 113 - - 114 - - 115 - - 116 - - 98 - - 97 - 98 - 99 - 100 @@ -53,141 +32,57 @@ components: - 115 - 116 - 117 - - 96 - - 119 - - 83 - - 97 - - 107 - - 108 - - 101 - - 103 - - 117 - - 99 - 118 - - 112 - - 109 - - 113 - - 111 - - 110 + - 119 x-enum-descriptions: + - "eDL: Card Entitlement" - "Common Data Element" - - "Data Group 1" - - "Data Group 2" - - "Data Group 3" - - "Data Group 4" - - "Data Group 5" - - "Data Group 6" - - "Data Group 7" - - "Data Group 8" - - "Data Group 9" - - "Data Group 10" - - "Data Group 11" - - "Data Group 12" - - "Data Group 13" - - "Data Group 14" - - "Data Group 15" - - "Data Group 16" - - "Security Object Document" - - "Data Group 17" - - "Data Group 18" - - "Data Group 22" - - "Data Group 23" - - "Data Group 24" - - "eID, Data Group 1" - - "eID, Data Group 2" - - "eID, Data Group 3" - - "eID, Data Group 4" - - "eID, Data Group 5" - - "eID, Data Group 6" - - "eID, Data Group 7" - - "eID, Data Group 8" - - "eID, Data Group 9" - - "eID, Data Group 10" - - "eID, Data Group 11" - - "eID, Data Group 12" - - "eID, Data Group 13" - - "eID, Data Group 14" - - "eID, Data Group 15" - - "eID, Data Group 16" - - "eID, Data Group 17" - - "eID, Data Group 18" - - "eID, Data Group 19" - - "eID, Data Group 20" - - "eID, Data Group 21" - - "eDL, Common Data Element" - - "eDL, Security Object Document" - - "eDL, Card Entitlement" - - "eDL, Data Group 1" - - "eDL, Data Group 2" - - "eDL, Data Group 3" - - "eDL, Data Group 4" - - "eDL, Data Group 5" - - "eDL, Data Group 6" - - "eDL, Data Group 7" - - "eDL, Data Group 8" - - "eDL, Data Group 9" - - "eDL, Data Group 11" - - "eDL, Data Group 12" - - "eDL, Data Group 13" - - "eDL, Data Group 14" + - "DG1: ePassport / eID / eDL" + - "DG24: ePassport; eID: DG2" + - "DG3: ePassport / eID; eDL: DG7" + - "eID: DG4" + - "DG5: ePassport / eID; eDL: DG4" + - "DG6: ePassport / eID" + - "DG7: ePassport / eID; eDL: DG5" + - "DG8: ePassport / eID" + - "DG9: ePassport / eID" + - "DG10: ePassport / eID" + - "DG11: ePassport / eID; eDL: DG2" + - "DG12: ePassport / eID; eDL: DG3" + - "DG13: ePassport / eID; eDL: DG11" + - "DG14: ePassport / eID; eDL: DG14" + - "DG15: ePassport / eID; eDL: DG13" + - "DG16: ePassport / eID; eDL: DG9" + - "DG17: ePassport / eID; eDL: DG12" + - "DG18: ePassport / eID" + - "DG22: ePassport; eID: DG19" + - "DG23: ePassport; eID: DG20" + - "DG2: ePassport; eID: DG21; eDL: DG6" + - "DG4: ePassport; eDL: DG8" + - "SOD: ePassport / eDL" x-enum-varnames: - - "COM" - - "DG1" - - "DG2" - - "DG3" - - "DG4" - - "DG5" - - "DG6" - - "DG7" - - "DG8" - - "DG9" - - "DG10" - - "DG11" - - "DG12" - - "DG13" - - "DG14" - - "DG15" - - "DG16" - - "SOD" - - "DG17" - - "DG18" - - "DG22" - - "DG23" - - "DG24" - - "EID_DG1" - - "EID_DG2" - - "EID_DG3" - - "EID_DG4" - - "EID_DG5" - - "EID_DG6" - - "EID_DG7" - - "EID_DG8" - - "EID_DG9" - - "EID_DG10" - - "EID_DG11" - - "EID_DG12" - - "EID_DG13" - - "EID_DG14" - - "EID_DG15" - - "EID_DG16" - - "EID_DG17" - - "EID_DG18" - - "EID_DG19" - - "EID_DG20" - - "EID_DG21" - - "EDL_COM" - - "EDL_SOD" - "EDL_CE" - - "EDL_DG1" - - "EDL_DG2" - - "EDL_DG3" - - "EDL_DG4" - - "EDL_DG5" - - "EDL_DG6" - - "EDL_DG7" - - "EDL_DG8" - - "EDL_DG9" - - "EDL_DG11" - - "EDL_DG12" - - "EDL_DG13" - - "EDL_DG14" + - "EDL_COM__COM" + - "EID_DG1__EDL_DG1__DG1" + - "EID_DG2__DG24" + - "EID_DG3__EDL_DG7__DG3" + - "EID_DG4" + - "EID_DG5__EDL_DG4__DG5" + - "EID_DG6__DG6" + - "EID_DG7__EDL_DG5__DG7" + - "EID_DG8__DG8" + - "EID_DG9__DG9" + - "EID_DG10__DG10" + - "EID_DG11__EDL_DG2__DG11" + - "EID_DG12__EDL_DG3__DG12" + - "EID_DG13__EDL_DG11__DG13" + - "EID_DG14__EDL_DG14__DG14" + - "EID_DG15__EDL_DG13__DG15" + - "EID_DG16__EDL_DG9__DG16" + - "EID_DG17__EDL_DG12__DG17" + - "EID_DG18__DG18" + - "EID_DG19__DG22" + - "EID_DG20__DG23" + - "EID_DG21__EDL_DG6__DG2" + - "EDL_DG8__DG4" + - "EDL_SOD__SOD" diff --git a/openapitools.json b/openapitools.json deleted file mode 100644 index 0e01b857..00000000 --- a/openapitools.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", - "spaces": 2, - "generator-cli": { - "version": "7.12.0" - } -} diff --git a/rt-rfid-binary-data.yml b/rt-rfid-binary-data.yml index ff154e8b..19fa9e9b 100644 --- a/rt-rfid-binary-data.yml +++ b/rt-rfid-binary-data.yml @@ -664,9 +664,8 @@ components: - 6 - 7 - 8 - - 0 x-enum-descriptions: - - "Not defined" + - "Not defined or Master File" - "ePassport application" - "eID application" - "eSign application" @@ -675,9 +674,8 @@ components: - "VisaRecords application" - "AddBiometrics application" - "Digital Travel Credentials" - - "Master File" x-enum-varnames: - - "UNSPECIFIED" + - "UNSPECIFIED__ROOT_FILES" - "E_PASSPORT" - "E_ID" - "E_SIGN" @@ -686,7 +684,6 @@ components: - "LDS2_VisaRecords" - "LDS2_AddBiometrics" - "eDTC_PC" - - "ROOT_FILES" RfidDataFile: title: "RfidDataFile" From c21047c8a526c5f790a9b65de718ed1fd73ac017 Mon Sep 17 00:00:00 2001 From: Artsiom Tsybulko Date: Tue, 9 Sep 2025 17:42:06 +0300 Subject: [PATCH 2/2] 42085 - remove RfidDataGroupTypeTag, RfidApplicationType --- e-rfid-data-group-type-tag.yml | 88 ---------------------------------- rt-rfid-binary-data.yml | 40 +--------------- 2 files changed, 2 insertions(+), 126 deletions(-) delete mode 100644 e-rfid-data-group-type-tag.yml diff --git a/e-rfid-data-group-type-tag.yml b/e-rfid-data-group-type-tag.yml deleted file mode 100644 index 87c21f8c..00000000 --- a/e-rfid-data-group-type-tag.yml +++ /dev/null @@ -1,88 +0,0 @@ -openapi: 3.0.4 -components: - schemas: - RfidDataGroupTypeTag: - title: "RfidDataGroupTypeTag" - type: integer - description: "Enumeration representing RFID Data Group Types. - Constants with prefix correspond to the informational data groups of ePassport - application, with prefix EID_ – those of eID application, with prefix EDL_ – - eDL application" - enum: - - 83 - - 96 - - 97 - - 98 - - 99 - - 100 - - 101 - - 102 - - 103 - - 104 - - 105 - - 106 - - 107 - - 108 - - 109 - - 110 - - 111 - - 112 - - 113 - - 114 - - 115 - - 116 - - 117 - - 118 - - 119 - x-enum-descriptions: - - "eDL: Card Entitlement" - - "Common Data Element" - - "DG1: ePassport / eID / eDL" - - "DG24: ePassport; eID: DG2" - - "DG3: ePassport / eID; eDL: DG7" - - "eID: DG4" - - "DG5: ePassport / eID; eDL: DG4" - - "DG6: ePassport / eID" - - "DG7: ePassport / eID; eDL: DG5" - - "DG8: ePassport / eID" - - "DG9: ePassport / eID" - - "DG10: ePassport / eID" - - "DG11: ePassport / eID; eDL: DG2" - - "DG12: ePassport / eID; eDL: DG3" - - "DG13: ePassport / eID; eDL: DG11" - - "DG14: ePassport / eID; eDL: DG14" - - "DG15: ePassport / eID; eDL: DG13" - - "DG16: ePassport / eID; eDL: DG9" - - "DG17: ePassport / eID; eDL: DG12" - - "DG18: ePassport / eID" - - "DG22: ePassport; eID: DG19" - - "DG23: ePassport; eID: DG20" - - "DG2: ePassport; eID: DG21; eDL: DG6" - - "DG4: ePassport; eDL: DG8" - - "SOD: ePassport / eDL" - x-enum-varnames: - - "EDL_CE" - - "EDL_COM__COM" - - "EID_DG1__EDL_DG1__DG1" - - "EID_DG2__DG24" - - "EID_DG3__EDL_DG7__DG3" - - "EID_DG4" - - "EID_DG5__EDL_DG4__DG5" - - "EID_DG6__DG6" - - "EID_DG7__EDL_DG5__DG7" - - "EID_DG8__DG8" - - "EID_DG9__DG9" - - "EID_DG10__DG10" - - "EID_DG11__EDL_DG2__DG11" - - "EID_DG12__EDL_DG3__DG12" - - "EID_DG13__EDL_DG11__DG13" - - "EID_DG14__EDL_DG14__DG14" - - "EID_DG15__EDL_DG13__DG15" - - "EID_DG16__EDL_DG9__DG16" - - "EID_DG17__EDL_DG12__DG17" - - "EID_DG18__DG18" - - "EID_DG19__DG22" - - "EID_DG20__DG23" - - "EID_DG21__EDL_DG6__DG2" - - "EDL_DG8__DG4" - - "EDL_SOD__SOD" diff --git a/rt-rfid-binary-data.yml b/rt-rfid-binary-data.yml index 19fa9e9b..e123c8d3 100644 --- a/rt-rfid-binary-data.yml +++ b/rt-rfid-binary-data.yml @@ -242,7 +242,7 @@ components: - CheckDigitComposite properties: Type: - $ref: "./e-rfid-data-group-type-tag.yml#/components/schemas/RfidDataGroupTypeTag" + type: integer DocumentID: $ref: "./rt-doc-type-old.yml#/components/schemas/DocumentFormat" DocumentType: @@ -628,7 +628,7 @@ components: - Files properties: Type: - $ref: "#/components/schemas/RfidApplicationType" + type: integer Status: $ref: "./e-rfid-error-codes.yml#/components/schemas/RFIDErrorCodes" ApplicationID: @@ -649,42 +649,6 @@ components: items: $ref: "#/components/schemas/RfidDataFile" - RfidApplicationType: - title: "RfidApplicationType" - type: integer - description: "Enumeration contains a set of constants that define the type - of application within the context of the communication session with electronic document" - enum: - - 0 - - 1 - - 2 - - 3 - - 4 - - 5 - - 6 - - 7 - - 8 - x-enum-descriptions: - - "Not defined or Master File" - - "ePassport application" - - "eID application" - - "eSign application" - - "eDL application" - - "TravelRecords application" - - "VisaRecords application" - - "AddBiometrics application" - - "Digital Travel Credentials" - x-enum-varnames: - - "UNSPECIFIED__ROOT_FILES" - - "E_PASSPORT" - - "E_ID" - - "E_SIGN" - - "E_DL" - - "LDS2_TravelRecords" - - "LDS2_VisaRecords" - - "LDS2_AddBiometrics" - - "eDTC_PC" - RfidDataFile: title: "RfidDataFile" description: "Structure is used to describe the contents of a single file of the LDS of electronic document and the analysis