From ccd9c148295a681cd0e7a1ba31fd49c1961fef96 Mon Sep 17 00:00:00 2001
From: AlexP <a.plohih@iqdev.digital>
Date: Tue, 14 May 2024 02:49:42 +0500
Subject: [PATCH] STA-960 | fix some issues

---
 app/composer.json                             |   2 +-
 app/config/packages/doctrine.yaml             |   4 +-
 app/config/routes.yaml                        |  12 +-
 app/config/services.yaml                      |  18 +--
 app/src/Controller/Handle.php                 |  32 -----
 app/src/Dto/DtoInterface.php                  |   6 -
 app/src/Dto/ErrorDto.php                      |  12 --
 app/src/Dto/FileDto.php                       |  18 ---
 app/src/Dto/KitchenTypeDto.php                |  12 --
 app/src/Dto/NewsCategoryDto.php               |  12 --
 app/src/Dto/NewsDetailElementDto.php          |  19 ---
 app/src/Dto/NewsListDto.php                   |  20 ---
 app/src/Dto/NewsListingElementDto.php         |  19 ---
 app/src/Dto/PaginationDto.php                 |  21 ---
 app/src/Dto/RestaurantDetailElementDto.php    |  45 ------
 app/src/Dto/RestaurantListingElementDto.php   |  20 ---
 app/src/Dto/RestaurantTypeDto.php             |  12 --
 app/src/Dto/ValidateErrorDto.php              |  16 ---
 app/src/Entity/PrototypeDto.php               |  11 --
 app/src/Entity/PrototypeElementDto.php        |  14 --
 app/src/Error/AbstractError.php               |  10 --
 app/src/Error/NotFoundError.php               |  16 ---
 .../{ => News}/Controller/NewsController.php  |  37 ++---
 app/src/News/Dto/NewsCategoryDto.php          |  16 +++
 app/src/News/Dto/NewsDetailElementDto.php     |  24 ++++
 .../Dto/NewsFilterVariantsDto.php}            |   8 +-
 app/src/News/Dto/NewsListDto.php              |  23 ++++
 app/src/News/Dto/NewsListingElementDto.php    |  31 +++++
 .../DtoFactory/NewsCategoryDtoFactory.php     |  36 +++++
 .../NewsDetailElementDtoFactory.php           |  28 ++++
 .../NewsFilterVariantsDtoFactory.php          |  21 +++
 .../News/DtoFactory/NewsListDtoFactory.php    |  24 ++++
 .../NewsListingElementDtoFactory.php          |  45 ++++++
 .../{ => News}/Request/NewsListingRequest.php |   7 +-
 app/src/News/Service/NewsDetailService.php    |  31 +++++
 app/src/News/Service/NewsListingService.php   |  57 ++++++++
 app/src/News/Service/NewsMainNewsService.php  |  22 +++
 app/src/News/Service/NewsSearchService.php    |  22 +++
 app/src/Repository/.gitignore                 |   0
 .../KitchensRepositoryInterface.php           |  11 --
 .../NewsCategoriesRepositoryInterface.php     |  12 --
 .../Repository/NewsRepositoryInterface.php    |  20 ---
 .../RestaurantTypeRepositoryInterface.php     |  12 --
 .../RestaurantsRepositoryInterface.php        |  20 ---
 .../Controller/RestaurantsController.php      |  25 ++--
 app/src/Restaurants/Dto/KitchenTypeDto.php    |  16 +++
 .../Dto/RestaurantDetailElementDto.php        |  59 ++++++++
 .../Dto/RestaurantFilterVariantsDto.php       |   7 +-
 .../Dto/RestaurantListDto.php                 |   7 +-
 .../Dto/RestaurantListingElementDto.php       |  25 ++++
 app/src/Restaurants/Dto/RestaurantTypeDto.php |  16 +++
 app/src/{ => Restaurants}/Dto/TagDto.php      |   6 +-
 .../DtoFactory/KitchenTypeDtoFactory.php      |  37 +++++
 .../RestaurantDetailElementDtoFactory.php     |  56 ++++++++
 .../RestaurantFilterVariantsDtoFactory.php    |  19 +++
 .../DtoFactory/RestaurantListDtoFactory.php   |  30 ++++
 .../RestaurantListingElementDtoFactory.php    |  45 ++++++
 .../DtoFactory/RestaurantTypeDtoFactory.php   |  36 +++++
 .../Restaurants/DtoFactory/TagDtoFactory.php  |  39 ++++++
 .../Request/RestaurantListingRequest.php      |   3 +-
 .../Service/RestaurantDetailService.php       |  34 +++++
 .../Service/RestaurantListingService.php      |  71 ++++++++++
 app/src/Service/NewsDetailService.php         |  26 ----
 app/src/Service/NewsListingService.php        |  71 ----------
 app/src/Service/NewsMainNewsService.php       |  19 ---
 app/src/Service/NewsSearchService.php         |  18 ---
 app/src/Service/RestaurantDetailService.php   |  30 ----
 app/src/Service/RestaurantListingService.php  |  88 ------------
 .../Shared/Abstraction/AbstractController.php |  33 +++++
 .../Abstraction}/AbstractRequest.php          |   9 +-
 app/src/Shared/Abstraction/DtoInterface.php   |   5 +
 .../Shared/Abstraction/EntityInterface.php    |   5 +
 .../Abstraction}/ServiceInterface.php         |   5 +-
 app/src/{ => Shared}/Dto/DtoCollection.php    |   4 +-
 app/src/Shared/Dto/ErrorDto.php               |  16 +++
 app/src/Shared/Dto/FileDto.php                |  22 +++
 app/src/Shared/Dto/PaginationDto.php          |  14 ++
 app/src/Shared/Dto/ValidateErrorDto.php       |  16 +++
 app/src/Shared/DtoFactory/ErrorDtoFactory.php |  18 +++
 app/src/Shared/DtoFactory/FileDtoFactory.php  |  39 ++++++
 .../DtoFactory/PaginationDtoFactory.php       |  17 +++
 .../DtoFactory/ValidateErrorDtoFactory.php    |  20 +++
 .../{Controller => Shared/Entity}/.gitignore  |   0
 app/src/{ => Shared}/Entity/File.php          |  24 +---
 app/src/{ => Shared}/Entity/Kitchens.php      |  21 +--
 app/src/{ => Shared}/Entity/News.php          |  43 +-----
 .../{ => Shared}/Entity/NewsCategories.php    |  23 +---
 app/src/{ => Shared}/Entity/NewsType.php      |   5 +-
 .../{ => Shared}/Entity/RestaurantTypes.php   |  21 +--
 app/src/{ => Shared}/Entity/Restaurants.php   | 129 ++----------------
 app/src/{ => Shared}/Entity/Settlements.php   |   4 +-
 app/src/{ => Shared}/Entity/Users.php         |   4 +-
 app/src/Shared/Error/BaseError.php            |  20 +++
 app/src/Shared/Error/ErrorCode.php            |  10 ++
 app/src/Shared/Error/NotFoundError.php        |  14 ++
 .../{Entity => Shared/Repository}/.gitignore  |   0
 .../Repository/FileRepository.php             |   4 +-
 .../Repository/KitchensRepository.php         |   6 +-
 .../Repository/NewsCategoriesRepository.php   |   7 +-
 .../Repository/NewsRepository.php             |  26 ++--
 .../Repository/NewsTypeRepository.php         |   4 +-
 .../Repository/RestaurantTypesRepository.php  |   6 +-
 .../Repository/RestaurantsRepository.php      |  10 +-
 .../Repository/SettlementsRepository.php      |   5 +-
 .../Repository/UsersRepository.php            |   4 +-
 .../{ => Shared}/Request/DetailRequest.php    |   3 +-
 app/src/{ => Shared}/Request/EmptyRequest.php |   4 +-
 107 files changed, 1279 insertions(+), 982 deletions(-)
 delete mode 100644 app/src/Controller/Handle.php
 delete mode 100644 app/src/Dto/DtoInterface.php
 delete mode 100644 app/src/Dto/ErrorDto.php
 delete mode 100644 app/src/Dto/FileDto.php
 delete mode 100644 app/src/Dto/KitchenTypeDto.php
 delete mode 100644 app/src/Dto/NewsCategoryDto.php
 delete mode 100644 app/src/Dto/NewsDetailElementDto.php
 delete mode 100644 app/src/Dto/NewsListDto.php
 delete mode 100644 app/src/Dto/NewsListingElementDto.php
 delete mode 100644 app/src/Dto/PaginationDto.php
 delete mode 100644 app/src/Dto/RestaurantDetailElementDto.php
 delete mode 100644 app/src/Dto/RestaurantListingElementDto.php
 delete mode 100644 app/src/Dto/RestaurantTypeDto.php
 delete mode 100644 app/src/Dto/ValidateErrorDto.php
 delete mode 100644 app/src/Entity/PrototypeDto.php
 delete mode 100644 app/src/Entity/PrototypeElementDto.php
 delete mode 100644 app/src/Error/AbstractError.php
 delete mode 100644 app/src/Error/NotFoundError.php
 rename app/src/{ => News}/Controller/NewsController.php (54%)
 create mode 100644 app/src/News/Dto/NewsCategoryDto.php
 create mode 100644 app/src/News/Dto/NewsDetailElementDto.php
 rename app/src/{Dto/NewsFilterVariants.php => News/Dto/NewsFilterVariantsDto.php} (52%)
 create mode 100644 app/src/News/Dto/NewsListDto.php
 create mode 100644 app/src/News/Dto/NewsListingElementDto.php
 create mode 100644 app/src/News/DtoFactory/NewsCategoryDtoFactory.php
 create mode 100644 app/src/News/DtoFactory/NewsDetailElementDtoFactory.php
 create mode 100644 app/src/News/DtoFactory/NewsFilterVariantsDtoFactory.php
 create mode 100644 app/src/News/DtoFactory/NewsListDtoFactory.php
 create mode 100644 app/src/News/DtoFactory/NewsListingElementDtoFactory.php
 rename app/src/{ => News}/Request/NewsListingRequest.php (89%)
 create mode 100644 app/src/News/Service/NewsDetailService.php
 create mode 100644 app/src/News/Service/NewsListingService.php
 create mode 100644 app/src/News/Service/NewsMainNewsService.php
 create mode 100644 app/src/News/Service/NewsSearchService.php
 delete mode 100644 app/src/Repository/.gitignore
 delete mode 100644 app/src/Repository/KitchensRepositoryInterface.php
 delete mode 100644 app/src/Repository/NewsCategoriesRepositoryInterface.php
 delete mode 100644 app/src/Repository/NewsRepositoryInterface.php
 delete mode 100644 app/src/Repository/RestaurantTypeRepositoryInterface.php
 delete mode 100644 app/src/Repository/RestaurantsRepositoryInterface.php
 rename app/src/{ => Restaurants}/Controller/RestaurantsController.php (50%)
 create mode 100644 app/src/Restaurants/Dto/KitchenTypeDto.php
 create mode 100644 app/src/Restaurants/Dto/RestaurantDetailElementDto.php
 rename app/src/{ => Restaurants}/Dto/RestaurantFilterVariantsDto.php (66%)
 rename app/src/{ => Restaurants}/Dto/RestaurantListDto.php (74%)
 create mode 100644 app/src/Restaurants/Dto/RestaurantListingElementDto.php
 create mode 100644 app/src/Restaurants/Dto/RestaurantTypeDto.php
 rename app/src/{ => Restaurants}/Dto/TagDto.php (69%)
 create mode 100644 app/src/Restaurants/DtoFactory/KitchenTypeDtoFactory.php
 create mode 100644 app/src/Restaurants/DtoFactory/RestaurantDetailElementDtoFactory.php
 create mode 100644 app/src/Restaurants/DtoFactory/RestaurantFilterVariantsDtoFactory.php
 create mode 100644 app/src/Restaurants/DtoFactory/RestaurantListDtoFactory.php
 create mode 100644 app/src/Restaurants/DtoFactory/RestaurantListingElementDtoFactory.php
 create mode 100644 app/src/Restaurants/DtoFactory/RestaurantTypeDtoFactory.php
 create mode 100644 app/src/Restaurants/DtoFactory/TagDtoFactory.php
 rename app/src/{ => Restaurants}/Request/RestaurantListingRequest.php (90%)
 create mode 100644 app/src/Restaurants/Service/RestaurantDetailService.php
 create mode 100644 app/src/Restaurants/Service/RestaurantListingService.php
 delete mode 100644 app/src/Service/NewsDetailService.php
 delete mode 100644 app/src/Service/NewsListingService.php
 delete mode 100644 app/src/Service/NewsMainNewsService.php
 delete mode 100644 app/src/Service/NewsSearchService.php
 delete mode 100644 app/src/Service/RestaurantDetailService.php
 delete mode 100644 app/src/Service/RestaurantListingService.php
 create mode 100644 app/src/Shared/Abstraction/AbstractController.php
 rename app/src/{Request => Shared/Abstraction}/AbstractRequest.php (88%)
 create mode 100644 app/src/Shared/Abstraction/DtoInterface.php
 create mode 100644 app/src/Shared/Abstraction/EntityInterface.php
 rename app/src/{Service => Shared/Abstraction}/ServiceInterface.php (56%)
 rename app/src/{ => Shared}/Dto/DtoCollection.php (68%)
 create mode 100644 app/src/Shared/Dto/ErrorDto.php
 create mode 100644 app/src/Shared/Dto/FileDto.php
 create mode 100644 app/src/Shared/Dto/PaginationDto.php
 create mode 100644 app/src/Shared/Dto/ValidateErrorDto.php
 create mode 100644 app/src/Shared/DtoFactory/ErrorDtoFactory.php
 create mode 100644 app/src/Shared/DtoFactory/FileDtoFactory.php
 create mode 100644 app/src/Shared/DtoFactory/PaginationDtoFactory.php
 create mode 100644 app/src/Shared/DtoFactory/ValidateErrorDtoFactory.php
 rename app/src/{Controller => Shared/Entity}/.gitignore (100%)
 rename app/src/{ => Shared}/Entity/File.php (93%)
 rename app/src/{ => Shared}/Entity/Kitchens.php (82%)
 rename app/src/{ => Shared}/Entity/News.php (80%)
 rename app/src/{ => Shared}/Entity/NewsCategories.php (81%)
 rename app/src/{ => Shared}/Entity/NewsType.php (95%)
 rename app/src/{ => Shared}/Entity/RestaurantTypes.php (82%)
 rename app/src/{ => Shared}/Entity/Restaurants.php (69%)
 rename app/src/{ => Shared}/Entity/Settlements.php (97%)
 rename app/src/{ => Shared}/Entity/Users.php (96%)
 create mode 100644 app/src/Shared/Error/BaseError.php
 create mode 100644 app/src/Shared/Error/ErrorCode.php
 create mode 100644 app/src/Shared/Error/NotFoundError.php
 rename app/src/{Entity => Shared/Repository}/.gitignore (100%)
 rename app/src/{ => Shared}/Repository/FileRepository.php (91%)
 rename app/src/{ => Shared}/Repository/KitchensRepository.php (84%)
 rename app/src/{ => Shared}/Repository/NewsCategoriesRepository.php (84%)
 rename app/src/{ => Shared}/Repository/NewsRepository.php (73%)
 rename app/src/{ => Shared}/Repository/NewsTypeRepository.php (92%)
 rename app/src/{ => Shared}/Repository/RestaurantTypesRepository.php (83%)
 rename app/src/{ => Shared}/Repository/RestaurantsRepository.php (88%)
 rename app/src/{ => Shared}/Repository/SettlementsRepository.php (90%)
 rename app/src/{ => Shared}/Repository/UsersRepository.php (91%)
 rename app/src/{ => Shared}/Request/DetailRequest.php (87%)
 rename app/src/{ => Shared}/Request/EmptyRequest.php (65%)

