мелкие правки

(cherry picked from commit a5542aba7c322dee98a7236b1a5dad70355d179d)

CMakeLists.txt

@@ -3,7 +3,7 @@ project(UpAndDown)
 
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-add_definitions(-D_WIN32_WINNT=0x0602)
+
 if(POLICY CMP0167)
     cmake_policy(SET CMP0167 OLD)
 endif()
@@ -13,7 +13,7 @@ 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 url)
+find_package(Boost 1.88.0 REQUIRED COMPONENTS filesystem json log)
 if (Boost_FOUND)
     include_directories(${Boost_INCLUDE_DIR})
 endif ()
@@ -38,8 +38,7 @@ add_executable(App ./src/main.cpp
                    ./src/db/mysql_connector.cpp
                    ./src/db/mysql_connector.h
                    ./src/DAO/IUserDAO.h
-        src/dtos/user_dto.h
+                   ./src/entities/user.h
-        src/dtos/medication_dto.h
                    ./src/DAO/MySQLUserDAO.cpp
                    ./src/DAO/MySQLUserDAO.h
                    ./src/endpoints_handlers/IExecutor.h
@@ -49,37 +48,11 @@ add_executable(App ./src/main.cpp
                    ./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/endpoints_handlers/PostDiaryExecutor.h
-        src/DAO/IDiariesDAO.h
-        src/dtos/diary_dto.h
-        src/DAO/MySQLDiariesDao.cpp
-        src/DAO/MySQLDiariesDao.h
 )
 
-target_link_libraries(App PRIVATE Boost::boost
+target_link_libraries(App PRIVATE Boost::boost Boost::json Threads::Threads mysql::concpp)
-        Boost::json
-        Boost::log
-        Boost::system
-        Boost::filesystem
-        Boost::url
-        Threads::Threads
-        mysql::concpp)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
@@ -88,7 +61,7 @@ endif ()
 add_executable(HelpersTests ./tests/helpers/helpers_TEST.cpp
                             ./src/helpers/helpers.h
                             ./src/helpers/helpers.cpp)
-target_link_libraries(HelpersTests PRIVATE Boost::boost Boost::json Boost::log)
+target_link_libraries(HelpersTests PRIVATE Boost::boost)
 add_test(HelpersTests HelpersTests)
 
 add_executable(ControllerTests ./tests/endpoint_handlers/Controller_TEST.cpp
@@ -97,86 +70,8 @@ add_executable(ControllerTests ./tests/endpoint_handlers/Controller_TEST.cpp
 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)
-target_link_libraries(AuthRegistrationExecutorTests PRIVATE Boost::boost
-        Boost::json
-        Boost::log
-        Boost::system
-        Boost::filesystem
-        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)
-target_link_libraries(AuthLoginExecutorTests PRIVATE Boost::boost
-        Boost::json
-        Boost::log
-        Boost::system
-        Boost::filesystem
-        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)
-target_link_libraries(AuthLogoutExecutorTests PRIVATE Boost::boost
-        Boost::json
-        Boost::log
-        Boost::system
-        Boost::filesystem
-        Threads::Threads
-        mysql::concpp)
-add_test(AuthLogoutExecutorTests AuthLogoutExecutorTests)
-
 if (WIN32)
     target_compile_definitions(App PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
     target_compile_definitions(HelpersTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
     target_compile_definitions(ControllerTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
-    target_compile_definitions(AuthRegistrationExecutorTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
-    target_compile_definitions(AuthLoginExecutorTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
-    target_compile_definitions(AuthLogoutExecutorTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
 endif()

LICENSE.txt

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,7 +1,11 @@
 # TODO:
 
 - ~~Сделать реальные исполнители(executors) для регистрации, авторизации, логаута~~
-- ~~Покрыть тестами класс User и AuthRegistrationExecutor~~
+- Посмотреть по поводу блокировок или тред пулла при использовании базы
+- Посмотреть пулл соединений(Object pool) при использовании базы данных(посмотреть api MySQL-Connector)
+- Посмотреть, что дает MySQL, какие там есть возможность
+- Посмотреть и подумать, что лучше - корутины или многопоточность?
+- Покрыть тестами класс User и AuthRegistrationExecutor
 - ~~Добавить clang-format(через CLion)~~
 - ~~Перевести GetByUUID GetByLogin на const ref/string_view в IUserDAO - также не vector, а span(погуглить)~~ - span не применим
 - ~~Привести к единому виду функции IUserDAO~~
@@ -11,34 +15,9 @@
 - ~~SharedPtr - передавать по константной ссылке.~~
 - ~~Вынести обработку исключений в RootExecutor~~
 - ~~Уменьшить дублирование кода в исключениях~~
-- ~~Покрыть логами~~
+- Покрыть логами
 - ~~Сделать один класс исключений, имеющих метод HTTP code - код и сообщение записывать уже в ловушке~~
-- ~~Сделать интеграционный тест по ручкам~~
+- Сделать интеграционный тест по ручкам
-- ~~Заменить internal_server_error на bad_request и перепроверить коды ошибок~~
-- ~~Создание и удаление вспомогательных классов должно быть вынесено в фикстуру~~
-- ~~К следующему занятию сделать ручку из кейса 3 + восстановить фикстуры из тестов~~
-- Посмотреть по поводу блокировок или тред пулла при использовании базы
-- Посмотреть пулл соединений(Object pool) при использовании базы данных(посмотреть api MySQL-Connector)
-- Посмотреть и подумать, что лучше - корутины или многопоточность?
-- UseCase'ы по работе с личным кабинетом
-- Научиться поднимать базы данных под каждый тест - научиться Docker - docker-compose - а если тест что-то должен заполнить, то он заполняет в самом начале()
-- Возможно, сделать тесты на CI/CD - приоритет - низкий
-- Найти слабые места в C++ -- std::forward, universal reference, просмотреть про decltype(почитать статьи)
-- Написать фронтенд для MVP
-- Разобрать decltype и auto по статье
-До 27.01.2026
-- Подобрать сервер по параметрам. Использовать linux.
-- Перевести string на string_view
-- ~~Попробовать nodiscard к executoru~~
-- Добить 2 ручки
-- Сделать тесты для ручек
-
-# План
-1)Добить бэкенд(2 ручки) (до февраля)
-2)Сделать деплой(до марта)
-3)Сделать фронтенд для MVP
-4)Делаем веб-чат и роль доктора
-5)Читать книгу Мейерса "Эффективный и современный C++" до ???
 
 # UseCase'ы приложения:
 
@@ -46,7 +25,7 @@
 
 ## UseCase №1
 ### 1.Название: Зарегистрировать пользователя
-### 2.Актор: Пользователь-пациент
+### 2.Актор: Пользователь
 ### 3.Цель: Внести данные о новом пользователе в систему
 ### 4.Предусловия:
 * Пользователь не авторизован в системе
@@ -81,6 +60,7 @@
 ##### Требования к валидации:
 * login: 3-50 символов, ^[A-Za-z0-9_]+$, уникальное значение
 * password: ≥ 5 символов
+
 ##### Response - 201 - Created
 ```
 {
@@ -90,6 +70,7 @@
   }
 }
 ```
+
 ##### Errors
 * `409 USER_EXISTS` — пользователь с таким логином уже есть(`B1`)
 * `422 VALIDATION_FAILED` — пустой логин/неправильный пароль(`B2`)
@@ -100,7 +81,7 @@
 
 ## UseCase №2
 ### 1.Название: Авторизация пользователя
-### 2.Актор: Пользователь-пациент
+### 2.Актор: Пользователь
 ### 3.Цель: Предоставить пользователю возможность получить его данные в виде дневника болезни
 ### 4.Предусловия:
 * Пользователь должен быть зарегистрирован в системе
@@ -145,10 +126,12 @@
   "token": af32df3bas739f272bd109c823
 }
 ```
+
 ##### Errors
 * `401 BAD_CREDENTIALS` — неверный логин/пароль (B1)
 * `422 VALIDATION_FAILED` — пустые поля (B2)
 * `400 BAD_REQUEST` — сервер не смог десереализовать JSON
+
 #### Logout-Request
 ```
 {
@@ -168,7 +151,7 @@ null
 
 ## UseCase №3
 ### 1.Название: Переход на главную страницу
-### 2.Актор: Пользователь-пациент
+### 2.Актор: Пользователь
 ### 3.Цель: Предоставить пользователю поверхностный вывод данных о нем и инструменты для глубокого просмотра данных и их модификации
 ### 4.Предусловия:
 * Пользователь имеет актуальный токен, подтверждающий его авторизацию в системе
@@ -177,7 +160,6 @@ null
 #### A1.Записи в дневнике есть
 * Система перенаправляет пользователя на его основную страницу
 * Система запрашивает и выводит последние записи и схемы лечения его дневника
-* Система делает доступными операции с дневником
 #### A2.Записей в дневнике нет
 * Заместо вывода записей в дневнике, система выводит заглушку, информирующую пользователя, что дневник пуст
 * Система делает доступными операции с дневником
@@ -190,7 +172,8 @@ null
 * Пользователю доступны операции добавления, модификации и удаления записей, а также схем лечения
 ### 8.API-Маршруты
 * `GET /api/v1/User/Diaries` - получить кусок дневника пользователя (требует Authorization: Bearer <token>) query-параметры: from (int, по умолч. 0), count (int, по умолч. 20)
-* `GET /api/v1/UserTreatmentSchemes` - получить список схем пользователя (требует Authorization: Bearer <token>) query-параметры: from (int, по умолч. 0), count (int, по умолч. 20)
+* `GET /api/v1/User/TreatmentSchemes` - получить кусок дневника пользователя (требует Authorization: Bearer <token>) query-параметры: from (int, по умолч. 0), count (int, по умолч. 20)
+
 ### 9.Контракт
 #### Diaries-Request
 ##### Response - 200 - OK
@@ -199,7 +182,7 @@ null
   diaries: [
     {
       "uuid": "e89b6a0c-4b0f-4722-a410-1e0c1864bf8a",
-      "time": "100000034", // в ms
+      "time": "10.08.2025",
       "mania_level": 1,
       "depression_level": 2,
       "mood_level": 3,
@@ -207,34 +190,56 @@ null
       "appetite_level": 5,
       "dream_level": 6,
       "anxiety_level": 7,
-      "comment": "Накрыл психоз. Выпил одну таблетку аминазина"
+      "treatment_scheme": {
-      "user_treatment_scheme_uuid": bf6d1555-39e9-4d73-8928-4763627f4dd5
+        "uuid": "bf6d1555-39e9-4d73-8928-4763627f4dd5",
+        "treatment_name": "Bipolar I Scheme",
+        "instructions": "Контроль лития в крови раз в 2 месяца. Анализ крови через вену."
+        "medications": [
+          {
+            "uuid": "8af2dfa9-3add-413c-9a0e-ff605088f1d5",
+            "name": "Litii Carbonate",
+            "dose": 1800,
+            "unit": "mg",
+            "is_urgent": false
+          }
+        ]
+      }
     }
   ]
 }
 ```
+
 ##### Errors
 * `401 TOKEN_REQUIRED|TOKEN_EXPIRED` — токен недействителен, либо отсутствует
 * `500 DATA_LOAD_FAILED` — ошибка при загрузке данных (`B1`)
-#### UserTreatmentSchemes-Request
+
+#### TreatmentSchemes-Request
 ##### Response - 200 - OK
 ```
 {
-  "user_treatment_schemes": [
+  "treatment_schemes": [
     {
       "uuid": "248313cb-a75e-4331-8379-d3f2fc36b68d"
       "treatment_name": "Bipolar I Scheme Urgent",
-      "instructions": "Схема для быстрого и жесткого купирования психозов. Аминазин пить каждый день.",
+      "instructions": "Схема для бытрого и жесткого купирования психозов. Аминазин пить каждый день.",
       "medications": [
-        "eda5a5f7-167a-44b9-900d-c5c6acfc249b"
+        {
+          "uuid": "eda5a5f7-167a-44b9-900d-c5c6acfc249b",
+          "name": "Aminazin",
+          "dose": 100,
+          "unit": "mg",
+          "is_urgent": true
+        }
       ]
     }
   ]
 }
 ```
+
 ##### Errors
 * `401 TOKEN_REQUIRED|TOKEN_EXPIRED` — токен недействителен, либо отсутствует
 * `500 DATA_LOAD_FAILED` — ошибка при загрузке данных (B1)
+
 ### 10. Используемые сущности ДБ
 * diaries(uuid(PK), time , mania_level , depression_level , mood_level , activity_level , appetite_level , dream_level , anxiety_level, user_treatment_schemes_uuid)
 * mania(level(PK))
@@ -247,257 +252,3 @@ null
 * treatment_schemes(user_treatment_schemes_uuid(PK), medication_uuid(PK))
 * user_treatment_schemes(uuid(PK), user_uuid, treatment_name, instructions)
 * medications(uuid(PK), name, dose, unit, is_urgent)
-
-
-## UseCase №4
-### 1.Название: Добавление новой записи в дневник
-### 2.Актор: Пользователь-пациент
-### 3.Цель: Ведение дневника болезни для врача
-### 4.Предусловия:
-* Пользователь авторизован в системе
-* Пользователь находится на главной странице
-### 5.Основной поток:
-#### А1.Пользователь создает новую запись в дневнике
-* Если отсутствуют, то подключаются идентификаторы мании, депрессии, настроения, активности, аппетита, сна, тревоги
-* Пользователь кликает по соответствующей кнопке добавления записи в дневник
-* Вызывается меню с формой заполнения записи
-* Пользователь описывает свое текущее состояние на модальном окне и указывает используемую схему лечения
-### 6.Потоки исключений:
-#### B1.Пользователь оставил пустым любое из полей, кроме comment
-* Запись о неполном состоянии нельзя создать. Кнопка создания записи заблокирована
-#### B2. Идентификаторы состояний не подгрузились
-* На поле вводаставится заглушка, делающая невозможным его заполнение.
-### 7.Постусловия
-* Пользователь добавил запись с указанной датой и прочими состояниями в БД
-### 8.API-Маршруты
-* `POST /api/v1/User/Diaries` - Создание записи в дневнике
-### 9.Контракт
-#### Diaries-Request
-```
-{
-  `user_uuid`: "51351bb1-7563-479d-a8e9-201d0ff934c2",
-  `time`: "172493000",
-  `mania_level`: "6",
-  `depression_level`: "6",
-  `mood_level`: "7",
-  `activity_level`: "4",
-  `appetite_level`: "5",
-  `dream_level`: "5",
-  `anxiety_level`: "9",
-  `comment`: "Сильная тревога. Пришлось выпить аминазин",
-  `user_treatment_schemes_uuid`: "51351bb1-7563-479d-a8e9-201d0ff934c2",
-}
-```
-##### Требования к валидации:
-* Все поля, кроме `comment` обязательны к заполнению
-* `user_treatment_schemes_uuid` должен указывать на существующую схему лечения
-##### Response - 201 - Created
-```
-{
-  `uuid`: "61351bb1-7563-479d-a8e9-201d0ff934c2",
-  `user_uuid`: "71351bb1-7563-479d-a8e9-201d0ff934c2",
-  `time` "172493000",
-  `mania_level`: "6",
-  `depression_level`: "6",
-  `mood_level`: "7",
-  `activity_level`: "4",
-  `appetite_level`: "5",
-  `dream_level`: "5",
-  `anxiety_level`: "9",
-  `comment`: "Сильная тревога. Пришлось выпить аминазин",
-  `user_treatment_scheme`: "51351bb1-7563-479d-a8e9-201d0ff934c2"
-}
-```
-##### Errors
-* `400 BAD_REQUEST` — отсутствуют обязательные поля
-* `400 BAD_REQUEST` — сервер не смог десереализовать JSON
-* `422 UNPROCECCABLE_ENTITY` - Во `time` значение размерностей ниже, чем день, должно быть равно 0
-* `422 TREATMENT_SCHEME_IS_NOT_EXISTS` - такой схемы лечения болезни не существует
-### 10. Используемые сущности ДБ
-* diaries(uuid(PK), time , mania_level , depression_level , mood_level , activity_level , appetite_level , dream_level , anxiety_level, user_treatment_schemes_uuid)
-* mania(level(PK))
-* depressions(level(PK))
-* moods(level(PK))
-* activities(level(PK))
-* appetites(level(PK))
-* dreams(level(PK))
-* anxiety(level(PK))
-* user_treatment_schemes(uuid(PK))
-
-
-## UseCase №5
-### 1.Название: Изменение существующей записи в дневнике
-### 2.Актор: Пользователь-пациент
-### 3.Цель: Внесение правок в ошибочно заполненный дневник
-### 4.Предусловия:
-* Пользователь авторизован в системе
-* Пользователю доступно для использования окно создания/редактирования дневника
-### 5.Основной поток:
-#### А1.Пользователь редактирует новую запись в дневнике
-* Если отсутствуют, то подключаются идентификаторы мании, депрессии, настроения, активности, аппетита, сна, тревоги
-* Пользователь кликает по кнопке редактирования уже существующей записи о своем состоянии в дневнике
-* В последующем меню пользователю предоставляется возможность изменить данные о своем состоянии, а также схему лечения
-### 6.Потоки исключений:
-#### B1.В приложении отсутствуют схемы лечений
-* Выполнение добавления записи невозможно, поэтому кнопка вызова меню блокируется
-#### B2.Пользователь оставил пустым любое из полей, кроме comment
-* Запись о неполном состоянии нельзя создать. Кнопка создания записи заблокирована
-#### B3. Идентификаторы состояний не подгрузились
-* На поле вводаставится заглушка, делающая невозможным его заполнение.
-#### B4. Попытка изменения даты
-* Пользователь попытался сделать запрос с измененной датой
-### 7.Постусловия
-* Пользователь изменил запись соглсано условиям выше в БД
-### 8.API-Маршруты
-* `PUT /api/v1/User/Diaries/:diary_guid` - Изменение записи в дневнике
-### 9.Контракт
-#### Diaries-Request
-```
-{
-  `uuid`: "61351bb1-7563-479d-a8e9-201d0ff934c2",
-  `user_uuid`: "51351bb1-7563-479d-a8e9-201d0ff934c2",
-  `time`: "172493000",
-  `mania_level`: "6",
-  `depression_level`: "6",
-  `mood_level`: "7",
-  `activity_level`: "4",
-  `appetite_level`: "5",
-  `dream_level`: "5",
-  `anxiety_level`: "9",
-  `comment`: "Сильная тревога. Пришлось выпить аминазин",
-  `user_treatment_schemes_uuid`: "51351bb1-7563-479d-a8e9-201d0ff934c2",
-}
-```
-##### Требования к валидации:
-* Все поля, кроме `comment` обязательны к заполнению
-* `user_treatment_schemes_uuid` должен указывать на существующую схему лечения
-##### Response - 201 - Updated
-```
-{
-  `uuid`: "61351bb1-7563-479d-a8e9-201d0ff934c2",
-  `user_uuid`: "71351bb1-7563-479d-a8e9-201d0ff934c2",
-  `time` "172493000",
-  `mania_level`: "6",
-  `depression_level`: "6",
-  `mood_level`: "7",
-  `activity_level`: "4",
-  `appetite_level`: "5",
-  `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"
-    ]
-  },
-}
-```
-##### Errors
-* `400 BAD_REQUEST` — отсутствуют обязательные поля
-* `400 BAD_REQUEST` — сервер не смог десереализовать JSON
-* `422 UNPROCECCABLE_ENTITY` - `time` не должно быть изменено
-* `422 TREATMENT_SCHEME_IS_NOT_EXISTS` - такой схемы лечения болезни не существует
-### 10. Используемые сущности ДБ
-* diaries(uuid(PK), time , mania_level , depression_level , mood_level , activity_level , appetite_level , dream_level , anxiety_level, user_treatment_schemes_uuid)
-* mania(level(PK))
-* depressions(level(PK))
-* moods(level(PK))
-* activities(level(PK))
-* appetites(level(PK))
-* dreams(level(PK))
-* anxiety(level(PK))
-* user_treatment_schemes(uuid(PK))
-
-
-## UseCase №6
-### 1.Название: Удаление существующей записи в дневнике
-### 2.Актор: Пользователь-пациент
-### 3.Цель: Удаление ненужной записи в дневнике
-### 4.Предусловия:
-* Пользователь авторизован в системе
-* Пользователю доступен вывод целевой записи, которую необходимо удалить
-### 5.Основной поток:
-#### А1.Пользователь Удаляет существующую запись в дневнике
-* Пользователь нажимает на кнопку удаления записи
-* Системы просит подтвердить удаление
-* Пользователь подтверждает свое действие. Запись удалена
-### 6.Потоки исключений:
-#### B1.Пользователь отказывается подтвердить действие
-* Запись не удаляется
-#### B2.Пользователь удаляет несуществующую запись
-* Выдается соответствующий ответ с ошибкой
-### 7.Постусловия
-* Целевая запись отсутствует в БД
-### 8.API-Маршруты
-* `DELETE /api/v1/User/Diaries/:diary_guid` - удаление записи в дневнике
-### 9.Контракт
-#### Diaries-Request
-##### Требования к валидации:
-* `:diary_guid` должен указывать на существующую страницу дневника
-##### Response - 204 - Deleted
-```
-null
-```
-##### Errors
-* `404 NOT_FOUND` - такой схемы лечения болезни никогда не существовало или она уже удалена
-### 10. Используемые сущности ДБ
-* diaries(uuid(PK))
-
-
-
-## UseCase №7
-### 1.Название: Создание схемы лечения
-### 2.Актор: Пользователь
-### 3.Цель: Предоставление пользователю способа лечения
-### 4.Предусловия:
-* Пользователь авторизован в системе
-* Пользователю доступен функционал создания схем лечения
-### 5.Основной поток:
-#### А1.Пользователь создает схему лечения
-* Пользователь указывает название схемы
-* Пользователь пишет к схема инструкцию
-* Пользователь добавляет к схеме лекарства
-### 6.Потоки исключений:
-#### B1.Пользователь отказался заполнять схему леккарствами
-* Схему нельзя создать в таком виде. На попытку создать схему выходит окно ошибок
-### 7.Постусловия
-* Схема создана и доступна для выбора в качестве лечения
-### 8.API-маршруты
-* `POST /api/v1/TreatmentScheme` - создание схемы лечения
-### 9.Контракт
-#### Diaries-Request
-```
-{
-  "treatment_name": "Bipolar I Scheme Urgent",
-  "instructions": "Схема для быстрого и жесткого купирования психозов. Аминазин пить каждый день.",
-  "medications": [
-    "eca5a5f7-167a-44b9-900d-c5c6acfc249b",
-    "eda5a5f7-167a-44b9-900d-c5c6acfc249b"
-  ]
-}
-```
-##### Требования к валидации:
-* `treatment_name` обязателен к заполнению
-* `medications` должен содержать хотя бы одно лекарство
-##### Response - 200 - Updated
-```
-{
-  "uuid": "eda5a5f7-167a-44b9-900d-c5c6acfc249b"
-  "treatment_name": "Bipolar I Scheme Urgent",
-  "instructions": "Схема для быстрого и жесткого купирования психозов. Аминазин пить каждый день.",
-  "medications": [
-    "eca5a5f7-167a-44b9-900d-c5c6acfc249b",
-    "eda5a5f7-167a-44b9-900d-c5c6acfc249b"
-  ]
-}
-```
-##### Errors
-* `400 BAD_REQUEST` — сервер не смог десереализовать JSON
-* `400 BAD_REQUEST` — Обязательные поля заполнены неправильно
-### 10. Используемые сущности ДБ
-* user_treatment_schemes(uuid, user_uuid, treatment_name, instructions)
-* medications(uuid, name, dose, unit, is_urgent)
-* treatment_schemes(user_treatment_schemes_uuid, medication_uuid)

db_assets/sql_scripts/init.sql

@@ -1,3 +1,5 @@
+-- Общая рекомендация - расписать use-case'ы
+
 CREATE SCHEMA `up_and_down` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 CREATE TABLE `up_and_down`.`users` (
@@ -70,7 +72,6 @@ CREATE TABLE `up_and_down`.`diaries` (
     `appetite_level` INT1 NOT NULL,
     `dream_level` INT1 NOT NULL,
     `anxiety_level` INT1 NOT NULL,
-    `comment` TEXT,
     `user_treatment_schemes_uuid` CHAR(36),
     PRIMARY KEY (`uuid`),
     FOREIGN KEY (`user_uuid`) REFERENCES `users`(`uuid`),
@@ -90,8 +91,7 @@ CREATE TABLE `up_and_down`.`medications` (
     `dose` int8 NOT NULL,
     `unit` CHAR(30),
     `is_urgent` BOOL NOT NULL,
-    PRIMARY KEY (`uuid`),
+    PRIMARY KEY (`uuid`)
-    UNIQUE KEY `uniq_medication` (`name`(255), `dose`, `unit`, `is_urgent`)
 );
 
 CREATE TABLE `up_and_down`.`treatment_schemes` (
@@ -101,3 +101,88 @@ CREATE TABLE `up_and_down`.`treatment_schemes` (
     FOREIGN KEY (`user_treatment_schemes_uuid`) REFERENCES `user_treatment_schemes`(`uuid`),
     FOREIGN KEY (`medication_uuid`) REFERENCES `medications`(`uuid`)
 );
+
+-- insert constants
+INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (1, 'Полное отсутствие мании');
+INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (2, 'Слегка приподнятое настроение');
+INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (3, 'Хорошее настроение');
+INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (4, 'Очень хорошее настроение, но в рамках разумного');
+INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (5, 'Гипомания I, характерная для циклотимии - приятная эйфория, повышенная активность');
+INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (6, 'Гипомания II, характерная для БАР II - все, что в предыдущем пункте + белеет в глазах');
+INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (7, 'Мания I - периодический не сильный отрыв от реальности');
+INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (8, 'Мания II - сопровождается бредом и галлюцинациями - неадекватная речь');
+INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (9, 'Мания III - сопровождается бредом и галлюцинациями - неадекватное поведение');
+INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (10, 'Мания IV - сопровождается бредом и галлюцинациями - человек опасен для себя и других');
+
+INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (1, 'Депрессия I');
+INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (2, 'Депрессия II');
+INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (3, 'Депрессия III');
+INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (4, 'Депрессия IV');
+INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (5, 'Депрессия V');
+INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (6, 'Депрессия VI');
+INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (7, 'Депрессия VII');
+INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (8, 'Депрессия VIII');
+INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (9, 'Депрессия IX');
+INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (10, 'Депрессия X');
+
+INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (1, 'Настроение I');
+INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (2, 'Настроение II');
+INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (3, 'Настроение III');
+INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (4, 'Настроение IV');
+INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (5, 'Настроение V');
+INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (6, 'Настроение VI');
+INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (7, 'Настроение VII');
+INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (8, 'Настроение VIII');
+INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (9, 'Настроение IX');
+INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (10, 'Настроение X');
+
+INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (1, 'Активность I');
+INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (2, 'Активность II');
+INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (3, 'Активность III');
+INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (4, 'Активность IV');
+INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (5, 'Активность V');
+INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (6, 'Активность VI');
+INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (7, 'Активность VII');
+INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (8, 'Активность VIII');
+INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (9, 'Активность IX');
+INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (10, 'Активность X');
+
+INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (1, 'Аппетит I');
+INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (2, 'Аппетит II');
+INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (3, 'Аппетит III');
+INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (4, 'Аппетит IV');
+INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (5, 'Аппетит V');
+INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (6, 'Аппетит VI');
+INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (7, 'Аппетит VII');
+INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (8, 'Аппетит VIII');
+INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (9, 'Аппетит IX');
+INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (10, 'Аппетит X');
+
+INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (1, 'Сон I');
+INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (2, 'Сон II');
+INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (3, 'Сон III');
+INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (4, 'Сон IV');
+INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (5, 'Сон V');
+INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (6, 'Сон VI');
+INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (7, 'Сон VII');
+INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (8, 'Сон VIII');
+INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (9, 'Сон IX');
+INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (10, 'Сон X');
+
+INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (1, 'Тревога I');
+INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (2, 'Тревога II');
+INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (3, 'Тревога III');
+INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (4, 'Тревога IV');
+INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (5, 'Тревога V');
+INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (6, 'Тревога VI');
+INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (7, 'Тревога VII');
+INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (8, 'Тревога VIII');
+INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (9, 'Тревога IX');
+INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (10, 'Тревога X');
+
+-- Заполнение пользователями
+INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('ab555fcb-b9ee-45f4-9de8-8f16daa5d03b', 'login1', 'Qwerty12345');
+INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('56b7c993-392f-41f8-adb1-9766842dc5fd', 'login2', 'AVALON123456');
+INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('a243b5f2-e265-4c25-82a9-dde4cc70643f', 'login3', 'Zxcvb123456');
+INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('51351bb1-7563-479d-a8e9-201d0ff934c2', 'login4', 'Sadly846612');
+INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'login5', 'Qwerty12345');

db_assets/sql_scripts/script_order.txt

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

db_assets/sql_scripts/seed_diaries.sql

@@ -1,42 +0,0 @@
-CREATE TABLE IF NOT EXISTS `up_and_down`.`numbers` (
-                                                       `n` INT NOT NULL PRIMARY KEY
-);
-
-INSERT INTO `up_and_down`.`numbers` (`n`)
-VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),
-       (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
-
-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`
-)
-SELECT
-    UUID() AS uuid,
-    uts.user_uuid,
-    DATE_ADD(TIMESTAMP('2025-01-01 08:00:00'), INTERVAL n.n DAY) AS time,
-
-    -- уровни от 1 до 10, чуть "перемешанные" через арифметику
-    ((n.n * 3) % 10) + 1 AS mania_level,
-    ((n.n * 5) % 10) + 1 AS depression_level,
-    ((n.n * 7) % 10) + 1 AS mood_level,
-    ((n.n * 2) % 10) + 1 AS activity_level,
-    ((n.n * 4) % 10) + 1 AS appetite_level,
-    ((n.n * 6) % 10) + 1 AS dream_level,
-    ((n.n * 8) % 10) + 1 AS anxiety_level,
-
-    CONCAT('Auto-generated diary entry #', n.n,
-           ' for treatment scheme ', uts.uuid) AS comment,
-
-    uts.uuid AS user_treatment_schemes_uuid
-FROM `up_and_down`.`user_treatment_schemes` uts
-    JOIN `up_and_down`.`numbers` n ON 1=1;

db_assets/sql_scripts/seed_medications.sql

@@ -1,21 +0,0 @@
-INSERT INTO `up_and_down`.`medications` (`uuid`, `name`, `dose`, `unit`, `is_urgent`) VALUES
-                                                                                          (UUID(), 'Литий карбонат', 300, 'mg', FALSE),
-                                                                                          (UUID(), 'Вальпроевая кислота (Депакин)', 500, 'mg', FALSE),
-                                                                                          (UUID(), 'Ламотриджин', 100, 'mg', FALSE),
-                                                                                          (UUID(), 'Карбамазепин', 200, 'mg', FALSE),
-                                                                                          (UUID(), 'Кветиапин', 100, 'mg', FALSE),
-                                                                                          (UUID(), 'Оланзапин', 10, 'mg', FALSE),
-                                                                                          (UUID(), 'Арипипразол', 15, 'mg', FALSE),
-                                                                                          (UUID(), 'Рисперидон', 2, 'mg', FALSE),
-                                                                                          (UUID(), 'Зипрасидон', 40, 'mg', FALSE),
-                                                                                          (UUID(), 'Лурасидон', 20, 'mg', FALSE),
-                                                                                          (UUID(), 'Аминосерин (Амилазин)', 50, 'mg', FALSE),
-                                                                                          (UUID(), 'Флуоксетин', 20, 'mg', FALSE),
-                                                                                          (UUID(), 'Сертралин', 50, 'mg', FALSE),
-                                                                                          (UUID(), 'Венлафаксин', 75, 'mg', FALSE),
-                                                                                          (UUID(), 'Дулоксетин', 30, 'mg', FALSE),
-                                                                                          (UUID(), 'Тразодон', 150, 'mg', FALSE),
-                                                                                          (UUID(), 'Габапентин', 300, 'mg', FALSE),
-                                                                                          (UUID(), 'Топирамат', 50, 'mg', FALSE),
-                                                                                          (UUID(), 'Пропранолол', 40, 'mg', TRUE),
-                                                                                          (UUID(), 'Клоназепам', 1, 'mg', TRUE);

db_assets/sql_scripts/seed_states.sql

@@ -1,77 +0,0 @@
--- insert constants
-INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (1, 'Полное отсутствие мании');
-INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (2, 'Слегка приподнятое настроение');
-INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (3, 'Хорошее настроение');
-INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (4, 'Очень хорошее настроение, но в рамках разумного');
-INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (5, 'Гипомания I, характерная для циклотимии - приятная эйфория, повышенная активность');
-INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (6, 'Гипомания II, характерная для БАР II - все, что в предыдущем пункте + белеет в глазах');
-INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (7, 'Мания I - периодический не сильный отрыв от реальности');
-INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (8, 'Мания II - сопровождается бредом и галлюцинациями - неадекватная речь');
-INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (9, 'Мания III - сопровождается бредом и галлюцинациями - неадекватное поведение');
-INSERT INTO `up_and_down`.`mania` (`level`, `description`) VALUES (10, 'Мания IV - сопровождается бредом и галлюцинациями - человек опасен для себя и других');
-
-INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (1, 'Депрессия I');
-INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (2, 'Депрессия II');
-INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (3, 'Депрессия III');
-INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (4, 'Депрессия IV');
-INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (5, 'Депрессия V');
-INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (6, 'Депрессия VI');
-INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (7, 'Депрессия VII');
-INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (8, 'Депрессия VIII');
-INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (9, 'Депрессия IX');
-INSERT INTO `up_and_down`.`depressions` (`level`, `description`) VALUES (10, 'Депрессия X');
-
-INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (1, 'Настроение I');
-INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (2, 'Настроение II');
-INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (3, 'Настроение III');
-INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (4, 'Настроение IV');
-INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (5, 'Настроение V');
-INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (6, 'Настроение VI');
-INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (7, 'Настроение VII');
-INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (8, 'Настроение VIII');
-INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (9, 'Настроение IX');
-INSERT INTO `up_and_down`.`moods` (`level`, `description`) VALUES (10, 'Настроение X');
-
-INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (1, 'Активность I');
-INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (2, 'Активность II');
-INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (3, 'Активность III');
-INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (4, 'Активность IV');
-INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (5, 'Активность V');
-INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (6, 'Активность VI');
-INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (7, 'Активность VII');
-INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (8, 'Активность VIII');
-INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (9, 'Активность IX');
-INSERT INTO `up_and_down`.`activities` (`level`, `description`) VALUES (10, 'Активность X');
-
-INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (1, 'Аппетит I');
-INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (2, 'Аппетит II');
-INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (3, 'Аппетит III');
-INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (4, 'Аппетит IV');
-INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (5, 'Аппетит V');
-INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (6, 'Аппетит VI');
-INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (7, 'Аппетит VII');
-INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (8, 'Аппетит VIII');
-INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (9, 'Аппетит IX');
-INSERT INTO `up_and_down`.`appetites` (`level`, `description`) VALUES (10, 'Аппетит X');
-
-INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (1, 'Сон I');
-INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (2, 'Сон II');
-INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (3, 'Сон III');
-INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (4, 'Сон IV');
-INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (5, 'Сон V');
-INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (6, 'Сон VI');
-INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (7, 'Сон VII');
-INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (8, 'Сон VIII');
-INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (9, 'Сон IX');
-INSERT INTO `up_and_down`.`dreams` (`level`, `description`) VALUES (10, 'Сон X');
-
-INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (1, 'Тревога I');
-INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (2, 'Тревога II');
-INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (3, 'Тревога III');
-INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (4, 'Тревога IV');
-INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (5, 'Тревога V');
-INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (6, 'Тревога VI');
-INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (7, 'Тревога VII');
-INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (8, 'Тревога VIII');
-INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (9, 'Тревога IX');
-INSERT INTO `up_and_down`.`anxiety` (`level`, `description`) VALUES (10, 'Тревога X');

db_assets/sql_scripts/seed_treatment_schemes.sql

@@ -1,63 +0,0 @@
-DELIMITER $$
-
-CREATE PROCEDURE `up_and_down`.`fill_treatment_schemes`()
-BEGIN
-    DECLARE done INT DEFAULT 0;
-    DECLARE v_uts_uuid CHAR(36);
-    DECLARE v_user_uuid CHAR(36);
-    DECLARE v_count INT;
-    DECLARE v_i INT;
-    DECLARE v_med_uuid CHAR(36);
-
-    -- курсор по всем схемам лечения пользователей
-    DECLARE cur CURSOR FOR
-SELECT uuid, user_uuid
-FROM `up_and_down`.`user_treatment_schemes`;
-
-DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
-
-OPEN cur;
-
-read_loop: LOOP
-        FETCH cur INTO v_uts_uuid, v_user_uuid;
-        IF done = 1 THEN
-            LEAVE read_loop;
-END IF;
-
-        -- случайное количество препаратов от 1 до 5
-        SET v_count = FLOOR(RAND() * 5) + 1;
-        SET v_i = 0;
-
-        meds_loop: WHILE v_i < v_count DO
-            -- случайный препарат из уже существующих medications
-SELECT m.uuid
-INTO v_med_uuid
-FROM `up_and_down`.`medications` m
-ORDER BY RAND()
-    LIMIT 1;
-
--- чтобы не было дублей (один и тот же препарат в одной схеме)
-IF NOT EXISTS (
-                SELECT 1
-                FROM `up_and_down`.`treatment_schemes` ts
-                WHERE ts.user_treatment_schemes_uuid = v_uts_uuid
-                  AND ts.medication_uuid = v_med_uuid
-            ) THEN
-                INSERT INTO `up_and_down`.`treatment_schemes` (
-                    `user_treatment_schemes_uuid`,
-                    `medication_uuid`
-                ) VALUES (
-                    v_uts_uuid,
-                    v_med_uuid
-                );
-                SET v_i = v_i + 1;
-END IF;
-END WHILE;
-END LOOP;
-
-CLOSE cur;
-END$$
-
-DELIMITER ;
-
-CALL `up_and_down`.`fill_treatment_schemes`();

db_assets/sql_scripts/seed_user_treatment_schemes.sql

@@ -1,195 +0,0 @@
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d564e669-a822-4ea8-80cf-86d8a7bafb91', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 01 for login2', 'Standard treatment scheme 01 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('02d5ea5f-af43-473c-891e-8c2e3a5f78f0', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 02 for login2', 'Standard treatment scheme 02 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('5bd6c955-9161-43a0-b5e4-a93a9cd11203', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 03 for login2', 'Standard treatment scheme 03 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('03d2deb4-df6a-4d77-9e06-3385a4464e7f', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 04 for login2', 'Standard treatment scheme 04 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('4e318764-2375-40bb-ac75-7364ef8bedd1', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 05 for login2', 'Standard treatment scheme 05 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('711e1123-1653-479e-8dd5-1d3126accf9f', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 06 for login2', 'Standard treatment scheme 06 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('5e2e3ec9-e837-4c62-bd91-731e14fc7f09', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 07 for login2', 'Standard treatment scheme 07 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('5968e9ec-cc6a-4eae-92a4-510e0662b8e8', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 08 for login2', 'Standard treatment scheme 08 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('7c083461-c3a1-4597-9a7d-9eaae0b3961c', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 09 for login2', 'Standard treatment scheme 09 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('ecb08cad-0116-4dc9-8b8f-27f8124a6a6d', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 10 for login2', 'Standard treatment scheme 10 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('87acb419-c3a0-47ad-9328-66af7f3bd80d', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 11 for login2', 'Standard treatment scheme 11 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('c557941f-4542-44c6-9018-b59e090e0725', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 12 for login2', 'Standard treatment scheme 12 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('20dc7b61-f782-4afe-935a-548627af48d3', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 13 for login2', 'Standard treatment scheme 13 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('ff316668-6245-43ba-8400-70c6db064591', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 14 for login2', 'Standard treatment scheme 14 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('1b9e482e-a95d-4426-a901-aac82b65d6cc', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 15 for login2', 'Standard treatment scheme 15 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('cd46d9e6-610a-42b8-a532-a228a122ad56', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 16 for login2', 'Standard treatment scheme 16 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('7471d503-daac-4c9f-ac4f-39c6a1e70b46', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 17 for login2', 'Standard treatment scheme 17 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('1bea6a9c-5f06-42df-adbb-918878a29269', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 18 for login2', 'Standard treatment scheme 18 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('3c21c11f-d381-4da5-92c7-460b4845f3c2', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 19 for login2', 'Standard treatment scheme 19 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('50e679a9-56a5-4366-9dfb-12b0f9c146f9', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 20 for login2', 'Standard treatment scheme 20 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('f26226ba-f8e7-43cc-a2ed-dee72fddd544', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 21 for login2', 'Standard treatment scheme 21 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('1e11af86-fc3f-4fa1-9142-1c5818be5dd2', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 22 for login2', 'Standard treatment scheme 22 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('0cebf129-ae65-4e7a-92ea-e15c7c506e9b', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 23 for login2', 'Standard treatment scheme 23 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('628c0588-83a5-413c-9753-88979b76d8c1', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 24 for login2', 'Standard treatment scheme 24 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('81e73502-5246-4f63-acd0-e908b8b1dbff', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 25 for login2', 'Standard treatment scheme 25 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('98cb3eb4-7973-4820-9d1b-fab098f78a49', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 26 for login2', 'Standard treatment scheme 26 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('4e43d7f8-50e6-4aa2-ae31-b3ea97cd7258', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 27 for login2', 'Standard treatment scheme 27 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('ee6d4b13-80b1-45cb-816a-050a19085874', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 28 for login2', 'Standard treatment scheme 28 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('0e29597a-aeff-4de5-9187-7add1292f674', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 29 for login2', 'Standard treatment scheme 29 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('00185651-9aa7-4441-9b69-ab20b8570a19', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 30 for login2', 'Standard treatment scheme 30 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('f24db057-f24e-47fc-9f34-705d80471ad6', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 31 for login2', 'Standard treatment scheme 31 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('6448f06c-865a-4ea5-a0a6-88653f00dfae', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 32 for login2', 'Standard treatment scheme 32 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('83fea65f-d2a0-4aa9-b8c0-f663e0241aa4', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 33 for login2', 'Standard treatment scheme 33 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('be1f77b7-5f20-40cf-a3a3-9baf4f54d830', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 34 for login2', 'Standard treatment scheme 34 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d932e4c5-d9b7-40f6-9bb3-6febca382e91', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 35 for login2', 'Standard treatment scheme 35 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('1f24f27b-0996-41a3-9d3f-5792ea0579f4', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 36 for login2', 'Standard treatment scheme 36 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('593b2bde-7abb-4f63-a334-00a0e14b18da', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 37 for login2', 'Standard treatment scheme 37 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('b894cf25-4ea9-4bb7-8eee-7a9766fb6882', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 38 for login2', 'Standard treatment scheme 38 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('6df93f3c-68c8-4bf4-8e55-51863599f48e', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 39 for login2', 'Standard treatment scheme 39 for login2');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('fa511de0-e1e5-460a-b771-ee9caa500b01', '56b7c993-392f-41f8-adb1-9766842dc5fd', 'Treatment scheme 40 for login2', 'Standard treatment scheme 40 for login2');
-
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('ea066091-f77d-48c9-9893-a2bcd848be62', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 01 for login3', 'Standard treatment scheme 01 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('f5862063-8dd6-4a47-9c35-a1116bc23f5e', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 02 for login3', 'Standard treatment scheme 02 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('14dd3e6e-50c4-4f16-b171-95bdd0e2c8a3', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 03 for login3', 'Standard treatment scheme 03 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('74e22b94-d3bb-4c52-a508-8cf958f7a728', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 04 for login3', 'Standard treatment scheme 04 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('b2ffe5c8-2377-46cc-8017-0d9d06051150', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 05 for login3', 'Standard treatment scheme 05 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('63011d38-8886-45e7-b883-5a83ae907a96', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 06 for login3', 'Standard treatment scheme 06 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('5b8f3afd-2a74-4ec9-b2e5-23919788f0bc', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 07 for login3', 'Standard treatment scheme 07 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('73d64fe3-b562-4b02-a7d8-9eca176b1c18', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 08 for login3', 'Standard treatment scheme 08 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('8ddcacfc-6d7f-45c9-adc5-30f689b91f6e', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 09 for login3', 'Standard treatment scheme 09 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('3f8bb381-8498-4727-b7f5-1c42a673d08e', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 10 for login3', 'Standard treatment scheme 10 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('a75224d4-57cc-4c5e-8dfc-ef604059df1f', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 11 for login3', 'Standard treatment scheme 11 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('65c3b073-b1de-4acf-9f99-52316c60858e', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 12 for login3', 'Standard treatment scheme 12 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('373bbeb4-dad9-4cae-a529-07b84dc1a2b0', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 13 for login3', 'Standard treatment scheme 13 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d1ebfe8e-4be4-4dd3-a31b-7bb3859e6f75', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 14 for login3', 'Standard treatment scheme 14 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('20e56586-74dc-40c4-9e15-2e9ea72793f7', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 15 for login3', 'Standard treatment scheme 15 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('f85cc1be-efa1-4b94-8131-674bc9ae45ff', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 16 for login3', 'Standard treatment scheme 16 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('b942b986-25d1-4048-b90a-b6d4389e2484', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 17 for login3', 'Standard treatment scheme 17 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('9939cd18-fd6f-4854-abd2-77829042a1f1', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 18 for login3', 'Standard treatment scheme 18 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('a2b4b42b-177d-4f1f-bfc0-576ed4e558ba', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 19 for login3', 'Standard treatment scheme 19 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('a5ef3ed5-6734-4cbd-8801-4034214f9e70', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 20 for login3', 'Standard treatment scheme 20 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('69aef932-049d-46b4-af96-c6344e2b3061', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 21 for login3', 'Standard treatment scheme 21 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('a563cd0c-4449-49f4-a39a-2226813b5481', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 22 for login3', 'Standard treatment scheme 22 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('6980c8ff-d49b-4e83-86ce-1ead13a9a8cd', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 23 for login3', 'Standard treatment scheme 23 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('3139c8f9-e44e-46c6-a499-b6c22ffbd3bf', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 24 for login3', 'Standard treatment scheme 24 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('6ef06a61-350b-4a0b-b893-4710dce94baf', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 25 for login3', 'Standard treatment scheme 25 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('6cbad25d-638f-47d3-9aee-fd1f5740b818', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 26 for login3', 'Standard treatment scheme 26 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d82ba023-9bfb-4d3c-8d3a-dc86f436b193', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 27 for login3', 'Standard treatment scheme 27 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('4dc77e76-4271-4e54-9dd8-4cbf781c9c87', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 28 for login3', 'Standard treatment scheme 28 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('adc5eb7c-7490-4230-8ee3-b0e9926b62c2', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 29 for login3', 'Standard treatment scheme 29 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d9be3f8e-3e6b-4c5e-b1f7-df7ddd3e7ccf', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 30 for login3', 'Standard treatment scheme 30 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('62cb5015-17a2-4f63-b1bc-882eca4f5f24', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 31 for login3', 'Standard treatment scheme 31 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('1e810b87-de35-4703-9663-aae4c39bee97', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 32 for login3', 'Standard treatment scheme 32 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('9ab45b0a-7851-4e33-8efd-5999dd8b6a6a', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 33 for login3', 'Standard treatment scheme 33 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('a79a4862-746f-4d5a-a99e-2057caf01a7d', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 34 for login3', 'Standard treatment scheme 34 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('28e2183c-bbb3-4b38-a029-88af7176a85d', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 35 for login3', 'Standard treatment scheme 35 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('7bb362d9-3cae-4b35-af7e-024d41bb947c', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 36 for login3', 'Standard treatment scheme 36 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('adf9e753-b51a-4f65-bb9e-822e38f0bcee', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 37 for login3', 'Standard treatment scheme 37 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('663984e1-7ccd-4dc1-a586-11ce05f524ca', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 38 for login3', 'Standard treatment scheme 38 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('672e072e-340d-4f6e-a925-af77f1df18b0', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 39 for login3', 'Standard treatment scheme 39 for login3');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('7484a1e6-a63b-4c01-9ff8-87f87e8b79d2', 'a243b5f2-e265-4c25-82a9-dde4cc70643f', 'Treatment scheme 40 for login3', 'Standard treatment scheme 40 for login3');
-
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('bd99e5a5-e01f-4eed-9b54-cf8ebd33ec62', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 01 for login4', 'Standard treatment scheme 01 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('c9c7b51d-8a61-4d6a-9546-7efc32b53a9a', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 02 for login4', 'Standard treatment scheme 02 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('c5faf9e6-51e5-4213-9a0f-5979642b192f', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 03 for login4', 'Standard treatment scheme 03 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('bc99fd22-e127-4f9d-8ff8-50612b353a03', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 04 for login4', 'Standard treatment scheme 04 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('86b40e24-ec00-4f8c-9540-976dc950d415', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 05 for login4', 'Standard treatment scheme 05 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('6ded4022-6fc7-4b4c-8692-d7b36b6fd559', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 06 for login4', 'Standard treatment scheme 06 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('e7597e7c-0252-436a-b348-6b06a5ae3339', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 07 for login4', 'Standard treatment scheme 07 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('1736a35a-6d2c-427b-9281-946390896e25', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 08 for login4', 'Standard treatment scheme 08 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('6fadfd02-b069-4f41-be9e-fa87b932b0aa', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 09 for login4', 'Standard treatment scheme 09 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('dd2682e1-b01b-4bb2-b5ef-b4c34bd58dc1', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 10 for login4', 'Standard treatment scheme 10 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('e91c93af-4008-4a26-9114-16b5ff628e6b', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 11 for login4', 'Standard treatment scheme 11 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('fc0a531f-3095-4920-98c5-f6d937a8fa56', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 12 for login4', 'Standard treatment scheme 12 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('cf9fcb20-209c-4ba3-967a-1998762b58d3', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 13 for login4', 'Standard treatment scheme 13 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('325b507f-a342-4134-9ed9-9acd5d61afc9', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 14 for login4', 'Standard treatment scheme 14 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('9a4dcb63-a6f5-4d9c-a122-32b5fa303028', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 15 for login4', 'Standard treatment scheme 15 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('3d99c7b9-9498-4a36-9fe7-d1864ff1e8bb', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 16 for login4', 'Standard treatment scheme 16 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('3e5cc607-72e0-4f52-bcff-6a5328a602f4', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 17 for login4', 'Standard treatment scheme 17 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d5f40e6b-8508-48ab-a821-f40b31b2d631', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 18 for login4', 'Standard treatment scheme 18 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('cdb87916-f8d5-4c8d-a70c-c9ae472c3d44', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 19 for login4', 'Standard treatment scheme 19 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('b927456d-6107-4fca-bd44-438d76a9dd87', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 20 for login4', 'Standard treatment scheme 20 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('909e5904-2fd2-424d-86f2-feaddd1fefd8', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 21 for login4', 'Standard treatment scheme 21 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d7e19282-a91c-423d-9c8e-eeac9491db74', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 22 for login4', 'Standard treatment scheme 22 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('4ea5983a-b578-479b-b67f-757e6c2b3671', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 23 for login4', 'Standard treatment scheme 23 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('cb5cfa34-5420-42fb-90a7-3509652643a5', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 24 for login4', 'Standard treatment scheme 24 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('0b982048-7f48-4f24-8898-eefe66060c8c', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 25 for login4', 'Standard treatment scheme 25 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('2f725907-3b0e-476c-9d99-3355613be072', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 26 for login4', 'Standard treatment scheme 26 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('f915ab57-7e00-4701-8342-4cf03da1650f', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 27 for login4', 'Standard treatment scheme 27 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('831f0573-eea4-4607-ad85-6662c5bce422', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 28 for login4', 'Standard treatment scheme 28 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('c324367a-267c-4cb4-9533-d2c74b35134c', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 29 for login4', 'Standard treatment scheme 29 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('2e55cb10-2739-4341-b1d7-bb98b7d8c5af', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 30 for login4', 'Standard treatment scheme 30 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('47159f47-ebcb-4b75-a630-30124928f0a0', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 31 for login4', 'Standard treatment scheme 31 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d1c9f7c9-11ce-4da1-b6e6-116766a22da7', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 32 for login4', 'Standard treatment scheme 32 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('2e8c86af-d86c-4b7e-a3f3-f7de9f458ff0', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 33 for login4', 'Standard treatment scheme 33 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('b1b07ddb-34a0-4f3a-acd7-4553d892b250', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 34 for login4', 'Standard treatment scheme 34 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('1a7a1012-61ac-46bd-b9fd-26927a7f9219', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 35 for login4', 'Standard treatment scheme 35 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('4df8b6b1-a76f-4fc0-9f26-19b6096c77d4', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 36 for login4', 'Standard treatment scheme 36 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d26264d4-a4cf-4bba-bbd2-95eca0e342c1', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 37 for login4', 'Standard treatment scheme 37 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d8304fed-cef1-48c3-95c3-930078446e76', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 38 for login4', 'Standard treatment scheme 38 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('dbf1c714-5775-4f3a-b443-ae395b95b77a', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 39 for login4', 'Standard treatment scheme 39 for login4');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('b09f82d7-8f8a-4e37-aca4-8da8de6127a2', '51351bb1-7563-479d-a8e9-201d0ff934c2', 'Treatment scheme 40 for login4', 'Standard treatment scheme 40 for login4');
-
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('72b290cb-d524-4c4d-b72d-28612086dbb5', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 01 for login5', 'Standard treatment scheme 01 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('8712fdb0-f08b-4e5d-9fff-f76a968a2b18', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 02 for login5', 'Standard treatment scheme 02 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('5db43cf5-6b2e-4415-b465-1b62eb9510dc', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 03 for login5', 'Standard treatment scheme 03 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('b6fd0069-3c78-4e47-8dfe-019167d35f2b', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 04 for login5', 'Standard treatment scheme 04 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('919fdc02-3bee-42db-a81a-a4807d6ac4ad', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 05 for login5', 'Standard treatment scheme 05 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('a562dd12-f1aa-4de1-a625-a21b20b75984', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 06 for login5', 'Standard treatment scheme 06 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('ad7d463e-8d8d-4d3a-a1c3-e1d2ffc270ed', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 07 for login5', 'Standard treatment scheme 07 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('c09e29cc-9b89-49a0-a45a-3bd8b30dbd9f', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 08 for login5', 'Standard treatment scheme 08 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('ee0fbe27-91d2-4a0f-9d24-2b037e125b2e', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 09 for login5', 'Standard treatment scheme 09 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('e0459a38-af20-4ab7-babd-b40b9f3b1661', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 10 for login5', 'Standard treatment scheme 10 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('311c412d-343b-47d2-9ad6-c47facd2ba06', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 11 for login5', 'Standard treatment scheme 11 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('8b625df8-503f-4a0e-9105-353d95fb3be6', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 12 for login5', 'Standard treatment scheme 12 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('850b3ba6-61fc-417b-ac8c-2ec1542fb4bd', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 13 for login5', 'Standard treatment scheme 13 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('ef55e7fc-02ec-4493-9cb8-0dfaf70eacc2', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 14 for login5', 'Standard treatment scheme 14 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('e96883dd-6baf-4daa-a142-af07014aee80', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 15 for login5', 'Standard treatment scheme 15 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('6348ff72-6216-470c-a3fb-9f87dcabdcde', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 16 for login5', 'Standard treatment scheme 16 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('cf14d92d-fded-4a01-ac3d-0debe7aad19f', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 17 for login5', 'Standard treatment scheme 17 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('3a8466f7-16b1-4d6c-ba4a-0c7217e59aec', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 18 for login5', 'Standard treatment scheme 18 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('b880932a-b6bb-4bb5-9e77-e1167ebc5b42', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 19 for login5', 'Standard treatment scheme 19 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('ca14f4b3-d99c-41b6-be38-6dbb397addeb', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 20 for login5', 'Standard treatment scheme 20 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('a34f5916-d60f-42fe-b8c8-dbd2d816d3eb', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 21 for login5', 'Standard treatment scheme 21 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('0c4cc519-7ee3-457d-b216-f541d2dc8bf8', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 22 for login5', 'Standard treatment scheme 22 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('1640c762-9b67-46dd-b662-3f8fcf59a304', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 23 for login5', 'Standard treatment scheme 23 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('7ad81eac-8760-4aa8-b6f4-274748cd3f7a', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 24 for login5', 'Standard treatment scheme 24 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('063ae7d4-a654-4009-94da-c07a9df2389f', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 25 for login5', 'Standard treatment scheme 25 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('61f11fed-c1f3-4159-ac53-01f22f38f927', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 26 for login5', 'Standard treatment scheme 26 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('50ab2efd-8c7d-4a14-bfd2-d89c74281fe0', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 27 for login5', 'Standard treatment scheme 27 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('915df5e1-a927-4930-8583-d0a1f07f2689', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 28 for login5', 'Standard treatment scheme 28 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('7cb089e1-b5f8-40c4-b4fd-504f5cfefbeb', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 29 for login5', 'Standard treatment scheme 29 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('959aeaa2-9524-4d06-87cf-27505df3c3b6', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 30 for login5', 'Standard treatment scheme 30 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('b067d2a2-60da-4f4c-b8d6-1f836ef48854', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 31 for login5', 'Standard treatment scheme 31 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('eb1e3c88-ee40-49a6-aced-3210500a7377', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 32 for login5', 'Standard treatment scheme 32 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('3f8f4b9d-7757-4678-9782-7d0dd8f04d2e', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 33 for login5', 'Standard treatment scheme 33 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('c75eb6ba-3448-440d-8b3a-6b8f84d48d7e', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 34 for login5', 'Standard treatment scheme 34 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('f0658d7b-e43e-4c79-9554-2048a1df7d36', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 35 for login5', 'Standard treatment scheme 35 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('8674a5f8-e7e4-48fa-83ec-011e0d0c0a48', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 36 for login5', 'Standard treatment scheme 36 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('89f22df7-f2d6-4ac7-b12c-7c4cd4a91bfa', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 37 for login5', 'Standard treatment scheme 37 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('bf5cf57a-1bf0-47b5-bf58-d973b584b155', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 38 for login5', 'Standard treatment scheme 38 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('5a855803-c4ec-4f85-be2c-dba874a56ccf', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 39 for login5', 'Standard treatment scheme 39 for login5');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('a3c7274b-d343-470a-aeaa-337debf999b5', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'Treatment scheme 40 for login5', 'Standard treatment scheme 40 for login5');
-
--- login6..login10: по 5 схем
-
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d54a8bd8-2278-4bd6-a05d-4e1930844b0d', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b7', 'Treatment scheme 01 for login6', 'Standard treatment scheme 01 for login6');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('e8f5e4bb-67f2-490d-96e4-63497de16acb', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b7', 'Treatment scheme 02 for login6', 'Standard treatment scheme 02 for login6');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('81e52566-531e-4d40-8209-755775f9d425', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b7', 'Treatment scheme 03 for login6', 'Standard treatment scheme 03 for login6');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('75b477f4-20bc-4c08-afdb-b098a6c502f7', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b7', 'Treatment scheme 04 for login6', 'Standard treatment scheme 04 for login6');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('df954ab8-1797-4098-b0a1-3ccc0d943d39', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b7', 'Treatment scheme 05 for login6', 'Standard treatment scheme 05 for login6');
-
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('cf1132d9-3a43-4e5d-b34c-8b19b1bf9e8d', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b8', 'Treatment scheme 01 for login7', 'Standard treatment scheme 01 for login7');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('37bf2da1-9a6a-4c2f-8984-bb5fd6cc8d3f', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b8', 'Treatment scheme 02 for login7', 'Standard treatment scheme 02 for login7');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('62737a4a-71bd-4f04-bd5c-22151f927592', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b8', 'Treatment scheme 03 for login7', 'Standard treatment scheme 03 for login7');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('8acbb0b0-4d83-4be7-abba-b39a018662ed', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b8', 'Treatment scheme 04 for login7', 'Standard treatment scheme 04 for login7');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('df2a0c75-6732-4e1a-9093-872bb2a1342a', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b8', 'Treatment scheme 05 for login7', 'Standard treatment scheme 05 for login7');
-
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('7740b026-4cc6-422e-8b9c-e7f6be9bd18b', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b9', 'Treatment scheme 01 for login8', 'Standard treatment scheme 01 for login8');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('ec42aa15-57e6-4d44-9837-fb17bf3da1ce', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b9', 'Treatment scheme 02 for login8', 'Standard treatment scheme 02 for login8');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('ab436b5c-4df1-4cae-bb34-e39637dfb539', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b9', 'Treatment scheme 03 for login8', 'Standard treatment scheme 03 for login8');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('b499addb-d9e4-45e7-b342-7a8618a21a3f', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b9', 'Treatment scheme 04 for login8', 'Standard treatment scheme 04 for login8');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('5de713fc-d0fc-4cc0-ba0f-ef6ecf256e82', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b9', 'Treatment scheme 05 for login8', 'Standard treatment scheme 05 for login8');
-
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('949e3b71-0a2e-4890-a9a9-0b95c50a0f5d', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b0', 'Treatment scheme 01 for login9', 'Standard treatment scheme 01 for login9');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('9a153947-16fa-4b95-83fc-745dccb149cb', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b0', 'Treatment scheme 02 for login9', 'Standard treatment scheme 02 for login9');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('7287725a-42dd-4bd1-83ff-d3d82de7de86', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b0', 'Treatment scheme 03 for login9', 'Standard treatment scheme 03 for login9');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('afe4f407-1440-4b83-a3fb-1961df602e08', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b0', 'Treatment scheme 04 for login9', 'Standard treatment scheme 04 for login9');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('0ece3f52-f44c-465b-bf0f-5ab25a23b0f7', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b0', 'Treatment scheme 05 for login9', 'Standard treatment scheme 05 for login9');
-
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('7ac7ad28-9e68-4aa7-b8ef-f7ffb7a7ca04', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b1', 'Treatment scheme 01 for login10', 'Standard treatment scheme 01 for login10');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('0e11eec4-8600-4ef8-a9fa-19d0133a3d6b', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b1', 'Treatment scheme 02 for login10', 'Standard treatment scheme 02 for login10');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('7133dd7a-73fc-4e00-8499-94b63aa21c02', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b1', 'Treatment scheme 03 for login10', 'Standard treatment scheme 03 for login10');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('ffad7a70-b797-4a44-9e4d-a39130cb18cc', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b1', 'Treatment scheme 04 for login10', 'Standard treatment scheme 04 for login10');
-INSERT INTO `up_and_down`.`user_treatment_schemes` (`uuid`, `user_uuid`, `treatment_name`, `instructions`) VALUES ('d1a2a1d7-d2b6-4f78-b2ad-3bfb9bf075c8', 'c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b1', 'Treatment scheme 05 for login10', 'Standard treatment scheme 05 for login10');

db_assets/sql_scripts/seed_users.sql

@@ -1,11 +0,0 @@
--- Заполнение пользователями
-INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('ab555fcb-b9ee-45f4-9de8-8f16daa5d03c', 'login1', '649111DF29DD8B55');
-INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('56b7c993-392f-41f8-adb1-9766842dc5fd', 'login2', '649111DF29DD8B55');
-INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('a243b5f2-e265-4c25-82a9-dde4cc70643f', 'login3', '649111DF29DD8B55');
-INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('51351bb1-7563-479d-a8e9-201d0ff934c2', 'login4', '649111DF29DD8B55');
-INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b6', 'login5', '649111DF29DD8B55');
-INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b7', 'login6', '649111DF29DD8B55');
-INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b8', 'login7', '649111DF29DD8B55');
-INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b9', 'login8', '649111DF29DD8B55');
-INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b0', 'login9', '649111DF29DD8B55');
-INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('c792bbe6-2bf2-4fe0-a781-ba96bfeaa3b1', 'login10', '649111DF29DD8B55');

src/DAO/IAuthDAO.h

@@ -3,7 +3,7 @@
 #include <cstdint>
 
 
-#include "../dtos/user_dto.h"
+#include "../entities/user.h"
 
 namespace uad
 {
@@ -16,8 +16,6 @@ public:
 
   virtual bool HasAuthorized(const std::string& auth_token) = 0;
 
-  virtual std::string_view GetUUID(const std::string& auth_token) = 0;
-
   virtual bool Logout(const std::string& user_token) = 0;
 
   virtual ~IAuthDAO() = default;

src/DAO/IDiariesDAO.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <string>
-
-#include "./../dtos/diary_dto.h"
-
-namespace uad
-{
-class IDiariesDAO
-{
-public:
-  virtual std::vector<diary_dto> GetDiariesByUserUUID(const std::string& login) = 0;
-
-  virtual void СreateDiary(
-    const std::string& user_uuid,
-    const diary_dto& dto
-  ) const = 0;
-
-  virtual ~IDiariesDAO() = default;
-};
-}

src/DAO/IMedicationsDAO.h

@@ -1,19 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <vector>
-
-#include "../dtos/medication_dto.h"
-
-namespace uad
-{
-class IMedicationsDAO
-{
-public:
-  [[nodiscard]] virtual std::vector<medication_dto> GetAll() const = 0;
-
-  [[nodiscard]] virtual std::string Create(const medication_dto& m) const = 0;
-
-  virtual ~IMedicationsDAO() = default;
-};
-}

src/DAO/IUserDAO.h

@@ -4,22 +4,22 @@
 #include <vector>
 #include <optional>
 
-#include "../dtos/user_dto.h"
+#include "../entities/user.h"
 
 namespace uad
 {
 class IUserDAO
 {
 public:
-  virtual std::string Create(const user_dto& created_user) = 0;
+  virtual std::string Create(const user& created_user) = 0;
 
-  virtual std::optional<user_dto> GetByUUID(const std::string& uuid) = 0;
+  virtual std::optional<user> GetByUUID(const std::string& uuid) = 0;
 
-  virtual std::optional<user_dto> GetByLogin(const std::string& login) = 0;
+  virtual std::optional<user> GetByLogin(const std::string& login) = 0;
 
-  virtual std::pair<bool, std::vector<user_dto>> GetAll(size_t limit, size_t offset) = 0;
+  virtual std::pair<bool, std::vector<user>> GetAll(size_t limit, size_t offset) = 0;
 
-  virtual bool Update(const user_dto& u) = 0;
+  virtual bool Update(const user& u) = 0;
 
   virtual bool Delete(const std::string& uuid) = 0;
 

src/DAO/IUserTreatmentSchemesDAO.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <string>
-#include "./../dtos/user_treatment_scheme_dto.h"
-
-namespace uad
-{
-class IUserTreatmentSchemeDAO {
-public:
-  virtual std::vector<user_treatment_scheme_dto> FindByUserUUID(const std::string& login) = 0;
-
-  virtual void CreateUserTreatmentScheme(
-        const std::string& user_login,
-        const user_treatment_scheme_dto& dto
-    ) = 0;
-
-  virtual ~IUserTreatmentSchemeDAO() = default;
-};
-}

src/DAO/MemoryAuthDAO.cpp

@@ -25,11 +25,6 @@ bool MemoryAuthDAO::HasAuthorized(const std::string& auth_token)
   return auth_tokens_to_users_uuids_.count(auth_token) > 0;
 }
 
-std::string_view MemoryAuthDAO::GetUUID(const std::string& auth_token)
-{
-  return auth_tokens_to_users_uuids_.at(auth_token);
-}
-
 bool MemoryAuthDAO::Logout(const std::string& auth_token)
 {
   if (!HasAuthorized(auth_token)) return false;

src/DAO/MemoryAuthDAO.h

@@ -25,8 +25,6 @@ public:
 
   bool HasAuthorized(const std::string& auth_token) override;
 
-  std::string_view GetUUID(const std::string& auth_token) override;
-
   bool Logout(const std::string& auth_token) override;
 };
 }

src/DAO/MySQLDiariesDAO.cpp

@@ -1,110 +0,0 @@
-#include "MySQLDiariesDAO.h"
-
-namespace uad
-{
-MySqlDiariesDAO::MySqlDiariesDAO(mysqlx::Session& session) : session_(session)
-{
-}
-
-std::vector<diary_dto> MySqlDiariesDAO::GetDiariesByUserUUID(const std::string& user_uuid)
-{
-  static const std::string query = R"(
-          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(user_uuid)
-                             .execute();
-
-  std::vector<diary_dto> diaries;
-  diaries.reserve(result.count());
-
-  for (const mysqlx::Row& row : result)
-  {
-    diary_dto dto;
-
-    dto.uuid = row[0].get<std::string>();
-    dto.time_ms = row[1].get<std::int64_t>();
-    dto.mania_level = row[2].get<int>();
-    dto.depression_level = row[3].get<int>();
-    dto.mood_level = row[4].get<int>();
-    dto.activity_level = row[5].get<int>();
-    dto.appetite_level = row[6].get<int>();
-    dto.dream_level = row[7].get<int>();
-    dto.anxiety_level = row[8].get<int>();
-
-    dto.comment = row[9].get<std::string>();
-
-    dto.user_treatment_scheme_uuid = row[10].get<std::string>();
-
-    diaries.push_back(std::move(dto));
-  }
-
-  return diaries;
-}
-
-void MySqlDiariesDAO::СreateDiary(const std::string& 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,
-      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();
-}
-}

src/DAO/MySQLDiariesDAO.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <string>
-
-#include "./../DAO/IDiariesDao.h"
-#include "./../db/mysql_connector.h"
-
-namespace uad
-{
-class MySqlDiariesDAO final : public IDiariesDAO
-{
-  mysqlx::Session& session_;
-
-public:
-  explicit MySqlDiariesDAO(mysqlx::Session& session);
-
-  std::vector<diary_dto> GetDiariesByUserUUID(const std::string& user_uuid) override;
-
-  void СreateDiary(
-    const std::string& user_uuid,
-    const diary_dto& dto
-  ) const override;
-};
-}

src/DAO/MySQLMedicationsDAO.cpp

@@ -1,52 +0,0 @@
-#include <boost/uuid.hpp>
-
-#include "MySQLMedicationsDAO.h"
-
-using namespace std;
-
-namespace  uad
-{
-MySQLMedicationsDAO::MySQLMedicationsDAO(mysqlx::Session& session): session_(session)
-{
-}
-
-std::vector<medication_dto> MySQLMedicationsDAO::GetAll() const
-{
-  static const string sql_script = "SELECT uuid, name, dose, unit, is_urgent FROM up_and_down.medications;";
-
-  mysqlx::SqlResult sql_result = session_.sql(sql_script).execute();
-  list<mysqlx::Row> rows = sql_result.fetchAll();
-
-  vector<medication_dto> ret;
-
-  if (rows.empty()) return ret;
-
-  for (const auto& row : rows)
-  {
-    medication_dto m;
-
-    m.uuid = row[0].get<string>();
-    m.name = row[1].get<string>();
-    m.dose = row[2].get<int64_t>();
-    m.unit = row[3].get<string>();
-    m.is_urgent = row[4].get<bool>();
-
-    ret.push_back(m);
-  }
-
-  return ret;
-}
-
-std::string MySQLMedicationsDAO::Create(const medication_dto& m) const
-{
-  boost::uuids::random_generator generator;
-  boost::uuids::uuid uuid = generator();
-  const std::string uuid_str = boost::uuids::to_string(uuid);
-
-  static const string sql_script = "INSERT INTO `up_and_down`.`medications` (`uuid`, `name`, `dose`, `unit`, `is_urgent`) VALUES ( ?, ?, ?, ?, ?);"s;
-
-  session_.sql(sql_script).bind(uuid_str, m.name, m.dose, m.unit, m.is_urgent).execute();
-
-  return uuid_str;
-}
-}

src/DAO/MySQLMedicationsDAO.h

@@ -1,21 +0,0 @@
-#pragma once
-#include <mysqlx/xdevapi.h>
-#include <cstdint>
-#include <vector>
-
-#include "IMedicationsDAO.h"
-#include "../dtos/medication_dto.h"
-
-namespace uad
-{
-class MySQLMedicationsDAO : public IMedicationsDAO
-{
-  mysqlx::Session& session_;
-public:
-  explicit MySQLMedicationsDAO(mysqlx::Session& session);
-
-  [[nodiscard]] std::vector<medication_dto> GetAll() const override;
-
-  [[nodiscard]] std::string Create(const medication_dto& m) const override;
-};
-}

src/DAO/MySQLUserDAO.cpp

@@ -14,7 +14,7 @@ MySQLUserDAO::MySQLUserDAO(mysqlx::Session& session) :
 {
 }
 
-string MySQLUserDAO::Create(const user_dto& created_user)
+string MySQLUserDAO::Create(const user& created_user)
 {
   boost::uuids::random_generator generator;
   boost::uuids::uuid uuid = generator();
@@ -31,7 +31,7 @@ string MySQLUserDAO::Create(const user_dto& created_user)
   return uuid_str;
 }
 
-optional<user_dto> MySQLUserDAO::GetByUUID(const string& uuid)
+optional<user> MySQLUserDAO::GetByUUID(const string& uuid)
 {
   static const string sql_script = "SELECT * FROM `up_and_down`.`users` WHERE (uuid = ?) LIMIT 1;"s;
   mysqlx::SqlResult sql_result = session_.
@@ -42,7 +42,7 @@ optional<user_dto> MySQLUserDAO::GetByUUID(const string& uuid)
   return GetSingleUserBySQLResult(std::move(sql_result));
 }
 
-optional<user_dto> MySQLUserDAO::GetByLogin(const string& login)
+optional<user> MySQLUserDAO::GetByLogin(const string& login)
 {
   static const std::string sql_script = "SELECT * FROM `up_and_down`.`users` WHERE (login = ?) LIMIT 1;"s;
   mysqlx::SqlResult sql_result = session_.
@@ -53,7 +53,7 @@ optional<user_dto> MySQLUserDAO::GetByLogin(const string& login)
   return GetSingleUserBySQLResult(std::move(sql_result));
 }
 
-pair<bool, vector<user_dto>> MySQLUserDAO::GetAll(size_t limit, size_t offset)
+pair<bool, vector<user>> MySQLUserDAO::GetAll(size_t limit, size_t offset)
 {
   static const string sql_script = "SELECT * FROM `up_and_down`.`users` LIMIT ? OFFSET ?;"s;
 
@@ -62,18 +62,18 @@ pair<bool, vector<user_dto>> MySQLUserDAO::GetAll(size_t limit, size_t offset)
                                  .bind(limit, offset)
                                  .execute();
   list<mysqlx::Row> rows = sql_result.fetchAll();
-  pair<bool, vector<user_dto>> ret;
+  pair<bool, vector<user>> ret;
 
   if (!rows.size())
   {
     ret.first = true;
-    ret.second = vector<user_dto>{};
+    ret.second = vector<user>{};
 
     return ret;
   }
 
   ret.first = rows.size() < limit + 1;
-  ret.second = vector<user_dto>{};
+  ret.second = vector<user>{};
 
   ret.second.reserve(limit);
 
@@ -84,7 +84,7 @@ pair<bool, vector<user_dto>> MySQLUserDAO::GetAll(size_t limit, size_t offset)
       break;
     }
 
-    user_dto user;
+    user user;
 
     const string user_uuid = row[0].get<string>();
     const string user_login = row[1].get<string>();
@@ -96,7 +96,7 @@ pair<bool, vector<user_dto>> MySQLUserDAO::GetAll(size_t limit, size_t offset)
   return ret;
 }
 
-bool MySQLUserDAO::Update(const user_dto& u)
+bool MySQLUserDAO::Update(const user& u)
 {
   static const string sql_script = "UPDATE `up_and_down`.`users` SET `login` = ? WHERE `uuid` = ?;"s;
 
@@ -118,7 +118,7 @@ bool MySQLUserDAO::Delete(const string& uuid)
   return !!schema.getAffectedItemsCount();
 }
 
-std::optional<user_dto> MySQLUserDAO::GetSingleUserBySQLResult(mysqlx::SqlResult&& sql_result)
+std::optional<user> MySQLUserDAO::GetSingleUserBySQLResult(mysqlx::SqlResult&& sql_result)
 {
   list<mysqlx::Row> rows = sql_result.fetchAll();
 
@@ -133,7 +133,7 @@ std::optional<user_dto> MySQLUserDAO::GetSingleUserBySQLResult(mysqlx::SqlResult
   const string user_login = row_data[1].get<string>();
   const string user_hashed_password = row_data[2].get<string>();
 
-  return optional<user_dto>({
+  return optional<user>({
       .uuid = user_uuid,
       .login = user_login,
       .hashed_password = user_hashed_password

src/DAO/MySQLUserDAO.h

@@ -1,4 +1,3 @@
-#pragma once
 #include <mysqlx/xdevapi.h>
 
 #include "IUserDAO.h"
@@ -11,19 +10,19 @@ class MySQLUserDAO : public IUserDAO
 public:
   explicit MySQLUserDAO(mysqlx::Session& session);
 
-  std::string Create(const user_dto& created_user) override;
+  std::string Create(const user& created_user) override;
 
-  std::optional<user_dto> GetByUUID(const std::string& uuid) override;
+  std::optional<user> GetByUUID(const std::string& uuid) override;
 
-  std::optional<user_dto> GetByLogin(const std::string& login) override;
+  std::optional<user> GetByLogin(const std::string& login) override;
 
-  std::pair<bool, std::vector<user_dto>> GetAll(size_t limit, size_t offset) override;
+  std::pair<bool, std::vector<user>> GetAll(size_t limit, size_t offset) override;
 
-  bool Update(const user_dto& u) override;
+  bool Update(const user& u) override;
 
   bool Delete(const std::string& uuid) override;
 
 private:
-  std::optional<user_dto> GetSingleUserBySQLResult(mysqlx::SqlResult&& sql_result);
+  std::optional<user> GetSingleUserBySQLResult(mysqlx::SqlResult&& sql_result);
 };
 }

src/DAO/MySQLUserTreatmentSchemesDAO.cpp

@@ -1,112 +0,0 @@
-#include <mysqlx/xdevapi.h>
-#include <unordered_map>
-
-#include "MySQLUserTreatmentSchemesDAO.h"
-
-namespace uad
-{
-MySQLUserTreatmentSchemesDAO::MySQLUserTreatmentSchemesDAO(mysqlx::Session& session)
-  : session_(session)
-{
-}
-
-std::vector<user_treatment_scheme_dto> MySQLUserTreatmentSchemesDAO::FindByUserUUID(
-  const std::string& user_uuid)
-{
-  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));
-  }
-
-  return std::move(schemes);
-}
-
-void MySQLUserTreatmentSchemesDAO::CreateUserTreatmentScheme(
-  const std::string& 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,
-        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

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "IUserTreatmentSchemesDAO.h"
-#include <mysqlx/xdevapi.h>
-
-namespace uad
-{
-class MySQLUserTreatmentSchemesDAO : public IUserTreatmentSchemeDAO
-{
-  mysqlx::Session& session_;
-public:
-  explicit MySQLUserTreatmentSchemesDAO(mysqlx::Session& session);
-
-  std::vector<user_treatment_scheme_dto> FindByUserUUID(const std::string& uuid) override;
-
-  void CreateUserTreatmentScheme(
-        const std::string& user_login,
-        const user_treatment_scheme_dto& dto
-    ) override;
-};
-} // uad

src/Session.cpp

@@ -1,81 +0,0 @@
-#include "RequestHandlers/BasicRequestHandler.h"
-#include "Session.h"
-
-namespace uad
-{
-Session::Session(
-  tcp::socket&& socket,
-  std::shared_ptr<std::string const> const& doc_root)
-  : stream_(std::move(socket)), doc_root_(doc_root) {}
-
-void Session::Run()
-{
-  net::dispatch(stream_.get_executor(),
-                beast::bind_front_handler(
-                  &Session::DoRead,
-                  shared_from_this()));
-}
-
-void Session::DoRead()
-{
-  req_ = {};
-
-  stream_.expires_after(std::chrono::seconds(30));
-
-  http::async_read(stream_, buffer_, req_,
-                   beast::bind_front_handler(
-                     &Session::OnRead,
-                     shared_from_this()));
-}
-
-void Session::OnRead(
-  beast::error_code ec,
-  std::size_t bytes_transferred)
-{
-  boost::ignore_unused(bytes_transferred);
-
-  if (ec == http::error::end_of_stream)
-    return DoClose();
-
-  if (ec)
-    return Fail(ec, "read");
-
-  SendResponse(
-    HandleRequest(*doc_root_, std::move(req_)));
-}
-
-void Session::SendResponse(http::message_generator&& msg)
-{
-  bool keep_alive = msg.keep_alive();
-
-  beast::async_write(
-    stream_,
-    std::move(msg),
-    beast::bind_front_handler(
-      &Session::OnWrite, shared_from_this(), keep_alive));
-}
-
-void Session::OnWrite(
-  bool keep_alive,
-  beast::error_code ec,
-  std::size_t bytes_transferred)
-{
-  boost::ignore_unused(bytes_transferred);
-
-  if (ec)
-    return uad::Fail(ec, "write");
-
-  if (!keep_alive)
-  {
-    return DoClose();
-  }
-
-  DoRead();
-}
-
-void Session::DoClose()
-{
-  beast::error_code ec;
-  stream_.socket().shutdown(tcp::socket::shutdown_send, ec);
-}
-}

src/Session.h

@@ -1,49 +0,0 @@
-#pragma once
-
-#include <boost/beast/core.hpp>
-#include <boost/beast/http.hpp>
-#include <boost/beast/version.hpp>
-#include <boost/asio/dispatch.hpp>
-#include <boost/asio/strand.hpp>
-#include <memory>
-#include <string>
-
-#include "helpers.h"
-
-namespace uad
-{
-namespace beast = boost::beast;
-namespace http = beast::http;
-using tcp = boost::asio::ip::tcp;
-namespace net = boost::asio;
-
-class Session : public std::enable_shared_from_this<Session>
-{
-  beast::tcp_stream stream_;
-  beast::flat_buffer buffer_;
-  std::shared_ptr<std::string const> doc_root_;
-  http::request<http::string_body> req_;
-
- public:
-  Session(
-    tcp::socket&& socket,
-    std::shared_ptr<std::string const> const& doc_root);
-
-  void Run();
-
-  void DoRead();
-
-  void OnRead(
-    beast::error_code ec,
-    std::size_t bytes_transferred);
-
-  void SendResponse(http::message_generator&& msg);
-
-  void OnWrite(
-    bool keep_alive,
-    beast::error_code ec,
-    std::size_t bytes_transferred);
-
-  void DoClose();
-};
-}

src/content_type.h

@@ -1,27 +0,0 @@
-#include <string_view>
-
-namespace uad
-{
-using namespace std::string_view_literals;
-
-struct content_type
-{
-  content_type() = delete;
-  constexpr inline static std::string_view k_TextHtml = "text/html"sv;
-  constexpr inline static std::string_view k_TextCsv = "text/csv"sv;
-  constexpr inline static std::string_view k_TextPlain = "text/plain"sv;
-  constexpr inline static std::string_view k_JSON = "application/json"sv;
-  constexpr inline static std::string_view k_Audio = "audio/mpeg"sv;
-  constexpr inline static std::string_view k_AudioExample = "audio/example"sv;
-  constexpr inline static std::string_view k_FontWoff = "font/woff"sv;
-  constexpr inline static std::string_view k_FontTtf = "font/ttf"sv;
-  constexpr inline static std::string_view k_FontOtf = "font/otf"sv;
-  constexpr inline static std::string_view k_ImagePng = "image/png"sv;
-  constexpr inline static std::string_view k_ImageJpeg = "image/jpeg"sv;
-  constexpr inline static std::string_view k_ImageGif = "image/gif"sv;
-  constexpr inline static std::string_view k_Model = "model/vrml"sv;
-  constexpr inline static std::string_view k_VideoMp4 = "video/mp4"sv;
-  constexpr inline static std::string_view k_VideoWebm = "video/webm"sv;
-  constexpr inline static std::string_view k_Binary = "application/octet-stream"sv;
-};
-}

src/dtos/diary_dto.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <string>
-#include <cstdint>
-
-namespace uad
-{
-struct diary_dto
-{
-  std::string uuid;
-  int64_t time_ms;
-  int64_t mania_level;
-  int64_t depression_level;
-  int64_t mood_level;
-  int64_t activity_level;
-  int64_t appetite_level;
-  int64_t dream_level;
-  int64_t anxiety_level;
-  std::string comment;
-  std::string user_treatment_scheme_uuid;
-};
-}

src/dtos/medication_dto.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include <string>
-
-#include "../helpers/helpers.h"
-
-namespace uad
-{
-struct medication_dto
-{
-  std::string uuid;
-  std::string name;
-  int64_t dose;
-  std::string unit;
-  bool is_urgent;
-};
-}

src/dtos/user_treatment_scheme_dto.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-
-namespace uad
-{
-struct user_treatment_scheme_dto {
-  std::string uuid;
-  std::string user_uuid;
-  std::string treatment_name;
-  std::string instructions;
-
-  std::vector<std::string> medication_uuids;
-};
-}

src/endpoints_handlers/AuthLoginExecutor.h

@@ -1,12 +1,11 @@
 #pragma once
-#include <boost/log/trivial.hpp>
 
 #include <regex>
 #include <boost/json.hpp>
 #include <mysqlx/xdevapi.h>
 #include <mysqlx/common/api.h>
-
 #include <boost/uuid.hpp>
+
 #include "IExecutor.h"
 #include "../DAO/IUserDAO.h"
 #include "../DAO/IAuthDAO.h"
@@ -30,7 +29,7 @@ public:
   {
   }
 
-  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
+  boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
   ) override
   {
@@ -39,8 +38,6 @@ public:
     using namespace boost::beast;
     using namespace std::string_literals;
 
-    BOOST_LOG_TRIVIAL(info) << "POST /api/v1/Auth/Login - Request";
-
     const auto body = req.body();
     value req_json;
 
@@ -50,8 +47,7 @@ public:
     }
     catch (const system::system_error& err)
     {
-      BOOST_LOG_TRIVIAL(info) << "POST /api/v1/Auth/Login - Response 400: Cannot deserialize json";
+      throw session_exception(http::status::bad_request, "cannot deserialize json");
-      throw session_exception(http::status::bad_request, "Cannot deserialize json");
     }
 
 
@@ -60,15 +56,13 @@ public:
 
     if (login.empty() || password.empty())
     {
-      BOOST_LOG_TRIVIAL(info) << "POST /api/v1/Auth/Login - Response 422: Login or password are empty";
       throw session_exception(http::status::unprocessable_entity, "Login or password are empty"s);
     }
 
-    const std::optional<user_dto> maybe_user = user_dao_->GetByLogin(login);
+    const std::optional<user> maybe_user = user_dao_->GetByLogin(login);
 
-    if (!maybe_user.has_value() || maybe_user.value().hashed_password != HashPassword(password))
+    if (!maybe_user.has_value() && maybe_user.value().hashed_password != HashPassword(password))
     {
-      BOOST_LOG_TRIVIAL(info) << "POST /api/v1/Auth/Login - Response 403: Incorrect login or password";
       throw session_exception(http::status::forbidden,"Incorrect login or password");
     }
     const std::string token = GenerateUUID();

src/endpoints_handlers/AuthLogoutExecutor.h

@@ -1,12 +1,15 @@
 #pragma once
-#include <boost/log/trivial.hpp>
 
+#include <regex>
 #include <boost/json.hpp>
 #include <mysqlx/xdevapi.h>
+#include <mysqlx/common/api.h>
+#include <boost/uuid.hpp>
 
 #include "IExecutor.h"
+#include "../DAO/IUserDAO.h"
 #include "../DAO/IAuthDAO.h"
-#include "../exceptions/session_exception.h"
+#include "../helpers/helpers.h"
 
 namespace uad
 {
@@ -23,7 +26,7 @@ public:
   {
   }
 
-  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
+  boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
     ) override
   {
@@ -32,8 +35,6 @@ public:
     using namespace boost::beast;
     using namespace std::string_literals;
 
-    BOOST_LOG_TRIVIAL(info) << "POST /api/v1/Auth/Logout - Request";
-
     const auto body = req.body();
     value req_json;
 
@@ -43,16 +44,14 @@ public:
     }
     catch (const system::system_error& err)
     {
-      BOOST_LOG_TRIVIAL(error) << "POST /api/v1/Auth/Logout - Response 400: Cannot deserialize json";
+      throw session_exception(http::status::internal_server_error, "cannot deserialize json"s);
-      throw session_exception(http::status::bad_request, "cannot deserialize json"s);
     }
 
     const std::string token = req_json.as_object().at("token").as_string().c_str();
 
     if (!auth_dao_->Logout(token))
     {
-      BOOST_LOG_TRIVIAL(error) << "POST /api/v1/Auth/Logout - Response 400: Token is not authorized";
+      throw session_exception(http::status::bad_request,  "token is not authorized"s);
-      throw session_exception(http::status::bad_request,  "Token is not authorized"s);
     }
 
     http::response<ResponseType> res{http::status::ok, req.version()};

src/endpoints_handlers/AuthRegistrationExecutor.h

@@ -1,9 +1,9 @@
 #pragma once
-#include <boost/log/trivial.hpp>
 
 #include <regex>
 #include <boost/json.hpp>
 #include <mysqlx/xdevapi.h>
+#include <boost/log/trivial.hpp>
 
 #include "IExecutor.h"
 #include "../DAO/IUserDAO.h"
@@ -24,7 +24,7 @@ public:
   {
   }
 
-  [[nodiscard]] boost::beast::http::response<ResponseType> operator ()(
+  boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
   ) override
   {
@@ -33,8 +33,6 @@ public:
     using namespace boost::beast;
     using namespace std::string_literals;
 
-    BOOST_LOG_TRIVIAL(info) << "POST /api/v1/Auth/Registration - Request";
-
     const auto& body = req.body();
     value req_json;
 
@@ -44,8 +42,7 @@ public:
     }
     catch (const system::system_error& err)
     {
-      BOOST_LOG_TRIVIAL(error) << "POST /api/v1/Auth/Registration - Response 400: Cannot deserialize json";
+      throw session_exception(http::status::bad_request, "cannot deserialize json");
-      throw session_exception(http::status::bad_request, "Cannot deserialize json");
     }
 
     const std::string login = req_json.as_object().at("login").as_string().c_str();
@@ -53,7 +50,6 @@ public:
 
     if (!ValidateLogin(login) || !ValidatePassword(password))
     {
-      BOOST_LOG_TRIVIAL(error) << "POST /api/v1/Auth/Registration - Response 422: Validations failed. Login should have length from 3 to 50. Password from 5 characters length.";
       throw session_exception(
       http::status::unprocessable_entity,
         "Validations failed. Login should have length from 3 to 50. Password from 5 characters length."s
@@ -62,11 +58,10 @@ public:
 
     if (user_dao_->GetByLogin(login).has_value())
     {
-      BOOST_LOG_TRIVIAL(error) << "POST /api/v1/Auth/Registration - Response 409: "s + "User with login "s + login + " exists"s;
+      throw session_exception(http::status::conflict, "user with login "s + login + " exists"s);
-      throw session_exception(http::status::conflict, "User with login "s + login + " exists"s);
     }
 
-    user_dto user;
+    user user;
 
     user.login = login;
     user.hashed_password = HashPassword(password);

src/endpoints_handlers/GetDiariesExecutor.h

@@ -1,123 +0,0 @@
-#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 GetDiariesExecutor : public IExecutor<Body, Allocator, ResponseType>
-{
-  mysqlx::Session& session_;
-  const std::shared_ptr<IAuthDAO>& auth_dao_;
-  const std::shared_ptr<IDiariesDAO>& diaries_dao_;
-
-public:
-  GetDiariesExecutor(
-    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 =
-      "GET /api/v1/User/Medications - Response 401: Unauthorized"s;
-
-    BOOST_LOG_TRIVIAL(info) << "GET /api/v1/User/Medications - 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()};
-
-    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

@@ -1,105 +0,0 @@
-#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/IMedicationsDAO.h"
-#include "../exceptions/session_exception.h"
-
-namespace uad
-{
-template <class Body, class Allocator, class ResponseType>
-class GetUserMedicationsExecutor : public IExecutor<Body, Allocator, ResponseType>
-{
-  mysqlx::Session& session_;
-  const std::shared_ptr<IAuthDAO>& auth_dao_;
-  const std::shared_ptr<IMedicationsDAO>& medications_dao_;
-public:
-  GetUserMedicationsExecutor(
-    mysqlx::Session& session,
-    const std::shared_ptr<IAuthDAO>& auth_dao,
-    const std::shared_ptr<IMedicationsDAO>& medications_dao
-  ): session_(session), auth_dao_(auth_dao), medications_dao_(medications_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 = "GET /api/v1/User/Medications - Response 401: Unauthorized"s;
-
-    BOOST_LOG_TRIVIAL(info) << "GET /api/v1/User/Medications - 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");
-    }
-
-    http::response<ResponseType> res{http::status::ok, req.version()};
-    const std::vector<medication_dto> medications = medications_dao_->GetAll();
-    value response_body;
-
-    response_body.emplace_object();
-    response_body.as_object().emplace("medications", toJSONArray(medications));
-
-    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 medication_dto& m)
-  {
-    return {
-          { "uuid", m.uuid },
-          { "name", m.name },
-          { "dose", m.dose },
-          { "unit", m.unit },
-          { "is_urgent", m.is_urgent }
-    };
-  }
-
-  boost::json::array toJSONArray(const std::vector<medication_dto>& medications)
-  {
-    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 : medications)
-    {
-      arr.emplace_back(ToJSON(m));
-    }
-
-    return std::move(arr);
-  }
-};
-}

src/endpoints_handlers/GetUserTreatmentSchemeExecutor.h

@@ -1,120 +0,0 @@
-#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 GetUserTreatmentSchemeExecutor : 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:
-  GetUserTreatmentSchemeExecutor(
-    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 =
-      "GET /api/v1/UserTreatmentSchemes - Response 401: Unauthorized"s;
-
-    BOOST_LOG_TRIVIAL(info) << "GET /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()};
-
-    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));
-
-    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 user_treatment_scheme_dto& scheme)
-  {
-    boost::json::array medications_json;
-    medications_json.reserve(scheme.medication_uuids.size());
-
-    for (const auto& medication_uuid : scheme.medication_uuids) {
-      medications_json.emplace_back(medication_uuid);
-    }
-
-    boost::json::object scheme_json;
-    scheme_json["uuid"] = scheme.uuid;
-    scheme_json["treatment_name"] = scheme.treatment_name;
-    scheme_json["instructions"] = scheme.instructions;
-    scheme_json["medications"] = std::move(medications_json);
-
-    return scheme_json;
-  }
-
-  boost::json::array ToJSONArray(const std::vector<user_treatment_scheme_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/HandleRequest.h

@@ -4,14 +4,10 @@
 
 #include "../db/mysql_connector.h"
 #include "../DAO/IUserDAO.h"
-#include "../DAO/IMedicationsDAO.h"
-#include "../DAO/MySQLUserTreatmentSchemesDAO.h"
 #include "AuthRegistrationExecutor.h"
 #include "RootExecutor.h"
 #include "../DAO/MemoryAuthDAO.h"
 #include "../DAO/MySQLUserDAO.h"
-#include "../DAO/MySQLMedicationsDAO.h"
-#include "../DAO/MySQLDiariesDAO.h"
 
 namespace uad
 {
@@ -23,17 +19,11 @@ void HandleRequest(
 {
   static std::shared_ptr<IUserDAO> user_dao = std::make_shared<MySQLUserDAO>(GetMySqlSession());
   static std::shared_ptr<IAuthDAO> auth_dao = std::make_shared<MemoryAuthDAO>(GetMySqlSession());
-  static std::shared_ptr<IMedicationsDAO> medications_dao = std::make_shared<MySQLMedicationsDAO>(GetMySqlSession());
-  static std::shared_ptr<IUserTreatmentSchemeDAO> user_treatment_schemes_dao = std::make_shared<MySQLUserTreatmentSchemesDAO>(GetMySqlSession());
-  static std::shared_ptr<IDiariesDAO> diaries_dao = std::make_shared<MySqlDiariesDAO>(GetMySqlSession());
 
   static RootExecutor<Body, Allocator, boost::beast::http::string_body, Send> root_executor(
     GetMySqlSession(),
     user_dao,
-    auth_dao,
+    auth_dao
-    medications_dao,
-    user_treatment_schemes_dao,
-    diaries_dao
   );
 
   root_executor(doc_root, std::move(req), std::forward<Send>(send));

src/endpoints_handlers/IExecutor.h

@@ -8,30 +8,9 @@ template <class Body, class Allocator, class ResponseType>
 class IExecutor
 {
 public:
-  [[nodiscard]] virtual boost::beast::http::response<ResponseType> operator ()(
+  virtual boost::beast::http::response<ResponseType> operator ()(
     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
   ) = 0;
   virtual ~IExecutor() = default;
 };
-
-// class IAuthorizable : public IExecutor
-// {
-//   IExecutor& next_executor_;
-// public:
-//   IAuthorizable(IExecutor& next_executor): next_executor_(next_executor)
-//   {
-//
-//   }
-//
-//   boost::beast::http::response<ResponseType> operator ()(
-//     boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>>&& req
-//   ) override
-//   {
-//     // Логика проверки авторизации
-//     // передать управление следующему executorу - возврат req
-//     // посмотреть chain of responsibility, composite
-//     // выбрасывать исключение здесь
-//     return next_executor_(req);
-//   }
-// };
 }

src/endpoints_handlers/PostDiaryExecutor.h

@@ -1,144 +0,0 @@
-#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 = obj["uuid"].as_string().c_str();
-    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();
-
-    if (obj.contains("comment"))
-      dto.comment = obj["comment"].as_string().c_str();
-
-    if (obj.contains("user_treatment_scheme_uuid"))
-      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

@@ -1,111 +0,0 @@
-#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/IMedicationsDAO.h"
-#include "../exceptions/session_exception.h"
-
-namespace uad
-{
-template <class Body, class Allocator, class ResponseType>
-class PostUserMedicationsExecutor : public IExecutor<Body, Allocator, ResponseType>
-{
-  mysqlx::Session& session_;
-  const std::shared_ptr<IAuthDAO>& auth_dao_;
-  const std::shared_ptr<IMedicationsDAO>& medications_dao_;
-public:
-  PostUserMedicationsExecutor(
-    mysqlx::Session& session,
-    const std::shared_ptr<IAuthDAO>& auth_dao,
-    const std::shared_ptr<IMedicationsDAO>& medications_dao
-  ): session_(session), auth_dao_(auth_dao), medications_dao_(medications_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/User/Medications - Response 401: Unauthorized"s;
-
-    BOOST_LOG_TRIVIAL(info) << "POST /api/v1/User/Medications - 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");
-    }
-
-    const auto body = req.body();
-    value req_json;
-    medication_dto m;
-
-    try
-    {
-      req_json = json::parse(body);
-    }
-    catch (const system::system_error& err)
-    {
-      BOOST_LOG_TRIVIAL(error) << "POST /api/v1/User/Medications - Response 400: Cannot deserialize json";
-      throw session_exception(http::status::bad_request, "Cannot deserialize json");
-    }
-
-    m.name = req_json.as_object().at("name").as_string().c_str();
-    m.dose = req_json.as_object().at("dose").as_int64();
-    m.unit = req_json.as_object().at("unit").as_string().c_str();
-    m.is_urgent = req_json.as_object().at("is_urgent").as_bool();
-
-    try
-    {
-      m.uuid = medications_dao_->Create(m);
-    }
-    catch (const std::runtime_error& err)
-    {
-      BOOST_LOG_TRIVIAL(error) << "POST /api/v1/User/Medications - Response 409: This medication already exists";
-      throw session_exception(http::status::conflict, "This medication already exists");
-    }
-
-    http::response<ResponseType> res{http::status::ok, req.version()};
-
-    res.body() = serialize(ToJSON(m));
-    res.set(http::field::content_type, "application/json");
-    res.content_length(res.body().size());
-
-    return res;
-  }
-
-private:
-  boost::json::object ToJSON(const medication_dto& m)
-  {
-    return {
-          { "uuid", m.uuid },
-          { "name", m.name },
-          { "dose", m.dose },
-          { "unit", m.unit },
-          { "is_urgent", m.is_urgent }
-    };
-  }
-};
-}

src/endpoints_handlers/PostUserTreatmentSchemeExecutor.h

@@ -1,144 +0,0 @@
-#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/RootExecutor.h

@@ -1,6 +1,3 @@
-#pragma once
-
-#include <boost/url.hpp>
 #include <mysqlx/xdevapi.h>
 #include <mysqlx/common/api.h>
 
@@ -10,17 +7,8 @@
 #include "AuthRegistrationExecutor.h"
 #include "AuthLoginExecutor.h"
 #include "AuthLogoutExecutor.h"
-#include "GetUserMedicationsExecutor.h"
-#include "GetUserTreatmentSchemeExecutor.h"
-#include "PostUserTreatmentSchemeExecutor.h"
-#include "PostUserMedicationsExecutor.h"
-#include "GetDiariesExecutor.h"
-#include "PostDiaryExecutor.h"
 #include "../DAO/IUserDAO.h"
 #include "../DAO/IAuthDAO.h"
-#include "../DAO/IDiariesDAO.h"
-#include "../DAO/IMedicationsDAO.h"
-#include "../DAO/IUserTreatmentSchemesDAO.h"
 #include "./../helpers/helpers.h"
 #include "./../exceptions/session_exception.h"
 
@@ -36,18 +24,6 @@ class RootExecutor
     Body, Allocator, boost::beast::http::string_body>;
   using RouteAuthLogoutExecutor = AuthLogoutExecutor<
     Body, Allocator, boost::beast::http::string_body>;
-  using RouteGetUserMedicationsExecutor = GetUserMedicationsExecutor<
-    Body, Allocator, boost::beast::http::string_body>;
-  using RoutePostUserMedicationsExecutor = PostUserMedicationsExecutor<
-    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 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>>;
@@ -61,95 +37,34 @@ private:
   mysqlx::Session& session_;
   const std::shared_ptr<IUserDAO>& user_dao_;
   const std::shared_ptr<IAuthDAO>& auth_dao_;
-  const std::shared_ptr<IMedicationsDAO>& medications_dao_;
-  const std::shared_ptr<IUserTreatmentSchemeDAO>& user_treatment_scheme_dao_;
-  const std::shared_ptr<IDiariesDAO>& diaries_dao_;
 
 public:
   RootExecutor(
     mysqlx::Session& session,
     const std::shared_ptr<IUserDAO>& user_dao,
-    const std::shared_ptr<IAuthDAO>& auth_dao,
+    const std::shared_ptr<IAuthDAO>& auth_dao) :
-    const std::shared_ptr<IMedicationsDAO>& medications_dao,
+    session_(session), user_dao_(user_dao), auth_dao_(auth_dao)
-    const std::shared_ptr<IUserTreatmentSchemeDAO>& user_treatment_scheme_dao,
-    const std::shared_ptr<IDiariesDAO>& diaries_dao
-  ) :
-    session_(session),
-    user_dao_(user_dao),
-    auth_dao_(auth_dao),
-    medications_dao_(medications_dao),
-    user_treatment_scheme_dao_(user_treatment_scheme_dao),
-    diaries_dao_(diaries_dao)
   {
     routes_pathes_["/api/v1/Auth/Register"] = std::make_unique<RouteController>(
       typename RouteController::HTTPMethodsToExecutors{
-         {
+        {boost::beast::http::verb::post, std::make_shared<RouteAuthRegistrationExecutor>(
-           boost::beast::http::verb::post, std::make_shared<RouteAuthRegistrationExecutor>(
            session_,
            user_dao_
-             )
+           )}
-         }
       }
       );
 
     routes_pathes_["/api/v1/Auth/Login"] = std::make_unique<RouteController>(
       typename RouteController::HTTPMethodsToExecutors{
-         {
+        {boost::beast::http::verb::post,
-           boost::beast::http::verb::post,
+         std::make_shared<RouteAuthLoginExecutor>(session_, user_dao_, auth_dao_)}
-           std::make_shared<RouteAuthLoginExecutor>(session_, user_dao_, auth_dao_)
-         }
       }
       );
 
     routes_pathes_["/api/v1/Auth/Logout"] = std::make_unique<RouteController>(
       typename RouteController::HTTPMethodsToExecutors{
-         {
+        {boost::beast::http::verb::post,
-           boost::beast::http::verb::post,
+         std::make_shared<RouteAuthLogoutExecutor>(session_, auth_dao_)}
-           std::make_shared<RouteAuthLogoutExecutor>(session_, auth_dao_)
-         }
-       }
-      );
-
-    routes_pathes_["/api/v1/User/Medications"] = std::make_unique<RouteController>(
-       typename RouteController::HTTPMethodsToExecutors{
-         {
-           boost::beast::http::verb::get,
-           std::make_shared<RouteGetUserMedicationsExecutor>(session_, auth_dao_, medications_dao_)
-         },
-         {
-           boost::beast::http::verb::post,
-           std::make_shared<RoutePostUserMedicationsExecutor>(session_, auth_dao_, medications_dao_)
-         },
-       }
-      );
-
-    routes_pathes_["/api/v1/UserTreatmentSchemes"] = std::make_unique<RouteController>(
-       typename RouteController::HTTPMethodsToExecutors{
-         {
-           boost::beast::http::verb::get,
-           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_)
-         }
-       }
-      );
-
-    routes_pathes_["/api/v1/Diaries"] = std::make_unique<RouteController>(
-       typename RouteController::HTTPMethodsToExecutors{
-         {
-           boost::beast::http::verb::get,
-           std::make_shared<RouteGetDiariesExecutor>(session_, auth_dao_,
-                                                     diaries_dao_)
-         },
-         {
-           boost::beast::http::verb::post,
-           std::make_shared<RoutePostDiaryExecutor>(session_, auth_dao_,
-                                                     diaries_dao_)
-         },
       }
       );
   }
@@ -160,8 +75,6 @@ public:
     Send&& send
     )
   {
-    namespace urls = boost::urls;
-
     const std::string& route = req.target();
     const bool is_match_route = routes_pathes_.count(route);
 
@@ -183,24 +96,20 @@ public:
         }
         catch (const session_exception& e)
         {
-          return send(SendSessionExceptionError(std::move(req), e));
+          boost::beast::http::response<ResponseType> res{e.code, req.version()};
-        }
+          boost::json::value response_body;
-      }
-    }
 
-    // urls::url_view parsed_view = urls::parse_uri_reference("/api/v1/Diaries/123").value();
+          response_body.emplace_object();
-    // auto segs = parsed_view.segments();
+          response_body.as_object().emplace("Result", e.what());
-    // std::vector<std::string_view> parts;
+
-    //
+          res.body() = serialize(response_body);
-    // for (auto s : segs)
+          res.set(boost::beast::http::field::content_type, "application/json");
-    //   parts.push_back(s);
+          res.content_length(res.body().size());
-    //
+
-    // if (parts.size() == 4 &&
+          return send(std::move(res));
-    // parts[0] == "api" &&
+        }
-    // parts[2] == "Diaries")
+      }
-    // {
+    }
-    //   std::string uuid = std::string(parts[3]);
-    // }
 
     if (req.method() != boost::beast::http::verb::get &&
       req.method() != boost::beast::http::verb::head)
@@ -298,20 +207,5 @@ private:
     res.prepare_payload();
     return res;
   }
-
-  boost::beast::http::response<ResponseType> SendSessionExceptionError(Request&& req, 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 res;
-  }
 };
 }

src/entities/user.h

@@ -6,7 +6,7 @@
 
 namespace uad
 {
-struct user_dto
+struct user
 {
   std::string uuid;
   std::string login;

src/helper.cpp

@@ -1,67 +0,0 @@
-#include "helpers.h"
-
-namespace uad
-{
-beast::string_view MimeType(beast::string_view path)
-{
-  using beast::iequals;
-  auto const ext = [&path]
-  {
-    auto const pos = path.rfind(".");
-    if (pos == beast::string_view::npos)
-      return beast::string_view {};
-    return path.substr(pos);
-  }();
-  if (iequals(ext, ".htm")) return "text/html";
-  if (iequals(ext, ".html")) return "text/html";
-  if (iequals(ext, ".php")) return "text/html";
-  if (iequals(ext, ".css")) return "text/css";
-  if (iequals(ext, ".txt")) return "text/plain";
-  if (iequals(ext, ".js")) return "application/javascript";
-  if (iequals(ext, ".json")) return "application/json";
-  if (iequals(ext, ".xml")) return "application/xml";
-  if (iequals(ext, ".swf")) return "application/x-shockwave-flash";
-  if (iequals(ext, ".flv")) return "video/x-flv";
-  if (iequals(ext, ".png")) return "image/png";
-  if (iequals(ext, ".jpe")) return "image/jpeg";
-  if (iequals(ext, ".jpeg")) return "image/jpeg";
-  if (iequals(ext, ".jpg")) return "image/jpeg";
-  if (iequals(ext, ".gif")) return "image/gif";
-  if (iequals(ext, ".bmp")) return "image/bmp";
-  if (iequals(ext, ".ico")) return "image/vnd.microsoft.icon";
-  if (iequals(ext, ".tiff")) return "image/tiff";
-  if (iequals(ext, ".tif")) return "image/tiff";
-  if (iequals(ext, ".svg")) return "image/svg+xml";
-  if (iequals(ext, ".svgz")) return "image/svg+xml";
-  return "application/text";
-}
-
-std::string PathCat(
-  beast::string_view base,
-  beast::string_view path)
-{
-  if (base.empty())
-    return std::string(path);
-  std::string result(base);
-#ifdef BOOST_MSVC
-  char constexpr path_separator = '\\';
-  if (result.back() == path_separator)
-    result.resize(result.size() - 1);
-  result.append(path.data(), path.size());
-  for (auto& c: result)
-    if (c == '/')
-      c = path_separator;
-#else
-  char constexpr path_separator = '/';
-    if(result.back() == path_separator)
-      result.resize(result.size() - 1);
-    result.append(path.data(), path.size());
-#endif
-  return result;
-}
-
-void Fail(beast::error_code ec, char const* what)
-{
-  std::cerr << what << ": " << ec.message() << "\n";
-}
-}

src/helpers.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <boost/beast/core.hpp>
-#include <boost/beast/http.hpp>
-#include <boost/beast/version.hpp>
-#include <boost/asio/dispatch.hpp>
-#include <boost/asio/strand.hpp>
-#include <boost/config.hpp>
-#include <algorithm>
-#include <cstdlib>
-#include <functional>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <thread>
-#include <vector>
-
-namespace uad
-{
-namespace beast = boost::beast;
-namespace http = beast::http;
-namespace net = boost::asio;
-
-beast::string_view MimeType(beast::string_view path);
-
-std::string PathCat(beast::string_view base, beast::string_view path);
-
-void Fail(beast::error_code ec, char const* what);
-}

src/log/Log.cpp

@@ -1,24 +0,0 @@
-#pragma once
-
-#include <boost/log/trivial.hpp>
-#include <boost/log/utility/setup/file.hpp>
-#include <boost/log/utility/setup/common_attributes.hpp>
-
-namespace logging = boost::log;
-
-namespace uad
-{
-void InitLogs()
-{
-  logging::add_file_log(
-    logging::keywords::file_name = "app_%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),
-    logging::keywords::format =
-      "[%TimeStamp%] [%Severity%]: %Message%"
-  );
-
-  logging::add_common_attributes();
-}
-}

src/log/Log.h

@@ -1,6 +0,0 @@
-#pragma once
-
-namespace uad
-{
-void InitLogs();
-}

src/main.cpp

@@ -1,9 +1,7 @@
-#include <boost/log/trivial.hpp>
 #ifdef WIN32
 #include <sdkddkver.h>
 #endif
 
-
 #include <algorithm>
 #include <boost/asio/signal_set.hpp>
 #include <boost/beast/core.hpp>
@@ -20,8 +18,7 @@
 #include "./session/WebsocketSession.h"
 #include "./listener/Listener.h"
 #include "./db/mysql_connector.h"
-#include "dtos/user_dto.h"
+#include "entities/user.h"
-#include "log/Log.h"
 
 namespace beast = boost::beast;
 namespace http = beast::http;
@@ -31,7 +28,6 @@ using tcp = boost::asio::ip::tcp;
 using namespace uad;
 using namespace std;
 using namespace std::string_literals;
-namespace logging = boost::log;
 
 int main(int argc, char* argv[])
 {
@@ -48,8 +44,6 @@ int main(int argc, char* argv[])
   auto const threads = std::max<int>(1, std::atoi(argv[4]));
   string mysql_credentials = argv[5];
 
-  InitLogs();
-
   uad::SetMySqlSession(new mysqlx::Session(mysql_credentials));
 
   net::io_context ioc{threads};
@@ -59,8 +53,6 @@ int main(int argc, char* argv[])
   net::signal_set signals(ioc, SIGINT, SIGTERM);
   signals.async_wait([&](beast::error_code const&, int) { ioc.stop(); });
 
-  BOOST_LOG_TRIVIAL(info) << "Приложение запущено";
-
   std::vector<std::thread> v;
   v.reserve(threads - 1);
   for (auto i = threads - 1; i > 0; --i)

src/sdk.h

@@ -1,4 +0,0 @@
-#pragma once
-#ifdef WIN32
-#include <sdkddkver.h>
-#endif

tests/endpoint_handlers/AuthLoginExecutor_TEST.cpp

@@ -1,107 +0,0 @@
-#ifdef WIN32
-#include <sdkddkver.h>
-#include <WinSock2.h>
-#endif
-
-#define BOOST_TEST_MODULE AuthLoginExecutors
-
-#include <boost/test/included/unit_test.hpp>
-
-#include <string>
-
-#include "./../../src/endpoints_handlers/AuthLoginExecutor.h"
-
-#include "../../src/DAO/MemoryAuthDAO.h"
-#include "./../../src/DAO/MySQLUserDAO.h"
-#include "./../../src/db/mysql_connector.h"
-#include "./../../src/exceptions/session_exception.h"
-#include "./../../src/helpers/helpers.h"
-#include "../fixtures/AuthFixture.h"
-
-using namespace std;
-using namespace uad;
-using namespace boost;
-using namespace beast;
-using namespace json;
-
-using RouteAuthLoginExecutor = AuthLoginExecutor<beast::http::string_body,
-                                                 std::allocator<char>,
-                                                 beast::http::string_body>;
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Cannot_Serialize_JSON, AuthFixture)
-{
-  RouteAuthLoginExecutor executor(GetMySqlSession(), user_dao, auth_dao);
-
-  req.body() = "{ \"login\": ABS3 }"s;
-  req.content_length(req.body().size());
-
-  BOOST_CHECK_EXCEPTION(executor(std::move(req)), session_exception,
-                        [](const session_exception& e) -> bool
-                        {
-                        return e.code == beast::http::status::bad_request;
-                        });
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Invalid_Login_Data, AuthFixture)
-{
-  RouteAuthLoginExecutor executor(GetMySqlSession(), user_dao, auth_dao);
-
-  value req_body;
-
-  req_body.emplace_object();
-
-  req_body.as_object().emplace("login"s, "MyLogin123456780"s + uuid);
-  req_body.as_object().emplace("password"s, "Qwerty123456"s);
-
-  req.body() = serialize(req_body);
-
-  BOOST_CHECK_EXCEPTION(executor(std::move(req)), session_exception,
-                        [](const session_exception& e) -> bool
-                        {
-                        return e.code == beast::http::status::forbidden;
-                        });
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Invalid_Fields, AuthFixture)
-{
-  RouteAuthLoginExecutor executor(GetMySqlSession(), user_dao, auth_dao);
-
-  value req_body;
-
-  req_body.emplace_object();
-
-  req_body.as_object().emplace("login"s, ""s);
-  req_body.as_object().emplace("password"s, ""s);
-
-  req.body() = serialize(req_body);
-
-  BOOST_CHECK_EXCEPTION(executor(std::move(req)), session_exception,
-                        [](const session_exception& e) -> bool
-                        {
-                        return e.code == beast::http::status::unprocessable_entity;
-                        });
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Succesful_Login, AuthFixture)
-{
-  RouteAuthLoginExecutor executor(GetMySqlSession(), user_dao, auth_dao);
-
-  value req_body;
-
-  user_dao->Create({""s, "MyLogin123456780"s + uuid, HashPassword("Qwerty123456"s)});
-
-  req_body.emplace_object();
-
-  req_body.as_object().emplace("login"s, "MyLogin123456780"s + uuid);
-  req_body.as_object().emplace("password"s, "Qwerty123456"s);
-
-  req.body() = serialize(req_body);
-
-  auto response = executor(std::move(req));
-
-  BOOST_CHECK(response.result() == http::status::ok);
-
-  auto response_body = parse(response.body());
-
-  BOOST_CHECK(response_body.as_object().count("token"s) == 1);
-}

tests/endpoint_handlers/AuthLogoutExecutor_TEST.cpp

@@ -1,88 +0,0 @@
-#ifdef WIN32
-#include <sdkddkver.h>
-#include <WinSock2.h>
-#endif
-
-#define BOOST_TEST_MODULE AuthLoginExecutors
-
-#include <boost/test/included/unit_test.hpp>
-
-#include <string>
-
-#include "./../../src/endpoints_handlers/AuthLogoutExecutor.h"
-
-#include "../../src/DAO/MemoryAuthDAO.h"
-#include "./../../src/DAO/MySQLUserDAO.h"
-#include "./../../src/db/mysql_connector.h"
-#include "./../../src/exceptions/session_exception.h"
-#include "./../../src/helpers/helpers.h"
-#include "../fixtures/AuthFixture.h"
-
-using namespace std;
-using namespace uad;
-using namespace boost;
-using namespace beast;
-using namespace json;
-
-using RouteAuthLogoutExecutor = AuthLogoutExecutor<beast::http::string_body,
-                                                   std::allocator<char>,
-                                                   beast::http::string_body>;
-using Request = boost::beast::http::request<beast::http::string_body,
-                                            beast::http::basic_fields<std::allocator<char>>>;
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Cant_Find_User_Token, AuthFixture)
-{
-  RouteAuthLogoutExecutor executor(GetMySqlSession(), auth_dao);
-
-  value req_body;
-
-  req_body.emplace_object();
-  req_body.as_object().emplace("token", "1234567890");
-
-  req.body() = "{ \"token\": abcde }";
-  req.content_length(req.body().size());
-
-  BOOST_CHECK_EXCEPTION(executor(std::move(req)), session_exception,
-                        [](const session_exception& e) -> bool
-                        {
-                        return e.code == beast::http::status::bad_request;
-                        });
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Cant_Revoke_Token, AuthFixture)
-{
-  RouteAuthLogoutExecutor executor(GetMySqlSession(), auth_dao);
-
-  value req_body;
-
-  req_body.emplace_object();
-  req_body.as_object().emplace("token", "1234567890");
-
-  req.body() = "{ \"token\": \"1234567890\" }";
-  req.content_length(req.body().size());
-
-  BOOST_CHECK_EXCEPTION(executor(std::move(req)), session_exception,
-                        [](const session_exception& e) -> bool
-                        {
-                        return e.code == beast::http::status::bad_request;
-                        });
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Succesful_Auth, AuthFixture)
-{
-  RouteAuthLogoutExecutor executor(GetMySqlSession(), auth_dao);
-
-  value req_body;
-
-  auth_dao->Login("SomethingUser", "1234567890");
-
-  req_body.emplace_object();
-  req_body.as_object().emplace("token", "1234567890");
-
-  req.body() = "{ \"token\": \"1234567890\" }";
-  req.content_length(req.body().size());
-
-  auto response = executor(std::move(req));
-
-  BOOST_CHECK(response.result() == http::status::ok);
-}

tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp

@@ -1,102 +0,0 @@
-#ifdef WIN32
-#include <sdkddkver.h>
-#endif
-
-#define BOOST_TEST_MODULE AuthRegistrationExecutors
-
-#include <boost/test/included/unit_test.hpp>
-
-#include <string>
-
-#include "./../../src/endpoints_handlers/AuthRegistrationExecutor.h"
-#include "./../../src/DAO/MySQLUserDAO.h"
-#include "./../../src/db/mysql_connector.h"
-#include "./../../src/exceptions/session_exception.h"
-#include "./../../src/helpers/helpers.h"
-#include "./../fixtures/AuthFixture.h"
-
-using namespace std;
-using namespace uad;
-using namespace boost;
-using namespace beast;
-using namespace json;
-
-using RouteAuthRegistrationExecutor = AuthRegistrationExecutor<beast::http::string_body,
-                                                               std::allocator<char>,
-                                                               beast::http::string_body>;
-using Request = boost::beast::http::request<beast::http::string_body,
-                                            beast::http::basic_fields<std::allocator<char>>>;
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Failed_Parse_Payload, AuthFixture)
-{
-  RouteAuthRegistrationExecutor executor(GetMySqlSession(), user_dao);
-
-  req.body() = "{ \"login\": ABS3 }"s;
-
-  BOOST_CHECK_EXCEPTION(executor(std::move(req)), session_exception, [](const session_exception& e) -> bool
-  {
-    return e.code == beast::http::status::bad_request;
-  });
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Invalid_Login_Data, AuthFixture)
-{
-  RouteAuthRegistrationExecutor executor(GetMySqlSession(), user_dao);
-
-  value req_body;
-
-  req_body.emplace_object();
-
-  req_body.as_object().emplace("login"s, "wq");
-  req_body.as_object().emplace("password"s, "Qw");
-
-  req.body() = serialize(req_body);
-
-  BOOST_CHECK_EXCEPTION(executor(std::move(req)), session_exception, [](const session_exception& e) -> bool
-  {
-    return e.code == beast::http::status::unprocessable_entity;
-  });
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Succesfull_User_Login, AuthFixture)
-{
-  RouteAuthRegistrationExecutor executor(GetMySqlSession(), user_dao);
-
-  value req_body;
-
-  req_body.emplace_object();
-
-  req_body.as_object().emplace("login"s, "MyLogin123456780"s + uuid);
-  req_body.as_object().emplace("password"s, "Qwerty123456"s);
-
-  req.body() = serialize(req_body);
-
-  auto response = executor(std::move(req));
-
-  BOOST_CHECK_EQUAL(response.result(), http::status::created);
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Unsuccesfull_User_Registration, AuthFixture)
-{
-  RouteAuthRegistrationExecutor executor(GetMySqlSession(), user_dao);
-
-  user_dao->Create(
-    user_dto {
-      .login = "MyLogin123456780"s + uuid,
-      .hashed_password = HashPassword("Qwerty123456"s)}
-    );
-
-  value req_body;
-
-  req_body.emplace_object();
-
-  req_body.as_object().emplace("login"s, "MyLogin123456780"s + uuid);
-  req_body.as_object().emplace("password"s, "Qwerty123456"s);
-
-  req.body() = serialize(req_body);
-
-  BOOST_CHECK_EXCEPTION(executor(std::move(req)), session_exception, [](const session_exception& e) -> bool
-  {
-    return e.code == beast::http::status::conflict;
-  });
-}

tests/fixtures/AuthFixture.cpp

@@ -1,36 +0,0 @@
-#include "AuthFixture.h"
-
-#include <boost/test/unit_test.hpp>
-#include <boost/beast.hpp>
-
-#include <memory>
-
-#include "./../../src/db/mysql_connector.h"
-
-using namespace std;
-
-namespace uad
-{
-AuthFixture::AuthFixture() :
-  uuid(std::to_string(uad::Random())),
-  argv(boost::unit_test::framework::master_test_suite().argv),
-  mysql_credentials(argv[1]),
-  mysql_session(new mysqlx::Session(mysql_credentials)),
-  helper(mysql_session),
-  user_dao(std::make_shared<MySQLUserDAO>(GetMySqlSession())),
-  auth_dao(make_shared<MemoryAuthDAO>(GetMySqlSession()))
-{
-  BOOST_TEST_MESSAGE("Setup RouteAuthRegistrationExecutor fixture");
-}
-
-AuthFixture::~AuthFixture()
-{
-  argv = nullptr;
-  mysql_session->close();
-  delete mysql_session;
-  mysql_session = nullptr;
-  SetMySqlSession(nullptr);
-
-  BOOST_TEST_MESSAGE("Teardown RouteAuthRegistrationExecutor fixture");
-}
-}

tests/fixtures/AuthFixture.h

@@ -1,40 +0,0 @@
-#pragma once
-
-#include <string>
-#include <boost/beast.hpp>
-#include <memory>
-#include <boost/test/unit_test.hpp>
-
-#include <mysqlx/xdevapi.h>
-#include "./../../src/endpoints_handlers/AuthRegistrationExecutor.h"
-#include "./../../src/DAO/MySQLUserDAO.h"
-#include "./../../src/DAO/MemoryAuthDAO.h"
-#include "./../../src/db/mysql_connector.h"
-#include "fixture_session_initialization_helper.h"
-
-namespace uad
-{
-using Request = boost::beast::http::request<boost::beast::http::string_body,
-                                            boost::beast::http::basic_fields<std::allocator<char>>>;
-
-class AuthFixture
-{
-public:
-  const std::string uuid;
-  char** argv;
-
-  const std::string mysql_credentials;
-  mysqlx::Session* mysql_session;
-
-  fixture_session_initialization_helper helper;
-
-  std::shared_ptr<IUserDAO> user_dao;
-  std::shared_ptr<MemoryAuthDAO> auth_dao;
-
-  Request req;
-
-  AuthFixture();
-
-  ~AuthFixture();
-};
-}

tests/fixtures/fixture_session_initialization_helper.cpp

@@ -1,9 +0,0 @@
-#include "fixture_session_initialization_helper.h"
-
-namespace uad
-{
-fixture_session_initialization_helper::fixture_session_initialization_helper(mysqlx::Session* session)
-{
-  uad::SetMySqlSession(session);
-}
-}

tests/fixtures/fixture_session_initialization_helper.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include "./../../src/db/mysql_connector.h"
-
-namespace uad
-{
-struct fixture_session_initialization_helper
-{
-  explicit fixture_session_initialization_helper(mysqlx::Session* session);
-};
-}