Fixed deliveryLocation

openprocurement · Feb 9, 2015 · d3ee512 · d3ee512
1 parent 2673c0a
commit d3ee512
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/src/openprocurement/api/migration.py b/src/openprocurement/api/migration.py
@@ -5,7 +5,7 @@
 
 
 LOGGER = logging.getLogger(__name__)
-SCHEMA_VERSION = 14
+SCHEMA_VERSION = 15
 SCHEMA_DOC = 'openprocurement_schema'
 
 
@@ -500,3 +500,17 @@ def from13to14(db):
         if changed:
             doc['dateModified'] = get_now().isoformat()
             db.save(doc)
+
+
+def from14to15(db):
+    results = db.view('tenders/all', include_docs=True)
+    for i in results:
+        doc = i.doc
+        changed = False
+        for item in doc["items"]:
+            if 'deliveryLocation' in item and 'longitudee' in item['deliveryLocation']:
+                changed = True
+                item['deliveryLocation']['longitude'] = item['deliveryLocation'].pop('longitudee')
+        if changed:
+            doc['dateModified'] = get_now().isoformat()
+            db.save(doc)
diff --git a/src/openprocurement/api/models.py b/src/openprocurement/api/models.py
@@ -144,7 +144,7 @@ class Options:
         serialize_when_none = False
 
     latitude = BaseType(required=True)
-    longitudee = BaseType(required=True)
+    longitude = BaseType(required=True)
     elevation = BaseType()
 
 

diff --git a/src/openprocurement/api/tests/migration.py b/src/openprocurement/api/tests/migration.py
@@ -508,6 +508,23 @@ def test_migrate_from13to14(self):
         self.assertEqual(u"CPV", migrated_item['items'][0]['classification']["scheme"])
         self.assertEqual(u"ДКПП", migrated_item['items'][0]['additionalClassifications'][0]["scheme"])
 
+    def test_migrate_from14to15(self):
+        set_db_schema_version(self.db, 14)
+        data = {
+            'doc_type': 'Tender',
+            "items": [{
+                "deliveryLocation": {
+                    'latitude': 49,
+                    'longitudee': 24
+                }
+            }]
+        }
+        _id, _rev = self.db.save(data)
+        item = self.db.get(_id)
+        migrate_data(self.db, 15)
+        migrated_item = self.db.get(_id)
+        self.assertEqual(item["items"][0]["deliveryLocation"]["longitudee"], migrated_item["items"][0]["deliveryLocation"]["longitude"])
+
 
 def suite():
     suite = unittest.TestSuite()