diff --git a/packages/crm-service/src/activities/activities.service.ts b/packages/crm-service/src/activities/activities.service.ts index 435b246..4e2a52a 100644 --- a/packages/crm-service/src/activities/activities.service.ts +++ b/packages/crm-service/src/activities/activities.service.ts @@ -11,7 +11,7 @@ import { VisibilityService } from '../visibility/visibility.service'; import { TeamResolverService } from '../visibility/team-resolver.service'; import { JwtPayload } from '../common/decorators/current-user.decorator'; import { Prisma } from '.prisma/crm-client'; -import { VisibilityLevel } from '../common/utils/build-visibility-filter'; +// VisibilityLevel type re-exported from build-visibility-filter @Injectable() export class ActivitiesService { @@ -91,15 +91,15 @@ export class ActivitiesService { user.role === 'TENANT_ADMIN' || user.tenantRole === 'ADMIN'; - if (!isAdmin && level !== VisibilityLevel.ALL) { + if (!isAdmin && level !== 'ALL') { let effectiveLevel = level; - if (user.tenantRole === 'TEAM_LEAD' && level === VisibilityLevel.OWN) { - effectiveLevel = VisibilityLevel.TEAM; + if (user.tenantRole === 'TEAM_LEAD' && level === 'OWN') { + effectiveLevel = 'TEAM'; } - if (effectiveLevel === VisibilityLevel.OWN) { + if (effectiveLevel === 'OWN') { where.createdBy = user.sub; - } else if (effectiveLevel === VisibilityLevel.TEAM) { + } else if (effectiveLevel === 'TEAM') { let teamIds = [user.sub]; if (bearerToken) { teamIds = await this.teamResolver.getTeamMemberIds( diff --git a/packages/crm-service/src/companies/companies.service.ts b/packages/crm-service/src/companies/companies.service.ts index 0aa4fca..ba91d7a 100644 --- a/packages/crm-service/src/companies/companies.service.ts +++ b/packages/crm-service/src/companies/companies.service.ts @@ -11,7 +11,7 @@ import { TeamResolverService } from '../visibility/team-resolver.service'; import { buildVisibilityFilter } from '../common/utils/build-visibility-filter'; import { JwtPayload } from '../common/decorators/current-user.decorator'; import { Prisma } from '.prisma/crm-client'; -import { VisibilityLevel } from '../common/utils/build-visibility-filter'; +// VisibilityLevel type re-exported from build-visibility-filter import { EntityStatus } from '../common/dto/contact-info.dto'; @Injectable() @@ -128,9 +128,9 @@ export class CompaniesService { let baseWhere: Record = { tenantId }; if (user) { const level = await this.visibilityService.getLevel(tenantId, 'COMPANY'); - if (level !== VisibilityLevel.ALL) { + if (level !== 'ALL') { let teamMemberIds: string[] | undefined; - if (level === VisibilityLevel.TEAM && bearerToken) { + if (level === 'TEAM' && bearerToken) { teamMemberIds = await this.teamResolver.getTeamMemberIds( user.sub, user.department, diff --git a/packages/crm-service/src/contacts/contacts.service.ts b/packages/crm-service/src/contacts/contacts.service.ts index a52faf2..bb4024a 100644 --- a/packages/crm-service/src/contacts/contacts.service.ts +++ b/packages/crm-service/src/contacts/contacts.service.ts @@ -12,7 +12,7 @@ import { TeamResolverService } from '../visibility/team-resolver.service'; import { buildVisibilityFilter } from '../common/utils/build-visibility-filter'; import { JwtPayload } from '../common/decorators/current-user.decorator'; import { Prisma } from '.prisma/crm-client'; -import { VisibilityLevel } from '../common/utils/build-visibility-filter'; +// VisibilityLevel type re-exported from build-visibility-filter import { EntityStatus } from '../common/dto/contact-info.dto'; @Injectable() @@ -136,9 +136,9 @@ export class ContactsService { let baseWhere: Record = { tenantId }; if (user) { const level = await this.visibilityService.getLevel(tenantId, 'CONTACT'); - if (level !== VisibilityLevel.ALL) { + if (level !== 'ALL') { let teamMemberIds: string[] | undefined; - if (level === VisibilityLevel.TEAM && bearerToken) { + if (level === 'TEAM' && bearerToken) { teamMemberIds = await this.teamResolver.getTeamMemberIds( user.sub, user.department, diff --git a/packages/crm-service/src/deals/deals.service.ts b/packages/crm-service/src/deals/deals.service.ts index 057665b..0aefed3 100644 --- a/packages/crm-service/src/deals/deals.service.ts +++ b/packages/crm-service/src/deals/deals.service.ts @@ -16,7 +16,7 @@ import { TeamResolverService } from '../visibility/team-resolver.service'; import { buildVisibilityFilter } from '../common/utils/build-visibility-filter'; import { JwtPayload } from '../common/decorators/current-user.decorator'; import { Prisma } from '.prisma/crm-client'; -import { VisibilityLevel } from '../common/utils/build-visibility-filter'; +// VisibilityLevel type re-exported from build-visibility-filter @Injectable() export class DealsService { @@ -145,9 +145,9 @@ export class DealsService { let baseWhere: Record = { tenantId }; if (user) { const level = await this.visibilityService.getLevel(tenantId, 'DEAL'); - if (level !== VisibilityLevel.ALL) { + if (level !== 'ALL') { let teamMemberIds: string[] | undefined; - if (level === VisibilityLevel.TEAM && bearerToken) { + if (level === 'TEAM' && bearerToken) { teamMemberIds = await this.teamResolver.getTeamMemberIds( user.sub, user.department,