Merge pull request 'change of logic' (#9) from test into develop

Reviewed-on: #9

backend/docker-compose.yml

@@ -0,0 +1,56 @@
+version: '3.8'
+
+services:
+  postgres:
+    image: postgres:15
+    container_name: postgres_db
+    restart: always
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: todo
+    ports:
+      - "5432:5432"
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+
+  users-auth-service:
+    build:
+      context: ./users-auth-service
+    container_name: users-auth-service
+    restart: always
+    depends_on:
+      - postgres
+    environment:
+      PORT: 4000
+      DB_HOST: postgres
+      DB_PORT: 5432
+      DB_USER: postgres
+      DB_PASSWORD: postgres
+      DB_NAME: todo
+      JWT_SECRET: super_secret_key
+      JWT_EXPIRES_IN: 3600s
+    ports:
+      - "4000:4000"
+
+  tasks-projects-service:
+    build:
+      context: ./tasks-projects-service
+    container_name: tasks-projects-service
+    restart: always
+    depends_on:
+      - postgres
+      - users-auth-service
+    environment:
+      PORT: 5000
+      DB_HOST: postgres
+      DB_PORT: 5432
+      DB_USER: postgres
+      DB_PASSWORD: postgres
+      DB_NAME: todo
+      JWT_SECRET: super_secret_key
+    ports:
+      - "5000:5000"
+
+volumes:
+  pgdata:

backend/package-lock.json

@@ -0,0 +1,153 @@
+{
+  "name": "backend",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "@nestjs/passport": "^11.0.5"
+      }
+    },
+    "node_modules/@lukeed/csprng": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@lukeed/csprng/-/csprng-1.1.0.tgz",
+      "integrity": "sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@nestjs/common": {
+      "version": "11.0.11",
+      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-11.0.11.tgz",
+      "integrity": "sha512-b3zYiho5/XGCnLa7W2hHv5ecSBR1huQrXCHu6pxd+g2HY2B7sKP5CXHMv4gHYqpIqu4ClOb7Q4tLKXMp9LyLUg==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "iterare": "1.2.1",
+        "tslib": "2.8.1",
+        "uid": "2.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/nest"
+      },
+      "peerDependencies": {
+        "class-transformer": "*",
+        "class-validator": "*",
+        "reflect-metadata": "^0.1.12 || ^0.2.0",
+        "rxjs": "^7.1.0"
+      },
+      "peerDependenciesMeta": {
+        "class-transformer": {
+          "optional": true
+        },
+        "class-validator": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nestjs/passport": {
+      "version": "11.0.5",
+      "resolved": "https://registry.npmjs.org/@nestjs/passport/-/passport-11.0.5.tgz",
+      "integrity": "sha512-ulQX6mbjlws92PIM15Naes4F4p2JoxGnIJuUsdXQPT+Oo2sqQmENEZXM7eYuimocfHnKlcfZOuyzbA33LwUlOQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@nestjs/common": "^10.0.0 || ^11.0.0",
+        "passport": "^0.5.0 || ^0.6.0 || ^0.7.0"
+      }
+    },
+    "node_modules/iterare": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/iterare/-/iterare-1.2.1.tgz",
+      "integrity": "sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==",
+      "license": "ISC",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/passport": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz",
+      "integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "passport-strategy": "1.x.x",
+        "pause": "0.0.1",
+        "utils-merge": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/jaredhanson"
+      }
+    },
+    "node_modules/passport-strategy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
+      "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/pause": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==",
+      "peer": true
+    },
+    "node_modules/reflect-metadata": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
+      "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==",
+      "license": "Apache-2.0",
+      "peer": true
+    },
+    "node_modules/rxjs": {
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD",
+      "peer": true
+    },
+    "node_modules/uid": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/uid/-/uid-2.0.2.tgz",
+      "integrity": "sha512-u3xV3X7uzvi5b1MncmZo3i2Aw222Zk1keqLA1YkHldREkAhAqi65wuPfe7lHx8H/Wzy+8CE7S7uS3jekIM5s8g==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@lukeed/csprng": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    }
+  }
+}

backend/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@nestjs/passport": "^11.0.5"
+  }
+}

backend/tasks-projects-service/.env

@@ -0,0 +1,9 @@
+PORT=5000
+
+JWT_SECRET=super_secret_key
+
+DB_HOST=localhost
+DB_PORT=5432
+DB_USER=postgres
+DB_PASSWORD=postgres
+DB_NAME=todo

backend/tasks-projects-service/Dockerfile

@@ -0,0 +1,20 @@
+# Используем Node.js 20 в качестве базового образа
+FROM node:20
+
+# Устанавливаем рабочую директорию
+WORKDIR /app
+
+# Копируем package.json и package-lock.json
+COPY package*.json ./
+
+# Устанавливаем зависимости
+RUN npm install
+
+# Копируем исходный код
+COPY . .
+
+# Открываем порт (совпадает с PORT в .env)
+EXPOSE 5000
+
+# Команда запуска
+CMD ["npm", "start"]

backend/tasks-projects-service/package.json

