Merge pull request #29 from Bricks666/develop

v2.4.1
Bricks666 · Mar 25, 2024 · c013639 · c013639
2 parents 71368fc + c0ded7e
commit c013639
Show file tree

Hide file tree

Showing 27 changed files with 3,384 additions and 2,988 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "server",
-	"version": "2.4.0",
+	"version": "2.4.1",
 	"description": "",
 	"main": "./dist/index.js",
 	"scripts": {
@@ -18,47 +18,49 @@
 	"author": "Bricks",
 	"license": "ISC",
 	"dependencies": {
-		"@nestjs-modules/mailer": "^1.8.1",
-		"@nestjs/common": "^9.3.5",
-		"@nestjs/config": "^2.3.0",
-		"@nestjs/core": "^9.3.5",
-		"@nestjs/jwt": "^10.0.1",
-		"@nestjs/platform-express": "^9.3.5",
-		"@nestjs/swagger": "^6.2.1",
-		"@prisma/client": "^4.10.1",
-		"bcrypt": "^5.1.0",
-		"cache-manager": "^5.1.6",
+		"@bricks-ether/server-utils": "^2.1.0",
+		"@nestjs-modules/mailer": "^1.10.3",
+		"@nestjs/cache-manager": "^2.2.1",
+		"@nestjs/common": "^10.3.3",
+		"@nestjs/config": "^3.2.0",
+		"@nestjs/core": "^10.3.3",
+		"@nestjs/jwt": "^10.2.0",
+		"@nestjs/platform-express": "^10.3.3",
+		"@nestjs/swagger": "^7.3.0",
+		"@prisma/client": "^5.10.2",
+		"bcrypt": "^5.1.1",
+		"cache-manager": "^5.4.0",
 		"cache-manager-redis-store": "^3.0.1",
 		"class-transformer": "^0.5.1",
-		"class-validator": "^0.14.0",
+		"class-validator": "^0.14.1",
 		"cookie-parser": "^1.4.6",
 		"express": "^4.18.2",
-		"handlebars": "^4.7.7",
-		"nodemailer": "^6.9.1",
-		"redis": "^4.6.5",
-		"reflect-metadata": "^0.1.13",
-		"rxjs": "^7.8.0",
-		"swagger-ui-express": "^4.6.0"
+		"handlebars": "^4.7.8",
+		"nodemailer": "^6.9.10",
+		"redis": "^4.6.13",
+		"reflect-metadata": "^0.2.1",
+		"rxjs": "^7.8.1",
+		"swagger-ui-express": "^5.0.0"
 	},
 	"devDependencies": {
-		"@nestjs/cli": "^9.1.8",
-		"@nestjs/schematics": "^9.0.4",
-		"@types/bcrypt": "^5.0.0",
-		"@types/cookie-parser": "^1.4.3",
-		"@types/express": "^4.17.15",
-		"@types/node": "^18.11.18",
-		"@types/nodemailer": "^6.4.7",
-		"@typescript-eslint/eslint-plugin": "^5.47.1",
-		"@typescript-eslint/parser": "^5.47.1",
-		"eslint": "^8.30.0",
+		"@nestjs/cli": "^10.3.2",
+		"@nestjs/schematics": "^10.1.1",
+		"@types/bcrypt": "^5.0.2",
+		"@types/cookie-parser": "^1.4.6",
+		"@types/express": "^4.17.21",
+		"@types/node": "^20.11.20",
+		"@types/nodemailer": "^6.4.14",
+		"@typescript-eslint/eslint-plugin": "^7.0.2",
+		"@typescript-eslint/parser": "^7.0.2",
+		"eslint": "^8.56.0",
 		"eslint-config-airbnb-base": "^15.0.0",
-		"eslint-config-prettier": "^8.5.0",
-		"eslint-plugin-import": "^2.26.0",
-		"eslint-plugin-sonarjs": "^0.17.0",
-		"husky": "^8.0.2",
-		"lint-staged": "^13.1.0",
-		"prettier": "^2.8.1",
-		"prisma": "^4.10.1",
-		"typescript": "^4.9.4"
+		"eslint-config-prettier": "^9.1.0",
+		"eslint-plugin-import": "^2.29.1",
+		"eslint-plugin-sonarjs": "^0.24.0",
+		"husky": "^9.0.11",
+		"lint-staged": "^15.2.2",
+		"prettier": "^3.2.5",
+		"prisma": "^5.10.2",
+		"typescript": "^5.3.3"
 	}
 }