diff --git a/app/composer.json b/app/composer.json
index 564d77e..be399e9 100644
--- a/app/composer.json
+++ b/app/composer.json
@@ -4,7 +4,7 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.2",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "doctrine/dbal": "^3",
diff --git a/app/config/packages/doctrine.yaml b/app/config/packages/doctrine.yaml
index bf5aa40..b67e855 100644
--- a/app/config/packages/doctrine.yaml
+++ b/app/config/packages/doctrine.yaml
@@ -21,8 +21,8 @@ doctrine:
             App:
                 type: attribute
                 is_bundle: false
-                dir: '%kernel.project_dir%/src/Entity'
-                prefix: 'App\Entity'
+                dir: '%kernel.project_dir%/src/Shared/Entity'
+                prefix: 'App\Shared\Entity'
                 alias: App
         controller_resolver:
             auto_mapping: true
diff --git a/app/config/routes.yaml b/app/config/routes.yaml
index 41ef814..0370c9f 100644
--- a/app/config/routes.yaml
+++ b/app/config/routes.yaml
@@ -1,5 +1,11 @@
-controllers:
+newsControllers:
     resource:
-        path: ../src/Controller/
-        namespace: App\Controller
+        path: ../src/News/Controller/
+        namespace: App\News\Controller
+    type: attribute
+
+restaurantsControllers:
+    resource:
+        path: ../src/Restaurants/Controller/
+        namespace: App\Restaurants\Controller
     type: attribute
diff --git a/app/config/services.yaml b/app/config/services.yaml
index 2d6a76f..55758d4 100644
--- a/app/config/services.yaml
+++ b/app/config/services.yaml
@@ -11,14 +11,14 @@ services:
         autowire: true      # Automatically injects dependencies in your services.
         autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
 
-    # makes classes in src/ available to be used as services
-    # this creates a service per class whose id is the fully-qualified class name
-    App\:
-        resource: '../src/'
-        exclude:
-            - '../src/DependencyInjection/'
-            - '../src/Entity/'
-            - '../src/Kernel.php'
-
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
+
+    App\Restaurants\:
+        resource: '../src/Restaurants/'
+
+    App\News\:
+        resource: '../src/News/'
+
+    App\Shared\:
+        resource: '../src/Shared/'
\ No newline at end of file
diff --git a/app/src/Controller/Handle.php b/app/src/Controller/Handle.php
deleted file mode 100644
index 97f6715..0000000
--- a/app/src/Controller/Handle.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Controller;
-
-use App\Request\AbstractRequest;
-use App\Service\ServiceInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-
-class Handle
-{
-    public function __construct(private readonly ServiceInterface $service) {}
-
-    public function handle(AbstractRequest $request): JsonResponse
-    {
-//        try {
-        return new JsonResponse($this->service->serve($request));
-//
-//        } catch (AbstractError $error) {
-//            $errorDto = new ErrorDto();
-//
-//            $errorDto->message = $error->message;
-//            $errorDto->code = $error->code;
-//            $errorDto->status = $error->status;
-//
-//            return new JsonResponse($errorDto, $error->status);
-//
-//        } catch (Throwable $exception) {
-//            $error = new ErrorDto();
-//            return new JsonResponse($error, $error->status);
-//        }
-    }
-}
diff --git a/app/src/Dto/DtoInterface.php b/app/src/Dto/DtoInterface.php
deleted file mode 100644
index fc79608..0000000
--- a/app/src/Dto/DtoInterface.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-/** Инетерфейс, необходимый для реализации протота */
-interface DtoInterface {}
diff --git a/app/src/Dto/ErrorDto.php b/app/src/Dto/ErrorDto.php
deleted file mode 100644
index e54f5cd..0000000
--- a/app/src/Dto/ErrorDto.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-class ErrorDto implements DtoInterface
-{
-    public string $status = '500';
-
-    public string $message = 'Something went wrong';
-
-    public string $code = '100';
-}
diff --git a/app/src/Dto/FileDto.php b/app/src/Dto/FileDto.php
deleted file mode 100644
index b480f1e..0000000
--- a/app/src/Dto/FileDto.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-class FileDto implements DtoInterface
-{
-    public string $id;
-
-    public string $name;
-
-    public string $description;
-
-    public int $size;
-
-    public string $type;
-
-    public string $url;
-}
diff --git a/app/src/Dto/KitchenTypeDto.php b/app/src/Dto/KitchenTypeDto.php
deleted file mode 100644
index e7cf75b..0000000
--- a/app/src/Dto/KitchenTypeDto.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-class KitchenTypeDto implements DtoInterface
-{
-    public string $id;
-
-    public string $name;
-
-    public string $code;
-}
diff --git a/app/src/Dto/NewsCategoryDto.php b/app/src/Dto/NewsCategoryDto.php
deleted file mode 100644
index 8f1b7f8..0000000
--- a/app/src/Dto/NewsCategoryDto.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-class NewsCategoryDto implements DtoInterface
-{
-    public string $id;
-
-    public string $name;
-
-    public string $code;
-}
diff --git a/app/src/Dto/NewsDetailElementDto.php b/app/src/Dto/NewsDetailElementDto.php
deleted file mode 100644
index 224b9cc..0000000
--- a/app/src/Dto/NewsDetailElementDto.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-class NewsDetailElementDto implements DtoInterface
-{
-    public string $id;
-
-    public string $name;
-
-    public string $description;
-
-    public ?string $text;
-
-    /** @var FileDto Преаью */
-    public ?FileDto $image;
-
-    public string $create_at;
-}
diff --git a/app/src/Dto/NewsListDto.php b/app/src/Dto/NewsListDto.php
deleted file mode 100644
index ae4971e..0000000
--- a/app/src/Dto/NewsListDto.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-class NewsListDto implements DtoInterface
-{
-    /**
-     * @param PaginationDto $pagination
-     * @param DtoCollection<NewsListingElementDto> $list
-     * @param NewsFilterVariants $filterVariants
-     */
-    public function __construct(
-        public PaginationDto $pagination,
-
-        /** @var DtoCollection<NewsListingElementDto>  */
-        public DtoCollection $list,
-
-        public NewsFilterVariants $filterVariants,
-    ) {}
-}
diff --git a/app/src/Dto/NewsListingElementDto.php b/app/src/Dto/NewsListingElementDto.php
deleted file mode 100644
index ef41fea..0000000
--- a/app/src/Dto/NewsListingElementDto.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-class NewsListingElementDto implements DtoInterface
-{
-    public string $id;
-
-    public string $name;
-
-    public ?string $description;
-
-    /** @var ?FileDto Превью */
-    public ?FileDto $image;
-
-    public string $create_at;
-
-    public string $detail_link;
-}
diff --git a/app/src/Dto/PaginationDto.php b/app/src/Dto/PaginationDto.php
deleted file mode 100644
index a784dfd..0000000
--- a/app/src/Dto/PaginationDto.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-class PaginationDto implements DtoInterface
-{
-    public int $current_page = 1;
-    public int $pages;
-    public int $page_size = 12;
-
-    public function __construct(int $page, int $limit, int $total)
-    {
-        $this->page_size = $limit > 0 ? $limit : 12;
-
-        $this->pages = ceil($total / $this->page_size);
-
-        if (($page > 1) && ($page <= $this->pages)) {
-            $this->current_page = $page;
-        }
-    }
-}
diff --git a/app/src/Dto/RestaurantDetailElementDto.php b/app/src/Dto/RestaurantDetailElementDto.php
deleted file mode 100644
index 13f29c9..0000000
--- a/app/src/Dto/RestaurantDetailElementDto.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-use Ramsey\Collection\Collection;
-
-class RestaurantDetailElementDto implements DtoInterface
-{
-    public string $id;
-
-    public string $name;
-
-    public string $code;
-
-    public string $coordinates;
-
-    public RestaurantTypeDto $type;
-
-    public ?string $check;
-
-    public ?string $check_info;
-
-    /** @var DtoCollection<KitchenTypeDto>|null  */
-    public ?DtoCollection $kitchen;
-
-    /** @var DtoCollection<string>|null */
-    public ?DtoCollection $phone;
-
-    /** @var DtoCollection<string>|null */
-    public ?DtoCollection $email;
-
-    /** @var DtoCollection<string>|null */
-    public ?DtoCollection $address;
-
-    /** @var DtoCollection<TagDto>|null */
-    public ?DtoCollection $tags;
-
-    public ?string $site;
-
-    /** @var FileDto|null Превью фото */
-    public ?FileDto $image;
-
-    /** @var DtoCollection<FileDto>|null */
-    public ?DtoCollection $gallery;
-}
diff --git a/app/src/Dto/RestaurantListingElementDto.php b/app/src/Dto/RestaurantListingElementDto.php
deleted file mode 100644
index 3b575da..0000000
--- a/app/src/Dto/RestaurantListingElementDto.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-class RestaurantListingElementDto implements DtoInterface
-{
-    public string $id;
-
-    public string $name;
-
-    public string $code;
-
-    public RestaurantTypeDto $type;
-
-    public ?string $check;
-
-    public ?FileDto $image;
-
-    public string $detail_link;
-}
diff --git a/app/src/Dto/RestaurantTypeDto.php b/app/src/Dto/RestaurantTypeDto.php
deleted file mode 100644
index 233bbc7..0000000
--- a/app/src/Dto/RestaurantTypeDto.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-class RestaurantTypeDto implements DtoInterface
-{
-    public string $id;
-
-    public string $name;
-
-    public string $code;
-}
diff --git a/app/src/Dto/ValidateErrorDto.php b/app/src/Dto/ValidateErrorDto.php
deleted file mode 100644
index c6331f6..0000000
--- a/app/src/Dto/ValidateErrorDto.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Dto;
-
-use Symfony\Component\Validator\ConstraintViolationInterface;
-
-class ValidateErrorDto extends ErrorDto
-{
-    public string $status = '422';
-
-    public function __construct(ConstraintViolationInterface $violation)
-    {
-        $this->message = $violation->getPropertyPath() . ':' . $violation->getMessage();
-        $this->code = $violation->getCode();
-    }
-}
diff --git a/app/src/Entity/PrototypeDto.php b/app/src/Entity/PrototypeDto.php
deleted file mode 100644
index 19c8822..0000000
--- a/app/src/Entity/PrototypeDto.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Dto\DtoInterface;
-/** Интерфейс прототипа */
-interface PrototypeDto
-{
-    /** Породить dto из сущности */
-    public function getDto(): DtoInterface;
-}
diff --git a/app/src/Entity/PrototypeElementDto.php b/app/src/Entity/PrototypeElementDto.php
deleted file mode 100644
index 7c6a79f..0000000
--- a/app/src/Entity/PrototypeElementDto.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Dto\DtoInterface;
-
-interface PrototypeElementDto
-{
-    /** Породить dto элемента листинга */
-    public function getDto(): DtoInterface;
-
-    /** Породить dto детальной информации */
-    public function getExtendedDto(): DtoInterface;
-}
diff --git a/app/src/Error/AbstractError.php b/app/src/Error/AbstractError.php
deleted file mode 100644
index 0827a2e..0000000
--- a/app/src/Error/AbstractError.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Error;
-
-class AbstractError extends \Exception
-{
-    public string $status = '500';
-    public $message = '';
-    public $code = '';
-}
diff --git a/app/src/Error/NotFoundError.php b/app/src/Error/NotFoundError.php
deleted file mode 100644
index 1e7b544..0000000
--- a/app/src/Error/NotFoundError.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Error;
-
-class NotFoundError extends AbstractError
-{
-    public string $status = '404';
-    public  $message = 'not Found';
-    public  $code = '404';
-
-    public function __construct(string $message)
-    {
-        $this->message = $message . ' ' . $this->message;
-        parent::__construct($this->message);
-    }
-}
diff --git a/app/src/Controller/NewsController.php b/app/src/News/Controller/NewsController.php
similarity index 54%
rename from app/src/Controller/NewsController.php
rename to app/src/News/Controller/NewsController.php
index 90c6a8c..286ff07 100644
--- a/app/src/Controller/NewsController.php
+++ b/app/src/News/Controller/NewsController.php
@@ -1,49 +1,54 @@
 <?php
 
-namespace App\Controller;
-
-use App\Request\DetailRequest;
-use App\Request\EmptyRequest;
-use App\Request\NewsListingRequest;
-use App\Service\NewsDetailService;
-use App\Service\NewsListingService;
-use App\Service\NewsMainNewsService;
-use App\Service\NewsSearchService;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BundleController;
+namespace App\News\Controller;
+
+use App\News\Request\NewsListingRequest;
+use App\News\Service\NewsDetailService;
+use App\News\Service\NewsListingService;
+use App\News\Service\NewsMainNewsService;
+use App\News\Service\NewsSearchService;
+use App\Shared\Abstraction\AbstractController;
+use App\Shared\DtoFactory\ErrorDtoFactory;
+use App\Shared\Request\DetailRequest;
+use App\Shared\Request\EmptyRequest;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\Routing\Attribute\Route;
 
 #[Route('/api/v1/news')]