@@ -0,0 +1,79 @@
+{
+  "name": "src",
+  "version": "0.0.1",
+  "description": "",
+  "author": "",
+  "private": true,
+  "license": "UNLICENSED",
+  "scripts": {
+    "build": "nest build",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "start": "nest start",
+    "start:dev": "nest start --watch",
+    "start:debug": "nest start --debug --watch",
+    "start:prod": "node dist/main",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:cov": "jest --coverage",
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:e2e": "jest --config ./test/jest-e2e.json"
+  },
+  "dependencies": {
+    "@nestjs/common": "^11.0.11",
+    "@nestjs/config": "^4.0.0",
+    "@nestjs/core": "^11.0.1",
+    "@nestjs/jwt": "^11.0.0",
+    "@nestjs/platform-express": "^11.0.1",
+    "@nestjs/swagger": "^11.0.6",
+    "@nestjs/typeorm": "^11.0.0",
+    "pg": "^8.13.3",
+    "reflect-metadata": "^0.2.2",
+    "rxjs": "^7.8.1",
+    "typeorm": "^0.3.20"
+  },
+  "devDependencies": {
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.18.0",
+    "@nestjs/cli": "^11.0.0",
+    "@nestjs/schematics": "^11.0.0",
+    "@nestjs/testing": "^11.0.1",
+    "@swc/cli": "^0.6.0",
+    "@swc/core": "^1.10.7",
+    "@types/express": "^5.0.0",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.10.7",
+    "@types/supertest": "^6.0.2",
+    "eslint": "^9.18.0",
+    "eslint-config-prettier": "^10.0.1",
+    "eslint-plugin-prettier": "^5.2.2",
+    "globals": "^15.14.0",
+    "jest": "^29.7.0",
+    "prettier": "^3.4.2",
+    "source-map-support": "^0.5.21",
+    "supertest": "^7.0.0",
+    "ts-jest": "^29.2.5",
+    "ts-loader": "^9.5.2",
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.20.0"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": "src",
+    "testRegex": ".*\\.spec\\.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  }
+}

backend/tasks-projects-service/src/app.module.ts

@@ -1,14 +1,10 @@
 import { Module } from '@nestjs/common';
+import { ConfigModule, ConfigService } from '@nestjs/config';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { ConfigModule } from '@nestjs/config';
+import { JwtModule } from '@nestjs/jwt';
-import { AuthModule } from './auth/auth.module';
-import { UsersModule } from './users/users.module';
 import { ProjectsModule } from './projects/projects.module';
 import { TasksModule } from './tasks/tasks.module';
-import { User } from './users/user.entity';
+import { JwtAuthGuard } from './auth/jwt-auth.guard';
-import { Project } from './projects/project.entity';
-import { Task } from './tasks/task.entity';
-import { ProjectMember } from './projects/project-member.entity';
 
 @Module({
   imports: [
@@ -20,13 +16,16 @@ import { ProjectMember } from './projects/project-member.entity';
       username: process.env.DB_USER || 'postgres',
       password: process.env.DB_PASSWORD || 'postgres',
       database: process.env.DB_NAME || 'todo',
-      entities: [User, Project, Task, ProjectMember],
+      autoLoadEntities: true,
       synchronize: true,
     }),
-    AuthModule,
+    JwtModule.register({
-    UsersModule,
+      secret: process.env.JWT_SECRET || 'super_secret_key',
+      signOptions: { expiresIn: process.env.JWT_EXPIRES_IN || '3600s' },
+    }),
     ProjectsModule,
     TasksModule,
   ],
+  providers: [JwtAuthGuard],
 })
 export class AppModule {}

backend/tasks-projects-service/src/auth/auth.module.ts

@@ -0,0 +1,15 @@
+import { Module } from '@nestjs/common';
+import { JwtModule } from '@nestjs/jwt';
+import { JwtAuthGuard } from './jwt-auth.guard';
+
+@Module({
+  imports: [
+    JwtModule.register({
+      secret: process.env.JWT_SECRET || 'super_secret_key',
+      signOptions: { expiresIn: '1h' },
+    }),
+  ],
+  providers: [JwtAuthGuard],
+  exports: [JwtModule, JwtAuthGuard],
+})
+export class AuthModule {}

backend/tasks-projects-service/src/auth/jwt-auth.guard.ts

@@ -0,0 +1,32 @@
+import { Injectable, CanActivate, ExecutionContext, UnauthorizedException } from '@nestjs/common';
+import { JwtService } from '@nestjs/jwt';
+import { Request } from 'express';
+
+interface RequestWithUser extends Request {
+  user?: any;
+}
+
+@Injectable()
+export class JwtAuthGuard implements CanActivate {
+  constructor(private readonly jwtService: JwtService) {}
+
+  canActivate(context: ExecutionContext): boolean {
+    const request = context.switchToHttp().getRequest<RequestWithUser>();
+    const authHeader = request.headers.authorization;
+
+    if (!authHeader || !authHeader.startsWith('Bearer ')) {
+      throw new UnauthorizedException('Missing or invalid token');
+    }
+
+    const token = authHeader.split(' ')[1];
+
+    try {
+      const decoded = this.jwtService.verify(token);
+      console.log('Decoded JWT:', decoded);
+      request.user = decoded;
+      return true;
+    } catch (error) {
+      throw new UnauthorizedException('Invalid token');
+    }
+  }
+}

backend/tasks-projects-service/src/main.ts

@@ -0,0 +1,29 @@
+import { NestFactory } from '@nestjs/core';
+import { AppModule } from './app.module';
+import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
+import { ConfigService } from '@nestjs/config';
+
+async function bootstrap() {
+  const app = await NestFactory.create(AppModule);
+
+  app.setGlobalPrefix('api');
+  
+  const configService = app.get(ConfigService);
+  const port = configService.get<number>('PORT') || 5000;
+
+  app.enableCors();
+
+  const config = new DocumentBuilder()
+    .setTitle('Cool TODO Manager API')
+    .setDescription('API for managing projects, project-members and tasks')
+    .setVersion('2.0')
+    .addBearerAuth()
+    .build();
+  const document = SwaggerModule.createDocument(app, config);
+  SwaggerModule.setup('api/docs', app, document);
+
+  
+
+  await app.listen(port);
+}
+bootstrap();

backend/tasks-projects-service/src/projects/project-member.entity.ts

@@ -0,0 +1,23 @@
+import { Entity, PrimaryGeneratedColumn, ManyToOne, Column, JoinColumn } from 'typeorm';
+import { Project } from './project.entity';
+import { ApiProperty } from '@nestjs/swagger';
+
+@Entity()
+export class ProjectMember {
+  @ApiProperty({ example: 1, description: 'Project member ID' })
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @ApiProperty({ example: 1, description: 'Project ID' })
+  @ManyToOne(() => Project, (project) => project.id, { onDelete: 'CASCADE', eager: true })
+  @JoinColumn({ name: 'projectId' })
+  project: Project;
+
+  @ApiProperty({ example: 5, description: 'User ID' })
+  @Column()
+  userId: number; 
+
+  @ApiProperty({ example: 'admin', description: 'User role in project' })
+  @Column()
+  role: string; 
+}

backend/tasks-projects-service/src/projects/project-members.controller.ts

