Master with core

.travis.yml

@@ -18,7 +18,6 @@ cache:
   directories:
     - eggs
 before_install:
-  - pip install setuptools==7.0
   - python2 bootstrap.py
 install:
   - bin/buildout -N

buildout.cfg

@@ -20,7 +20,11 @@ eggs =
     nose
 
 
+[remotes]
+gh=https://github.com/
+[email protected]:
+
 [sources]
-openprocurement.api = git https://github.com/prozorro-sale/openprocurement.api.git
-openprocurement.auctions.flash = git https://github.com/prozorro-sale/openprocurement.auctions.flash.git
-openprocurement.auctions.core = git https://github.com/prozorro-sale/openprocurement.auctions.core.git
+openprocurement.api = git ${remotes:gh}openprocurement/openprocurement.api.git pushurl=${remotes:gh_push}openprocurement/openprocurement.api.git branch=ea_core_master
+openprocurement.auctions.core = git ${remotes:gh}openprocurement/openprocurement.auctions.core.git pushurl=${remotes:gh_push}openprocurement/openprocurement.auctions.core.git branch=a499878011598746_separating_awarding
+openprocurement.auctions.flash = git ${remotes:gh}openprocurement/openprocurement.auctions.flash.git pushurl=${remotes:gh_push}openprocurement/openprocurement.auctions.flash.git branch=a499878011598746_separating_awarding

docs.py

@@ -4,7 +4,7 @@
 import os
 from datetime import timedelta, datetime
 
-from openprocurement.api.models import get_now
+from openprocurement.api.utils import get_now
 import openprocurement.auctions.dgf.tests.base as base_test
 from openprocurement.auctions.flash.tests.base import PrefixedRequestClass
 from openprocurement.auctions.dgf.tests.base import test_auction_data as base_test_auction_data, test_bids, test_financial_bids

openprocurement/auctions/dgf/adapters.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from openprocurement.auctions.core.adapters import AuctionConfigurator
+from openprocurement.auctions.dgf.models import (
+    DGFOtherAssets,
+    DGFFinancialAssets
+)
+from openprocurement.auctions.core.plugins.awarding.v2_1.adapters import (
+    AwardingV2_1ConfiguratorMixin
+)
+
+
+class AuctionDGFOtherAssetsConfigurator(AuctionConfigurator,
+                                        AwardingV2_1ConfiguratorMixin):
+    name = 'Auction Dgf Configurator'
+    model = DGFOtherAssets
+
+
+class AuctionDGFFinancialAssetsConfigurator(AuctionConfigurator,
+                                            AwardingV2_1ConfiguratorMixin):
+    name = 'Auction Dgf Configurator'
+    model = DGFFinancialAssets

openprocurement/auctions/dgf/constants.py

@@ -1,5 +1,6 @@
 from datetime import datetime, timedelta
-from openprocurement.api.models import TZ, ORA_CODES
+from openprocurement.api.constants import TZ
+from openprocurement.api.models.auction_models.models import ORA_CODES
 
 
 def read_json(name):
@@ -25,20 +26,10 @@ def read_json(name):
 #time constants
 DGF_ID_REQUIRED_FROM = datetime(2017, 1, 1, tzinfo=TZ)
 DGF_DECISION_REQUIRED_FROM = datetime(2017, 1, 1, tzinfo=TZ)
-CLASSIFICATION_PRECISELY_FROM = datetime(2017, 7, 19, tzinfo=TZ)
 MINIMAL_EXPOSITION_REQUIRED_FROM = datetime(2017, 11, 17, tzinfo=TZ)
-DGF_ADDRESS_REQUIRED_FROM = datetime(2018, 2, 9, tzinfo=TZ)
 
-#codes
-CAVPS_CODES = read_json('cav_ps.json')
-CPVS_CODES = read_json('cpvs.json')
+DGF_ADDRESS_REQUIRED_FROM = datetime(2020, 2, 8, tzinfo=TZ)
 
 ORA_CODES[0:0] = ["UA-IPN", "UA-FIN"]
 
 NUMBER_OF_BIDS_TO_BE_QUALIFIED = 2
-
-#code units
-CPV_NON_SPECIFIC_LOCATION_UNITS = ('45', '48', '50', '51', '55', '60', '63', '64',
-                                   '65', '66', '71', '72', '73', '75', '76', '77',
-                                   '79', '80', '85', '90', '92', '98')
-CAV_NON_SPECIFIC_LOCATION_UNITS = ('07', '08')

openprocurement/auctions/dgf/includeme.py

