diff --git a/atst/domain/portfolio_roles.py b/atst/domain/portfolio_roles.py index 9691f242..5c9cccbc 100644 --- a/atst/domain/portfolio_roles.py +++ b/atst/domain/portfolio_roles.py @@ -1,22 +1,13 @@ from sqlalchemy.orm.exc import NoResultFound from atst.database import db -from atst.models.portfolio_role import ( - PortfolioRole, - Status as PortfolioRoleStatus, - MEMBER_STATUSES, -) +from atst.models.portfolio_role import PortfolioRole, Status as PortfolioRoleStatus from atst.models.user import User from .permission_sets import PermissionSets from .exceptions import NotFoundError -MEMBER_STATUS_CHOICES = [ - dict(name=key, display_name=value) for key, value in MEMBER_STATUSES.items() -] - - class PortfolioRoles(object): @classmethod def get(cls, portfolio_id, user_id): @@ -39,34 +30,6 @@ class PortfolioRoles(object): except NoResultFound: raise NotFoundError("portfolio_role") - @classmethod - def _get_active_portfolio_role(cls, portfolio_id, user_id): - try: - return ( - db.session.query(PortfolioRole) - .join(User) - .filter(User.id == user_id, PortfolioRole.portfolio_id == portfolio_id) - .filter(PortfolioRole.status == PortfolioRoleStatus.ACTIVE) - .one() - ) - except NoResultFound: - return None - - @classmethod - def _get_portfolio_role(cls, user, portfolio_id): - try: - existing_portfolio_role = ( - db.session.query(PortfolioRole) - .filter( - PortfolioRole.user == user, - PortfolioRole.portfolio_id == portfolio_id, - ) - .one() - ) - return existing_portfolio_role - except NoResultFound: - raise NotFoundError("portfolio role") - @classmethod def add(cls, user, portfolio_id, permission_sets=None): new_portfolio_role = None