Added logging operation

openprocurement · Jan 5, 2015 · 861a511 · 861a511
1 parent 2704b71
commit 861a511
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 7 deletions.
diff --git a/src/openprocurement/api/views/auction.py b/src/openprocurement/api/views/auction.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from logging import getLogger
 from cornice.service import Service
 from openprocurement.api.models import Award
 from openprocurement.api.utils import (
@@ -10,6 +11,9 @@
 )
 
 
+LOGGER = getLogger(__name__)
+
+
 auction = Service(name='Tender Auction', path='/tenders/{tender_id}/auction', renderer='json')
 
 
@@ -78,6 +82,7 @@ def patch_auction(request):
     """Set urls for access to auction.
     """
     apply_patch(request, src=request.validated['tender_src'])
+    LOGGER.info('Updated auction urls')
     return {'data': request.validated['tender'].serialize("auction_view")}
 
 
@@ -166,4 +171,5 @@ def post_auction(request):
     award = Award(award_data)
     tender.awards.append(award)
     save_tender(request)
+    LOGGER.info('Report auction results')
     return {'data': tender.serialize(tender.status)}
diff --git a/src/openprocurement/api/views/award.py b/src/openprocurement/api/views/award.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from logging import getLogger
 from cornice.resource import resource, view
 from openprocurement.api.models import Award, Contract, get_now
 from openprocurement.api.utils import (
@@ -11,6 +12,9 @@
 )
 
 