-class NewsController extends BundleController
+class NewsController extends AbstractController
 {
     public function __construct(
+        ErrorDtoFactory $errorFactory,
+
         private readonly NewsDetailService $detailService,
         private readonly NewsListingService $listingService,
         private readonly NewsMainNewsService $mainNewsService,
         private readonly NewsSearchService $searchService,
-    ) {}
+    ) {
+        parent::__construct($errorFactory);
+    }
 
     #[Route('/', name: 'news', methods: ['GET'])]
     public function news(NewsListingRequest $request): JsonResponse
     {
-        return (new Handle($this->listingService))->handle($request);
+        return $this->handle($this->listingService, $request);
     }
 
     #[Route('/mainNews', name: 'mainNews', methods: ['GET'])]
     public function mainNews(EmptyRequest $request): JsonResponse
     {
-        return (new Handle($this->mainNewsService))->handle($request);
+        return $this->handle($this->mainNewsService, $request);
     }
 
     #[Route('/search', name: 'searchNews', methods: ['GET'])]
     public function search(EmptyRequest $request): JsonResponse
     {
-        return (new Handle($this->searchService))->handle($request);
+        return $this->handle($this->searchService, $request);
     }
 
     #[Route('/{detailId}', name: 'oneNews', methods: ['GET'])]
     public function oneNews(DetailRequest $request): JsonResponse
     {
-        return (new Handle($this->detailService))->handle($request);
+        return $this->handle($this->detailService, $request);
     }
 }
diff --git a/app/src/News/Dto/NewsCategoryDto.php b/app/src/News/Dto/NewsCategoryDto.php
new file mode 100644
index 0000000..21917d9
--- /dev/null
+++ b/app/src/News/Dto/NewsCategoryDto.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\News\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+
+class NewsCategoryDto implements DtoInterface
+{
+    public function __construct(
+        public string $id,
+
+        public string $name,
+
+        public string $code,
+    ) {}
+}
diff --git a/app/src/News/Dto/NewsDetailElementDto.php b/app/src/News/Dto/NewsDetailElementDto.php
new file mode 100644
index 0000000..634effa
--- /dev/null
+++ b/app/src/News/Dto/NewsDetailElementDto.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\News\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Dto\FileDto;
+
+class NewsDetailElementDto implements DtoInterface
+{
+    public function __construct(
+        public string $id,
+
+        public string $name,
+
+        public string $description,
+
+        public string $createAt,
+
+        public ?string $text = null,
+
+        /** @var FileDto Преаью */
+        public ?FileDto $image = null,
+    ) {}
+}
diff --git a/app/src/Dto/NewsFilterVariants.php b/app/src/News/Dto/NewsFilterVariantsDto.php
similarity index 52%
rename from app/src/Dto/NewsFilterVariants.php
rename to app/src/News/Dto/NewsFilterVariantsDto.php
index 2a48144..b3f9f5c 100644
--- a/app/src/Dto/NewsFilterVariants.php
+++ b/app/src/News/Dto/NewsFilterVariantsDto.php
@@ -1,15 +1,17 @@
 <?php
 
-namespace App\Dto;
+namespace App\News\Dto;
 
-class NewsFilterVariants implements DtoInterface
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Dto\DtoCollection;
+
+class NewsFilterVariantsDto implements DtoInterface
 {
 
     /**
      * @param DtoCollection<NewsCategoryDto> $category
      */
     public function __construct(
-        /** @var DtoCollection<NewsCategoryDto>  */
         public DtoCollection $category,
     ) {}
 }
diff --git a/app/src/News/Dto/NewsListDto.php b/app/src/News/Dto/NewsListDto.php
new file mode 100644
index 0000000..d4ffffd
--- /dev/null
+++ b/app/src/News/Dto/NewsListDto.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\News\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\Dto\PaginationDto;
+
+class NewsListDto implements DtoInterface
+{
+    /**
+     * @param PaginationDto $pagination
+     * @param DtoCollection<NewsListingElementDto> $list
+     * @param NewsFilterVariantsDto $filterVariants
+     */
+    public function __construct(
+        public PaginationDto         $pagination,
+
+        public DtoCollection         $list,
+
+        public NewsFilterVariantsDto $filterVariants,
+    ) {}
+}
diff --git a/app/src/News/Dto/NewsListingElementDto.php b/app/src/News/Dto/NewsListingElementDto.php
new file mode 100644
index 0000000..dd6c610
--- /dev/null
+++ b/app/src/News/Dto/NewsListingElementDto.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\News\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Dto\FileDto;
+
+class NewsListingElementDto implements DtoInterface
+{
+    /**
+     * @param string $id
+     * @param string $name
+     * @param string $create_at
+     * @param string $detail_link
+     * @param string|null $description
+     * @param FileDto|null $image Превью
+     */
+    public function __construct(
+        public string $id,
+
+        public string $name,
+
+        public string $createAt,
+
+        public string $detailLink,
+
+        public ?string $description = null,
+
+        public ?FileDto $image = null,
+    ) {}
+}
diff --git a/app/src/News/DtoFactory/NewsCategoryDtoFactory.php b/app/src/News/DtoFactory/NewsCategoryDtoFactory.php
new file mode 100644
index 0000000..f5726a8
--- /dev/null
+++ b/app/src/News/DtoFactory/NewsCategoryDtoFactory.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\News\DtoFactory;
+
+use App\News\Dto\NewsCategoryDto;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\Entity\NewsCategories;
+use Ramsey\Collection\Collection;
+
+class NewsCategoryDtoFactory
+{
+    public function create(NewsCategories $category): NewsCategoryDto
+    {
+        return new NewsCategoryDto(
+            id: $category->getId(),
+            name: $category->getName(),
+            code: $category->getCode(),
+        );
+    }
+
+    /**
+     * @param Collection<NewsCategories> $categories
+     * @return DtoCollection<NewsCategoryDto>
+     */
+    public function createCollection(Collection $categories): DtoCollection
+    {
+        $categoriesDto = $categories->map(function(NewsCategories $category) {
+            return $this->create($category);
+        });
+
+        return new DtoCollection(
+            NewsCategoryDto::class,
+            $categoriesDto->toArray()
+        );
+    }
+}
diff --git a/app/src/News/DtoFactory/NewsDetailElementDtoFactory.php b/app/src/News/DtoFactory/NewsDetailElementDtoFactory.php
new file mode 100644
index 0000000..c4a82b0
--- /dev/null
+++ b/app/src/News/DtoFactory/NewsDetailElementDtoFactory.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\News\DtoFactory;
+
+use App\News\Dto\NewsDetailElementDto;
+use App\Shared\DtoFactory\FileDtoFactory;
+use App\Shared\Entity\News;
+
+class NewsDetailElementDtoFactory
+{
+    public function __construct(
+        private readonly FileDtoFactory $fileFactory
+    ) {}
+
+    public function create(News $news): NewsDetailElementDto
+    {
+        return new NewsDetailElementDto(
+            id: $news->getId(),
+            name: $news->getName(),
+            description: $news->getPreviewText(),
+            createAt: $news->getCreatedAt()->format('Y-m-d H:i:s'),
+            text: $news->getDetailText(),
+            image: $news->getPreviewImage() !== null
+                ? $this->fileFactory->create($news->getPreviewImage())
+                : null,
+        );
+    }
+}
diff --git a/app/src/News/DtoFactory/NewsFilterVariantsDtoFactory.php b/app/src/News/DtoFactory/NewsFilterVariantsDtoFactory.php
new file mode 100644
index 0000000..80f54fe
--- /dev/null
+++ b/app/src/News/DtoFactory/NewsFilterVariantsDtoFactory.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\News\DtoFactory;
+
+use App\News\Dto\NewsCategoryDto;
+use App\News\Dto\NewsFilterVariantsDto;
+use App\Shared\Dto\DtoCollection;
+
+class NewsFilterVariantsDtoFactory
+{
+    /**
+     * @param DtoCollection<NewsCategoryDto> $categories
+     * @return NewsFilterVariantsDto
+     */
+    public function create(DtoCollection $categories): NewsFilterVariantsDto
+    {
+        return new NewsFilterVariantsDto(
+            $categories
+        );
+    }
+}
diff --git a/app/src/News/DtoFactory/NewsListDtoFactory.php b/app/src/News/DtoFactory/NewsListDtoFactory.php
new file mode 100644
index 0000000..40f714f
--- /dev/null
+++ b/app/src/News/DtoFactory/NewsListDtoFactory.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\News\DtoFactory;
+
+use App\News\Dto\NewsFilterVariantsDto;
+use App\News\Dto\NewsListDto;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\Dto\PaginationDto;
+
+class NewsListDtoFactory
+{
+    public function create(
+        PaginationDto $pagination,
+        DtoCollection $list,
+        NewsFilterVariantsDto $filters,
+    ): NewsListDto
+    {
+        return new NewsListDto(
+            pagination: $pagination,
+            list: $list,
+            filterVariants: $filters
+        );
+    }
+}
diff --git a/app/src/News/DtoFactory/NewsListingElementDtoFactory.php b/app/src/News/DtoFactory/NewsListingElementDtoFactory.php
new file mode 100644
index 0000000..668b6ac
--- /dev/null
+++ b/app/src/News/DtoFactory/NewsListingElementDtoFactory.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\News\DtoFactory;
+
+use App\News\Dto\NewsListingElementDto;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\DtoFactory\FileDtoFactory;
+use App\Shared\Entity\News;
+use Ramsey\Collection\Collection;
+
+class NewsListingElementDtoFactory
+{
+    public function __construct(
+        private readonly FileDtoFactory $fileFactory,
+    ) {}
+
+    public function create(News $news): NewsListingElementDto
+    {
+        return new NewsListingElementDto(
+            id: $news->getId(),
+            name: $news->getName(),
+            createAt: $news->getCreatedAt()->format('Y-m-d H:i:s'),
+            detailLink: "api/v1/news/" . $news->getId(),
+            description: $news->getPreviewText(),
+            image: $news->getPreviewImage() !== null
+                ? $this->fileFactory->create($news->getPreviewImage())
+                :null,
+        );
+    }
+
+    /**
+     * @param Collection<News> $news
+     * @return DtoCollection<NewsListingElementDto>
+     */
+    public function createCollection(Collection $news): DtoCollection
+    {
+        return new DtoCollection(
+            NewsListingElementDto::class,
+            $news->map(function(News $oneNews) {
+                return $this->create($oneNews);
+            })
+            ->toArray()
+        );
+    }
+}
diff --git a/app/src/Request/NewsListingRequest.php b/app/src/News/Request/NewsListingRequest.php
similarity index 89%
rename from app/src/Request/NewsListingRequest.php
rename to app/src/News/Request/NewsListingRequest.php
index fd570e4..31d99f6 100644
--- a/app/src/Request/NewsListingRequest.php
+++ b/app/src/News/Request/NewsListingRequest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace App\Request;
+namespace App\News\Request;
 
-use Symfony\Component\Validator\Constraints\Uuid;
+use App\Shared\Abstraction\AbstractRequest;
 use Symfony\Component\Validator\Constraints\AtLeastOneOf;
 use Symfony\Component\Validator\Constraints\Blank;
