f4ead89956
## Summary Follow-up to #20953. Migrates 23 of the 30 entities that were left in `WORKSPACE_SCOPED_EXEMPTIONS` last time, so the lint rule's workspaceId-enforcement default now covers most of the core/metadata schema. ### Migrated (23 entities, 88 files, 22 commits) | Family | Entities | |---|---| | Trivial caches | `NavigationMenuItem`, `Skill`, `DataSource`, `Webhook`, `CommandMenuItem`, `IndexMetadata` | | Views | `View`, `ViewField`, `ViewFieldGroup`, `ViewFilter`, `ViewFilterGroup`, `ViewGroup`, `ViewSort` | | Layouts | `PageLayout`, `PageLayoutTab`, `PageLayoutWidget` | | Roles & permissions | `Role`, `RoleTarget`, `PermissionFlag`, `ObjectPermission`, `FieldPermission`, `RowLevelPermissionPredicate`, `RowLevelPermissionPredicateGroup` | For each entity: swap `@InjectRepository(X)` → `@InjectWorkspaceScopedRepository(X)` (and the field type → `WorkspaceScopedRepository<X>`); rewrite every call site to pass `workspaceId` as the first arg (stripped from `where`/criteria — the wrapper throws if you include it now); register `provideWorkspaceScopedRepository(X)` in every owning NestJS module; update affected spec providers to `getWorkspaceScopedRepositoryToken(X)`. ### Rule update - `ApplicationRegistrationVariableEntity` was misclassified — moved to `STRUCTURAL_EXEMPTIONS` (no `workspaceId` column; it's keyed on `applicationRegistrationId` at the instance level). - 22 of the 23 migrated entities removed from `WORKSPACE_SCOPED_EXEMPTIONS` entirely (zero remaining raw `@InjectRepository` sites). - `RoleTargetEntity` also removed; one call site in `user-workspace.service.ts` keeps a raw injection with an `eslint-disable` + reason because `softRemove(...)` is not on the wrapper API yet (the migration would require threading `workspaceId` through `deleteUserWorkspace`'s three callers). ### Still exempted (7 entities, follow-up PRs) | Entity | Why deferred | |---|---| | `ApplicationEntity` | ~50 sites with several cross-workspace lookups by id (auth, OAuth, file-storage, cleanup) | | `CalendarChannelEntity` / `MessageChannelEntity` | Use `.increment(...)` (not on wrapper) and `repository.manager.transaction(...)` — wrapper needs to grow `.increment` + the transaction sites need `withManager` or dual-inject | | `FieldMetadataEntity` / `ObjectMetadataEntity` | The metadata services `extends TypeOrmQueryService<X>` and `super(rawRepo)` — requires dual-inject or reworking the inheritance | | `KeyValuePairEntity` | Allows `workspaceId: IsNull()` for instance-level config; wrapper rejects null | | `UpgradeMigrationEntity` | Same — instance-level + cross-workspace ledger | ## Test plan - [x] `npx nx typecheck twenty-server` — clean - [x] `npx nx lint twenty-server` — clean (0/0) - [x] All 10 affected unit specs pass (115 tests) — api-key, agent-role, permissions, workspace-roles-permissions-cache, view-filter-group, workflow-version-step-operations, two-factor-authentication (service + resolver), user-workspace, file - [ ] Server integration tests in CI
117 lines
5.8 KiB
TypeScript
117 lines
5.8 KiB
TypeScript
/* @license Enterprise */
|
|
|
|
import { Injectable } from '@nestjs/common';
|
|
import { InjectRepository } from '@nestjs/typeorm';
|
|
|
|
import { Repository } from 'typeorm';
|
|
|
|
import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/workspace-cache-provider.service';
|
|
|
|
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
|
|
import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
|
|
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
|
|
import { fromRowLevelPermissionPredicateEntityToFlatRowLevelPermissionPredicate } from 'src/engine/metadata-modules/flat-row-level-permission-predicate/utils/from-row-level-permission-predicate-entity-to-flat-row-level-permission-predicate.util';
|
|
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
|
|
import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
|
|
import { RowLevelPermissionPredicateGroupEntity } from 'src/engine/metadata-modules/row-level-permission-predicate/entities/row-level-permission-predicate-group.entity';
|
|
import { RowLevelPermissionPredicateEntity } from 'src/engine/metadata-modules/row-level-permission-predicate/entities/row-level-permission-predicate.entity';
|
|
import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
|
|
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
|
|
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
|
|
import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator';
|
|
import { createIdToUniversalIdentifierMap } from 'src/engine/workspace-cache/utils/create-id-to-universal-identifier-map.util';
|
|
import { addFlatEntityToFlatEntityMapsThroughMutationOrThrow } from 'src/engine/workspace-manager/workspace-migration/utils/add-flat-entity-to-flat-entity-maps-through-mutation-or-throw.util';
|
|
|
|
@Injectable()
|
|
@WorkspaceCache('flatRowLevelPermissionPredicateMaps')
|
|
export class WorkspaceFlatRowLevelPermissionPredicateMapCacheService extends WorkspaceCacheProvider<FlatRowLevelPermissionPredicateMaps> {
|
|
constructor(
|
|
@InjectWorkspaceScopedRepository(RowLevelPermissionPredicateEntity)
|
|
private readonly rowLevelPermissionPredicateRepository: WorkspaceScopedRepository<RowLevelPermissionPredicateEntity>,
|
|
@InjectRepository(ApplicationEntity)
|
|
private readonly applicationRepository: Repository<ApplicationEntity>,
|
|
@InjectRepository(FieldMetadataEntity)
|
|
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
|
|
@InjectRepository(ObjectMetadataEntity)
|
|
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
|
|
@InjectWorkspaceScopedRepository(RoleEntity)
|
|
private readonly roleRepository: WorkspaceScopedRepository<RoleEntity>,
|
|
@InjectWorkspaceScopedRepository(RowLevelPermissionPredicateGroupEntity)
|
|
private readonly rowLevelPermissionPredicateGroupRepository: WorkspaceScopedRepository<RowLevelPermissionPredicateGroupEntity>,
|
|
) {
|
|
super();
|
|
}
|
|
|
|
async computeForCache(
|
|
workspaceId: string,
|
|
): Promise<FlatRowLevelPermissionPredicateMaps> {
|
|
const [
|
|
rowLevelPermissionPredicates,
|
|
applications,
|
|
fieldMetadatas,
|
|
objectMetadatas,
|
|
roles,
|
|
rowLevelPermissionPredicateGroups,
|
|
] = await Promise.all([
|
|
this.rowLevelPermissionPredicateRepository.find(workspaceId, {
|
|
withDeleted: true,
|
|
}),
|
|
this.applicationRepository.find({
|
|
where: { workspaceId },
|
|
select: ['id', 'universalIdentifier'],
|
|
withDeleted: true,
|
|
}),
|
|
this.fieldMetadataRepository.find({
|
|
where: { workspaceId },
|
|
select: ['id', 'universalIdentifier'],
|
|
withDeleted: true,
|
|
}),
|
|
this.objectMetadataRepository.find({
|
|
where: { workspaceId },
|
|
select: ['id', 'universalIdentifier'],
|
|
withDeleted: true,
|
|
}),
|
|
this.roleRepository.find(workspaceId, {
|
|
select: ['id', 'universalIdentifier'],
|
|
withDeleted: true,
|
|
}),
|
|
this.rowLevelPermissionPredicateGroupRepository.find(workspaceId, {
|
|
select: ['id', 'universalIdentifier'],
|
|
withDeleted: true,
|
|
}),
|
|
]);
|
|
|
|
const applicationIdToUniversalIdentifierMap =
|
|
createIdToUniversalIdentifierMap(applications);
|
|
const fieldMetadataIdToUniversalIdentifierMap =
|
|
createIdToUniversalIdentifierMap(fieldMetadatas);
|
|
const objectMetadataIdToUniversalIdentifierMap =
|
|
createIdToUniversalIdentifierMap(objectMetadatas);
|
|
const roleIdToUniversalIdentifierMap =
|
|
createIdToUniversalIdentifierMap(roles);
|
|
const rowLevelPermissionPredicateGroupIdToUniversalIdentifierMap =
|
|
createIdToUniversalIdentifierMap(rowLevelPermissionPredicateGroups);
|
|
|
|
const flatRowLevelPermissionPredicateMaps = createEmptyFlatEntityMaps();
|
|
|
|
for (const rowLevelPermissionPredicateEntity of rowLevelPermissionPredicates) {
|
|
const flatRowLevelPermissionPredicate =
|
|
fromRowLevelPermissionPredicateEntityToFlatRowLevelPermissionPredicate({
|
|
entity: rowLevelPermissionPredicateEntity,
|
|
applicationIdToUniversalIdentifierMap,
|
|
fieldMetadataIdToUniversalIdentifierMap,
|
|
objectMetadataIdToUniversalIdentifierMap,
|
|
roleIdToUniversalIdentifierMap,
|
|
rowLevelPermissionPredicateGroupIdToUniversalIdentifierMap,
|
|
});
|
|
|
|
addFlatEntityToFlatEntityMapsThroughMutationOrThrow({
|
|
flatEntity: flatRowLevelPermissionPredicate,
|
|
flatEntityMapsToMutate: flatRowLevelPermissionPredicateMaps,
|
|
});
|
|
}
|
|
|
|
return flatRowLevelPermissionPredicateMaps;
|
|
}
|
|
}
|