refactor: simplify schema names and remove provider id columns

app/repositories/companies_repo.py

@@ -21,8 +21,7 @@ class CompaniesRepository:
             pattern = f"%{keyword}%"
             cond = or_(
                 Company.company_key.ilike(pattern),
-                Company.display_name.ilike(pattern),
-                Company.legal_name.ilike(pattern),
+                Company.name.ilike(pattern),
             )
             stmt = stmt.where(cond)
             count_stmt = count_stmt.where(cond)
@@ -34,15 +33,13 @@ class CompaniesRepository:
         self,
         *,
         company_key: str,
-        display_name: str,
-        legal_name: str | None,
+        name: str,
         provider_group_id: str | None = None,
         status: str = "active",
     ) -> Company:
         item = Company(
             company_key=company_key,
-            display_name=display_name,
-            legal_name=legal_name,
+            name=name,
             provider_group_id=provider_group_id,
             status=status,
         )
@@ -55,15 +52,12 @@ class CompaniesRepository:
         self,
         item: Company,
         *,
-        display_name: str | None = None,
-        legal_name: str | None = None,
+        name: str | None = None,
         provider_group_id: str | None = None,
         status: str | None = None,
     ) -> Company:
-        if display_name is not None:
-            item.display_name = display_name
-        if legal_name is not None:
-            item.legal_name = legal_name
+        if name is not None:
+            item.name = name
         if provider_group_id is not None:
             item.provider_group_id = provider_group_id
         if status is not None:

app/repositories/roles_repo.py

@@ -30,7 +30,6 @@ class RolesRepository:
             cond = or_(
                 Role.role_key.ilike(pattern),
                 Role.name.ilike(pattern),
-                Role.provider_role_name.ilike(pattern),
                 Role.description.ilike(pattern),
             )
             stmt = stmt.where(cond)
@@ -52,7 +51,6 @@ class RolesRepository:
         system_id: str,
         name: str,
         description: str | None,
-        provider_role_name: str,
         status: str = "active",
     ) -> Role:
         item = Role(
@@ -60,7 +58,6 @@ class RolesRepository:
             system_id=system_id,
             name=name,
             description=description,
-            provider_role_name=provider_role_name,
             status=status,
         )
         self.db.add(item)
@@ -75,7 +72,6 @@ class RolesRepository:
         system_id: str | None = None,
         name: str | None = None,
         description: str | None = None,
-        provider_role_name: str | None = None,
         status: str | None = None,
     ) -> Role:
         if system_id is not None:
@@ -84,8 +80,6 @@ class RolesRepository:
             item.name = name
         if description is not None:
             item.description = description
-        if provider_role_name is not None:
-            item.provider_role_name = provider_role_name
         if status is not None:
             item.status = status
         self.db.commit()

app/repositories/systems_repo.py

@@ -19,7 +19,7 @@ class SystemsRepository:
         count_stmt = select(func.count()).select_from(System)
         if keyword:
             pattern = f"%{keyword}%"
-            cond = or_(System.system_key.ilike(pattern), System.name.ilike(pattern), System.provider_client_id.ilike(pattern))
+            cond = or_(System.system_key.ilike(pattern), System.name.ilike(pattern))
             stmt = stmt.where(cond)
             count_stmt = count_stmt.where(cond)
         if status:
@@ -29,8 +29,8 @@ class SystemsRepository:
         stmt = stmt.order_by(System.created_at.desc()).limit(limit).offset(offset)
         return list(self.db.scalars(stmt).all()), int(self.db.scalar(count_stmt) or 0)
 
-    def create(self, *, system_key: str, name: str, provider_client_id: str, status: str = "active") -> System:
-        item = System(system_key=system_key, name=name, provider_client_id=provider_client_id, status=status)
+    def create(self, *, system_key: str, name: str, status: str = "active") -> System:
+        item = System(system_key=system_key, name=name, status=status)
         self.db.add(item)
         self.db.commit()
         self.db.refresh(item)
@@ -41,13 +41,10 @@ class SystemsRepository:
         item: System,
         *,
         name: str | None = None,
-        provider_client_id: str | None = None,
         status: str | None = None,
     ) -> System:
         if name is not None:
             item.name = name
-        if provider_client_id is not None:
-            item.provider_client_id = provider_client_id
         if status is not None:
             item.status = status
         self.db.commit()

app/repositories/user_sites_repo.py

@@ -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())