Compare commits

..
9 Commits
Author SHA1 Message Date
arswarog 16a69a7e59 docs: test assignment description and design decisions
CI / Сборка (push) Successful in 23s
Стенд master
CI / Деплой на стейджинг (push) Successful in 5s
CI / Проверка кода (push) Successful in 15s
2026-11-16 16:57:31 +03:00
arswarog 163d3bb61f ci: force corepack install to bypass pnpx EEXIST collision
CI / Сборка (push) Successful in 1m47s
Стенд master
CI / Деплой на стейджинг (push) Successful in 21s
CI / Проверка кода (push) Successful in 18s
runner image ships pnpm/pnpx alongside yarn 1.22.22 and lacks corepack;
npm install -g corepack failed with EEXIST on /usr/local/bin/pnpx
2026-11-13 20:21:42 +03:00
arswarog 66337ae989 deploy: staging single-container via host caddy-docker-proxy
CI / Сборка (push) Failing after 5s
CI / Деплой на стейджинг (push) Skipped
CI / Проверка кода (push) Skipped
- drop caddy/SSL in container (staging only): api service gets caddy labels,
  host caddy terminates TLS and routes ${BRANCH}.it-smi.jt4d.ru.net -> :5000
- simplify Dockerfile to single-stage, healthcheck -> /, .dockerignore
- pin packageManager yarn@4.18.0 and use corepack: project is Yarn 4 (berry
  lockfile), base image and CI runner ship Yarn 1 and failed on install
- rewrite ci.yaml/cleanup.yaml for flat project (single api image, no Nx)
2026-11-13 19:54:00 +03:00
arswarog 8da8c241e9 profile: guery profile (minimal) 2026-11-13 19:18:36 +03:00
arswarog 6cd287cf78 profile: create module structure 2026-11-13 19:18:17 +03:00
arswarog 2e8eaa0478 graphql: add graphql 2026-11-13 19:17:56 +03:00
arswarog a1e0fdcb92 db: prisma init 2026-11-13 19:17:16 +03:00
arswarog 0403d1b489 all: install prisma 2026-11-13 19:17:16 +03:00
arswarog 0b7c76b290 chore: prettier 2026-11-13 19:16:45 +03:00
11 changed files with 1561 additions and 1157 deletions

No files matched your search