@@ -0,0 +1,74 @@
+import { Controller, Post, Delete, Get, Patch, Body, Param, UseGuards, Request, NotFoundException, ForbiddenException } from '@nestjs/common';
+import { ProjectMembersService } from './project-members.service';
+import { JwtAuthGuard } from '../auth/jwt-auth.guard';
+import { ApiTags, ApiBearerAuth, ApiOperation, ApiResponse, ApiParam, ApiBody } from '@nestjs/swagger';
+
+class AddMemberDto {
+  userId: number;
+  role: string;
+}
+
+class RemoveMemberDto {
+  userId: number;
+}
+
+class ChangeRoleDto {
+  userId: number;
+  role: string;
+}
+
+@ApiTags('Project Members')
+@ApiBearerAuth()
+@Controller('projects/:id/members')
+@UseGuards(JwtAuthGuard)
+export class ProjectMembersController {
+  constructor(private readonly projectMembersService: ProjectMembersService) {}
+
+  @ApiOperation({ summary: 'Get all members of a project' })
+  @ApiParam({ name: 'id', type: 'number', description: 'Project ID' })
+  @ApiResponse({ status: 200, description: 'List of project members' })
+  @Get()
+  async getMembers(@Param('id') projectId: number) {
+    return this.projectMembersService.getMembers(projectId);
+  }
+
+  @ApiOperation({ summary: 'Add a member to a project' })
+  @ApiParam({ name: 'id', type: 'number', description: 'Project ID' })
+  @ApiBody({ type: AddMemberDto })
+  @ApiResponse({ status: 201, description: 'Member added successfully' })
+  @ApiResponse({ status: 403, description: 'Only project owner can add members' })
+  @ApiResponse({ status: 404, description: 'Project not found' })
+  @Post('add')
+  async addMember(@Request() req, @Param('id') projectId: number, @Body() body: AddMemberDto) {
+    return this.projectMembersService.addMember(req.user.sub, projectId, body.userId, body.role);
+  }
+
+  @ApiOperation({ summary: 'Remove a member from a project' })
+  @ApiParam({ name: 'id', type: 'number', description: 'Project ID' })
+  @ApiBody({ type: RemoveMemberDto })
+  @ApiResponse({ status: 200, description: 'Member removed successfully' })
+  @ApiResponse({ status: 403, description: 'Only project owner can remove members' })
+  @ApiResponse({ status: 404, description: 'Project not found' })
+  @Delete('remove')
+  async removeMember(@Request() req, @Param('id') projectId: number, @Body() body: RemoveMemberDto) {
+    return this.projectMembersService.removeMember(req.user.sub, projectId, body.userId);
+  }
+
+  @ApiOperation({ summary: 'Change member role in a project' })
+  @ApiParam({ name: 'id', type: 'number', description: 'Project ID' })
+  @ApiBody({ type: ChangeRoleDto })
+  @ApiResponse({ status: 200, description: 'Role updated successfully' })
+  @ApiResponse({ status: 403, description: 'Only project owner can change roles' })
+  @ApiResponse({ status: 404, description: 'Project not found' })
+  @Patch('role')
+  async changeRole(@Request() req, @Param('id') projectId: number, @Body() body: ChangeRoleDto) {
+    return this.projectMembersService.changeRole(req.user.sub, projectId, body.userId, body.role);
+  }
+
+  @ApiOperation({ summary: 'User leaves the project' })
+  @ApiParam({ name: 'id', type: 'number', description: 'Project ID' })
+  @Delete('leave')
+  async leaveProject(@Request() req, @Param('id') projectId: number) {
+    return this.projectMembersService.leaveProject(req.user.sub, projectId);
+  }
+}

backend/tasks-projects-service/src/projects/project-members.service.ts

@@ -0,0 +1,54 @@
+import { Injectable, NotFoundException, ForbiddenException } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+import { ProjectMember } from './project-member.entity';
+import { Project } from '../projects/project.entity';
+
+@Injectable()
+export class ProjectMembersService {
+  constructor(
+    @InjectRepository(ProjectMember)
+    private readonly projectMembersRepository: Repository<ProjectMember>,
+    @InjectRepository(Project)
+    private readonly projectsRepository: Repository<Project>,
+  ) {}
+
+  async getMembers(projectId: number) {
+    return this.projectMembersRepository.find({ where: { project: { id: projectId } } });
+  }
+
+  async addMember(ownerId: number, projectId: number, userId: number, role: string) {
+    const project = await this.projectsRepository.findOne({ where: { id: projectId } });
+    if (!project) throw new NotFoundException('Project not found');
+    if (project.ownerId !== ownerId) throw new ForbiddenException('Only the project owner can add members');
+
+    const existingMember = await this.projectMembersRepository.findOne({ where: { project: { id: projectId }, userId } });
+    if (existingMember) throw new ForbiddenException('User is already a member');
+
+    const newMember = this.projectMembersRepository.create({ project, userId, role });
+    return this.projectMembersRepository.save(newMember);
+  }
+
+  async removeMember(ownerId: number, projectId: number, userId: number) {
+    const project = await this.projectsRepository.findOne({ where: { id: projectId } });
+    if (!project) throw new NotFoundException('Project not found');
+    if (project.ownerId !== ownerId) throw new ForbiddenException('Only the project owner can remove members');
+
+    await this.projectMembersRepository.delete({ project: { id: projectId }, userId });
+    return { message: 'Member removed' };
+  }
+
+  async changeRole(ownerId: number, projectId: number, userId: number, role: string) {
+    const project = await this.projectsRepository.findOne({ where: { id: projectId } });
+    if (!project) throw new NotFoundException('Project not found');
+    if (project.ownerId !== ownerId) throw new ForbiddenException('Only the project owner can change roles');
+
+    await this.projectMembersRepository.update({ project: { id: projectId }, userId }, { role });
+    return { message: 'Role updated' };
+  }
+
+  async leaveProject(userId: number, projectId: number) {
+    await this.projectMembersRepository.delete({ project: { id: projectId }, userId });
+    return { message: 'You left the project' };
+  }
+}

backend/tasks-projects-service/src/projects/project.entity.ts

@@ -1,5 +1,4 @@
-import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, CreateDateColumn, UpdateDateColumn } from 'typeorm';
+import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn } from 'typeorm';
-import { User } from '../users/user.entity';
 import { ApiProperty } from '@nestjs/swagger';
 
 @Entity()
