Added version history to api keys. This needed a bit of change

to create history to handle foreign keys better. There may yet
be a better way of doing this that I have not found yet in sqlalchemy
docs.

app/dao/api_key_dao.py

@@ -1,19 +1,30 @@
+import uuid
 from flask import current_app
 from itsdangerous import URLSafeSerializer
 
 from app import db
 from app.models import ApiKey
 
+from app.dao.dao_utils import (
+    transactional,
+    versioned
+)
 
+
+@transactional
+@versioned
 def save_model_api_key(api_key, update_dict={}):
     if update_dict:
-        if update_dict['id']:
+        if update_dict.get('id'):
             del update_dict['id']
-        db.session.query(ApiKey).filter_by(id=api_key.id).update(update_dict)
+        for key, value in update_dict.items():
+            setattr(api_key, key, update_dict[key])
+        db.session.add(api_key)
     else:
+        if not api_key.id:
+            api_key.id = uuid.uuid4()  # must be set now so version history model can use same id
         api_key.secret = _generate_secret()
         db.session.add(api_key)
-    db.session.commit()
 
 
 def get_model_api_keys(service_id, id=None):

app/dao/dao_utils.py

@@ -1,22 +1,6 @@
-import datetime
-
+import itertools
 from functools import wraps
-
-
-def create_history(obj):
-    history_mapper = obj.__history_mapper__
-    history_model = history_mapper.class_
-    history = history_model()
-    if obj.version:
-        obj.version += 1
-    else:
-        obj.version = 1
-        obj.created_at = datetime.datetime.now()
-    for prop in history_mapper.iterate_properties:
-        if obj.__mapper__.get_property(prop.key):
-            setattr(history, prop.key, getattr(obj, prop.key))
-    history.created_by_id = obj.created_by.id
-    return history
+from app.history_meta import versioned_objects, create_history
 
 
 def transactional(func):
@@ -37,12 +21,10 @@ def transactional(func):
 def versioned(func):
     @wraps(func)
     def record_version(*args, **kwargs):
-        import itertools
         from app import db
-        from app.history_meta import versioned_objects
-        from app.dao.dao_utils import create_history
         func(*args, **kwargs)
-        for obj in versioned_objects(itertools.chain(db.session.new, db.session.dirty)):
-            history = create_history(obj)
-            db.session.add(history)
+        history_objects = [create_history(obj) for obj in
+                           versioned_objects(itertools.chain(db.session.new, db.session.dirty))]
+        for h_obj in history_objects:
+            db.session.add(h_obj)
     return record_version