+use Symfony\Component\Validator\Constraints\Uuid;
 
 class NewsListingRequest extends AbstractRequest
 {
@@ -27,4 +28,4 @@ class NewsListingRequest extends AbstractRequest
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/News/Service/NewsDetailService.php b/app/src/News/Service/NewsDetailService.php
new file mode 100644
index 0000000..8397215
--- /dev/null
+++ b/app/src/News/Service/NewsDetailService.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\News\Service;
+
+use App\News\Dto\NewsDetailElementDto;
+use App\News\DtoFactory\NewsDetailElementDtoFactory;
+use App\Shared\Abstraction\AbstractRequest;
+use App\Shared\Abstraction\ServiceInterface;
+use App\Shared\Error\NotFoundError;
+use App\Shared\Repository\NewsRepository;
+
+class NewsDetailService implements ServiceInterface
+{
+    public function __construct(
+        private readonly NewsRepository $news,
+
+        private readonly NewsDetailElementDtoFactory $dtoFactory,
+    ) {}
+
+    /**
+     * @throws NotFoundError
+     */
+    public function serve(AbstractRequest $request): NewsDetailElementDto
+    {
+        $news = $this->news->find($request->detailId);
+
+        return $news !== null
+            ? $this->dtoFactory->create($news)
+            :  throw new NotFoundError('News not found');
+    }
+}
diff --git a/app/src/News/Service/NewsListingService.php b/app/src/News/Service/NewsListingService.php
new file mode 100644
index 0000000..fd32d9f
--- /dev/null
+++ b/app/src/News/Service/NewsListingService.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\News\Service;
+
+use App\News\DtoFactory\NewsCategoryDtoFactory;
+use App\News\DtoFactory\NewsFilterVariantsDtoFactory;
+use App\News\DtoFactory\NewsListDtoFactory;
+use App\News\DtoFactory\NewsListingElementDtoFactory;
+use App\Shared\DtoFactory\PaginationDtoFactory;
+use App\News\Dto\NewsListDto;
+use App\Shared\Abstraction\AbstractRequest;
+use App\Shared\Abstraction\ServiceInterface;
+use App\Shared\Repository\NewsCategoriesRepository;
+use App\Shared\Repository\NewsRepository;
+
+class NewsListingService implements ServiceInterface
+{
+    public function __construct(
+        private readonly NewsRepository $news,
+        private readonly NewsCategoriesRepository $newsCategories,
+
+        private readonly PaginationDtoFactory $paginationFactory,
+        private readonly NewsListingElementDtoFactory $listFactory,
+        private readonly NewsFilterVariantsDtoFactory $filterFactory,
+        private readonly NewsListDtoFactory $listingFactory,
+        private readonly NewsCategoryDtoFactory $categoryFactory,
+    ) {}
+
+    public function serve(AbstractRequest $request): NewsListDto
+    {
+        $countOfNews = $this->news->getCountWithFilters($request->news_category);
+
+        $pagination = $this->paginationFactory->create(
+            $request->page,
+            $request->limit,
+            $countOfNews
+        );
+
+        $offset = min($pagination->pageSize, $countOfNews) * ($pagination->currentPage - 1);
+
+        $list = $this->listFactory->createCollection(
+            $this->news->getWithFilters($request->news_category, $request->limit, $offset)
+        );
+
+        $categoriesDto = $this->categoryFactory->createCollection(
+            $this->newsCategories->getAll()
+        );
+
+        $filters = $this->filterFactory->create($categoriesDto);
+
+        return $this->listingFactory->create(
+            $pagination,
+            $list,
+            $filters
+        );
+    }
+}
diff --git a/app/src/News/Service/NewsMainNewsService.php b/app/src/News/Service/NewsMainNewsService.php
new file mode 100644
index 0000000..784633d
--- /dev/null
+++ b/app/src/News/Service/NewsMainNewsService.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\News\Service;
+
+use App\News\Dto\NewsListingElementDto;
+use App\News\DtoFactory\NewsListingElementDtoFactory;
+use App\Shared\Abstraction\AbstractRequest;
+use App\Shared\Abstraction\ServiceInterface;
+use App\Shared\Repository\NewsRepository;
+
+class NewsMainNewsService implements ServiceInterface
+{
+    public function __construct(
+        private readonly NewsRepository $news,
+
+        private readonly NewsListingElementDtoFactory $dtoFactory,
+    ) {}
+    public function serve(AbstractRequest $request): NewsListingElementDto
+    {
+        return $this->dtoFactory->create($this->news->getMainNews());
+    }
+}
diff --git a/app/src/News/Service/NewsSearchService.php b/app/src/News/Service/NewsSearchService.php
new file mode 100644
index 0000000..391d3c9
--- /dev/null
+++ b/app/src/News/Service/NewsSearchService.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\News\Service;
+
+use App\News\Dto\NewsDetailElementDto;
+use App\News\DtoFactory\NewsDetailElementDtoFactory;
+use App\Shared\Abstraction\AbstractRequest;
+use App\Shared\Abstraction\ServiceInterface;
+use App\Shared\Repository\NewsRepository;
+
+class NewsSearchService implements ServiceInterface
+{
+    public function __construct(
+        private readonly NewsRepository $news,
+
+        private readonly NewsDetailElementDtoFactory $dtoFactory,
+    ) {}
+    public function serve(AbstractRequest $request): NewsDetailElementDto
+    {
+        return $this->dtoFactory->create($this->news->getMainNews());
+    }
+}
diff --git a/app/src/Repository/.gitignore b/app/src/Repository/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/app/src/Repository/KitchensRepositoryInterface.php b/app/src/Repository/KitchensRepositoryInterface.php
deleted file mode 100644
index afba82d..0000000
--- a/app/src/Repository/KitchensRepositoryInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Repository;
-
-use Ramsey\Collection\Collection;
-
-interface KitchensRepositoryInterface
-{
-    /** @return  */
-    public function getAll(): Collection;
-}
\ No newline at end of file
diff --git a/app/src/Repository/NewsCategoriesRepositoryInterface.php b/app/src/Repository/NewsCategoriesRepositoryInterface.php
deleted file mode 100644
index a3c7cfe..0000000
--- a/app/src/Repository/NewsCategoriesRepositoryInterface.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Repository;
-
-use App\Entity\NewsType;
-use Ramsey\Collection\Collection;
-
-interface NewsCategoriesRepositoryInterface
-{
-    /** @return Collection<NewsType> */
-    public function getAll(): Collection;
-}
diff --git a/app/src/Repository/NewsRepositoryInterface.php b/app/src/Repository/NewsRepositoryInterface.php
deleted file mode 100644
index b67c875..0000000
--- a/app/src/Repository/NewsRepositoryInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Repository;
-
-use App\Entity\News;
-use Ramsey\Collection\Collection;
-
-/**
- * @extends ServiceEntityRepository<News>
- *
- * @method News|null find($id, $lockMode = null, $lockVersion = null)
- */
-interface NewsRepositoryInterface
-{
-    public function getMainNews(): News;
-    public function getCountWithFilters(?string $categoryId): int;
-
-    /** @return Collection<News> */
-    public function findByFilters(?string $categoryId, int $limit, int $offset): Collection;
-}
diff --git a/app/src/Repository/RestaurantTypeRepositoryInterface.php b/app/src/Repository/RestaurantTypeRepositoryInterface.php
deleted file mode 100644
index 6198943..0000000
--- a/app/src/Repository/RestaurantTypeRepositoryInterface.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Repository;
-
-use App\Entity\RestaurantTypes;
-use Ramsey\Collection\Collection;
-
-interface RestaurantTypeRepositoryInterface
-{
-    /** @return Collection<RestaurantTypes> */
-    public function getAll(): Collection;
-}
diff --git a/app/src/Repository/RestaurantsRepositoryInterface.php b/app/src/Repository/RestaurantsRepositoryInterface.php
deleted file mode 100644
index e5e2f2f..0000000
--- a/app/src/Repository/RestaurantsRepositoryInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Repository;
-
-use App\Entity\Restaurants;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Ramsey\Collection\Collection;
-
-/**
- * @extends ServiceEntityRepository<Restaurants>
- *
- * @method Restaurants|null find($id, $lockMode = null, $lockVersion = null)
- */
-interface RestaurantsRepositoryInterface
-{
-    public function getCountWithFilters(?string $kitchenId, string $typeId): int;
-
-    /** @return Collection<Restaurants> */
-    public function findByFilters(?string $kitchenId, ?string $typeId, int $limit, int $offset): Collection;
-}
diff --git a/app/src/Controller/RestaurantsController.php b/app/src/Restaurants/Controller/RestaurantsController.php
similarity index 50%
rename from app/src/Controller/RestaurantsController.php
rename to app/src/Restaurants/Controller/RestaurantsController.php
index b268f83..5893ecb 100644
--- a/app/src/Controller/RestaurantsController.php
+++ b/app/src/Restaurants/Controller/RestaurantsController.php
@@ -1,32 +1,37 @@
 <?php
 
-namespace App\Controller;
+namespace App\Restaurants\Controller;
 
-use App\Request\DetailRequest;
-use App\Request\RestaurantListingRequest;
-use App\Service\RestaurantDetailService;
-use App\Service\RestaurantListingService;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BundleController;
+use App\Restaurants\Request\RestaurantListingRequest;
+use App\Restaurants\Service\RestaurantDetailService;
+use App\Restaurants\Service\RestaurantListingService;
+use App\Shared\Abstraction\AbstractController;
+use App\Shared\DtoFactory\ErrorDtoFactory;
+use App\Shared\Request\DetailRequest;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\Routing\Attribute\Route;
 
 #[Route('/api/v1/restaurants')]
-class RestaurantsController extends BundleController
+class RestaurantsController extends AbstractController
 {
     public function __construct(
+        ErrorDtoFactory $errorFactory,
+
         private readonly RestaurantListingService $listingService,
         private readonly RestaurantDetailService $detailService,
-    ) {}
+    ) {
+        parent::__construct($errorFactory);
+    }
 
     #[Route('/', name: 'restaurants', methods: ['GET'])]
     public function restaurants(RestaurantListingRequest $request): JsonResponse
     {
-        return (new Handle($this->listingService))->handle($request);
+        return $this->handle($this->listingService, $request);
     }
 
     #[Route('/{detailId}', name: 'restaurant', methods: ['GET'])]
     public function restaurant(DetailRequest $request): JsonResponse
     {
-        return (new Handle($this->detailService))->handle($request);
+        return $this->handle($this->detailService, $request);
     }
 }
diff --git a/app/src/Restaurants/Dto/KitchenTypeDto.php b/app/src/Restaurants/Dto/KitchenTypeDto.php
new file mode 100644
index 0000000..e326132
--- /dev/null
+++ b/app/src/Restaurants/Dto/KitchenTypeDto.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Restaurants\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+
+class KitchenTypeDto implements DtoInterface
+{
+    public function __construct(
+        public string $id,
+
+        public string $name,
+
+        public string $code,
+    ) {}
+}
diff --git a/app/src/Restaurants/Dto/RestaurantDetailElementDto.php b/app/src/Restaurants/Dto/RestaurantDetailElementDto.php
new file mode 100644
index 0000000..41139b8
--- /dev/null
+++ b/app/src/Restaurants/Dto/RestaurantDetailElementDto.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Restaurants\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\Dto\FileDto;
+
+class RestaurantDetailElementDto implements DtoInterface
+{
+    /**
+     * @param string $id
+     * @param string $name
+     * @param string $code
+     * @param string $coordinates
+     * @param RestaurantTypeDto $type
+     * @param string|null $check
+     * @param string|null $check_info
+     * @param DtoCollection<KitchenTypeDto>|null $kitchen
+     * @param DtoCollection<string>|null $phone
+     * @param DtoCollection<string>|null $email
+     * @param DtoCollection<string>|null $address
+     * @param DtoCollection<TagDto>|null $tags
+     * @param string|null $site
+     * @param FileDto|null $image Превью
+     * @param DtoCollection<FileDto>|null $gallery
+     */
+    public function __construct(
+        public string $id,
+
+        public string $name,
+
+        public string $code,
+
+        public string $coordinates,
+
+        public RestaurantTypeDto $type,
+
+        public ?string $check = null,
+
+        public ?string $check_info = null,
+
+        public ?DtoCollection $kitchen = null,
+
+        public ?DtoCollection $phone = null,
+
+        public ?DtoCollection $email = null,
+
+        public ?DtoCollection $address = null,
+
+        public ?DtoCollection $tags = null,
+
+        public ?string $site = null,
+
+        public ?FileDto $image = null,
+
+        public ?DtoCollection $gallery = null,
+    ) {}
+}
diff --git a/app/src/Dto/RestaurantFilterVariantsDto.php b/app/src/Restaurants/Dto/RestaurantFilterVariantsDto.php
similarity index 66%
rename from app/src/Dto/RestaurantFilterVariantsDto.php
rename to app/src/Restaurants/Dto/RestaurantFilterVariantsDto.php
index 8fd5a95..e4a15c1 100644
--- a/app/src/Dto/RestaurantFilterVariantsDto.php
+++ b/app/src/Restaurants/Dto/RestaurantFilterVariantsDto.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Dto;
+namespace App\Restaurants\Dto;
 
-use Ramsey\Collection\Collection;
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Dto\DtoCollection;
 
 class RestaurantFilterVariantsDto implements DtoInterface
 {
@@ -11,10 +12,8 @@ class RestaurantFilterVariantsDto implements DtoInterface
      * @param DtoCollection<KitchenTypeDto> $kitchen
      */
     public function __construct(
-        /** @var DtoCollection<RestaurantTypeDto>  */
         public DtoCollection $type,
 
-        /** @var DtoCollection<KitchenTypeDto>  */
         public DtoCollection $kitchen,
     ) {}
 }
diff --git a/app/src/Dto/RestaurantListDto.php b/app/src/Restaurants/Dto/RestaurantListDto.php
similarity index 74%
rename from app/src/Dto/RestaurantListDto.php
rename to app/src/Restaurants/Dto/RestaurantListDto.php
index fd500cb..9d7f022 100644
--- a/app/src/Dto/RestaurantListDto.php
+++ b/app/src/Restaurants/Dto/RestaurantListDto.php
@@ -1,6 +1,10 @@
 <?php
 
