Move Auction logic to view. Auto calculation of auction fields. Rectification period. procurementMethodDetails field. submissionMethodDetails field #7

oleksiyVeretiuk · 2018-04-25T13:59:01Z

coveralls · 2018-04-26T08:48:19Z

Pull Request Test Coverage Report for Build 38

513 of 538 (95.35%) changed or added relevant lines in 15 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage decreased (-0.02%) to 95.971%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
openregistry/lots/loki/views/lot_auction.py	17	18	94.44%
openregistry/lots/loki/validation.py	31	32	96.88%
openregistry/lots/loki/models.py	40	43	93.02%
openregistry/lots/loki/tests/auction.py	17	21	80.95%
openregistry/lots/loki/tests/blanks/auction_blanks.py	244	260	93.85%

Totals
Change from base Build 25:	-0.02%
Covered Lines:	1858
Relevant Lines:	1936

💛 - Coveralls

leits · 2018-04-26T08:50:46Z

openregistry/lots/loki/adapters.py

@@ -25,5 +29,15 @@ class LokiLotManagerAdapter(LotManagerAdapter):
        validate_decision_post,
    )

+    def _set_rectificationPeriod(self, request):
+        if request.validated['data'].get('status') == 'pending' and not request.context.rectificationPeriod:


Цей if повинен бути в change_lot

leits · 2018-04-26T08:52:13Z

openregistry/lots/loki/adapters.py

@@ -25,5 +29,15 @@ class LokiLotManagerAdapter(LotManagerAdapter):
        validate_decision_post,
    )

+    def _set_rectificationPeriod(self, request):
+        if request.validated['data'].get('status') == 'pending' and not request.context.rectificationPeriod:
+            request.context.rectificationPeriod = type(request.context).rectificationPeriod.model_class()


Спочатку формуєш період, потім передаєш його в context

leits · 2018-04-26T08:52:59Z

openregistry/lots/loki/models.py

@@ -67,20 +68,41 @@ class AuctionParameters(Model):
    if SANDBOX_MODE:
        procurementMethodDetails = StringType()

+    def validate_dutchSteps(self, data, value):
+        if data['type'] == 'english' and value:


if data['type'] != 'insider'

leits · 2018-04-26T08:53:36Z

openregistry/lots/loki/models.py

-    guarantee = ModelType(Guarantee, required=True)
+    status = StringType()
+    procurementMethodType = StringType(choices=['sellout.english', 'sellout.insider'])
+    tenderAttempts = IntType(max_value=3)


leits · 2018-04-26T08:53:50Z

openregistry/lots/loki/models.py

-    value = ModelType(Value, required=True)
-    minimalStep = ModelType(Value, required=True)
-    guarantee = ModelType(Guarantee, required=True)
+    status = StringType()


Довільна стрінга?

По логіці тут повинен був бути choices зі статусами з процедури для SSP, але чи вони вже є?

@ivanka-jakimchuk ^

Так, статуси є. Але графіку зі флоу ще нема

leits · 2018-04-26T09:08:34Z

openregistry/lots/loki/validation.py

@@ -85,3 +86,56 @@ def validate_deleted_status(request, error_handler, **kwargs):
            "only when asset have at least one document with \'cancellationDetails\' documentType")
        request.errors.status = 403
        raise error_handler(request)
+
+
+def validate_update_item_in_not_allowed_status(request, error_handler, **kwargs):


not_allowed_status-и можна винести в конфігуратор і перенести цю функцію в core

під конфігуратором ти маєш на увазі LotManager чи LokiLotConfigurator?

Список статусів, у яких не можна оновлювати items

leits · 2018-04-26T09:09:57Z

openregistry/lots/loki/validation.py

+
+
+def validate_update_auction_in_not_allowed_status(request, error_handler, **kwargs):
+    is_convoy = bool(request.authenticated_role != 'convoy')


is_convoy = bool(не конвой) ?

openregistry/lots/loki/validation.py

+                                  'Can\'t update item in current ({}) lot status'.format(request.validated['lot_status']))
+
+
+def validate_verification_status(request, error_handler, **kwargs):


