improvement: fixed some package.json issues. readme files updated.

2026-05-05 00:01:06 +03:30
parent 4c61885cef
commit 15ef17228f
15 changed files with 23445 additions and 228 deletions
--- a/backend/.npmrc
+++ b/backend/.npmrc
@@ -0,0 +1 @@
+legacy-peer-deps=true
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,18 +1,19 @@
 # ============================================
 # STAGE 1: BUILDER STAGE
 # ============================================
-FROM node:18-alpine AS builder
+FROM node:20-alpine AS builder

 WORKDIR /app

 COPY package*.json ./
+COPY .npmrc ./
 COPY prisma ./prisma/

 RUN npm ci

 COPY . .

-RUN npx prisma generate
+RUN npm run prisma:generate
 RUN npm run build
 RUN npm prune --production

@@ -20,7 +21,7 @@ RUN npm prune --production
 # ============================================
 # STAGE 2: PRODUCTION STAGE
 # ============================================
-FROM node:18-alpine
+FROM node:20-alpine

 RUN apk add --no-cache dumb-init

@@ -29,14 +30,10 @@ WORKDIR /app
 RUN addgroup -g 1001 -S nodejs && \
    adduser -S dyolink -u 1001

+# Prisma client comes from the builder (npm prune --production keeps @prisma/client).
 COPY package*.json ./
 COPY prisma ./prisma/

-RUN npm ci --only=production && \
-    npm cache clean --force
-
-RUN npx prisma generate
-
 COPY --from=builder /app/dist ./dist
 COPY --from=builder /app/node_modules ./node_modules

--- a/backend/README.md
+++ b/backend/README.md
@@ -1,98 +1,88 @@
-<p align="center">
-  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="120" alt="Nest Logo" /></a>
-</p>
+# Dyolink — Backend (NestJS)

-[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
-[circleci-url]: https://circleci.com/gh/nestjs/nest
+## Prerequisites

-  <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
-    <p align="center">
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
-<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
-<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
-<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
-<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
-  <a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg" alt="Donate us"/></a>
-    <a href="https://opencollective.com/nest#sponsor"  target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
-  <a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow" alt="Follow us on Twitter"></a>
-</p>
-  <!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
-  [![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->
+- **Node.js 20+** and **npm**
+- **PostgreSQL** reachable from your machine (local or remote)

-## Description
+## First-time setup

-[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
+1. **Clone the monorepo** and go to the backend app:

-## Project setup
+   ```bash
+   git clone <repository-url> dyolink
+   cd dyolink/backend
+   ```
+
+2. **Install dependencies**
+
+   ```bash
+   npm install
+   ```
+
+3. **Environment**
+
+   Copy `.env.example` to `.env` and set at least:
+
+   - `DATABASE_URL` — PostgreSQL connection string for your dev database
+   - `JWT_SECRET` — strong secret for signing tokens  
+   Do not commit `.env`.
+
+4. **Database URL for local dev**
+
+   Point `DATABASE_URL` at a database you created in Postgres (create an empty DB first if needed).
+
+5. **Generate Prisma Client**
+
+   ```bash
+   npm run prisma:generate
+   ```
+
+6. **Apply migrations** (creates/updates tables to match `prisma/schema.prisma`)
+
+   ```bash
+   npm run prisma:migrate
+   ```
+
+   This runs `prisma migrate dev`. Use it during development when the schema changes.
+
+7. **Seed** (optional — sample data / bootstrap)
+
+   ```bash
+   npm run prisma:seed
+   ```
+
+## Run (development)

 ```bash
-$ npm install
+npm run start:dev
 ```

-## Compile and run the project
+API listens on **`http://localhost:3000`** by default (`PORT` in `.env`).
+
+If the frontend runs on another origin (e.g. `http://localhost:3001`), set `CORS_ORIGIN` in `.env` to that URL.
+
+## After pulling latest `main`

 ```bash
-# development
-$ npm run start
-
-# watch mode
-$ npm run start:dev
-
-# production mode
-$ npm run start:prod
+git pull
+npm install
+npm run prisma:generate
+npm run prisma:migrate
 ```

-## Run tests
+If teammates added migrations, step 4 applies them. Resolve migration conflicts locally before pushing.

-```bash
-# unit tests
-$ npm run test
+## Useful commands

-# e2e tests
-$ npm run test:e2e
+| Command | Purpose |
+|--------|---------|
+| `npm run prisma:generate` | Regenerate client after `schema.prisma` changes |
+| `npm run prisma:migrate` | Dev migrations (`migrate dev`) |
+| `npm run prisma:deploy` | Production-style apply (`migrate deploy`) — e.g. CI/containers |
+| `npm run build` | Compile Nest app |
+| `npm run start:prod` | Run compiled app (`node dist/main`) |

-# test coverage
-$ npm run test:cov
-```
+## Docker

-## Deployment
-
-When you're ready to deploy your NestJS application to production, there are some key steps you can take to ensure it runs as efficiently as possible. Check out the [deployment documentation](https://docs.nestjs.com/deployment) for more information.
-
-If you are looking for a cloud-based platform to deploy your NestJS application, check out [Mau](https://mau.nestjs.com), our official platform for deploying NestJS applications on AWS. Mau makes deployment straightforward and fast, requiring just a few simple steps:
-
-```bash
-$ npm install -g @nestjs/mau
-$ mau deploy
-```
-
-With Mau, you can deploy your application in just a few clicks, allowing you to focus on building features rather than managing infrastructure.
-
-## Resources
-
-Check out a few resources that may come in handy when working with NestJS:
-
- Visit the [NestJS Documentation](https://docs.nestjs.com) to learn more about the framework.
- For questions and support, please visit our [Discord channel](https://discord.gg/G7Qnnhy).
- To dive deeper and get more hands-on experience, check out our official video [courses](https://courses.nestjs.com/).
- Deploy your application to AWS with the help of [NestJS Mau](https://mau.nestjs.com) in just a few clicks.
- Visualize your application graph and interact with the NestJS application in real-time using [NestJS Devtools](https://devtools.nestjs.com).
- Need help with your project (part-time to full-time)? Check out our official [enterprise support](https://enterprise.nestjs.com).
- To stay in the loop and get updates, follow us on [X](https://x.com/nestframework) and [LinkedIn](https://linkedin.com/company/nestjs).
- Looking for a job, or have a job to offer? Check out our official [Jobs board](https://jobs.nestjs.com).
-
-## Support
-
-Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
-
-## Stay in touch
-
- Author - [Kamil Myśliwiec](https://twitter.com/kammysliwiec)
- Website - [https://nestjs.com](https://nestjs.com/)
- Twitter - [@nestframework](https://twitter.com/nestframework)
-
-## License
-
-Nest is [MIT licensed](https://github.com/nestjs/nest/blob/master/LICENSE).
+Image build is defined in **`Dockerfile`** at this folder. For full-stack deployment and CI, see the **repository root `README.md`**.
--- a/backend/SETUP.md
+++ b/backend/SETUP.md
@@ -1,95 +0,0 @@
-
-# Dyolink Backend - Development Setup Guide
-
-## 📋 Prerequisites
-
-Before starting, ensure you have the following installed:
- **Node.js** (v18 or higher)
- **PostgreSQL** (v15 or higher) - We use v18, but any v15+ works
- **Git** (for cloning)
- **npm** or **yarn** (npm comes with Node.js)
-
-## 🚀 Initial Setup Steps
-
-1. Clone the Repository
-```bash
-git clone [your-repository-url]
-cd dyolink/backend
-
-2. Install Dependencies
-bash
-npm install
-
-3. Environment Configuration
-Create a .env file in the backend folder:
-env
-# backend/.env
-DATABASE_URL=postgresql://postgres:1234@localhost:5432/dyolink_db
-JWT_SECRET=your-super-secret-key-here-change-this
-JWT_REFRESH_SECRET=your-super-secret-refresh-key-here-different-from-above
-JWT_EXPIRES_IN=15m
-JWT_REFRESH_EXPIRES_IN=7d
-PORT=3000
-⚠️ Important: Never commit the .env file to git! We have .gitignore set up to prevent this.
-
-4. Database Setup
-Option A: Fresh PostgreSQL Installation
-If you don't have PostgreSQL installed:
-Windows (using Chocolatey):
-bash
-choco install postgresql
-macOS (using Homebrew):
-bash
-brew install postgresql@15
-brew services start postgresql@15
-Common Installation Issues & Fixes:
-Issue	Solution
-"Password not set during installation"	Edit pg_hba.conf temporarily (see Troubleshooting section)
-"Service not starting"	Run PowerShell/Terminal as Administrator
-"Port 5432 already in use"	Stop local PostgreSQL service or change port
-Option B: Using Existing PostgreSQL
-If you already have PostgreSQL:
-bash
-# Connect to PostgreSQL
-psql -U postgres
-# Create the database (if it doesn't exist)
-CREATE DATABASE dyolink_db;
-\q
-
-5. Database Migrations
-Once PostgreSQL is running and you've created the database:
-bash
-# Generate Prisma client
-npx prisma generate
-# Run migrations to create tables
-npx prisma migrate dev --name init_schema
-⚠️ Known Issue: If you get P1001: Can't reach database server, ensure PostgreSQL is running:
-bash
-# Check PostgreSQL status
-# Windows:
-Get-Service postgresql-x64-18
-# macOS:
-brew services list | grep postgres
-
-6. Seed the Database
-bash
-# Seed with initial data (organization types, plans, permissions, test user)
-npx prisma db seed
-⚠️ Prisma 7 Note: If seeding fails with PrismaClientInitializationError, we've fixed this by using the driver adapter pattern. The seed file now uses:
-typescript
-import { PrismaPg } from '@prisma/adapter-pg';
-import { Pool } from 'pg';
-const adapter = new PrismaPg(pool);
-const prisma = new PrismaClient({ adapter });
-7. Verify Setup
-bash
-# Open Prisma Studio to verify data
-npx prisma studio
-# This opens http://localhost:5555 - you should see all tables with seeded data
-8. Start Development Server
-bash
-npm run start:dev
-You should see:
-text
-Application is running on: http://localhost:3000
-✅ Database connected successfully
--- a/backend/docker-entrypoint.sh
+++ b/backend/docker-entrypoint.sh
@@ -8,22 +8,22 @@ echo "=========================================="
 if [ "$NODE_ENV" = "production" ]; then
    echo "Running in PRODUCTION mode"
    echo "Running database migrations..."
-    npx prisma migrate deploy
+    ./node_modules/.bin/prisma migrate deploy
 else
    echo "Running in DEVELOPMENT mode"
    echo "Syncing database schema..."
-    npx prisma db push
+    ./node_modules/.bin/prisma db push
 fi

 if [ "$NODE_ENV" != "production" ]; then
    if [ -f "prisma/seed.ts" ] || [ -f "prisma/seed.js" ]; then
        echo "Running database seed..."
-        npx prisma db seed
+        ./node_modules/.bin/prisma db seed
    fi
 fi

 echo "Verifying database connection..."
-if ! echo "SELECT 1" | npx prisma db execute --stdin --schema prisma/schema.prisma >/dev/null 2>&1; then
+if ! echo "SELECT 1" | ./node_modules/.bin/prisma db execute --stdin --schema prisma/schema.prisma >/dev/null 2>&1; then
    echo "Cannot connect to database or execute query."
    exit 1
 fi
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
--- a/backend/package.json
+++ b/backend/package.json
@@ -41,6 +41,7 @@
    "@nestjs/swagger": "^11.2.6",
    "@nestjs/throttler": "^6.5.0",
    "@prisma/client": "^6.19.2",
+    "prisma": "^6.19.2",
    "adminjs": "^7.8.17",
    "axios": "^1.13.5",
    "bcrypt": "^6.0.0",
@@ -84,7 +85,6 @@
    "globals": "^16.0.0",
    "jest": "^30.0.0",
    "prettier": "^3.4.2",
-    "prisma": "^6.19.2",
    "source-map-support": "^0.5.21",
    "supertest": "^7.0.0",
    "ts-jest": "^29.2.5",
@@ -94,6 +94,10 @@
    "typescript": "^5.7.3",
    "typescript-eslint": "^8.20.0"
  },
+  "overrides": {
+    "@tiptap/core": "2.27.2",
+    "@tiptap/pm": "2.27.2"
+  },
  "jest": {
    "moduleFileExtensions": [
      "js",
--- a/backend/src/modules/patients/patients.service.ts
+++ b/backend/src/modules/patients/patients.service.ts
@@ -1,5 +1,4 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
-import { Prisma } from '@prisma/client';
 import { PrismaService } from '../../../prisma/prisma.service';
 import { CreatePatientDto } from './dto/create-patient.dto';
 import { ListPatientsDto } from './dto/list-patients.dto';
@@ -26,15 +25,15 @@ export class PatientsService {
    const { page = 1, limit = 10, q } = query;
    const skip = (page - 1) * limit;

-    const where: Prisma.PatientWhereInput = {
+    const where = {
      organizationId,
      ...(q
        ? {
            OR: [
-              { firstName: { contains: q, mode: 'insensitive' } },
-              { lastName: { contains: q, mode: 'insensitive' } },
-              { email: { contains: q, mode: 'insensitive' } },
-              { phone: { contains: q, mode: 'insensitive' } },
+              { firstName: { contains: q, mode: 'insensitive' as const } },
+              { lastName: { contains: q, mode: 'insensitive' as const } },
+              { email: { contains: q, mode: 'insensitive' as const } },
+              { phone: { contains: q, mode: 'insensitive' as const } },
            ],
          }
        : {}),
--- a/backend/tsconfig.json
+++ b/backend/tsconfig.json
@@ -1,5 +1,6 @@
 {
  "compilerOptions": {
+    "types": ["node", "jest"],
    "module": "nodenext",
    "moduleResolution": "nodenext",
    "resolvePackageJsonExports": true,