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

6
server/src/core/pipeline/pipeline.module.ts
View File

@ -1,11 +1,8 @@
import { Module } from '@nestjs/common';
import { PipelineService } from './services/pipeline.service';
import { PipelineResolver } from './resolvers/pipeline.resolver';
import { PipelineRelationsResolver } from './resolvers/pipeline-relations.resolver';
import { PipelineStageResolver } from './resolvers/pipeline-stage.resolver';
import { PipelineStageRelationsResolver } from './resolvers/pipeline-stage-relations.resolver';
import { PipelineProgressResolver } from './resolvers/pipeline-progress.resolver';
import { PipelineProgressRelationsResolver } from './resolvers/pipeline-progress-relations.resolver';
import { PipelineStageService } from './services/pipeline-stage.service';
import { PipelineProgressService } from './services/pipeline-progress.service';
@ -16,11 +13,8 @@ import { PipelineProgressService } from './services/pipeline-progress.service';
PipelineStageService,
PipelineProgressService,
PipelineResolver,
PipelineRelationsResolver,
PipelineStageResolver,
PipelineStageRelationsResolver,
PipelineProgressResolver,
PipelineProgressRelationsResolver,
],
exports: [PipelineService, PipelineStageService, PipelineProgressService],
})

32
server/src/core/pipeline/resolvers/pipeline-progress-relations.resolver.spec.ts
View File

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

40
server/src/core/pipeline/resolvers/pipeline-progress-relations.resolver.ts
View File

@ -1,40 +0,0 @@
import * as TypeGraphQL from '@nestjs/graphql';
import { PipelineProgress } from 'src/core/@generated/pipeline-progress/pipeline-progress.model';
import { PipelineStage } from 'src/core/@generated/pipeline-stage/pipeline-stage.model';
import { Pipeline } from 'src/core/@generated/pipeline/pipeline.model';
import { PipelineStageService } from '../services/pipeline-stage.service';
import { PipelineService } from '../services/pipeline.service';
@TypeGraphQL.Resolver(() => PipelineProgress)
export class PipelineProgressRelationsResolver {
constructor(
private readonly pipelineStageService: PipelineStageService,
private readonly pipelineService: PipelineService,
) {}
@TypeGraphQL.ResolveField(() => PipelineStage, {
nullable: false,
})
async pipelineStage(
@TypeGraphQL.Root() pipelineStage: PipelineProgress,
): Promise<PipelineStage> {
return this.pipelineStageService.findUniqueOrThrow({
where: {
id: pipelineStage.pipelineStageId,
},
});
}
@TypeGraphQL.ResolveField(() => Pipeline, {
nullable: false,
})
async pipeline(
@TypeGraphQL.Root() pipelineStage: PipelineProgress,
): Promise<Pipeline> {
return this.pipelineService.findUniqueOrThrow({
where: {
id: pipelineStage.pipelineId,
},
});
}
}

23
server/src/core/pipeline/resolvers/pipeline-progress.resolver.ts
View File

@ -22,6 +22,10 @@ import {
} from 'src/ability/handlers/pipeline-progress.ability-handler';
import { UserAbility } from 'src/decorators/user-ability.decorator';
import { AppAbility } from 'src/ability/ability.factory';
import {
PrismaSelector,
PrismaSelect,
} from 'src/decorators/prisma-select.decorator';
@UseGuards(JwtAuthGuard)
@Resolver(() => PipelineProgress)
@ -36,13 +40,16 @@ export class PipelineProgressResolver {
async findManyPipelineProgress(
@Args() args: FindManyPipelineProgressArgs,
@UserAbility() ability: AppAbility,
) {
@PrismaSelector({ modelName: 'PipelineProgress' })
prismaSelect: PrismaSelect<'PipelineProgress'>,
): Promise<Partial<PipelineProgress>[]> {
return this.pipelineProgressService.findMany({
...args,
where: {
...args.where,
AND: [accessibleBy(ability).PipelineProgress],
},
select: prismaSelect.value,
});
}
@ -53,10 +60,13 @@ export class PipelineProgressResolver {
@CheckAbilities(UpdatePipelineProgressAbilityHandler)
async updateOnePipelineProgress(
@Args() args: UpdateOnePipelineProgressArgs,
): Promise<PipelineProgress | null> {
@PrismaSelector({ modelName: 'PipelineProgress' })
prismaSelect: PrismaSelect<'PipelineProgress'>,
): Promise<Partial<PipelineProgress> | null> {
return this.pipelineProgressService.update({
...args,
} satisfies UpdateOnePipelineProgressArgs as Prisma.PipelineProgressUpdateArgs);
select: prismaSelect.value,
} as Prisma.PipelineProgressUpdateArgs);
}
@Mutation(() => AffectedRows, {
@ -80,12 +90,15 @@ export class PipelineProgressResolver {
async createOnePipelineProgress(
@Args() args: CreateOnePipelineProgressArgs,
@AuthWorkspace() workspace: Workspace,
): Promise<PipelineProgress> {
@PrismaSelector({ modelName: 'PipelineProgress' })
prismaSelect: PrismaSelect<'PipelineProgress'>,
): Promise<Partial<PipelineProgress>> {
return this.pipelineProgressService.create({
data: {
...args.data,
...{ workspace: { connect: { id: workspace.id } } },
},
} satisfies CreateOnePipelineProgressArgs as Prisma.PipelineProgressCreateArgs);
select: prismaSelect.value,
} as Prisma.PipelineProgressCreateArgs);
}
}

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

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

