Fixes an issue where the new id would not serialize

MITSustainableDesignLab · Sep 9, 2020 · 140d8cc · 140d8cc
1 parent 1a15294
commit 140d8cc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 33 deletions.
diff --git a/tests/test_mongodb_schema.py b/tests/test_mongodb_schema.py
@@ -1,6 +1,5 @@
 import json
 
-import geojson
 import pytest
 import shapely.geometry
 from archetypal import UmiTemplateLibrary
@@ -72,6 +71,14 @@ def test_import_library(db, imported):
         assert bldg
 
 
+def test_serialize_db(imported):
+    bldgs = BuildingTemplate.objects().all()
+    templates = []
+    for bldg in bldgs:
+        templates.append(bldg.to_template())
+    lib = UmiTemplateLibrary(BuildingTemplates=templates).to_json()
+
+
 def test_serialize_templatelist(bldg, window, struct, core):
     """From a list of :class:~`umitemplatedb.mongodb_schema.BuildingTemplate`
     create an :class:~`archetypal.umi_template.UmiTemplateLibrary`"""
@@ -82,7 +89,7 @@ def test_serialize_templatelist(bldg, window, struct, core):
         templates.append(bldg.to_template())
 
     lib = UmiTemplateLibrary(BuildingTemplates=templates)
-    lib.to_json()
+    print(lib.to_json())
 
 
 @pytest.fixture(scope="session")
@@ -95,6 +102,8 @@ def db():
 
 @pytest.fixture(scope="session")
 def imported(db):
+    UmiBase.drop_collection()
+
     path = "tests/test_templates/BostonTemplateLibrary.json"
     import_umitemplate(path)
 

diff --git a/umitemplatedb/core.py b/umitemplatedb/core.py
@@ -4,9 +4,7 @@
 from mongoengine import *
 
 from umitemplatedb import mongodb_schema
-from umitemplatedb.mongodb_schema import (
-    BuildingTemplate,
-)
+from umitemplatedb.mongodb_schema import BuildingTemplate
 
 
 def import_umitemplate(filename, **kwargs):
@@ -24,7 +22,7 @@ def import_umitemplate(filename, **kwargs):
     lib = UmiTemplateLibrary.read_file(filename)
 
     # Loop over building templates
-    for bldgtemplate in lib.__dict__["BuildingTemplates"]:
+    for bldgtemplate in lib.BuildingTemplates:
 
         def recursive(umibase, **metaattributes):
             """recursively create db objects from UmiBase objects. Start with
@@ -63,20 +61,12 @@ def recursive(umibase, **metaattributes):
             if isinstance(class_instance, EmbeddedDocument):
                 return class_instance
             else:
-                class_instance = class_(
-                    **instance_attr,
-                    key=hash(
-                        (instance_attr.get("Name", id(umibase).__str__()),
-                        type(umibase).__name__)
-                    )
-                )
+                class_instance = class_(**instance_attr,)
                 if isinstance(class_instance, BuildingTemplate):
                     for key, value in metaattributes.items():
                         class_instance[key] = value
                 class_instance.save()
                 return class_instance
 
         # loop starts here
-        bldg = recursive(
-            bldgtemplate, **kwargs
-        )
+        recursive(bldgtemplate, **kwargs)
diff --git a/umitemplatedb/mongodb_schema.py b/umitemplatedb/mongodb_schema.py
@@ -6,9 +6,11 @@
 from mongoengine import *
 
 
-class PrimaryKey(IntField):
-    def __init__(self, field=None, *args, **kwargs):
-        super().__init__(field=field, *args, **kwargs)
+class CompoundKey(EmbeddedDocument):
+    name = StringField(required=True)
+    clsname = StringField(required=True)
+
+    meta = {"allow_inheritance": True, "strict": False}
 
 
 class UmiBase(Document):
@@ -22,16 +24,19 @@ class UmiBase(Document):
 
     """
 
+    key = StringField(primary_key=True)
+
     Name = StringField(required=True)
-    key = PrimaryKey(
-        primary_key=True, default=hash((str(Name), Document.__name__))
-    )
     Comments = StringField(null=True)
     DataSource = StringField(null=True)
     Category = StringField(default="Uncategorized")
 
     meta = {"allow_inheritance": True}
 
+    def save(self, *args, **kwargs):
+        self.key = ", ".join([type(self).__name__, self.Name])
+        return super(UmiBase, self).save(*args, **kwargs)
+
 
 class Material(UmiBase):
     # MaterialBase
@@ -277,15 +282,6 @@ class WindowSetting(UmiBase):
 }
 
 
-def validate_poly(val):
-    if not val:
-        raise ValidationError("value can not be empty")
-
-
-def update_modified(sender, document):
-    document.DateModified = datetime.utcnow()
-
-
 class BuildingTemplate(UmiBase):
     """Top most object in Umi Template Structure"""
 
@@ -375,8 +371,9 @@ def geo_countries(self):
             from datapackage import Package
 
             try:
-                package = Package("https://datahub.io/core/geo-countries/datapackage"
-                                      ".json")
+                package = Package(
+                    "https://datahub.io/core/geo-countries/datapackage" ".json"
+                )
             except:
                 self._geo_countries = []
             else: