rename role -> permission_set everywhere

atst/models/__init__.py

@@ -3,7 +3,7 @@ from sqlalchemy.ext.declarative import declarative_base
 Base = declarative_base()
 
 from .permissions import Permissions
-from .role import Role
+from .permission_set import PermissionSet
 from .user import User
 from .portfolio_role import PortfolioRole
 from .portfolio import Portfolio

atst/models/permission_set.py

@@ -5,8 +5,8 @@ from sqlalchemy.orm.attributes import flag_modified
 from atst.models import Base, types, mixins
 
 
-class Role(Base, mixins.TimestampsMixin):
-    __tablename__ = "roles"
+class PermissionSet(Base, mixins.TimestampsMixin):
+    __tablename__ = "permission_sets"
 
     id = types.Id()
     name = Column(String, index=True, unique=True, nullable=False)
@@ -27,6 +27,6 @@ class Role(Base, mixins.TimestampsMixin):
         flag_modified(self, "permissions")
 
     def __repr__(self):
-        return "<Role(name='{}', description='{}', permissions='{}', id='{}')>".format(
+        return "<PermissionSet(name='{}', description='{}', permissions='{}', id='{}')>".format(
             self.name, self.description, self.permissions, self.id
         )

atst/models/portfolio_role.py

@@ -30,10 +30,10 @@ class Status(Enum):
 
 
 portfolio_roles_roles = Table(
-    "portfolio_roles_roles",
+    "portfolio_roles_permission_sets",
     Base.metadata,
     Column("portfolio_role_id", UUID(as_uuid=True), ForeignKey("portfolio_roles.id")),
-    Column("role_id", UUID(as_uuid=True), ForeignKey("roles.id")),
+    Column("permission_set_id", UUID(as_uuid=True), ForeignKey("permission_sets.id")),
 )
 
 
@@ -52,7 +52,7 @@ class PortfolioRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
 
     status = Column(SQLAEnum(Status, native_enum=False), default=Status.PENDING)
 
-    permission_sets = relationship("Role", secondary=portfolio_roles_roles)
+    permission_sets = relationship("PermissionSet", secondary=portfolio_roles_roles)
 
     @property
     def permissions(self):

atst/models/user.py

@@ -11,9 +11,9 @@ class User(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
 
     id = types.Id()
     username = Column(String)
-    atat_role_id = Column(UUID(as_uuid=True), ForeignKey("roles.id"))
+    atat_role_id = Column(UUID(as_uuid=True), ForeignKey("permission_sets.id"))
 
-    atat_role = relationship("Role")
+    atat_role = relationship("PermissionSet")
     portfolio_roles = relationship("PortfolioRole", backref="user")
 
     email = Column(String, unique=True)