diff options
Diffstat (limited to 'api/database')
-rw-r--r-- | api/database/handler.py | 30 | ||||
-rw-r--r-- | api/database/v1/__init__.py | 0 | ||||
-rw-r--r-- | api/database/v1/handlers.py (renamed from api/database/handlers.py) | 33 | ||||
-rw-r--r-- | api/database/v1/models.py (renamed from api/database/models.py) | 2 |
4 files changed, 34 insertions, 31 deletions
diff --git a/api/database/handler.py b/api/database/handler.py deleted file mode 100644 index f6a22578f..000000000 --- a/api/database/handler.py +++ /dev/null @@ -1,30 +0,0 @@ -# ############################################################################ -# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -# ############################################################################ -from api.database import db_session -from api.database.models import AsyncTasks - - -class AsyncTaskHandler(object): - def insert(self, kwargs): - task = AsyncTasks(**kwargs) - db_session.add(task) - db_session.commit() - return task - - def update_status(self, task, status): - task.status = status - db_session.commit() - - def update_error(self, task, error): - task.error = error - db_session.commit() - - def get_task_by_taskid(self, task_id): - task = AsyncTasks.query.filter_by(task_id=task_id).first() - return task diff --git a/api/database/v1/__init__.py b/api/database/v1/__init__.py new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/api/database/v1/__init__.py diff --git a/api/database/handlers.py b/api/database/v1/handlers.py index 42979b529..f7c448cda 100644 --- a/api/database/handlers.py +++ b/api/database/v1/handlers.py @@ -7,7 +7,8 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## from api.database import db_session -from api.database.models import Tasks +from api.database.v1.models import Tasks +from api.database.v1.models import AsyncTasks class TasksHandler(object): @@ -28,4 +29,34 @@ class TasksHandler(object): def get_task_by_taskid(self, task_id): task = Tasks.query.filter_by(task_id=task_id).first() + if not task: + raise ValueError + + return task + + def update_attr(self, task_id, attr): + task = self.get_task_by_taskid(task_id) + + for k, v in attr.items(): + setattr(task, k, v) + db_session.commit() + + +class AsyncTaskHandler(object): + def insert(self, kwargs): + task = AsyncTasks(**kwargs) + db_session.add(task) + db_session.commit() + return task + + def update_status(self, task, status): + task.status = status + db_session.commit() + + def update_error(self, task, error): + task.error = error + db_session.commit() + + def get_task_by_taskid(self, task_id): + task = AsyncTasks.query.filter_by(task_id=task_id).first() return task diff --git a/api/database/models.py b/api/database/v1/models.py index 2270de96b..213e77f6e 100644 --- a/api/database/models.py +++ b/api/database/v1/models.py @@ -10,6 +10,7 @@ from __future__ import absolute_import from sqlalchemy import Column from sqlalchemy import Integer from sqlalchemy import String +from sqlalchemy import Text from api.database import Base @@ -20,6 +21,7 @@ class Tasks(Base): task_id = Column(String(30)) status = Column(Integer) error = Column(String(120)) + result = Column(Text) details = Column(String(120)) def __repr__(self): |