From 7eb79058ab1e1fdda7d0d2bb476155e64d96c556 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Thu, 25 Jul 2024 11:12:25 +0200 Subject: [PATCH] Add voluntary forms to expected notice subtypes (TEDEFO-3556) Also add the corresponding NTDs in the unit test data. --- .../analysis/fact/NoticeTypesIndexFact.java | 3 +- .../tedefo-2578/invalid/notice-types/E1.json | 48 +++++++++++++++++ .../tedefo-2578/invalid/notice-types/E2.json | 48 +++++++++++++++++ .../tedefo-2578/invalid/notice-types/E3.json | 48 +++++++++++++++++ .../tedefo-2578/invalid/notice-types/E4.json | 48 +++++++++++++++++ .../tedefo-2578/invalid/notice-types/E5.json | 48 +++++++++++++++++ .../tedefo-2578/invalid/notice-types/E6.json | 48 +++++++++++++++++ .../invalid/notice-types/notice-types.json | 54 +++++++++++++++++++ .../tedefo-2578/valid/notice-types/E1.json | 48 +++++++++++++++++ .../tedefo-2578/valid/notice-types/E2.json | 48 +++++++++++++++++ .../tedefo-2578/valid/notice-types/E3.json | 48 +++++++++++++++++ .../tedefo-2578/valid/notice-types/E4.json | 48 +++++++++++++++++ .../tedefo-2578/valid/notice-types/E5.json | 48 +++++++++++++++++ .../tedefo-2578/valid/notice-types/E6.json | 48 +++++++++++++++++ .../valid/notice-types/notice-types.json | 54 +++++++++++++++++++ 15 files changed, 686 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E1.json create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E2.json create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E3.json create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E4.json create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E5.json create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E6.json create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E1.json create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E2.json create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E3.json create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E4.json create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E5.json create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E6.json diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/NoticeTypesIndexFact.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/NoticeTypesIndexFact.java index 115adc3..079c53f 100644 --- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/NoticeTypesIndexFact.java +++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/NoticeTypesIndexFact.java @@ -29,7 +29,8 @@ public Set getExpectedNoticeSubtypes() { "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", - "CEI", "T01", "T02", "X01", "X02") + "CEI", "T01", "T02", "X01", "X02", + "E1", "E2", "E3", "E4", "E5", "E6") .collect(Collectors.toSet()); } diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E1.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E1.json new file mode 100644 index 0000000..b473848 --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E1.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E1", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E2.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E2.json new file mode 100644 index 0000000..b964082 --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E2.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E2", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E3.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E3.json new file mode 100644 index 0000000..dfb6e6b --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E3.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E3", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E4.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E4.json new file mode 100644 index 0000000..c8ae741 --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E4.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E4", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E5.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E5.json new file mode 100644 index 0000000..c9ec70a --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E5.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E5", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E6.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E6.json new file mode 100644 index 0000000..2656939 --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/E6.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E6", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/notice-types.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/notice-types.json index c5967ed..a176514 100644 --- a/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/notice-types.json +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/invalid/notice-types/notice-types.json @@ -392,6 +392,60 @@ "subTypeId" : "X02", "_label" : "notice|name|X02", "viewTemplateIds" : [ "summary", "X02" ] + }, { + "documentType" : "PIN", + "legalBasis" : "other", + "formType" : "planning", + "type" : "pin-only", + "description" : "Voluntary Pre-market Consultation Notice", + "subTypeId" : "E1", + "_label" : "notice|name|E1", + "viewTemplateIds" : [ "summary", "E1" ] + }, { + "documentType" : "PIN", + "legalBasis" : "other", + "formType" : "planning", + "type" : "pin-only", + "description" : "Voluntary Prior Information Notice", + "subTypeId" : "E2", + "_label" : "notice|name|E2", + "viewTemplateIds" : [ "summary", "E2" ] + }, { + "documentType" : "CN", + "legalBasis" : "other", + "formType" : "competition", + "type" : "cn-standard", + "description" : "Voluntary Contract Notice", + "subTypeId" : "E3", + "_label" : "notice|name|E3", + "viewTemplateIds" : [ "summary", "E3" ] + }, { + "documentType" : "CAN", + "legalBasis" : "other", + "formType" : "result", + "type" : "can-standard", + "description" : "Voluntary Award Notice", + "subTypeId" : "E4", + "_label" : "notice|name|E4", + "viewTemplateIds" : [ "summary", "E4" ] + }, { + "documentType" : "CAN", + "legalBasis" : "other", + "formType" : "completion", + "type" : "", + "description" : "Voluntary Completion Notice", + "subTypeId" : "E5", + "_label" : "notice|name|E5", + "viewTemplateIds" : [ "summary", "E5" ] + }, { + "documentType" : "CAN", + "legalBasis" : "other", + "formType" : "cont-modif", + "type" : "can-modif", + "description" : "Voluntary Contract Modification Notice", + "subTypeId" : "E6", + "_label" : "notice|name|E6", + "viewTemplateIds" : [ "summary", "E6" ] } ], "documentTypes" : [ { "id" : "BRIN", diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E1.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E1.json new file mode 100644 index 0000000..b473848 --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E1.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E1", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E2.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E2.json new file mode 100644 index 0000000..b964082 --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E2.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E2", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E3.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E3.json new file mode 100644 index 0000000..dfb6e6b --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E3.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E3", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E4.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E4.json new file mode 100644 index 0000000..c8ae741 --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E4.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E4", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E5.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E5.json new file mode 100644 index 0000000..c9ec70a --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E5.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E5", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E6.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E6.json new file mode 100644 index 0000000..2656939 --- /dev/null +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/E6.json @@ -0,0 +1,48 @@ +{ + "ublVersion" : "2.3", + "sdkVersion" : "1.10.0", + "metadataDatabase" : { + "version" : "1.10.0", + "createdOn" : "2023-11-15T14:00:00" + }, + "noticeId" : "E6", + "metadata" : [ { + "id" : "BT-02-notice", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Notice Type", + "_label" : "field|name|BT-02-notice", + "readOnly" : true + } ], + "content" : [ { + "id" : "GR-Buyer", + "contentType" : "group", + "displayType" : "SECTION", + "description" : "Contracting Party and Provider related Information", + "_label" : "group|name|GR-Buyer", + "content" : [ { + "id" : "GR-ContractingAuthority", + "contentType" : "group", + "nodeId" : "ND-ContractingParty", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|ND-ContractingParty", + "_repeatable" : true, + "content" : [ { + "id" : "GR-ContractingAuthority-Buyer", + "contentType" : "group", + "displayType" : "GROUP", + "description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)", + "_label" : "group|name|GR-ContractingAuthority-Buyer", + "content" : [ { + "id" : "OPT-300-Procedure-Buyer", + "contentType" : "field", + "displayType" : "COMBOBOX", + "description" : "Buyer Technical Identifier Reference", + "_label" : "field|name|OPT-300-Procedure-Buyer", + "_idSchemes" : [ "ORG" ] + } ] + } ] + } ] + } ] +} \ No newline at end of file diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/notice-types.json b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/notice-types.json index 66ec2ec..c5b38d6 100644 --- a/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/notice-types.json +++ b/src/test/resources/eforms-sdk-tests/tedefo-2578/valid/notice-types/notice-types.json @@ -410,6 +410,60 @@ "subTypeId" : "X02", "_label" : "notice|name|X02", "viewTemplateIds" : [ "summary", "X02" ] + }, { + "documentType" : "PIN", + "legalBasis" : "other", + "formType" : "planning", + "type" : "pin-only", + "description" : "Voluntary Pre-market Consultation Notice", + "subTypeId" : "E1", + "_label" : "notice|name|E1", + "viewTemplateIds" : [ "summary", "E1" ] + }, { + "documentType" : "PIN", + "legalBasis" : "other", + "formType" : "planning", + "type" : "pin-only", + "description" : "Voluntary Prior Information Notice", + "subTypeId" : "E2", + "_label" : "notice|name|E2", + "viewTemplateIds" : [ "summary", "E2" ] + }, { + "documentType" : "CN", + "legalBasis" : "other", + "formType" : "competition", + "type" : "cn-standard", + "description" : "Voluntary Contract Notice", + "subTypeId" : "E3", + "_label" : "notice|name|E3", + "viewTemplateIds" : [ "summary", "E3" ] + }, { + "documentType" : "CAN", + "legalBasis" : "other", + "formType" : "result", + "type" : "can-standard", + "description" : "Voluntary Award Notice", + "subTypeId" : "E4", + "_label" : "notice|name|E4", + "viewTemplateIds" : [ "summary", "E4" ] + }, { + "documentType" : "CAN", + "legalBasis" : "other", + "formType" : "completion", + "type" : "", + "description" : "Voluntary Completion Notice", + "subTypeId" : "E5", + "_label" : "notice|name|E5", + "viewTemplateIds" : [ "summary", "E5" ] + }, { + "documentType" : "CAN", + "legalBasis" : "other", + "formType" : "cont-modif", + "type" : "can-modif", + "description" : "Voluntary Contract Modification Notice", + "subTypeId" : "E6", + "_label" : "notice|name|E6", + "viewTemplateIds" : [ "summary", "E6" ] } ], "documentTypes" : [ { "id" : "BRIN",