move models into common module

openprocurement · Feb 26, 2016 · 4cf3e72 · 4cf3e72
1 parent a12021e
commit 4cf3e72
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/openprocurement/tender/limited/__init__.py b/openprocurement/tender/limited/__init__.py
@@ -1,9 +1,8 @@
-from openprocurement.tender.limited.models import Tender
-from openprocurement.tender.limited.models_negotiation import Tender as NegotiationTender
+from openprocurement.tender.limited.models import ReportingTender, NegotiationTender
 
 
 def includeme(config):
-    config.add_tender_procurementMethodType(Tender)
+    config.add_tender_procurementMethodType(ReportingTender)
     config.scan("openprocurement.tender.limited.views")
 
 

diff --git a/openprocurement/tender/limited/models.py b/openprocurement/tender/limited/models.py
@@ -163,3 +163,18 @@ def import_data(self, raw_data, **kw):
 
         self._data.update(data)
         return self
+
+ReportingTender = Tender
+
+from datetime import timedelta
+from schematics.exceptions import ValidationError
+TENDER_STAND_STILL_DAYS = 1
+TENDER_PERIOD = timedelta(days=TENDER_STAND_STILL_DAYS)
+
+
+@implementer(ITender)
+class Tender(ReportingTender):
+    """ Negotiation """
+    procurementMethodType = StringType(default="negotiation")
+
+NegotiationTender = Tender
diff --git a/openprocurement/tender/limited/models_negotiation.py b/openprocurement/tender/limited/models_negotiation.py
diff --git a/openprocurement/tender/limited/tests/tender.py b/openprocurement/tender/limited/tests/tender.py
@@ -1,19 +1,17 @@
 # -*- coding: utf-8 -*-
 import unittest
-from datetime import timedelta
 
 from openprocurement.api import ROUTE_PREFIX
 from openprocurement.api.models import get_now
-from openprocurement.tender.limited.models import Tender
-from openprocurement.tender.limited.models_negotiation import Tender as NegotiationTender
+from openprocurement.tender.limited.models import NegotiationTender, ReportingTender
 from openprocurement.tender.limited.tests.base import (
     test_tender_data, test_tender_negotiation_data, BaseTenderWebTest)
 
 
 class TenderTest(BaseTenderWebTest):
 
     def test_simple_add_tender(self):
-        u = Tender(test_tender_data)
+        u = ReportingTender(test_tender_data)
         u.tenderID = "UA-X"
 
         assert u.id is None