-namespace App\Dto;
+namespace App\Restaurants\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\Dto\PaginationDto;
 
 class RestaurantListDto implements DtoInterface
 {
@@ -12,7 +16,6 @@ class RestaurantListDto implements DtoInterface
     public function __construct(
         public PaginationDto $pagination,
 
-        /** @var DtoCollection<RestaurantListingElementDto>  */
         public DtoCollection $list,
 
         public RestaurantFilterVariantsDto $filterVariants,
diff --git a/app/src/Restaurants/Dto/RestaurantListingElementDto.php b/app/src/Restaurants/Dto/RestaurantListingElementDto.php
new file mode 100644
index 0000000..b9b212e
--- /dev/null
+++ b/app/src/Restaurants/Dto/RestaurantListingElementDto.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Restaurants\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Dto\FileDto;
+
+class RestaurantListingElementDto implements DtoInterface
+{
+    public function __construct(
+        public string $id,
+
+        public string $name,
+
+        public string $code,
+
+        public RestaurantTypeDto $type,
+
+        public string $detailLink,
+
+        public ?string $check = null,
+
+        public ?FileDto $image = null,
+    ) {}
+}
diff --git a/app/src/Restaurants/Dto/RestaurantTypeDto.php b/app/src/Restaurants/Dto/RestaurantTypeDto.php
new file mode 100644
index 0000000..c6747da
--- /dev/null
+++ b/app/src/Restaurants/Dto/RestaurantTypeDto.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Restaurants\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+
+class RestaurantTypeDto implements DtoInterface
+{
+    public function __construct(
+        public string $id,
+
+        public string $name,
+
+        public string $code,
+    ) {}
+}
diff --git a/app/src/Dto/TagDto.php b/app/src/Restaurants/Dto/TagDto.php
similarity index 69%
rename from app/src/Dto/TagDto.php
rename to app/src/Restaurants/Dto/TagDto.php
index 58733a0..eb8d11c 100644
--- a/app/src/Dto/TagDto.php
+++ b/app/src/Restaurants/Dto/TagDto.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace App\Dto;
+namespace App\Restaurants\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Dto\DtoCollection;
 
 class TagDto implements DtoInterface
 {
@@ -11,7 +14,6 @@ class TagDto implements DtoInterface
     public function __construct(
         public string $name,
 
-        /** @var DtoCollection<string>  */
         public DtoCollection $list,
     ) {}
 }
diff --git a/app/src/Restaurants/DtoFactory/KitchenTypeDtoFactory.php b/app/src/Restaurants/DtoFactory/KitchenTypeDtoFactory.php
new file mode 100644
index 0000000..04c7260
--- /dev/null
+++ b/app/src/Restaurants/DtoFactory/KitchenTypeDtoFactory.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Restaurants\DtoFactory;
+
+use App\Restaurants\Dto\KitchenTypeDto;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\Entity\Kitchens;
+use Ramsey\Collection\Collection as RamseyCollection;
+use Doctrine\Common\Collections\Collection as DoctrineCollection;
+
+class KitchenTypeDtoFactory
+{
+    public function create(Kitchens $kitchen): KitchenTypeDto
+    {
+        return new KitchenTypeDto(
+            id: $kitchen->getId(),
+            name: $kitchen->getName(),
+            code: $kitchen->getCode(),
+        );
+    }
+
+    /**
+     * @param DoctrineCollection<Kitchens>|RamseyCollection<Kitchens> $kitchens
+     * @return DtoCollection<KitchenTypeDto>
+     */
+    public function createCollection(DoctrineCollection|RamseyCollection $kitchens): DtoCollection
+    {
+        $kitchenCollection = $kitchens->map(function(Kitchens $kitchen) {
+            return $this->create($kitchen);
+        });
+
+        return new DtoCollection(
+            KitchenTypeDto::class,
+            $kitchenCollection->toArray()
+        );
+    }
+}
diff --git a/app/src/Restaurants/DtoFactory/RestaurantDetailElementDtoFactory.php b/app/src/Restaurants/DtoFactory/RestaurantDetailElementDtoFactory.php
new file mode 100644
index 0000000..343b892
--- /dev/null
+++ b/app/src/Restaurants/DtoFactory/RestaurantDetailElementDtoFactory.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Restaurants\DtoFactory;
+
+use App\Restaurants\Dto\RestaurantDetailElementDto;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\DtoFactory\FileDtoFactory;
+use App\Shared\Entity\Restaurants;
+
+class RestaurantDetailElementDtoFactory
+{
+    public function __construct(
+        private readonly RestaurantTypeDtoFactory $typeFactory,
+        private readonly KitchenTypeDtoFactory $kitchenFactory,
+        private readonly TagDtoFactory $tagFactory,
+        private readonly FileDtoFactory $fileFactory,
+    ) {}
+    public function create(Restaurants $restaurant): RestaurantDetailElementDto
+    {
+        return new RestaurantDetailElementDto(
+            id: $restaurant->getId(),
+            name: $restaurant->getName(),
+            code: $restaurant->getCode(),
+            coordinates: $restaurant->getCoordinates(),
+            type: $this->typeFactory->create($restaurant->getType()),
+            check: $restaurant->getReceipt(),
+            check_info: $restaurant->getReceiptInfo(),
+            kitchen: $this->kitchenFactory->createCollection($restaurant->getKitchens()),
+            phone: $this->decodeJson($restaurant->getPhone()),
+            email: $this->decodeJson($restaurant->getEmail()),
+            address: $this->decodeJson($restaurant->getAddress()),
+            tags: $this->tagFactory->createCollection($restaurant->getTags()),
+            site: $restaurant->getSite(),
+            image: $this->fileFactory->create($restaurant->getPreviewImage()),
+            gallery: $this->fileFactory->createCollection($restaurant->getGallery()),
+        );
+    }
+
+    /**
+     * @throws \JsonException
+     */
+    private function decodeJson(string $json)
+    {
+        return $json === null
+            ? null
+            : new DtoCollection(
+                'string',
+                json_decode(
+                    $json,
+                    true,
+                    512,
+                    JSON_THROW_ON_ERROR
+                ),
+            );
+    }
+}
\ No newline at end of file
diff --git a/app/src/Restaurants/DtoFactory/RestaurantFilterVariantsDtoFactory.php b/app/src/Restaurants/DtoFactory/RestaurantFilterVariantsDtoFactory.php
new file mode 100644
index 0000000..91624eb
--- /dev/null
+++ b/app/src/Restaurants/DtoFactory/RestaurantFilterVariantsDtoFactory.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Restaurants\DtoFactory;
+
+use App\Restaurants\Dto\RestaurantFilterVariantsDto;
+use App\Shared\Dto\DtoCollection;
+
+class RestaurantFilterVariantsDtoFactory
+{
+    public function create(
+        DtoCollection $types,
+        DtoCollection $kitchens
+    ): RestaurantFilterVariantsDto {
+        return new RestaurantFilterVariantsDto(
+            $types,
+            $kitchens,
+        );
+    }
+}
diff --git a/app/src/Restaurants/DtoFactory/RestaurantListDtoFactory.php b/app/src/Restaurants/DtoFactory/RestaurantListDtoFactory.php
new file mode 100644
index 0000000..3a372b9
--- /dev/null
+++ b/app/src/Restaurants/DtoFactory/RestaurantListDtoFactory.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Restaurants\DtoFactory;
+
+use App\Restaurants\Dto\RestaurantFilterVariantsDto;
+use App\Restaurants\Dto\RestaurantListDto;
+use App\Restaurants\Dto\RestaurantListingElementDto;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\Dto\PaginationDto;
+
+class RestaurantListDtoFactory
+{
+    /**
+     * @param PaginationDto $pagination
+     * @param DtoCollection<RestaurantListingElementDto> $list
+     * @param RestaurantFilterVariantsDto $filters
+     * @return RestaurantListDto
+     */
+    public function create(
+        PaginationDto $pagination,
+        DtoCollection $list,
+        RestaurantFilterVariantsDto $filters
+    ): RestaurantListDto {
+        return new RestaurantListDto(
+            $pagination,
+            $list,
+            $filters
+        );
+    }
+}
diff --git a/app/src/Restaurants/DtoFactory/RestaurantListingElementDtoFactory.php b/app/src/Restaurants/DtoFactory/RestaurantListingElementDtoFactory.php
new file mode 100644
index 0000000..d46d87b
--- /dev/null
+++ b/app/src/Restaurants/DtoFactory/RestaurantListingElementDtoFactory.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Restaurants\DtoFactory;
+
+use App\Restaurants\Dto\RestaurantListingElementDto;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\DtoFactory\FileDtoFactory;
+use App\Shared\Entity\Restaurants;
+use Ramsey\Collection\Collection;
+
+class RestaurantListingElementDtoFactory
+{
+    public function __construct(
+        private readonly RestaurantTypeDtoFactory $typeFactory,
+        private readonly FileDtoFactory $fileFactory,
+    ) {}
+    public function create(Restaurants $restaurant): RestaurantListingElementDto
+    {
+        return new RestaurantListingElementDto(
+            id: $restaurant->getId(),
+            name: $restaurant->getName(),
+            code: $restaurant->getCode(),
+            type: $this->typeFactory->create($restaurant->getType()),
+            detailLink: 'api/v1/restaurants/' . $restaurant->getId(),
+            check: $restaurant->getReceipt(),
+            image: $this->fileFactory->create($restaurant->getPreviewImage())
+        );
+    }
+
+    /**
+     * @param Collection<Restaurants> $restaurants
+     * @return DtoCollection<RestaurantListingElementDto>
+     */
+    public function createCollection(Collection $restaurants): DtoCollection
+    {
+        $restaurantsDto = $restaurants->map(function(Restaurants $restaurant) {
+            return $this->create($restaurant);
+        });
+
+        return new DtoCollection(
+            RestaurantListingElementDto::class,
+            $restaurantsDto->toArray(),
+        );
+    }
+}
diff --git a/app/src/Restaurants/DtoFactory/RestaurantTypeDtoFactory.php b/app/src/Restaurants/DtoFactory/RestaurantTypeDtoFactory.php
new file mode 100644
index 0000000..30b6ebc
--- /dev/null
+++ b/app/src/Restaurants/DtoFactory/RestaurantTypeDtoFactory.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Restaurants\DtoFactory;
+
+use App\Restaurants\Dto\RestaurantTypeDto;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\Entity\RestaurantTypes;
+use Ramsey\Collection\Collection;
+
+class RestaurantTypeDtoFactory
+{
+    public function create(RestaurantTypes $type): RestaurantTypeDto
+    {
+        return new RestaurantTypeDto(
+            id: $type->getId(),
+            name: $type->getName(),
+            code: $type->getCode(),
+        );
+    }
+
+    /**
+     * @param Collection<RestaurantTypes> $types
+     * @return DtoCollection<RestaurantTypeDto>
+     */
+    public function createCollection(Collection $types): DtoCollection
+    {
+        $typesDto = $types->map(function(RestaurantTypes $type) {
+            return $this->create($type);
+        });
+
+        return new DtoCollection(
+            RestaurantTypeDto::class,
+            $typesDto->toArray()
+        );
+    }
+}
diff --git a/app/src/Restaurants/DtoFactory/TagDtoFactory.php b/app/src/Restaurants/DtoFactory/TagDtoFactory.php
new file mode 100644
index 0000000..174e26e
--- /dev/null
+++ b/app/src/Restaurants/DtoFactory/TagDtoFactory.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Restaurants\DtoFactory;
+
+use App\Restaurants\Dto\TagDto;
+use App\Shared\Dto\DtoCollection;
+use JsonException;
+use Ramsey\Collection\Collection as RamseyCollection;
+
+class TagDtoFactory
+{
+    /**
+     * @param string $json
+     * @return DtoCollection<TagDto>
+     * @throws JsonException
+     */
+    public function createCollection(string $json): DtoCollection
+    {
+        $jsonCollection = new RamseyCollection(
+            'array',
+            json_decode(
+                $json,
+                true,
+                512,
+                JSON_THROW_ON_ERROR
+            )
+        );
+
+        $tagCollection = new DtoCollection(TagDto::class);
+
+        foreach ($jsonCollection as $name => $jsonItem) {
+            $tagCollection->add(
+                new TagDto($name, new DtoCollection('string', $jsonItem))
+            );
+        }
+
+        return $tagCollection;
+    }
+}
diff --git a/app/src/Request/RestaurantListingRequest.php b/app/src/Restaurants/Request/RestaurantListingRequest.php
similarity index 90%
rename from app/src/Request/RestaurantListingRequest.php
rename to app/src/Restaurants/Request/RestaurantListingRequest.php
index 403a3a9..b85da7f 100644
--- a/app/src/Request/RestaurantListingRequest.php
+++ b/app/src/Restaurants/Request/RestaurantListingRequest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Request;
+namespace App\Restaurants\Request;
 
+use App\Shared\Abstraction\AbstractRequest;
 use Symfony\Component\Validator\Constraints\AtLeastOneOf;
 use Symfony\Component\Validator\Constraints\Blank;
 use Symfony\Component\Validator\Constraints\Uuid;
diff --git a/app/src/Restaurants/Service/RestaurantDetailService.php b/app/src/Restaurants/Service/RestaurantDetailService.php
new file mode 100644
index 0000000..b8dda37
--- /dev/null
+++ b/app/src/Restaurants/Service/RestaurantDetailService.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Restaurants\Service;
+
+use App\Restaurants\DtoFactory\RestaurantDetailElementDtoFactory;
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Abstraction\AbstractRequest;
+use App\Shared\Abstraction\ServiceInterface;
+use App\Shared\Error\NotFoundError;
+use App\Shared\Repository\RestaurantsRepository;
+
+class RestaurantDetailService implements ServiceInterface
+{
+    public function __construct(
+        private readonly RestaurantsRepository $restaurants,
+
+        private readonly RestaurantDetailElementDtoFactory $dtoFactory
+    ) {}
+
+    /**
+     * @throws NotFoundError При ненайдемом ресторане
+     * @throws \JsonException При ошибке парсинга списков
+     */
+    public function serve(AbstractRequest $request): DtoInterface
+    {
+        $restaurant = $this->restaurants->find($request->detailId);
+
+        if ($restaurant === null) {
+            throw new NotFoundError('Restaurant not found');
+        }
+
+        return $this->dtoFactory->create($restaurant);
+    }
+}
diff --git a/app/src/Restaurants/Service/RestaurantListingService.php b/app/src/Restaurants/Service/RestaurantListingService.php
new file mode 100644
index 0000000..a56b29f
--- /dev/null
+++ b/app/src/Restaurants/Service/RestaurantListingService.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Restaurants\Service;
+
+use App\Restaurants\DtoFactory\KitchenTypeDtoFactory;
+use App\Restaurants\DtoFactory\RestaurantFilterVariantsDtoFactory;
+use App\Restaurants\DtoFactory\RestaurantListDtoFactory;
+use App\Restaurants\DtoFactory\RestaurantListingElementDtoFactory;
+use App\Restaurants\DtoFactory\RestaurantTypeDtoFactory;
+use App\Shared\Abstraction\AbstractRequest;
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Abstraction\ServiceInterface;
+use App\Shared\DtoFactory\PaginationDtoFactory;
+use App\Shared\Repository\KitchensRepository;
+use App\Shared\Repository\RestaurantsRepository;
+use App\Shared\Repository\RestaurantTypesRepository;
+
+class RestaurantListingService implements ServiceInterface
+{
+    public function __construct(
+        private readonly RestaurantsRepository $restaurants,
+        private readonly RestaurantTypesRepository $types,
+        private readonly KitchensRepository $kitchens,
+
+        private readonly PaginationDtoFactory $paginationFactory,
+        private readonly RestaurantListingElementDtoFactory $listFactory,
+        private readonly RestaurantFilterVariantsDtoFactory $filterFactory,
+        private readonly RestaurantTypeDtoFactory $typeFactory,
+        private readonly KitchenTypeDtoFactory $kitchenFactory,
+        private readonly RestaurantListDtoFactory $listingFactory,
+    ) {}
+
+    public function serve(AbstractRequest $request): DtoInterface
+    {
+        $countOfRestaurants = $this
+            ->restaurants
+            ->getCountWithFilters(
+                $request->restaurant_type_id,
+                $request->kitchen_id
+            );
+
+        $pagination = $this->paginationFactory->create(
+            $request->page,
+            $request->limit,
+            $countOfRestaurants,
+        );
+
+        $offset = min($pagination->pageSize, $countOfRestaurants) * ($pagination->currentPage - 1);
+
+        $list = $this->listFactory->createCollection(
+            $this->restaurants->getWithFilters(
+                $request->kitchen_id,
+                $request->restaurant_type_id,
+                $pagination->pageSize,
+                $offset,
+            ),
+        );
+
+
+        $filters = $this->filterFactory->create(
+            $this->typeFactory->createCollection($this->types->getAll()),
+            $this->kitchenFactory->createCollection($this->kitchens->getAll())
+        );
+
+        return $this->listingFactory->create(
+            $pagination,
+            $list,
+            $filters
+        );
+    }
+}
diff --git a/app/src/Service/NewsDetailService.php b/app/src/Service/NewsDetailService.php
deleted file mode 100644
index 19c394d..0000000
--- a/app/src/Service/NewsDetailService.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Service;
-
-use App\Dto\DtoInterface;
-use App\Error\NotFoundError;
-use App\Repository\NewsRepositoryInterface;
-use App\Request\AbstractRequest;
-
-class NewsDetailService implements ServiceInterface
-{
-    public function __construct(
-        private readonly NewsRepositoryInterface $news,
-    ) {}
-
-    public function serve(AbstractRequest $request): DtoInterface
-    {
-        $news = $this->news->find($request->detailId);
-
-        if ($news === null) {
-            throw new NotFoundError('News');
-        }
-
-        return $news->getExtendedDto();
-    }
-}
diff --git a/app/src/Service/NewsListingService.php b/app/src/Service/NewsListingService.php
deleted file mode 100644
index 6d75636..0000000
--- a/app/src/Service/NewsListingService.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Service;
-
-use App\Dto\DtoCollection;
-use App\Dto\DtoInterface;
-use App\Dto\NewsCategoryDto;
-use App\Dto\NewsFilterVariants;
-use App\Dto\NewsListDto;
-use App\Dto\NewsListingElementDto;
-use App\Dto\PaginationDto;
-use App\Entity\News;
-use App\Entity\NewsCategories;
-use App\Repository\NewsRepositoryInterface;
-use App\Repository\NewsCategoriesRepositoryInterface;
-use App\Request\AbstractRequest;
-
-class NewsListingService implements ServiceInterface
-{
-
-    public function __construct(
-        private readonly NewsRepositoryInterface $news,
-        private readonly NewsCategoriesRepositoryInterface $newsCategories,
-    ) {}
-
-    public function serve(AbstractRequest $request): DtoInterface
-    {
-        $countOfRestaurants = $this
-            ->news->
-            getCountWithFilters($request->news_category);
-
-        $pagination = new PaginationDto(
-            $request->page,
-            $request->limit,
-            $countOfRestaurants
-        );
-
-        $offset = min($pagination->page_size, $countOfRestaurants) * ($pagination->current_page - 1);
-
-        $list = new DtoCollection(
-            NewsListingElementDto::class,
-            $this
-                ->news
-                ->findByFilters(
-                    $request->news_category,
-                    $request->limit, $offset
-                )
-                ->map(function(News $news) {
-                    return $news->getDto();
-                })
-                ->toArray()
-        );
-
-        $filters = new NewsFilterVariants(
-            new DtoCollection(
-                NewsCategoryDto::class,
-                $this->newsCategories->getAll()
-                    ->map(function(NewsCategories $category) {
-                        return $category->getDto();
-                    })
-                    ->toArray()
-            ),
-        );
-
-        return new NewsListDto(
-            $pagination,
-            $list,
-            $filters
-        );
-    }
-}
diff --git a/app/src/Service/NewsMainNewsService.php b/app/src/Service/NewsMainNewsService.php
deleted file mode 100644
index 16037d3..0000000
--- a/app/src/Service/NewsMainNewsService.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Service;
-
-use App\Dto\DtoInterface;
-use App\Repository\NewsRepositoryInterface;
-use App\Request\AbstractRequest;
-use Doctrine\ORM\EntityManagerInterface;
-
-class NewsMainNewsService implements ServiceInterface
-{
-    public function __construct(
-        private readonly NewsRepositoryInterface $news,
-    ) {}
-    public function serve(AbstractRequest $request): DtoInterface
-    {
-        return $this->news->getMainNews()->getDto();
-    }
-}
diff --git a/app/src/Service/NewsSearchService.php b/app/src/Service/NewsSearchService.php
deleted file mode 100644
index ff9713e..0000000
--- a/app/src/Service/NewsSearchService.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Service;
-
-use App\Dto\DtoInterface;
-use App\Repository\NewsRepositoryInterface;
-use App\Request\AbstractRequest;
-
-class NewsSearchService implements ServiceInterface
-{
-    public function __construct(
-        private readonly NewsRepositoryInterface $news,
-    ) {}
-    public function serve(AbstractRequest $request): DtoInterface
-    {
-        return $this->news->getMainNews()->getExtendedDto();
-    }
-}
diff --git a/app/src/Service/RestaurantDetailService.php b/app/src/Service/RestaurantDetailService.php
deleted file mode 100644
index 2547cfa..0000000
--- a/app/src/Service/RestaurantDetailService.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Service;
-
-use App\Dto\DtoInterface;
-use App\Error\NotFoundError;
-use App\Repository\RestaurantsRepositoryInterface;
-use App\Request\AbstractRequest;
-
-class RestaurantDetailService implements ServiceInterface
-{
-    public function __construct(
-        private readonly RestaurantsRepositoryInterface $restaurants,
-    ) {}
-
-    /**
-     * @throws NotFoundError При ненайдемом ресторане
-     * @throws \JsonException При ошибке парсинга списков
-     */
-    public function serve(AbstractRequest $request): DtoInterface
-    {
-        $restaurant = $this->restaurants->find($request->detailId);
-
-        if ($restaurant === null) {
-            throw new NotFoundError('Restaurant');
-        }
-
-        return $restaurant->getExtendedDto();
-    }
-}
diff --git a/app/src/Service/RestaurantListingService.php b/app/src/Service/RestaurantListingService.php
deleted file mode 100644
index d24741a..0000000
--- a/app/src/Service/RestaurantListingService.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace App\Service;
-
-use App\Dto\DtoCollection;
-use App\Dto\DtoInterface;
-use App\Dto\KitchenTypeDto;
-use App\Dto\PaginationDto;
-use App\Dto\RestaurantFilterVariantsDto;
-use App\Dto\RestaurantListDto;
-use App\Dto\RestaurantListingElementDto;
-use App\Dto\RestaurantTypeDto;
-use App\Entity\Kitchens;
-use App\Entity\Restaurants;
-use App\Entity\RestaurantTypes;
-use App\Repository\KitchensRepositoryInterface;
-use App\Repository\RestaurantsRepositoryInterface;
-use App\Repository\RestaurantTypeRepositoryInterface;
-use App\Request\AbstractRequest;
-
-class RestaurantListingService implements ServiceInterface
-{
-    public function __construct(
-        private readonly RestaurantsRepositoryInterface $restaurants,
-        private readonly RestaurantTypeRepositoryInterface $types,
-        private readonly KitchensRepositoryInterface $kitchens,
-    ) {}
-
-    public function serve(AbstractRequest $request): DtoInterface
-    {
-        $countOfRestaurants = $this
-            ->restaurants
-            ->getCountWithFilters(
-                $request->restaurant_type_id,
-                $request->kitchen_id
-            );
-
-        $pagination = new PaginationDto(
-            $request->page,
-            $request->limit,
-            $countOfRestaurants,
-        );
-
-        $offset = min($pagination->page_size, $countOfRestaurants) * ($pagination->current_page - 1);
-
-        $list = new DtoCollection(
-            RestaurantListingElementDto::class,
-            $this
-                ->restaurants
-                ->findByFilters(
-                    $request
-                        ->restaurant_type_id,
-                    $request->kitchen_id,
-                    $request->limit,
-                    $offset,
-                )
-                ->map(function (Restaurants $restaurant) {
-                    return $restaurant->getDto();
-                })
-                ->toArray()
-        );
-
-        $filters = new RestaurantFilterVariantsDto(
-            new DtoCollection(
-                RestaurantTypeDto::class,
-                $this->types->getAll()
-                    ->map(function(RestaurantTypes $types) {
-                        return $types->getDto();
-                    })
-                    ->toArray()
-            ),
-            new DtoCollection(
-                KitchenTypeDto::class,
-                $this->kitchens->getAll()
-                    ->map(function(Kitchens $kitchen) {
-                        return $kitchen->getDto();
-                    })
-                    ->toArray()
-            ),
-        );
-
-        return new RestaurantListDto(
-            $pagination,
-            $list,
-            $filters,
-        );
-    }
-}
diff --git a/app/src/Shared/Abstraction/AbstractController.php b/app/src/Shared/Abstraction/AbstractController.php
new file mode 100644
index 0000000..3d40cc8
--- /dev/null
+++ b/app/src/Shared/Abstraction/AbstractController.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Shared\Abstraction;
+
+use App\Shared\Dto\ErrorDto;
+use App\Shared\DtoFactory\ErrorDtoFactory;
+use App\Shared\Error\BaseError;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BundleController;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Throwable;
+
+abstract class AbstractController extends BundleController
+{
+    public function __construct(
+        protected readonly ErrorDtoFactory $errorFactory,
+    ) {}
+
+    protected function handle(ServiceInterface $service, AbstractRequest $request): JsonResponse
+    {
+//        try {
+            return new JsonResponse($service->serve($request));
+//
+//        } catch (BaseError $error) {
+//            $errorDto = $this->errorFactory->create($error);
+//
+//            return new JsonResponse($errorDto, $errorDto->status);
+//
+//        } catch (Throwable $exception) {
+//            $error = new ErrorDto();
+//            return new JsonResponse($error, $error->status);
+//        }
+    }
+}
diff --git a/app/src/Request/AbstractRequest.php b/app/src/Shared/Abstraction/AbstractRequest.php
similarity index 88%
rename from app/src/Request/AbstractRequest.php
rename to app/src/Shared/Abstraction/AbstractRequest.php
index 9ddccd5..a7be59c 100644
--- a/app/src/Request/AbstractRequest.php
+++ b/app/src/Shared/Abstraction/AbstractRequest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Request;
+namespace App\Shared\Abstraction;
 
-use App\Dto\DtoCollection;
-use App\Dto\ValidateErrorDto;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\Dto\ValidateErrorDto;
+use App\Shared\DtoFactory\ValidateErrorDtoFactory;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Validator\Exception\ValidatorException;
@@ -52,7 +53,7 @@ abstract class AbstractRequest
         $messages = new DtoCollection(ValidateErrorDto::class);
 
         foreach ($errors as $error) {
-            $messages->add(new ValidateErrorDto($error));
+            $messages->add((new ValidateErrorDtoFactory($error))->create());
         }
 
         if ($messages->count() > 0) {
diff --git a/app/src/Shared/Abstraction/DtoInterface.php b/app/src/Shared/Abstraction/DtoInterface.php
new file mode 100644
index 0000000..60a39cd
--- /dev/null
+++ b/app/src/Shared/Abstraction/DtoInterface.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace App\Shared\Abstraction;
+
+interface DtoInterface {}
diff --git a/app/src/Shared/Abstraction/EntityInterface.php b/app/src/Shared/Abstraction/EntityInterface.php
new file mode 100644
index 0000000..e7b98aa
--- /dev/null
+++ b/app/src/Shared/Abstraction/EntityInterface.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace App\Shared\Abstraction;
+
+interface EntityInterface {}
\ No newline at end of file
diff --git a/app/src/Service/ServiceInterface.php b/app/src/Shared/Abstraction/ServiceInterface.php
similarity index 56%
rename from app/src/Service/ServiceInterface.php
rename to app/src/Shared/Abstraction/ServiceInterface.php
index f52194d..aca9fbf 100644
--- a/app/src/Service/ServiceInterface.php
+++ b/app/src/Shared/Abstraction/ServiceInterface.php
@@ -1,9 +1,6 @@
 <?php
 
-namespace App\Service;
-
-use App\Dto\DtoInterface;
-use App\Request\AbstractRequest;
+namespace App\Shared\Abstraction;
 
 interface ServiceInterface
 {
diff --git a/app/src/Dto/DtoCollection.php b/app/src/Shared/Dto/DtoCollection.php
similarity index 68%
rename from app/src/Dto/DtoCollection.php
rename to app/src/Shared/Dto/DtoCollection.php
index 0e6bb08..1e27e88 100644
--- a/app/src/Dto/DtoCollection.php
+++ b/app/src/Shared/Dto/DtoCollection.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace App\Dto;
+namespace App\Shared\Dto;
 
 use JsonSerializable;
 use Ramsey\Collection\AbstractCollection;
 
-/** Переопределенная коллекция, что бы можно было сериалайзить коллекции */
 class DtoCollection extends AbstractCollection implements JsonSerializable
 {
     public function __construct(
@@ -21,7 +20,6 @@ class DtoCollection extends AbstractCollection implements JsonSerializable
         return $this->collectionType;
     }
 
-    /** Метод для сериализации коллекции в JSON */
     public function jsonSerialize(): array
     {
         return $this->data;
diff --git a/app/src/Shared/Dto/ErrorDto.php b/app/src/Shared/Dto/ErrorDto.php
new file mode 100644
index 0000000..fe14352
--- /dev/null
+++ b/app/src/Shared/Dto/ErrorDto.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Shared\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+
+class ErrorDto implements DtoInterface
+{
+    public function __construct(
+        public string $status = '500',
+
+        public string $message = 'Something went wrong',
+
+        public string $code = '100',
+    ) {}
+}
diff --git a/app/src/Shared/Dto/FileDto.php b/app/src/Shared/Dto/FileDto.php
new file mode 100644
index 0000000..1cff98b
--- /dev/null
+++ b/app/src/Shared/Dto/FileDto.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Shared\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+
+class FileDto implements DtoInterface
+{
+    public function __construct(
+        public string $id,
+
+        public string $name,
+
+        public string $description,
+
+        public int $size,
+
+        public string $type,
+
+        public string $url,
+    ) {}
+}
diff --git a/app/src/Shared/Dto/PaginationDto.php b/app/src/Shared/Dto/PaginationDto.php
new file mode 100644
index 0000000..8433d9b
--- /dev/null
+++ b/app/src/Shared/Dto/PaginationDto.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Shared\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+
+class PaginationDto implements DtoInterface
+{
+    public function __construct(
+        public int $currentPage,
+        public int $pages,
+        public int $pageSize,
+    ) {}
+}
diff --git a/app/src/Shared/Dto/ValidateErrorDto.php b/app/src/Shared/Dto/ValidateErrorDto.php
new file mode 100644
index 0000000..02a6766
--- /dev/null
+++ b/app/src/Shared/Dto/ValidateErrorDto.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Shared\Dto;
+
+use App\Shared\Abstraction\DtoInterface;
+
+class ValidateErrorDto implements DtoInterface
+{
+    public function __construct(
+        public string $message,
+
+        public string $code,
+
+        public string $status,
+    ) {}
+}
diff --git a/app/src/Shared/DtoFactory/ErrorDtoFactory.php b/app/src/Shared/DtoFactory/ErrorDtoFactory.php
new file mode 100644
index 0000000..f2bc249
--- /dev/null
+++ b/app/src/Shared/DtoFactory/ErrorDtoFactory.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Shared\DtoFactory;
+
+use App\Shared\Dto\ErrorDto;
+use App\Shared\Error\BaseError;
+
+class ErrorDtoFactory
+{
+    public function create(BaseError $error): ErrorDto
+    {
+       return new ErrorDto(
+           status: $error->getStatusCode(),
+           message: $error->getMessage(),
+           code: $error->getCode(),
+       );
+    }
+}
diff --git a/app/src/Shared/DtoFactory/FileDtoFactory.php b/app/src/Shared/DtoFactory/FileDtoFactory.php
new file mode 100644
index 0000000..6fbc5c9
--- /dev/null
+++ b/app/src/Shared/DtoFactory/FileDtoFactory.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Shared\DtoFactory;
+
+use App\Shared\Dto\DtoCollection;
+use App\Shared\Dto\FileDto;
+use App\Shared\Entity\File;
+use Doctrine\Common\Collections\Collection;
+
+class FileDtoFactory
+{
+    public function create(File $file): FileDto
+    {
+        return new FileDto(
+            id: $file->getId(),
+            name: $file->getName(),
+            description: $file->getDescription(),
+            size: $file->getSize(),
+            type: $file->getType(),
+            url: $file->getUrl(),
+        );
+    }
+
+    /**
+     * @param Collection<File> $files
+     * @return DtoCollection<FileDto>
+     */
+    public function createCollection(Collection $files): DtoCollection
+    {
+        $filesDto = $files->map(function(File $file) {
+            return $this->create($file);
+        });
+
+        return new DtoCollection(
+            FileDto::class,
+            $filesDto->toArray()
+        );
+    }
+}
diff --git a/app/src/Shared/DtoFactory/PaginationDtoFactory.php b/app/src/Shared/DtoFactory/PaginationDtoFactory.php
new file mode 100644
index 0000000..933de0c
--- /dev/null
+++ b/app/src/Shared/DtoFactory/PaginationDtoFactory.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Shared\DtoFactory;
+
+use App\Shared\Dto\PaginationDto;
+
+class PaginationDtoFactory
+{
+    public function create(int $page, int $limit, int $total): PaginationDto
+    {
+        $pageSize = $limit > 0 ? $limit : 12;
+        $pages = ceil($total / $pageSize);
+        $page = ($page > 1) && ($page <= $pages) ? $page : 1;
+
+        return new PaginationDto($page, $pages,  $pageSize);
+    }
+}
diff --git a/app/src/Shared/DtoFactory/ValidateErrorDtoFactory.php b/app/src/Shared/DtoFactory/ValidateErrorDtoFactory.php
new file mode 100644
index 0000000..9cb815a
--- /dev/null
+++ b/app/src/Shared/DtoFactory/ValidateErrorDtoFactory.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Shared\DtoFactory;
+
+use App\Shared\Dto\ValidateErrorDto;
+use App\Shared\Error\ErrorCode;
+use http\Message;
+use Symfony\Component\Validator\ConstraintViolationInterface;
+
+class ValidateErrorDtoFactory
+{
+    public function create(ConstraintViolationInterface $error): ValidateErrorDto
+    {
+        return new ValidateErrorDto(
+            message: $error->getPropertyPath() . ' : ' . $error->getMessage(),
+            code: ErrorCode::ValidateFailed->value,
+            status: 422
+        );
+    }
+}
diff --git a/app/src/Controller/.gitignore b/app/src/Shared/Entity/.gitignore
similarity index 100%
rename from app/src/Controller/.gitignore
rename to app/src/Shared/Entity/.gitignore
diff --git a/app/src/Entity/File.php b/app/src/Shared/Entity/File.php
similarity index 93%
rename from app/src/Entity/File.php
rename to app/src/Shared/Entity/File.php
index 751cb27..5c448b7 100644
--- a/app/src/Entity/File.php
+++ b/app/src/Shared/Entity/File.php
@@ -1,17 +1,16 @@
 <?php
 
-namespace App\Entity;
+namespace App\Shared\Entity;
 
-use App\Dto\DtoInterface;
-use App\Dto\FileDto;
-use App\Repository\FileRepository;
+use App\Shared\Abstraction\EntityInterface;
+use App\Shared\Repository\FileRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity(repositoryClass: FileRepository::class)]
-class File implements PrototypeDto
+class File implements EntityInterface
 {
     #[ORM\Id]
     #[ORM\Column(type: Types::GUID)]
@@ -290,19 +289,4 @@ class File implements PrototypeDto
 
         return $this;
     }
-
-    /** @inheritDoc */
-    public function getDto(): FileDto
-    {
-        $dto =  new FileDto();
-
-        $dto->id = $this->getId();
-        $dto->name = $this->getName();
-        $dto->description = $this->getDescription();
-        $dto->size = $this->getSize();
-        $dto->type = $this->getType();
-        $dto->url = $this->getUrl();
-
-        return $dto;
-    }
 }
diff --git a/app/src/Entity/Kitchens.php b/app/src/Shared/Entity/Kitchens.php
similarity index 82%
rename from app/src/Entity/Kitchens.php
rename to app/src/Shared/Entity/Kitchens.php
index d45bf0a..b6eb7b1 100644
--- a/app/src/Entity/Kitchens.php
+++ b/app/src/Shared/Entity/Kitchens.php
@@ -1,17 +1,16 @@
 <?php
 
-namespace App\Entity;
+namespace App\Shared\Entity;
 
-use App\Dto\DtoInterface;
-use App\Dto\KitchenTypeDto;
-use App\Repository\KitchensRepository;
+use App\Shared\Abstraction\EntityInterface;
+use App\Shared\Repository\KitchensRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity(repositoryClass: KitchensRepository::class)]
-class Kitchens implements PrototypeDto
+class Kitchens implements EntityInterface
 {
     #[ORM\Id]
     #[ORM\Column(type: Types::GUID)]
@@ -96,16 +95,4 @@ class Kitchens implements PrototypeDto
 
         return $this;
     }
-
-    /** @inheritDoc */
-    public function getDto(): DtoInterface
-    {
-        $dto = new KitchenTypeDto();
-
-        $dto->id = $this->getId();
-        $dto->name = $this->getName();
-        $dto->code = $this->getCode();
-
-        return $dto;
-    }
 }
diff --git a/app/src/Entity/News.php b/app/src/Shared/Entity/News.php
similarity index 80%
rename from app/src/Entity/News.php
rename to app/src/Shared/Entity/News.php
index 53a1595..9640253 100644
--- a/app/src/Entity/News.php
+++ b/app/src/Shared/Entity/News.php
@@ -1,18 +1,19 @@
 <?php
 
-namespace App\Entity;
+namespace App\Shared\Entity;
 
-use App\Dto\DtoInterface;
-use App\Dto\NewsDetailElementDto;
-use App\Dto\NewsListingElementDto;
-use App\Repository\NewsRepository;
+use App\News\Dto\NewsDetailElementDto;
+use App\News\Dto\NewsListingElementDto;
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Abstraction\EntityInterface;
+use App\Shared\Repository\NewsRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity(repositoryClass: NewsRepository::class)]
-class News implements PrototypeElementDto
+class News
 {
     #[ORM\Id]
     #[ORM\Column(type: Types::GUID)]
@@ -245,34 +246,4 @@ class News implements PrototypeElementDto
 
         return $this;
     }
-
-    /** @inheritDoc */
-    public function getDto(): DtoInterface
-    {
-        $entity = new NewsListingElementDto();
-
-        $entity->id = $this->getId();
-        $entity->name = $this->getName();
-        $entity->description = $this->getDetailText();
-        $entity->image = $this->getPreviewImage()?->getDto();
-        $entity->create_at = $this->getCreatedAt()->format('Y-m-d H:i:s');
-        $entity->detail_link = "api/v1/restaurants/" . $this->getId();
-
-        return $entity;
-    }
-
-    /** @inheritDoc */
-    public function getExtendedDto(): DtoInterface
-    {
-        $entity = new NewsDetailElementDto();
-
-        $entity->id = $this->getId();
-        $entity->name = $this->getName();
-        $entity->description = $this->getPreviewText();
-        $entity->text = $this->getDetailText();
-        $entity->image = $this->getPreviewImage()?->getDto();
-        $entity->create_at = $this->getCreatedAt()->format('Y-m-d H:i:s');
-
-        return $entity;
-    }
 }