+1
View File
@@ -10,6 +10,7 @@ node_modules
.gitea
test
src
prisma
docs
.env
.env.*
-10
View File
@@ -48,15 +48,6 @@ jobs:
labels: |
org.opencontainers.image.ref.name=${{ github.head_ref || github.ref_name }}
- name: Build migrate docker image
uses: docker/build-push-action@v7
with:
context: .
file: Dockerfile.migrate
push: true
tags: git.jt4d.ru/${{ github.repository }}/api:${{ github.head_ref || github.ref_name }}-migrate
cache-from: git.jt4d.ru/${{ github.repository }}/api:latest
deploy-staging:
name: Деплой на стейджинг
runs-on: ubuntu-latest
@@ -87,7 +78,6 @@ jobs:
sed -i "s/\${BRANCH}/$BRANCH/g" docker-compose.yml
docker compose pull --quiet
staging-db-postgres create "${{ github.repository }}" "$BRANCH"
docker compose run --rm migrate
docker compose down
docker compose up -d
-19
View File
@@ -1,19 +0,0 @@
FROM git.jt4d.ru/jt4d/node:24-alpine
ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
WORKDIR /app
RUN corepack enable
COPY package.json yarn.lock .yarnrc.yml ./
RUN yarn install --immutable && yarn cache clean
COPY prisma.config.ts ./
COPY ./prisma ./prisma
# Прогреваем кэш схемного движка Prisma при сборке: иначе `migrate deploy`
# качает его с binaries.prisma.sh уже на стенде, в момент деплоя.
RUN yarn prisma version
CMD ["yarn", "prisma", "migrate", "deploy"]
+6 -10
View File
@@ -12,22 +12,21 @@ erDiagram
Profile ||--o{ Project : "Проекты"
Profile {
string firstName "имя"
string lastName "фамилия"
string name "имя"
string description "краткое описание"
}
Link {
string name "название"
string title "название"
string link "адрес ссылки"
}
Skill {
string name "название навыка"
string title "название навыка"
}
Project {
string name "название проекта"
string title "название проекта"
string link "адрес проекта или его репозитория"
string description "описание"
}
@@ -124,12 +123,9 @@ Postgres - популярная, широкий функционал. Уже е
### Сущности
Идентификаторы сущностям на уровне API не нужны, поэтому в GraphQL они не отдаются. Внутри БД они есть:
Prisma требует у модели уникальный идентификатор, и `id` (autoincrement) заодно даёт стабильные
связи `profileId` и порядок выдачи. Наружу это не протекает — DTO описывает только бизнес-поля.
Идентификаторы сущностям в данном задаче не нужны.
Профиль ровно один, но запись профиля оставлю: так вложенность (профиль → навыки/ссылки/опыт/проекты)
выражена отношением в БД, а не соглашением «все строки таблицы принадлежат профилю».
Запись профиля тоже не особо нужна, но оставлю для работы со вложенностью.
---
-9
View File
@@ -1,13 +1,4 @@
services:
migrate:
container_name: it-smi_${BRANCH}_migrate
image: git.jt4d.ru/public/it-smi/api:${BRANCH}-migrate
environment:
DATABASE_URL: postgres://${POSTGRES_USER:-}:${POSTGRES_PASSWORD:-}@${POSTGRES_HOST:-}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-}
restart: 'no'
networks:
- 'net'
api:
container_name: it-smi_${BRANCH}_api
image: git.jt4d.ru/public/it-smi/api:${BRANCH}
+1 -1
View File
@@ -35,6 +35,7 @@
"dotenv": "^18.0.10",
"graphql": "^17.1.0",
"pg": "^8.23.1",
"prisma": "8.0.0-rc.33",
"reflect-metadata": "^0.2.2",
"rxjs": "^7.8.1",
"ts-morph": "^28.0.0"
@@ -52,7 +53,6 @@
"oxlint": "^1.58.0",
"oxlint-tsgolint": "^7.0.2001",
"prettier": "^3.4.2",
"prisma": "7.10.1",
"source-map-support": "^0.5.21",
"supertest": "^7.0.0",
"typescript": "^6.0.2",
@@ -1,75 +0,0 @@
-- CreateTable
CREATE TABLE "Profile" (
"id" SERIAL NOT NULL,
"firstName" TEXT NOT NULL,
"lastName" TEXT NOT NULL,
"description" TEXT NOT NULL,
CONSTRAINT "Profile_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "Skill" (
"id" SERIAL NOT NULL,
"name" TEXT NOT NULL,
"profileId" INTEGER NOT NULL,
CONSTRAINT "Skill_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "Link" (
"id" SERIAL NOT NULL,
"name" TEXT NOT NULL,
"link" TEXT NOT NULL,
"profileId" INTEGER NOT NULL,
CONSTRAINT "Link_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "Project" (
"id" SERIAL NOT NULL,
"name" TEXT NOT NULL,
"link" TEXT NOT NULL,
"description" TEXT NOT NULL,
"profileId" INTEGER NOT NULL,
CONSTRAINT "Project_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "Experience" (
"id" SERIAL NOT NULL,
"company" TEXT NOT NULL,
"position" TEXT NOT NULL,
"period" TEXT NOT NULL,
"achievements" TEXT[] DEFAULT ARRAY[]::TEXT[],
"profileId" INTEGER NOT NULL,
CONSTRAINT "Experience_pkey" PRIMARY KEY ("id")
);
-- CreateIndex
CREATE INDEX "Skill_profileId_idx" ON "Skill"("profileId");
-- CreateIndex
CREATE INDEX "Link_profileId_idx" ON "Link"("profileId");
-- CreateIndex
CREATE INDEX "Project_profileId_idx" ON "Project"("profileId");
-- CreateIndex
CREATE INDEX "Experience_profileId_idx" ON "Experience"("profileId");
-- AddForeignKey
ALTER TABLE "Skill" ADD CONSTRAINT "Skill_profileId_fkey" FOREIGN KEY ("profileId") REFERENCES "Profile"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Link" ADD CONSTRAINT "Link_profileId_fkey" FOREIGN KEY ("profileId") REFERENCES "Profile"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Project" ADD CONSTRAINT "Project_profileId_fkey" FOREIGN KEY ("profileId") REFERENCES "Profile"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Experience" ADD CONSTRAINT "Experience_profileId_fkey" FOREIGN KEY ("profileId") REFERENCES "Profile"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-3
View File
@@ -1,3 +0,0 @@
# Please do not edit this file manually
# It should be added in your version-control system (e.g., Git)
provider = "postgresql"
-53
View File
@@ -11,56 +11,3 @@ generator client {
datasource db {
provider = "postgresql"
}
model Profile {
id Int @id @default(autoincrement())
firstName String
lastName String
description String
skills Skill[]
links Link[]
experiences Experience[]
projects Project[]
}
model Skill {
id Int @id @default(autoincrement())
name String
profileId Int
profile Profile @relation(fields: [profileId], references: [id], onDelete: Cascade)
@@index([profileId])
}
model Link {
id Int @id @default(autoincrement())
name String
link String
profileId Int
profile Profile @relation(fields: [profileId], references: [id], onDelete: Cascade)
@@index([profileId])
}
model Project {
id Int @id @default(autoincrement())
name String
link String
description String
profileId Int
profile Profile @relation(fields: [profileId], references: [id], onDelete: Cascade)
@@index([profileId])
}
model Experience {
id Int @id @default(autoincrement())
company String
position String
period String
achievements String[] @default([])
profileId Int
profile Profile @relation(fields: [profileId], references: [id], onDelete: Cascade)
@@index([profileId])
}
File renamed without changes.
+1553 -977
View File
File diff suppressed because it is too large. Load diff