diff --git a/src/activities/repositories/activity-action/activity-action.repository.ts b/src/activities/repositories/activity-action/activity-action.repository.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
-import { DatabaseService } from '@/database/database.service';
+import { PrismaDatabaseService } from '@bricks-ether/server-utils/nestjs';
 import { ActivityActionDto } from '../../dto';
 import { CreateParams, GetOneParams } from './types';
 
 @Injectable()
 export class ActivityActionRepository {
-	constructor(private readonly databaseService: DatabaseService) {}
+	constructor(private readonly databaseService: PrismaDatabaseService) {}
 
 	async getAll(): Promise<ActivityActionDto[]> {
 		return this.databaseService.activityAction.findMany();

diff --git a/src/activities/repositories/activity-sphere/activity-sphere.repository.ts b/src/activities/repositories/activity-sphere/activity-sphere.repository.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
-import { DatabaseService } from '@/database/database.service';
+import { PrismaDatabaseService } from '@bricks-ether/server-utils/nestjs';
 import { ActivitySphereDto } from '../../dto';
 import { CreateParams, GetOneParams } from './types';
 
 @Injectable()
 export class ActivitySphereRepository {
-	constructor(private readonly databaseService: DatabaseService) {}
+	constructor(private readonly databaseService: PrismaDatabaseService) {}
 
 	async getAll(): Promise<ActivitySphereDto[]> {
 		return this.databaseService.activitySphere.findMany();

diff --git a/src/activities/repositories/activity/activity.repository.ts b/src/activities/repositories/activity/activity.repository.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
-import { DatabaseService } from '@/database/database.service';
+import { PrismaDatabaseService } from '@bricks-ether/server-utils/nestjs';
 import { ActivityDto } from '../../dto';
 import {
 	CreateParams,
@@ -13,7 +13,7 @@ import { select } from './config';
 
 @Injectable()
 export class ActivityRepository {
-	constructor(private readonly databaseService: DatabaseService) {}
+	constructor(private readonly databaseService: PrismaDatabaseService) {}
 
 	async getAllByRoomId(params: GetAllByRoomIdParams): Promise<ActivityDto[]> {
 		const {

diff --git a/src/app.module.ts b/src/app.module.ts
@@ -1,5 +1,7 @@
 import { APP_GUARD } from '@nestjs/core';
-import { CacheModule, CacheStore, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
+import { CacheModule, CacheStore } from '@nestjs/cache-manager';
+import { PrismaDatabaseModule } from '@bricks-ether/server-utils/nestjs';
 import { ConfigModule } from '@nestjs/config';
 import { RedisClientOptions } from 'redis';
 import { redisStore } from 'cache-manager-redis-store';
@@ -12,7 +14,6 @@ import { AuthModule } from '@/auth/auth.module';
 import { AuthGuard, IsActivatedGuard } from '@/auth/lib';
 import { ProgressModule } from '@/progress/progress.module';
 import { CommentsModule } from '@/comments/comments.module';
-import { DatabaseModule } from '@/database/database.module';
 import { MailModule } from '@/mail/mail.module';
 import { TokensModule } from '@/tokens/tokens.module';
 import { MembersModule } from '@/members/members.module';
@@ -25,13 +26,13 @@ const modules = [
 		store: redisStore as unknown as CacheStore,
 		isGlobal: true,
 		max: 50,
-		ttl: 5,
+		ttl: +process.env.CACHE_TTL,
 		url: process.env.REDIS_URL,
 	}),
 	ConfigModule.forRoot({
 		envFilePath: '.env',
 	}),
-	DatabaseModule.forRoot({}),
+	PrismaDatabaseModule.forRoot({}),
 	AuthModule,
 	UsersModule,
 	RoomsModule,

diff --git a/src/comments/repositories/comment/comment.repository.ts b/src/comments/repositories/comment/comment.repository.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
-import { DatabaseService } from '@/database/database.service';
+import { PrismaDatabaseService } from '@bricks-ether/server-utils/nestjs';
 import { SECURITY_USER_SELECT } from '@/users/repositories';
 import { CommentDto } from '../../dto';
 import {
@@ -29,7 +29,7 @@ const select = {
 
 @Injectable()
 export class CommentRepository {
-	constructor(private readonly databaseService: DatabaseService) {}
+	constructor(private readonly databaseService: PrismaDatabaseService) {}
 
 	async getAll(params: GetAllParams): Promise<CommentDto[]> {
 		const { limit, offset, roomId, taskId, } = params;
@@ -91,6 +91,7 @@ export class CommentRepository {
 		});
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	private static map(comment: any): CommentDto {
 		const { author, ...rest } = comment;
 

diff --git a/src/database/database.module-definition.ts b/src/database/database.module-definition.ts
diff --git a/src/database/database.module.ts b/src/database/database.module.ts
diff --git a/src/database/database.service.ts b/src/database/database.service.ts
diff --git a/src/database/index.ts b/src/database/index.ts
diff --git a/src/main.ts b/src/main.ts
@@ -7,15 +7,11 @@ import * as cookieParser from 'cookie-parser';
 import { AppModule } from '@/app.module';
 import { StandardResponseInterceptor, __PROD__ } from '@/shared';
 import { ORIGIN } from '@/const';
-import { DatabaseService } from '@/database';
 
 async function bootstrap() {
 	const { PORT, } = process.env;
 	const app = await NestFactory.create(AppModule);
 
-	const prismaService = app.get(DatabaseService);
-	await prismaService.enableShutdownHooks(app);
-
 	app.use(cookieParser());
 	app.enableCors({
 		credentials: true,
@@ -49,6 +45,7 @@ async function bootstrap() {
 	/**
 	 * Для преобразования BigInt в JSON
 	 */
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	(BigInt.prototype as any).toJSON = function () {
 		return Number(this);
 	};

diff --git a/src/members/controllers/members.controller.ts b/src/members/controllers/members.controller.ts
@@ -3,7 +3,6 @@ import {
 	Get,
 	Delete,
 	NotFoundException,
-	CacheInterceptor,
 	UseInterceptors
 } from '@nestjs/common';
 import {
@@ -12,6 +11,7 @@ import {
 	ApiOperation,
 	ApiTags
 } from '@nestjs/swagger';
+import { CacheInterceptor } from '@nestjs/cache-manager';
 import { Auth, CurrentUser } from '@/auth/lib';
 import { SecurityUserDto } from '@/users/dto';
 import { IntParam } from '@/shared';

diff --git a/src/members/repositories/members/members.repository.ts b/src/members/repositories/members/members.repository.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { DatabaseService } from '@/database';
+import { PrismaDatabaseService } from '@bricks-ether/server-utils/nestjs';
 import { SECURITY_USER_SELECT } from '@/users/repositories';
 import { SecurityUserDto } from '@/users/dto';
 import {
@@ -12,7 +12,7 @@ import {
 
 @Injectable()
 export class MembersRepository {
-	constructor(private readonly databaseService: DatabaseService) {}
+	constructor(private readonly databaseService: PrismaDatabaseService) {}
 
 	async getAllActivated(params: GetMembersParams): Promise<SecurityUserDto[]> {
 		const { roomId, } = params;

diff --git a/src/progress/repositories/progress/progress.repository.ts b/src/progress/repositories/progress/progress.repository.ts
@@ -1,14 +1,14 @@
 import { Injectable } from '@nestjs/common';
 import { Prisma, TaskStatus } from '@prisma/client';
-import { DatabaseService } from '@/database/database.service';
+import { PrismaDatabaseService } from '@bricks-ether/server-utils/nestjs';
 import { map } from '@/shared';
 import { TagDto } from '@/tags/dto';
 import { ProgressDto, ProgressQueryResult } from '../../dto';
 import { GetAllParams } from './types';
 
 @Injectable()
 export class ProgressRepository {
-	constructor(private readonly databaseService: DatabaseService) {}
+	constructor(private readonly databaseService: PrismaDatabaseService) {}
 
 	async getAll(params: GetAllParams): Promise<ProgressDto[]> {
 		const { roomId, } = params;

diff --git a/src/room-invitations/repositories/room-invitations/room-invitations.repository.ts b/src/room-invitations/repositories/room-invitations/room-invitations.repository.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { DatabaseService } from '@/database/database.service';
+import { PrismaDatabaseService } from '@bricks-ether/server-utils/nestjs';
 import { RoomInvitationDto } from '../../dto';
 import { invitationSelect } from '../configs';
 import {
@@ -14,7 +14,7 @@ import {
 
 @Injectable()
 export class RoomInvitationsRepository {
-	constructor(private readonly databaseService: DatabaseService) {}
+	constructor(private readonly databaseService: PrismaDatabaseService) {}
 
 	async getAllActive(
 		params: GetRoomInvitationsParams

diff --git a/src/rooms/controllers/lib.ts b/src/rooms/controllers/lib.ts
@@ -0,0 +1,3 @@
+export const getUserRoomsCacheKey = (userId: number): string => {
+	return `rooms_${userId}`;
+};