From bc98a41614c89a2cca72d3c212566dbf96fd291e Mon Sep 17 00:00:00 2001 From: Arswarog Date: Tue, 17 Nov 2026 19:12:34 +0300 Subject: [PATCH] profile: dto, prisma access, resolver with dataloaders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - PrismaModule/PrismaService на pg-адаптере (Prisma 7 без движка запросов) - DTO профиля и связей; служебные id/profileId не публикуются в GraphQL - ProfileService — единственное место запросов к БД - DataLoader'ы на каждый запрос: 1 SQL на профиль + по 1 на затронутую связь - GraphQLModule.forRootAsync кладёт лоадеры в контекст - клиент Prisma генерируется в src/, иначе сборка с rootDir src не видит его - DATABASE_URL для api-контейнера собирается в docker-compose --- .gitignore | 2 +- .oxlintrc.json | 1 + .prettierignore | 1 + docker-compose.staging.yml | 1 + package.json | 3 +- prisma/schema.prisma | 2 +- src/app.module.ts | 25 ++++--- src/graphql.ts | 30 +++++++- src/main.ts | 2 + src/prisma/prisma.module.ts | 9 +++ src/prisma/prisma.service.ts | 22 ++++++ src/profile/dto/experience.dto.ts | 18 +++++ src/profile/dto/index.ts | 4 + src/profile/dto/link.dto.ts | 12 +++ src/profile/dto/profile.dto.ts | 28 ++++++- src/profile/dto/project.dto.ts | 15 ++++ src/profile/dto/skill.dto.ts | 9 +++ src/profile/profile.loaders.ts | 52 +++++++++++++ src/profile/profile.module.ts | 8 +- src/profile/profile.resolver.ts | 13 ---- src/profile/profile.service.ts | 89 ++++++++++++++++++++++- src/profile/resolvers/index.ts | 2 + src/profile/resolvers/profile.resolver.ts | 45 ++++++++++++ src/profile/resolvers/skill.resolver.ts | 17 +++++ yarn.lock | 8 ++ 25 files changed, 386 insertions(+), 32 deletions(-) create mode 100644 src/prisma/prisma.module.ts create mode 100644 src/prisma/prisma.service.ts create mode 100644 src/profile/dto/experience.dto.ts create mode 100644 src/profile/dto/link.dto.ts create mode 100644 src/profile/dto/project.dto.ts create mode 100644 src/profile/dto/skill.dto.ts create mode 100644 src/profile/profile.loaders.ts delete mode 100644 src/profile/profile.resolver.ts create mode 100644 src/profile/resolvers/index.ts create mode 100644 src/profile/resolvers/profile.resolver.ts create mode 100644 src/profile/resolvers/skill.resolver.ts diff --git a/.gitignore b/.gitignore index 7737ec1..ef88772 100644 --- a/.gitignore +++ b/.gitignore @@ -59,4 +59,4 @@ pids # Diagnostic reports (https://nodejs.org/api/report.html) report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json -/generated/prisma +/src/generated diff --git a/.oxlintrc.json b/.oxlintrc.json index 554f9be..b91a744 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -1,5 +1,6 @@ { "$schema": "./node_modules/oxlint/configuration_schema.json", + "ignorePatterns": ["src/generated"], "rules": { "typescript/no-explicit-any": "off", "typescript/no-floating-promises": "error" diff --git a/.prettierignore b/.prettierignore index ac34991..579be02 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,6 @@ dist coverage +src/generated *.d.ts node_modules .obsidian diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index ae9ae1e..97739e2 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -19,6 +19,7 @@ services: POSTGRES_DB: ${POSTGRES_DB:-} POSTGRES_HOST: ${POSTGRES_HOST:-} POSTGRES_PORT: ${POSTGRES_PORT:-5432} + DATABASE_URL: postgres://${POSTGRES_USER:-}:${POSTGRES_PASSWORD:-}@${POSTGRES_HOST:-}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-} labels: caddy: ${BRANCH}.it-smi.jt4d.ru.net caddy.reverse_proxy: '{{upstreams 5000}}' diff --git a/package.json b/package.json index e9842be..1e985d3 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "type": "module", "packageManager": "yarn@4.18.0", "scripts": { - "build": "nest build", + "build": "prisma generate && nest build", "deploy": "nest deploy", "format": "prettier --write \"src/**/*.ts\"", "start": "nest start", @@ -32,6 +32,7 @@ "@nestjs/platform-express": "^12.0.1", "@prisma/adapter-pg": "^7.10.1", "@prisma/client": "^7.10.1", + "dataloader": "^2.2.3", "dotenv": "^18.0.10", "graphql": "^17.1.0", "pg": "^8.23.1", diff --git a/prisma/schema.prisma b/prisma/schema.prisma index eab6873..9ad581f 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -5,7 +5,7 @@ generator client { provider = "prisma-client" - output = "../generated/prisma" + output = "../src/generated/prisma" } datasource db { diff --git a/src/app.module.ts b/src/app.module.ts index 59e81ae..1735f23 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -7,22 +7,29 @@ import { ApolloServerPluginLandingPageLocalDefault } from '@apollo/server/plugin import { AppController } from './app.controller.js'; import { AppService } from './app.service.js'; import { ProfileModule } from './profile/profile.module.js'; +import { createProfileLoaders, GraphQLContext } from './profile/profile.loaders.js'; +import { ProfileService } from './profile/profile.service.js'; @Module({ imports: [ - GraphQLModule.forRoot({ + GraphQLModule.forRootAsync({ driver: ApolloDriver, + imports: [ProfileModule], + inject: [ProfileService], + useFactory: (profileService: ProfileService) => ({ + autoSchemaFile: true, + sortSchema: true, - autoSchemaFile: true, - sortSchema: true, + definitions: { + path: join(process.cwd(), 'src/graphql.ts'), + outputAs: 'class', + }, - definitions: { - path: join(process.cwd(), 'src/graphql.ts'), - outputAs: 'class', - }, + playground: false, + plugins: [ApolloServerPluginLandingPageLocalDefault()], - playground: false, - plugins: [ApolloServerPluginLandingPageLocalDefault()], + context: (): GraphQLContext => ({ loaders: createProfileLoaders(profileService) }), + }), }), ProfileModule, ], diff --git a/src/graphql.ts b/src/graphql.ts index 32bb1c4..620a7b0 100644 --- a/src/graphql.ts +++ b/src/graphql.ts @@ -8,13 +8,41 @@ /* tslint:disable */ /* eslint-disable */ +export class ExperienceDto { + achievements: string[]; + company: string; + period: string; + position: string; +} + +export class LinkDto { + link: string; + name: string; +} + export class ProfileDto { + description: string; + experience: ExperienceDto[]; firstName: string; lastName: string; + links: LinkDto[]; + projects: ProjectDto[]; + skills: SkillDto[]; +} + +export class ProjectDto { + description: string; + link: string; + name: string; } export abstract class IQuery { - abstract profile(): ProfileDto | Promise; + abstract profile(): Nullable | Promise>; +} + +export class SkillDto { + name: string; + profile: ProfileDto; } type Nullable = T | null; diff --git a/src/main.ts b/src/main.ts index 5b1c525..9d13373 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,3 +1,5 @@ +import 'dotenv/config'; + import { NestFactory } from '@nestjs/core'; import { AppModule } from './app.module.js'; diff --git a/src/prisma/prisma.module.ts b/src/prisma/prisma.module.ts new file mode 100644 index 0000000..74eb425 --- /dev/null +++ b/src/prisma/prisma.module.ts @@ -0,0 +1,9 @@ +import { Module } from '@nestjs/common'; + +import { PrismaService } from './prisma.service.js'; + +@Module({ + providers: [PrismaService], + exports: [PrismaService], +}) +export class PrismaModule {} diff --git a/src/prisma/prisma.service.ts b/src/prisma/prisma.service.ts new file mode 100644 index 0000000..9c693a9 --- /dev/null +++ b/src/prisma/prisma.service.ts @@ -0,0 +1,22 @@ +import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common'; +import { PrismaPg } from '@prisma/adapter-pg'; + +import { PrismaClient } from '../generated/prisma/client.js'; + +/** + * Единственная точка доступа к БД. + */ +@Injectable() +export class PrismaService extends PrismaClient implements OnModuleInit, OnModuleDestroy { + constructor() { + super({ adapter: new PrismaPg(process.env.DATABASE_URL ?? '') }); + } + + async onModuleInit(): Promise { + await this.$connect(); + } + + async onModuleDestroy(): Promise { + await this.$disconnect(); + } +} diff --git a/src/profile/dto/experience.dto.ts b/src/profile/dto/experience.dto.ts new file mode 100644 index 0000000..0f85b62 --- /dev/null +++ b/src/profile/dto/experience.dto.ts @@ -0,0 +1,18 @@ +import { Field, ObjectType } from '@nestjs/graphql'; + +@ObjectType({ description: 'Опыт работы' }) +export class ExperienceDto { + profileId: number; + + @Field(() => String, { description: 'Компания' }) + company: string; + + @Field(() => String, { description: 'Должность' }) + position: string; + + @Field(() => String, { description: 'Период работы' }) + period: string; + + @Field(() => [String], { description: 'Достижения' }) + achievements: string[]; +} diff --git a/src/profile/dto/index.ts b/src/profile/dto/index.ts index e390c2c..1e2021c 100644 --- a/src/profile/dto/index.ts +++ b/src/profile/dto/index.ts @@ -1 +1,5 @@ +export { ExperienceDto } from './experience.dto.js'; +export { LinkDto } from './link.dto.js'; export { ProfileDto } from './profile.dto.js'; +export { ProjectDto } from './project.dto.js'; +export { SkillDto } from './skill.dto.js'; diff --git a/src/profile/dto/link.dto.ts b/src/profile/dto/link.dto.ts new file mode 100644 index 0000000..92a1075 --- /dev/null +++ b/src/profile/dto/link.dto.ts @@ -0,0 +1,12 @@ +import { Field, ObjectType } from '@nestjs/graphql'; + +@ObjectType({ description: 'Ссылка' }) +export class LinkDto { + profileId: number; + + @Field(() => String, { description: 'Название ресурса' }) + name: string; + + @Field(() => String, { description: 'Адрес ссылки' }) + link: string; +} diff --git a/src/profile/dto/profile.dto.ts b/src/profile/dto/profile.dto.ts index a63dbb2..31a1cc5 100644 --- a/src/profile/dto/profile.dto.ts +++ b/src/profile/dto/profile.dto.ts @@ -1,10 +1,32 @@ import { Field, ObjectType } from '@nestjs/graphql'; -@ObjectType() +import { ExperienceDto } from './experience.dto.js'; +import { LinkDto } from './link.dto.js'; +import { ProjectDto } from './project.dto.js'; +import { SkillDto } from './skill.dto.js'; + +@ObjectType({ description: 'Профиль и связанные с ним данные' }) export class ProfileDto { - @Field() + id: number; + + @Field(() => String, { description: 'Имя' }) firstName: string; - @Field() + @Field(() => String, { description: 'Фамилия' }) lastName: string; + + @Field(() => String, { description: 'Краткое описание' }) + description: string; + + @Field(() => [SkillDto], { description: 'Навыки' }) + skills?: SkillDto[]; + + @Field(() => [LinkDto], { description: 'Ссылки на профессиональные ресурсы' }) + links?: LinkDto[]; + + @Field(() => [ExperienceDto], { description: 'Опыт работы' }) + experience?: ExperienceDto[]; + + @Field(() => [ProjectDto], { description: 'Проекты' }) + projects?: ProjectDto[]; } diff --git a/src/profile/dto/project.dto.ts b/src/profile/dto/project.dto.ts new file mode 100644 index 0000000..720e133 --- /dev/null +++ b/src/profile/dto/project.dto.ts @@ -0,0 +1,15 @@ +import { Field, ObjectType } from '@nestjs/graphql'; + +@ObjectType({ description: 'Проект' }) +export class ProjectDto { + profileId: number; + + @Field(() => String, { description: 'Название проекта' }) + name: string; + + @Field(() => String, { description: 'Адрес проекта или его репозитория' }) + link: string; + + @Field(() => String, { description: 'Описание проекта' }) + description: string; +} diff --git a/src/profile/dto/skill.dto.ts b/src/profile/dto/skill.dto.ts new file mode 100644 index 0000000..1652e37 --- /dev/null +++ b/src/profile/dto/skill.dto.ts @@ -0,0 +1,9 @@ +import { Field, ObjectType } from '@nestjs/graphql'; + +@ObjectType({ description: 'Навык' }) +export class SkillDto { + profileId: number; + + @Field(() => String, { description: 'Название навыка' }) + name: string; +} diff --git a/src/profile/profile.loaders.ts b/src/profile/profile.loaders.ts new file mode 100644 index 0000000..56a503a --- /dev/null +++ b/src/profile/profile.loaders.ts @@ -0,0 +1,52 @@ +import DataLoader from 'dataloader'; + +import { ExperienceDto, LinkDto, ProfileDto, ProjectDto, SkillDto } from './dto/index.js'; +import { ProfileService } from './profile.service.js'; + +export interface ProfileLoaders { + profiles: DataLoader; + skills: DataLoader; + links: DataLoader; + experience: DataLoader; + projects: DataLoader; +} + +export interface GraphQLContext { + loaders: ProfileLoaders; +} + +function loaderByProfileId( + load: (profileIds: number[]) => Promise, +): DataLoader { + return new DataLoader(async (profileIds) => { + const rows = await load([...profileIds]); + const buckets = new Map(profileIds.map((id) => [id, []])); + + for (const row of rows) { + buckets.get(row.profileId)?.push(row); + } + + return profileIds.map((id) => buckets.get(id) ?? []); + }); +} + +function loaderById( + load: (ids: number[]) => Promise, +): DataLoader { + return new DataLoader(async (ids) => { + const rows = await load([...ids]); + const byId = new Map(rows.map((row) => [row.id, row])); + + return ids.map((id) => byId.get(id) ?? null); + }); +} + +export function createProfileLoaders(profileService: ProfileService): ProfileLoaders { + return { + profiles: loaderById((ids) => profileService.getProfiles(ids)), + skills: loaderByProfileId((profileIds) => profileService.getSkills(profileIds)), + links: loaderByProfileId((profileIds) => profileService.getLinks(profileIds)), + experience: loaderByProfileId((profileIds) => profileService.getExperiences(profileIds)), + projects: loaderByProfileId((profileIds) => profileService.getProjects(profileIds)), + }; +} diff --git a/src/profile/profile.module.ts b/src/profile/profile.module.ts index 3f247e9..b299eb9 100644 --- a/src/profile/profile.module.ts +++ b/src/profile/profile.module.ts @@ -1,8 +1,12 @@ import { Module } from '@nestjs/common'; + +import { PrismaModule } from '../prisma/prisma.module.js'; +import { ProfileResolver, SkillResolver } from './resolvers/index.js'; import { ProfileService } from './profile.service.js'; -import { ProfileResolver } from './profile.resolver.js'; @Module({ - providers: [ProfileService, ProfileResolver], + imports: [PrismaModule], + providers: [ProfileService, ProfileResolver, SkillResolver], + exports: [ProfileService], }) export class ProfileModule {} diff --git a/src/profile/profile.resolver.ts b/src/profile/profile.resolver.ts deleted file mode 100644 index 2dba26d..0000000 --- a/src/profile/profile.resolver.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Resolver, Query } from '@nestjs/graphql'; -import { ProfileDto } from './dto/index.js'; - -@Resolver() -export class ProfileResolver { - @Query(() => ProfileDto) - async profile(): Promise { - return { - firstName: 'Евгений', - lastName: 'Лубяной', - }; - } -} diff --git a/src/profile/profile.service.ts b/src/profile/profile.service.ts index 8e5abdb..db93930 100644 --- a/src/profile/profile.service.ts +++ b/src/profile/profile.service.ts @@ -1,4 +1,91 @@ import { Injectable } from '@nestjs/common'; +import { PrismaService } from '../prisma/prisma.service.js'; +import { ExperienceDto, LinkDto, ProfileDto, ProjectDto, SkillDto } from './dto/index.js'; + @Injectable() -export class ProfileService {} +export class ProfileService { + constructor(private readonly prisma: PrismaService) {} + + async getProfile(): Promise { + const profile = await this.prisma.profile.findFirst({ orderBy: { id: 'asc' } }); + if (!profile) { + return null; + } + + return { + id: profile.id, + firstName: profile.firstName, + lastName: profile.lastName, + description: profile.description, + }; + } + + async getProfiles(ids: number[]): Promise { + const profiles = await this.prisma.profile.findMany({ + where: { id: { in: ids } }, + orderBy: { id: 'asc' }, + }); + + return profiles.map((profile) => ({ + id: profile.id, + firstName: profile.firstName, + lastName: profile.lastName, + description: profile.description, + })); + } + + async getSkills(profileIds: number[]): Promise { + const skills = await this.prisma.skill.findMany({ + where: { profileId: { in: profileIds } }, + orderBy: { id: 'asc' }, + }); + + return skills.map((skill) => ({ + profileId: skill.profileId, + name: skill.name, + })); + } + + async getLinks(profileIds: number[]): Promise { + const links = await this.prisma.link.findMany({ + where: { profileId: { in: profileIds } }, + orderBy: { id: 'asc' }, + }); + + return links.map((link) => ({ + profileId: link.profileId, + name: link.name, + link: link.link, + })); + } + + async getExperiences(profileIds: number[]): Promise { + const experiences = await this.prisma.experience.findMany({ + where: { profileId: { in: profileIds } }, + orderBy: { id: 'asc' }, + }); + + return experiences.map((experience) => ({ + profileId: experience.profileId, + company: experience.company, + position: experience.position, + period: experience.period, + achievements: experience.achievements, + })); + } + + async getProjects(profileIds: number[]): Promise { + const projects = await this.prisma.project.findMany({ + where: { profileId: { in: profileIds } }, + orderBy: { id: 'asc' }, + }); + + return projects.map((project) => ({ + profileId: project.profileId, + name: project.name, + link: project.link, + description: project.description, + })); + } +} diff --git a/src/profile/resolvers/index.ts b/src/profile/resolvers/index.ts new file mode 100644 index 0000000..be2b0aa --- /dev/null +++ b/src/profile/resolvers/index.ts @@ -0,0 +1,2 @@ +export { ProfileResolver } from './profile.resolver.js'; +export { SkillResolver } from './skill.resolver.js'; diff --git a/src/profile/resolvers/profile.resolver.ts b/src/profile/resolvers/profile.resolver.ts new file mode 100644 index 0000000..adaaf65 --- /dev/null +++ b/src/profile/resolvers/profile.resolver.ts @@ -0,0 +1,45 @@ +import { Context, Parent, Query, ResolveField, Resolver } from '@nestjs/graphql'; + +import { ExperienceDto, LinkDto, ProfileDto, ProjectDto, SkillDto } from '../dto/index.js'; +import type { GraphQLContext } from '../profile.loaders.js'; +import { ProfileService } from '../profile.service.js'; + +/** + * Точка входа GraphQL. Бизнес-логики нет: запрос профиля делегируется сервису, + * вложенные данные догружаются лоадерами из контекста запроса. + */ +@Resolver(() => ProfileDto) +export class ProfileResolver { + constructor(private readonly profileService: ProfileService) {} + + @Query(() => ProfileDto, { nullable: true, description: 'Профиль владельца визитки' }) + profile(): Promise { + return this.profileService.getProfile(); + } + + @ResolveField(() => [SkillDto], { description: 'Навыки' }) + skills(@Parent() profile: ProfileDto, @Context() context: GraphQLContext): Promise { + return context.loaders.skills.load(profile.id); + } + + @ResolveField(() => [LinkDto], { description: 'Ссылки на профессиональные ресурсы' }) + links(@Parent() profile: ProfileDto, @Context() context: GraphQLContext): Promise { + return context.loaders.links.load(profile.id); + } + + @ResolveField(() => [ExperienceDto], { description: 'Опыт работы' }) + experience( + @Parent() profile: ProfileDto, + @Context() context: GraphQLContext, + ): Promise { + return context.loaders.experience.load(profile.id); + } + + @ResolveField(() => [ProjectDto], { description: 'Проекты' }) + projects( + @Parent() profile: ProfileDto, + @Context() context: GraphQLContext, + ): Promise { + return context.loaders.projects.load(profile.id); + } +} diff --git a/src/profile/resolvers/skill.resolver.ts b/src/profile/resolvers/skill.resolver.ts new file mode 100644 index 0000000..1856b10 --- /dev/null +++ b/src/profile/resolvers/skill.resolver.ts @@ -0,0 +1,17 @@ +import { Context, Parent, ResolveField, Resolver } from '@nestjs/graphql'; + +import { ProfileDto, SkillDto } from '../dto/index.js'; +import type { GraphQLContext } from '../profile.loaders.js'; + +@Resolver(() => SkillDto) +export class SkillResolver { + @ResolveField(() => ProfileDto, { + description: 'Профиль, к которому относится навык', + }) + profile( + @Parent() skill: SkillDto, + @Context() context: GraphQLContext, + ): Promise { + return context.loaders.profiles.load(skill.profileId); + } +} diff --git a/yarn.lock b/yarn.lock index fb1065a..714a2f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3132,6 +3132,13 @@ __metadata: languageName: node linkType: hard +"dataloader@npm:^2.2.3": + version: 2.2.3 + resolution: "dataloader@npm:2.2.3" + checksum: 10c0/9b9a056fbc863ca86da87d59e053e871e263b4966aa4d55e40d61a65e96815fae5530ca220629064ca5f8e3000c0c4ec93292e170c38ff393fb34256b4d7c1aa + languageName: node + linkType: hard + "debug@npm:^4.3.7, debug@npm:^4.4.0, debug@npm:^4.4.3": version: 4.4.3 resolution: "debug@npm:4.4.3" @@ -4095,6 +4102,7 @@ __metadata: "@types/pg": "npm:^8" "@types/supertest": "npm:^7.0.0" "@vitest/coverage-v8": "npm:^4.1.2" + dataloader: "npm:^2.2.3" dotenv: "npm:^18.0.10" graphql: "npm:^17.1.0" oxlint: "npm:^1.58.0"