leits · 2018-04-26T09:19:06Z

openregistry/lots/loki/views/lot_auction.py

+    def patch(self):
+        """Lot Auction Update"""
+        if apply_patch(self.request, src=self.request.context.serialize()):
+            update_file_content_type(self.request)


Поглянь на функцію update_file_content_type

leits · 2018-04-26T09:19:44Z

openregistry/lots/loki/views/lot_auction.py

+            self.LOGGER.info('Updated lot item {}'.format(self.request.context.id),
+                        extra=context_unpack(self.request, {'MESSAGE_ID': 'lot_auction_patch'}))
+            return {'data': self.request.context.serialize("view")}
+        return {'data': self.request.context.serialize("view")}


Другого return не потрібно

Під час тестів натикнувся на таку штуку: коли патчиш ідентичні дані з тими, які вже є в лоті apply_patch повертає не True і через це в response.json лежить None

Так, все правильно

leits · 2018-04-26T16:05:17Z

openregistry/lots/loki/adapters.py

+            auction.auctionParameters = auctionParameters_class()
+            if auction_type == 'sellout.english':
+                auction.auctionParameters.type = 'english'
+            if auction_type == 'sellout.insider':


leits · 2018-04-26T16:07:07Z

openregistry/lots/loki/adapters.py

+        auction_class = lot.__class__.auctions.model_class
+        auctionParameters_class = lot.__class__.auctions.model_class.auctionParameters.model_class
+        for tenderAttempts, auction_type in enumerate(auction_types, 1):
+            auction = auction_class()


поглянь на make_award функцію, об'єкт класу можна створити передавши йому дані

leits · 2018-04-26T16:07:42Z

openregistry/lots/loki/adapters.py

+        self._validate(request, self.change_validation)
+        if request.validated['data'].get('status') == 'pending' and not request.context.rectificationPeriod:
+            self._set_rectificationPeriod(request)


leits · 2018-04-26T16:08:20Z

openregistry/lots/loki/models.py

@@ -62,25 +65,44 @@ class AccountDetails(Model):


 class AuctionParameters(Model):
+    class Options:
+        roles = auctionParameters_roles
+
    type = StringType(choices=['english', 'insider'])
    dutchSteps = IntType(default=None, min_value=1, max_value=100)
    if SANDBOX_MODE:
        procurementMethodDetails = StringType()


Це значення аукціону, а не AuctionParameters

Мається на увазі, що procurementMethodDetails повинен бути в auction?

leits · 2018-04-26T16:09:29Z

openregistry/lots/loki/models.py

+            english = auctions[0]
+            second_english = auctions[1]
+            insider = auctions[2]
+            auto_calculated_fields = filter(lambda f: english[f], auto_calculated_fields)


А якщо одного з полів не буде? KeyError

Це ж schematics модель тому в поля, якого немає значення буде none. Проте переплавлю на getattr

oleksiyVeretiuk added 14 commits April 24, 2018 16:21

Merge branch 'master' of https://github.com/openprocurement/openregis…

616573b

…try.lots.loki

Update Auction model. Add auction roles

62f21c3

Automatically create auction for lot after creation

4dfb73c

Add validator for auction and item

78d60f3

Add validators

51a5653

Add views for auctions

9ac1308

Update test data

a3c6710

Add blanks for auction

8e7b805

Create test for auction

76fe02c

Expand tests

4ef56e2

Merge branch 'master' of https://github.com/openprocurement/openregis…

2a46956

…try.lots.loki

Move creating rectificationPeriod to adapter

e9fa47a

Use adapter in view

ccd198c

Expand tests

62ad0c9

oleksiyVeretiuk changed the title ~~Move Auction logic to view. Auto calculation of of auction fields~~ Move Auction logic to view. Auto calculation of auction fields Apr 26, 2018

oleksiyVeretiuk added 2 commits April 26, 2018 11:31

Add autochanging procurementMethodDetails depending on value in english

9e548c1

Expand tests

f4dfcbc

