Настроенный запуск

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.29.8)
+cmake_minimum_required(VERSION 3.28.3)
 project(UpAndDown)
 
 set(CMAKE_CXX_STANDARD 23)
@@ -8,12 +8,14 @@ if (POLICY CMP0167)
     cmake_policy(SET CMP0167 OLD)
 endif ()
 
-set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
-set(Boost_INCLUDE_DIR ${BOOST_ROOT})
-set(Boost_LIBRARY_DIR "${BOOST_ROOT}/stage/lib")
 
-find_package(Boost 1.88.0 REQUIRED COMPONENTS filesystem json log system filesystem)
+if (WIN32)
+    set(Boost_INCLUDE_DIR ${BOOST_ROOT})
+    set(Boost_LIBRARY_DIR "${BOOST_ROOT}/stage/lib")
+endif ()
+
+find_package(Boost 1.88.0 REQUIRED COMPONENTS filesystem json log system url log_setup)
 if (Boost_FOUND)
     include_directories(${Boost_INCLUDE_DIR})
 endif ()
@@ -23,52 +25,56 @@ find_package(mysql-concpp REQUIRED)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
-add_executable(App ./src/main.cpp
-        ./src/helpers/helpers.h
-        ./src/helpers/helpers.cpp
-        ./src/endpoints_handlers/HandleRequest.h
-        ./src/endpoints_handlers/IController.h
-        ./src/endpoints_handlers/Controller.h
-        ./src/session/HttpSession.h
-        ./src/session/HttpSession.cpp
-        ./src/session/WebsocketSession.h
-        ./src/session/WebsocketSession.cpp
-        ./src/listener/Listener.h
-        ./src/listener/Listener.cpp
-        ./src/db/mysql_connector.cpp
-        ./src/db/mysql_connector.h
-        ./src/DAO/IUserDAO.h
-        src/dtos/user_dto.h
-        src/dtos/medication_dto.h
-        ./src/DAO/MySQLUserDAO.cpp
-        ./src/DAO/MySQLUserDAO.h
-        ./src/endpoints_handlers/IExecutor.h
-        ./src/endpoints_handlers/AuthRegistrationExecutor.h
-        ./src/endpoints_handlers/RootExecutor.h
-        ./src/DAO/IAuthDAO.h
-        ./src/DAO/MemoryAuthDAO.cpp
-        ./src/DAO/MemoryAuthDAO.h
-        ./src/endpoints_handlers/AuthLogoutExecutor.h
-        ./src/endpoints_handlers/AuthLoginExecutor.h
-        ./src/exceptions/session_exception.cpp
-        ./src/exceptions/session_exception.h
-        src/log/Log.h
-        src/log/Log.cpp
-        tests/fixtures/AuthFixture.h
-        src/endpoints_handlers/GetUserMedicationsExecutor.h
-        src/DAO/IMedicationsDAO.h
-        src/DAO/MySQLMedicationsDAO.h
-        src/DAO/MySQLMedicationsDAO.cpp
-        src/dtos/user_treatment_scheme_dto.h
-        src/DAO/IUserTreatmentSchemesDAO.h
-        src/DAO/MySQLUserTreatmentSchemesDAO.cpp
-        src/DAO/MySQLUserTreatmentSchemesDAO.h
-        src/endpoints_handlers/GetUserTreatmentSchemeExecutor.h
-        src/endpoints_handlers/GetDiariesExecutor.h
-        src/DAO/IDiariesDAO.h
-        src/dtos/diary_dto.h
-        src/DAO/MySQLDiariesDao.cpp
-        src/DAO/MySQLDiariesDao.h
+add_executable(App
+        ${CMAKE_SOURCE_DIR}/src/main.cpp
+        ${CMAKE_SOURCE_DIR}/src/helpers/helpers.h
+        ${CMAKE_SOURCE_DIR}/src/helpers/helpers.cpp
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/HandleRequest.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/IController.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/Controller.h
+        ${CMAKE_SOURCE_DIR}/src/session/HttpSession.h
+        ${CMAKE_SOURCE_DIR}/src/session/HttpSession.cpp
+        ${CMAKE_SOURCE_DIR}/src/session/WebsocketSession.h
+        ${CMAKE_SOURCE_DIR}/src/session/WebsocketSession.cpp
+        ${CMAKE_SOURCE_DIR}/src/listener/Listener.h
+        ${CMAKE_SOURCE_DIR}/src/listener/Listener.cpp
+        ${CMAKE_SOURCE_DIR}/src/db/mysql_connector.cpp
+        ${CMAKE_SOURCE_DIR}/src/db/mysql_connector.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/IUserDAO.h
+        ${CMAKE_SOURCE_DIR}/src/dtos/user_dto.h
+        ${CMAKE_SOURCE_DIR}/src/dtos/medication_dto.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLUserDAO.cpp
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLUserDAO.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/IExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/AuthRegistrationExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/RootExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/IAuthDAO.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MemoryAuthDAO.cpp
+        ${CMAKE_SOURCE_DIR}/src/DAO/MemoryAuthDAO.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/AuthLogoutExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/AuthLoginExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/exceptions/session_exception.cpp
+        ${CMAKE_SOURCE_DIR}/src/exceptions/session_exception.h
+        ${CMAKE_SOURCE_DIR}/src/log/Log.h
+        ${CMAKE_SOURCE_DIR}/src/log/Log.cpp
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/AuthFixture.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/GetUserMedicationsExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/IMedicationsDAO.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLMedicationsDAO.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLMedicationsDAO.cpp
+        ${CMAKE_SOURCE_DIR}/src/dtos/user_treatment_scheme_dto.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/IUserTreatmentSchemesDAO.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLUserTreatmentSchemesDAO.cpp
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLUserTreatmentSchemesDAO.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/GetUserTreatmentSchemeExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/GetDiariesExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/PostDiaryExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/PutDiaryExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/DeleteDiaryExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/IDiariesDAO.h
+        ${CMAKE_SOURCE_DIR}/src/dtos/diary_dto.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLDiariesDAO.cpp
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLDiariesDAO.h
 )
 
 target_link_libraries(App PRIVATE Boost::boost
@@ -76,6 +82,8 @@ target_link_libraries(App PRIVATE Boost::boost
         Boost::log
         Boost::system
         Boost::filesystem
+        Boost::url
+        Boost::log_setup
         Threads::Threads
         mysql::concpp)
 
@@ -83,89 +91,97 @@ if (MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
 endif ()
 
-add_executable(HelpersTests ./tests/helpers/helpers_TEST.cpp
-        ./src/helpers/helpers.h
-        ./src/helpers/helpers.cpp)
+add_executable(HelpersTests
+        ${CMAKE_SOURCE_DIR}/tests/helpers/helpers_TEST.cpp
+        ${CMAKE_SOURCE_DIR}/src/helpers/helpers.h
+        ${CMAKE_SOURCE_DIR}/src/helpers/helpers.cpp)
 target_link_libraries(HelpersTests PRIVATE Boost::boost Boost::json Boost::log)
 add_test(HelpersTests HelpersTests)
 
-add_executable(ControllerTests ./tests/endpoint_handlers/Controller_TEST.cpp
-        ./src/endpoints_handlers/IController.h
-        ./src/endpoints_handlers/Controller.h)
+add_executable(ControllerTests
+        ${CMAKE_SOURCE_DIR}/tests/endpoint_handlers/Controller_TEST.cpp
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/IController.h
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/Controller.h)
 target_link_libraries(ControllerTests PRIVATE Boost::boost)
 add_test(ControllerTests ControllerTests)
 
-add_executable(AuthRegistrationExecutorTests ./tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp
-        ./src/endpoints_handlers/AuthRegistrationExecutor.h
-        ./src/exceptions/session_exception.cpp
-        ./src/exceptions/session_exception.h
-        ./src/helpers/helpers.h
-        ./src/helpers/helpers.cpp
-        ./src/DAO/MemoryAuthDAO.h
-        ./src/DAO/MemoryAuthDAO.cpp
-        ./src/DAO/MySQLUserDAO.h
-        ./src/DAO/MySQLUserDAO.cpp
-        ./src/db/mysql_connector.h
-        ./src/db/mysql_connector.cpp
-        tests/fixtures/AuthFixture.h
-        tests/fixtures/AuthFixture.cpp
-        ./tests/fixtures/fixture_session_initialization_helper.h
-        ./tests/fixtures/fixture_session_initialization_helper.cpp)
+add_executable(AuthRegistrationExecutorTests
+        ${CMAKE_SOURCE_DIR}/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/AuthRegistrationExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/exceptions/session_exception.cpp
+        ${CMAKE_SOURCE_DIR}/src/exceptions/session_exception.h
+        ${CMAKE_SOURCE_DIR}/src/helpers/helpers.h
+        ${CMAKE_SOURCE_DIR}/src/helpers/helpers.cpp
+        ${CMAKE_SOURCE_DIR}/src/DAO/MemoryAuthDAO.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MemoryAuthDAO.cpp
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLUserDAO.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLUserDAO.cpp
+        ${CMAKE_SOURCE_DIR}/src/db/mysql_connector.h
+        ${CMAKE_SOURCE_DIR}/src/db/mysql_connector.cpp
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/AuthFixture.h
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/AuthFixture.cpp
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/fixture_session_initialization_helper.h
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/fixture_session_initialization_helper.cpp)
 target_link_libraries(AuthRegistrationExecutorTests PRIVATE Boost::boost
         Boost::json
         Boost::log
         Boost::system
         Boost::filesystem
+        Boost::log_setup
         Threads::Threads
         mysql::concpp)
 add_test(AuthRegistrationExecutorTests AuthRegistrationExecutorTests)
 
-add_executable(AuthLoginExecutorTests ./tests/endpoint_handlers/AuthLoginExecutor_TEST.cpp
-        ./src/endpoints_handlers/AuthRegistrationExecutor.h
-        ./src/exceptions/session_exception.cpp
-        ./src/exceptions/session_exception.h
-        ./src/helpers/helpers.h
-        ./src/helpers/helpers.cpp
-        ./src/DAO/MySQLUserDAO.h
-        ./src/DAO/MySQLUserDAO.cpp
-        ./src/DAO/MemoryAuthDAO.h
-        ./src/DAO/MemoryAuthDAO.cpp
-        ./src/db/mysql_connector.h
-        ./src/db/mysql_connector.cpp
-        tests/fixtures/AuthFixture.h
-        tests/fixtures/AuthFixture.cpp
-        ./tests/fixtures/fixture_session_initialization_helper.h
-        ./tests/fixtures/fixture_session_initialization_helper.cpp)
+add_executable(AuthLoginExecutorTests
+        ${CMAKE_SOURCE_DIR}/tests/endpoint_handlers/AuthLoginExecutor_TEST.cpp
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/AuthRegistrationExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/exceptions/session_exception.cpp
+        ${CMAKE_SOURCE_DIR}/src/exceptions/session_exception.h
+        ${CMAKE_SOURCE_DIR}/src/helpers/helpers.h
+        ${CMAKE_SOURCE_DIR}/src/helpers/helpers.cpp
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLUserDAO.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLUserDAO.cpp
+        ${CMAKE_SOURCE_DIR}/src/DAO/MemoryAuthDAO.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MemoryAuthDAO.cpp
+        ${CMAKE_SOURCE_DIR}/src/db/mysql_connector.h
+        ${CMAKE_SOURCE_DIR}/src/db/mysql_connector.cpp
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/AuthFixture.h
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/AuthFixture.cpp
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/fixture_session_initialization_helper.h
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/fixture_session_initialization_helper.cpp)
 target_link_libraries(AuthLoginExecutorTests PRIVATE Boost::boost
         Boost::json
         Boost::log
         Boost::system
         Boost::filesystem
+        Boost::log_setup
         Threads::Threads
         mysql::concpp)
 add_test(AuthLoginExecutorTests AuthLoginExecutorTests)
 
-add_executable(AuthLogoutExecutorTests ./tests/endpoint_handlers/AuthLogoutExecutor_TEST.cpp
-        ./src/endpoints_handlers/AuthRegistrationExecutor.h
-        ./src/exceptions/session_exception.cpp
-        ./src/exceptions/session_exception.h
-        ./src/helpers/helpers.h
-        ./src/helpers/helpers.cpp
-        ./src/DAO/MySQLUserDAO.h
-        ./src/DAO/MySQLUserDAO.cpp
-        ./src/DAO/MemoryAuthDAO.h
-        ./src/DAO/MemoryAuthDAO.cpp
-        ./src/db/mysql_connector.h
-        ./src/db/mysql_connector.cpp
-        ./tests/fixtures/AuthFixture.h
-        ./tests/fixtures/AuthFixture.cpp
-        ./tests/fixtures/fixture_session_initialization_helper.h
-        ./tests/fixtures/fixture_session_initialization_helper.cpp)
+add_executable(AuthLogoutExecutorTests
+        ${CMAKE_SOURCE_DIR}/tests/endpoint_handlers/AuthLogoutExecutor_TEST.cpp
+        ${CMAKE_SOURCE_DIR}/src/endpoints_handlers/AuthRegistrationExecutor.h
+        ${CMAKE_SOURCE_DIR}/src/exceptions/session_exception.cpp
+        ${CMAKE_SOURCE_DIR}/src/exceptions/session_exception.h
+        ${CMAKE_SOURCE_DIR}/src/helpers/helpers.h
+        ${CMAKE_SOURCE_DIR}/src/helpers/helpers.cpp
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLUserDAO.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MySQLUserDAO.cpp
+        ${CMAKE_SOURCE_DIR}/src/DAO/MemoryAuthDAO.h
+        ${CMAKE_SOURCE_DIR}/src/DAO/MemoryAuthDAO.cpp
+        ${CMAKE_SOURCE_DIR}/src/db/mysql_connector.h
+        ${CMAKE_SOURCE_DIR}/src/db/mysql_connector.cpp
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/AuthFixture.h
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/AuthFixture.cpp
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/fixture_session_initialization_helper.h
+        ${CMAKE_SOURCE_DIR}/tests/fixtures/fixture_session_initialization_helper.cpp)
 target_link_libraries(AuthLogoutExecutorTests PRIVATE Boost::boost
         Boost::json
         Boost::log
         Boost::system
         Boost::filesystem
+        Boost::log_setup
         Threads::Threads
         mysql::concpp)
 add_test(AuthLogoutExecutorTests AuthLogoutExecutorTests)

Dockerfile

@@ -0,0 +1,52 @@
+FROM ubuntu:24.04
+
+ARG CONCPP_VER=9.4.0
+ARG CONCPP_TGZ=mysql-connector-c++-${CONCPP_VER}-linux-glibc2.28-x86-64bit.tar.gz
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+      ca-certificates curl xz-utils \
+    && rm -rf /var/lib/apt/lists/*
+
+# MySQL xDevAPI install
+RUN curl -fsSL -o concpp.tgz \
+      "https://dev.mysql.com/get/Downloads/Connector-C++/${CONCPP_TGZ}" \
+    && mkdir -p /opt \
+    && tar -xzf concpp.tgz -C /opt \
+    && rm concpp.tgz \
+    && found_dir="$(ls -1 /opt | grep -E '^mysql-connector-c\+\+-'"${CONCPP_VER}"'-')" \
+    && mv "/opt/${found_dir}" /opt/mysql-concpp
+
+# CMake install
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    cmake build-essential \
+ && rm -rf /var/lib/apt/lists/*
+
+# Boost install
+RUN curl -L --retry 5 --retry-all-errors -o /tmp/boost.tar.gz "https://archives.boost.io/release/1.88.0/source/boost_1_88_0.tar.gz" \
+ && ls -lh /tmp/boost.tar.gz \
+ && tar -tzf /tmp/boost.tar.gz >/dev/null
+
+RUN mkdir -p /tmp/boost-src \
+ && tar -xzf /tmp/boost.tar.gz -C /tmp/boost-src --strip-components=1 \
+ && cd /tmp/boost-src \
+ && ./bootstrap.sh --prefix=/usr/local
+
+RUN cd /tmp/boost-src \
+ && ./b2 -j"$(nproc)" install
+
+ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+
+# Project copy
+WORKDIR /project
+# COPY . /project
+EXPOSE 8080
+
+# Build & Run project
+CMD ["bash", "-lc", "\
+  set -euo pipefail; \
+  test -f /project/CMakeLists.txt; \
+  mkdir -p /project/dist; \
+  cmake -S /project -B /project/dist --target App -Dmysql-concpp_DIR=/opt/mysql-concpp; \
+  cmake --build /project/dist -j2; \
+  exec /project/dist/App 0.0.0.0 8080 . 12 mysqlx://root:root@up_and_down_mysql:33060 \
+"]

README.md

@@ -1,10 +1,15 @@
+# Запуск(Без Docker):
+- cmake .. -DBOOST_ROOT=C:\Libs\boost_1_88_0 -Dmysql-concpp_DIR=C:\Libs\mysql_connector
+- cmake --build .
+- ./App <address> <port> <doc_root> <threads_count> <mysqlx://user:password@localhost:3306>
+
+# Запуск(С Docker):
+- $env:DOCKER_BUILDKIT=1; docker build --progress=plain -t up_and_down .
+- docker run --rm -v //c/CLionProjects/UpAndDown:/project -p 8080:8080 up_and_down
+
 # TODO:
 
 - ~~Сделать реальные исполнители(executors) для регистрации, авторизации, логаута~~
-- Посмотреть по поводу блокировок или тред пулла при использовании базы
-- Посмотреть пулл соединений(Object pool) при использовании базы данных(посмотреть api MySQL-Connector)
-- Посмотреть, что дает MySQL, какие там есть возможность
-- Посмотреть и подумать, что лучше - корутины или многопоточность?
 - ~~Покрыть тестами класс User и AuthRegistrationExecutor~~
 - ~~Добавить clang-format(через CLion)~~
 - ~~Перевести GetByUUID GetByLogin на const ref/string_view в IUserDAO - также не vector, а span(погуглить)~~ - span не применим
@@ -18,14 +23,37 @@
 - ~~Покрыть логами~~
 - ~~Сделать один класс исключений, имеющих метод HTTP code - код и сообщение записывать уже в ловушке~~
 - ~~Сделать интеграционный тест по ручкам~~
-- UseCase'ы по работе с личным кабинетом
-- Научиться поднимать базы данных под каждый тест - научиться Docker - docker-compose - а если тест что-то должен заполнить, то он заполняет в самом начале()
-- Возможно, сделать тесты на CI/CD - приоритет - низкий
 - ~~Заменить internal_server_error на bad_request и перепроверить коды ошибок~~
 - ~~Создание и удаление вспомогательных классов должно быть вынесено в фикстуру~~
 - ~~К следующему занятию сделать ручку из кейса 3 + восстановить фикстуры из тестов~~
-- Попробовать nodiscard к executoru
-- Найти слабые места в C++ -- std::forward, universal reference
+- Посмотреть по поводу блокировок или тред пулла при использовании базы
+- Посмотреть пулл соединений(Object pool) при использовании базы данных(посмотреть api MySQL-Connector)
+- Посмотреть и подумать, что лучше - корутины или многопоточность?
+- UseCase'ы по работе с личным кабинетом
+- Найти слабые места в C++ -- std::forward, universal reference, просмотреть про decltype(почитать статьи)
+- ~~Разобрать decltype и auto по статье~~
+- Подготовить резюме для тестовых собесов
+- DockerHosting.ru - купить аренду после того, как будет готов фронт и бэк
+- Сделать 2-3 теста
+- Продвинуться по фронтенду(форма авторизации и логина)
+До 27.01.2026
+- ~~Подобрать сервер по параметрам. Использовать linux.~~
+- ~~Перевести string на string_view~~
+- ~~Попробовать nodiscard к executoru~~
+- ~~Добить 2 ручки~~
+До 01.04.2026
+- Сделать Dockerfile & Docker-compose(очищать и заполнять базу после каждого тест-кейса)
+- Возможно, сделать тесты на CI/CD - приоритет
+- Научиться поднимать базы данных под каждый тест - научиться Docker - docker-compose - а если тест что-то должен заполнить, то он заполняет в самом начале
+- Проставить const на немутабельные объекты
+- Передавать аргументы через --argument=value и парсить их через Boost::program_options
+
+# План
+1)Добить бэкенд(2 ручки) (до февраля)
+2)Сделать деплой(до марта)
+3)Сделать фронтенд для MVP
+4)Делаем веб-чат и роль доктора
+5)Читать книгу Мейерса "Эффективный и современный C++" до ???
 
 # UseCase'ы приложения:
 
@@ -213,13 +241,7 @@ null
       "treatment_name": "Bipolar I Scheme Urgent",
       "instructions": "Схема для быстрого и жесткого купирования психозов. Аминазин пить каждый день.",
       "medications": [
-        {
-          "uuid": "eda5a5f7-167a-44b9-900d-c5c6acfc249b",
-          "name": "Aminazin",
-          "dose": 100,
-          "unit": "mg",
-          "is_urgent": true
-        }
+        "eda5a5f7-167a-44b9-900d-c5c6acfc249b"
       ]
     }
   ]
@@ -298,14 +320,7 @@ null
   `dream_level`: "5",
   `anxiety_level`: "9",
   `comment`: "Сильная тревога. Пришлось выпить аминазин",
-  `user_treatment_scheme`: {
-    "uuid": "248313cb-a75e-4331-8379-d3f2fc36b68d"
-    "treatment_name": "Bipolar I Scheme Urgent",
-    "instructions": "Схема для быстрого и жесткого купирования психозов. Аминазин пить каждый день.",
-    "medications": [
-      "eda5a5f7-167a-44b9-900d-c5c6acfc249b"
-    ]
-  },
+  `user_treatment_scheme`: "51351bb1-7563-479d-a8e9-201d0ff934c2"
 }
 ```
 ##### Errors

docker-compose.yml

@@ -0,0 +1,36 @@
+services:
+  up_and_down_service:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - "//c/CLionProjects/UpAndDown:/project"
+    ports:
+      - "8080:8080"
+    depends_on:
+      up_and_down_mysql:
+        condition: service_healthy
+
+  up_and_down_mysql:
+    image: mysql:8.4
+    command: >
+      --mysqlx=ON
+      --mysqlx-port=33060
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+    ports:
+      - "3307:3306"
+      - "33061:33060"
+    volumes:
+      - mysql_data:/var/lib/mysql
+      - "//c/CLionProjects/UpAndDown/db_assets/sql_scripts:/docker-entrypoint-initdb.d:ro"
+    healthcheck:
+      test: [ "CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -uroot -p\"$$MYSQL_ROOT_PASSWORD\" --silent" ]
+      interval: 5s
+      timeout: 3s
+      retries: 30
+      start_period: 20s
+    restart: unless-stopped
+
+volumes:
+  mysql_data:

script_order.txt

@@ -0,0 +1,7 @@
+init
+seed_states
+seed_medications
+seed_users
+seed_user_treatment_schemes
+seed_treatment_schemes
+seed_diaries

src/DAO/IAuthDAO.h

@@ -11,14 +11,14 @@ class IAuthDAO
 {
 public:
   virtual std::string Login(
-    const std::string& registrated_user_uuid,
-    const std::string& auth_token) = 0;
+    std::string_view registrated_user_uuid,
+    std::string_view auth_token) = 0;
 
-  virtual bool HasAuthorized(const std::string& auth_token) = 0;
+  virtual bool HasAuthorized(std::string_view auth_token) = 0;
 
-  virtual std::string_view GetLogin(const std::string& auth_token) = 0;
+  virtual std::string_view GetUUID(std::string_view auth_token) = 0;
 
-  virtual bool Logout(const std::string& user_token) = 0;
+  virtual bool Logout(std::string_view user_token) = 0;
 
   virtual ~IAuthDAO() = default;
 };

src/DAO/IDiariesDAO.h

@@ -10,7 +10,23 @@ namespace uad
 class IDiariesDAO
 {
 public:
-  virtual std::vector<diary_dto> GetDiariesByLogin(const std::string& login) = 0;
+  virtual std::vector<diary_dto> GetDiariesByUserUUID(std::string_view login) = 0;
+
+  virtual void СreateDiary(
+    std::string_view user_uuid,
+    const diary_dto& dto
+  ) const = 0;
+
+  virtual void UpdateDiary(
+    std::string_view user_uuid,
+    std::string_view diary_uuid,
+    const diary_dto& dto
+  ) const = 0;
+
+  virtual void DeleteDiary(
+    std::string_view user_uuid,
+    std::string_view diary_uuid
+  ) const = 0;
 
   virtual ~IDiariesDAO() = default;
 };

src/DAO/IUserDAO.h

@@ -13,15 +13,15 @@ class IUserDAO
 public:
   virtual std::string Create(const user_dto& created_user) = 0;
 
-  virtual std::optional<user_dto> GetByUUID(const std::string& uuid) = 0;
+  virtual std::optional<user_dto> GetByUUID(std::string_view uuid) = 0;
 
-  virtual std::optional<user_dto> GetByLogin(const std::string& login) = 0;
+  virtual std::optional<user_dto> GetByLogin(std::string_view login) = 0;
 
   virtual std::pair<bool, std::vector<user_dto>> GetAll(size_t limit, size_t offset) = 0;
 
   virtual bool Update(const user_dto& u) = 0;
 
-  virtual bool Delete(const std::string& uuid) = 0;
+  virtual bool Delete(std::string_view uuid) = 0;
 
   virtual ~IUserDAO() = default;
 };

src/DAO/IUserTreatmentSchemesDAO.h

@@ -8,7 +8,12 @@ namespace uad
 {
 class IUserTreatmentSchemeDAO {
 public:
-  virtual std::vector<user_treatment_scheme_dto> FindByUserLogin(const std::string& login) = 0;
+  virtual std::vector<user_treatment_scheme_dto> FindByUserUUID(std::string_view login) = 0;
+
+  virtual void CreateUserTreatmentScheme(
+        std::string_view user_login,
+        const user_treatment_scheme_dto& dto
+    ) = 0;
 
   virtual ~IUserTreatmentSchemeDAO() = default;
 };

src/DAO/MemoryAuthDAO.cpp

@@ -11,33 +11,33 @@ MemoryAuthDAO::MemoryAuthDAO(mysqlx::Session& session): session_(session)
 }
 
 std::string MemoryAuthDAO::Login(
-  const std::string& registrated_user_uuid,
-  const std::string& auth_token)
+  std::string_view registrated_user_uuid,
+  std::string_view auth_token)
 {
-  users_uuids_to_auth_tokens_[registrated_user_uuid] = auth_token;
-  auth_tokens_to_users_uuids_[auth_token] = registrated_user_uuid;
+  users_uuids_to_auth_tokens_[registrated_user_uuid.data()] = auth_token;
+  auth_tokens_to_users_uuids_[auth_token.data()] = registrated_user_uuid;
 
-  return auth_token;
+  return auth_token.data();
 }
 
-bool MemoryAuthDAO::HasAuthorized(const std::string& auth_token)
+bool MemoryAuthDAO::HasAuthorized(std::string_view auth_token)
 {
-  return auth_tokens_to_users_uuids_.count(auth_token) > 0;
+  return auth_tokens_to_users_uuids_.count(auth_token.data()) > 0;
 }
 
-std::string_view MemoryAuthDAO::GetLogin(const std::string& auth_token)
+std::string_view MemoryAuthDAO::GetUUID(std::string_view auth_token)
 {
-  return auth_tokens_to_users_uuids_.at(auth_token);
+  return auth_tokens_to_users_uuids_.at(auth_token.data());
 }
 
-bool MemoryAuthDAO::Logout(const std::string& auth_token)
+bool MemoryAuthDAO::Logout(std::string_view auth_token)
 {
   if (!HasAuthorized(auth_token)) return false;
 
-  string user_uuid = auth_tokens_to_users_uuids_[auth_token];
+  string user_uuid = auth_tokens_to_users_uuids_[auth_token.data()];
 
   users_uuids_to_auth_tokens_.erase(user_uuid);
-  auth_tokens_to_users_uuids_.erase(auth_token);
+  auth_tokens_to_users_uuids_.erase(auth_token.data());
 
   return true;
 }

src/DAO/MemoryAuthDAO.h

@@ -20,13 +20,13 @@ public:
   explicit MemoryAuthDAO(mysqlx::Session& session);
 
   std::string Login(
-    const std::string& registrated_user_uuid,
-    const std::string& auth_token) override;
+    std::string_view registrated_user_uuid,
+    std::string_view auth_token) override;
 
-  bool HasAuthorized(const std::string& auth_token) override;
+  bool HasAuthorized(std::string_view auth_token) override;
 
-  std::string_view GetLogin(const std::string& auth_token) override;
+  std::string_view GetUUID(std::string_view auth_token) override;
 
-  bool Logout(const std::string& auth_token) override;
+  bool Logout(std::string_view auth_token) override;
 };
 }

src/DAO/MySQLDiariesDAO.cpp

@@ -1,36 +1,36 @@
 #include "MySQLDiariesDAO.h"
 
+#include "../exceptions/session_exception.h"
+
 namespace uad
 {
 MySqlDiariesDAO::MySqlDiariesDAO(mysqlx::Session& session) : session_(session)
 {
 }
 
-std::vector<diary_dto> MySqlDiariesDAO::GetDiariesByLogin(const std::string& login)
+std::vector<diary_dto> MySqlDiariesDAO::GetDiariesByUserUUID(std::string_view user_uuid)
 {
   static const std::string query = R"(
-            SELECT
-                d.uuid,
-                UNIX_TIMESTAMP(d.time) * 1000 AS time_ms,
-                d.mania_level,
-                d.depression_level,
-                d.mood_level,
-                d.activity_level,
-                d.appetite_level,
-                d.dream_level,
-                d.anxiety_level,
-                d.comment,
-                d.user_treatment_schemes_uuid
-            FROM up_and_down.users u
-            JOIN up_and_down.diaries d
-                ON d.user_uuid = u.uuid
-            WHERE u.login = ?
-            ORDER BY d.time ASC
+          SELECT
+            d.uuid,
+            UNIX_TIMESTAMP(d.time) * 1000,
+            d.mania_level,
+            d.depression_level,
+            d.mood_level,
+            d.activity_level,
+            d.appetite_level,
+            d.dream_level,
+            d.anxiety_level,
+            d.comment,
+            d.user_treatment_schemes_uuid
+        FROM up_and_down.diaries d
+        WHERE d.user_uuid = ?
+        ORDER BY d.time;
         )";
 
   mysqlx::SqlResult result = session_
                              .sql(query)
-                             .bind(login)
+                             .bind(user_uuid.data())
                              .execute();
 
   std::vector<diary_dto> diaries;
@@ -50,15 +50,121 @@ std::vector<diary_dto> MySqlDiariesDAO::GetDiariesByLogin(const std::string& log
     dto.dream_level = row[7].get<int>();
     dto.anxiety_level = row[8].get<int>();
 
-    dto.comment =
-      row[9].isNull() ? "" : row[9].get<std::string>();
+    dto.comment = row[9].get<std::string>();
 
-    dto.user_treatment_scheme_uuid =
-      row[10].isNull() ? "" : row[10].get<std::string>();
+    dto.user_treatment_scheme_uuid = row[10].get<std::string>();
 
     diaries.push_back(std::move(dto));
   }
 
   return diaries;
 }
+
+void MySqlDiariesDAO::СreateDiary(std::string_view user_uuid, const diary_dto& dto) const
+{
+  auto stmt = session_.sql(R"(
+        INSERT INTO `up_and_down`.`diaries` (
+            uuid,
+            user_uuid,
+            time,
+            mania_level,
+            depression_level,
+            mood_level,
+            activity_level,
+            appetite_level,
+            dream_level,
+            anxiety_level,
+            comment,
+            user_treatment_schemes_uuid
+        ) VALUES (
+            ?,
+            ?,
+            FROM_UNIXTIME(? / 1000),
+            ?,
+            ?,
+            ?,
+            ?,
+            ?,
+            ?,
+            ?,
+            ?,
+            ?
+        )
+    )");
+
+  stmt.bind(
+      dto.uuid,
+      user_uuid.data(),
+      dto.time_ms,
+      dto.mania_level,
+      dto.depression_level,
+      dto.mood_level,
+      dto.activity_level,
+      dto.appetite_level,
+      dto.dream_level,
+      dto.anxiety_level,
+      dto.comment,
+      dto.user_treatment_scheme_uuid
+  );
+
+  stmt.execute();
+}
+
+void MySqlDiariesDAO::UpdateDiary(
+  std::string_view user_uuid,
+  std::string_view diary_uuid,
+  const diary_dto& dto) const
+{
+  auto stmt = session_.sql(R"(
+        UPDATE `up_and_down`.`diaries`
+        SET
+            mania_level = ?,
+            depression_level = ?,
+            mood_level = ?,
+            activity_level = ?,
+            appetite_level = ?,
+            dream_level = ?,
+            anxiety_level = ?,
+            comment = ?,
+            user_treatment_schemes_uuid = ?
+        WHERE uuid = ?
+    )");
+
+  stmt.bind(
+      dto.mania_level,
+      dto.depression_level,
+      dto.mood_level,
+      dto.activity_level,
+      dto.appetite_level,
+      dto.dream_level,
+      dto.anxiety_level,
+      dto.comment,
+      dto.user_treatment_scheme_uuid,
+      diary_uuid.data()
+  );
+
+  const auto res = stmt.execute();
+
+  if (res.getAffectedItemsCount() == 0) {
+    throw session_exception(boost::beast::http::status::not_found, "Diary not found");
+  }
+}
+
+void MySqlDiariesDAO::DeleteDiary(
+  std::string_view user_uuid,
+  std::string_view diary_uuid) const
+{
+  auto stmt = session_.sql(R"(
+        DELETE FROM `up_and_down`.`diaries`
+        WHERE uuid = ? AND user_uuid = ?
+    )");
+
+  stmt.bind(diary_uuid.data(), user_uuid.data());
+
+  auto res = stmt.execute();
+
+  if (res.getAffectedItemsCount() == 0) {
+    throw session_exception(boost::beast::http::status::not_found, "Diary not found");
+  }
+}
 }

src/DAO/MySQLDiariesDAO.h

@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 
-#include "./../DAO/IDiariesDao.h"
+#include "./../DAO/IDiariesDAO.h"
 #include "./../db/mysql_connector.h"
 
 namespace uad
@@ -11,10 +11,26 @@ namespace uad
 class MySqlDiariesDAO final : public IDiariesDAO
 {
   mysqlx::Session& session_;
+
 public:
   explicit MySqlDiariesDAO(mysqlx::Session& session);
 
-  std::vector<diary_dto> GetDiariesByLogin(const std::string& login) override;
+  std::vector<diary_dto> GetDiariesByUserUUID(std::string_view user_uuid) override;
 
+  void СreateDiary(
+    std::string_view user_uuid,
+    const diary_dto& dto
+  ) const override;
+
+  void UpdateDiary(
+    std::string_view user_uuid,
+    std::string_view diary_uuid,
+    const diary_dto& dto
+  ) const override;
+
+  void DeleteDiary(
+    std::string_view user_uuid,
+    std::string_view diary_uuid
+  ) const override;
 };
-}
+}

src/DAO/MySQLUserDAO.cpp

@@ -31,23 +31,23 @@ string MySQLUserDAO::Create(const user_dto& created_user)
   return uuid_str;
 }
 
-optional<user_dto> MySQLUserDAO::GetByUUID(const string& uuid)
+optional<user_dto> MySQLUserDAO::GetByUUID(std::string_view uuid)
 {
   static const string sql_script = "SELECT * FROM `up_and_down`.`users` WHERE (uuid = ?) LIMIT 1;"s;
   mysqlx::SqlResult sql_result = session_.
                                  sql(sql_script)
-                                 .bind(uuid)
+                                 .bind(uuid.data())
                                  .execute();
 
   return GetSingleUserBySQLResult(std::move(sql_result));
 }
 
-optional<user_dto> MySQLUserDAO::GetByLogin(const string& login)
+optional<user_dto> MySQLUserDAO::GetByLogin(std::string_view login)
 {
   static const std::string sql_script = "SELECT * FROM `up_and_down`.`users` WHERE (login = ?) LIMIT 1;"s;
-  mysqlx::SqlResult sql_result = session_.
-                                 sql(sql_script)
-                                 .bind(login)
+  mysqlx::SqlResult sql_result = session_
+                                 .sql(sql_script)
+                                 .bind(login.data())
                                  .execute();
 
   return GetSingleUserBySQLResult(std::move(sql_result));
@@ -107,12 +107,12 @@ bool MySQLUserDAO::Update(const user_dto& u)
   return !!schema.getAffectedItemsCount();
 }
 
-bool MySQLUserDAO::Delete(const string& uuid)
+bool MySQLUserDAO::Delete(std::string_view uuid)
 {
   static const string sql_script = "DELETE FROM `up_and_down`.`users` WHERE `uuid` = ?;";
 
   auto schema = session_.sql(sql_script)
-                        .bind(uuid)
+                        .bind(uuid.data())
                         .execute();
 
   return !!schema.getAffectedItemsCount();

src/DAO/MySQLUserDAO.h

@@ -13,15 +13,15 @@ public:
 
   std::string Create(const user_dto& created_user) override;
 
-  std::optional<user_dto> GetByUUID(const std::string& uuid) override;
+  std::optional<user_dto> GetByUUID(std::string_view uuid) override;
 
-  std::optional<user_dto> GetByLogin(const std::string& login) override;
+  std::optional<user_dto> GetByLogin(std::string_view login) override;
 
   std::pair<bool, std::vector<user_dto>> GetAll(size_t limit, size_t offset) override;
 
   bool Update(const user_dto& u) override;
 
-  bool Delete(const std::string& uuid) override;
+  bool Delete(std::string_view uuid) override;
 
 private:
   std::optional<user_dto> GetSingleUserBySQLResult(mysqlx::SqlResult&& sql_result);

src/DAO/MySQLUserTreatmentSchemesDAO.cpp

@@ -10,8 +10,8 @@ MySQLUserTreatmentSchemesDAO::MySQLUserTreatmentSchemesDAO(mysqlx::Session& sess
 {
 }
 
-std::vector<user_treatment_scheme_dto> MySQLUserTreatmentSchemesDAO::FindByUserLogin(
-  const std::string& login)
+std::vector<user_treatment_scheme_dto> MySQLUserTreatmentSchemesDAO::FindByUserUUID(
+  std::string_view user_uuid)
 {
   static const std::string query = R"(
             SELECT
@@ -24,11 +24,14 @@ std::vector<user_treatment_scheme_dto> MySQLUserTreatmentSchemesDAO::FindByUserL
                 ON uts.user_uuid = u.uuid
             LEFT JOIN up_and_down.treatment_schemes ts
                 ON ts.user_treatment_schemes_uuid = uts.uuid
-            WHERE u.login = ?
+            WHERE u.uuid = ?
             ORDER BY uts.uuid
         )";
 
-  mysqlx::SqlResult result = session_.sql(query).bind(login).execute();
+  mysqlx::SqlResult result = session_
+                             .sql(query)
+                             .bind(user_uuid.data())
+                             .execute();
 
   std::unordered_map<std::string, user_treatment_scheme_dto> scheme_map;
 
@@ -62,6 +65,48 @@ std::vector<user_treatment_scheme_dto> MySQLUserTreatmentSchemesDAO::FindByUserL
     schemes.push_back(std::move(dto));
   }
 
-  return schemes;
+  return std::move(schemes);
+}
+
+void MySQLUserTreatmentSchemesDAO::CreateUserTreatmentScheme(
+  std::string_view user_uuid,
+  const user_treatment_scheme_dto& dto)
+{
+  session_.startTransaction();
+
+  try {
+    session_.sql(R"(
+                INSERT INTO up_and_down.user_treatment_schemes (
+                    uuid,
+                    user_uuid,
+                    treatment_name,
+                    instructions
+                ) VALUES (?, ?, ?, ?)
+            )")
+    .bind(
+        dto.uuid,
+        user_uuid.data(),
+        dto.treatment_name,
+        dto.instructions
+    )
+    .execute();
+
+    for (const auto& medication_uuid : dto.medication_uuids) {
+      session_.sql(R"(
+                    INSERT INTO up_and_down.treatment_schemes (
+                        user_treatment_schemes_uuid,
+                        medication_uuid
+                    ) VALUES (?, ?)
+                )")
+      .bind(dto.uuid, medication_uuid)
+      .execute();
+    }
+
+    session_.commit();
+  }
+  catch (...) {
+    session_.rollback();
+    throw;
+  }
 }
 } // uad

src/DAO/MySQLUserTreatmentSchemesDAO.h

@@ -11,6 +11,11 @@ class MySQLUserTreatmentSchemesDAO : public IUserTreatmentSchemeDAO
 public:
   explicit MySQLUserTreatmentSchemesDAO(mysqlx::Session& session);
 
-  std::vector<user_treatment_scheme_dto> FindByUserLogin(const std::string& login) override;
+  std::vector<user_treatment_scheme_dto> FindByUserUUID(std::string_view uuid) override;
+
+  void CreateUserTreatmentScheme(
+        std::string_view user_login,
+        const user_treatment_scheme_dto& dto
+    ) override;
 };
 } // uad

src/endpoints_handlers/AuthLoginExecutor.h

@@ -30,7 +30,7 @@ public:
   {
   }
 
-  boost::beast::http::response<ResponseType> operator ()(
+  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
   ) override
   {

src/endpoints_handlers/AuthLogoutExecutor.h

@@ -23,7 +23,7 @@ public:
   {
   }
 
-  boost::beast::http::response<ResponseType> operator ()(
+  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
     ) override
   {

src/endpoints_handlers/AuthRegistrationExecutor.h

@@ -24,7 +24,7 @@ public:
   {
   }
 
-  boost::beast::http::response<ResponseType> operator ()(
+  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
   ) override
   {
@@ -97,16 +97,16 @@ public:
   }
 
 private:
-  bool ValidateLogin(const std::string& login)
+  bool ValidateLogin(std::string_view login)
   {
     if (login.size() < 3 || login.size() > 50) return false;
 
     std::regex pattern(std::string("^[A-Za-z0-9_]+$"));
 
-    return std::regex_match(login, pattern);
+    return std::regex_match(login.data(), pattern);
   }
 
-  bool ValidatePassword(const std::string& password)
+  bool ValidatePassword(std::string_view password)
   {
     return password.size() >= 5;
   }

src/endpoints_handlers/DeleteDiaryExecutor.h

@@ -0,0 +1,79 @@
+#pragma once
+#include <boost/log/trivial.hpp>
+
+#include <regex>
+#include <boost/json.hpp>
+#include <boost/mpl/vector/vector0.hpp>
+#include <mysqlx/xdevapi.h>
+
+#include "IExecutor.h"
+#include "../DAO/IAuthDAO.h"
+#include "../DAO/IDiariesDAO.h"
+#include "../exceptions/session_exception.h"
+
+namespace uad
+{
+template <class Body, class Allocator, class ResponseType>
+class DeleteDiaryExecutor
+{
+  mysqlx::Session& session_;
+  const std::shared_ptr<IAuthDAO>& auth_dao_;
+  const std::shared_ptr<IDiariesDAO>& diaries_dao_;
+
+public:
+  DeleteDiaryExecutor(
+    mysqlx::Session& session,
+    const std::shared_ptr<IAuthDAO>& auth_dao,
+    const std::shared_ptr<IDiariesDAO>& diaries_dao
+  ) : session_(session), auth_dao_(auth_dao), diaries_dao_(diaries_dao)
+  {
+  }
+
+  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
+    boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req,
+    std::string diary_uuid
+  )
+  {
+    using namespace boost;
+    using namespace boost::json;
+    using namespace boost::beast;
+    using namespace std::string_literals;
+    using namespace std::string_view_literals;
+
+    constexpr std::string_view auth_prefix = "Bearer "sv;
+    static const std::string invalid_token_message =
+      "DELETE /api/v1/Diary - Response 401: Unauthorized"s;
+
+    BOOST_LOG_TRIVIAL(info) << "DELETE /api/v1/Diary - Request";
+
+    if (req[http::field::authorization].size() <= auth_prefix.size())
+    {
+      BOOST_LOG_TRIVIAL(error) << invalid_token_message;
+      throw session_exception(http::status::unauthorized, "Unauthorized");
+    }
+
+    const std::string auth_token = {
+        req[http::field::authorization].begin() + auth_prefix.size(),
+        req[http::field::authorization].end()
+      };
+
+    if (!auth_dao_->HasAuthorized(auth_token))
+    {
+      BOOST_LOG_TRIVIAL(error) << invalid_token_message;
+      throw session_exception(http::status::unauthorized, "Unauthorized");
+    }
+
+    std::string_view user_uuid_ref = auth_dao_->GetUUID(auth_token);
+    const std::string user_uuid{user_uuid_ref.begin(), user_uuid_ref.end()};
+
+    diaries_dao_->DeleteDiary(user_uuid, diary_uuid);
+
+    http::response<ResponseType> res{http::status::no_content, req.version()};
+    res.keep_alive(req.keep_alive());
+
+    BOOST_LOG_TRIVIAL(info) << "DELETE /api/v1/Diary - Response 204: Diary deleted";
+
+    return res;
+  }
+};
+}

src/endpoints_handlers/GetDiariesExecutor.h

@@ -30,7 +30,7 @@ public:
   {
   }
 
-  boost::beast::http::response<ResponseType> operator ()(
+  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
   ) override
   {
@@ -63,12 +63,61 @@ public:
       throw session_exception(http::status::unauthorized, "Unauthorized");
     }
 
-    std::string_view user_login_ref = auth_dao_->GetLogin(auth_token);
-    const std::string user_login{user_login_ref.begin(), user_login_ref.end()};
+    std::string_view user_uuid_ref = auth_dao_->GetUUID(auth_token);
+    const std::string user_uuid{user_uuid_ref.begin(), user_uuid_ref.end()};
+
+    std::vector<diary_dto> diaries = diaries_dao_->GetDiariesByUserUUID(user_uuid);
 
     http::response<ResponseType> res{http::status::ok, req.version()};
+    value response_body;
+
+    response_body.emplace_object();
+    response_body.as_object().emplace("diaries", toJSONArray(diaries));
+
+    res.body() = serialize(response_body);
+    res.set(http::field::content_type, "application/json");
+    res.content_length(res.body().size());
 
     return res;
   }
+
+private:
+  boost::json::object ToJSON(const diary_dto& diary)
+  {
+    boost::json::object diary_json;
+
+    diary_json["uuid"] = diary.uuid;
+    diary_json["time"] = diary.time_ms;
+    diary_json["mania_level"] = diary.mania_level;
+    diary_json["depression_level"] = diary.depression_level;
+    diary_json["mood_level"] = diary.mood_level;
+    diary_json["activity_level"] = diary.activity_level;
+    diary_json["appetite_level"] = diary.appetite_level;
+    diary_json["dream_level"] = diary.dream_level;
+    diary_json["anxiety_level"] = diary.anxiety_level;
+    diary_json["comment"] = diary.comment;
+    diary_json["user_treatment_scheme_uuid"] =
+        diary.user_treatment_scheme_uuid;
+
+    return diary_json;
+  }
+
+  boost::json::array toJSONArray(const std::vector<diary_dto>& schemes)
+  {
+    using namespace boost;
+    using namespace boost::json;
+    using namespace boost::beast;
+    using namespace std::string_literals;
+    using namespace std::string_view_literals;
+
+    json::array arr;
+
+    for (const auto& m : schemes)
+    {
+      arr.emplace_back(ToJSON(m));
+    }
+
+    return std::move(arr);
+  }
 };
 }

src/endpoints_handlers/GetUserMedicationsExecutor.h

@@ -29,7 +29,7 @@ public:
 
   }
 
-  boost::beast::http::response<ResponseType> operator ()(
+  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
   ) override
   {

src/endpoints_handlers/GetUserTreatmentSchemeExecutor.h

@@ -29,7 +29,7 @@ public:
   {
   }
 
-  boost::beast::http::response<ResponseType> operator ()(
+  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
   ) override
   {
@@ -41,9 +41,9 @@ public:
 
     constexpr std::string_view auth_prefix = "Bearer "sv;
     static const std::string invalid_token_message =
-      "GET /api/v1/User/Medications - Response 401: Unauthorized"s;
+      "GET /api/v1/UserTreatmentSchemes - Response 401: Unauthorized"s;
 
-    BOOST_LOG_TRIVIAL(info) << "GET /api/v1/User/Medications - Request";
+    BOOST_LOG_TRIVIAL(info) << "GET /api/v1/UserTreatmentSchemes - Request";
 
     if (req[http::field::authorization].size() <= auth_prefix.size())
     {
@@ -62,66 +62,16 @@ public:
       throw session_exception(http::status::unauthorized, "Unauthorized");
     }
 
-    std::string_view user_login_ref = auth_dao_->GetLogin(auth_token);
-    const std::string user_uuid{user_login_ref.begin(), user_login_ref.end()};
+    std::string_view user_uuid_ref = auth_dao_->GetUUID(auth_token);
+    const std::string user_uuid{user_uuid_ref.begin(), user_uuid_ref.end()};
 
-    static const std::string query = R"(
-            SELECT
-                uts.uuid,
-                uts.treatment_name,
-                uts.instructions,
-                ts.medication_uuid
-            FROM up_and_down.users u
-            JOIN up_and_down.user_treatment_schemes uts
-                ON uts.user_uuid = u.uuid
-            LEFT JOIN up_and_down.treatment_schemes ts
-                ON ts.user_treatment_schemes_uuid = uts.uuid
-            WHERE u.uuid = ?
-            ORDER BY uts.uuid
-        )";
-
-    mysqlx::SqlResult result = session_
-                               .sql(query)
-                               .bind(user_uuid)
-                               .execute();
-
-    std::unordered_map<std::string, user_treatment_scheme_dto> scheme_map;
-
-    for (const mysqlx::Row& row : result)
-    {
-      const std::string scheme_uuid = row[0].get<std::string>();
-
-      if (scheme_map.find(scheme_uuid) == scheme_map.end())
-      {
-        user_treatment_scheme_dto dto;
-        dto.uuid = scheme_uuid;
-        dto.treatment_name = row[1].isNull() ? "" : row[1].get<std::string>();
-        dto.instructions = row[2].isNull() ? "" : row[2].get<std::string>();
-
-        scheme_map.emplace(scheme_uuid, std::move(dto));
-      }
-
-      if (!row[3].isNull())
-      {
-        scheme_map[scheme_uuid]
-          .medication_uuids
-          .push_back(row[3].get<std::string>());
-      }
-    }
-
-    std::vector<user_treatment_scheme_dto> schemes;
-    schemes.reserve(scheme_map.size());
-
-    for (auto& [_, dto] : scheme_map)
-    {
-      schemes.push_back(std::move(dto));
-    }
+    std::vector<user_treatment_scheme_dto> schemes = user_treatment_scheme_dao_->FindByUserUUID(user_uuid);
 
     http::response<ResponseType> res{http::status::ok, req.version()};
     value response_body;
 
     response_body.emplace_object();
-    response_body.as_object().emplace("user_treatment_schemes", toJSONArray(schemes));
+    response_body.as_object().emplace("user_treatment_schemes", ToJSONArray(schemes));
 
     res.body() = serialize(response_body);
     res.set(http::field::content_type, "application/json");
@@ -149,7 +99,7 @@ private:
     return scheme_json;
   }
 
-  boost::json::array toJSONArray(const std::vector<user_treatment_scheme_dto>& schemes)
+  boost::json::array ToJSONArray(const std::vector<user_treatment_scheme_dto>& schemes)
   {
     using namespace boost;
     using namespace boost::json;

src/endpoints_handlers/IExecutor.h

@@ -8,7 +8,7 @@ template <class Body, class Allocator, class ResponseType>
 class IExecutor
 {
 public:
-  virtual boost::beast::http::response<ResponseType> operator ()(
+  [[nodiscard]] virtual boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
   ) = 0;
   virtual ~IExecutor() = default;

src/endpoints_handlers/PostDiaryExecutor.h

@@ -0,0 +1,140 @@
+#pragma once
+#include <boost/log/trivial.hpp>
+
+#include <regex>
+#include <boost/json.hpp>
+#include <boost/mpl/vector/vector0.hpp>
+#include <mysqlx/xdevapi.h>
+
+#include "IExecutor.h"
+#include "../DAO/IAuthDAO.h"
+#include "../DAO/IDiariesDAO.h"
+#include "../DAO/IUserTreatmentSchemesDAO.h"
+#include "../exceptions/session_exception.h"
+
+namespace uad
+{
+template <class Body, class Allocator, class ResponseType>
+class PostDiaryExecutor : public IExecutor<Body, Allocator, ResponseType>
+{
+  mysqlx::Session& session_;
+  const std::shared_ptr<IAuthDAO>& auth_dao_;
+  const std::shared_ptr<IDiariesDAO>& diaries_dao_;
+
+public:
+  PostDiaryExecutor(
+    mysqlx::Session& session,
+    const std::shared_ptr<IAuthDAO>& auth_dao,
+    const std::shared_ptr<IDiariesDAO>& diaries_dao
+  ) : session_(session), auth_dao_(auth_dao), diaries_dao_(diaries_dao)
+  {
+  }
+
+  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
+    boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
+  ) override
+  {
+    using namespace boost;
+    using namespace boost::json;
+    using namespace boost::beast;
+    using namespace std::string_literals;
+    using namespace std::string_view_literals;
+
+    constexpr std::string_view auth_prefix = "Bearer "sv;
+    static const std::string invalid_token_message =
+      "POST /api/v1/Diary - Response 401: Unauthorized"s;
+
+    BOOST_LOG_TRIVIAL(info) << "POST /api/v1/Diary - Request";
+
+    if (req[http::field::authorization].size() <= auth_prefix.size())
+    {
+      BOOST_LOG_TRIVIAL(error) << invalid_token_message;
+      throw session_exception(http::status::unauthorized, "Unauthorized");
+    }
+
+    const std::string auth_token = {
+        req[http::field::authorization].begin() + auth_prefix.size(),
+        req[http::field::authorization].end()
+      };
+
+    if (!auth_dao_->HasAuthorized(auth_token))
+    {
+      BOOST_LOG_TRIVIAL(error) << invalid_token_message;
+      throw session_exception(http::status::unauthorized, "Unauthorized");
+    }
+
+    std::string_view user_uuid_ref = auth_dao_->GetUUID(auth_token);
+    const std::string user_uuid{user_uuid_ref.begin(), user_uuid_ref.end()};
+
+    value val = json::parse(req.body());
+    object& obj = val.as_object();
+
+    diary_dto dto;
+
+    dto.uuid = GenerateUUID();
+    dto.time_ms = obj["time_ms"].as_int64();
+    dto.mania_level = obj["mania_level"].as_int64();
+    dto.depression_level = obj["depression_level"].as_int64();
+    dto.mood_level = obj["mood_level"].as_int64();
+    dto.activity_level = obj["activity_level"].as_int64();
+    dto.appetite_level = obj["appetite_level"].as_int64();
+    dto.dream_level = obj["dream_level"].as_int64();
+    dto.anxiety_level = obj["anxiety_level"].as_int64();
+    dto.comment = obj["comment"].as_string().c_str();
+    dto.user_treatment_scheme_uuid =
+      obj["user_treatment_scheme_uuid"].as_string().c_str();
+
+    try
+    {
+      session_.startTransaction();
+      diaries_dao_->СreateDiary(user_uuid, dto);
+      session_.commit();
+    }
+    catch (const mysqlx::Error& e)
+    {
+      session_.rollback();
+      BOOST_LOG_TRIVIAL(error) << "MySQL Error: " << e.what();
+      throw session_exception(http::status::internal_server_error, "Internal Server Error");
+    }
+    catch (const std::exception& e)
+    {
+      session_.rollback();
+      BOOST_LOG_TRIVIAL(error) << "Unexpected Error: " << e.what();
+      throw session_exception(http::status::internal_server_error, "Internal Server Error");
+    }
+
+    http::response<ResponseType> res{http::status::ok, req.version()};
+    value response_body;
+
+    response_body.emplace_object();
+    response_body.as_object().emplace("diary", ToJSON(dto));
+
+    res.body() = serialize(response_body);
+    res.set(http::field::content_type, "application/json");
+    res.content_length(res.body().size());
+
+    return res;
+  }
+
+private:
+  boost::json::object ToJSON(const diary_dto& diary)
+  {
+    boost::json::object diary_json;
+
+    diary_json["uuid"] = diary.uuid;
+    diary_json["time"] = diary.time_ms;
+    diary_json["mania_level"] = diary.mania_level;
+    diary_json["depression_level"] = diary.depression_level;
+    diary_json["mood_level"] = diary.mood_level;
+    diary_json["activity_level"] = diary.activity_level;
+    diary_json["appetite_level"] = diary.appetite_level;
+    diary_json["dream_level"] = diary.dream_level;
+    diary_json["anxiety_level"] = diary.anxiety_level;
+    diary_json["comment"] = diary.comment;
+    diary_json["user_treatment_scheme_uuid"] =
+      diary.user_treatment_scheme_uuid;
+
+    return diary_json;
+  }
+};
+}

src/endpoints_handlers/PostUserMedicationsExecutor.h

@@ -29,7 +29,7 @@ public:
 
   }
 
-  boost::beast::http::response<ResponseType> operator ()(
+  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
   ) override
   {
@@ -68,7 +68,7 @@ public:
     }
     catch (const system::system_error& err)
     {
-      BOOST_LOG_TRIVIAL(info) << "POST /api/v1/User/Medications - Response 400: Cannot deserialize json";
+      BOOST_LOG_TRIVIAL(error) << "POST /api/v1/User/Medications - Response 400: Cannot deserialize json";
       throw session_exception(http::status::bad_request, "Cannot deserialize json");
     }
 

src/endpoints_handlers/PostUserTreatmentSchemeExecutor.h

@@ -0,0 +1,144 @@
+#pragma once
+#include <boost/log/trivial.hpp>
+
+#include <regex>
+#include <boost/json.hpp>
+#include <boost/mpl/vector/vector0.hpp>
+#include <mysqlx/xdevapi.h>
+
+#include "IExecutor.h"
+#include "../DAO/IAuthDAO.h"
+#include "../DAO/IUserTreatmentSchemesDAO.h"
+#include "../exceptions/session_exception.h"
+
+namespace uad
+{
+template <class Body, class Allocator, class ResponseType>
+class PostUserTreatmentSchemeExecutor : public IExecutor<Body, Allocator, ResponseType>
+{
+  mysqlx::Session& session_;
+  const std::shared_ptr<IAuthDAO>& auth_dao_;
+  const std::shared_ptr<IUserTreatmentSchemeDAO>& user_treatment_scheme_dao_;
+
+public:
+  PostUserTreatmentSchemeExecutor(
+    mysqlx::Session& session,
+    const std::shared_ptr<IAuthDAO>& auth_dao,
+    const std::shared_ptr<IUserTreatmentSchemeDAO>& user_treatment_scheme_dao
+  ) : session_(session), auth_dao_(auth_dao), user_treatment_scheme_dao_(user_treatment_scheme_dao)
+  {
+  }
+
+  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
+    boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
+  ) override
+  {
+    using namespace boost;
+    using namespace boost::json;
+    using namespace boost::beast;
+    using namespace std::string_literals;
+    using namespace std::string_view_literals;
+
+    constexpr std::string_view auth_prefix = "Bearer "sv;
+    static const std::string invalid_token_message =
+      "POST /api/v1/UserTreatmentSchemes - Response 401: Unauthorized"s;
+
+    BOOST_LOG_TRIVIAL(info) << "POST /api/v1/UserTreatmentSchemes - Request";
+
+    if (req[http::field::authorization].size() <= auth_prefix.size())
+    {
+      BOOST_LOG_TRIVIAL(error) << invalid_token_message;
+      throw session_exception(http::status::unauthorized, "Unauthorized");
+    }
+
+    const std::string auth_token = {
+        req[http::field::authorization].begin() + auth_prefix.size(),
+        req[http::field::authorization].end()
+      };
+
+    if (!auth_dao_->HasAuthorized(auth_token))
+    {
+      BOOST_LOG_TRIVIAL(error) << invalid_token_message;
+      throw session_exception(http::status::unauthorized, "Unauthorized");
+    }
+
+    std::string_view user_uuid_ref = auth_dao_->GetUUID(auth_token);
+    const std::string user_uuid{user_uuid_ref.begin(), user_uuid_ref.end()};
+    const auto body = req.body();
+    value req_json;
+
+    try
+    {
+      req_json = json::parse(body);
+    }
+    catch (const system::system_error& err)
+    {
+      BOOST_LOG_TRIVIAL(error) <<
+      "POST /api/v1/UserTreatmentSchemes - Response 400: Cannot deserialize json";
+      throw session_exception(http::status::bad_request, "Cannot deserialize json");
+    }
+
+    user_treatment_scheme_dto utsd = FromJSON(req_json);
+    utsd.uuid = GenerateUUID();
+
+    try
+    {
+      user_treatment_scheme_dao_->CreateUserTreatmentScheme(user_uuid, utsd);
+    }
+    catch (...)
+    {
+      BOOST_LOG_TRIVIAL(error) <<
+      "POST /api/v1/UserTreatmentSchemes - Response 400: Cannot write entity";
+      throw session_exception(http::status::bad_request, "Cannot write entity");
+    }
+
+    http::response<ResponseType> res{http::status::ok, req.version()};
+    json::value res_json = ToJSON(utsd);
+
+    res.body() = serialize(res_json);
+    res.set(http::field::content_type, "application/json");
+    res.content_length(res.body().size());
+
+    return res;
+  }
+
+private:
+  user_treatment_scheme_dto FromJSON(const boost::json::value& scheme)
+  {
+    user_treatment_scheme_dto dto;
+
+    dto.treatment_name =
+      scheme.at("treatment_name").as_string().c_str();
+
+    dto.instructions =
+      scheme.at("instructions").as_string().c_str();
+
+    for (const auto& med : scheme.at("medications").as_array())
+    {
+      dto.medication_uuids.push_back(
+                                     med.as_string().c_str()
+                                    );
+    }
+
+    return dto;
+  }
+
+  boost::json::object ToJSON(const user_treatment_scheme_dto& utsd)
+  {
+    boost::json::array medications_json;
+    medications_json.reserve(utsd.medication_uuids.size());
+
+    for (const auto& medication_uuid : utsd.medication_uuids) {
+      medications_json.emplace_back(medication_uuid);
+    }
+
+    boost::json::object scheme_json;
+    scheme_json["uuid"] = utsd.uuid;
+    scheme_json["treatment_name"] = utsd.treatment_name;
+    scheme_json["instructions"] = utsd.instructions;
+    scheme_json["medications"] = std::move(medications_json);
+
+    return scheme_json;
+  }
+};
+}

src/endpoints_handlers/PutDiaryExecutor.h

@@ -0,0 +1,119 @@
+#pragma once
+#include <boost/log/trivial.hpp>
+
+#include <regex>
+#include <boost/json.hpp>
+#include <boost/mpl/vector/vector0.hpp>
+#include <mysqlx/xdevapi.h>
+
+#include "IExecutor.h"
+#include "../DAO/IAuthDAO.h"
+#include "../DAO/IDiariesDAO.h"
+#include "../DAO/IUserTreatmentSchemesDAO.h"
+#include "../exceptions/session_exception.h"
+
+namespace uad
+{
+template <class Body, class Allocator, class ResponseType>
+class PutDiaryExecutor
+{
+  mysqlx::Session& session_;
+  const std::shared_ptr<IAuthDAO>& auth_dao_;
+  const std::shared_ptr<IDiariesDAO>& diaries_dao_;
+
+public:
+  PutDiaryExecutor(
+    mysqlx::Session& session,
+    const std::shared_ptr<IAuthDAO>& auth_dao,
+    const std::shared_ptr<IDiariesDAO>& diaries_dao
+  ) : session_(session), auth_dao_(auth_dao), diaries_dao_(diaries_dao)
+  {
+  }
+
+  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
+    boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req,
+    std::string diary_uuid
+  )
+  {
+    using namespace boost;
+    using namespace boost::json;
+    using namespace boost::beast;
+    using namespace std::string_literals;
+    using namespace std::string_view_literals;
+
+    constexpr std::string_view auth_prefix = "Bearer "sv;
+    static const std::string invalid_token_message =
+      "PUT /api/v1/Diary - Response 401: Unauthorized"s;
+
+    BOOST_LOG_TRIVIAL(info) << "PUT /api/v1/Diary - Request";
+
+    if (req[http::field::authorization].size() <= auth_prefix.size())
+    {
+      BOOST_LOG_TRIVIAL(error) << invalid_token_message;
+      throw session_exception(http::status::unauthorized, "Unauthorized");
+    }
+
+    const std::string auth_token = {
+        req[http::field::authorization].begin() + auth_prefix.size(),
+        req[http::field::authorization].end()
+      };
+
+    if (!auth_dao_->HasAuthorized(auth_token))
+    {
+      BOOST_LOG_TRIVIAL(error) << invalid_token_message;
+      throw session_exception(http::status::unauthorized, "Unauthorized");
+    }
+
+    std::string_view user_uuid_ref = auth_dao_->GetUUID(auth_token);
+    const std::string user_uuid{user_uuid_ref.begin(), user_uuid_ref.end()};
+
+    value val = json::parse(req.body());
+    object& obj = val.as_object();
+
+    diary_dto dto;
+
+    dto.uuid = diary_uuid;
+    dto.mania_level = obj["mania_level"].as_int64();
+    dto.depression_level = obj["depression_level"].as_int64();
+    dto.mood_level = obj["mood_level"].as_int64();
+    dto.activity_level = obj["activity_level"].as_int64();
+    dto.appetite_level = obj["appetite_level"].as_int64();
+    dto.dream_level = obj["dream_level"].as_int64();
+    dto.anxiety_level = obj["anxiety_level"].as_int64();
+    dto.comment = obj["comment"].as_string().c_str();
+    dto.user_treatment_scheme_uuid = obj["user_treatment_scheme_uuid"].as_string().c_str();
+
+    diaries_dao_->UpdateDiary(user_uuid, diary_uuid, dto);
+
+    http::response<ResponseType> res{http::status::ok, req.version()};
+    value response_body = ToJSON(dto);
+
+    res.body() = serialize(response_body);
+    res.set(http::field::content_type, "application/json");
+    res.content_length(res.body().size());
+
+    return res;
+  }
+
+private:
+  boost::json::object ToJSON(const diary_dto& diary)
+  {
+    boost::json::object diary_json;
+
+    diary_json["uuid"] = diary.uuid;
+    diary_json["time"] = diary.time_ms;
+    diary_json["mania_level"] = diary.mania_level;
+    diary_json["depression_level"] = diary.depression_level;
+    diary_json["mood_level"] = diary.mood_level;
+    diary_json["activity_level"] = diary.activity_level;
+    diary_json["appetite_level"] = diary.appetite_level;
+    diary_json["dream_level"] = diary.dream_level;
+    diary_json["anxiety_level"] = diary.anxiety_level;
+    diary_json["comment"] = diary.comment;
+    diary_json["user_treatment_scheme_uuid"] =
+      diary.user_treatment_scheme_uuid;
+
+    return diary_json;
+  }
+};
+}

src/endpoints_handlers/RootExecutor.h

@@ -1,3 +1,6 @@
+#pragma once
+
+#include <boost/url.hpp>
 #include <mysqlx/xdevapi.h>
 #include <mysqlx/common/api.h>
 
@@ -9,8 +12,12 @@
 #include "AuthLogoutExecutor.h"
 #include "GetUserMedicationsExecutor.h"
 #include "GetUserTreatmentSchemeExecutor.h"
+#include "PostUserTreatmentSchemeExecutor.h"
 #include "PostUserMedicationsExecutor.h"
 #include "GetDiariesExecutor.h"
+#include "PostDiaryExecutor.h"
+#include "PutDiaryExecutor.h"
+#include "DeleteDiaryExecutor.h"
 #include "../DAO/IUserDAO.h"
 #include "../DAO/IAuthDAO.h"
 #include "../DAO/IDiariesDAO.h"
@@ -37,8 +44,17 @@ class RootExecutor
     Body, Allocator, boost::beast::http::string_body>;
   using RouteGetUserTreatmentSchemeExecutor = GetUserTreatmentSchemeExecutor<
     Body, Allocator, boost::beast::http::string_body>;
+  using RoutePostUserTreatmentSchemeExecutor = PostUserTreatmentSchemeExecutor<
+    Body, Allocator, boost::beast::http::string_body>;
   using RouteGetDiariesExecutor = GetDiariesExecutor<
     Body, Allocator, boost::beast::http::string_body>;
+  using RoutePostDiaryExecutor = PostDiaryExecutor<
+    Body, Allocator, boost::beast::http::string_body>;
+  using RoutePutDiaryExecutor = PutDiaryExecutor<
+    Body, Allocator, boost::beast::http::string_body>;
+  using RouteDeleteDiaryExecutor = DeleteDiaryExecutor<
+    Body, Allocator, boost::beast::http::string_body>;
+
   using IRouteController = IController<Body, Allocator, boost::beast::http::string_body>;
   using RouteController = Controller<Body, Allocator, boost::beast::http::string_body>;
   using RoutesPathes = std::unordered_map<std::string, std::unique_ptr<IRouteController>>;
@@ -121,6 +137,11 @@ public:
            std::make_shared<RouteGetUserTreatmentSchemeExecutor>(session_, auth_dao_,
                                                                  user_treatment_scheme_dao_)
          },
+         {
+           boost::beast::http::verb::post,
+           std::make_shared<RoutePostUserTreatmentSchemeExecutor>(session_, auth_dao_,
+                                                                  user_treatment_scheme_dao_)
+         }
        }
       );
 
@@ -131,6 +152,11 @@ public:
            std::make_shared<RouteGetDiariesExecutor>(session_, auth_dao_,
                                                      diaries_dao_)
          },
+         {
+           boost::beast::http::verb::post,
+           std::make_shared<RoutePostDiaryExecutor>(session_, auth_dao_,
+                                                     diaries_dao_)
+         },
        }
       );
   }
@@ -141,13 +167,14 @@ public:
     Send&& send
   )
   {
-    const std::string& route = req.target();
-    const bool is_match_route = routes_pathes_.count(route);
+    namespace urls = boost::urls;
+
+    const bool is_match_route = routes_pathes_.count(req.target());
 
     if (is_match_route)
     {
       std::optional<std::shared_ptr<IRouteExecutor>> maybe_executor_ptr = routes_pathes_
-        .at(route)
+        .at(req.target())
         ->FindExecutor(req.method());
 
       if (maybe_executor_ptr.has_value())
@@ -162,21 +189,50 @@ public:
         }
         catch (const session_exception& e)
         {
-          boost::beast::http::response<ResponseType> res{e.code, req.version()};
-          boost::json::value response_body;
-
-          response_body.emplace_object();
-          response_body.as_object().emplace("Result", e.what());
-
-          res.body() = serialize(response_body);
-          res.set(boost::beast::http::field::content_type, "application/json");
-          res.content_length(res.body().size());
-
-          return send(std::move(res));
+          return send(SendSessionExceptionError(std::move(req), e));
         }
       }
     }
 
+    urls::url_view parsed_view = urls::parse_uri_reference(req.target()).value();
+    auto segs = parsed_view.segments();
+    std::vector<std::string> parts;
+
+    for (auto s : segs)
+      parts.push_back(s);
+
+    if (parts.size() == 4 &&
+    parts[0] == "api" &&
+    parts[2] == "Diaries")
+    {
+      try
+      {
+        std::string uuid = std::string(parts[3]);
+
+        if (req.method() == boost::beast::http::verb::put)
+        {
+          return send(RoutePutDiaryExecutor(
+            session_,
+            auth_dao_,
+            diaries_dao_
+            )(std::move(req), uuid));
+        }
+
+        if (req.method() == boost::beast::http::verb::delete_)
+        {
+          return send(RouteDeleteDiaryExecutor(
+            session_,
+            auth_dao_,
+            diaries_dao_
+            )(std::move(req), uuid));
+        }
+      }
+      catch (const session_exception& e)
+      {
+        return send(SendSessionExceptionError(std::move(req), e));
+      }
+    }
+
     if (req.method() != boost::beast::http::verb::get &&
       req.method() != boost::beast::http::verb::head)
       return send(SendBadRequest(std::move(req), "Unknown boost::beast::HTTP-method"));
@@ -273,5 +329,20 @@ private:
     res.prepare_payload();
     return res;
   }
+
+  StringResponse SendSessionExceptionError(Request&& req, const session_exception& e)
+  {
+    StringResponse res{e.code, req.version()};
+    boost::json::value response_body;
+
+    response_body.emplace_object();
+    response_body.as_object().emplace("Result", e.what());
+
+    res.body() = serialize(response_body);
+    res.set(boost::beast::http::field::content_type, "application/json");
+    res.content_length(res.body().size());
+
+    return res;
+  }
 };
 }

src/exceptions/session_exception.cpp

@@ -4,7 +4,7 @@ using namespace std;
 
 namespace uad
 {
-char const* session_exception::what() const
+char const* session_exception::what() const noexcept
 {
   return message.c_str();
 }

src/exceptions/session_exception.h

@@ -15,6 +15,6 @@ struct session_exception : std::exception
   session_exception(const boost::beast::http::status ec, const std::string info)
   : code(ec), comment(info), message(std::to_string(static_cast<uint64_t>(ec)) + " - " + comment)
   {}
-  char const* what() const override;
+  [[nodiscard]] char const* what() const noexcept override;
 };
 }

src/helpers/helpers.cpp

@@ -117,9 +117,9 @@ std::string ToHex(std::byte* src, size_t len)
   return ret;
 }
 
-std::string HashPassword(const std::string& password)
+std::string HashPassword(std::string_view password)
 {
-  size_t calculated_hash = std::hash<string>{}(password);
+  size_t calculated_hash = std::hash<std::string_view>{}(password);
   return ToHex((byte*)&calculated_hash, sizeof(calculated_hash));
 }
 

src/helpers/helpers.h

@@ -12,7 +12,7 @@ void Fail(boost::beast::error_code ec, char const* what);
 
 std::string ToHex(std::byte* src, size_t len);
 
-std::string HashPassword(const std::string& password);
+std::string HashPassword(std::string_view password);
 
 std::string GenerateUUID();
 

src/log/Log.cpp

@@ -1,5 +1,3 @@
-#pragma once
-
 #include <boost/log/trivial.hpp>
 #include <boost/log/utility/setup/file.hpp>
 #include <boost/log/utility/setup/common_attributes.hpp>
@@ -11,7 +9,7 @@ namespace uad
 void InitLogs()
 {
   logging::add_file_log(
-    logging::keywords::file_name = "app_%Y-%m-%d_%H-%M-%S.log",
+    logging::keywords::file_name = "./logs/up_and_down_%Y-%m-%d_%H-%M-%S.log",
     logging::keywords::rotation_size = 10 * 1024 * 1024,
     logging::keywords::time_based_rotation =
       logging::sinks::file::rotation_at_time_point(0, 0, 0),

tests/endpoint_handlers/Controller_TEST.cpp

@@ -51,12 +51,12 @@ BOOST_AUTO_TEST_CASE(Should_Be_Initiated_With_Unordered_Map_HTTP_Methods_To_Exec
 {
   IControllerMock::HTTPMethodsToExecutors executors;
 
-  executors[beast::http::verb::get] = make_shared<MockExecutor>();
-  executors[beast::http::verb::post] = make_shared<MockExecutor>();
-  executors[beast::http::verb::put] = make_shared<MockExecutor>();
-  executors[beast::http::verb::delete_] = make_shared<MockExecutor>();
-  executors[beast::http::verb::head] = make_shared<MockExecutor>();
-  executors[beast::http::verb::options] = make_shared<MockExecutor>();
+  executors[beast::http::verb::get] = std::make_shared<MockExecutor>();
+  executors[beast::http::verb::post] = std::make_shared<MockExecutor>();
+  executors[beast::http::verb::put] = std::make_shared<MockExecutor>();
+  executors[beast::http::verb::delete_] = std::make_shared<MockExecutor>();
+  executors[beast::http::verb::head] = std::make_shared<MockExecutor>();
+  executors[beast::http::verb::options] = std::make_shared<MockExecutor>();
 
   IControllerMock my_controller(std::move(executors));