@@ -16,9 +15,9 @@ export class Project {
   @Column({ nullable: true })
   description: string;
 
-  @ApiProperty({ description: 'Owner user object' })
+  @ApiProperty({ example: 5, description: 'ID of the project owner' })
-  @ManyToOne(() => User, (user) => user.id, { eager: true })
+  @Column()
-  owner: User;
+  ownerId: number;
 
   @ApiProperty({ description: 'Date of creation' })
   @CreateDateColumn()

backend/tasks-projects-service/src/projects/projects.controller.ts

@@ -0,0 +1,88 @@
+import { Controller, Post, Get, Patch, Delete, Body, Param, UseGuards, Request } from '@nestjs/common';
+import { ProjectsService } from './projects.service';
+import { Project } from './project.entity';
+import { JwtAuthGuard } from '../auth/jwt-auth.guard';
+import { ApiTags, ApiBearerAuth, ApiOperation, ApiParam, ApiBody, ApiResponse } from '@nestjs/swagger';
+
+class CreateProjectDto {
+  title: string;
+  description?: string;
+}
+
+class UpdateProjectDto {
+  title?: string;
+  description?: string;
+}
+
+@ApiTags('Projects')
+@ApiBearerAuth()
+@Controller('projects')
+export class ProjectsController {
+  constructor(private readonly projectsService: ProjectsService) {}
+
+  @ApiOperation({ summary: 'Create new project' })
+  @ApiBody({
+    description: 'Project data',
+    type: CreateProjectDto,
+  })
+  @ApiResponse({ status: 201, description: 'Project created', type: Project })
+  @UseGuards(JwtAuthGuard)
+  @Post('create')
+  async create(@Request() req, @Body() body: CreateProjectDto): Promise<Project> {
+    return this.projectsService.create({
+      title: body.title,
+      description: body.description,
+      ownerId: req.user?.sub, 
+    });
+  }
+
+
+  @ApiOperation({ summary: 'Get all projects' })
+  @ApiResponse({ status: 200, description: 'List of projects', type: Project, isArray: true })
+  @Get()
+  async findAll(): Promise<Project[]> {
+    return this.projectsService.findAll();
+  }
+
+  @ApiOperation({ summary: 'Get my projects' })
+  @ApiResponse({ status: 200, description: 'List of projects', type: Project, isArray: true })
+  @UseGuards(JwtAuthGuard)
+  @Get('my')
+  async findMyProjects(@Request() req): Promise<Project[]> {
+    return this.projectsService.findByOwner(req.user.sub);
+  }
+
+  @ApiOperation({ summary: 'Get single project by ID' })
+  @ApiParam({ name: 'id', type: 'number' })
+  @ApiResponse({ status: 200, description: 'Found project', type: Project })
+  @ApiResponse({ status: 404, description: 'Project not found' })
+  @Get(':id')
+  async findOne(@Param('id') id: number): Promise<Project | null> {
+    return this.projectsService.findOneById(id);
+  }
+
+  @ApiOperation({ summary: 'Update project' })
+  @ApiParam({ name: 'id', type: 'number' })
+  @ApiBody({ description: 'Fields to update', type: UpdateProjectDto })
+  @ApiResponse({ status: 200, description: 'Project updated', type: Project })
+  @ApiResponse({ status: 404, description: 'Project not found' })
+  @UseGuards(JwtAuthGuard)
+  @Patch(':id')
+  async update(
+    @Request() req,
+    @Param('id') id: number,
+    @Body() data: UpdateProjectDto,
+  ): Promise<Project> {
+    return this.projectsService.update(id, data, req.user.sub);
+  }
+
+  @ApiOperation({ summary: 'Delete project' })
+  @ApiParam({ name: 'id', type: 'number' })
+  @ApiResponse({ status: 200, description: 'Project deleted' })
+  @ApiResponse({ status: 404, description: 'Project not found' })
+  @UseGuards(JwtAuthGuard)
+  @Delete(':id')
+  async delete(@Request() req, @Param('id') id: number): Promise<void> {
+    return this.projectsService.delete(id, req.user.sub);
+  }
+}

backend/tasks-projects-service/src/projects/projects.module.ts

@@ -0,0 +1,19 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { ProjectsService } from './projects.service';
+import { ProjectsController } from './projects.controller';
+import { Project } from './project.entity';
+import { ProjectMembersService } from './project-members.service';
+import { ProjectMembersController } from './project-members.controller';
+import { ProjectMember } from './project-member.entity';
+import { AuthModule } from 'src/auth/auth.module';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([Project, ProjectMember]),
+  AuthModule
+],
+  controllers: [ProjectsController, ProjectMembersController],
+  providers: [ProjectsService, ProjectMembersService],
+  exports: [ProjectsService, ProjectMembersService],
+})
+export class ProjectsModule {}

backend/tasks-projects-service/src/projects/projects.service.ts

