refactor: simplify schema names and remove provider id columns
This commit is contained in:
@@ -20,7 +20,7 @@ class UserSitesRepository:
|
||||
.join(Site, Site.id == UserSite.site_id)
|
||||
.join(Company, Company.id == Site.company_id)
|
||||
.where(UserSite.user_id == user_id)
|
||||
.order_by(Company.display_name.asc(), Site.display_name.asc())
|
||||
.order_by(Company.name.asc(), Site.display_name.asc())
|
||||
)
|
||||
return list(self.db.execute(stmt).all())
|
||||
|
||||
@@ -49,6 +49,6 @@ class UserSitesRepository:
|
||||
.join(Role, Role.id == SiteRole.role_id)
|
||||
.join(System, System.id == Role.system_id)
|
||||
.where(UserSite.user_id == user_id)
|
||||
.order_by(Company.display_name.asc(), Site.display_name.asc(), System.name.asc(), Role.name.asc())
|
||||
.order_by(Company.name.asc(), Site.display_name.asc(), System.name.asc(), Role.name.asc())
|
||||
)
|
||||
return list(self.db.execute(stmt).all())
|
||||
|
||||
Reference in New Issue
Block a user