diff --git a/app/src/Entity/NewsCategories.php b/app/src/Shared/Entity/NewsCategories.php
similarity index 81%
rename from app/src/Entity/NewsCategories.php
rename to app/src/Shared/Entity/NewsCategories.php
index 0f77fd1..f4b30cb 100644
--- a/app/src/Entity/NewsCategories.php
+++ b/app/src/Shared/Entity/NewsCategories.php
@@ -1,17 +1,18 @@
 <?php
 
-namespace App\Entity;
+namespace App\Shared\Entity;
 
-use App\Dto\DtoInterface;
-use App\Dto\NewsCategoryDto;
-use App\Repository\NewsCategoriesRepository;
+use App\News\Dto\NewsCategoryDto;
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Abstraction\EntityInterface;
+use App\Shared\Repository\NewsCategoriesRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity(repositoryClass: NewsCategoriesRepository::class)]
-class NewsCategories implements PrototypeDto
+class NewsCategories implements EntityInterface
 {
     #[ORM\Id]
     #[ORM\Column(type: Types::GUID)]
@@ -96,16 +97,4 @@ class NewsCategories implements PrototypeDto
 
         return $this;
     }
-
-    /** @inheritDoc */
-    public function getDto(): DtoInterface
-    {
-        $dto = new NewsCategoryDto();
-
-        $dto->id = $this->getId();
-        $dto->name = $this->getName();
-        $dto->code = $this->getCode();
-
-        return $dto;
-    }
 }
