admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: prisma typed select (#347)

Browse Source 
* feat: wip prisma gql select

* feat: stronger api using decorator

* feat: add PrismaSelect everywhere

* fix: remove unused

* fix: remove seed debug
This commit is contained in:
Jérémy M
2023-06-22 11:17:31 +02:00
committed by GitHub
parent eb9be6894e
commit ca283a2196
35 changed files with 1081 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/core/comment/comment.module.ts
View File

@ -1,10 +1,8 @@
import { Module } from '@nestjs/common';
import { CommentService } from './services/comment.service';
import { CommentResolver } from './resolvers/comment.resolver';
import { CommentRelationsResolver } from './resolvers/comment-relations.resolver';
import { CommentThreadTargetService } from './services/comment-thread-target.service';
import { CommentThreadResolver } from './resolvers/comment-thread.resolver';
import { CommentThreadRelationsResolver } from './resolvers/comment-thread-relations.resolver';
import { CommentThreadService } from './services/comment-thread.service';
@Module({
@ -13,9 +11,7 @@ import { CommentThreadService } from './services/comment-thread.service';
CommentThreadService,
CommentThreadTargetService,
CommentResolver,
CommentRelationsResolver,
CommentThreadResolver,
CommentThreadRelationsResolver,
],
exports: [CommentService, CommentThreadService, CommentThreadTargetService],
})

25
server/src/core/comment/resolvers/comment-relations.resolver.spec.ts
View File

@ -1,25 +0,0 @@
import { Test, TestingModule } from '@nestjs/testing';
import { CommentRelationsResolver } from './comment-relations.resolver';
import { CommentService } from '../services/comment.service';
describe('CommentRelationsResolver', () => {
let resolver: CommentRelationsResolver;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [
CommentRelationsResolver,
{
provide: CommentService,
useValue: {},
},
],
}).compile();
resolver = module.get<CommentRelationsResolver>(CommentRelationsResolver);
});
it('should be defined', () => {
expect(resolver).toBeDefined();
});
});

22
server/src/core/comment/resolvers/comment-relations.resolver.ts
View File

@ -1,22 +0,0 @@
import * as TypeGraphQL from '@nestjs/graphql';
import { User } from 'src/core/@generated/user/user.model';
import { Comment } from 'src/core/@generated/comment/comment.model';
import { CommentService } from '../services/comment.service';
@TypeGraphQL.Resolver(() => Comment)
export class CommentRelationsResolver {
constructor(private readonly commentService: CommentService) {}
@TypeGraphQL.ResolveField(() => User, {
nullable: true,
})
async author(@TypeGraphQL.Parent() comment: Comment): Promise<User | null> {
return await this.commentService
.findFirst({
where: {
id: comment.id,
},
})
.author({});
}
}

32
server/src/core/comment/resolvers/comment-thread-relations.resolver.spec.ts
View File

@ -1,32 +0,0 @@
import { Test, TestingModule } from '@nestjs/testing';
import { CommentThreadRelationsResolver } from './comment-thread-relations.resolver';
import { CommentService } from '../services/comment.service';
import { CommentThreadTargetService } from '../services/comment-thread-target.service';
describe('CommentThreadRelationsResolver', () => {
let resolver: CommentThreadRelationsResolver;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [
CommentThreadRelationsResolver,
{
provide: CommentService,
useValue: {},
},
{
provide: CommentThreadTargetService,
useValue: {},
},
],
}).compile();
resolver = module.get<CommentThreadRelationsResolver>(
CommentThreadRelationsResolver,
);
});
it('should be defined', () => {
expect(resolver).toBeDefined();
});
});

48
server/src/core/comment/resolvers/comment-thread-relations.resolver.ts
View File

@ -1,48 +0,0 @@
import * as TypeGraphQL from '@nestjs/graphql';
import { CommentThreadTarget } from 'src/core/@generated/comment-thread-target/comment-thread-target.model';
import { CommentThread } from 'src/core/@generated/comment-thread/comment-thread.model';
import { Comment } from 'src/core/@generated/comment/comment.model';
import { CommentService } from '../services/comment.service';
import { CommentThreadTargetService } from '../services/comment-thread-target.service';
@TypeGraphQL.Resolver(() => CommentThread)
export class CommentThreadRelationsResolver {
constructor(
private readonly commentService: CommentService,
private readonly commentThreadTargetService: CommentThreadTargetService,
) {}
@TypeGraphQL.ResolveField(() => [Comment], {
nullable: false,
})
async comments(
@TypeGraphQL.Root() commentThread: CommentThread,
): Promise<Comment[]> {
return this.commentService.findMany({
where: {
commentThreadId: commentThread.id,
},
orderBy: {
// TODO: find a way to pass it in the query
createdAt: 'desc',
},
});
}
@TypeGraphQL.ResolveField(() => [CommentThreadTarget], {
nullable: true,
})
async commentThreadTargets(
@TypeGraphQL.Root() commentThread: CommentThread,
): Promise<CommentThreadTarget[]> {
return this.commentThreadTargetService.findMany({
where: {
commentThreadId: commentThread.id,
},
orderBy: {
// TODO: find a way to pass it in the query
createdAt: 'desc',
},
});
}
}

29
server/src/core/comment/resolvers/comment-thread.resolver.ts
View File

@ -11,6 +11,10 @@ import { CommentThreadService } from '../services/comment-thread.service';
import { prepareFindManyArgs } from 'src/utils/prepare-find-many';
import { UpdateOneCommentThreadArgs } from 'src/core/@generated/comment-thread/update-one-comment-thread.args';
import { Prisma } from '@prisma/client';
import {
PrismaSelector,
PrismaSelect,
} from 'src/decorators/prisma-select.decorator';
@UseGuards(JwtAuthGuard)
@Resolver(() => CommentThread)
@ -24,7 +28,9 @@ export class CommentThreadResolver {
async createOneCommentThread(
@Args() args: CreateOneCommentThreadArgs,
@AuthWorkspace() workspace: Workspace,
): Promise<CommentThread> {
@PrismaSelector({ modelName: 'CommentThread' })
prismaSelect: PrismaSelect<'CommentThread'>,
): Promise<Partial<CommentThread>> {
const newCommentData = args.data.comments?.createMany?.data
? args.data.comments?.createMany?.data?.map((comment) => ({
...comment,
@ -38,6 +44,7 @@ export class CommentThreadResolver {
...{ comments: { createMany: { data: newCommentData } } },
...{ workspace: { connect: { id: workspace.id } } },
},
select: prismaSelect.value,
});
return createdCommentThread;
@ -48,10 +55,13 @@ export class CommentThreadResolver {
})
async updateOneCommentThread(
@Args() args: UpdateOneCommentThreadArgs,
): Promise<CommentThread> {
const updatedCommentThread = await this.commentThreadService.update(
args satisfies UpdateOneCommentThreadArgs as Prisma.CommentThreadUpdateArgs,
);
@PrismaSelector({ modelName: 'CommentThread' })
prismaSelect: PrismaSelect<'CommentThread'>,
): Promise<Partial<CommentThread>> {
const updatedCommentThread = await this.commentThreadService.update({
...args,
select: prismaSelect.value,
} as Prisma.CommentThreadUpdateArgs);
return updatedCommentThread;
}
@ -60,13 +70,18 @@ export class CommentThreadResolver {
async findManyCommentThreads(
@Args() args: FindManyCommentThreadArgs,
@AuthWorkspace() workspace: Workspace,
) {
@PrismaSelector({ modelName: 'CommentThread' })
prismaSelect: PrismaSelect<'CommentThread'>,
): Promise<Partial<CommentThread>[]> {
const preparedArgs = prepareFindManyArgs<FindManyCommentThreadArgs>(
args,
workspace,
);
const result = await this.commentThreadService.findMany(preparedArgs);
const result = await this.commentThreadService.findMany({
...preparedArgs,
select: prismaSelect.value,
});
return result;
}

11
server/src/core/comment/resolvers/comment.resolver.ts
View File

@ -8,6 +8,10 @@ import { Comment } from '../../../core/@generated/comment/comment.model';
import { CreateOneCommentGuard } from '../../../guards/create-one-comment.guard';
import { Prisma } from '@prisma/client';
import { CommentService } from '../services/comment.service';
import {
PrismaSelector,
PrismaSelect,
} from 'src/decorators/prisma-select.decorator';
@UseGuards(JwtAuthGuard)
@Resolver(() => Comment)
@ -21,12 +25,15 @@ export class CommentResolver {
async createOneComment(
@Args() args: CreateOneCommentArgs,
@AuthWorkspace() workspace: Workspace,
): Promise<Comment> {
@PrismaSelector({ modelName: 'Comment' })
prismaSelect: PrismaSelect<'Comment'>,
): Promise<Partial<Comment>> {
return this.commentService.create({
data: {
...args.data,
...{ workspace: { connect: { id: workspace.id } } },
},
} satisfies CreateOneCommentArgs as Prisma.CommentCreateArgs);
select: prismaSelect.value,
} as Prisma.CommentCreateArgs);
}
}