Fix examples

examples/luggage_models.py

@@ -1,4 +1,5 @@
 from src import serializable, schema, fields, domain_model, view_model
+from src.firestore_object import FirestoreObjectClsFactory
 
 Schema = schema.Schema
 
@@ -18,23 +19,22 @@ class LuggageCollectionSchema(Schema):
     total_weight = fields.Integer(dump_to="total_weight", dump_only=True)
 
 
-class LuggageItem(domain_model.DomainModel):
+class LuggageItemBase(domain_model.DomainModel):
 
-    _schema_cls = LuggageItemSchema
+    _collection_name = "LuggageItem"
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.luggage_type = str()
-        self.weight_in_lbs = int()
-        self.owner_id = str()
 
+LuggageItem = FirestoreObjectClsFactory.create(
+    name="LuggageItem",
+    schema=LuggageItemSchema,
+    base=LuggageItemBase
+)
 
-class Luggages(view_model.ViewModel):
+
+class LuggagesBase(view_model.ViewModel):
     """ Keeps track of luggage amount
     """
 
-    _schema_cls = LuggageCollectionSchema
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._luggage_d = dict()
@@ -90,3 +90,8 @@ def _get_weight(self) -> int:
         return weight
 
 
+Luggages = FirestoreObjectClsFactory.create(
+    name="Luggages",
+    schema=LuggageCollectionSchema,
+    base=LuggagesBase
+)

examples/view_example.py

@@ -9,6 +9,7 @@
 from src.view import GenericView, document_as_view, default_mapper
 from src import fields
 from src.schema import Schema
+from src.firestore_object import FirestoreObjectClsFactory
 from src.view_model import ViewModel
 from google.cloud import firestore
 from functools import partial
@@ -35,9 +36,11 @@ class Palette(Schema):
         palette_name = fields.Str()
         colors = fields.Nested(Color, many=True)
 
-    class PaletteViewModel(ViewModel):
-        _schema_cls = Palette
-
+    PaletteViewModel = FirestoreObjectClsFactory.create(
+        name="PaletteViewModel",
+        schema=Palette,
+        base=ViewModel
+    )
 
     description = "A list of colors (may be filtered by palette)"
 
@@ -73,7 +76,7 @@ class PaletteViewModel(ViewModel):
     obj = document_as_view(
                         view_model_cls=PaletteViewModel,
                         app=app,
-                        endpoint="palettes/<doc_id:string>",
+                        endpoint="/palettes/<string:doc_id>",
                         mapper=palette_doc_mapper)
 
     app.run(debug=True)

src/fields.py

@@ -87,4 +87,11 @@ def default_value(self):
         return str()
 
 
+class Nested(fields.Nested, Field):
+
+    @property
+    def default_value(self):
+        return None
+
+
 Str = String

src/serializable.py

@@ -187,7 +187,8 @@ def to_dict(self):
 def initializer(obj, d):
     for key, val in d.items():
         assert isinstance(val, fields.Field)
-        if not hasattr(obj, key):
+        # if not hasattr(obj, key):
+        if key not in dir(obj):
             setattr(obj, key, val.default_value)