diff --git a/app/src/Entity/NewsType.php b/app/src/Shared/Entity/NewsType.php
similarity index 95%
rename from app/src/Entity/NewsType.php
rename to app/src/Shared/Entity/NewsType.php
index 8331456..d7d724e 100644
--- a/app/src/Entity/NewsType.php
+++ b/app/src/Shared/Entity/NewsType.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace App\Entity;
+namespace App\Shared\Entity;
 
-use App\Dto\DtoInterface;
-use App\Repository\NewsTypeRepository;
+use App\Shared\Repository\NewsTypeRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
diff --git a/app/src/Entity/RestaurantTypes.php b/app/src/Shared/Entity/RestaurantTypes.php
similarity index 82%
rename from app/src/Entity/RestaurantTypes.php
rename to app/src/Shared/Entity/RestaurantTypes.php
index 59f87c8..8081330 100644
--- a/app/src/Entity/RestaurantTypes.php
+++ b/app/src/Shared/Entity/RestaurantTypes.php
@@ -1,18 +1,16 @@
 <?php
 
-namespace App\Entity;
+namespace App\Shared\Entity;
 
-use App\Dto\DtoInterface;
-use App\Dto\RestaurantTypeDto;
-use App\Repository\RestaurantTypesRepository;
+use App\Shared\Abstraction\EntityInterface;
+use App\Shared\Repository\RestaurantTypesRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Doctrine\ORM\Mapping\GeneratedValue;
 
 #[ORM\Entity(repositoryClass: RestaurantTypesRepository::class)]
-class RestaurantTypes implements PrototypeDto
+class RestaurantTypes implements EntityInterface
 {
     #[ORM\Id]
     #[ORM\Column(type: Types::GUID)]
@@ -100,15 +98,4 @@ class RestaurantTypes implements PrototypeDto
 
         return $this;
     }
-
-    public function getDto(): DtoInterface
-    {
-        $dto = new RestaurantTypeDto();
-
-        $dto->id = $this->getId();
-        $dto->name = $this->getName();
-        $dto->code = $this->getCode();
-
-        return $dto;
-    }
 }
diff --git a/app/src/Entity/Restaurants.php b/app/src/Shared/Entity/Restaurants.php
similarity index 69%
rename from app/src/Entity/Restaurants.php
rename to app/src/Shared/Entity/Restaurants.php
index 69e614c..a88eba4 100644
--- a/app/src/Entity/Restaurants.php
+++ b/app/src/Shared/Entity/Restaurants.php
@@ -1,23 +1,24 @@
 <?php
 
-namespace App\Entity;
-
-use App\Dto\DtoCollection;
-use App\Dto\DtoInterface;
-use App\Dto\FileDto;
-use App\Dto\KitchenTypeDto;
-use App\Dto\RestaurantDetailElementDto;
-use App\Dto\RestaurantListingElementDto;
-use App\Dto\TagDto;
-use App\Repository\RestaurantsRepository;
+namespace App\Shared\Entity;
+
+use App\Restaurants\Dto\KitchenTypeDto;
+use App\Restaurants\Dto\RestaurantDetailElementDto;
+use App\Restaurants\Dto\RestaurantListingElementDto;
+use App\Restaurants\Dto\TagDto;
+use App\Shared\Abstraction\DtoInterface;
+use App\Shared\Abstraction\EntityInterface;
+use App\Shared\Dto\DtoCollection;
+use App\Shared\Dto\FileDto;
+use App\Shared\Repository\RestaurantsRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Ramsey\Collection\Collection as RamseyCollection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
+use Ramsey\Collection\Collection as RamseyCollection;
 
 #[ORM\Entity(repositoryClass: RestaurantsRepository::class)]
-class Restaurants implements PrototypeElementDto
+class Restaurants implements EntityInterface
 {
     #[ORM\Id]
     #[ORM\Column(type: Types::GUID)]
@@ -400,108 +401,4 @@ class Restaurants implements PrototypeElementDto
 
         return $this;
     }
