feat: refactoring casl permission checks for recursive nested operations (#778)
* feat: nested casl abilities * fix: remove unused packages * Fixes * Fix createMany broken * Fix lint * Fix lint * Fix lint * Fix lint * Fixes * Fix CommentThread * Fix bugs * Fix lint * Fix bugs * Fixed auto routing * Fixed app path --------- Co-authored-by: Charles Bochet <charles@twenty.com> Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
This commit is contained in:
Jérémy M
@ -9,35 +9,35 @@ export class AttachmentService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.attachment.findFirst;
|
||||
findFirstOrThrow = this.prismaService.attachment.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.attachment.findFirst;
|
||||
findFirstOrThrow = this.prismaService.client.attachment.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.attachment.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.attachment.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.attachment.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.client.attachment.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.attachment.findMany;
|
||||
findMany = this.prismaService.client.attachment.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.attachment.create;
|
||||
createMany = this.prismaService.attachment.createMany;
|
||||
create = this.prismaService.client.attachment.create;
|
||||
createMany = this.prismaService.client.attachment.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.attachment.update;
|
||||
upsert = this.prismaService.attachment.upsert;
|
||||
updateMany = this.prismaService.attachment.updateMany;
|
||||
update = this.prismaService.client.attachment.update;
|
||||
upsert = this.prismaService.client.attachment.upsert;
|
||||
updateMany = this.prismaService.client.attachment.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.attachment.delete;
|
||||
deleteMany = this.prismaService.attachment.deleteMany;
|
||||
delete = this.prismaService.client.attachment.delete;
|
||||
deleteMany = this.prismaService.client.attachment.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.attachment.aggregate;
|
||||
aggregate = this.prismaService.client.attachment.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.attachment.count;
|
||||
count = this.prismaService.client.attachment.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.attachment.groupBy;
|
||||
groupBy = this.prismaService.client.attachment.groupBy;
|
||||
|
||||
getFileTypeFromFileName(fileName: string): AttachmentType {
|
||||
const extension = fileName.split('.').pop()?.toLowerCase();
|
||||
|
||||
@ -31,7 +31,7 @@ export class TokenService {
|
||||
assert(expiresIn, '', InternalServerErrorException);
|
||||
const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
|
||||
|
||||
const user = await this.prismaService.user.findUnique({
|
||||
const user = await this.prismaService.client.user.findUnique({
|
||||
where: { id: userId },
|
||||
include: {
|
||||
workspaceMember: true,
|
||||
@ -71,7 +71,7 @@ export class TokenService {
|
||||
sub: userId,
|
||||
};
|
||||
|
||||
const refreshToken = await this.prismaService.refreshToken.create({
|
||||
const refreshToken = await this.prismaService.client.refreshToken.create({
|
||||
data: refreshTokenPayload,
|
||||
});
|
||||
|
||||
@ -122,13 +122,13 @@ export class TokenService {
|
||||
UnprocessableEntityException,
|
||||
);
|
||||
|
||||
const token = await this.prismaService.refreshToken.findUnique({
|
||||
const token = await this.prismaService.client.refreshToken.findUnique({
|
||||
where: { id: jwtPayload.jti },
|
||||
});
|
||||
|
||||
assert(token, "This refresh token doesn't exist", NotFoundException);
|
||||
|
||||
const user = await this.prismaService.user.findUnique({
|
||||
const user = await this.prismaService.client.user.findUnique({
|
||||
where: {
|
||||
id: jwtPayload.sub,
|
||||
},
|
||||
@ -141,7 +141,7 @@ export class TokenService {
|
||||
|
||||
if (token.isRevoked) {
|
||||
// Revoke all user refresh tokens
|
||||
await this.prismaService.refreshToken.updateMany({
|
||||
await this.prismaService.client.refreshToken.updateMany({
|
||||
where: {
|
||||
id: {
|
||||
in: user.refreshTokens.map(({ id }) => id),
|
||||
@ -172,7 +172,7 @@ export class TokenService {
|
||||
} = await this.verifyRefreshToken(token);
|
||||
|
||||
// Revoke old refresh token
|
||||
await this.prismaService.refreshToken.update({
|
||||
await this.prismaService.client.refreshToken.update({
|
||||
where: {
|
||||
id,
|
||||
},
|
||||
|
||||
@ -24,7 +24,7 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
|
||||
}
|
||||
|
||||
async validate(payload: JwtPayload): Promise<PassportUser> {
|
||||
const user = await this.prismaService.user.findUniqueOrThrow({
|
||||
const user = await this.prismaService.client.user.findUniqueOrThrow({
|
||||
where: { id: payload.sub },
|
||||
});
|
||||
|
||||
@ -32,9 +32,10 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
|
||||
throw new UnauthorizedException();
|
||||
}
|
||||
|
||||
const workspace = await this.prismaService.workspace.findUniqueOrThrow({
|
||||
where: { id: payload.workspaceId },
|
||||
});
|
||||
const workspace =
|
||||
await this.prismaService.client.workspace.findUniqueOrThrow({
|
||||
where: { id: payload.workspaceId },
|
||||
});
|
||||
|
||||
if (!workspace) {
|
||||
throw new UnauthorizedException();
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { CanActivate } from '@nestjs/common';
|
||||
|
||||
import { CommentThreadService } from 'src/core/comment/services/comment-thread.service';
|
||||
import { CreateOneCommentGuard } from 'src/guards/create-one-comment.guard';
|
||||
import { CreateOneCommentThreadGuard } from 'src/guards/create-one-comment-thread.guard';
|
||||
import { AbilityFactory } from 'src/ability/ability.factory';
|
||||
|
||||
import { CommentThreadResolver } from './comment-thread.resolver';
|
||||
@ -12,8 +9,6 @@ describe('CommentThreadResolver', () => {
|
||||
let resolver: CommentThreadResolver;
|
||||
|
||||
beforeEach(async () => {
|
||||
const mockGuard: CanActivate = { canActivate: jest.fn(() => true) };
|
||||
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [
|
||||
CommentThreadResolver,
|
||||
@ -26,12 +21,7 @@ describe('CommentThreadResolver', () => {
|
||||
useValue: {},
|
||||
},
|
||||
],
|
||||
})
|
||||
.overrideGuard(CreateOneCommentGuard)
|
||||
.useValue(mockGuard)
|
||||
.overrideGuard(CreateOneCommentThreadGuard)
|
||||
.useValue(mockGuard)
|
||||
.compile();
|
||||
}).compile();
|
||||
|
||||
resolver = module.get<CommentThreadResolver>(CommentThreadResolver);
|
||||
});
|
||||
|
||||
@ -9,7 +9,6 @@ import { Workspace } from 'src/core/@generated/workspace/workspace.model';
|
||||
import { AuthWorkspace } from 'src/decorators/auth-workspace.decorator';
|
||||
import { CommentThread } from 'src/core/@generated/comment-thread/comment-thread.model';
|
||||
import { CreateOneCommentThreadArgs } from 'src/core/@generated/comment-thread/create-one-comment-thread.args';
|
||||
import { CreateOneCommentThreadGuard } from 'src/guards/create-one-comment-thread.guard';
|
||||
import { FindManyCommentThreadArgs } from 'src/core/@generated/comment-thread/find-many-comment-thread.args';
|
||||
import { CommentThreadService } from 'src/core/comment/services/comment-thread.service';
|
||||
import { UpdateOneCommentThreadArgs } from 'src/core/@generated/comment-thread/update-one-comment-thread.args';
|
||||
@ -35,7 +34,6 @@ import { DeleteManyCommentThreadArgs } from 'src/core/@generated/comment-thread/
|
||||
export class CommentThreadResolver {
|
||||
constructor(private readonly commentThreadService: CommentThreadService) {}
|
||||
|
||||
@UseGuards(CreateOneCommentThreadGuard)
|
||||
@Mutation(() => CommentThread, {
|
||||
nullable: false,
|
||||
})
|
||||
@ -51,6 +49,15 @@ export class CommentThreadResolver {
|
||||
data: {
|
||||
...args.data,
|
||||
...{ workspace: { connect: { id: workspace.id } } },
|
||||
commentThreadTargets: args.data?.commentThreadTargets?.createMany
|
||||
? {
|
||||
createMany: {
|
||||
data: args.data.commentThreadTargets.createMany.data.map(
|
||||
(target) => ({ ...target, workspaceId: workspace.id }),
|
||||
),
|
||||
},
|
||||
}
|
||||
: undefined,
|
||||
},
|
||||
select: prismaSelect.value,
|
||||
} as Prisma.CommentThreadCreateArgs);
|
||||
@ -65,6 +72,7 @@ export class CommentThreadResolver {
|
||||
@CheckAbilities(UpdateCommentThreadAbilityHandler)
|
||||
async updateOneCommentThread(
|
||||
@Args() args: UpdateOneCommentThreadArgs,
|
||||
@AuthWorkspace() workspace: Workspace,
|
||||
@PrismaSelector({ modelName: 'CommentThread' })
|
||||
prismaSelect: PrismaSelect<'CommentThread'>,
|
||||
): Promise<Partial<CommentThread>> {
|
||||
@ -84,7 +92,18 @@ export class CommentThreadResolver {
|
||||
}
|
||||
const updatedCommentThread = await this.commentThreadService.update({
|
||||
where: args.where,
|
||||
data: args.data,
|
||||
data: {
|
||||
...args.data,
|
||||
commentThreadTargets: args.data?.commentThreadTargets?.createMany
|
||||
? {
|
||||
createMany: {
|
||||
data: args.data.commentThreadTargets.createMany.data.map(
|
||||
(target) => ({ ...target, workspaceId: workspace.id }),
|
||||
),
|
||||
},
|
||||
}
|
||||
: undefined,
|
||||
},
|
||||
select: prismaSelect.value,
|
||||
} as Prisma.CommentThreadUpdateArgs);
|
||||
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { CanActivate } from '@nestjs/common';
|
||||
|
||||
import { CommentService } from 'src/core/comment/services/comment.service';
|
||||
import { CreateOneCommentGuard } from 'src/guards/create-one-comment.guard';
|
||||
import { AbilityFactory } from 'src/ability/ability.factory';
|
||||
|
||||
import { CommentResolver } from './comment.resolver';
|
||||
@ -11,8 +9,6 @@ describe('CommentResolver', () => {
|
||||
let resolver: CommentResolver;
|
||||
|
||||
beforeEach(async () => {
|
||||
const mockGuard: CanActivate = { canActivate: jest.fn(() => true) };
|
||||
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [
|
||||
CommentResolver,
|
||||
@ -25,10 +21,7 @@ describe('CommentResolver', () => {
|
||||
useValue: {},
|
||||
},
|
||||
],
|
||||
})
|
||||
.overrideGuard(CreateOneCommentGuard)
|
||||
.useValue(mockGuard)
|
||||
.compile();
|
||||
}).compile();
|
||||
|
||||
resolver = module.get<CommentResolver>(CommentResolver);
|
||||
});
|
||||
|
||||
@ -8,7 +8,6 @@ import { Workspace } from 'src/core/@generated/workspace/workspace.model';
|
||||
import { AuthWorkspace } from 'src/decorators/auth-workspace.decorator';
|
||||
import { CreateOneCommentArgs } from 'src/core/@generated/comment/create-one-comment.args';
|
||||
import { Comment } from 'src/core/@generated/comment/comment.model';
|
||||
import { CreateOneCommentGuard } from 'src/guards/create-one-comment.guard';
|
||||
import { CommentService } from 'src/core/comment/services/comment.service';
|
||||
import {
|
||||
PrismaSelector,
|
||||
@ -25,7 +24,6 @@ import { User } from 'src/core/@generated/user/user.model';
|
||||
export class CommentResolver {
|
||||
constructor(private readonly commentService: CommentService) {}
|
||||
|
||||
@UseGuards(CreateOneCommentGuard)
|
||||
@Mutation(() => Comment, {
|
||||
nullable: false,
|
||||
})
|
||||
|
||||
@ -7,33 +7,35 @@ export class CommentThreadTargetService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.commentThreadTarget.findFirst;
|
||||
findFirstOrThrow = this.prismaService.commentThreadTarget.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.commentThreadTarget.findFirst;
|
||||
findFirstOrThrow =
|
||||
this.prismaService.client.commentThreadTarget.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.commentThreadTarget.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.commentThreadTarget.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.commentThreadTarget.findUnique;
|
||||
findUniqueOrThrow =
|
||||
this.prismaService.client.commentThreadTarget.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.commentThreadTarget.findMany;
|
||||
findMany = this.prismaService.client.commentThreadTarget.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.commentThreadTarget.create;
|
||||
createMany = this.prismaService.commentThreadTarget.createMany;
|
||||
create = this.prismaService.client.commentThreadTarget.create;
|
||||
createMany = this.prismaService.client.commentThreadTarget.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.commentThreadTarget.update;
|
||||
upsert = this.prismaService.commentThreadTarget.upsert;
|
||||
updateMany = this.prismaService.commentThreadTarget.updateMany;
|
||||
update = this.prismaService.client.commentThreadTarget.update;
|
||||
upsert = this.prismaService.client.commentThreadTarget.upsert;
|
||||
updateMany = this.prismaService.client.commentThreadTarget.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.commentThreadTarget.delete;
|
||||
deleteMany = this.prismaService.commentThreadTarget.deleteMany;
|
||||
delete = this.prismaService.client.commentThreadTarget.delete;
|
||||
deleteMany = this.prismaService.client.commentThreadTarget.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.commentThreadTarget.aggregate;
|
||||
aggregate = this.prismaService.client.commentThreadTarget.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.commentThreadTarget.count;
|
||||
count = this.prismaService.client.commentThreadTarget.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.commentThreadTarget.groupBy;
|
||||
groupBy = this.prismaService.client.commentThreadTarget.groupBy;
|
||||
}
|
||||
|
||||
@ -7,33 +7,33 @@ export class CommentThreadService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.commentThread.findFirst;
|
||||
findFirstOrThrow = this.prismaService.commentThread.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.commentThread.findFirst;
|
||||
findFirstOrThrow = this.prismaService.client.commentThread.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.commentThread.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.commentThread.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.commentThread.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.client.commentThread.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.commentThread.findMany;
|
||||
findMany = this.prismaService.client.commentThread.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.commentThread.create;
|
||||
createMany = this.prismaService.commentThread.createMany;
|
||||
create = this.prismaService.client.commentThread.create;
|
||||
createMany = this.prismaService.client.commentThread.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.commentThread.update;
|
||||
upsert = this.prismaService.commentThread.upsert;
|
||||
updateMany = this.prismaService.commentThread.updateMany;
|
||||
update = this.prismaService.client.commentThread.update;
|
||||
upsert = this.prismaService.client.commentThread.upsert;
|
||||
updateMany = this.prismaService.client.commentThread.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.commentThread.delete;
|
||||
deleteMany = this.prismaService.commentThread.deleteMany;
|
||||
delete = this.prismaService.client.commentThread.delete;
|
||||
deleteMany = this.prismaService.client.commentThread.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.commentThread.aggregate;
|
||||
aggregate = this.prismaService.client.commentThread.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.commentThread.count;
|
||||
count = this.prismaService.client.commentThread.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.commentThread.groupBy;
|
||||
groupBy = this.prismaService.client.commentThread.groupBy;
|
||||
}
|
||||
|
||||
@ -7,33 +7,33 @@ export class CommentService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.comment.findFirst;
|
||||
findFirstOrThrow = this.prismaService.comment.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.comment.findFirst;
|
||||
findFirstOrThrow = this.prismaService.client.comment.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.comment.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.comment.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.comment.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.client.comment.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.comment.findMany;
|
||||
findMany = this.prismaService.client.comment.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.comment.create;
|
||||
createMany = this.prismaService.comment.createMany;
|
||||
create = this.prismaService.client.comment.create;
|
||||
createMany = this.prismaService.client.comment.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.comment.update;
|
||||
upsert = this.prismaService.comment.upsert;
|
||||
updateMany = this.prismaService.comment.updateMany;
|
||||
update = this.prismaService.client.comment.update;
|
||||
upsert = this.prismaService.client.comment.upsert;
|
||||
updateMany = this.prismaService.client.comment.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.comment.delete;
|
||||
deleteMany = this.prismaService.comment.deleteMany;
|
||||
delete = this.prismaService.client.comment.delete;
|
||||
deleteMany = this.prismaService.client.comment.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.comment.aggregate;
|
||||
aggregate = this.prismaService.client.comment.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.comment.count;
|
||||
count = this.prismaService.client.comment.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.comment.groupBy;
|
||||
groupBy = this.prismaService.client.comment.groupBy;
|
||||
}
|
||||
|
||||
@ -1,9 +1,5 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { CanActivate } from '@nestjs/common';
|
||||
|
||||
import { UpdateOneGuard } from 'src/guards/update-one.guard';
|
||||
import { DeleteManyGuard } from 'src/guards/delete-many.guard';
|
||||
import { CreateOneGuard } from 'src/guards/create-one.guard';
|
||||
import { AbilityFactory } from 'src/ability/ability.factory';
|
||||
|
||||
import { CompanyService } from './company.service';
|
||||
@ -13,8 +9,6 @@ describe('CompanyResolver', () => {
|
||||
let resolver: CompanyResolver;
|
||||
|
||||
beforeEach(async () => {
|
||||
const mockGuard: CanActivate = { canActivate: jest.fn(() => true) };
|
||||
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [
|
||||
CompanyResolver,
|
||||
@ -27,14 +21,7 @@ describe('CompanyResolver', () => {
|
||||
useValue: {},
|
||||
},
|
||||
],
|
||||
})
|
||||
.overrideGuard(UpdateOneGuard)
|
||||
.useValue(mockGuard)
|
||||
.overrideGuard(DeleteManyGuard)
|
||||
.useValue(mockGuard)
|
||||
.overrideGuard(CreateOneGuard)
|
||||
.useValue(mockGuard)
|
||||
.compile();
|
||||
}).compile();
|
||||
|
||||
resolver = module.get<CompanyResolver>(CompanyResolver);
|
||||
});
|
||||
|
||||
@ -12,9 +12,6 @@ import { UpdateOneCompanyArgs } from 'src/core/@generated/company/update-one-com
|
||||
import { CreateOneCompanyArgs } from 'src/core/@generated/company/create-one-company.args';
|
||||
import { AffectedRows } from 'src/core/@generated/prisma/affected-rows.output';
|
||||
import { DeleteManyCompanyArgs } from 'src/core/@generated/company/delete-many-company.args';
|
||||
import { UpdateOneGuard } from 'src/guards/update-one.guard';
|
||||
import { DeleteManyGuard } from 'src/guards/delete-many.guard';
|
||||
import { CreateOneGuard } from 'src/guards/create-one.guard';
|
||||
import {
|
||||
PrismaSelect,
|
||||
PrismaSelector,
|
||||
@ -78,7 +75,6 @@ export class CompanyResolver {
|
||||
});
|
||||
}
|
||||
|
||||
@UseGuards(UpdateOneGuard)
|
||||
@Mutation(() => Company, {
|
||||
nullable: true,
|
||||
})
|
||||
@ -96,7 +92,6 @@ export class CompanyResolver {
|
||||
} as Prisma.CompanyUpdateArgs);
|
||||
}
|
||||
|
||||
@UseGuards(DeleteManyGuard)
|
||||
@Mutation(() => AffectedRows, {
|
||||
nullable: false,
|
||||
})
|
||||
@ -110,7 +105,6 @@ export class CompanyResolver {
|
||||
});
|
||||
}
|
||||
|
||||
@UseGuards(CreateOneGuard)
|
||||
@Mutation(() => Company, {
|
||||
nullable: false,
|
||||
})
|
||||
|
||||
@ -8,35 +8,35 @@ export class CompanyService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.company.findFirst;
|
||||
findFirstOrThrow = this.prismaService.company.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.company.findFirst;
|
||||
findFirstOrThrow = this.prismaService.client.company.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.company.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.company.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.company.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.client.company.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.company.findMany;
|
||||
findMany = this.prismaService.client.company.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.company.create;
|
||||
createMany = this.prismaService.company.createMany;
|
||||
create = this.prismaService.client.company.create;
|
||||
createMany = this.prismaService.client.company.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.company.update;
|
||||
upsert = this.prismaService.company.upsert;
|
||||
updateMany = this.prismaService.company.updateMany;
|
||||
update = this.prismaService.client.company.update;
|
||||
upsert = this.prismaService.client.company.upsert;
|
||||
updateMany = this.prismaService.client.company.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.company.delete;
|
||||
deleteMany = this.prismaService.company.deleteMany;
|
||||
delete = this.prismaService.client.company.delete;
|
||||
deleteMany = this.prismaService.client.company.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.company.aggregate;
|
||||
aggregate = this.prismaService.client.company.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.company.count;
|
||||
count = this.prismaService.client.company.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.company.groupBy;
|
||||
groupBy = this.prismaService.client.company.groupBy;
|
||||
async createDefaultCompanies({ workspaceId }: { workspaceId: string }) {
|
||||
const companies = companiesSeed.map((company) => ({
|
||||
...company,
|
||||
|
||||
@ -1,9 +1,5 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { CanActivate } from '@nestjs/common';
|
||||
|
||||
import { UpdateOneGuard } from 'src/guards/update-one.guard';
|
||||
import { DeleteManyGuard } from 'src/guards/delete-many.guard';
|
||||
import { CreateOneGuard } from 'src/guards/create-one.guard';
|
||||
import { AbilityFactory } from 'src/ability/ability.factory';
|
||||
|
||||
import { PersonService } from './person.service';
|
||||
@ -13,8 +9,6 @@ describe('PersonResolver', () => {
|
||||
let resolver: PersonResolver;
|
||||
|
||||
beforeEach(async () => {
|
||||
const mockGuard: CanActivate = { canActivate: jest.fn(() => true) };
|
||||
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [
|
||||
PersonResolver,
|
||||
@ -27,14 +21,7 @@ describe('PersonResolver', () => {
|
||||
useValue: {},
|
||||
},
|
||||
],
|
||||
})
|
||||
.overrideGuard(UpdateOneGuard)
|
||||
.useValue(mockGuard)
|
||||
.overrideGuard(DeleteManyGuard)
|
||||
.useValue(mockGuard)
|
||||
.overrideGuard(CreateOneGuard)
|
||||
.useValue(mockGuard)
|
||||
.compile();
|
||||
}).compile();
|
||||
|
||||
resolver = module.get<PersonResolver>(PersonResolver);
|
||||
});
|
||||
|
||||
@ -20,9 +20,6 @@ import { AffectedRows } from 'src/core/@generated/prisma/affected-rows.output';
|
||||
import { DeleteManyPersonArgs } from 'src/core/@generated/person/delete-many-person.args';
|
||||
import { Workspace } from 'src/core/@generated/workspace/workspace.model';
|
||||
import { AuthWorkspace } from 'src/decorators/auth-workspace.decorator';
|
||||
import { UpdateOneGuard } from 'src/guards/update-one.guard';
|
||||
import { DeleteManyGuard } from 'src/guards/delete-many.guard';
|
||||
import { CreateOneGuard } from 'src/guards/create-one.guard';
|
||||
import {
|
||||
PrismaSelect,
|
||||
PrismaSelector,
|
||||
@ -95,7 +92,6 @@ export class PersonResolver {
|
||||
return `${parent.firstName ?? ''} ${parent.lastName ?? ''}`;
|
||||
}
|
||||
|
||||
@UseGuards(UpdateOneGuard)
|
||||
@Mutation(() => Person, {
|
||||
nullable: true,
|
||||
})
|
||||
@ -128,7 +124,6 @@ export class PersonResolver {
|
||||
} as Prisma.PersonUpdateArgs);
|
||||
}
|
||||
|
||||
@UseGuards(DeleteManyGuard)
|
||||
@Mutation(() => AffectedRows, {
|
||||
nullable: false,
|
||||
})
|
||||
@ -142,7 +137,6 @@ export class PersonResolver {
|
||||
});
|
||||
}
|
||||
|
||||
@UseGuards(CreateOneGuard)
|
||||
@Mutation(() => Person, {
|
||||
nullable: false,
|
||||
})
|
||||
|
||||
@ -10,35 +10,35 @@ export class PersonService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.person.findFirst;
|
||||
findFirstOrThrow = this.prismaService.person.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.person.findFirst;
|
||||
findFirstOrThrow = this.prismaService.client.person.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.person.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.person.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.person.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.client.person.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.person.findMany;
|
||||
findMany = this.prismaService.client.person.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.person.create;
|
||||
createMany = this.prismaService.person.createMany;
|
||||
create = this.prismaService.client.person.create;
|
||||
createMany = this.prismaService.client.person.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.person.update;
|
||||
upsert = this.prismaService.person.upsert;
|
||||
updateMany = this.prismaService.person.updateMany;
|
||||
update = this.prismaService.client.person.update;
|
||||
upsert = this.prismaService.client.person.upsert;
|
||||
updateMany = this.prismaService.client.person.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.person.delete;
|
||||
deleteMany = this.prismaService.person.deleteMany;
|
||||
delete = this.prismaService.client.person.delete;
|
||||
deleteMany = this.prismaService.client.person.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.person.aggregate;
|
||||
aggregate = this.prismaService.client.person.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.person.count;
|
||||
count = this.prismaService.client.person.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.person.groupBy;
|
||||
groupBy = this.prismaService.client.person.groupBy;
|
||||
async createDefaultPeople({
|
||||
workspaceId,
|
||||
companies,
|
||||
|
||||
@ -7,33 +7,35 @@ export class PipelineProgressService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.pipelineProgress.findFirst;
|
||||
findFirstOrThrow = this.prismaService.pipelineProgress.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.pipelineProgress.findFirst;
|
||||
findFirstOrThrow =
|
||||
this.prismaService.client.pipelineProgress.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.pipelineProgress.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.pipelineProgress.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.pipelineProgress.findUnique;
|
||||
findUniqueOrThrow =
|
||||
this.prismaService.client.pipelineProgress.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.pipelineProgress.findMany;
|
||||
findMany = this.prismaService.client.pipelineProgress.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.pipelineProgress.create;
|
||||
createMany = this.prismaService.pipelineProgress.createMany;
|
||||
create = this.prismaService.client.pipelineProgress.create;
|
||||
createMany = this.prismaService.client.pipelineProgress.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.pipelineProgress.update;
|
||||
upsert = this.prismaService.pipelineProgress.upsert;
|
||||
updateMany = this.prismaService.pipelineProgress.updateMany;
|
||||
update = this.prismaService.client.pipelineProgress.update;
|
||||
upsert = this.prismaService.client.pipelineProgress.upsert;
|
||||
updateMany = this.prismaService.client.pipelineProgress.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.pipelineProgress.delete;
|
||||
deleteMany = this.prismaService.pipelineProgress.deleteMany;
|
||||
delete = this.prismaService.client.pipelineProgress.delete;
|
||||
deleteMany = this.prismaService.client.pipelineProgress.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.pipelineProgress.aggregate;
|
||||
aggregate = this.prismaService.client.pipelineProgress.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.pipelineProgress.count;
|
||||
count = this.prismaService.client.pipelineProgress.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.pipelineProgress.groupBy;
|
||||
groupBy = this.prismaService.client.pipelineProgress.groupBy;
|
||||
}
|
||||
|
||||
@ -8,35 +8,35 @@ export class PipelineStageService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.pipelineStage.findFirst;
|
||||
findFirstOrThrow = this.prismaService.pipelineStage.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.pipelineStage.findFirst;
|
||||
findFirstOrThrow = this.prismaService.client.pipelineStage.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.pipelineStage.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.pipelineStage.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.pipelineStage.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.client.pipelineStage.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.pipelineStage.findMany;
|
||||
findMany = this.prismaService.client.pipelineStage.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.pipelineStage.create;
|
||||
createMany = this.prismaService.pipelineStage.createMany;
|
||||
create = this.prismaService.client.pipelineStage.create;
|
||||
createMany = this.prismaService.client.pipelineStage.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.pipelineStage.update;
|
||||
upsert = this.prismaService.pipelineStage.upsert;
|
||||
updateMany = this.prismaService.pipelineStage.updateMany;
|
||||
update = this.prismaService.client.pipelineStage.update;
|
||||
upsert = this.prismaService.client.pipelineStage.upsert;
|
||||
updateMany = this.prismaService.client.pipelineStage.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.pipelineStage.delete;
|
||||
deleteMany = this.prismaService.pipelineStage.deleteMany;
|
||||
delete = this.prismaService.client.pipelineStage.delete;
|
||||
deleteMany = this.prismaService.client.pipelineStage.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.pipelineStage.aggregate;
|
||||
aggregate = this.prismaService.client.pipelineStage.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.pipelineStage.count;
|
||||
count = this.prismaService.client.pipelineStage.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.pipelineStage.groupBy;
|
||||
groupBy = this.prismaService.client.pipelineStage.groupBy;
|
||||
|
||||
// Customs
|
||||
async createDefaultPipelineStages({
|
||||
|
||||
@ -10,35 +10,35 @@ export class PipelineService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.pipeline.findFirst;
|
||||
findFirstOrThrow = this.prismaService.pipeline.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.pipeline.findFirst;
|
||||
findFirstOrThrow = this.prismaService.client.pipeline.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.pipeline.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.pipeline.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.pipeline.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.client.pipeline.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.pipeline.findMany;
|
||||
findMany = this.prismaService.client.pipeline.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.pipeline.create;
|
||||
createMany = this.prismaService.pipeline.createMany;
|
||||
create = this.prismaService.client.pipeline.create;
|
||||
createMany = this.prismaService.client.pipeline.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.pipeline.update;
|
||||
upsert = this.prismaService.pipeline.upsert;
|
||||
updateMany = this.prismaService.pipeline.updateMany;
|
||||
update = this.prismaService.client.pipeline.update;
|
||||
upsert = this.prismaService.client.pipeline.upsert;
|
||||
updateMany = this.prismaService.client.pipeline.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.pipeline.delete;
|
||||
deleteMany = this.prismaService.pipeline.deleteMany;
|
||||
delete = this.prismaService.client.pipeline.delete;
|
||||
deleteMany = this.prismaService.client.pipeline.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.pipeline.aggregate;
|
||||
aggregate = this.prismaService.client.pipeline.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.pipeline.count;
|
||||
count = this.prismaService.client.pipeline.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.pipeline.groupBy;
|
||||
groupBy = this.prismaService.client.pipeline.groupBy;
|
||||
|
||||
// Customs
|
||||
async createDefaultPipeline({ workspaceId }: { workspaceId: string }) {
|
||||
|
||||
@ -19,35 +19,35 @@ export class UserService {
|
||||
) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.user.findFirst;
|
||||
findFirstOrThrow = this.prismaService.user.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.user.findFirst;
|
||||
findFirstOrThrow = this.prismaService.client.user.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.user.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.user.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.user.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.client.user.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.user.findMany;
|
||||
findMany = this.prismaService.client.user.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.user.create;
|
||||
createMany = this.prismaService.user.createMany;
|
||||
create = this.prismaService.client.user.create;
|
||||
createMany = this.prismaService.client.user.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.user.update;
|
||||
upsert = this.prismaService.user.upsert;
|
||||
updateMany = this.prismaService.user.updateMany;
|
||||
update = this.prismaService.client.user.update;
|
||||
upsert = this.prismaService.client.user.upsert;
|
||||
updateMany = this.prismaService.client.user.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.user.delete;
|
||||
deleteMany = this.prismaService.user.deleteMany;
|
||||
delete = this.prismaService.client.user.delete;
|
||||
deleteMany = this.prismaService.client.user.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.user.aggregate;
|
||||
aggregate = this.prismaService.client.user.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.user.count;
|
||||
count = this.prismaService.client.user.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.user.groupBy;
|
||||
groupBy = this.prismaService.client.user.groupBy;
|
||||
|
||||
// Customs
|
||||
async createUser<T extends Prisma.UserCreateArgs>(
|
||||
@ -68,7 +68,7 @@ export class UserService {
|
||||
assert(workspace, 'workspace is missing', BadRequestException);
|
||||
|
||||
// Create user
|
||||
const user = await this.prismaService.user.upsert({
|
||||
const user = await this.prismaService.client.user.upsert({
|
||||
where: {
|
||||
email: args.data.email,
|
||||
},
|
||||
|
||||
@ -7,33 +7,34 @@ export class WorkspaceMemberService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.workspaceMember.findFirst;
|
||||
findFirstOrThrow = this.prismaService.workspaceMember.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.workspaceMember.findFirst;
|
||||
findFirstOrThrow = this.prismaService.client.workspaceMember.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.workspaceMember.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.workspaceMember.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.workspaceMember.findUnique;
|
||||
findUniqueOrThrow =
|
||||
this.prismaService.client.workspaceMember.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.workspaceMember.findMany;
|
||||
findMany = this.prismaService.client.workspaceMember.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.workspaceMember.create;
|
||||
createMany = this.prismaService.workspaceMember.createMany;
|
||||
create = this.prismaService.client.workspaceMember.create;
|
||||
createMany = this.prismaService.client.workspaceMember.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.workspaceMember.update;
|
||||
upsert = this.prismaService.workspaceMember.upsert;
|
||||
updateMany = this.prismaService.workspaceMember.updateMany;
|
||||
update = this.prismaService.client.workspaceMember.update;
|
||||
upsert = this.prismaService.client.workspaceMember.upsert;
|
||||
updateMany = this.prismaService.client.workspaceMember.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.workspaceMember.delete;
|
||||
deleteMany = this.prismaService.workspaceMember.deleteMany;
|
||||
delete = this.prismaService.client.workspaceMember.delete;
|
||||
deleteMany = this.prismaService.client.workspaceMember.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.workspaceMember.aggregate;
|
||||
aggregate = this.prismaService.client.workspaceMember.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.workspaceMember.count;
|
||||
count = this.prismaService.client.workspaceMember.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.workspaceMember.groupBy;
|
||||
groupBy = this.prismaService.client.workspaceMember.groupBy;
|
||||
}
|
||||
|
||||
@ -19,35 +19,35 @@ export class WorkspaceService {
|
||||
) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.workspace.findFirst;
|
||||
findFirstOrThrow = this.prismaService.workspace.findFirstOrThrow;
|
||||
findFirst = this.prismaService.client.workspace.findFirst;
|
||||
findFirstOrThrow = this.prismaService.client.workspace.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.workspace.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.workspace.findUniqueOrThrow;
|
||||
findUnique = this.prismaService.client.workspace.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.client.workspace.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.workspace.findMany;
|
||||
findMany = this.prismaService.client.workspace.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.workspace.create;
|
||||
createMany = this.prismaService.workspace.createMany;
|
||||
create = this.prismaService.client.workspace.create;
|
||||
createMany = this.prismaService.client.workspace.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.workspace.update;
|
||||
upsert = this.prismaService.workspace.upsert;
|
||||
updateMany = this.prismaService.workspace.updateMany;
|
||||
update = this.prismaService.client.workspace.update;
|
||||
upsert = this.prismaService.client.workspace.upsert;
|
||||
updateMany = this.prismaService.client.workspace.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.workspace.delete;
|
||||
deleteMany = this.prismaService.workspace.deleteMany;
|
||||
delete = this.prismaService.client.workspace.delete;
|
||||
deleteMany = this.prismaService.client.workspace.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.workspace.aggregate;
|
||||
aggregate = this.prismaService.client.workspace.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.workspace.count;
|
||||
count = this.prismaService.client.workspace.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.workspace.groupBy;
|
||||
groupBy = this.prismaService.client.workspace.groupBy;
|
||||
|
||||
// Customs
|
||||
async createDefaultWorkspace() {
|
||||
|
||||
Reference in New Issue
Block a user