Restore buyer and supplier fields

README.md

@@ -2,7 +2,7 @@
 
 The Open Contracting Data Standard for Public Private Partnerships profile provides an extended Open Contracting Data Standard schema, offering a structured data model for presenting information on Public Private Partnership Projects.
 
-It is based on the [World Bank Framework for Disclosure in Public Private Partnership Projects](http://www.worldbank.org/en/topic/publicprivatepartnerships/brief/ppp-tools#T1) and was developed between May 2016 and May 2017 through a partnership between the [World Bank Open Contracting team](https://blogs.worldbank.org/category/tags/open-contracting), [PPP team](http://www.worldbank.org/en/topic/publicprivatepartnerships), [Open Contracting Partnership](http://open-contracting.org), and [Open Data Services Co-operative](http://www.opendataservices.coop). 
+It is based on the [World Bank Framework for Disclosure in Public Private Partnership Projects](http://www.worldbank.org/en/topic/publicprivatepartnerships/brief/ppp-tools#T1) and was developed between May 2016 and May 2017 through a partnership between the [World Bank Open Contracting team](https://blogs.worldbank.org/category/tags/open-contracting), [PPP team](http://www.worldbank.org/en/topic/publicprivatepartnerships), [Open Contracting Partnership](http://open-contracting.org), and [Open Data Services Co-operative](http://www.opendataservices.coop).
 
 Full documentation of the profile is available at [http://standard.open-contracting.org/profiles/ppp/](http://standard.open-contracting.org/profiles/ppp/)
 
@@ -17,13 +17,13 @@ The consolidated OCDS for PPPs extension can be declared in [OCDS package metada
 }
 ```
 
-## About PPP extensions 
+## About PPP extensions
 
 OCDS for PPPs is constructed from [a number of different modular extensions to OCDS](http://standard.open-contracting.org/profiles/ppp/latest/en/extensions/), most of which can be used independently from the profile.
 
-This repository contains one additional extensions that forms part of the OCDS for PPPs profile. This extension introduces a number of fields and building blocks that are specific to PPP disclosure against the World Bank Framework, as well as a set of modifications that only apply in an OCDS Profile (e.g. removing standard fields that are not required in the profile). 
+This repository contains one additional extensions that forms part of the OCDS for PPPs profile. This extension introduces a number of fields and building blocks that are specific to PPP disclosure against the World Bank Framework, as well as a set of modifications that only apply in an OCDS Profile (e.g. changing closed codelists).
 
-### PPP Specific extensions 
+### PPP Specific extensions
 
 #### Evaluation Indicators
 
@@ -35,6 +35,20 @@ The `awards.evaluationIndicators` section includes properties to express the **v
 * riskPremium
 * netPresentValue
 
+##### Example
+
+```
+"evaluationIndicators": {
+  "riskPremium": 0.0092,
+  "riskPremiumDetails": "Based on a market risk premium of 6.0% (per government guidelines) and an asset beta of 0.45 (per a sample of listed telecommunication network providers) the project risk allocation gives rise to a risk premium of 0.92%",
+  "discountRate": 0.03,
+  "discountRateDetails": "Based on the current long term public sector bond rate",
+  "netPresentValue": {
+    "amount": 118044591901.35034,
+    "currency": "USD"
+  }
+```
+
 #### Finance Summary
 
 The PPP disclosure framework calls for a number of different indicators relating to the financial model of a PPP project. Whilst some of these may be reported as metrics on an ongoing basis, some are simple single values.
@@ -46,12 +60,28 @@ The `contracts.financeSummary` section includes properties to express the **valu
 * subsidyRatio
 * projectIRR
 
+##### Example
+
+```
+"financeSummary": {
+  "debtEquityRatio": 2.05,
+  "debtEquityRatioDetails": "Until the target population coverage is reached mega Consortium must comply with a contribution of capital of at least 30% of the total value of the company",
+  "shareCapital": {
+    "amount": 20000000,
+    "currency": "USD"
+  }
+```
+
 ## Issues
 
 Report issues for this extension in the [ocds-extensions repository](https://github.com/open-contracting/ocds-extensions/issues), putting the extension's name in the issue's title.
 
 ## Changelog
 
+### 2020-12-14
+
+* Restore `buyer` and `awards/suppliers` fields.
+
 ### 2020-11-16
 
 * Restore deprecated fields.

release-schema.json

@@ -32,33 +32,16 @@
       "enum": [
         "ppp"
       ]
-    },
-    "buyer": null,
-    "publicAuthority": {
-      "title": "Public authority",
-      "description": "The public authority is the unit/body/department within a government that is tendering and contracting the project. The public counterpart in the PPP contract.",
-      "$ref": "#/definitions/OrganizationReference"
     }
   },
   "definitions": {
     "Award": {
       "properties": {
-        "preferredBidders": {
-          "title": "Preferred bidders",
-          "description": "The bidder or bidders awarded this award, the preferred bidder(s) will become the counter party or parties of the procuring authority in the PPP contract when the contract is signed.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/OrganizationReference"
-          },
-          "uniqueItems": true,
-          "minItems": 1
-        },
         "evaluationIndicators": {
           "title": "Evaluation of PPP option",
           "description": "Key indicators that describe how the PPP option has been evaluated by government.",
           "$ref": "#/definitions/EvaluationIndicators"
-        },
-        "suppliers": null
+        }
       }
     },
     "Contract": {