pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update function name to better reflect what it does

Browse Source
This commit is contained in:
leigh-mil 2019-12-18 10:54:00 -05:00
parent d300ccf31b
commit f543602076
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
atst/domain/applications.py
View File

@ -11,7 +11,7 @@ from atst.models import (
ApplicationRoleStatus, ApplicationRoleStatus,
EnvironmentRole, EnvironmentRole,
) )
from atst.utils import first_or_none, update_or_raise_already_exists_error from atst.utils import first_or_none, commit_or_raise_already_exists_error
class Applications(BaseDomainClass): class Applications(BaseDomainClass):
@ -28,7 +28,7 @@ class Applications(BaseDomainClass):
if environment_names: if environment_names:
Environments.create_many(user, application, environment_names) Environments.create_many(user, application, environment_names)
update_or_raise_already_exists_error(message="application") commit_or_raise_already_exists_error(message="application")
return application return application
@classmethod @classmethod
@ -55,7 +55,7 @@ class Applications(BaseDomainClass):
) )
db.session.add(application) db.session.add(application)
update_or_raise_already_exists_error(message="application") commit_or_raise_already_exists_error(message="application")
return application return application
@classmethod @classmethod

6
atst/domain/environments.py
View File

@ -12,7 +12,7 @@ from atst.models import (
CLIN, CLIN,
) )
from atst.domain.environment_roles import EnvironmentRoles from atst.domain.environment_roles import EnvironmentRoles
from atst.utils import update_or_raise_already_exists_error from atst.utils import commit_or_raise_already_exists_error
from .exceptions import NotFoundError, DisabledError from .exceptions import NotFoundError, DisabledError
@ -22,7 +22,7 @@ class Environments(object):
def create(cls, user, application, name): def create(cls, user, application, name):
environment = Environment(application=application, name=name, creator=user) environment = Environment(application=application, name=name, creator=user)
db.session.add(environment) db.session.add(environment)
update_or_raise_already_exists_error(message="environment") commit_or_raise_already_exists_error(message="environment")
return environment return environment
@classmethod @classmethod
@ -40,7 +40,7 @@ class Environments(object):
if name is not None: if name is not None:
environment.name = name environment.name = name
db.session.add(environment) db.session.add(environment)
update_or_raise_already_exists_error(message="environment") commit_or_raise_already_exists_error(message="environment")
return environment return environment
@classmethod @classmethod

6
atst/domain/task_orders.py
View File

@ -4,7 +4,7 @@ from atst.database import db
from atst.models.clin import CLIN from atst.models.clin import CLIN
from atst.models.task_order import TaskOrder, SORT_ORDERING from atst.models.task_order import TaskOrder, SORT_ORDERING
from . import BaseDomainClass from . import BaseDomainClass
from atst.utils import update_or_raise_already_exists_error from atst.utils import commit_or_raise_already_exists_error
class TaskOrders(BaseDomainClass): class TaskOrders(BaseDomainClass):
@ -15,7 +15,7 @@ class TaskOrders(BaseDomainClass):
def create(cls, portfolio_id, number, clins, pdf): def create(cls, portfolio_id, number, clins, pdf):
task_order = TaskOrder(portfolio_id=portfolio_id, number=number, pdf=pdf) task_order = TaskOrder(portfolio_id=portfolio_id, number=number, pdf=pdf)
db.session.add(task_order) db.session.add(task_order)
update_or_raise_already_exists_error(message="task_order") commit_or_raise_already_exists_error(message="task_order")
TaskOrders.create_clins(task_order.id, clins) TaskOrders.create_clins(task_order.id, clins)
return task_order return task_order
@ -34,7 +34,7 @@ class TaskOrders(BaseDomainClass):
task_order.number = number task_order.number = number
db.session.add(task_order) db.session.add(task_order)
update_or_raise_already_exists_error(message="task_order") commit_or_raise_already_exists_error(message="task_order")
return task_order return task_order
@classmethod @classmethod

2
atst/utils/__init__.py
View File

@ -30,7 +30,7 @@ def pick(keys, dct):
return {k: v for (k, v) in dct.items() if k in _keys} return {k: v for (k, v) in dct.items() if k in _keys}
def update_or_raise_already_exists_error(message): def commit_or_raise_already_exists_error(message):
try: try:
db.session.commit() db.session.commit()
except IntegrityError: except IntegrityError: