From 9769716fac2d1351b18d0cd8d68fcb98caea0f66 Mon Sep 17 00:00:00 2001 From: odscjen Date: Wed, 28 Feb 2024 11:32:35 +0000 Subject: [PATCH 1/7] release_schema: add organization/details/classifications --- schema/dereferenced-release-schema.json | 102 ++++++++++++++++++ schema/release-schema.json | 11 ++ .../versioned-release-validation-schema.json | 8 ++ 3 files changed, 121 insertions(+) diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index f71ea0fca..002d7721b 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -605,6 +605,57 @@ ], "codelist": "partyScale.csv", "openCodelist": false + }, + "classifications": { + "title": "Organization classifications", + "description": "The classifications that categorize the organization", + "type": "array", + "items": { + "title": "Classification", + "description": "A classification consists of at least two parts: an identifier for the list (scheme) from which the classification is taken, and an identifier for the category from that list being applied. It is useful to also publish a text label and/or URI that users can draw on to interpret the classification.", + "type": "object", + "properties": { + "scheme": { + "title": "Scheme", + "description": "The scheme or codelist from which the classification code is taken, using the open [classificationScheme](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#classification-scheme) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "classificationScheme.csv", + "openCodelist": true + }, + "id": { + "title": "ID", + "description": "The classification code taken from the scheme. Although an integer is allowed, it is recommended to use a string.", + "type": [ + "string", + "integer", + "null" + ] + }, + "description": { + "title": "Description", + "description": "A textual description or title for the classification code.", + "type": [ + "string", + "null" + ] + }, + "uri": { + "title": "URI", + "description": "A URI to uniquely identify the classification code.", + "type": [ + "string", + "null" + ], + "format": "uri" + } + } + }, + "uniqueItems": true, + "wholeListMerge": true, + "minItems": 1 } } } @@ -33388,6 +33439,57 @@ ], "codelist": "partyScale.csv", "openCodelist": false + }, + "classifications": { + "title": "Organization classifications", + "description": "The classifications that categorize the organization", + "type": "array", + "items": { + "title": "Classification", + "description": "A classification consists of at least two parts: an identifier for the list (scheme) from which the classification is taken, and an identifier for the category from that list being applied. It is useful to also publish a text label and/or URI that users can draw on to interpret the classification.", + "type": "object", + "properties": { + "scheme": { + "title": "Scheme", + "description": "The scheme or codelist from which the classification code is taken, using the open [classificationScheme](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#classification-scheme) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "classificationScheme.csv", + "openCodelist": true + }, + "id": { + "title": "ID", + "description": "The classification code taken from the scheme. Although an integer is allowed, it is recommended to use a string.", + "type": [ + "string", + "integer", + "null" + ] + }, + "description": { + "title": "Description", + "description": "A textual description or title for the classification code.", + "type": [ + "string", + "null" + ] + }, + "uri": { + "title": "URI", + "description": "A URI to uniquely identify the classification code.", + "type": [ + "string", + "null" + ], + "format": "uri" + } + } + }, + "uniqueItems": true, + "wholeListMerge": true, + "minItems": 1 } } } diff --git a/schema/release-schema.json b/schema/release-schema.json index 0b2db5725..746c471db 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -1429,6 +1429,17 @@ ], "codelist": "partyScale.csv", "openCodelist": false + }, + "classifications": { + "title": "Organization classifications", + "description": "The classifications that categorize the organization", + "type": "array", + "items": { + "$ref": "#/definitions/Classification" + }, + "uniqueItems": true, + "wholeListMerge": true, + "minItems": 1 } } } diff --git a/schema/versioned-release-validation-schema.json b/schema/versioned-release-validation-schema.json index 58fb87484..7f9c281ef 100644 --- a/schema/versioned-release-validation-schema.json +++ b/schema/versioned-release-validation-schema.json @@ -1621,6 +1621,14 @@ ], "codelist": "partyScale.csv", "openCodelist": false + }, + "classifications": { + "type": "array", + "items": { + "$ref": "#/definitions/Classification" + }, + "uniqueItems": true, + "minItems": 1 } } }, From 2f26586bc54783f6a543075707412dd5b85c9e94 Mon Sep 17 00:00:00 2001 From: odscjen Date: Wed, 28 Feb 2024 11:42:22 +0000 Subject: [PATCH 2/7] update changelog.md --- docs/history/changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index c669a97b3..0c82e3baf 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -210,6 +210,7 @@ Per the [normative and non-normative content and changes policy](../governance/n * [#1490](https://github.com/open-contracting/standard/pull/1490) `SimpleIdentifier` * [#1519](https://github.com/open-contracting/standard/pull/1519) `Value.amountNet` and `Value.amountGross` * [#1490](https://github.com/open-contracting/standard/pull/1490) `contracts.identifiers` + * [#1679](https://github.com/open-contracting/standard/pull/1679) `Organization.details.classifications` merged from Organization classifications extension * Deprecate some fields: * [#1200](https://github.com/open-contracting/standard/pull/1200) `tender.submissionMethod`, because all codes from the `submissionMethod` codelist are deprecated. From 4ed6d6e4665dccf597d27f172a43eb2212ff0af9 Mon Sep 17 00:00:00 2001 From: Jen Harris <95221058+odscjen@users.noreply.github.com> Date: Thu, 7 Mar 2024 10:10:26 +0000 Subject: [PATCH 3/7] Update docs/history/changelog.md Co-authored-by: Duncan Dewhurst --- docs/history/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 0c82e3baf..b225c5235 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -210,7 +210,7 @@ Per the [normative and non-normative content and changes policy](../governance/n * [#1490](https://github.com/open-contracting/standard/pull/1490) `SimpleIdentifier` * [#1519](https://github.com/open-contracting/standard/pull/1519) `Value.amountNet` and `Value.amountGross` * [#1490](https://github.com/open-contracting/standard/pull/1490) `contracts.identifiers` - * [#1679](https://github.com/open-contracting/standard/pull/1679) `Organization.details.classifications` merged from Organization classifications extension + * [#1679](https://github.com/open-contracting/standard/pull/1679) `Organization.details.classifications` * Deprecate some fields: * [#1200](https://github.com/open-contracting/standard/pull/1200) `tender.submissionMethod`, because all codes from the `submissionMethod` codelist are deprecated. From c368d38a976118da1a12e54a0d74b48be43c90a1 Mon Sep 17 00:00:00 2001 From: odscjen Date: Thu, 7 Mar 2024 10:22:47 +0000 Subject: [PATCH 4/7] classificationScheme.csv: add codes from organizationClassification extension --- docs/history/changelog.md | 5 +++++ schema/codelists/classificationScheme.csv | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 0c82e3baf..8e0a295ca 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -84,6 +84,11 @@ Per the [normative and non-normative content and changes policy](../governance/n * 'COFOG' * [#1452](https://github.com/open-contracting/standard/pull/1452) Add 'proClass'. * [#1637](https://github.com/open-contracting/standard/pull/1637) Add 'sdg' and 'sdgTarget'. + * [#1679](https://github.com/open-contracting/standard/pull/1679) Add codes from the organization classification extension: + * 'TED_CA_TYPE' + * 'TED_CE_ACTIVITY' + * 'eu-buyer-contracting-type' + * 'eu-main-activity' * `documentType.csv`: * Add codes: diff --git a/schema/codelists/classificationScheme.csv b/schema/codelists/classificationScheme.csv index c44ae85c3..2aca73f40 100644 --- a/schema/codelists/classificationScheme.csv +++ b/schema/codelists/classificationScheme.csv @@ -16,3 +16,7 @@ COFOG,Classification of the Functions of Government,"A standard classifying the proClass,ProClass,ProClass is a procurement classification scheme intended for use by local government in the United Kingdom.,https://proclass.org.uk/,item sdg,Sustainable Development Goals,"The Sustainable Development Goals are a collection of 17 interlinked goals set by the United Nations General Assembly and designed to be a ""blueprint to achieve a better and more sustainable future for all"".",https://unstats.un.org/sdgs/indicators/indicators-list/,tender sdgTarget,Sustainable Development Goal Targets,The Sustainable Development Goal Targets are specific targets for each Sustainable Development Goal.,https://unstats.un.org/sdgs/indicators/indicators-list/,tender +TED_CA_TYPE,EU Type of contracting authority (TED schema),The types of contracting authority within the domain of public procurement according to the legislation of the European Parliament. This scheme's codes match those in TED schema.,https://simap.ted.europa.eu/documents/10184/99173/EN_F01.pdf,organization +TED_CE_ACTIVITY,EU Main activity of contracting entity (TED schema),The main activity of the contracting entity within the domain of public procurement according to the legislation of the European Parliament. This scheme's codes match those in TED schema.,https://simap.ted.europa.eu/documents/10184/99173/EN_F04.pdf,organization +eu-buyer-contracting-type,EU Buyer contracting entity type,Whether or not the buyer is a contracting entity within the domain of public procurement according to the legislation of the European Parliament.,https://docs.ted.europa.eu/eforms/latest/reference/code-lists/buyer-contracting-type.html,organization +eu-main-activity,EU Main activity authority list (eForms),The main activity of the contracting entity within the domain of public procurement according to the legislation of the European Parliament. This scheme's codes match those in eForms.,https://op.europa.eu/en/web/eu-vocabularies/concept-scheme/-/resource?uri=http://publications.europa.eu/resource/authority/main-activity,organization From 4f782cfe9aee879ec894870102708ca4b2b149ed Mon Sep 17 00:00:00 2001 From: Jen Harris <95221058+odscjen@users.noreply.github.com> Date: Fri, 8 Mar 2024 11:20:25 +0000 Subject: [PATCH 5/7] Update schema/release-schema.json Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com> --- schema/release-schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/release-schema.json b/schema/release-schema.json index 746c471db..376bbd7ce 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -1432,7 +1432,7 @@ }, "classifications": { "title": "Organization classifications", - "description": "The classifications that categorize the organization", + "description": "The classifications that categorize the organization.", "type": "array", "items": { "$ref": "#/definitions/Classification" From d1a97b70da8b702f3d256ff2a2ff9e19599939ef Mon Sep 17 00:00:00 2001 From: odscjen Date: Fri, 8 Mar 2024 11:23:13 +0000 Subject: [PATCH 6/7] update changelog.md --- docs/history/changelog.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 03055fc35..51d34b1cd 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -80,15 +80,14 @@ Per the [normative and non-normative content and changes policy](../governance/n * [#1210](https://github.com/open-contracting/standard/pull/1210) Add codes from the legal basis extension: * 'CELEX' * 'LEXML' - * [#1218](https://github.com/open-contracting/standard/pull/1218) Add codes from the organization classification extension: + * [#1218](https://github.com/open-contracting/standard/pull/1218) [#1679](https://github.com/open-contracting/standard/pull/1679) Add codes from the organization classification extension: * 'COFOG' - * [#1452](https://github.com/open-contracting/standard/pull/1452) Add 'proClass'. - * [#1637](https://github.com/open-contracting/standard/pull/1637) Add 'sdg' and 'sdgTarget'. - * [#1679](https://github.com/open-contracting/standard/pull/1679) Add codes from the organization classification extension: * 'TED_CA_TYPE' * 'TED_CE_ACTIVITY' * 'eu-buyer-contracting-type' * 'eu-main-activity' + * [#1452](https://github.com/open-contracting/standard/pull/1452) Add 'proClass'. + * [#1637](https://github.com/open-contracting/standard/pull/1637) Add 'sdg' and 'sdgTarget'. * `documentType.csv`: * Add codes: From 30526cc382348a96dc906ac74be0990a5d20dbfd Mon Sep 17 00:00:00 2001 From: odscjen Date: Fri, 8 Mar 2024 11:24:49 +0000 Subject: [PATCH 7/7] run manage.py --- schema/dereferenced-release-schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index 002d7721b..bc7951f68 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -608,7 +608,7 @@ }, "classifications": { "title": "Organization classifications", - "description": "The classifications that categorize the organization", + "description": "The classifications that categorize the organization.", "type": "array", "items": { "title": "Classification", @@ -33442,7 +33442,7 @@ }, "classifications": { "title": "Organization classifications", - "description": "The classifications that categorize the organization", + "description": "The classifications that categorize the organization.", "type": "array", "items": { "title": "Classification",