@@ -2,50 +2,59 @@ import { Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { Project } from './project.entity';
-import { UsersService } from '../users/users.service';
 
 @Injectable()
 export class ProjectsService {
   constructor(
     @InjectRepository(Project)
     private projectsRepository: Repository<Project>,
-    private usersService: UsersService,
   ) {}
 
   async create(data: { title: string; description?: string; ownerId: number }): Promise<Project> {
-    const owner = await this.usersService.findOneById(data.ownerId);
+    console.log('Received data:', data);
-    if (!owner) throw new NotFoundException('Owner not found');
-
     const project = this.projectsRepository.create({
       title: data.title,
       description: data.description,
-      owner,
+      ownerId: data.ownerId,
     });
     return this.projectsRepository.save(project);
   }
   
+
   async findAll(): Promise<Project[]> {
     return this.projectsRepository.find();
   }
 
+  async findByOwner(ownerId: number): Promise<Project[]> {
+    return this.projectsRepository.find({ where: { ownerId } });
+  }
+
   async findOneById(id: number): Promise<Project | null> {
     return this.projectsRepository.findOne({ where: { id } });
   }
 
-  async update(id: number, data: { title?: string; description?: string }): Promise<Project> {
+  async update(id: number, data: { title?: string; description?: string }, ownerId: number): Promise<Project> {
     const project = await this.findOneById(id);
     if (!project) throw new NotFoundException('Project not found');
 
+    if (project.ownerId !== ownerId) {
+      throw new NotFoundException('You are not the owner of this project'); 
+    }
+
     if (data.title !== undefined) project.title = data.title;
     if (data.description !== undefined) project.description = data.description;
 
     return this.projectsRepository.save(project);
   }
 
-  async delete(id: number): Promise<void> {
+  async delete(id: number, ownerId: number): Promise<void> {
-    const result = await this.projectsRepository.delete(id);
+    const project = await this.findOneById(id);
-    if (result.affected === 0) {
+    if (!project) throw new NotFoundException('Project not found');
-      throw new NotFoundException('Project not found');
+
-    }
+    if (project.ownerId !== ownerId) {
+      throw new NotFoundException('You are not the owner of this project'); 
+    }
+
+    await this.projectsRepository.delete(id);
   }
 }

backend/tasks-projects-service/src/tasks/task.entity.ts

@@ -1,6 +1,5 @@
 import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, CreateDateColumn } from 'typeorm';
 import { Project } from '../projects/project.entity';
-import { User } from '../users/user.entity';
 import { ApiProperty } from '@nestjs/swagger';
 
 @Entity()
@@ -9,8 +8,8 @@ export class Task {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @ApiProperty({ description: 'Project object' })
+  @ApiProperty({ example: 2, description: 'Project ID' })
-  @ManyToOne(() => Project, (project) => project.id, { eager: true })
+  @ManyToOne(() => Project, (project) => project.id, { eager: true, onDelete: 'CASCADE' })
   project: Project;
 
   @ApiProperty({ example: 'My Task', description: 'Task title' })
@@ -21,9 +20,9 @@ export class Task {
   @Column({ default: 'todo' })
   status: string; // 'todo', 'in_progress', 'done'
 
-  @ApiProperty({ description: 'Assigned user object', required: false })
+  @ApiProperty({ example: 5, description: 'Assigned User ID', required: false })
-  @ManyToOne(() => User, (user) => user.id, { nullable: true, eager: true })
+  @Column({ nullable: true })
-  assigned_user?: User;
+  assignedUserId?: number; 
 
   @ApiProperty({ example: '2025-03-01T12:00:00Z', required: false })
   @Column({ type: 'timestamp', nullable: true })

backend/tasks-projects-service/src/tasks/tasks.controller.ts

@@ -1,7 +1,7 @@
-import { Controller, Post, Get, Patch, Delete, Body, Param, UseGuards } from '@nestjs/common';
+import { Controller, Post, Get, Patch, Delete, Body, Param, UseGuards, Request } from '@nestjs/common';
 import { TasksService } from './tasks.service';
 import { Task } from './task.entity';
-import { AuthGuard } from '@nestjs/passport';
+import { JwtAuthGuard } from '../auth/jwt-auth.guard';
 import { ApiTags, ApiBearerAuth, ApiOperation, ApiParam, ApiBody, ApiResponse } from '@nestjs/swagger';
 
 class CreateTaskDto {
@@ -21,6 +21,7 @@ class UpdateTaskDto {
 @ApiTags('Tasks')
 @ApiBearerAuth()
 @Controller('tasks')
+@UseGuards(JwtAuthGuard)
 export class TasksController {
   constructor(private readonly tasksService: TasksService) {}
 
@@ -28,41 +29,20 @@ export class TasksController {
   @ApiBody({
     description: 'Task creation data',
     type: CreateTaskDto,
-    examples: {
-      example1: {
-        summary: 'Simple task',
-        value: {
-          title: 'My Task',
-          projectId: 1,
-          assignedUserId: 2,
-          deadline: '2025-03-01T12:00:00Z',
-        },
-      },
-    },
   })
-  @ApiResponse({
+  @ApiResponse({ status: 201, description: 'Task created', type: Task })
-    status: 201,
-    description: 'Task created',
-    type: Task,
-  })
-  @UseGuards(AuthGuard('jwt'))
   @Post('create')
-  async create(@Body() body: CreateTaskDto): Promise<Task> {
+  async create(@Request() req, @Body() body: CreateTaskDto): Promise<Task> {
     return this.tasksService.create({
       title: body.title,
       projectId: body.projectId,
-      assignedUserId: body.assignedUserId,
+      assignedUserId: body.assignedUserId ?? req.user.sub,
       deadline: body.deadline ? new Date(body.deadline) : undefined,
     });
   }
 
   @ApiOperation({ summary: 'Get all tasks' })
-  @ApiResponse({
+  @ApiResponse({ status: 200, description: 'List of tasks', type: Task, isArray: true })
-    status: 200,
-    description: 'List of tasks',
-    type: Task,
-    isArray: true,
-  })
   @Get()
   async findAll(): Promise<Task[]> {
     return this.tasksService.findAll();
@@ -70,15 +50,8 @@ export class TasksController {
 
   @ApiOperation({ summary: 'Get task by ID' })
   @ApiParam({ name: 'id', type: 'number' })
-  @ApiResponse({
+  @ApiResponse({ status: 200, description: 'Found task', type: Task })
-    status: 200,
+  @ApiResponse({ status: 404, description: 'Task not found' })
-    description: 'Found task',
-    type: Task,
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Task not found',
-  })
   @Get(':id')
   async findOne(@Param('id') id: number): Promise<Task | null> {
     return this.tasksService.findOneById(id);
@@ -86,66 +59,36 @@ export class TasksController {
 
   @ApiOperation({ summary: 'Get tasks by project ID' })
   @ApiParam({ name: 'projectId', type: 'number' })
-  @ApiResponse({
+  @ApiResponse({ status: 200, description: 'List of tasks for the specified project', type: Task, isArray: true })
-    status: 200,
-    description: 'List of tasks for the specified project',
-    type: Task,
-    isArray: true,
-  })
   @Get('project/:projectId')
   async findByProject(@Param('projectId') projectId: number): Promise<Task[]> {
     return this.tasksService.findByProjectId(projectId);
   }
 
-
   @ApiOperation({ summary: 'Update task' })
   @ApiParam({ name: 'id', type: 'number' })
   @ApiBody({
     description: 'Fields to update in the task',
     type: UpdateTaskDto,
-    examples: {
-      example1: {
-        summary: 'Update partial fields',
-        value: {
-          title: 'Updated Task Title',
-          status: 'in_progress',
-        },
-      },
-    },
   })
-  @ApiResponse({
+  @ApiResponse({ status: 200, description: 'Task updated', type: Task })
-    status: 200,
+  @ApiResponse({ status: 404, description: 'Task not found' })
-    description: 'Task updated',
-    type: Task,
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Task not found',
-  })
-  @UseGuards(AuthGuard('jwt'))
   @Patch(':id')
-  async update(@Param('id') id: number, @Body() body: UpdateTaskDto): Promise<Task> {
+  async update(@Request() req, @Param('id') id: number, @Body() body: UpdateTaskDto): Promise<Task> {
     return this.tasksService.update(id, {
       title: body.title,
       status: body.status,
       deadline: body.deadline ? new Date(body.deadline) : undefined,
-      assignedUserId: body.assignedUserId,
+      assignedUserId: body.assignedUserId ?? req.user.sub,
     });
   }
 
   @ApiOperation({ summary: 'Delete task' })
   @ApiParam({ name: 'id', type: 'number' })
-  @ApiResponse({
+  @ApiResponse({ status: 200, description: 'Task deleted' })
-    status: 200,
+  @ApiResponse({ status: 404, description: 'Task not found' })
-    description: 'Task deleted',
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Task not found',
-  })
-  @UseGuards(AuthGuard('jwt'))
   @Delete(':id')
-  async delete(@Param('id') id: number) {
+  async delete(@Request() req, @Param('id') id: number) {
     return this.tasksService.delete(id);
   }
 }

backend/tasks-projects-service/src/tasks/tasks.module.ts

@@ -4,13 +4,13 @@ import { TasksService } from './tasks.service';
 import { TasksController } from './tasks.controller';
 import { Task } from './task.entity';
 import { ProjectsModule } from '../projects/projects.module';
-import { UsersModule } from '../users/users.module';
+import { AuthModule } from '../auth/auth.module'; 
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([Task]),
     ProjectsModule,
-    UsersModule,
+    AuthModule, 
   ],
   controllers: [TasksController],
   providers: [TasksService],

backend/tasks-projects-service/src/tasks/tasks.service.ts

@@ -3,7 +3,6 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { Task } from './task.entity';
 import { ProjectsService } from '../projects/projects.service';
-import { UsersService } from '../users/users.service';
 
 @Injectable()
 export class TasksService {
@@ -11,23 +10,16 @@ export class TasksService {
     @InjectRepository(Task)
     private tasksRepository: Repository<Task>,
     private projectsService: ProjectsService,
-    private usersService: UsersService,
   ) {}
 
   async create(data: { title: string; projectId: number; assignedUserId?: number; deadline?: Date }) {
     const project = await this.projectsService.findOneById(data.projectId);
     if (!project) throw new NotFoundException('Project not found');
 
-    let user;
-    if (data.assignedUserId) {
-      user = await this.usersService.findOneById(data.assignedUserId);
-      if (!user) throw new NotFoundException('Assigned user not found');
-    }
-
     const task = this.tasksRepository.create({
       title: data.title,
       project,
-      assigned_user: user,
+      assignedUserId: data.assignedUserId,
       deadline: data.deadline,
     });
 
@@ -45,7 +37,6 @@ export class TasksService {
   async findByProjectId(projectId: number): Promise<Task[]> {
     return this.tasksRepository.find({
       where: { project: { id: projectId } },
-      relations: ['assigned_user'], // Загружаем связанные данные о назначенном пользователе
     });
   }
 
@@ -56,11 +47,8 @@ export class TasksService {
     if (data.title !== undefined) task.title = data.title;
     if (data.status !== undefined) task.status = data.status;
     if (data.deadline !== undefined) task.deadline = data.deadline;
-
     if (data.assignedUserId !== undefined) {
-      const user = await this.usersService.findOneById(data.assignedUserId);
+      task.assignedUserId = data.assignedUserId; 
-      if (!user) throw new NotFoundException('Assigned user not found');
-      task.assigned_user = user;
     }
 
     return this.tasksRepository.save(task);

backend/users-auth-service/.env

@@ -1,8 +1,10 @@
+PORT=4000
+
+JWT_SECRET=super_secret_key
+JWT_EXPIRES_IN=3600s
+
 DB_HOST=localhost
 DB_PORT=5432
 DB_USER=postgres
 DB_PASSWORD=postgres
 DB_NAME=todo
-
-JWT_SECRET=your_secret_key
-JWT_EXPIRES_IN=3600s

backend/users-auth-service/Dockerfile

@@ -0,0 +1,20 @@
+# Используем официальный образ Node.js
+FROM node:20
+
+# Устанавливаем рабочую директорию внутри контейнера
+WORKDIR /app
+
+# Копируем package.json и package-lock.json
+COPY package*.json ./
+
+# Устанавливаем зависимости
+RUN npm install
+
+# Копируем весь код проекта в контейнер
+COPY . .
+
+# Открываем порт 4000
+EXPOSE 4000
+
+# Команда запуска приложения
+CMD ["npm", "start"]

backend/users-auth-service/README.md

@@ -0,0 +1,99 @@
+<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>
+
+[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
+[circleci-url]: https://circleci.com/gh/nestjs/nest
+
+  <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://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></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)-->
+
+## Description
+
+[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
+
+## Project setup
+
+```bash
+$ npm install
+```
+
+## Compile and run the project
+
+```bash
+# development
+$ npm run start
+
+# watch mode
+$ npm run start:dev
+
+# production mode
+$ npm run start:prod
+```
+
+## Run tests
+
+```bash
+# unit tests
+$ npm run test
+
+# e2e tests
+$ npm run test:e2e
+
+# test coverage
+$ npm run test:cov
+```
+
+## 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 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).

backend/users-auth-service/eslint.config.mjs

@@ -0,0 +1,35 @@
+// @ts-check
+import eslint from '@eslint/js';
+import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
+import globals from 'globals';
+import tseslint from 'typescript-eslint';
+
+export default tseslint.config(
+  {
+    ignores: ['eslint.config.mjs'],
+  },
+  eslint.configs.recommended,
+  ...tseslint.configs.recommendedTypeChecked,
+  eslintPluginPrettierRecommended,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+      },
+      ecmaVersion: 5,
+      sourceType: 'module',
+      parserOptions: {
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+  },
+  {
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-floating-promises': 'warn',
+      '@typescript-eslint/no-unsafe-argument': 'warn'
+    },
+  },
+);

backend/users-auth-service/nest-cli.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://json.schemastore.org/nest-cli",
+  "collection": "@nestjs/schematics",
+  "sourceRoot": "src",
+  "compilerOptions": {
+    "deleteOutDir": true
+  }
+}

backend/users-auth-service/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "backend",
+  "name": "src",
   "version": "0.0.1",
   "description": "",
   "author": "",
@@ -26,15 +26,14 @@
     "@nestjs/jwt": "^11.0.0",
     "@nestjs/passport": "^11.0.5",
     "@nestjs/platform-express": "^11.0.1",
-    "@nestjs/swagger": "^11.0.5",
+    "@nestjs/swagger": "^11.0.6",
     "@nestjs/typeorm": "^11.0.0",
     "bcrypt": "^5.1.1",
-    "passport": "^0.7.0",
+    "dotenv": "^16.4.7",
     "passport-jwt": "^4.0.1",
     "pg": "^8.13.3",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
-    "swagger-ui-express": "^5.0.1",
     "typeorm": "^0.3.20"
   },
   "devDependencies": {
@@ -45,11 +44,9 @@
     "@nestjs/testing": "^11.0.1",
     "@swc/cli": "^0.6.0",
     "@swc/core": "^1.10.7",
-    "@types/bcrypt": "^5.0.2",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.10.7",
-    "@types/passport-jwt": "^4.0.1",
     "@types/supertest": "^6.0.2",
     "eslint": "^9.18.0",
     "eslint-config-prettier": "^10.0.1",

backend/users-auth-service/src/.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all"
+}

backend/users-auth-service/src/app.controller.spec.ts

@@ -0,0 +1,22 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { AppController } from './app.controller';
+import { AppService } from './app.service';
+
+describe('AppController', () => {
+  let appController: AppController;
+
+  beforeEach(async () => {
+    const app: TestingModule = await Test.createTestingModule({
+      controllers: [AppController],
+      providers: [AppService],
+    }).compile();
+
+    appController = app.get<AppController>(AppController);
+  });
+
+  describe('root', () => {
+    it('should return "Hello World!"', () => {
+      expect(appController.getHello()).toBe('Hello World!');
+    });
+  });
+});

backend/users-auth-service/src/app.controller.ts

@@ -0,0 +1,12 @@
+import { Controller, Get } from '@nestjs/common';
+import { AppService } from './app.service';
+
+@Controller()
+export class AppController {
+  constructor(private readonly appService: AppService) {}
+
+  @Get()
+  getHello(): string {
+    return this.appService.getHello();
+  }
+}

backend/users-auth-service/src/app.module.ts

@@ -0,0 +1,29 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { ConfigModule } from '@nestjs/config';
+import { AuthModule } from './auth/auth.module';
+import { UsersModule } from './users/users.module';
+import { User } from './users/user.entity';
+
+@Module({
+  imports: [
+    ConfigModule.forRoot({ isGlobal: true }),
+    TypeOrmModule.forRootAsync({
+      imports: [ConfigModule],
+      useFactory: () => ({
+        type: 'postgres',
+        host: process.env.DB_HOST || 'localhost',
+        port: Number(process.env.DB_PORT) || 5432,
+        username: process.env.DB_USER || 'postgres',
+        password: process.env.DB_PASSWORD || 'postgres',
+        database: process.env.DB_NAME || 'todo',
+        entities: [User],
+        synchronize: true,
+      }),
+    }),
+    AuthModule,
+    UsersModule
+  ],
+  exports: [TypeOrmModule],
+})
+export class AppModule {}

backend/users-auth-service/src/app.service.ts

@@ -0,0 +1,8 @@
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class AppService {
+  getHello(): string {
+    return 'Hello World!';
+  }
+}

backend/users-auth-service/src/auth/auth.service.ts

@@ -25,6 +25,7 @@ export class AuthService {
 
   async login(user: any) {
     const payload = { username: user.username, sub: user.id };
+    console.log("access_token:", payload);
     return {
       access_token: this.jwtService.sign(payload),
     };

backend/users-auth-service/src/auth/jwt.module.ts

@@ -0,0 +1,21 @@
+import { Module } from '@nestjs/common';
+import { JwtModule } from '@nestjs/jwt';
+import { ConfigModule, ConfigService } from '@nestjs/config';
+import { JwtStrategy } from './jwt.strategy';
+
+@Module({
+  imports: [
+    ConfigModule,
+    JwtModule.registerAsync({
+      imports: [ConfigModule],
+      useFactory: async (configService: ConfigService) => ({
+        secret: configService.get<string>('JWT_SECRET'),
+        signOptions: { expiresIn: configService.get<string>('JWT_EXPIRES_IN', '3600s') },
+      }),
+      inject: [ConfigService],
+    }),
+  ],
+  providers: [JwtStrategy],
+  exports: [JwtModule],
+})
+export class JwtAuthModule {}

backend/users-auth-service/src/auth/jwt.strategy.ts

@@ -1,14 +1,15 @@
 import { Injectable } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import { ExtractJwt, Strategy } from 'passport-jwt';
+import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy) {
-  constructor() {
+  constructor(configService: ConfigService) {
     super({
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
       ignoreExpiration: false,
-      secretOrKey: process.env.JWT_SECRET || 'super_secret_key',
+      secretOrKey: configService.get<string>('JWT_SECRET'),
     });
   }
 

backend/users-auth-service/src/main.ts

@@ -0,0 +1,28 @@
+import { NestFactory } from '@nestjs/core';
+import { AppModule } from './app.module';
+import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
+import { ConfigService } from '@nestjs/config';
+
+async function bootstrap() {
+  const app = await NestFactory.create(AppModule);
+
+  app.setGlobalPrefix('api');
+  const configService = app.get(ConfigService);
+  const port = configService.get<number>('PORT') || 4000;
+
+  app.enableCors();
+
+  const config = new DocumentBuilder()
+    .setTitle('Cool TODO Manager API')
+    .setDescription('API for user authentication and JWT token management')
+    .setVersion('2.0')
+    .addBearerAuth()
+    .build();
+  const document = SwaggerModule.createDocument(app, config);
+  SwaggerModule.setup('api/docs', app, document);
+
+
+
+  await app.listen(port);
+}
+bootstrap();

backend/users-auth-service/src/users/users.controller.ts

@@ -23,4 +23,11 @@ export class UsersController {
   async getUser(@Param('username') username: string): Promise<User | null> {
     return this.usersService.findOneByUsername(username);
   }
+
+  @ApiOperation({ summary: 'Get all users' })
+  @ApiResponse({ status: 200, description: 'List of users', type: User, isArray: true})
+  @Get()
+  async findAll(): Promise<User[]> {
+    return this.usersService.findAll();
+  }
 }

backend/users-auth-service/src/users/users.service.ts

@@ -29,6 +29,10 @@ export class UsersService {
     return this.usersRepository.findOne({ where: { username } });
   }
 
+  async findAll(): Promise<User[]> {
+    return this.usersRepository.find();
+  }
+
   async findOneById(id: number): Promise<User | null> {
     return this.usersRepository.findOne({ where: { id } });
   }

backend/users-auth-service/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
+}

backend/users-auth-service/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "target": "ES2023",
+    "sourceMap": true,
+    "outDir": "./dist",
+    "baseUrl": "./",
+    "incremental": true,
+    "skipLibCheck": true,
+    "strictNullChecks": true,
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "noFallthroughCasesInSwitch": false
+  }
+}

nestjs/backend/.dockerignore

@@ -1,3 +0,0 @@
-dist/
-node_modules/
-test/

nestjs/backend/Dockerfile

@@ -1,23 +0,0 @@
-# Используем официальный Node.js образ
-FROM node:18
-
-# Устанавливаем рабочую директорию внутри контейнера
-WORKDIR /app
-
-# Копируем package*.json
-COPY package*.json ./
-
-# Устанавливаем зависимости
-RUN npm install
-
-# Копируем весь код
-COPY . .
-
-# Собираем TypeScript
-RUN npm run build
-
-# Открываем порт 3000
-EXPOSE 3000
-
-# Запускаем NestJS в продакшене
-CMD ["npm", "run", "start:prod"]

nestjs/backend/docker-compose.yml

@@ -1,33 +0,0 @@
-version: "3.8"
-services:
-  db:
-    container_name: nestjs_db
-    image: postgres:latest
-    restart: always
-    environment:
-      POSTGRES_USER: nichtar
-      POSTGRES_PASSWORD: 6t30a72
-      POSTGRES_DB: todo
-    ports:
-      - "5432:5432"
-    volumes:
-      - db_data:/var/lib/postgresql/data
-
-  backend:
-    container_name: nestjs_backend
-    build: .
-    ports:
-      - "3000:3000"
-    depends_on:
-      - db
-    environment:
-      DB_HOST: db
-      DB_PORT: 5432
-      DB_USER: nichtar
-      DB_PASSWORD: 6t30a72
-      DB_NAME: todo
-      JWT_SECRET: your_secret_key
-      JWT_EXPIRES_IN: 3600s
-
-volumes:
-  db_data:

nestjs/backend/src/config.ts

@@ -1,5 +0,0 @@
-export default {
-    jwtSecret: process.env.JWT_SECRET || 'super_secret_key',
-    jwtExpiresIn: '1h',
-  };
-  

nestjs/backend/src/main.ts

@@ -1,26 +0,0 @@
-import { NestFactory } from '@nestjs/core';
-import { AppModule } from './app.module';
-import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
-
-async function bootstrap() {
-  const app = await NestFactory.create(AppModule);
-
-  app.setGlobalPrefix('api'); // Все маршруты будут начинаться с `/api`
-  app.enableCors(); // Разрешаем CORS
-
-  // Настройка Swagger
-  const config = new DocumentBuilder()
-  .setTitle('Cool TODO Manager API')
-  .setDescription('NestJS + PostgreSQL + JWT + Docker')
-  .setVersion('2.0')
-  .addBearerAuth()
-  .build();
-
-  const document = SwaggerModule.createDocument(app, config);
-  SwaggerModule.setup('api/docs', app, document);
-  // Теперь Swagger доступен по /api/docs
-
-  await app.listen(3000);
-  console.log('🚀 Server running on http://localhost:3000/api');
-}
-bootstrap();

nestjs/backend/src/projects/project-member.entity.ts

@@ -1,18 +0,0 @@
-import { Entity, PrimaryGeneratedColumn, ManyToOne, Column } from 'typeorm';
-import { Project } from './project.entity';
-import { User } from '../users/user.entity';
-
-@Entity()
-export class ProjectMember {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @ManyToOne(() => Project, (project) => project.id, { eager: true })
-  project: Project;
-
-  @ManyToOne(() => User, (user) => user.id, { eager: true })
-  user: User;
-
-  @Column()
-  role: string; // 'owner' or 'member'
-}

nestjs/backend/src/projects/projects.controller.ts

@@ -1,119 +0,0 @@
-import { Controller, Post, Get, Patch, Delete, Body, Param, UseGuards, Request } from '@nestjs/common';
-import { ProjectsService } from './projects.service';
-import { Project } from './project.entity';
-import { AuthGuard } from '@nestjs/passport';
-import { ApiTags, ApiBearerAuth, ApiOperation, ApiParam, ApiBody, ApiResponse } from '@nestjs/swagger';
-
-class CreateProjectDto {
-  title: string;
-  description?: string;
-}
-
-@ApiTags('Projects')
-@ApiBearerAuth() // Все маршруты под Bearer Token (Try it out -> authorize)
-@Controller('projects')
-export class ProjectsController {
-  constructor(private readonly projectsService: ProjectsService) {}
-
-  @ApiOperation({ summary: 'Create new project' })
-  @ApiBody({
-    description: 'Project data',
-    type: CreateProjectDto,
-    examples: {
-      example1: {
-        summary: 'Simple project',
-        value: {
-          title: 'My project',
-          description: 'Test desc',
-        },
-      },
-    },
-  })
-  @ApiResponse({
-    status: 201,
-    description: 'Project created',
-    type: Project,
-  })
-  @UseGuards(AuthGuard('jwt'))
-  @Post('create')
-  async create(@Request() req, @Body() body: CreateProjectDto): Promise<Project> {
-    return this.projectsService.create({
-      title: body.title,
-      description: body.description,
-      ownerId: req.user.userId,
-    });
-  }
-
-  @ApiOperation({ summary: 'Get all projects' })
-  @ApiResponse({
-    status: 200,
-    description: 'List of projects',
-    type: Project,
-    isArray: true,
-  })
-  @Get()
-  async findAll(): Promise<Project[]> {
-    return this.projectsService.findAll();
-  }
-
-  @ApiOperation({ summary: 'Get single project by ID' })
-  @ApiParam({ name: 'id', type: 'number' })
-  @ApiResponse({
-    status: 200,
-    description: 'Found project',
-    type: Project,
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Project not found',
-  })
-  @Get(':id')
-  async findOne(@Param('id') id: number): Promise<Project | null> {
-    return this.projectsService.findOneById(id);
-  }
-
-  @ApiOperation({ summary: 'Update project' })
-  @ApiParam({ name: 'id', type: 'number' })
-  @ApiBody({
-    description: 'Fields to update',
-    schema: {
-      properties: {
-        title: { type: 'string', example: 'Updated Title' },
-        description: { type: 'string', example: 'Updated desc' },
-      },
-    },
-  })
-  @ApiResponse({
-    status: 200,
-    description: 'Project updated',
-    type: Project,
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Project not found',
-  })
-  @UseGuards(AuthGuard('jwt'))
-  @Patch(':id')
-  async update(
-    @Param('id') id: number,
-    @Body() data: { title?: string; description?: string },
-  ): Promise<Project> {
-    return this.projectsService.update(id, data);
-  }
-
-  @ApiOperation({ summary: 'Delete project' })
-  @ApiParam({ name: 'id', type: 'number' })
-  @ApiResponse({
-    status: 200,
-    description: 'Project deleted',
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Project not found',
-  })
-  @UseGuards(AuthGuard('jwt'))
-  @Delete(':id')
-  async delete(@Param('id') id: number): Promise<void> {
-    return this.projectsService.delete(id);
-  }
-}

nestjs/backend/src/projects/projects.module.ts

@@ -1,18 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { ProjectsService } from './projects.service';
-import { ProjectsController } from './projects.controller';
-import { Project } from './project.entity';
-import { ProjectMember } from './project-member.entity';
-import { UsersModule } from '../users/users.module';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([Project, ProjectMember]),
-    UsersModule,
-  ],
-  controllers: [ProjectsController],
-  providers: [ProjectsService],
-  exports: [ProjectsService],
-})
-export class ProjectsModule {}

nestjs/backend/test/app.e2e-spec.ts

@@ -1,25 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { INestApplication } from '@nestjs/common';
-import * as request from 'supertest';
-import { App } from 'supertest/types';
-import { AppModule } from './../src/app.module';
-
-describe('AppController (e2e)', () => {
-  let app: INestApplication<App>;
-
-  beforeEach(async () => {
-    const moduleFixture: TestingModule = await Test.createTestingModule({
-      imports: [AppModule],
-    }).compile();
-
-    app = moduleFixture.createNestApplication();
-    await app.init();
-  });
-
-  it('/ (GET)', () => {
-    return request(app.getHttpServer())
-      .get('/')
-      .expect(200)
-      .expect('Hello World!');
-  });
-});

nestjs/backend/test/jest-e2e.json

@@ -1,9 +0,0 @@
-{
-  "moduleFileExtensions": ["js", "json", "ts"],
-  "rootDir": ".",
-  "testEnvironment": "node",
-  "testRegex": ".e2e-spec.ts$",
-  "transform": {
-    "^.+\\.(t|j)s$": "ts-jest"
-  }
-}

nestjs/package-lock.json

@@ -1,6 +0,0 @@
-{
-  "name": "nestjs",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}