+LOGGER = getLogger(__name__)
+
+
 @resource(name='Tender Awards',
           collection_path='/tenders/{tender_id}/awards',
           path='/tenders/{tender_id}/awards/{award_id}',
@@ -166,6 +170,7 @@ def collection_post(self):
         award = Award(award_data)
         tender.awards.append(award)
         save_tender(self.request)
+        LOGGER.info('Created tender award {}'.format(award.id))
         self.request.response.status = 201
         self.request.response.headers['Location'] = self.request.route_url('Tender Awards', tender_id=tender.id, award_id=award['id'])
         return {'data': award.serialize("view")}
@@ -316,4 +321,5 @@ def patch(self):
                     tender.awardPeriod.endDate = get_now()
                     tender.status = 'active.awarded'
             save_tender(self.request)
+            LOGGER.info('Updated tender award {}'.format(self.request.context.id))
         return {'data': award.serialize("view")}
diff --git a/src/openprocurement/api/views/award_complaint.py b/src/openprocurement/api/views/award_complaint.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from logging import getLogger
 from cornice.resource import resource, view
 from openprocurement.api.models import Award, Complaint, STAND_STILL_TIME, get_now
 from openprocurement.api.utils import (
@@ -11,6 +12,9 @@
 )
 
 
+LOGGER = getLogger(__name__)
+
+
 @resource(name='Tender Award Complaints',
           collection_path='/tenders/{tender_id}/awards/{award_id}/complaints',
           path='/tenders/{tender_id}/awards/{award_id}/complaints/{complaint_id}',
@@ -34,6 +38,7 @@ def collection_post(self):
         complaint = Complaint(complaint_data)
         self.request.validated['award'].complaints.append(complaint)
         save_tender(self.request)
+        LOGGER.info('Created tender award complaint {}'.format(complaint.id))
         self.request.response.status = 201
         self.request.response.headers['Location'] = self.request.route_url('Tender Award Complaints', tender_id=tender.id, award_id=self.request.validated['award_id'], complaint_id=complaint['id'])
         return {'data': complaint.serialize("view")}
@@ -124,4 +129,5 @@ def patch(self):
                     else:
                         tender.status = 'unsuccessful'
             save_tender(self.request)
+            LOGGER.info('Updated tender award complaint {}'.format(self.request.context.id))
         return {'data': complaint.serialize("view")}
diff --git a/src/openprocurement/api/views/award_complaint_document.py b/src/openprocurement/api/views/award_complaint_document.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from logging import getLogger
 from cornice.resource import resource, view
 from openprocurement.api.utils import (
     get_file,
@@ -13,6 +14,9 @@
 )
 
 
+LOGGER = getLogger(__name__)
+
+
 @resource(name='Tender Award Complaint Documents',
           collection_path='/tenders/{tender_id}/awards/{award_id}/complaints/{complaint_id}/documents',
           path='/tenders/{tender_id}/awards/{award_id}/complaints/{complaint_id}/documents/{document_id}',
@@ -48,6 +52,7 @@ def collection_post(self):
         document = upload_file(self.request)
         self.request.validated['complaint'].documents.append(document)
         save_tender(self.request)
+        LOGGER.info('Created tender award complaint document {}'.format(document.id))
         self.request.response.status = 201
         document_route = self.request.matched_route.name.replace("collection_", "")
         self.request.response.headers['Location'] = self.request.current_route_url(_route_name=document_route, document_id=document.id, _query={})
@@ -78,6 +83,7 @@ def put(self):
         document = upload_file(self.request)
         self.request.validated['complaint'].documents.append(document)
         save_tender(self.request)
+        LOGGER.info('Updated tender award complaint document {}'.format(self.request.context.id))
         return {'data': document.serialize("view")}
 
     @view(renderer='json', validators=(validate_patch_document_data,), permission='review_complaint')
@@ -88,4 +94,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
+        LOGGER.info('Updated tender award complaint document {}'.format(self.request.context.id))
         return {'data': self.request.context.serialize("view")}
diff --git a/src/openprocurement/api/views/award_contract.py b/src/openprocurement/api/views/award_contract.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
+from logging import getLogger
 from cornice.resource import resource, view
 from openprocurement.api.models import Contract
 from openprocurement.api.utils import (
-    apply_data_patch,
+    apply_patch,
     save_tender,
 )
 from openprocurement.api.validation import (
@@ -11,6 +12,9 @@
 )
 
 
+LOGGER = getLogger(__name__)
+
+
 @resource(name='Tender Award Contracts',
           collection_path='/tenders/{tender_id}/awards/{award_id}/contracts',
           path='/tenders/{tender_id}/awards/{award_id}/contracts/{contract_id}',
@@ -35,6 +39,7 @@ def collection_post(self):
         contract.awardID = self.request.validated['award_id']
         self.request.validated['award'].contracts.append(contract)
         save_tender(self.request)
+        LOGGER.info('Created tender award contract {}'.format(contract.id))
         self.request.response.status = 201
         self.request.response.headers['Location'] = self.request.route_url('Tender Award Contracts', tender_id=tender.id, award_id=self.request.validated['award_id'], contract_id=contract['id'])
         return {'data': contract.serialize()}
@@ -59,9 +64,6 @@ def patch(self):
             self.request.errors.add('body', 'data', 'Can\'t update contract in current tender status')
             self.request.errors.status = 403
             return
-        contract = self.request.validated['contract']
-        contract_data = self.request.validated['data']
-        if contract_data:
-            contract.import_data(apply_data_patch(contract.serialize(), contract_data))
-            save_tender(self.request)
-        return {'data': contract.serialize()}
+        apply_patch(self.request, src=self.request.context.serialize())
+        LOGGER.info('Updated tender award contract {}'.format(self.request.context.id))
+        return {'data': self.request.context.serialize()}
diff --git a/src/openprocurement/api/views/award_contract_document.py b/src/openprocurement/api/views/award_contract_document.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from logging import getLogger
 from cornice.resource import resource, view
 from openprocurement.api.utils import (
     get_file,
@@ -13,6 +14,9 @@
 )
 
 
+LOGGER = getLogger(__name__)
+
+
 @resource(name='Tender Award Contract Documents',
           collection_path='/tenders/{tender_id}/awards/{award_id}/contracts/{contract_id}/documents',
           path='/tenders/{tender_id}/awards/{award_id}/contracts/{contract_id}/documents/{document_id}',
@@ -53,6 +57,7 @@ def collection_post(self):
         document = upload_file(self.request)
         self.request.validated['contract'].documents.append(document)
         save_tender(self.request)
+        LOGGER.info('Created tender award contract document {}'.format(document.id))
         self.request.response.status = 201
         document_route = self.request.matched_route.name.replace("collection_", "")
         self.request.response.headers['Location'] = self.request.current_route_url(_route_name=document_route, document_id=document.id, _query={})
@@ -88,6 +93,7 @@ def put(self):
         document = upload_file(self.request)
         self.request.validated['contract'].documents.append(document)
         save_tender(self.request)
+        LOGGER.info('Updated tender award contract document {}'.format(self.request.context.id))
         return {'data': document.serialize("view")}
 
     @view(renderer='json', validators=(validate_patch_document_data,), permission='edit_tender')
@@ -102,4 +108,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
+        LOGGER.info('Updated tender award contract document {}'.format(self.request.context.id))
         return {'data': self.request.context.serialize("view")}
diff --git a/src/openprocurement/api/views/award_document.py b/src/openprocurement/api/views/award_document.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from logging import getLogger
 from cornice.resource import resource, view
 from openprocurement.api.utils import (
     get_file,
@@ -13,6 +14,9 @@
 )
 
 
+LOGGER = getLogger(__name__)
+
+
 @resource(name='Tender Award Documents',
           collection_path='/tenders/{tender_id}/awards/{award_id}/documents',
           path='/tenders/{tender_id}/awards/{award_id}/documents/{document_id}',
@@ -48,6 +52,7 @@ def collection_post(self):
         document = upload_file(self.request)
         self.request.validated['award'].documents.append(document)
         save_tender(self.request)
+        LOGGER.info('Created tender award document {}'.format(document.id))
         self.request.response.status = 201
         document_route = self.request.matched_route.name.replace("collection_", "")
         self.request.response.headers['Location'] = self.request.current_route_url(_route_name=document_route, document_id=document.id, _query={})
@@ -78,6 +83,7 @@ def put(self):
         document = upload_file(self.request)
         self.request.validated['award'].documents.append(document)
         save_tender(self.request)
+        LOGGER.info('Updated tender award document {}'.format(self.request.context.id))
         return {'data': document.serialize("view")}
 
     @view(renderer='json', validators=(validate_patch_document_data,), permission='edit_tender')
@@ -88,4 +94,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
+        LOGGER.info('Updated tender award document {}'.format(self.request.context.id))
         return {'data': self.request.context.serialize("view")}
diff --git a/src/openprocurement/api/views/bid.py b/src/openprocurement/api/views/bid.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from logging import getLogger
 from cornice.resource import resource, view
 from openprocurement.api.models import Bid
 from openprocurement.api.utils import (
@@ -12,6 +13,9 @@
 )
 
 
+LOGGER = getLogger(__name__)
+
+
 @resource(name='Tender Bids',
           collection_path='/tenders/{tender_id}/bids',
           path='/tenders/{tender_id}/bids/{bid_id}',
@@ -114,6 +118,7 @@ def collection_post(self):
         set_ownership(bid, self.request)
         tender.bids.append(bid)
         save_tender(self.request)
+        LOGGER.info('Created tender bid {}'.format(bid.id))
         self.request.response.status = 201
         self.request.response.headers['Location'] = self.request.route_url('Tender Bids', tender_id=tender.id, bid_id=bid['id'])
         return {
@@ -246,6 +251,7 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
+        LOGGER.info('Updated tender bid {}'.format(self.request.context.id))
         return {'data': self.request.context.serialize("view")}
 
     @view(renderer='json', permission='edit_bid')
@@ -287,4 +293,5 @@ def delete(self):
         res = bid.serialize("view")
         tender.bids.remove(bid)
         save_tender(self.request)
+        LOGGER.info('Deleted tender bid {}'.format(self.request.context.id))
         return {'data': res}
diff --git a/src/openprocurement/api/views/bid_document.py b/src/openprocurement/api/views/bid_document.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from logging import getLogger
 from cornice.resource import resource, view
 from openprocurement.api.utils import (
     get_file,
@@ -13,6 +14,9 @@
 )
 
 
+LOGGER = getLogger(__name__)
+
+
 @resource(name='Tender Bid Documents',
           collection_path='/tenders/{tender_id}/bids/{bid_id}/documents',
           path='/tenders/{tender_id}/bids/{bid_id}/documents/{document_id}',
@@ -52,6 +56,7 @@ def collection_post(self):
         document = upload_file(self.request)
         self.request.validated['bid'].documents.append(document)
         save_tender(self.request)
+        LOGGER.info('Created tender bid document {}'.format(document.id))
         self.request.response.status = 201
         document_route = self.request.matched_route.name.replace("collection_", "")
         self.request.response.headers['Location'] = self.request.current_route_url(_route_name=document_route, document_id=document.id, _query={})
@@ -86,6 +91,7 @@ def put(self):
         document = upload_file(self.request)
         self.request.validated['bid'].documents.append(document)
         save_tender(self.request)
+        LOGGER.info('Updated tender bid document {}'.format(self.request.context.id))
         return {'data': document.serialize("view")}
 
     @view(renderer='json', validators=(validate_patch_document_data,), permission='edit_bid')
@@ -96,4 +102,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
+        LOGGER.info('Updated tender bid document {}'.format(self.request.context.id))
         return {'data': self.request.context.serialize("view")}
diff --git a/src/openprocurement/api/views/complaint_document.py b/src/openprocurement/api/views/complaint_document.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from logging import getLogger
 from cornice.resource import resource, view
 from openprocurement.api.utils import (
     get_file,
@@ -13,6 +14,9 @@
 )
 
 
+LOGGER = getLogger(__name__)
+
+
 @resource(name='Tender Complaint Documents',
           collection_path='/tenders/{tender_id}/complaints/{complaint_id}/documents',
           path='/tenders/{tender_id}/complaints/{complaint_id}/documents/{document_id}',
@@ -48,6 +52,7 @@ def collection_post(self):
         document = upload_file(self.request)
         self.request.validated['complaint'].documents.append(document)
         save_tender(self.request)
+        LOGGER.info('Created tender complaint document {}'.format(document.id))
         self.request.response.status = 201
         document_route = self.request.matched_route.name.replace("collection_", "")
         self.request.response.headers['Location'] = self.request.current_route_url(_route_name=document_route, document_id=document.id, _query={})
@@ -78,6 +83,7 @@ def put(self):
         document = upload_file(self.request)
         self.request.validated['complaint'].documents.append(document)
         save_tender(self.request)
+        LOGGER.info('Updated tender complaint document {}'.format(self.request.context.id))
         return {'data': document.serialize("view")}
 
     @view(renderer='json', validators=(validate_patch_document_data,), permission='review_complaint')
@@ -88,4 +94,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
+        LOGGER.info('Updated tender complaint document {}'.format(self.request.context.id))
         return {'data': self.request.context.serialize("view")}