From 99114aff672c2acf7e4536594b15488a343fae89 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Mon, 18 May 2026 19:10:30 +0300
Subject: [PATCH 1/6] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B3=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=BA=20=D0=B7=D0=B0=D1=89=D0=B8=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rest/rest.application.ts                  |   8 ++-
 src/rest/rest.container.ts                    |   5 ++
 src/shared/helpers/common.ts                  |   4 ++
 src/shared/libs/config/rest.config.schema.ts  |  14 ++++
 .../controller/base-controller.abstract.ts    |  12 +++-
 .../rest/middleware/upload-file.middleware.ts |  16 +++--
 src/shared/libs/transform/path-transformer.ts |  62 ++++++++++++++++++
 .../libs/transform/transformer.const.ts       |   3 +
 src/shared/modules/comment/comment-service.ts |   7 +-
 src/shared/modules/offer/dto/offer-dto.ts     |   2 +-
 src/shared/modules/offer/offer-controller.ts  |  30 ++++++++-
 .../modules/offer/offer-service.interface.ts  |   2 +-
 src/shared/modules/offer/offer-service.ts     |   6 +-
 src/shared/modules/offer/offer.entity.ts      |   8 +--
 src/shared/modules/user/dto/user-dto.ts       |  11 +---
 src/shared/modules/user/user-controller.ts    |  28 ++++++++
 src/shared/modules/user/user-service.ts       |   9 ++-
 src/shared/modules/user/user.constant.ts      |   1 +
 src/shared/types/container.ts                 |   1 +
 src/static/default-avatar.jpg                 | Bin 0 -> 9099 bytes
 20 files changed, 195 insertions(+), 34 deletions(-)
 create mode 100644 src/shared/libs/transform/path-transformer.ts
 create mode 100644 src/shared/libs/transform/transformer.const.ts
 create mode 100644 src/shared/modules/user/user.constant.ts
 create mode 100644 src/static/default-avatar.jpg

diff --git a/src/rest/rest.application.ts b/src/rest/rest.application.ts
index d23f675..7f43bc3 100644
--- a/src/rest/rest.application.ts
+++ b/src/rest/rest.application.ts
@@ -8,6 +8,7 @@ import express, { Express } from 'express';
 import { Controller } from '../shared/libs/rest/controller/controller.interface.js';
 import { ExceptionFilter } from '../shared/libs/rest/exception-filter/exception-filter.interface.js';
 import { ParseTokenMiddleware } from '../shared/libs/rest/middleware/parse-token.middleware.js';
