rename role -> permission_set everywhere

atst/domain/permission_sets.py

@@ -1,7 +1,7 @@
 from sqlalchemy.orm.exc import NoResultFound
 
 from atst.database import db
-from atst.models import Role, Permissions
+from atst.models import PermissionSet, Permissions
 from .exceptions import NotFoundError
 
 
@@ -265,16 +265,16 @@ PORTFOLIO_PERMISSION_SETS = (
 )
 
 
-class Roles(object):
+class PermissionSets(object):
     @classmethod
-    def get(cls, role_name):
+    def get(cls, perms_set_name):
         try:
-            role = db.session.query(Role).filter_by(name=role_name).one()
+            role = db.session.query(PermissionSet).filter_by(name=perms_set_name).one()
         except NoResultFound:
-            raise NotFoundError("role")
+            raise NotFoundError("permission_set")
 
         return role
 
     @classmethod
     def get_all(cls):
-        return db.session.query(Role).all()
+        return db.session.query(PermissionSet).all()

atst/domain/portfolio_roles.py

@@ -8,7 +8,7 @@ from atst.models.portfolio_role import (
 )
 from atst.models.user import User
 
-from .roles import Roles
+from .permission_sets import PermissionSets
 from .exceptions import NotFoundError
 
 
@@ -108,7 +108,9 @@ class PortfolioRoles(object):
         perms_set_names = PortfolioRoles._DEFAULT_PORTFOLIO_PERMS_SETS.union(
             set(set_names)
         )
-        return [Roles.get(perms_set_name) for perms_set_name in perms_set_names]
+        return [
+            PermissionSets.get(perms_set_name) for perms_set_name in perms_set_names
+        ]
 
     @classmethod
     def update(cls, portfolio_role, set_names):

atst/domain/portfolios/portfolios.py

@@ -1,4 +1,4 @@
-from atst.domain.roles import Roles, PORTFOLIO_PERMISSION_SETS
+from atst.domain.permission_sets import PermissionSets, PORTFOLIO_PERMISSION_SETS
 from atst.domain.authz import Authorization
 from atst.models.permissions import Permissions
 from atst.domain.users import Users
@@ -20,7 +20,9 @@ class Portfolios(object):
         portfolio = PortfoliosQuery.create(
             name=name, defense_component=defense_component
         )
-        perms_sets = [Roles.get(prms["name"]) for prms in PORTFOLIO_PERMISSION_SETS]
+        perms_sets = [
+            PermissionSets.get(prms["name"]) for prms in PORTFOLIO_PERMISSION_SETS
+        ]
         Portfolios._create_portfolio_role(
             user,
             portfolio,

atst/domain/users.py

@@ -4,7 +4,7 @@ from sqlalchemy.exc import IntegrityError
 from atst.database import db
 from atst.models import User
 
-from .roles import Roles
+from .permission_sets import PermissionSets
 from .exceptions import NotFoundError, AlreadyExistsError, UnauthorizedError
 
 
@@ -29,7 +29,7 @@ class Users(object):
 
     @classmethod
     def create(cls, dod_id, atat_role_name=None, **kwargs):
-        atat_role = Roles.get(atat_role_name)
+        atat_role = PermissionSets.get(atat_role_name)
 
         try:
             user = User(dod_id=dod_id, atat_role=atat_role, **kwargs)
@@ -56,7 +56,7 @@ class Users(object):
     def update_role(cls, user_id, atat_role_name):
 
         user = Users.get(user_id)
-        atat_role = Roles.get(atat_role_name)
+        atat_role = PermissionSets.get(atat_role_name)
         user.atat_role = atat_role
 
         db.session.add(user)