Skip to content

Commit 7035444

Browse files
committed
Preparing API v0.4 release
1 parent 81ff4ba commit 7035444

29 files changed

Lines changed: 178 additions & 220 deletions

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
# built documents.
5353
#
5454
# The short X.Y version.
55-
version = '0.3'
55+
version = '0.4'
5656
# The full version, including alpha/beta/rc tags.
57-
release = '0.3.0'
57+
release = '0.4.0'
5858

5959
# The language for content autogenerated by Sphinx. Refer to documentation
6060
# for a list of supported languages.

docs/source/overview.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,21 @@ lot. The changes in the API are communicated via `Open Procurement API
6666
Change log
6767
----------
6868

69+
0.4
70+
~~~
71+
Released: 2014-12-01
72+
73+
New Features:
74+
75+
- Filing Complaint on award
76+
- Complaint attachments
77+
- Tender Cancelling
78+
- Question authors visibility
79+
80+
Modifications:
81+
82+
- Tender status codelist harmonized
83+
6984
0.3
7085
~~~
7186
Released: 2014-11-21

docs/source/standard/tender.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Schema
126126
The date or period on which an award is anticipated to be made.
127127

128128
:status:
129-
'enquiries', 'tendering', 'auction', 'qualification', 'awarded', 'contract-signed', 'paused'
129+
'ative.enquiries', 'active.tendering', 'active.auction', 'active.qualification', 'active.awarded', 'unsuccessful', 'complete', 'cancelled'
130130

131131
Status of the Tender.
132132

docs/source/tutorial.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ and `Location` response header reports the location of object created. The
4343
body of response reveals the information about tender created, its internal
4444
`id` (that matches the `Location` segment), its official `tenderID` and
4545
`modified` datestamp stating the moment in time when tender was last
46-
modified. Note that tender is created with `enquiries` status.
46+
modified. Note that tender is created with `active.enquiries` status.
4747

4848
Let's access the URL of object created (the `Location` header of the response):
4949

@@ -138,7 +138,7 @@ And we can see that it is overriding the original version:
138138
Enquiries
139139
---------
140140

141-
When tender is in `enquiry` status, interested parties can ask questions:
141+
When tender is in `active.enquiry` status, interested parties can ask questions:
142142

143143
.. include:: tutorial/ask-question.http
144144
:code:
Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
$ http -j PATCH http://api-sandbox.openprocurement.org/api/0/tenders/e1c4e54be2314868bab3ecfcf6241cba/questions/2356d267b21444368c0bd155f80b6b08 data:=@./answer.json
2-
PATCH /api/0/tenders/e1c4e54be2314868bab3ecfcf6241cba/questions/2356d267b21444368c0bd155f80b6b08 HTTP/1.1
1+
$ http -j PATCH https://api-sandbox.openprocurement.org/api/0/tenders/327c00d16cff4c37be5bd4915cdff8a3/questions/74fb1c83ec7549e0abd7284e05287b8b data:=@./answer.json
2+
PATCH /api/0/tenders/327c00d16cff4c37be5bd4915cdff8a3/questions/74fb1c83ec7549e0abd7284e05287b8b HTTP/1.1
33
Content-Type: application/json; charset=utf-8
44

55
{
@@ -14,30 +14,9 @@ Content-Type: application/json; charset=UTF-8
1414
{
1515
"data": {
1616
"answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"",
17-
"author": {
18-
"address": {
19-
"countryName": "Україна",
20-
"locality": "м. Вінниця",
21-
"postalCode": "21100",
22-
"region": "м. Вінниця",
23-
"streetAddress": "вул. Островського, 33"
24-
},
25-
"contactPoint": {
26-
"email": "soleksuk@gmail.com",
27-
"name": "Сергій Олексюк",
28-
"telephone": "+380 (432) 21-69-30"
29-
},
30-
"identifier": {
31-
"id": "13313462",
32-
"legalName": "Державне комунальне підприємство громадського харчування «Школяр»",
33-
"scheme": "https://ns.openprocurement.org/ua/edrpou",
34-
"uri": "http://sch10.edu.vn.ua/"
35-
},
36-
"name": "ДКП «Школяр»"
37-
},
38-
"date": "2014-11-22T04:27:57.785461+02:00",
17+
"date": "2014-12-01T17:39:35.616161+02:00",
3918
"description": "Просимо додати таблицю потрібної калорійності харчування по місяцях",
40-
"id": "2356d267b21444368c0bd155f80b6b08",
19+
"id": "74fb1c83ec7549e0abd7284e05287b8b",
4120
"title": "Калорійність по місяцях"
4221
}
4322
}

docs/source/tutorial/ask-question.http

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
$ http -j POST http://api-sandbox.openprocurement.org/api/0/tenders/e1c4e54be2314868bab3ecfcf6241cba/questions data:=@./question.json
2-
POST /api/0/tenders/e1c4e54be2314868bab3ecfcf6241cba/questions HTTP/1.1
1+
$ http -j POST https://api-sandbox.openprocurement.org/api/0/tenders/327c00d16cff4c37be5bd4915cdff8a3/questions data:=@./question.json
2+
POST /api/0/tenders/327c00d16cff4c37be5bd4915cdff8a3/questions HTTP/1.1
33
Content-Type: application/json; charset=utf-8
44

55
{
@@ -32,7 +32,7 @@ Content-Type: application/json; charset=utf-8
3232

3333
HTTP/1.1 201 Created
3434
Content-Type: application/json; charset=UTF-8
35-
Location: http://api-sandbox.openprocurement.org/api/0/tenders/e1c4e54be2314868bab3ecfcf6241cba/bids/2356d267b21444368c0bd155f80b6b08
35+
Location: http://api-sandbox.openprocurement.org/api/0/tenders/327c00d16cff4c37be5bd4915cdff8a3/questions/74fb1c83ec7549e0abd7284e05287b8b
3636

3737
{
3838
"data": {
@@ -57,9 +57,9 @@ Location: http://api-sandbox.openprocurement.org/api/0/tenders/e1c4e54be2314868b
5757
},
5858
"name": "ДКП «Школяр»"
5959
},
60-
"date": "2014-11-22T04:27:57.785461+02:00",
60+
"date": "2014-12-01T17:39:35.616161+02:00",
6161
"description": "Просимо додати таблицю потрібної калорійності харчування по місяцях",
62-
"id": "2356d267b21444368c0bd155f80b6b08",
62+
"id": "74fb1c83ec7549e0abd7284e05287b8b",
6363
"title": "Калорійність по місяцях"
6464
}
6565
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
$ http http://api-sandbox.openprocurement.org/api/0/tenders/e1c4e54be2314868bab3ecfcf6241cba/bids/991bfd3d936b43c4bd129b3a23c4fa85/documents
2-
GET /api/0/tenders/e1c4e54be2314868bab3ecfcf6241cba/bids/991bfd3d936b43c4bd129b3a23c4fa85/documents HTTP/1.1
1+
$ http https://api-sandbox.openprocurement.org/api/0/tenders/327c00d16cff4c37be5bd4915cdff8a3/bids/9b2c1ec83e1646edb2ce6056d653d390/documents
2+
GET /api/0/tenders/327c00d16cff4c37be5bd4915cdff8a3/bids/9b2c1ec83e1646edb2ce6056d653d390/documents HTTP/1.1
33

44

55

@@ -9,12 +9,12 @@ Content-Type: application/json; charset=UTF-8
99
{
1010
"data": [
1111
{
12-
"dateModified": "2014-11-22T04:28:01.016428+02:00",
13-
"datePublished": "2014-11-22T04:28:01.016385+02:00",
12+
"dateModified": "2014-12-01T17:39:41.114476+02:00",
13+
"datePublished": "2014-12-01T17:39:41.114422+02:00",
1414
"format": "text/plain",
15-
"id": "619d3552bb984221a06977b00caa6388",
15+
"id": "316aecfb5cd9407ebc2ae980d86812d8",
1616
"title": "Proposal.pdf",
17-
"url": "http://api-sandbox.openprocurement.org/api/0/tenders/e1c4e54be2314868bab3ecfcf6241cba/bids/991bfd3d936b43c4bd129b3a23c4fa85/documents/619d3552bb984221a06977b00caa6388?download=56d715375f374153be706e74c1b983b6"
17+
"url": "http://api-sandbox.openprocurement.org/api/0/tenders/327c00d16cff4c37be5bd4915cdff8a3/bids/9b2c1ec83e1646edb2ce6056d653d390/documents/316aecfb5cd9407ebc2ae980d86812d8?download=efad340688de454486f267f8575477dc"
1818
}
1919
]
2020
}
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
$ http http://api-sandbox.openprocurement.org/api/0/tenders/ad41df97f2364911a27a7c744a8e3e62
2-
GET /api/0/tenders/ad41df97f2364911a27a7c744a8e3e62 HTTP/1.1
1+
$ http https://api-sandbox.openprocurement.org/api/0/tenders/779630aecd87417097dcfb48871b6990
2+
GET /api/0/tenders/779630aecd87417097dcfb48871b6990 HTTP/1.1
33

44

55

@@ -8,12 +8,12 @@ Content-Type: application/json; charset=UTF-8
88

99
{
1010
"data": {
11-
"dateModified": "2014-11-22T04:27:50.716220+02:00",
11+
"dateModified": "2014-12-01T17:39:21.504836+02:00",
1212
"enquiryPeriod": {
13-
"startDate": "2014-11-22T04:27:50.716220+02:00"
13+
"startDate": "2014-12-01T17:39:21.504836+02:00"
1414
},
15-
"id": "ad41df97f2364911a27a7c744a8e3e62",
16-
"status": "enquiries",
17-
"tenderID": "UA-ad41df97f2364911a27a7c744a8e3e62"
15+
"id": "779630aecd87417097dcfb48871b6990",
16+
"status": "active.enquiries",
17+
"tenderID": "UA-779630aecd87417097dcfb48871b6990"
1818
}
1919
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
$ http -j PATCH https://api-sandbox.openprocurement.org/api/0/tenders/bd02634d93eb4c13923283adedc8a168 data:={"status":"cancelled"}
2-
PATCH /api/0/tenders/bd02634d93eb4c13923283adedc8a168 HTTP/1.1
1+
$ http -j PATCH https://api-sandbox.openprocurement.org/api/0/tenders/779630aecd87417097dcfb48871b6990 data:={"status":"cancelled"}
2+
PATCH /api/0/tenders/779630aecd87417097dcfb48871b6990 HTTP/1.1
33
Content-Type: application/json; charset=utf-8
44

55
{
@@ -13,12 +13,12 @@ Content-Type: application/json; charset=UTF-8
1313

1414
{
1515
"data": {
16-
"dateModified": "2014-12-01T15:59:41.185408+02:00",
16+
"dateModified": "2014-12-01T17:39:23.440187+02:00",
1717
"enquiryPeriod": {
18-
"startDate": "2014-12-01T15:59:30.491291+02:00"
18+
"startDate": "2014-12-01T17:39:21.504836+02:00"
1919
},
20-
"id": "bd02634d93eb4c13923283adedc8a168",
20+
"id": "779630aecd87417097dcfb48871b6990",
2121
"status": "cancelled",
22-
"tenderID": "UA-bd02634d93eb4c13923283adedc8a168"
22+
"tenderID": "UA-779630aecd87417097dcfb48871b6990"
2323
}
2424
}

docs/source/tutorial/create-tender-procuringEntity.http

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$ http -j POST http://api-sandbox.openprocurement.org/api/0/tenders data:=@./school-tender.json
1+
$ http -j POST https://api-sandbox.openprocurement.org/api/0/tenders data:=@./school-tender.json
22
POST /api/0/tenders HTTP/1.1
33
Content-Type: application/json; charset=utf-8
44

@@ -25,15 +25,18 @@ Content-Type: application/json; charset=utf-8
2525

2626
HTTP/1.1 201 Created
2727
Content-Type: application/json; charset=UTF-8
28-
Location: http://api-sandbox.openprocurement.org/api/0/tenders/e1c4e54be2314868bab3ecfcf6241cba
28+
Location: http://api-sandbox.openprocurement.org/api/0/tenders/327c00d16cff4c37be5bd4915cdff8a3
2929

3030
{
31+
"access": {
32+
"token": "4668a63ccfd443e8b848e856952e9a2b"
33+
},
3134
"data": {
32-
"dateModified": "2014-11-22T04:27:52.011949+02:00",
35+
"dateModified": "2014-12-01T17:39:25.289180+02:00",
3336
"enquiryPeriod": {
34-
"startDate": "2014-11-22T04:27:52.011949+02:00"
37+
"startDate": "2014-12-01T17:39:25.289180+02:00"
3538
},
36-
"id": "e1c4e54be2314868bab3ecfcf6241cba",
39+
"id": "327c00d16cff4c37be5bd4915cdff8a3",
3740
"procuringEntity": {
3841
"address": {
3942
"countryName": "Україна",
@@ -50,7 +53,7 @@ Location: http://api-sandbox.openprocurement.org/api/0/tenders/e1c4e54be2314868b
5053
},
5154
"name": "ЗОСШ #10 м.Вінниці"
5255
},
53-
"status": "enquiries",
54-
"tenderID": "UA-e1c4e54be2314868bab3ecfcf6241cba"
56+
"status": "active.enquiries",
57+
"tenderID": "UA-327c00d16cff4c37be5bd4915cdff8a3"
5558
}
5659
}

0 commit comments

Comments
 (0)