Skip to content

Commit

Permalink
Merge branch 'cs-16394-tenderer-action-date' into 'master'
Browse files Browse the repository at this point in the history
[CS-16394] Add tendererActionDate to complaints

See merge request cdb/openprocurement.api!909
  • Loading branch information
Olha Zamirets committed Apr 26, 2024
2 parents db22bc2 + a378c16 commit 837518d
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ Content-Type: application/json
"value": {
"amount": 2000.0,
"currency": "UAH"
}
},
"tendererActionDate": "2023-10-10T01:00:00+03:00"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ Content-Type: application/json
"value": {
"amount": 2000.0,
"currency": "UAH"
}
},
"tendererActionDate": "2023-10-10T01:00:00+03:00"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ Content-Type: application/json
"value": {
"amount": 2000.0,
"currency": "UAH"
}
},
"tendererActionDate": "2023-10-10T01:00:00+03:00"
},
{
"id": "cd2a784c50d54e89944fb36a581a8d41",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ Content-Type: application/json
"value": {
"amount": 3000.0,
"currency": "UAH"
}
},
"tendererActionDate": "2023-10-10T01:00:01+03:00"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ Content-Type: application/json
"value": {
"amount": 3000.0,
"currency": "UAH"
}
},
"tendererActionDate": "2023-10-10T01:00:01+03:00"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ Content-Type: application/json
"value": {
"amount": 3000.0,
"currency": "UAH"
}
},
"tendererActionDate": "2023-10-10T01:00:01+03:00"
},
{
"id": "23ea1b75c75e42a6b351faa7e1cf618b",
Expand Down
7 changes: 6 additions & 1 deletion src/openprocurement/tender/core/procedure/state/complaint.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,12 @@ def handler(complaint):
and request_data.get("tendererAction", current_complaint.get("tendererAction"))
and new_status == "resolved"
):
return TendererResolvePatchComplaint, empty_handler

def handler(complaint):
complaint["status"] = "resolved"
complaint["tendererActionDate"] = get_now().isoformat()

return TendererResolvePatchComplaint, handler
elif status in ["pending", "accepted"]:
return TendererActionPatchComplaint, empty_handler
else:
Expand Down

0 comments on commit 837518d

Please sign in to comment.