+import { getFullServerPath } from '../shared/helpers/common.js';
 
 @injectable()
 export class RestApplication {
@@ -57,6 +58,11 @@ export class RestApplication {
       '/upload',
       express.static(this.config.get('UPLOAD_FILE_DIRECTORY')),
     );
+
+    this.server.use(
+      '/static',
+      express.static(this.config.get('STATIC_DIRECTORY_PATH')),
+    );
   }
 
   private async _initControllers() {
@@ -91,7 +97,7 @@ export class RestApplication {
     await this.__initExceptionFilters();
 
     this.logger.info(
-      `🚀 Server started on http://localhost:${this.config.get('PORT')}`,
+      `🚀 Server started on ${getFullServerPath(this.config.get('HOST'), this.config.get('PORT'))}`,
     );
 
     this.logger.info('Database initialization');
diff --git a/src/rest/rest.container.ts b/src/rest/rest.container.ts
index 2b31faa..80b213a 100644
--- a/src/rest/rest.container.ts
+++ b/src/rest/rest.container.ts
@@ -9,6 +9,7 @@ import {
 } from '../shared/libs/database-client/index.js';
 import { ExceptionFilter } from '../shared/libs/rest/exception-filter/exception-filter.interface.js';
 import { AppExceptionFilter } from '../shared/libs/rest/exception-filter/app-exception-filter.js';
+import { PathTransformer } from '../shared/libs/transform/path-transformer.js';
 
 export function createRestContainer() {
   const restApplicationContainer = new Container();
@@ -32,6 +33,10 @@ export function createRestContainer() {
     .bind<ExceptionFilter>(Component.ExceptionFilter)
     .to(AppExceptionFilter)
     .inSingletonScope();
+  restApplicationContainer
+    .bind(Component.PathTransformer)
+    .to(PathTransformer)
+    .inSingletonScope();
 
   return restApplicationContainer;
 }
diff --git a/src/shared/helpers/common.ts b/src/shared/helpers/common.ts
index 1643ffa..ee06918 100644
--- a/src/shared/helpers/common.ts
+++ b/src/shared/helpers/common.ts
@@ -29,3 +29,7 @@ export function fillDTO<T, V>(dto: ClassConstructor<T>, plainObject: V) {
 export function createErrorObject(message: string) {
   return { error: message };
 }
+
+export function getFullServerPath(host: string, port: number) {
+  return `http://${host}:${port}`;
+}
diff --git a/src/shared/libs/config/rest.config.schema.ts b/src/shared/libs/config/rest.config.schema.ts
index a318da0..7fa9001 100644
--- a/src/shared/libs/config/rest.config.schema.ts
+++ b/src/shared/libs/config/rest.config.schema.ts
@@ -11,6 +11,8 @@ export type RestSchema = {
   DB_NAME: string;
   UPLOAD_FILE_DIRECTORY: string;
   JWT_SECRET: string;
+  HOST: string;
+  STATIC_DIRECTORY_PATH: string;
 };
 
 convict.addFormats(validator);
@@ -70,4 +72,16 @@ export const restSchema = convict<RestSchema>({
     env: 'JWT_SECRET',
     default: null,
   },
+  HOST: {
+    doc: 'Host name',
+    format: String,
+    env: 'HOST',
+    default: null,
+  },
+  STATIC_DIRECTORY_PATH: {
+    doc: 'Static directory path',
+    format: String,
+    env: 'STATIC_DIRECTORY_PATH',
+    default: null,
+  },
 });
diff --git a/src/shared/libs/rest/controller/base-controller.abstract.ts b/src/shared/libs/rest/controller/base-controller.abstract.ts
index d130324..427f8f1 100644
--- a/src/shared/libs/rest/controller/base-controller.abstract.ts
+++ b/src/shared/libs/rest/controller/base-controller.abstract.ts
@@ -1,10 +1,12 @@
-import { injectable } from 'inversify';
+import { inject, injectable } from 'inversify';
 import { Controller } from './controller.interface.js';
 import { Response, Router } from 'express';
 import { Route } from '../types/route.interface.js';
 import { StatusCodes } from 'http-status-codes';
 import { Logger } from '../../logger/index.js';
 import expressAsyncHandler from 'express-async-handler';
+import { Component } from '../../../types/container.js';
+import { PathTransformer } from '../../transform/path-transformer.js';
 
 const DEFAULT_CONTENT_TYPE = 'application/json';
 
@@ -16,6 +18,9 @@ export abstract class BaseController implements Controller {
     this._router = Router();
   }
 
+  @inject(Component.PathTransformer)
+  protected readonly pathTransformer: PathTransformer;
+
   get router(): Router {
     return this._router;
   }
@@ -37,7 +42,10 @@ export abstract class BaseController implements Controller {
   }
 
   public send<T>(res: Response, statusCode: number, data: T) {
-    res.type(DEFAULT_CONTENT_TYPE).status(statusCode).json(data);
+    const modifiedData = this.pathTransformer.execute(
+      data as Record<string, unknown>,
+    );
+    res.type(DEFAULT_CONTENT_TYPE).status(statusCode).json(modifiedData);
   }
 
   public created<T>(res: Response, data: T) {
diff --git a/src/shared/libs/rest/middleware/upload-file.middleware.ts b/src/shared/libs/rest/middleware/upload-file.middleware.ts
index 3d0de85..383e4de 100644
--- a/src/shared/libs/rest/middleware/upload-file.middleware.ts
+++ b/src/shared/libs/rest/middleware/upload-file.middleware.ts
@@ -1,16 +1,22 @@
 import { NextFunction, Request, Response } from 'express';
-import { Middleware } from '../index.js';
 import multer, { diskStorage } from 'multer';
 import { extension } from 'mime-types';
 import * as crypto from 'node:crypto';
+import { Middleware } from './middleware.interface.js';
 
 export class UploadFileMiddleware implements Middleware {
   constructor(
-    private readonly fieldName: string,
-    private readonly uploadDirectory: string,
+    private uploadDirectory: string,
+    private fieldName: string,
   ) {}
 
-  execute(req: Request, res: Response, next: NextFunction): void {
+  public async execute(
+    req: Request,
+    res: Response,
+    next: NextFunction,
+  ): Promise<void> {
+    console.log(this.uploadDirectory);
+    console.log(this.fieldName);
     const storage = diskStorage({
       destination: this.uploadDirectory,
       filename: (_req, file, callback) => {
@@ -20,6 +26,8 @@ export class UploadFileMiddleware implements Middleware {
       },
     });
 
+    console.log(storage);
+
     const uploadSingleFileMiddleware = multer({ storage }).single(
       this.fieldName,
     );
diff --git a/src/shared/libs/transform/path-transformer.ts b/src/shared/libs/transform/path-transformer.ts
new file mode 100644
index 0000000..2452170
--- /dev/null
+++ b/src/shared/libs/transform/path-transformer.ts
@@ -0,0 +1,62 @@
+import { inject, injectable } from 'inversify';
+import { Logger } from '../logger/index.js';
+import { Component } from '../../types/container.js';
+import { Config, RestSchema } from '../config/index.js';
+import {
+  DEFAULT_STATIC_IMAGES,
+  STATIC_RESOURCE_FIELDS,
+} from './transformer.const.js';
+import { getFullServerPath } from '../../helpers/common.js';
+
+function isObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+@injectable()
+export class PathTransformer {
+  constructor(
+    @inject(Component.Logger) private readonly logger: Logger,
+    @inject(Component.Config) private readonly config: Config<RestSchema>,
+  ) {
+    this.logger.info('PathTransformer was created');
+  }
+
+  private hasDefaultImage(value: string) {
+    return DEFAULT_STATIC_IMAGES.includes(value);
+  }
+
+  private isStaticProperty(property: string) {
+    return STATIC_RESOURCE_FIELDS.includes(property);
+  }
+
+  public execute(data: Record<string, unknown>) {
+    const stack = [data];
+    while (stack.length > 0) {
+      const current = stack.pop();
+      for (const key in current) {
+        if (Object.hasOwn(current, key)) {
+          const value = current[key];
+
+          if (isObject(value)) {
+            stack.push(value);
+            continue;
+          }
+
+          if (this.isStaticProperty(key) && typeof value === 'string') {
+            const staticPath = '/static';
+            const uploadPath = '/upload';
+            const serverHost = this.config.get('HOST');
+            const serverPort = this.config.get('PORT');
+            const rootPath = this.hasDefaultImage(value)
+              ? staticPath
+              : uploadPath;
+            current[key] =
+              `${getFullServerPath(serverHost, serverPort)}${rootPath}/${value}`;
+          }
+        }
+      }
+    }
+
+    return data;
+  }
+}
diff --git a/src/shared/libs/transform/transformer.const.ts b/src/shared/libs/transform/transformer.const.ts
new file mode 100644
index 0000000..b113565
--- /dev/null
+++ b/src/shared/libs/transform/transformer.const.ts
@@ -0,0 +1,3 @@
+export const DEFAULT_STATIC_IMAGES = ['default-avatar.jpg'];
+
+export const STATIC_RESOURCE_FIELDS = ['avatar', 'imagePreview', 'images'];
diff --git a/src/shared/modules/comment/comment-service.ts b/src/shared/modules/comment/comment-service.ts
index de1e4eb..b071eb1 100644
--- a/src/shared/modules/comment/comment-service.ts
+++ b/src/shared/modules/comment/comment-service.ts
@@ -31,7 +31,12 @@ export class CommentService implements CommentServiceInterface {
   public async findByOfferId(
     offerId: string,
   ): Promise<DocumentType<CommentEntity>[]> {
-    return this.commentModel.find({ offerId }).populate('author');
+    return this.commentModel
+      .find({ offerId })
+      .populate('author')
+      .limit(50)
+      .sort({ date: -1 })
+      .exec();
   }
 
   public async deleteByOfferId(offerId: string): Promise<number> {
diff --git a/src/shared/modules/offer/dto/offer-dto.ts b/src/shared/modules/offer/dto/offer-dto.ts
index e9aa503..f630359 100644
--- a/src/shared/modules/offer/dto/offer-dto.ts
+++ b/src/shared/modules/offer/dto/offer-dto.ts
@@ -72,7 +72,7 @@ export class CreateOfferDto {
   @IsArray({ message: OfferDTOValidationMessage.goods.isArray })
     goods!: Amenity[];
 
-  @IsObject({ message: OfferDTOValidationMessage.host.isObject })
+  @IsString({ message: OfferDTOValidationMessage.host.isObject })
     host!: string;
 
   @IsInt({ message: OfferDTOValidationMessage.commentsCount.isInt })
diff --git a/src/shared/modules/offer/offer-controller.ts b/src/shared/modules/offer/offer-controller.ts
index 0c67e7d..85b4369 100644
--- a/src/shared/modules/offer/offer-controller.ts
+++ b/src/shared/modules/offer/offer-controller.ts
@@ -62,6 +62,20 @@ export class OfferController extends BaseController {
         new DocumentExistsMiddleware('offerId', 'offer', this.offerService),
       ],
     });
+    this.addRoute({
+      path: '/premium',
+      method: HttpMethod.Get,
+      handler: this.showPremiumOffers,
+    });
+    this.addRoute({
+      path: '/:offerId',
+      method: HttpMethod.Get,
+      handler: this.getDetailOffers,
+      middlewares: [
+        new ValidateObjectIdMiddleware('offerId'),
+        new DocumentExistsMiddleware('offerId', 'offer', this.offerService),
+      ],
+    });
     this.addRoute({
       path: '/:offerId/comments',
       method: HttpMethod.Get,
@@ -74,7 +88,8 @@ export class OfferController extends BaseController {
   }
 
   public async index(req: Request, res: Response) {
-    const offers = await this.offerService.find();
+    const limit = Number(req.params.limit) || 60;
+    const offers = await this.offerService.find(limit);
     let favoritesIds: string[] = [];
 
     if (req.tokenPayload) {
@@ -105,11 +120,18 @@ export class OfferController extends BaseController {
 
     const result = await this.offerService.createOffer({
       ...req.body,
-      userId: req.tokenPayload.id,
+      host: req.tokenPayload.id,
     });
     this.created(res, fillDTO(OfferRDO, result));
   }
 
+  public async getDetailOffers(req: Request, res: Response) {
+    const offer = await this.offerService.findOfferById(
+      req.params.offerId as string,
+    );
+    this.ok(res, fillDTO(OfferRDO, offer));
+  }
+
   public async update(req: Request, res: Response) {
     const updateOffer = await this.offerService.updateById(
       req.params.id as string,
@@ -138,13 +160,15 @@ export class OfferController extends BaseController {
     const city = req.params.city as City;
     const premiumOffers = await this.offerService.findPremiumOffersByCity(city);
 
+    console.log(premiumOffers);
+
     this.ok(res, fillDTO(OfferRDO, premiumOffers));
   }
 
   public async getComments(req: Request, res: Response) {
     const offerId = req.params.offerId;
 
-    const comments = this.commentService.findByOfferId(offerId as string);
+    const comments = await this.commentService.findByOfferId(offerId as string);
 
     this.ok(res, fillDTO(OfferRDO, comments));
   }
diff --git a/src/shared/modules/offer/offer-service.interface.ts b/src/shared/modules/offer/offer-service.interface.ts
index 6f85822..7cc5e9b 100644
--- a/src/shared/modules/offer/offer-service.interface.ts
+++ b/src/shared/modules/offer/offer-service.interface.ts
@@ -15,5 +15,5 @@ export interface OfferServiceInterface {
   incCommentCount(offerId: string): Promise<DocumentType<OfferEntity> | null>;
   decCommentCount(offerId: string): Promise<DocumentType<OfferEntity> | null>;
   findPremiumOffersByCity(city: City): Promise<DocumentType<OfferEntity>[]>;
-  find(): Promise<DocumentType<OfferEntity>[]>;
+  find(limit: number): Promise<DocumentType<OfferEntity>[]>;
 }
diff --git a/src/shared/modules/offer/offer-service.ts b/src/shared/modules/offer/offer-service.ts
index 8ad7b2b..026f0c1 100644
--- a/src/shared/modules/offer/offer-service.ts
+++ b/src/shared/modules/offer/offer-service.ts
@@ -63,8 +63,8 @@ export class OfferService implements OfferServiceInterface, DocumentExists {
       .exec();
   }
 
-  async find(): Promise<DocumentType<OfferEntity>[]> {
-    return this.offerModel.find().populate('host').exec();
+  async find(limit: number): Promise<DocumentType<OfferEntity>[]> {
+    return this.offerModel.find().populate('host').limit(limit).exec();
   }
 
   async findPremiumOffersByCity(
@@ -72,6 +72,8 @@ export class OfferService implements OfferServiceInterface, DocumentExists {
   ): Promise<DocumentType<OfferEntity>[]> {
     return this.offerModel
       .find({ city, isPremium: true })
+      .sort({ date: -1 })
+      .limit(3)
       .populate('host')
       .exec();
   }
diff --git a/src/shared/modules/offer/offer.entity.ts b/src/shared/modules/offer/offer.entity.ts
index b0df816..c397e12 100644
--- a/src/shared/modules/offer/offer.entity.ts
+++ b/src/shared/modules/offer/offer.entity.ts
@@ -5,7 +5,7 @@ import {
   prop,
   Ref,
 } from '@typegoose/typegoose';
-import { Amenity, City, HousingType } from '../../types/offer.js';
+import { Amenity, City, HousingType, Location } from '../../types/offer.js';
 import { UserEntity } from '../user/user.entity.js';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
@@ -17,10 +17,6 @@ export interface OfferEntity extends defaultClasses.Base {}
     timestamps: true,
   },
 })
-class Location {
-  public latitude!: number;
-  public longitude!: number;
-}
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class OfferEntity extends defaultClasses.TimeStamps {
@@ -104,7 +100,7 @@ export class OfferEntity extends defaultClasses.TimeStamps {
   @prop({ required: true })
   public commentsCount!: number;
 
-  @prop({ _id: false, type: () => Location, required: true })
+  @prop({ _id: false, required: true })
   public location!: Location;
 }
 
diff --git a/src/shared/modules/user/dto/user-dto.ts b/src/shared/modules/user/dto/user-dto.ts
index 90906cc..a6da1f3 100644
--- a/src/shared/modules/user/dto/user-dto.ts
+++ b/src/shared/modules/user/dto/user-dto.ts
@@ -1,10 +1,4 @@
-import {
-  IsBoolean,
-  IsEmail,
-  IsString,
-  MaxLength,
-  MinLength,
-} from 'class-validator';
+import { IsBoolean, IsEmail, MaxLength, MinLength } from 'class-validator';
 import { UserDTOValidationMessage } from './user-dto.messages.js';
 
 export class CreateUserDto {
@@ -15,9 +9,6 @@ export class CreateUserDto {
   @IsEmail({}, { message: UserDTOValidationMessage.email.isEmail })
   public email: string;
 
-  @IsString({ message: UserDTOValidationMessage.avatar.isString })
-  public avatar: string;
-
   @MinLength(6, { message: UserDTOValidationMessage.password.min })
   @MaxLength(12, { message: UserDTOValidationMessage.password.max })
   public password: string;
diff --git a/src/shared/modules/user/user-controller.ts b/src/shared/modules/user/user-controller.ts
index 6979ca3..978aedd 100644
--- a/src/shared/modules/user/user-controller.ts
+++ b/src/shared/modules/user/user-controller.ts
@@ -14,6 +14,7 @@ import { ValidateDTOMiddleware } from '../../libs/rest/middleware/validate-objec
 import { CreateUserDto, LoginUserDTO } from './dto/user-dto.js';
 import { AuthServiceInterface, UserNotFoundException } from '../auth/index.js';
 import { PrivateRouteMiddleware } from '../../libs/rest/middleware/private-route.middleware.js';
+import { UploadFileMiddleware } from '../../libs/rest/middleware/upload-file.middleware.js';
 
 export class UserController extends BaseController {
   constructor(
@@ -39,10 +40,23 @@ export class UserController extends BaseController {
       middlewares: [new ValidateDTOMiddleware(LoginUserDTO)],
     });
 
+    this.addRoute({
+      path: '/:userId/favorite',
+      method: HttpMethod.Get,
+      handler: this.getFavorites,
+      middlewares: [new PrivateRouteMiddleware()],
+    });
+
     this.addRoute({
       path: '/:userId/avatar',
       method: HttpMethod.Post,
       handler: this.uploadAvatar,
+      middlewares: [
+        new UploadFileMiddleware(
+          'avatar',
+          this.config.get('UPLOAD_FILE_DIRECTORY'),
+        ),
+      ],
     });
 
     this.addRoute({
@@ -70,6 +84,20 @@ export class UserController extends BaseController {
     this.created(res, fillDTO(UserRDO, result));
   }
 
+  public async getFavorites(req: Request, res: Response) {
+    const user = await this.userService.findById(req.tokenPayload.id);
+    if (!user) {
+      throw new HttpError(
+        StatusCodes.UNAUTHORIZED,
+        'Unauthorized',
+        'UserController',
+      );
+    }
+    const favorites = await this.userService.findFavoriteOffers(user.id);
+
+    this.ok(res, favorites);
+  }
+
   public async auth(req: Request, res: Response) {
     const user = await this.authService.verify(req.body as LoginUserDTO);
 
diff --git a/src/shared/modules/user/user-service.ts b/src/shared/modules/user/user-service.ts
index 9412d7f..df5ec79 100644
--- a/src/shared/modules/user/user-service.ts
+++ b/src/shared/modules/user/user-service.ts
@@ -6,6 +6,7 @@ import { inject, injectable } from 'inversify';
 import { Component } from '../../types/container.js';
 import { Logger } from '../../libs/logger/index.js';
 import { OfferEntity } from '../offer/offer.entity.js';
+import { DEFAULT_AVATAR_FILE_NAME } from './user.constant.js';
 
 @injectable()
 export class UserService implements UserServiceInterface {
@@ -18,7 +19,7 @@ export class UserService implements UserServiceInterface {
     dto: CreateUserDto,
     salt: string,
   ): Promise<DocumentType<UserEntity>> {
-    const user = new UserEntity(dto);
+    const user = new UserEntity({ ...dto, avatar: DEFAULT_AVATAR_FILE_NAME });
     user.setPassword(dto.password, salt);
 
     const result = await UserModel.create(user);
@@ -38,8 +39,10 @@ export class UserService implements UserServiceInterface {
   async findFavoriteOffers(
     userId: number,
   ): Promise<DocumentType<OfferEntity>[]> {
-    const user = await UserModel.findById(userId).populate('favorites').exec();
-
+    const user = await this.userModel
+      .findById(userId)
+      .populate('favorites')
+      .exec();
     return (user?.favorites as DocumentType<OfferEntity>[]) ?? [];
   }
 
diff --git a/src/shared/modules/user/user.constant.ts b/src/shared/modules/user/user.constant.ts
new file mode 100644
index 0000000..29633af
--- /dev/null
+++ b/src/shared/modules/user/user.constant.ts
@@ -0,0 +1 @@
+export const DEFAULT_AVATAR_FILE_NAME = 'default-avatar.jpg';
diff --git a/src/shared/types/container.ts b/src/shared/types/container.ts
index 7125145..2abbcfa 100644
--- a/src/shared/types/container.ts
+++ b/src/shared/types/container.ts
@@ -15,4 +15,5 @@ export const Component = {
   CommentController: Symbol.for('CommentController'),
   AuthService: Symbol.for('AuthService'),
   AuthExceptionFilter: Symbol.for('AuthExceptionFilter'),
+  PathTransformer: Symbol.for('PathTransformer'),
 } as const;
diff --git a/src/static/default-avatar.jpg b/src/static/default-avatar.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ef5daf07473922d53d59c0662a68044e5b17f8e2
GIT binary patch
literal 9099
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

literal 0
HcmV?d00001


From 56954ccbbda8a33868c0fdef61a87f9954b9cc33 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Sat, 23 May 2026 20:50:24 +0300
Subject: [PATCH 2/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=BA=D0=BE=D0=B4=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libs/rest/middleware/upload-file.middleware.ts | 14 +++++---------
 src/shared/modules/comment/comment-service.ts      |  4 ++--
 src/shared/modules/comment/comment.const.ts        |  1 +
 src/shared/modules/offer/offer-controller.ts       |  5 ++++-
 src/shared/modules/offer/offer-service.ts          |  3 ++-
 src/shared/modules/offer/offer.const.ts            |  1 +
 src/shared/modules/user/user-controller.ts         |  2 +-
 7 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 src/shared/modules/comment/comment.const.ts
 create mode 100644 src/shared/modules/offer/offer.const.ts

diff --git a/src/shared/libs/rest/middleware/upload-file.middleware.ts b/src/shared/libs/rest/middleware/upload-file.middleware.ts
index 383e4de..eabe033 100644
--- a/src/shared/libs/rest/middleware/upload-file.middleware.ts
+++ b/src/shared/libs/rest/middleware/upload-file.middleware.ts
@@ -1,8 +1,8 @@
-import { NextFunction, Request, Response } from 'express';
-import multer, { diskStorage } from 'multer';
-import { extension } from 'mime-types';
-import * as crypto from 'node:crypto';
-import { Middleware } from './middleware.interface.js';
+import { NextFunction, Request, Response } from "express";
+import multer, { diskStorage } from "multer";
+import { extension } from "mime-types";
+import * as crypto from "node:crypto";
+import { Middleware } from "./middleware.interface.js";
 
 export class UploadFileMiddleware implements Middleware {
   constructor(
@@ -15,8 +15,6 @@ export class UploadFileMiddleware implements Middleware {
     res: Response,
     next: NextFunction,
   ): Promise<void> {
-    console.log(this.uploadDirectory);
-    console.log(this.fieldName);
     const storage = diskStorage({
       destination: this.uploadDirectory,
       filename: (_req, file, callback) => {
@@ -26,8 +24,6 @@ export class UploadFileMiddleware implements Middleware {
       },
     });
 
-    console.log(storage);
-
     const uploadSingleFileMiddleware = multer({ storage }).single(
       this.fieldName,
     );
diff --git a/src/shared/modules/comment/comment-service.ts b/src/shared/modules/comment/comment-service.ts
index b071eb1..a9bd51f 100644
--- a/src/shared/modules/comment/comment-service.ts
+++ b/src/shared/modules/comment/comment-service.ts
@@ -6,6 +6,7 @@ import { CommentDto } from './dto/comment-dto.js';
 import { CommentEntity } from './comment.entity.js';
 import { DocumentType, types } from '@typegoose/typegoose';
 import { OfferServiceInterface } from '../offer/offer-service.interface.js';
+import { DISPLAY_COMMENT_COUNT } from './comment.const.js';
 
 @injectable()
 export class CommentService implements CommentServiceInterface {
@@ -33,8 +34,7 @@ export class CommentService implements CommentServiceInterface {
   ): Promise<DocumentType<CommentEntity>[]> {
     return this.commentModel
       .find({ offerId })
-      .populate('author')
-      .limit(50)
+      .limit(DISPLAY_COMMENT_COUNT)
       .sort({ date: -1 })
       .exec();
   }
diff --git a/src/shared/modules/comment/comment.const.ts b/src/shared/modules/comment/comment.const.ts
new file mode 100644
index 0000000..9f0214e
--- /dev/null
+++ b/src/shared/modules/comment/comment.const.ts
@@ -0,0 +1 @@
+export const DISPLAY_COMMENT_COUNT = 50;
diff --git a/src/shared/modules/offer/offer-controller.ts b/src/shared/modules/offer/offer-controller.ts
index 85b4369..4a100b9 100644
--- a/src/shared/modules/offer/offer-controller.ts
+++ b/src/shared/modules/offer/offer-controller.ts
@@ -18,6 +18,7 @@ import { DocumentExistsMiddleware } from '../../libs/rest/middleware/document-ex
 import { DocumentExists } from '../../libs/rest/types/document-exists.interface.js';
 import { PrivateRouteMiddleware } from '../../libs/rest/middleware/private-route.middleware.js';
 import { UserServiceInterface } from '../user/user-service.interface.js';
+import { CommentRDO } from '../comment/rdo/comment-rdo.js';
 
 export class OfferController extends BaseController {
   constructor(
@@ -170,6 +171,8 @@ export class OfferController extends BaseController {
 
     const comments = await this.commentService.findByOfferId(offerId as string);
 
-    this.ok(res, fillDTO(OfferRDO, comments));
+    console.log(comments);
+
+    this.ok(res, fillDTO(CommentRDO, comments));
   }
 }
diff --git a/src/shared/modules/offer/offer-service.ts b/src/shared/modules/offer/offer-service.ts
index 026f0c1..6fda718 100644
--- a/src/shared/modules/offer/offer-service.ts
+++ b/src/shared/modules/offer/offer-service.ts
@@ -9,6 +9,7 @@ import { DocumentType, types } from '@typegoose/typegoose';
 import { CommentEntity } from '../comment/comment.entity.js';
 import { Types } from 'mongoose';
 import { DocumentExists } from '../../libs/rest/types/document-exists.interface.js';
+import { DISPLAY_PREMIUM_OFFERS_COUNT } from './offer.const.js';
 
 @injectable()
 export class OfferService implements OfferServiceInterface, DocumentExists {
@@ -73,7 +74,7 @@ export class OfferService implements OfferServiceInterface, DocumentExists {
     return this.offerModel
       .find({ city, isPremium: true })
       .sort({ date: -1 })
-      .limit(3)
+      .limit(DISPLAY_PREMIUM_OFFERS_COUNT)
       .populate('host')
       .exec();
   }
diff --git a/src/shared/modules/offer/offer.const.ts b/src/shared/modules/offer/offer.const.ts
new file mode 100644
index 0000000..5df6342
--- /dev/null
+++ b/src/shared/modules/offer/offer.const.ts
@@ -0,0 +1 @@
+export const DISPLAY_PREMIUM_OFFERS_COUNT = 3;
diff --git a/src/shared/modules/user/user-controller.ts b/src/shared/modules/user/user-controller.ts
index 978aedd..38934b0 100644
--- a/src/shared/modules/user/user-controller.ts
+++ b/src/shared/modules/user/user-controller.ts
@@ -53,8 +53,8 @@ export class UserController extends BaseController {
       handler: this.uploadAvatar,
       middlewares: [
         new UploadFileMiddleware(
-          'avatar',
           this.config.get('UPLOAD_FILE_DIRECTORY'),
+          'avatar',
         ),
       ],
     });

From 5c7cf086ae99a5c2bff99a5b14922d0164b95b77 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Sat, 23 May 2026 20:52:27 +0300
Subject: [PATCH 3/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libs/rest/middleware/upload-file.middleware.ts     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/shared/libs/rest/middleware/upload-file.middleware.ts b/src/shared/libs/rest/middleware/upload-file.middleware.ts
index eabe033..2e7631f 100644
--- a/src/shared/libs/rest/middleware/upload-file.middleware.ts
+++ b/src/shared/libs/rest/middleware/upload-file.middleware.ts
@@ -1,8 +1,8 @@
-import { NextFunction, Request, Response } from "express";
-import multer, { diskStorage } from "multer";
-import { extension } from "mime-types";
-import * as crypto from "node:crypto";
-import { Middleware } from "./middleware.interface.js";
+import { NextFunction, Request, Response } from 'express';
+import multer, { diskStorage } from 'multer';
+import { extension } from 'mime-types';
+import * as crypto from 'node:crypto';
+import { Middleware } from './middleware.interface.js';
 
 export class UploadFileMiddleware implements Middleware {
   constructor(

From ce97411c6bafc16d389cf2ea1c04473620f79930 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Sat, 23 May 2026 20:57:19 +0300
Subject: [PATCH 4/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libs/rest/middleware/upload-file.middleware.ts     | 10 +++++-----
 src/shared/modules/offer/offer-controller.ts           |  6 ------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/shared/libs/rest/middleware/upload-file.middleware.ts b/src/shared/libs/rest/middleware/upload-file.middleware.ts
index eabe033..2e7631f 100644
--- a/src/shared/libs/rest/middleware/upload-file.middleware.ts
+++ b/src/shared/libs/rest/middleware/upload-file.middleware.ts
@@ -1,8 +1,8 @@
-import { NextFunction, Request, Response } from "express";
-import multer, { diskStorage } from "multer";
-import { extension } from "mime-types";
-import * as crypto from "node:crypto";
-import { Middleware } from "./middleware.interface.js";
+import { NextFunction, Request, Response } from 'express';
+import multer, { diskStorage } from 'multer';
+import { extension } from 'mime-types';
+import * as crypto from 'node:crypto';
+import { Middleware } from './middleware.interface.js';
 
 export class UploadFileMiddleware implements Middleware {
   constructor(
diff --git a/src/shared/modules/offer/offer-controller.ts b/src/shared/modules/offer/offer-controller.ts
index 4a100b9..75398d9 100644
--- a/src/shared/modules/offer/offer-controller.ts
+++ b/src/shared/modules/offer/offer-controller.ts
@@ -160,9 +160,6 @@ export class OfferController extends BaseController {
   public async showPremiumOffers(req: Request, res: Response) {
     const city = req.params.city as City;
     const premiumOffers = await this.offerService.findPremiumOffersByCity(city);
-
-    console.log(premiumOffers);
-
     this.ok(res, fillDTO(OfferRDO, premiumOffers));
   }
 
@@ -170,9 +167,6 @@ export class OfferController extends BaseController {
     const offerId = req.params.offerId;
 
     const comments = await this.commentService.findByOfferId(offerId as string);
-
-    console.log(comments);
-
     this.ok(res, fillDTO(CommentRDO, comments));
   }
 }

From aabb36da965be1d99fbeec42e86877bcbf4e6ccc Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Sat, 23 May 2026 20:59:54 +0300
Subject: [PATCH 5/6] =?UTF-8?q?Revert=20"=D0=98=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ce97411c6bafc16d389cf2ea1c04473620f79930.
---
 .../libs/rest/middleware/upload-file.middleware.ts     | 10 +++++-----
 src/shared/modules/offer/offer-controller.ts           |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/shared/libs/rest/middleware/upload-file.middleware.ts b/src/shared/libs/rest/middleware/upload-file.middleware.ts
index 2e7631f..eabe033 100644
--- a/src/shared/libs/rest/middleware/upload-file.middleware.ts
+++ b/src/shared/libs/rest/middleware/upload-file.middleware.ts
@@ -1,8 +1,8 @@
-import { NextFunction, Request, Response } from 'express';
-import multer, { diskStorage } from 'multer';
-import { extension } from 'mime-types';
-import * as crypto from 'node:crypto';
-import { Middleware } from './middleware.interface.js';
+import { NextFunction, Request, Response } from "express";
+import multer, { diskStorage } from "multer";
+import { extension } from "mime-types";
+import * as crypto from "node:crypto";
+import { Middleware } from "./middleware.interface.js";
 
 export class UploadFileMiddleware implements Middleware {
   constructor(
diff --git a/src/shared/modules/offer/offer-controller.ts b/src/shared/modules/offer/offer-controller.ts
index 75398d9..4a100b9 100644
--- a/src/shared/modules/offer/offer-controller.ts
+++ b/src/shared/modules/offer/offer-controller.ts
@@ -160,6 +160,9 @@ export class OfferController extends BaseController {
   public async showPremiumOffers(req: Request, res: Response) {
     const city = req.params.city as City;
     const premiumOffers = await this.offerService.findPremiumOffersByCity(city);
+
+    console.log(premiumOffers);
+
     this.ok(res, fillDTO(OfferRDO, premiumOffers));
   }
 
@@ -167,6 +170,9 @@ export class OfferController extends BaseController {
     const offerId = req.params.offerId;
 
     const comments = await this.commentService.findByOfferId(offerId as string);
+
+    console.log(comments);
+
     this.ok(res, fillDTO(CommentRDO, comments));
   }
 }

From 779302874eb25ae4cc5ee1465b2a60f68a801dd3 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Sun, 24 May 2026 14:03:29 +0300
Subject: [PATCH 6/6] =?UTF-8?q?=D0=9F=D0=BE=D0=B8=D1=81=D0=BA=20=D0=B8=20?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D1=81=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D0=B8=D1=8F=20=D0=A2=D0=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shared/modules/offer/offer-controller.ts |  7 ++---
 src/shared/modules/offer/offer.const.ts      |  1 +
 src/shared/modules/user/rdo/user.rdo.ts      | 32 ++++++++++++++++++++
 src/shared/modules/user/user-controller.ts   |  8 +++--
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/shared/modules/offer/offer-controller.ts b/src/shared/modules/offer/offer-controller.ts
index 4a100b9..174c26d 100644
--- a/src/shared/modules/offer/offer-controller.ts
+++ b/src/shared/modules/offer/offer-controller.ts
@@ -19,6 +19,7 @@ import { DocumentExists } from '../../libs/rest/types/document-exists.interface.
 import { PrivateRouteMiddleware } from '../../libs/rest/middleware/private-route.middleware.js';
 import { UserServiceInterface } from '../user/user-service.interface.js';
 import { CommentRDO } from '../comment/rdo/comment-rdo.js';
+import { MAX_DISPLAY_OFFERS_COUNT } from './offer.const.js';
 
 export class OfferController extends BaseController {
   constructor(
@@ -89,7 +90,7 @@ export class OfferController extends BaseController {
   }
 
   public async index(req: Request, res: Response) {
-    const limit = Number(req.params.limit) || 60;
+    const limit = Number(req.params.limit) || MAX_DISPLAY_OFFERS_COUNT;
     const offers = await this.offerService.find(limit);
     let favoritesIds: string[] = [];
 
@@ -161,8 +162,6 @@ export class OfferController extends BaseController {
     const city = req.params.city as City;
     const premiumOffers = await this.offerService.findPremiumOffersByCity(city);
 
-    console.log(premiumOffers);
-
     this.ok(res, fillDTO(OfferRDO, premiumOffers));
   }
 
@@ -171,8 +170,6 @@ export class OfferController extends BaseController {
 
     const comments = await this.commentService.findByOfferId(offerId as string);
 
-    console.log(comments);
-
     this.ok(res, fillDTO(CommentRDO, comments));
   }
 }
diff --git a/src/shared/modules/offer/offer.const.ts b/src/shared/modules/offer/offer.const.ts
index 5df6342..0071f44 100644
--- a/src/shared/modules/offer/offer.const.ts
+++ b/src/shared/modules/offer/offer.const.ts
@@ -1 +1,2 @@
 export const DISPLAY_PREMIUM_OFFERS_COUNT = 3;
+export const MAX_DISPLAY_OFFERS_COUNT = 60;
diff --git a/src/shared/modules/user/rdo/user.rdo.ts b/src/shared/modules/user/rdo/user.rdo.ts
index 95f044d..33c743c 100644
--- a/src/shared/modules/user/rdo/user.rdo.ts
+++ b/src/shared/modules/user/rdo/user.rdo.ts
@@ -17,6 +17,38 @@ export class UserRDO {
     favorites: string[];
 }
 
+export class UserFavoriteOfferRDO {
+  @Expose()
+    title: string;
+
+  @Expose()
+    date: Date;
+
+  @Expose()
+    city: string;
+
+  @Expose()
+    type: string;
+
+  @Expose()
+    price: number;
+
+  @Expose()
+    isFavorite: boolean;
+
+  @Expose()
+    imagePreview: string;
+
+  @Expose()
+    isPremium: boolean;
+
+  @Expose()
+    rating: number;
+
+  @Expose()
+    commentsCount: number;
+}
+
 export class LoggedUserRDO {
   @Expose()
   public email: string;
diff --git a/src/shared/modules/user/user-controller.ts b/src/shared/modules/user/user-controller.ts
index 38934b0..febc222 100644
--- a/src/shared/modules/user/user-controller.ts
+++ b/src/shared/modules/user/user-controller.ts
@@ -7,7 +7,11 @@ import { Logger } from '../../libs/logger/index.js';
 import { UserServiceInterface } from './user-service.interface.js';
 import { StatusCodes } from 'http-status-codes';
 import { Config, RestSchema } from '../../libs/config/index.js';
-import { LoggedUserRDO, UserRDO } from './rdo/user.rdo.js';
+import {
+  LoggedUserRDO,
+  UserFavoriteOfferRDO,
+  UserRDO,
+} from './rdo/user.rdo.js';
 import { fillDTO } from '../../helpers/common.js';
 import { HttpError } from '../../libs/rest/errors/http-error.js';
 import { ValidateDTOMiddleware } from '../../libs/rest/middleware/validate-object.middleware.js';
@@ -95,7 +99,7 @@ export class UserController extends BaseController {
     }
     const favorites = await this.userService.findFavoriteOffers(user.id);
 
-    this.ok(res, favorites);
+    this.ok(res, fillDTO(UserFavoriteOfferRDO, favorites));
   }
 
   public async auth(req: Request, res: Response) {