-
-    /** @inheritDoc */
-    public function getDto(): DtoInterface
-    {
-        $dto = new RestaurantListingElementDto();
-
-        $dto->id = $this->getId();
-        $dto->name = $this->getName();
-        $dto->code = $this->getCode();
-        $dto->type = $this->getType()->getDto();
-        $dto->check = $this->getReceipt();
-        $dto->image = $this->getPreviewImage()?->getDto();
-        $dto->detail_link = 'api/v1/restaurants/' . $this->getId();
-
-        return $dto;
-    }
-
-    /** @inheritDoc
-     * @throws \JsonException Если получен неправильный json с бд
-     */
-    public function getExtendedDto(): DtoInterface
-    {
-        $dto = new RestaurantDetailElementDto();
-
-        $dto->id = $this->getId();
-        $dto->name = $this->getName();
-        $dto->code = $this->getCode();
-        $dto->coordinates = $this->getCoordinates();
-        $dto->type = $this->getType()->getDto();
-        $dto->check = $this->getReceipt();
-        $dto->check_info = $this->getReceiptInfo();
-
-        $dto->kitchen = new DtoCollection(
-            KitchenTypeDto::class,
-            $this->getKitchens()
-                ->map(function(Kitchens $kitchen) {
-                return $kitchen->getDto();
-                })
-                ->toArray()
-        );
-
-        $dto->phone = $this->decode($this->getPhone());
-        $dto->email = $this->decode($this->getEmail());
-        $dto->address = $this->decode($this->getAddress());
-        $dto->tags = $this->decodeTags($this->getTags());
-        $dto->site = $this->getSite();
-        $dto->image = $this->getPreviewImage()?->getDto();
-        $dto->gallery = new DtoCollection(
-            FileDto::class,
-            $this->getGallery()
-                ->map(function(File $file) {
-                    return $file->getDto();
-                })
-                ->toArray()
-        );
-
-        return $dto;
-    }
-
-    /**
-     * @throws \JsonException Если получен неправильный json с бд
-     * @return ?DtoCollection<string>
-     */
-    private function decode(?string $jsonString): ?DtoCollection
-    {
-        if ($jsonString === null) {
-            return null;
-        }
-        return new DtoCollection(
-            'string',
-            json_decode(
-                $jsonString,
-                true,
-                512,
-                JSON_THROW_ON_ERROR
-            )
-        );
-    }
-
-    private function decodeTags(?string $jsonString): ?DtoCollection
-    {
-        if ($jsonString === null) {
-            return null;
-        }
-
-        $jsonCollection = new RamseyCollection(
-            'array',
-            json_decode(
-                $jsonString,
-                true,
-                512,
-                JSON_THROW_ON_ERROR
-            )
-        );
-
-        $tagCollection = new DtoCollection(TagDto::class);
-        foreach ($jsonCollection as $name => $jsonItem) {
-            $tagCollection->add(
-                new TagDto($name, new DtoCollection('string', $jsonItem))
-            );
-        }
-
-        return $tagCollection;
-    }
 }
diff --git a/app/src/Entity/Settlements.php b/app/src/Shared/Entity/Settlements.php
similarity index 97%
rename from app/src/Entity/Settlements.php
rename to app/src/Shared/Entity/Settlements.php
index 6f6dc92..3c26eb1 100644
--- a/app/src/Entity/Settlements.php
+++ b/app/src/Shared/Entity/Settlements.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity;
+namespace App\Shared\Entity;
 
-use App\Repository\SettlementsRepository;
+use App\Shared\Repository\SettlementsRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
diff --git a/app/src/Entity/Users.php b/app/src/Shared/Entity/Users.php
similarity index 96%
rename from app/src/Entity/Users.php
rename to app/src/Shared/Entity/Users.php
index 6c8ef97..bbb1f07 100644
--- a/app/src/Entity/Users.php
+++ b/app/src/Shared/Entity/Users.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity;
+namespace App\Shared\Entity;
 
-use App\Repository\UsersRepository;
+use App\Shared\Repository\UsersRepository;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/app/src/Shared/Error/BaseError.php b/app/src/Shared/Error/BaseError.php
new file mode 100644
index 0000000..7a297f7
--- /dev/null
+++ b/app/src/Shared/Error/BaseError.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Shared\Error;
+
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class BaseError extends HttpException
+{
+    public function __construct(
+        int $statusCode = 500,
+        string $message = 'Something bad happening',
+        ErrorCode $code = ErrorCode::NotExcepted
+    ) {
+        parent::__construct(
+            statusCode: $statusCode,
+            message: $message,
+            code: $code->value
+        );
+    }
+}
diff --git a/app/src/Shared/Error/ErrorCode.php b/app/src/Shared/Error/ErrorCode.php
new file mode 100644
index 0000000..a9495f4
--- /dev/null
+++ b/app/src/Shared/Error/ErrorCode.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Shared\Error;
+
+enum ErrorCode: int
+{
+    case EntityNotFound = 10;
+    case ValidateFailed = 20;
+    case NotExcepted = 50;
+}
diff --git a/app/src/Shared/Error/NotFoundError.php b/app/src/Shared/Error/NotFoundError.php
new file mode 100644
index 0000000..1e71bda
--- /dev/null
+++ b/app/src/Shared/Error/NotFoundError.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Shared\Error;
+
+class NotFoundError extends BaseError
+{
+    public function __construct(string $message)
+    {
+        parent::__construct(
+            404,
+            $message,
+            ErrorCode::EntityNotFound);
+    }
+}
diff --git a/app/src/Entity/.gitignore b/app/src/Shared/Repository/.gitignore
similarity index 100%
rename from app/src/Entity/.gitignore
rename to app/src/Shared/Repository/.gitignore
diff --git a/app/src/Repository/FileRepository.php b/app/src/Shared/Repository/FileRepository.php
similarity index 91%
rename from app/src/Repository/FileRepository.php
rename to app/src/Shared/Repository/FileRepository.php
index 567fb59..66a474d 100644
--- a/app/src/Repository/FileRepository.php
+++ b/app/src/Shared/Repository/FileRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Shared\Repository;
 
-use App\Entity\File;
+use App\Shared\Entity\File;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/app/src/Repository/KitchensRepository.php b/app/src/Shared/Repository/KitchensRepository.php
similarity index 84%
rename from app/src/Repository/KitchensRepository.php
rename to app/src/Shared/Repository/KitchensRepository.php
index 39c355b..6631046 100644
--- a/app/src/Repository/KitchensRepository.php
+++ b/app/src/Shared/Repository/KitchensRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Shared\Repository;
 
-use App\Entity\Kitchens;
+use App\Shared\Entity\Kitchens;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Ramsey\Collection\Collection;
@@ -15,7 +15,7 @@ use Ramsey\Collection\Collection;
  * @method Kitchens[]    findAll()
  * @method Kitchens[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class KitchensRepository extends ServiceEntityRepository implements KitchensRepositoryInterface
+class KitchensRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
diff --git a/app/src/Repository/NewsCategoriesRepository.php b/app/src/Shared/Repository/NewsCategoriesRepository.php
similarity index 84%
rename from app/src/Repository/NewsCategoriesRepository.php
rename to app/src/Shared/Repository/NewsCategoriesRepository.php
index fb73900..9c34689 100644
--- a/app/src/Repository/NewsCategoriesRepository.php
+++ b/app/src/Shared/Repository/NewsCategoriesRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Shared\Repository;
 
-use App\Entity\NewsCategories;
+use App\Shared\Entity\NewsCategories;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Ramsey\Collection\Collection;
@@ -15,8 +15,7 @@ use Ramsey\Collection\Collection;
  * @method NewsCategories[]    findAll()
  * @method NewsCategories[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class NewsCategoriesRepository extends ServiceEntityRepository implements NewsCategoriesRepositoryInterface
-{
+class NewsCategoriesRepository extends ServiceEntityRepository{
     public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, NewsCategories::class);
diff --git a/app/src/Repository/NewsRepository.php b/app/src/Shared/Repository/NewsRepository.php
similarity index 73%
rename from app/src/Repository/NewsRepository.php
rename to app/src/Shared/Repository/NewsRepository.php
index 44e4ef4..4dfe229 100644
--- a/app/src/Repository/NewsRepository.php
+++ b/app/src/Shared/Repository/NewsRepository.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Shared\Repository;
 
-use App\Entity\News;
-use App\Entity\Restaurants;
+use App\Shared\Entity\News;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
@@ -18,7 +17,7 @@ use Ramsey\Collection\Collection;
  * @method News[]    findAll()
  * @method News[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class NewsRepository extends ServiceEntityRepository implements NewsRepositoryInterface
+class NewsRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
@@ -37,35 +36,26 @@ class NewsRepository extends ServiceEntityRepository implements NewsRepositoryIn
     public function getCountWithFilters(?string $categoryId): int
     {
         $query = $this->createQueryBuilder('n');
-        $query = $this->getByFilters($categoryId, $query);
+        $query = $this->findByFilters($categoryId, $query);
         return $query->select('COUNT(n.id)')->getQuery()->getSingleScalarResult();
     }
 
     /** @return Collection<News> */
-    public function findByFilters(?string $categoryId, int $limit, int $offset): Collection
+    public function getWithFilters(?string $categoryId, int $limit, int $offset): Collection
     {
         $query = $this->createQueryBuilder('n');
-        $query = $this->getByFilters($categoryId, $query);
+        $query = $this->findByFilters($categoryId, $query);
         $query = $query->setMaxResults($limit);
         $query = $query->setFirstResult($offset);
         return $this->toCollection($query);
     }
 
-    /** @return Collection<Restaurants> */
+    /** @return Collection<News> */
     public function getAll(): Collection
     {
         return $this->toCollection($this->createQueryBuilder('n'));
     }
 
-    public function getMain(): News
-    {
-        return $this->createQueryBuilder('n')
-            ->andWhere('n.mainPageRender = true')
-            ->setMaxResults(1)
-            ->getQuery()
-            ->getResult()[0];
-    }
-
     /**
      * @param QueryBuilder $query
      * @return Collection<News>
@@ -81,7 +71,7 @@ class NewsRepository extends ServiceEntityRepository implements NewsRepositoryIn
         );
     }
 
-    protected function getByFilters(?string $categoryId, QueryBuilder $query): QueryBuilder
+    protected function findByFilters(?string $categoryId, QueryBuilder $query): QueryBuilder
     {
         if ($categoryId !== null) {
             $query = $query
diff --git a/app/src/Repository/NewsTypeRepository.php b/app/src/Shared/Repository/NewsTypeRepository.php
similarity index 92%
rename from app/src/Repository/NewsTypeRepository.php
rename to app/src/Shared/Repository/NewsTypeRepository.php
index e2acd17..e3decdf 100644
--- a/app/src/Repository/NewsTypeRepository.php
+++ b/app/src/Shared/Repository/NewsTypeRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Shared\Repository;
 
-use App\Entity\NewsType;
+use App\Shared\Entity\NewsType;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Ramsey\Collection\Collection;
diff --git a/app/src/Repository/RestaurantTypesRepository.php b/app/src/Shared/Repository/RestaurantTypesRepository.php
similarity index 83%
rename from app/src/Repository/RestaurantTypesRepository.php
rename to app/src/Shared/Repository/RestaurantTypesRepository.php
index cecf853..8ba1ec2 100644
--- a/app/src/Repository/RestaurantTypesRepository.php
+++ b/app/src/Shared/Repository/RestaurantTypesRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Shared\Repository;
 
-use App\Entity\RestaurantTypes;
+use App\Shared\Entity\RestaurantTypes;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Ramsey\Collection\Collection;
@@ -15,7 +15,7 @@ use Ramsey\Collection\Collection;
  * @method RestaurantTypes[]    findAll()
  * @method RestaurantTypes[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class RestaurantTypesRepository extends ServiceEntityRepository implements RestaurantTypeRepositoryInterface
+class RestaurantTypesRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
diff --git a/app/src/Repository/RestaurantsRepository.php b/app/src/Shared/Repository/RestaurantsRepository.php
similarity index 88%
rename from app/src/Repository/RestaurantsRepository.php
rename to app/src/Shared/Repository/RestaurantsRepository.php
index 188e4db..48eef29 100644
--- a/app/src/Repository/RestaurantsRepository.php
+++ b/app/src/Shared/Repository/RestaurantsRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Shared\Repository;
 
-use App\Entity\Restaurants;
+use App\Shared\Entity\Restaurants;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
@@ -17,7 +17,7 @@ use Ramsey\Collection\Collection;
  * @method Restaurants[]    findAll()
  * @method Restaurants[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class RestaurantsRepository extends ServiceEntityRepository implements RestaurantsRepositoryInterface
+class RestaurantsRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
@@ -50,7 +50,7 @@ class RestaurantsRepository extends ServiceEntityRepository implements Restauran
     {
         if ($typeId !== null) {
             $query = $query
-                ->where('r.type.id = :typeId')
+                ->where('r.type = :typeId')
                 ->setParameter('typeId', $typeId);
         }
         return $query;
@@ -65,7 +65,7 @@ class RestaurantsRepository extends ServiceEntityRepository implements Restauran
     }
 
     /** @return Collection<Restaurants> */
-    public function findByFilters(?string $kitchenId, ?string $typeId, int $limit, int $offset): Collection
+    public function getWithFilters(?string $kitchenId, ?string $typeId, int $limit, int $offset): Collection
     {
         $query = $this->createQueryBuilder('r');
         $query = $this->filterByKitchen($kitchenId, $query);
diff --git a/app/src/Repository/SettlementsRepository.php b/app/src/Shared/Repository/SettlementsRepository.php
similarity index 90%
rename from app/src/Repository/SettlementsRepository.php
rename to app/src/Shared/Repository/SettlementsRepository.php
index 66a2f2d..e83866a 100644
--- a/app/src/Repository/SettlementsRepository.php
+++ b/app/src/Shared/Repository/SettlementsRepository.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Repository;
+namespace App\Shared\Repository;
 
-use App\Entity\Settlements;
+
+use App\Shared\Entity\Settlements;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/app/src/Repository/UsersRepository.php b/app/src/Shared/Repository/UsersRepository.php
similarity index 91%
rename from app/src/Repository/UsersRepository.php
rename to app/src/Shared/Repository/UsersRepository.php
index dfbe45b..770a961 100644
--- a/app/src/Repository/UsersRepository.php
+++ b/app/src/Shared/Repository/UsersRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Shared\Repository;
 
-use App\Entity\Users;
+use App\Shared\Entity\Users;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/app/src/Request/DetailRequest.php b/app/src/Shared/Request/DetailRequest.php
similarity index 87%
rename from app/src/Request/DetailRequest.php
rename to app/src/Shared/Request/DetailRequest.php
index ac690b8..ea4e027 100644
--- a/app/src/Request/DetailRequest.php
+++ b/app/src/Shared/Request/DetailRequest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Request;
+namespace App\Shared\Request;
 
+use App\Shared\Abstraction\AbstractRequest;
 use Symfony\Component\Validator\Constraints\Uuid;
 use Symfony\Contracts\Service\Attribute\Required;
 
diff --git a/app/src/Request/EmptyRequest.php b/app/src/Shared/Request/EmptyRequest.php
similarity index 65%
rename from app/src/Request/EmptyRequest.php
rename to app/src/Shared/Request/EmptyRequest.php
index 28809e1..2f2ab8e 100644
--- a/app/src/Request/EmptyRequest.php
+++ b/app/src/Shared/Request/EmptyRequest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace App\Request;
+namespace App\Shared\Request;
+
+use App\Shared\Abstraction\AbstractRequest;
 
 class EmptyRequest extends AbstractRequest
 {
-- 
GitLab