From 4010ed61ce10582e6fb949ffdfd95e88a774eeca Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Thu, 28 Jan 2016 11:42:13 +0000 Subject: [PATCH] Moved creating queue name to model --- app/models.py | 4 +++- app/service/rest.py | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models.py b/app/models.py index e081653cf..83f80bbda 100644 --- a/app/models.py +++ b/app/models.py @@ -1,3 +1,5 @@ +import uuid + from sqlalchemy import UniqueConstraint from . import db @@ -84,7 +86,7 @@ class Service(db.Model): secondary=user_to_service, backref=db.backref('user_to_service', lazy='dynamic')) restricted = db.Column(db.Boolean, index=False, unique=False, nullable=False) - queue_name = db.Column(UUID(as_uuid=True)) + queue_name = db.Column(UUID(as_uuid=True), default=uuid.uuid4) class ApiKey(db.Model): diff --git a/app/service/rest.py b/app/service/rest.py index 81cfc8e4d..c114b5555 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -28,9 +28,6 @@ def create_service(): # I believe service is already added to the session but just needs a # db.session.commit try: - # add service name to here or in dao? - import uuid - service.queue_name = uuid.uuid4() save_model_service(service) except DAOException as e: return jsonify(result="error", message=str(e)), 400