oleksiyVeretiuk changed the title ~~Move Auction logic to view. Auto calculation of auction fields~~ Move Auction logic to view. Auto calculation of auction fields. Rectification period. procurementMethodDetails field Apr 26, 2018

oleksiyVeretiuk added 2 commits April 26, 2018 11:55

Add submissionMethodDetails field

a564c12

Expand tests

82b460e

leits reviewed Apr 26, 2018

View reviewed changes

oleksiyVeretiuk added 7 commits April 26, 2018 15:48

First stage resolving discussions

e01df5c

Resolving discussions stage 2

dae518f

Fix tests

ed73aa8

Use SELLOUT_AUCTION_STATUSES

f0ebda3

Change validation error on 422. Use validator in manager

d73777b

Remove validators use roles

05046a2

Expand tests

03d340c

leits reviewed Apr 26, 2018

View reviewed changes

oleksiyVeretiuk added 5 commits April 27, 2018 09:45

Solve discussions

834bf6d

Solve discussions

eb80684

Solve discussions

732dc9a

Create AUCTION_STATUSES constant

704a622

Auto setting scheduled status

0342d46

leits merged commit 49f5155 into openprocurement:master Apr 27, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move Auction logic to view. Auto calculation of auction fields. Rectification period. procurementMethodDetails field. submissionMethodDetails field #7

Move Auction logic to view. Auto calculation of auction fields. Rectification period. procurementMethodDetails field. submissionMethodDetails field #7

oleksiyVeretiuk commented Apr 25, 2018 •

edited

Loading

coveralls commented Apr 26, 2018 •

edited

Loading

leits Apr 26, 2018

leits Apr 26, 2018

leits Apr 26, 2018

leits Apr 26, 2018

leits Apr 26, 2018

oleksiyVeretiuk Apr 26, 2018 •

edited

Loading

leits Apr 26, 2018

ivanka-jakimchuk Apr 26, 2018

leits Apr 26, 2018

oleksiyVeretiuk Apr 26, 2018 •

edited

Loading

leits Apr 26, 2018

leits Apr 26, 2018

This comment was marked as resolved.

leits Apr 26, 2018

leits Apr 26, 2018

oleksiyVeretiuk Apr 26, 2018

leits Apr 26, 2018

leits Apr 26, 2018

leits Apr 26, 2018

leits Apr 26, 2018

leits Apr 26, 2018

oleksiyVeretiuk Apr 27, 2018 •

edited

Loading

leits Apr 27, 2018

leits Apr 26, 2018

oleksiyVeretiuk Apr 27, 2018 •

edited

Loading



		def validate_update_auction_in_not_allowed_status(request, error_handler, **kwargs):
		is_convoy = bool(request.authenticated_role != 'convoy')

		'Can\'t update item in current ({}) lot status'.format(request.validated['lot_status']))


		def validate_verification_status(request, error_handler, **kwargs):

Move Auction logic to view. Auto calculation of auction fields. Rectification period. procurementMethodDetails field. submissionMethodDetails field #7

Move Auction logic to view. Auto calculation of auction fields. Rectification period. procurementMethodDetails field. submissionMethodDetails field #7

Conversation

oleksiyVeretiuk commented Apr 25, 2018 • edited Loading

coveralls commented Apr 26, 2018 • edited Loading

Pull Request Test Coverage Report for Build 38

💛 - Coveralls

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oleksiyVeretiuk Apr 26, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oleksiyVeretiuk Apr 26, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oleksiyVeretiuk Apr 27, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oleksiyVeretiuk Apr 27, 2018 • edited Loading

Choose a reason for hiding this comment

oleksiyVeretiuk commented Apr 25, 2018 •

edited

Loading

coveralls commented Apr 26, 2018 •

edited

Loading

oleksiyVeretiuk Apr 26, 2018 •

edited

Loading

oleksiyVeretiuk Apr 26, 2018 •

edited

Loading

oleksiyVeretiuk Apr 27, 2018 •

edited

Loading

oleksiyVeretiuk Apr 27, 2018 •

edited

Loading