@@ -0,0 +1,53 @@
+from pyramid.interfaces import IRequest
+from openprocurement.auctions.dgf.models import (
+    IDgfAuction,
+    DGFOtherAssets,
+    DGFFinancialAssets
+)
+from openprocurement.auctions.dgf.adapters import (
+    AuctionDGFOtherAssetsConfigurator,
+    AuctionDGFFinancialAssetsConfigurator
+)
+from openprocurement.auctions.core.plugins.awarding.v2_1.adapters import (
+    AwardingNextCheckV2_1
+)
+from openprocurement.api.interfaces import (
+    IContentConfigurator,
+    IAwardingNextCheck
+)
+
+
+def includeme_other(config):
+    config.add_auction_procurementMethodType(DGFOtherAssets)
+
+    config.scan('openprocurement.auctions.dgf.views.other')
+
+    # Register adapters
+    config.registry.registerAdapter(
+        AuctionDGFOtherAssetsConfigurator,
+        (IDgfAuction, IRequest),
+        IContentConfigurator
+    )
+    config.registry.registerAdapter(
+        AwardingNextCheckV2_1,
+        (IDgfAuction, ),
+        IAwardingNextCheck
+    )
+
+
+def includeme_financial(config):
+    config.add_auction_procurementMethodType(DGFFinancialAssets)
+
+    config.scan('openprocurement.auctions.dgf.views.financial')
+
+    # Register Adapters
+    config.registry.registerAdapter(
+        AuctionDGFFinancialAssetsConfigurator,
+        (IDgfAuction, IRequest),
+        IContentConfigurator
+    )
+    config.registry.registerAdapter(
+        AwardingNextCheckV2_1,
+        (IDgfAuction, ),
+        IAwardingNextCheck
+)

openprocurement/auctions/dgf/migration.py

@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
 import logging
-from openprocurement.api.models import get_now, TZ
+from openprocurement.api.utils import get_now
 from openprocurement.api.traversal import Root
 from barbecue import chef
 from uuid import uuid4
 
+from openprocurement.auctions.core.plugins.awarding.v2_1.migration import (
+    migrate_awarding_1_0_to_awarding_2_1
+)
 
 LOGGER = logging.getLogger(__name__)
 SCHEMA_VERSION = 1
@@ -23,7 +26,9 @@ def set_db_schema_version(db, version):
 
 
 def migrate_data(registry, destination=None):
-    if registry.settings.get('plugins') and 'auctions.dgf' not in registry.settings['plugins'].split(','): # pragma: no cover
+    existing_plugins = (dgf in registry.settings['plugins'].split(',') for dgf in
+                        ('auctions.dgf.other', 'auctions.dgf.financial'))
+    if registry.settings.get('plugins') and not any(existing_plugins):
         return
     cur_version = get_db_schema_version(registry.db)
     if cur_version == SCHEMA_VERSION:
@@ -49,51 +54,7 @@ def __init__(self, registry):
     docs = []
     for i in results:
         auction = i.doc
-        if auction['procurementMethodType'] not in ['dgfOtherAssets', 'dgfFinancialAssets'] \
-                or auction['status'] not in ['active.qualification', 'active.awarded'] \
-                or 'awards' not in auction:
-            continue
-
-        now = get_now().isoformat()
-        awards = auction["awards"]
-        award = [a for a in awards if a['status'] in ['active', 'pending']][0]
-        award_create_date = award['complaintPeriod']['startDate']
-        award.update({
-            'verificationPeriod': {
-                'startDate': award_create_date,
-                'endDate': award_create_date
-            },
-            'paymentPeriod': {
-                'startDate': award_create_date,
-            },
-            'signingPeriod': {
-                'startDate': award_create_date,
-            }
-        })
-
-        if award['status'] == 'pending':
-            award['status'] = 'pending.payment'
-
-        elif award['status'] == 'active':
-            award['paymentPeriod']['endDate'] = now
-
-        awarded_bids = set([a['bid_id'] for a in awards])
-        sorted_bids = chef(auction['bids'], auction.get('features'), [], True)
-        filtered_bids = [bid for bid in sorted_bids if bid['id'] not in awarded_bids]
-
-        for bid in filtered_bids:
-            award = {
-                'id': uuid4().hex,
-                'bid_id': bid['id'],
-                'status': 'pending.waiting',
-                'date': award_create_date,
-                'value': bid['value'],
-                'suppliers': bid['tenderers'],
-                'complaintPeriod': {
-                    'startDate': award_create_date
-                }
-            }
-            awards.append(award)
+        migrate_awarding_1_0_to_awarding_2_1(auction)
 
         model = registry.auction_procurementMethodTypes.get(auction['procurementMethodType'])
         if model: