chore: refacto NestJS in modules (#308)
* chore: wip refacto in modules * fix: rollback port * fix: jwt guard in wrong folder * chore: rename folder exception-filter in filters * fix: tests are running * fix: excessive stack depth comparing types * fix: auth issue * chore: move createUser in UserService * fix: test * fix: guards * fix: jwt guard don't handle falsy user
This commit is contained in:
22
server/src/core/comment/comment.module.ts
Normal file
22
server/src/core/comment/comment.module.ts
Normal file
@ -0,0 +1,22 @@
|
||||
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({
|
||||
providers: [
|
||||
CommentService,
|
||||
CommentThreadService,
|
||||
CommentThreadTargetService,
|
||||
CommentResolver,
|
||||
CommentRelationsResolver,
|
||||
CommentThreadResolver,
|
||||
CommentThreadRelationsResolver,
|
||||
],
|
||||
exports: [CommentService, CommentThreadService, CommentThreadTargetService],
|
||||
})
|
||||
export class CommentModule {}
|
||||
@ -0,0 +1,25 @@
|
||||
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();
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,22 @@
|
||||
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({});
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
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();
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,48 @@
|
||||
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',
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { CommentThreadResolver } from './comment-thread.resolver';
|
||||
import { CommentThreadService } from '../services/comment-thread.service';
|
||||
import { CanActivate } from '@nestjs/common';
|
||||
import { CreateOneCommentGuard } from 'src/guards/create-one-comment.guard';
|
||||
import { CreateOneCommentThreadGuard } from 'src/guards/create-one-comment-thread.guard';
|
||||
|
||||
describe('CommentThreadResolver', () => {
|
||||
let resolver: CommentThreadResolver;
|
||||
|
||||
beforeEach(async () => {
|
||||
const mockGuard: CanActivate = { canActivate: jest.fn(() => true) };
|
||||
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [
|
||||
CommentThreadResolver,
|
||||
{
|
||||
provide: CommentThreadService,
|
||||
useValue: {},
|
||||
},
|
||||
],
|
||||
})
|
||||
.overrideGuard(CreateOneCommentGuard)
|
||||
.useValue(mockGuard)
|
||||
.overrideGuard(CreateOneCommentThreadGuard)
|
||||
.useValue(mockGuard)
|
||||
.compile();
|
||||
|
||||
resolver = module.get<CommentThreadResolver>(CommentThreadResolver);
|
||||
});
|
||||
|
||||
it('should be defined', () => {
|
||||
expect(resolver).toBeDefined();
|
||||
});
|
||||
});
|
||||
73
server/src/core/comment/resolvers/comment-thread.resolver.ts
Normal file
73
server/src/core/comment/resolvers/comment-thread.resolver.ts
Normal file
@ -0,0 +1,73 @@
|
||||
import { Resolver, Args, Mutation, Query } from '@nestjs/graphql';
|
||||
import { UseGuards } from '@nestjs/common';
|
||||
import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
|
||||
import { Workspace } from '../../../core/@generated/workspace/workspace.model';
|
||||
import { AuthWorkspace } from '../../../decorators/auth-workspace.decorator';
|
||||
import { CommentThread } from '../../../core/@generated/comment-thread/comment-thread.model';
|
||||
import { CreateOneCommentThreadArgs } from '../../../core/@generated/comment-thread/create-one-comment-thread.args';
|
||||
import { CreateOneCommentThreadGuard } from '../../../guards/create-one-comment-thread.guard';
|
||||
import { FindManyCommentThreadArgs } from '../../../core/@generated/comment-thread/find-many-comment-thread.args';
|
||||
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';
|
||||
|
||||
@UseGuards(JwtAuthGuard)
|
||||
@Resolver(() => CommentThread)
|
||||
export class CommentThreadResolver {
|
||||
constructor(private readonly commentThreadService: CommentThreadService) {}
|
||||
|
||||
@UseGuards(CreateOneCommentThreadGuard)
|
||||
@Mutation(() => CommentThread, {
|
||||
nullable: false,
|
||||
})
|
||||
async createOneCommentThread(
|
||||
@Args() args: CreateOneCommentThreadArgs,
|
||||
@AuthWorkspace() workspace: Workspace,
|
||||
): Promise<CommentThread> {
|
||||
const newCommentData = args.data.comments?.createMany?.data
|
||||
? args.data.comments?.createMany?.data?.map((comment) => ({
|
||||
...comment,
|
||||
...{ workspaceId: workspace.id },
|
||||
}))
|
||||
: [];
|
||||
|
||||
const createdCommentThread = await this.commentThreadService.create({
|
||||
data: {
|
||||
...args.data,
|
||||
...{ comments: { createMany: { data: newCommentData } } },
|
||||
...{ workspace: { connect: { id: workspace.id } } },
|
||||
},
|
||||
});
|
||||
|
||||
return createdCommentThread;
|
||||
}
|
||||
|
||||
@Mutation(() => CommentThread, {
|
||||
nullable: false,
|
||||
})
|
||||
async updateOneCommentThread(
|
||||
@Args() args: UpdateOneCommentThreadArgs,
|
||||
): Promise<CommentThread> {
|
||||
const updatedCommentThread = await this.commentThreadService.update(
|
||||
args satisfies UpdateOneCommentThreadArgs as Prisma.CommentThreadUpdateArgs,
|
||||
);
|
||||
|
||||
return updatedCommentThread;
|
||||
}
|
||||
|
||||
@Query(() => [CommentThread])
|
||||
async findManyCommentThreads(
|
||||
@Args() args: FindManyCommentThreadArgs,
|
||||
@AuthWorkspace() workspace: Workspace,
|
||||
) {
|
||||
const preparedArgs = prepareFindManyArgs<FindManyCommentThreadArgs>(
|
||||
args,
|
||||
workspace,
|
||||
);
|
||||
|
||||
const result = await this.commentThreadService.findMany(preparedArgs);
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
32
server/src/core/comment/resolvers/comment.resolver.spec.ts
Normal file
32
server/src/core/comment/resolvers/comment.resolver.spec.ts
Normal file
@ -0,0 +1,32 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { CommentResolver } from './comment.resolver';
|
||||
import { CommentService } from '../services/comment.service';
|
||||
import { CreateOneCommentGuard } from 'src/guards/create-one-comment.guard';
|
||||
import { CanActivate } from '@nestjs/common';
|
||||
|
||||
describe('CommentResolver', () => {
|
||||
let resolver: CommentResolver;
|
||||
|
||||
beforeEach(async () => {
|
||||
const mockGuard: CanActivate = { canActivate: jest.fn(() => true) };
|
||||
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [
|
||||
CommentResolver,
|
||||
{
|
||||
provide: CommentService,
|
||||
useValue: {},
|
||||
},
|
||||
],
|
||||
})
|
||||
.overrideGuard(CreateOneCommentGuard)
|
||||
.useValue(mockGuard)
|
||||
.compile();
|
||||
|
||||
resolver = module.get<CommentResolver>(CommentResolver);
|
||||
});
|
||||
|
||||
it('should be defined', () => {
|
||||
expect(resolver).toBeDefined();
|
||||
});
|
||||
});
|
||||
32
server/src/core/comment/resolvers/comment.resolver.ts
Normal file
32
server/src/core/comment/resolvers/comment.resolver.ts
Normal file
@ -0,0 +1,32 @@
|
||||
import { Resolver, Args, Mutation } from '@nestjs/graphql';
|
||||
import { UseGuards } from '@nestjs/common';
|
||||
import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
|
||||
import { Workspace } from '../../../core/@generated/workspace/workspace.model';
|
||||
import { AuthWorkspace } from '../../../decorators/auth-workspace.decorator';
|
||||
import { CreateOneCommentArgs } from '../../../core/@generated/comment/create-one-comment.args';
|
||||
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';
|
||||
|
||||
@UseGuards(JwtAuthGuard)
|
||||
@Resolver(() => Comment)
|
||||
export class CommentResolver {
|
||||
constructor(private readonly commentService: CommentService) {}
|
||||
|
||||
@UseGuards(CreateOneCommentGuard)
|
||||
@Mutation(() => Comment, {
|
||||
nullable: false,
|
||||
})
|
||||
async createOneComment(
|
||||
@Args() args: CreateOneCommentArgs,
|
||||
@AuthWorkspace() workspace: Workspace,
|
||||
): Promise<Comment> {
|
||||
return this.commentService.create({
|
||||
data: {
|
||||
...args.data,
|
||||
...{ workspace: { connect: { id: workspace.id } } },
|
||||
},
|
||||
} satisfies CreateOneCommentArgs as Prisma.CommentCreateArgs);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { CommentThreadTargetService } from './comment-thread-target.service';
|
||||
import { PrismaService } from 'src/database/prisma.service';
|
||||
import { prismaMock } from 'src/prisma-mock/jest-prisma-singleton';
|
||||
|
||||
describe('CommentThreadTargetService', () => {
|
||||
let service: CommentThreadTargetService;
|
||||
|
||||
beforeEach(async () => {
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [
|
||||
CommentThreadTargetService,
|
||||
{
|
||||
provide: PrismaService,
|
||||
useValue: prismaMock,
|
||||
},
|
||||
],
|
||||
}).compile();
|
||||
|
||||
service = module.get<CommentThreadTargetService>(
|
||||
CommentThreadTargetService,
|
||||
);
|
||||
});
|
||||
|
||||
it('should be defined', () => {
|
||||
expect(service).toBeDefined();
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,38 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { PrismaService } from 'src/database/prisma.service';
|
||||
|
||||
@Injectable()
|
||||
export class CommentThreadTargetService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.commentThreadTarget.findFirst;
|
||||
findFirstOrThrow = this.prismaService.commentThreadTarget.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.commentThreadTarget.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.commentThreadTarget.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.commentThreadTarget.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.commentThreadTarget.create;
|
||||
createMany = this.prismaService.commentThreadTarget.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.commentThreadTarget.update;
|
||||
upsert = this.prismaService.commentThreadTarget.upsert;
|
||||
updateMany = this.prismaService.commentThreadTarget.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.commentThreadTarget.delete;
|
||||
deleteMany = this.prismaService.commentThreadTarget.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.commentThreadTarget.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.commentThreadTarget.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.commentThreadTarget.groupBy;
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { CommentThreadService } from './comment-thread.service';
|
||||
import { PrismaService } from 'src/database/prisma.service';
|
||||
import { prismaMock } from 'src/prisma-mock/jest-prisma-singleton';
|
||||
|
||||
describe('CommentThreadService', () => {
|
||||
let service: CommentThreadService;
|
||||
|
||||
beforeEach(async () => {
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [
|
||||
CommentThreadService,
|
||||
{
|
||||
provide: PrismaService,
|
||||
useValue: prismaMock,
|
||||
},
|
||||
],
|
||||
}).compile();
|
||||
|
||||
service = module.get<CommentThreadService>(CommentThreadService);
|
||||
});
|
||||
|
||||
it('should be defined', () => {
|
||||
expect(service).toBeDefined();
|
||||
});
|
||||
});
|
||||
38
server/src/core/comment/services/comment-thread.service.ts
Normal file
38
server/src/core/comment/services/comment-thread.service.ts
Normal file
@ -0,0 +1,38 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { PrismaService } from 'src/database/prisma.service';
|
||||
|
||||
@Injectable()
|
||||
export class CommentThreadService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.commentThread.findFirst;
|
||||
findFirstOrThrow = this.prismaService.commentThread.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.commentThread.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.commentThread.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.commentThread.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.commentThread.create;
|
||||
createMany = this.prismaService.commentThread.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.commentThread.update;
|
||||
upsert = this.prismaService.commentThread.upsert;
|
||||
updateMany = this.prismaService.commentThread.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.commentThread.delete;
|
||||
deleteMany = this.prismaService.commentThread.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.commentThread.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.commentThread.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.commentThread.groupBy;
|
||||
}
|
||||
26
server/src/core/comment/services/comment.service.spec.ts
Normal file
26
server/src/core/comment/services/comment.service.spec.ts
Normal file
@ -0,0 +1,26 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { CommentService } from './comment.service';
|
||||
import { PrismaService } from 'src/database/prisma.service';
|
||||
import { prismaMock } from 'src/prisma-mock/jest-prisma-singleton';
|
||||
|
||||
describe('CommentService', () => {
|
||||
let service: CommentService;
|
||||
|
||||
beforeEach(async () => {
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [
|
||||
CommentService,
|
||||
{
|
||||
provide: PrismaService,
|
||||
useValue: prismaMock,
|
||||
},
|
||||
],
|
||||
}).compile();
|
||||
|
||||
service = module.get<CommentService>(CommentService);
|
||||
});
|
||||
|
||||
it('should be defined', () => {
|
||||
expect(service).toBeDefined();
|
||||
});
|
||||
});
|
||||
38
server/src/core/comment/services/comment.service.ts
Normal file
38
server/src/core/comment/services/comment.service.ts
Normal file
@ -0,0 +1,38 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { PrismaService } from 'src/database/prisma.service';
|
||||
|
||||
@Injectable()
|
||||
export class CommentService {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
// Find
|
||||
findFirst = this.prismaService.comment.findFirst;
|
||||
findFirstOrThrow = this.prismaService.comment.findFirstOrThrow;
|
||||
|
||||
findUnique = this.prismaService.comment.findUnique;
|
||||
findUniqueOrThrow = this.prismaService.comment.findUniqueOrThrow;
|
||||
|
||||
findMany = this.prismaService.comment.findMany;
|
||||
|
||||
// Create
|
||||
create = this.prismaService.comment.create;
|
||||
createMany = this.prismaService.comment.createMany;
|
||||
|
||||
// Update
|
||||
update = this.prismaService.comment.update;
|
||||
upsert = this.prismaService.comment.upsert;
|
||||
updateMany = this.prismaService.comment.updateMany;
|
||||
|
||||
// Delete
|
||||
delete = this.prismaService.comment.delete;
|
||||
deleteMany = this.prismaService.comment.deleteMany;
|
||||
|
||||
// Aggregate
|
||||
aggregate = this.prismaService.comment.aggregate;
|
||||
|
||||
// Count
|
||||
count = this.prismaService.comment.count;
|
||||
|
||||
// GroupBy
|
||||
groupBy = this.prismaService.comment.groupBy;
|
||||
}
|
||||
Reference in New Issue
Block a user