Fixed a thing and reworked point creation

where/app.py

@@ -5,6 +5,14 @@ from where.model.field_types import FieldType
 
 app = Flask(__name__)
 
+def create_resource(session, model_cls, data, get_function):
+    model = model_cls(**data)
+    session.add(model)
+    session.commit()
+    response = make_response(jsonify(model.as_json()), 201)
+    response.headers['Location'] = url_for(get_function, id=model.id)
+    return response
+
 
 @app.route('/')
 def index():
@@ -122,23 +130,11 @@ def get_point(session, id):
 @app.route('/add-point', methods=['POST'])
 @with_session
 def add_point(session):
-    allowed_params = {'name', 'lat', 'lon', 'attributes', 'category_id', 'parent_id'}
     data = request.get_json()
-    data = {key: val for key, val in data.items() if key in allowed_params}
-
-    # TODO: For some reason point.category is NULL when we do validation, even though the category ID is present
-    #       this is causing an exception whenever a non-null attributes object is passed
-    point = Point(category_id=data.pop('category_id'))
-    for key, val in data.items():
-        setattr(point, key, val)
-
-    session.add(point)
-    session.commit()
-
-    response = make_response(jsonify(point.as_json()), 201)
-    response.headers['Location'] = url_for('get_point', id=point.id)
-    return response
+    data['category'] = session.query(Category).get(data['category'])
+    data['parent_id'] = data.pop('parent', None)
 
+    return create_resource(session, Point, data, 'get_point')
 
 @app.route('/point', methods=['GET'])
 @with_session

where/model/__init__.py

@@ -61,12 +61,20 @@ class Point(Base):
     parent = relationship('Point', remote_side=[id])
     children = relationship('Point')
 
+    def __init__(self, **kwargs):
+        # Need to load category first or else attribute validation will fail
+        if 'category' in kwargs:
+            self.category = kwargs.pop('category')
+        
+        super(Point, self).__init__(**kwargs)
+
     @validates('attributes')
     def validate_data(self, _, data):
         if data is None:
             return
 
         fields = self.category.fields
+        print(fields[0].slug)
 
         for key in data:
             # Find Field object that corresponds to this key