24
server/src/core/pipeline/resolvers/pipeline-relations.resolver.ts
View File

@ -1,24 +0,0 @@
import * as TypeGraphQL from '@nestjs/graphql';
import { PipelineStage } from 'src/core/@generated/pipeline-stage/pipeline-stage.model';
import { Pipeline } from 'src/core/@generated/pipeline/pipeline.model';
import { PipelineStageService } from '../services/pipeline-stage.service';
@TypeGraphQL.Resolver(() => Pipeline)
export class PipelineRelationsResolver {
constructor(private readonly pipelineStageService: PipelineStageService) {}
@TypeGraphQL.ResolveField(() => [PipelineStage], {
nullable: false,
})
async pipelineStages(
@TypeGraphQL.Root() pipeline: Pipeline,
): Promise<PipelineStage[]> {
return this.pipelineStageService.findMany({
where: {
pipelineId: {
equals: pipeline.id,
},
},
});
}
}

27
server/src/core/pipeline/resolvers/pipeline-stage-relations.resolver.spec.ts
View File

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

26
server/src/core/pipeline/resolvers/pipeline-stage-relations.resolver.ts
View File

@ -1,26 +0,0 @@
import * as TypeGraphQL from '@nestjs/graphql';
import { PipelineProgress } from 'src/core/@generated/pipeline-progress/pipeline-progress.model';
import { PipelineStage } from 'src/core/@generated/pipeline-stage/pipeline-stage.model';
import { PipelineProgressService } from '../services/pipeline-progress.service';
@TypeGraphQL.Resolver(() => PipelineStage)
export class PipelineStageRelationsResolver {
constructor(
private readonly pipelineProgressService: PipelineProgressService,
) {}
@TypeGraphQL.ResolveField(() => [PipelineProgress], {
nullable: false,
})
async pipelineProgresses(
@TypeGraphQL.Root() pipelineStage: PipelineStage,
): Promise<PipelineProgress[]> {
return this.pipelineProgressService.findMany({
where: {
pipelineStageId: {
equals: pipelineStage.id,
},
},
});
}
}

9
server/src/core/pipeline/resolvers/pipeline-stage.resolver.ts
View File

@ -10,6 +10,10 @@ import { CheckAbilities } from 'src/decorators/check-abilities.decorator';
import { ReadPipelineStageAbilityHandler } from 'src/ability/handlers/pipeline-stage.ability-handler';
import { UserAbility } from 'src/decorators/user-ability.decorator';
import { AppAbility } from 'src/ability/ability.factory';
import {
PrismaSelector,
PrismaSelect,
} from 'src/decorators/prisma-select.decorator';
@UseGuards(JwtAuthGuard)
@Resolver(() => PipelineStage)
@ -22,13 +26,16 @@ export class PipelineStageResolver {
async findManyPipelineStage(
@Args() args: FindManyPipelineStageArgs,
@UserAbility() ability: AppAbility,
) {
@PrismaSelector({ modelName: 'PipelineStage' })
prismaSelect: PrismaSelect<'PipelineStage'>,
): Promise<Partial<PipelineStage>[]> {
return this.pipelineStageService.findMany({
...args,
where: {
...args.where,
AND: [accessibleBy(ability).PipelineStage],
},
select: prismaSelect.value,
});
}
}

9
server/src/core/pipeline/resolvers/pipeline.resolver.ts
View File

@ -10,6 +10,10 @@ import { CheckAbilities } from 'src/decorators/check-abilities.decorator';
import { ReadPipelineAbilityHandler } from 'src/ability/handlers/pipeline.ability-handler';
import { UserAbility } from 'src/decorators/user-ability.decorator';
import { AppAbility } from 'src/ability/ability.factory';
import {
PrismaSelector,
PrismaSelect,
} from 'src/decorators/prisma-select.decorator';
@UseGuards(JwtAuthGuard)
@Resolver(() => Pipeline)
@ -22,13 +26,16 @@ export class PipelineResolver {
async findManyPipeline(
@Args() args: FindManyPipelineArgs,
@UserAbility() ability: AppAbility,
) {
@PrismaSelector({ modelName: 'Pipeline' })
prismaSelect: PrismaSelect<'Pipeline'>,
): Promise<Partial<Pipeline>[]> {
return this.pipelineService.findMany({
...args,
where: {
...args.where,
AND: [accessibleBy(ability).Pipeline],
},
select: prismaSelect.value,
});
}
}