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

(cherry picked from commit a5542aba7c322dee98a7236b1a5dad70355d179d)

CMakeLists.txt

@@ -3,17 +3,17 @@ project(UpAndDown)
 
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-add_definitions(-D_WIN32_WINNT=0x0602)
+
-if (POLICY CMP0167)
+if(POLICY CMP0167)
     cmake_policy(SET CMP0167 OLD)
-endif ()
+endif()
 
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_INCLUDE_DIR ${BOOST_ROOT})
 set(Boost_LIBRARY_DIR "${BOOST_ROOT}/stage/lib")
 
-find_package(Boost 1.88.0 REQUIRED COMPONENTS filesystem json log system filesystem)
+find_package(Boost 1.88.0 REQUIRED COMPONENTS filesystem json log)
 if (Boost_FOUND)
     include_directories(${Boost_INCLUDE_DIR})
 endif ()
@@ -24,142 +24,54 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
 add_executable(App ./src/main.cpp
-        ./src/helpers/helpers.h
+                   ./src/helpers/helpers.h
-        ./src/helpers/helpers.cpp
+                   ./src/helpers/helpers.cpp
-        ./src/endpoints_handlers/HandleRequest.h
+                   ./src/endpoints_handlers/HandleRequest.h
-        ./src/endpoints_handlers/IController.h
+                   ./src/endpoints_handlers/IController.h
-        ./src/endpoints_handlers/Controller.h
+                   ./src/endpoints_handlers/Controller.h
-        ./src/session/HttpSession.h
+                   ./src/session/HttpSession.h
-        ./src/session/HttpSession.cpp
+                   ./src/session/HttpSession.cpp
-        ./src/session/WebsocketSession.h
+                   ./src/session/WebsocketSession.h
-        ./src/session/WebsocketSession.cpp
+                   ./src/session/WebsocketSession.cpp
-        ./src/listener/Listener.h
+                   ./src/listener/Listener.h
-        ./src/listener/Listener.cpp
+                   ./src/listener/Listener.cpp
-        ./src/db/mysql_connector.cpp
+                   ./src/db/mysql_connector.cpp
-        ./src/db/mysql_connector.h
+                   ./src/db/mysql_connector.h
-        ./src/DAO/IUserDAO.h
+                   ./src/DAO/IUserDAO.h
-        ./src/entities/user.h
+                   ./src/entities/user.h
-        ./src/DAO/MySQLUserDAO.cpp
+                   ./src/DAO/MySQLUserDAO.cpp
-        ./src/DAO/MySQLUserDAO.h
+                   ./src/DAO/MySQLUserDAO.h
-        ./src/endpoints_handlers/IExecutor.h
+                   ./src/endpoints_handlers/IExecutor.h
-        ./src/endpoints_handlers/AuthRegistrationExecutor.h
+                   ./src/endpoints_handlers/AuthRegistrationExecutor.h
-        ./src/endpoints_handlers/RootExecutor.h
+                   ./src/endpoints_handlers/RootExecutor.h
-        ./src/DAO/IAuthDAO.h
+                   ./src/DAO/IAuthDAO.h
-        ./src/DAO/MemoryAuthDAO.cpp
+                   ./src/DAO/MemoryAuthDAO.cpp
-        ./src/DAO/MemoryAuthDAO.h
+                   ./src/DAO/MemoryAuthDAO.h
-        ./src/endpoints_handlers/AuthLogoutExecutor.h
+                   ./src/endpoints_handlers/AuthLogoutExecutor.h
-        ./src/endpoints_handlers/AuthLoginExecutor.h
+                   ./src/exceptions/session_exception.cpp
-        ./src/exceptions/session_exception.cpp
+                   ./src/exceptions/session_exception.h
-        ./src/exceptions/session_exception.h
-        src/log/Log.h
-        src/log/Log.cpp
-        tests/fixtures/AuthFixture.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
-        Threads::Threads
-        mysql::concpp)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
 endif ()
 
 add_executable(HelpersTests ./tests/helpers/helpers_TEST.cpp
-        ./src/helpers/helpers.h
+                            ./src/helpers/helpers.h
-        ./src/helpers/helpers.cpp)
+                            ./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
-        ./src/endpoints_handlers/IController.h
+                               ./src/endpoints_handlers/IController.h
-        ./src/endpoints_handlers/Controller.h)
+                               ./src/endpoints_handlers/Controller.h)
 target_link_libraries(ControllerTests PRIVATE Boost::boost)
 add_test(ControllerTests ControllerTests)
 
-add_executable(AuthRegistrationExecutorTests ./tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp
-        ./src/endpoints_handlers/AuthRegistrationExecutor.h
-        ./src/exceptions/session_exception.cpp
-        ./src/exceptions/session_exception.h
-        ./src/helpers/helpers.h
-        ./src/helpers/helpers.cpp
-        ./src/DAO/MemoryAuthDAO.h
-        ./src/DAO/MemoryAuthDAO.cpp
-        ./src/DAO/MySQLUserDAO.h
-        ./src/DAO/MySQLUserDAO.cpp
-        ./src/db/mysql_connector.h
-        ./src/db/mysql_connector.cpp
-        tests/fixtures/AuthFixture.h
-        tests/fixtures/AuthFixture.cpp
-        ./tests/fixtures/fixture_session_initialization_helper.h
-        ./tests/fixtures/fixture_session_initialization_helper.cpp)
-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)
+endif()
-    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

@@ -5,7 +5,7 @@
 - Посмотреть пулл соединений(Object pool) при использовании базы данных(посмотреть api MySQL-Connector)
 - Посмотреть, что дает MySQL, какие там есть возможность
 - Посмотреть и подумать, что лучше - корутины или многопоточность?
-- ~~Покрыть тестами класс User и AuthRegistrationExecutor~~
+- Покрыть тестами класс User и AuthRegistrationExecutor
 - ~~Добавить clang-format(через CLion)~~
 - ~~Перевести GetByUUID GetByLogin на const ref/string_view в IUserDAO - также не vector, а span(погуглить)~~ - span не применим
 - ~~Привести к единому виду функции IUserDAO~~
@@ -15,14 +15,9 @@
 - ~~SharedPtr - передавать по константной ссылке.~~
 - ~~Вынести обработку исключений в RootExecutor~~
 - ~~Уменьшить дублирование кода в исключениях~~
-- ~~Покрыть логами~~
+- Покрыть логами
 - ~~Сделать один класс исключений, имеющих метод HTTP code - код и сообщение записывать уже в ловушке~~
-- ~~Сделать интеграционный тест по ручкам~~
+- Сделать интеграционный тест по ручкам
-- UseCase'ы по работе с личным кабинетом
-- Научиться поднимать базы данных под каждый тест - научиться Docker - docker-compose - а если тест что-то должен заполнить, то он заполняет в самом начале()
-- Возможно, сделать тесты на CI/CD - приоритет - низкий
-- ~~Заменить internal_server_error на bad_request и перепроверить коды ошибок~~
-- ~~Создание и удаление вспомогательных классов должно быть вынесено в фикстуру~~
 
 # UseCase'ы приложения:
 
@@ -30,7 +25,7 @@
 
 ## UseCase №1
 ### 1.Название: Зарегистрировать пользователя
-### 2.Актор: Пользователь-пациент
+### 2.Актор: Пользователь
 ### 3.Цель: Внести данные о новом пользователе в систему
 ### 4.Предусловия:
 * Пользователь не авторизован в системе
@@ -86,7 +81,7 @@
 
 ## UseCase №2
 ### 1.Название: Авторизация пользователя
-### 2.Актор: Пользователь-пациент
+### 2.Актор: Пользователь
 ### 3.Цель: Предоставить пользователю возможность получить его данные в виде дневника болезни
 ### 4.Предусловия:
 * Пользователь должен быть зарегистрирован в системе
@@ -156,7 +151,7 @@ null
 
 ## UseCase №3
 ### 1.Название: Переход на главную страницу
-### 2.Актор: Пользователь-пациент
+### 2.Актор: Пользователь
 ### 3.Цель: Предоставить пользователю поверхностный вывод данных о нем и инструменты для глубокого просмотра данных и их модификации
 ### 4.Предусловия:
 * Пользователь имеет актуальный токен, подтверждающий его авторизацию в системе
@@ -165,7 +160,6 @@ null
 #### A1.Записи в дневнике есть
 * Система перенаправляет пользователя на его основную страницу
 * Система запрашивает и выводит последние записи и схемы лечения его дневника
-* Система делает доступными операции с дневником
 #### A2.Записей в дневнике нет
 * Заместо вывода записей в дневнике, система выводит заглушку, информирующую пользователя, что дневник пуст
 * Система делает доступными операции с дневником
@@ -178,7 +172,7 @@ null
 * Пользователю доступны операции добавления, модификации и удаления записей, а также схем лечения
 ### 8.API-Маршруты
 * `GET /api/v1/User/Diaries` - получить кусок дневника пользователя (требует 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)
+* `GET /api/v1/User/TreatmentSchemes` - получить кусок дневника пользователя (требует Authorization: Bearer <token>) query-параметры: from (int, по умолч. 0), count (int, по умолч. 20)
 
 ### 9.Контракт
 #### Diaries-Request
@@ -188,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,
@@ -196,19 +190,11 @@ null
       "appetite_level": 5,
       "dream_level": 6,
       "anxiety_level": 7,
-      "comment": "Накрыл психоз. Выпил одну таблетку аминазина"
       "treatment_scheme": {
         "uuid": "bf6d1555-39e9-4d73-8928-4763627f4dd5",
         "treatment_name": "Bipolar I Scheme",
         "instructions": "Контроль лития в крови раз в 2 месяца. Анализ крови через вену."
         "medications": [
-          {
-            "uuid": "9bf2dfa9-3add-413c-9a0e-ff605088f1d5",
-            name: "Haloperidol",
-            dose: 10
-            unit: "mg",
-            "is_urgent": false
-          },
           {
             "uuid": "8af2dfa9-3add-413c-9a0e-ff605088f1d5",
             "name": "Litii Carbonate",
@@ -266,230 +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/Auth/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`: {
-    "uuid": "248313cb-a75e-4331-8379-d3f2fc36b68d"
-    "treatment_name": "Bipolar I Scheme Urgent",
-    "instructions": "Схема для быстрого и жесткого купирования психозов. Аминазин пить каждый день.",
-    "medications": [
-      {
-        "uuid": "eda5a5f7-167a-44b9-900d-c5c6acfc249b",
-        "name": "Aminazin",
-        "dose": 100,
-        "unit": "mg",
-        "is_urgent": true
-      }
-    ]
-  },
-}
-```
-
-##### 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/Auth/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": [
-      {
-        "uuid": "eda5a5f7-167a-44b9-900d-c5c6acfc249b",
-        "name": "Aminazin",
-        "dose": 100,
-        "unit": "mg",
-        "is_urgent": true
-      }
-    ]
-  },
-}
-```
-##### 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/Auth/Diaries/:diary_guid` - удаление записи в дневнике
-
-### 9.Контракт
-#### Diaries-Request
-##### Требования к валидации:
-* `:diary_guid` должен указывать на существующую страницу дневника
-
-##### Response - 204 - Deleted
-```
-null
-```
-##### Errors
-* `404 NOT_FOUND` - такой схемы лечения болезни никогда не существовало или она уже удалена
-
-### 10. Используемые сущности ДБ
-* diaries(uuid(PK))

build/conan.lock

@@ -1,42 +0,0 @@
-{
- "graph_lock": {
-  "nodes": {
-   "0": {
-    "options": "boost:asio_no_deprecated=False\nboost:buildid=None\nboost:bzip2=True\nboost:debug_level=0\nboost:diagnostic_definitions=False\nboost:error_code_header_only=False\nboost:extra_b2_flags=None\nboost:filesystem_no_deprecated=False\nboost:filesystem_use_std_fs=False\nboost:filesystem_version=None\nboost:header_only=False\nboost:i18n_backend=deprecated\nboost:i18n_backend_iconv=off\nboost:i18n_backend_icu=False\nboost:layout=system\nboost:lzma=False\nboost:magic_autolink=False\nboost:multithreading=True\nboost:namespace=boost\nboost:namespace_alias=False\nboost:pch=True\nboost:python_executable=None\nboost:python_version=None\nboost:segmented_stacks=False\nboost:shared=False\nboost:system_no_deprecated=False\nboost:system_use_utf8=False\nboost:visibility=hidden\nboost:without_atomic=False\nboost:without_chrono=False\nboost:without_cobalt=True\nboost:without_container=False\nboost:without_context=False\nboost:without_contract=False\nboost:without_coroutine=False\nboost:without_date_time=False\nboost:without_exception=False\nboost:without_fiber=True\nboost:without_filesystem=False\nboost:without_graph=False\nboost:without_graph_parallel=True\nboost:without_iostreams=False\nboost:without_json=False\nboost:without_locale=False\nboost:without_log=False\nboost:without_math=False\nboost:without_mpi=True\nboost:without_nowide=False\nboost:without_program_options=False\nboost:without_python=True\nboost:without_random=False\nboost:without_regex=False\nboost:without_serialization=False\nboost:without_stacktrace=False\nboost:without_system=False\nboost:without_test=False\nboost:without_thread=False\nboost:without_timer=False\nboost:without_type_erasure=False\nboost:without_url=False\nboost:without_wave=False\nboost:zlib=True\nboost:zstd=False\nbzip2:build_executable=True\nbzip2:shared=False\nzlib:shared=False",
-    "requires": [
-     "1"
-    ],
-    "path": "..\\conanfile.txt",
-    "context": "host"
-   },
-   "1": {
-    "ref": "boost/1.84.0",
-    "options": "asio_no_deprecated=False\nbuildid=None\nbzip2=True\ndebug_level=0\ndiagnostic_definitions=False\nerror_code_header_only=False\nextra_b2_flags=None\nfilesystem_no_deprecated=False\nfilesystem_use_std_fs=False\nfilesystem_version=None\nheader_only=False\ni18n_backend=deprecated\ni18n_backend_iconv=off\ni18n_backend_icu=False\nlayout=system\nlzma=False\nmagic_autolink=False\nmultithreading=True\nnamespace=boost\nnamespace_alias=False\npch=True\npython_executable=None\npython_version=None\nsegmented_stacks=False\nshared=False\nsystem_no_deprecated=False\nsystem_use_utf8=False\nvisibility=hidden\nwithout_atomic=False\nwithout_chrono=False\nwithout_cobalt=True\nwithout_container=False\nwithout_context=False\nwithout_contract=False\nwithout_coroutine=False\nwithout_date_time=False\nwithout_exception=False\nwithout_fiber=True\nwithout_filesystem=False\nwithout_graph=False\nwithout_graph_parallel=True\nwithout_iostreams=False\nwithout_json=False\nwithout_locale=False\nwithout_log=False\nwithout_math=False\nwithout_mpi=True\nwithout_nowide=False\nwithout_program_options=False\nwithout_python=True\nwithout_random=False\nwithout_regex=False\nwithout_serialization=False\nwithout_stacktrace=False\nwithout_system=False\nwithout_test=False\nwithout_thread=False\nwithout_timer=False\nwithout_type_erasure=False\nwithout_url=False\nwithout_wave=False\nzlib=True\nzstd=False\nbzip2:build_executable=True\nbzip2:shared=False\nzlib:shared=False",
-    "package_id": "e50863e182b9f1a9ce9e711c031065f1fe5f7f78",
-    "prev": "0",
-    "requires": [
-     "2",
-     "3"
-    ],
-    "context": "host"
-   },
-   "2": {
-    "ref": "zlib/1.3.1",
-    "options": "shared=False",
-    "package_id": "5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b",
-    "prev": "0",
-    "context": "host"
-   },
-   "3": {
-    "ref": "bzip2/1.0.8",
-    "options": "build_executable=True\nshared=False",
-    "package_id": "53b5fd22ba061620078deefdae9a437c5f693201",
-    "prev": "0",
-    "context": "host"
-   }
-  },
-  "revisions_enabled": false
- },
- "version": "0.4",
- "profile_host": "[settings]\narch=x86_64\narch_build=x86_64\nbuild_type=Release\ncompiler=Visual Studio\ncompiler.runtime=MD\ncompiler.version=17\nos=Windows\nos_build=Windows\n[options]\n[build_requires]\n[env]\n"
-}

build/conanbuildinfo.cmake

@@ -1,1020 +0,0 @@
-include(CMakeParseArguments)
-
-macro(conan_find_apple_frameworks FRAMEWORKS_FOUND FRAMEWORKS SUFFIX BUILD_TYPE)
-    if(APPLE)
-        if(CMAKE_BUILD_TYPE)
-            set(_BTYPE ${CMAKE_BUILD_TYPE})
-        elseif(NOT BUILD_TYPE STREQUAL "")
-            set(_BTYPE ${BUILD_TYPE})
-        endif()
-        if(_BTYPE)
-            if(${_BTYPE} MATCHES "Debug|_DEBUG")
-                set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_DEBUG} ${CONAN_FRAMEWORKS${SUFFIX}})
-                set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_DEBUG} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
-            elseif(${_BTYPE} MATCHES "Release|_RELEASE")
-                set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_RELEASE} ${CONAN_FRAMEWORKS${SUFFIX}})
-                set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_RELEASE} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
-            elseif(${_BTYPE} MATCHES "RelWithDebInfo|_RELWITHDEBINFO")
-                set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_RELWITHDEBINFO} ${CONAN_FRAMEWORKS${SUFFIX}})
-                set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_RELWITHDEBINFO} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
-            elseif(${_BTYPE} MATCHES "MinSizeRel|_MINSIZEREL")
-                set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_MINSIZEREL} ${CONAN_FRAMEWORKS${SUFFIX}})
-                set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_MINSIZEREL} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
-            endif()
-        endif()
-        foreach(_FRAMEWORK ${FRAMEWORKS})
-            # https://cmake.org/pipermail/cmake-developers/2017-August/030199.html
-            find_library(CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND NAMES ${_FRAMEWORK} PATHS ${CONAN_FRAMEWORK_DIRS${SUFFIX}} CMAKE_FIND_ROOT_PATH_BOTH)
-            if(CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND)
-                list(APPEND ${FRAMEWORKS_FOUND} ${CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND})
-            else()
-                message(FATAL_ERROR "Framework library ${_FRAMEWORK} not found in paths: ${CONAN_FRAMEWORK_DIRS${SUFFIX}}")
-            endif()
-        endforeach()
-    endif()
-endmacro()
-
-
-#################
-###  BOOST
-#################
-set(CONAN_BOOST_ROOT "C:/.conan/029ec3/1")
-set(CONAN_INCLUDE_DIRS_BOOST "C:/.conan/029ec3/1/include")
-set(CONAN_LIB_DIRS_BOOST "C:/.conan/029ec3/1/lib")
-set(CONAN_BIN_DIRS_BOOST )
-set(CONAN_RES_DIRS_BOOST )
-set(CONAN_SRC_DIRS_BOOST )
-set(CONAN_BUILD_DIRS_BOOST )
-set(CONAN_FRAMEWORK_DIRS_BOOST )
-set(CONAN_LIBS_BOOST libboost_contract libboost_coroutine libboost_context libboost_graph libboost_iostreams libboost_json libboost_locale libboost_log_setup libboost_log libboost_math_c99 libboost_math_c99f libboost_math_c99l libboost_math_tr1 libboost_math_tr1f libboost_math_tr1l libboost_nowide libboost_program_options libboost_random libboost_regex libboost_stacktrace_noop libboost_stacktrace_windbg libboost_stacktrace_windbg_cached libboost_timer libboost_type_erasure libboost_thread libboost_chrono libboost_container libboost_date_time libboost_unit_test_framework libboost_prg_exec_monitor libboost_test_exec_monitor libboost_exception libboost_url libboost_wave libboost_filesystem libboost_atomic libboost_wserialization libboost_serialization)
-set(CONAN_PKG_LIBS_BOOST libboost_contract libboost_coroutine libboost_context libboost_graph libboost_iostreams libboost_json libboost_locale libboost_log_setup libboost_log libboost_math_c99 libboost_math_c99f libboost_math_c99l libboost_math_tr1 libboost_math_tr1f libboost_math_tr1l libboost_nowide libboost_program_options libboost_random libboost_regex libboost_stacktrace_noop libboost_stacktrace_windbg libboost_stacktrace_windbg_cached libboost_timer libboost_type_erasure libboost_thread libboost_chrono libboost_container libboost_date_time libboost_unit_test_framework libboost_prg_exec_monitor libboost_test_exec_monitor libboost_exception libboost_url libboost_wave libboost_filesystem libboost_atomic libboost_wserialization libboost_serialization)
-set(CONAN_SYSTEM_LIBS_BOOST ole32 dbgeng bcrypt ntdll shell32 Advapi32 user32)
-set(CONAN_FRAMEWORKS_BOOST )
-set(CONAN_FRAMEWORKS_FOUND_BOOST "")  # Will be filled later
-set(CONAN_DEFINES_BOOST "-DBOOST_STACKTRACE_USE_NOOP"
-			"-DBOOST_STACKTRACE_USE_WINDBG"
-			"-DBOOST_STACKTRACE_USE_WINDBG_CACHED"
-			"-DBOOST_ALL_NO_LIB")
-set(CONAN_BUILD_MODULES_PATHS_BOOST )
-# COMPILE_DEFINITIONS are equal to CONAN_DEFINES without -D, for targets
-set(CONAN_COMPILE_DEFINITIONS_BOOST "BOOST_STACKTRACE_USE_NOOP"
-			"BOOST_STACKTRACE_USE_WINDBG"
-			"BOOST_STACKTRACE_USE_WINDBG_CACHED"
-			"BOOST_ALL_NO_LIB")
-
-set(CONAN_C_FLAGS_BOOST "")
-set(CONAN_CXX_FLAGS_BOOST "")
-set(CONAN_SHARED_LINKER_FLAGS_BOOST "")
-set(CONAN_EXE_LINKER_FLAGS_BOOST "")
-
-# For modern cmake targets we use the list variables (separated with ;)
-set(CONAN_C_FLAGS_BOOST_LIST "")
-set(CONAN_CXX_FLAGS_BOOST_LIST "")
-set(CONAN_SHARED_LINKER_FLAGS_BOOST_LIST "")
-set(CONAN_EXE_LINKER_FLAGS_BOOST_LIST "")
-
-# Apple Frameworks
-conan_find_apple_frameworks(CONAN_FRAMEWORKS_FOUND_BOOST "${CONAN_FRAMEWORKS_BOOST}" "_BOOST" "")
-# Append to aggregated values variable
-set(CONAN_LIBS_BOOST ${CONAN_PKG_LIBS_BOOST} ${CONAN_SYSTEM_LIBS_BOOST} ${CONAN_FRAMEWORKS_FOUND_BOOST})
-
-
-#################
-###  ZLIB
-#################
-set(CONAN_ZLIB_ROOT "C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b")
-set(CONAN_INCLUDE_DIRS_ZLIB "C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/include")
-set(CONAN_LIB_DIRS_ZLIB "C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/lib")
-set(CONAN_BIN_DIRS_ZLIB )
-set(CONAN_RES_DIRS_ZLIB )
-set(CONAN_SRC_DIRS_ZLIB )
-set(CONAN_BUILD_DIRS_ZLIB "C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/")
-set(CONAN_FRAMEWORK_DIRS_ZLIB )
-set(CONAN_LIBS_ZLIB zlib)
-set(CONAN_PKG_LIBS_ZLIB zlib)
-set(CONAN_SYSTEM_LIBS_ZLIB )
-set(CONAN_FRAMEWORKS_ZLIB )
-set(CONAN_FRAMEWORKS_FOUND_ZLIB "")  # Will be filled later
-set(CONAN_DEFINES_ZLIB )
-set(CONAN_BUILD_MODULES_PATHS_ZLIB )
-# COMPILE_DEFINITIONS are equal to CONAN_DEFINES without -D, for targets
-set(CONAN_COMPILE_DEFINITIONS_ZLIB )
-
-set(CONAN_C_FLAGS_ZLIB "")
-set(CONAN_CXX_FLAGS_ZLIB "")
-set(CONAN_SHARED_LINKER_FLAGS_ZLIB "")
-set(CONAN_EXE_LINKER_FLAGS_ZLIB "")
-
-# For modern cmake targets we use the list variables (separated with ;)
-set(CONAN_C_FLAGS_ZLIB_LIST "")
-set(CONAN_CXX_FLAGS_ZLIB_LIST "")
-set(CONAN_SHARED_LINKER_FLAGS_ZLIB_LIST "")
-set(CONAN_EXE_LINKER_FLAGS_ZLIB_LIST "")
-
-# Apple Frameworks
-conan_find_apple_frameworks(CONAN_FRAMEWORKS_FOUND_ZLIB "${CONAN_FRAMEWORKS_ZLIB}" "_ZLIB" "")
-# Append to aggregated values variable
-set(CONAN_LIBS_ZLIB ${CONAN_PKG_LIBS_ZLIB} ${CONAN_SYSTEM_LIBS_ZLIB} ${CONAN_FRAMEWORKS_FOUND_ZLIB})
-
-
-#################
-###  BZIP2
-#################
-set(CONAN_BZIP2_ROOT "C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201")
-set(CONAN_INCLUDE_DIRS_BZIP2 "C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/include")
-set(CONAN_LIB_DIRS_BZIP2 "C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/lib")
-set(CONAN_BIN_DIRS_BZIP2 "C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/bin")
-set(CONAN_RES_DIRS_BZIP2 )
-set(CONAN_SRC_DIRS_BZIP2 )
-set(CONAN_BUILD_DIRS_BZIP2 "C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/")
-set(CONAN_FRAMEWORK_DIRS_BZIP2 )
-set(CONAN_LIBS_BZIP2 bz2)
-set(CONAN_PKG_LIBS_BZIP2 bz2)
-set(CONAN_SYSTEM_LIBS_BZIP2 )
-set(CONAN_FRAMEWORKS_BZIP2 )
-set(CONAN_FRAMEWORKS_FOUND_BZIP2 "")  # Will be filled later
-set(CONAN_DEFINES_BZIP2 )
-set(CONAN_BUILD_MODULES_PATHS_BZIP2 )
-# COMPILE_DEFINITIONS are equal to CONAN_DEFINES without -D, for targets
-set(CONAN_COMPILE_DEFINITIONS_BZIP2 )
-
-set(CONAN_C_FLAGS_BZIP2 "")
-set(CONAN_CXX_FLAGS_BZIP2 "")
-set(CONAN_SHARED_LINKER_FLAGS_BZIP2 "")
-set(CONAN_EXE_LINKER_FLAGS_BZIP2 "")
-
-# For modern cmake targets we use the list variables (separated with ;)
-set(CONAN_C_FLAGS_BZIP2_LIST "")
-set(CONAN_CXX_FLAGS_BZIP2_LIST "")
-set(CONAN_SHARED_LINKER_FLAGS_BZIP2_LIST "")
-set(CONAN_EXE_LINKER_FLAGS_BZIP2_LIST "")
-
-# Apple Frameworks
-conan_find_apple_frameworks(CONAN_FRAMEWORKS_FOUND_BZIP2 "${CONAN_FRAMEWORKS_BZIP2}" "_BZIP2" "")
-# Append to aggregated values variable
-set(CONAN_LIBS_BZIP2 ${CONAN_PKG_LIBS_BZIP2} ${CONAN_SYSTEM_LIBS_BZIP2} ${CONAN_FRAMEWORKS_FOUND_BZIP2})
-
-
-### Definition of global aggregated variables ###
-
-set(CONAN_PACKAGE_NAME None)
-set(CONAN_PACKAGE_VERSION None)
-
-set(CONAN_SETTINGS_ARCH "x86_64")
-set(CONAN_SETTINGS_ARCH_BUILD "x86_64")
-set(CONAN_SETTINGS_BUILD_TYPE "Release")
-set(CONAN_SETTINGS_COMPILER "Visual Studio")
-set(CONAN_SETTINGS_COMPILER_RUNTIME "MD")
-set(CONAN_SETTINGS_COMPILER_VERSION "17")
-set(CONAN_SETTINGS_OS "Windows")
-set(CONAN_SETTINGS_OS_BUILD "Windows")
-
-set(CONAN_DEPENDENCIES boost zlib bzip2)
-# Storing original command line args (CMake helper) flags
-set(CONAN_CMD_CXX_FLAGS ${CONAN_CXX_FLAGS})
-
-set(CONAN_CMD_SHARED_LINKER_FLAGS ${CONAN_SHARED_LINKER_FLAGS})
-set(CONAN_CMD_C_FLAGS ${CONAN_C_FLAGS})
-# Defining accumulated conan variables for all deps
-
-set(CONAN_INCLUDE_DIRS "C:/.conan/029ec3/1/include"
-			"C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/include"
-			"C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/include" ${CONAN_INCLUDE_DIRS})
-set(CONAN_LIB_DIRS "C:/.conan/029ec3/1/lib"
-			"C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/lib"
-			"C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/lib" ${CONAN_LIB_DIRS})
-set(CONAN_BIN_DIRS "C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/bin" ${CONAN_BIN_DIRS})
-set(CONAN_RES_DIRS  ${CONAN_RES_DIRS})
-set(CONAN_FRAMEWORK_DIRS  ${CONAN_FRAMEWORK_DIRS})
-set(CONAN_LIBS libboost_contract libboost_coroutine libboost_context libboost_graph libboost_iostreams libboost_json libboost_locale libboost_log_setup libboost_log libboost_math_c99 libboost_math_c99f libboost_math_c99l libboost_math_tr1 libboost_math_tr1f libboost_math_tr1l libboost_nowide libboost_program_options libboost_random libboost_regex libboost_stacktrace_noop libboost_stacktrace_windbg libboost_stacktrace_windbg_cached libboost_timer libboost_type_erasure libboost_thread libboost_chrono libboost_container libboost_date_time libboost_unit_test_framework libboost_prg_exec_monitor libboost_test_exec_monitor libboost_exception libboost_url libboost_wave libboost_filesystem libboost_atomic libboost_wserialization libboost_serialization zlib bz2 ${CONAN_LIBS})
-set(CONAN_PKG_LIBS libboost_contract libboost_coroutine libboost_context libboost_graph libboost_iostreams libboost_json libboost_locale libboost_log_setup libboost_log libboost_math_c99 libboost_math_c99f libboost_math_c99l libboost_math_tr1 libboost_math_tr1f libboost_math_tr1l libboost_nowide libboost_program_options libboost_random libboost_regex libboost_stacktrace_noop libboost_stacktrace_windbg libboost_stacktrace_windbg_cached libboost_timer libboost_type_erasure libboost_thread libboost_chrono libboost_container libboost_date_time libboost_unit_test_framework libboost_prg_exec_monitor libboost_test_exec_monitor libboost_exception libboost_url libboost_wave libboost_filesystem libboost_atomic libboost_wserialization libboost_serialization zlib bz2 ${CONAN_PKG_LIBS})
-set(CONAN_SYSTEM_LIBS ole32 dbgeng bcrypt ntdll shell32 Advapi32 user32 ${CONAN_SYSTEM_LIBS})
-set(CONAN_FRAMEWORKS  ${CONAN_FRAMEWORKS})
-set(CONAN_FRAMEWORKS_FOUND "")  # Will be filled later
-set(CONAN_DEFINES "-DBOOST_STACKTRACE_USE_NOOP"
-			"-DBOOST_STACKTRACE_USE_WINDBG"
-			"-DBOOST_STACKTRACE_USE_WINDBG_CACHED"
-			"-DBOOST_ALL_NO_LIB" ${CONAN_DEFINES})
-set(CONAN_BUILD_MODULES_PATHS  ${CONAN_BUILD_MODULES_PATHS})
-set(CONAN_CMAKE_MODULE_PATH "C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/"
-			"C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/" ${CONAN_CMAKE_MODULE_PATH})
-
-set(CONAN_CXX_FLAGS " ${CONAN_CXX_FLAGS}")
-set(CONAN_SHARED_LINKER_FLAGS " ${CONAN_SHARED_LINKER_FLAGS}")
-set(CONAN_EXE_LINKER_FLAGS " ${CONAN_EXE_LINKER_FLAGS}")
-set(CONAN_C_FLAGS " ${CONAN_C_FLAGS}")
-
-# Apple Frameworks
-conan_find_apple_frameworks(CONAN_FRAMEWORKS_FOUND "${CONAN_FRAMEWORKS}" "" "")
-# Append to aggregated values variable: Use CONAN_LIBS instead of CONAN_PKG_LIBS to include user appended vars
-set(CONAN_LIBS ${CONAN_LIBS} ${CONAN_SYSTEM_LIBS} ${CONAN_FRAMEWORKS_FOUND})
-
-
-###  Definition of macros and functions ###
-
-macro(conan_define_targets)
-    if(${CMAKE_VERSION} VERSION_LESS "3.1.2")
-        message(FATAL_ERROR "TARGETS not supported by your CMake version!")
-    endif()  # CMAKE > 3.x
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CONAN_CMD_CXX_FLAGS}")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CONAN_CMD_C_FLAGS}")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CONAN_CMD_SHARED_LINKER_FLAGS}")
-
-
-    set(_CONAN_PKG_LIBS_BOOST_DEPENDENCIES "${CONAN_SYSTEM_LIBS_BOOST} ${CONAN_FRAMEWORKS_FOUND_BOOST} CONAN_PKG::zlib CONAN_PKG::bzip2")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_BOOST_DEPENDENCIES "${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_BOOST}" "${CONAN_LIB_DIRS_BOOST}"
-                                  CONAN_PACKAGE_TARGETS_BOOST "${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES}"
-                                  "" boost)
-    set(_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_DEBUG "${CONAN_SYSTEM_LIBS_BOOST_DEBUG} ${CONAN_FRAMEWORKS_FOUND_BOOST_DEBUG} CONAN_PKG::zlib CONAN_PKG::bzip2")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_BOOST_DEPENDENCIES_DEBUG "${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_DEBUG}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_BOOST_DEBUG}" "${CONAN_LIB_DIRS_BOOST_DEBUG}"
-                                  CONAN_PACKAGE_TARGETS_BOOST_DEBUG "${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_DEBUG}"
-                                  "debug" boost)
-    set(_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_RELEASE "${CONAN_SYSTEM_LIBS_BOOST_RELEASE} ${CONAN_FRAMEWORKS_FOUND_BOOST_RELEASE} CONAN_PKG::zlib CONAN_PKG::bzip2")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_BOOST_DEPENDENCIES_RELEASE "${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_RELEASE}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_BOOST_RELEASE}" "${CONAN_LIB_DIRS_BOOST_RELEASE}"
-                                  CONAN_PACKAGE_TARGETS_BOOST_RELEASE "${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_RELEASE}"
-                                  "release" boost)
-    set(_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_RELWITHDEBINFO "${CONAN_SYSTEM_LIBS_BOOST_RELWITHDEBINFO} ${CONAN_FRAMEWORKS_FOUND_BOOST_RELWITHDEBINFO} CONAN_PKG::zlib CONAN_PKG::bzip2")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_BOOST_DEPENDENCIES_RELWITHDEBINFO "${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_RELWITHDEBINFO}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_BOOST_RELWITHDEBINFO}" "${CONAN_LIB_DIRS_BOOST_RELWITHDEBINFO}"
-                                  CONAN_PACKAGE_TARGETS_BOOST_RELWITHDEBINFO "${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_RELWITHDEBINFO}"
-                                  "relwithdebinfo" boost)
-    set(_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_MINSIZEREL "${CONAN_SYSTEM_LIBS_BOOST_MINSIZEREL} ${CONAN_FRAMEWORKS_FOUND_BOOST_MINSIZEREL} CONAN_PKG::zlib CONAN_PKG::bzip2")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_BOOST_DEPENDENCIES_MINSIZEREL "${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_MINSIZEREL}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_BOOST_MINSIZEREL}" "${CONAN_LIB_DIRS_BOOST_MINSIZEREL}"
-                                  CONAN_PACKAGE_TARGETS_BOOST_MINSIZEREL "${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_MINSIZEREL}"
-                                  "minsizerel" boost)
-
-    add_library(CONAN_PKG::boost INTERFACE IMPORTED)
-
-    # Property INTERFACE_LINK_FLAGS do not work, necessary to add to INTERFACE_LINK_LIBRARIES
-    set_property(TARGET CONAN_PKG::boost PROPERTY INTERFACE_LINK_LIBRARIES ${CONAN_PACKAGE_TARGETS_BOOST} ${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BOOST_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BOOST_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_BOOST_LIST}>
-
-                                                                 $<$<CONFIG:Release>:${CONAN_PACKAGE_TARGETS_BOOST_RELEASE} ${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_RELEASE}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BOOST_RELEASE_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BOOST_RELEASE_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_BOOST_RELEASE_LIST}>>
-
-                                                                 $<$<CONFIG:RelWithDebInfo>:${CONAN_PACKAGE_TARGETS_BOOST_RELWITHDEBINFO} ${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_RELWITHDEBINFO}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BOOST_RELWITHDEBINFO_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BOOST_RELWITHDEBINFO_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_BOOST_RELWITHDEBINFO_LIST}>>
-
-                                                                 $<$<CONFIG:MinSizeRel>:${CONAN_PACKAGE_TARGETS_BOOST_MINSIZEREL} ${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_MINSIZEREL}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BOOST_MINSIZEREL_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BOOST_MINSIZEREL_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_BOOST_MINSIZEREL_LIST}>>
-
-                                                                 $<$<CONFIG:Debug>:${CONAN_PACKAGE_TARGETS_BOOST_DEBUG} ${_CONAN_PKG_LIBS_BOOST_DEPENDENCIES_DEBUG}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BOOST_DEBUG_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BOOST_DEBUG_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_BOOST_DEBUG_LIST}>>)
-    set_property(TARGET CONAN_PKG::boost PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CONAN_INCLUDE_DIRS_BOOST}
-                                                                      $<$<CONFIG:Release>:${CONAN_INCLUDE_DIRS_BOOST_RELEASE}>
-                                                                      $<$<CONFIG:RelWithDebInfo>:${CONAN_INCLUDE_DIRS_BOOST_RELWITHDEBINFO}>
-                                                                      $<$<CONFIG:MinSizeRel>:${CONAN_INCLUDE_DIRS_BOOST_MINSIZEREL}>
-                                                                      $<$<CONFIG:Debug>:${CONAN_INCLUDE_DIRS_BOOST_DEBUG}>)
-    set_property(TARGET CONAN_PKG::boost PROPERTY INTERFACE_COMPILE_DEFINITIONS ${CONAN_COMPILE_DEFINITIONS_BOOST}
-                                                                      $<$<CONFIG:Release>:${CONAN_COMPILE_DEFINITIONS_BOOST_RELEASE}>
-                                                                      $<$<CONFIG:RelWithDebInfo>:${CONAN_COMPILE_DEFINITIONS_BOOST_RELWITHDEBINFO}>
-                                                                      $<$<CONFIG:MinSizeRel>:${CONAN_COMPILE_DEFINITIONS_BOOST_MINSIZEREL}>
-                                                                      $<$<CONFIG:Debug>:${CONAN_COMPILE_DEFINITIONS_BOOST_DEBUG}>)
-    set_property(TARGET CONAN_PKG::boost PROPERTY INTERFACE_COMPILE_OPTIONS ${CONAN_C_FLAGS_BOOST_LIST} ${CONAN_CXX_FLAGS_BOOST_LIST}
-                                                                  $<$<CONFIG:Release>:${CONAN_C_FLAGS_BOOST_RELEASE_LIST} ${CONAN_CXX_FLAGS_BOOST_RELEASE_LIST}>
-                                                                  $<$<CONFIG:RelWithDebInfo>:${CONAN_C_FLAGS_BOOST_RELWITHDEBINFO_LIST} ${CONAN_CXX_FLAGS_BOOST_RELWITHDEBINFO_LIST}>
-                                                                  $<$<CONFIG:MinSizeRel>:${CONAN_C_FLAGS_BOOST_MINSIZEREL_LIST} ${CONAN_CXX_FLAGS_BOOST_MINSIZEREL_LIST}>
-                                                                  $<$<CONFIG:Debug>:${CONAN_C_FLAGS_BOOST_DEBUG_LIST}  ${CONAN_CXX_FLAGS_BOOST_DEBUG_LIST}>)
-
-
-    set(_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES "${CONAN_SYSTEM_LIBS_ZLIB} ${CONAN_FRAMEWORKS_FOUND_ZLIB} ")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_ZLIB_DEPENDENCIES "${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_ZLIB}" "${CONAN_LIB_DIRS_ZLIB}"
-                                  CONAN_PACKAGE_TARGETS_ZLIB "${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES}"
-                                  "" zlib)
-    set(_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_DEBUG "${CONAN_SYSTEM_LIBS_ZLIB_DEBUG} ${CONAN_FRAMEWORKS_FOUND_ZLIB_DEBUG} ")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_DEBUG "${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_DEBUG}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_ZLIB_DEBUG}" "${CONAN_LIB_DIRS_ZLIB_DEBUG}"
-                                  CONAN_PACKAGE_TARGETS_ZLIB_DEBUG "${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_DEBUG}"
-                                  "debug" zlib)
-    set(_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_RELEASE "${CONAN_SYSTEM_LIBS_ZLIB_RELEASE} ${CONAN_FRAMEWORKS_FOUND_ZLIB_RELEASE} ")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_RELEASE "${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_RELEASE}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_ZLIB_RELEASE}" "${CONAN_LIB_DIRS_ZLIB_RELEASE}"
-                                  CONAN_PACKAGE_TARGETS_ZLIB_RELEASE "${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_RELEASE}"
-                                  "release" zlib)
-    set(_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_RELWITHDEBINFO "${CONAN_SYSTEM_LIBS_ZLIB_RELWITHDEBINFO} ${CONAN_FRAMEWORKS_FOUND_ZLIB_RELWITHDEBINFO} ")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_RELWITHDEBINFO "${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_RELWITHDEBINFO}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_ZLIB_RELWITHDEBINFO}" "${CONAN_LIB_DIRS_ZLIB_RELWITHDEBINFO}"
-                                  CONAN_PACKAGE_TARGETS_ZLIB_RELWITHDEBINFO "${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_RELWITHDEBINFO}"
-                                  "relwithdebinfo" zlib)
-    set(_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_MINSIZEREL "${CONAN_SYSTEM_LIBS_ZLIB_MINSIZEREL} ${CONAN_FRAMEWORKS_FOUND_ZLIB_MINSIZEREL} ")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_MINSIZEREL "${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_MINSIZEREL}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_ZLIB_MINSIZEREL}" "${CONAN_LIB_DIRS_ZLIB_MINSIZEREL}"
-                                  CONAN_PACKAGE_TARGETS_ZLIB_MINSIZEREL "${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_MINSIZEREL}"
-                                  "minsizerel" zlib)
-
-    add_library(CONAN_PKG::zlib INTERFACE IMPORTED)
-
-    # Property INTERFACE_LINK_FLAGS do not work, necessary to add to INTERFACE_LINK_LIBRARIES
-    set_property(TARGET CONAN_PKG::zlib PROPERTY INTERFACE_LINK_LIBRARIES ${CONAN_PACKAGE_TARGETS_ZLIB} ${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_ZLIB_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_ZLIB_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_ZLIB_LIST}>
-
-                                                                 $<$<CONFIG:Release>:${CONAN_PACKAGE_TARGETS_ZLIB_RELEASE} ${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_RELEASE}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_ZLIB_RELEASE_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_ZLIB_RELEASE_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_ZLIB_RELEASE_LIST}>>
-
-                                                                 $<$<CONFIG:RelWithDebInfo>:${CONAN_PACKAGE_TARGETS_ZLIB_RELWITHDEBINFO} ${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_RELWITHDEBINFO}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_ZLIB_RELWITHDEBINFO_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_ZLIB_RELWITHDEBINFO_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_ZLIB_RELWITHDEBINFO_LIST}>>
-
-                                                                 $<$<CONFIG:MinSizeRel>:${CONAN_PACKAGE_TARGETS_ZLIB_MINSIZEREL} ${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_MINSIZEREL}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_ZLIB_MINSIZEREL_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_ZLIB_MINSIZEREL_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_ZLIB_MINSIZEREL_LIST}>>
-
-                                                                 $<$<CONFIG:Debug>:${CONAN_PACKAGE_TARGETS_ZLIB_DEBUG} ${_CONAN_PKG_LIBS_ZLIB_DEPENDENCIES_DEBUG}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_ZLIB_DEBUG_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_ZLIB_DEBUG_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_ZLIB_DEBUG_LIST}>>)
-    set_property(TARGET CONAN_PKG::zlib PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CONAN_INCLUDE_DIRS_ZLIB}
-                                                                      $<$<CONFIG:Release>:${CONAN_INCLUDE_DIRS_ZLIB_RELEASE}>
-                                                                      $<$<CONFIG:RelWithDebInfo>:${CONAN_INCLUDE_DIRS_ZLIB_RELWITHDEBINFO}>
-                                                                      $<$<CONFIG:MinSizeRel>:${CONAN_INCLUDE_DIRS_ZLIB_MINSIZEREL}>
-                                                                      $<$<CONFIG:Debug>:${CONAN_INCLUDE_DIRS_ZLIB_DEBUG}>)
-    set_property(TARGET CONAN_PKG::zlib PROPERTY INTERFACE_COMPILE_DEFINITIONS ${CONAN_COMPILE_DEFINITIONS_ZLIB}
-                                                                      $<$<CONFIG:Release>:${CONAN_COMPILE_DEFINITIONS_ZLIB_RELEASE}>
-                                                                      $<$<CONFIG:RelWithDebInfo>:${CONAN_COMPILE_DEFINITIONS_ZLIB_RELWITHDEBINFO}>
-                                                                      $<$<CONFIG:MinSizeRel>:${CONAN_COMPILE_DEFINITIONS_ZLIB_MINSIZEREL}>
-                                                                      $<$<CONFIG:Debug>:${CONAN_COMPILE_DEFINITIONS_ZLIB_DEBUG}>)
-    set_property(TARGET CONAN_PKG::zlib PROPERTY INTERFACE_COMPILE_OPTIONS ${CONAN_C_FLAGS_ZLIB_LIST} ${CONAN_CXX_FLAGS_ZLIB_LIST}
-                                                                  $<$<CONFIG:Release>:${CONAN_C_FLAGS_ZLIB_RELEASE_LIST} ${CONAN_CXX_FLAGS_ZLIB_RELEASE_LIST}>
-                                                                  $<$<CONFIG:RelWithDebInfo>:${CONAN_C_FLAGS_ZLIB_RELWITHDEBINFO_LIST} ${CONAN_CXX_FLAGS_ZLIB_RELWITHDEBINFO_LIST}>
-                                                                  $<$<CONFIG:MinSizeRel>:${CONAN_C_FLAGS_ZLIB_MINSIZEREL_LIST} ${CONAN_CXX_FLAGS_ZLIB_MINSIZEREL_LIST}>
-                                                                  $<$<CONFIG:Debug>:${CONAN_C_FLAGS_ZLIB_DEBUG_LIST}  ${CONAN_CXX_FLAGS_ZLIB_DEBUG_LIST}>)
-
-
-    set(_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES "${CONAN_SYSTEM_LIBS_BZIP2} ${CONAN_FRAMEWORKS_FOUND_BZIP2} ")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_BZIP2_DEPENDENCIES "${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_BZIP2}" "${CONAN_LIB_DIRS_BZIP2}"
-                                  CONAN_PACKAGE_TARGETS_BZIP2 "${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES}"
-                                  "" bzip2)
-    set(_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_DEBUG "${CONAN_SYSTEM_LIBS_BZIP2_DEBUG} ${CONAN_FRAMEWORKS_FOUND_BZIP2_DEBUG} ")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_DEBUG "${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_DEBUG}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_BZIP2_DEBUG}" "${CONAN_LIB_DIRS_BZIP2_DEBUG}"
-                                  CONAN_PACKAGE_TARGETS_BZIP2_DEBUG "${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_DEBUG}"
-                                  "debug" bzip2)
-    set(_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_RELEASE "${CONAN_SYSTEM_LIBS_BZIP2_RELEASE} ${CONAN_FRAMEWORKS_FOUND_BZIP2_RELEASE} ")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_RELEASE "${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_RELEASE}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_BZIP2_RELEASE}" "${CONAN_LIB_DIRS_BZIP2_RELEASE}"
-                                  CONAN_PACKAGE_TARGETS_BZIP2_RELEASE "${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_RELEASE}"
-                                  "release" bzip2)
-    set(_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_RELWITHDEBINFO "${CONAN_SYSTEM_LIBS_BZIP2_RELWITHDEBINFO} ${CONAN_FRAMEWORKS_FOUND_BZIP2_RELWITHDEBINFO} ")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_RELWITHDEBINFO "${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_RELWITHDEBINFO}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_BZIP2_RELWITHDEBINFO}" "${CONAN_LIB_DIRS_BZIP2_RELWITHDEBINFO}"
-                                  CONAN_PACKAGE_TARGETS_BZIP2_RELWITHDEBINFO "${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_RELWITHDEBINFO}"
-                                  "relwithdebinfo" bzip2)
-    set(_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_MINSIZEREL "${CONAN_SYSTEM_LIBS_BZIP2_MINSIZEREL} ${CONAN_FRAMEWORKS_FOUND_BZIP2_MINSIZEREL} ")
-    string(REPLACE " " ";" _CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_MINSIZEREL "${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_MINSIZEREL}")
-    conan_package_library_targets("${CONAN_PKG_LIBS_BZIP2_MINSIZEREL}" "${CONAN_LIB_DIRS_BZIP2_MINSIZEREL}"
-                                  CONAN_PACKAGE_TARGETS_BZIP2_MINSIZEREL "${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_MINSIZEREL}"
-                                  "minsizerel" bzip2)
-
-    add_library(CONAN_PKG::bzip2 INTERFACE IMPORTED)
-
-    # Property INTERFACE_LINK_FLAGS do not work, necessary to add to INTERFACE_LINK_LIBRARIES
-    set_property(TARGET CONAN_PKG::bzip2 PROPERTY INTERFACE_LINK_LIBRARIES ${CONAN_PACKAGE_TARGETS_BZIP2} ${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BZIP2_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BZIP2_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_BZIP2_LIST}>
-
-                                                                 $<$<CONFIG:Release>:${CONAN_PACKAGE_TARGETS_BZIP2_RELEASE} ${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_RELEASE}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BZIP2_RELEASE_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BZIP2_RELEASE_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_BZIP2_RELEASE_LIST}>>
-
-                                                                 $<$<CONFIG:RelWithDebInfo>:${CONAN_PACKAGE_TARGETS_BZIP2_RELWITHDEBINFO} ${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_RELWITHDEBINFO}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BZIP2_RELWITHDEBINFO_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BZIP2_RELWITHDEBINFO_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_BZIP2_RELWITHDEBINFO_LIST}>>
-
-                                                                 $<$<CONFIG:MinSizeRel>:${CONAN_PACKAGE_TARGETS_BZIP2_MINSIZEREL} ${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_MINSIZEREL}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BZIP2_MINSIZEREL_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BZIP2_MINSIZEREL_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_BZIP2_MINSIZEREL_LIST}>>
-
-                                                                 $<$<CONFIG:Debug>:${CONAN_PACKAGE_TARGETS_BZIP2_DEBUG} ${_CONAN_PKG_LIBS_BZIP2_DEPENDENCIES_DEBUG}
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BZIP2_DEBUG_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:${CONAN_SHARED_LINKER_FLAGS_BZIP2_DEBUG_LIST}>
-                                                                 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CONAN_EXE_LINKER_FLAGS_BZIP2_DEBUG_LIST}>>)
-    set_property(TARGET CONAN_PKG::bzip2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CONAN_INCLUDE_DIRS_BZIP2}
-                                                                      $<$<CONFIG:Release>:${CONAN_INCLUDE_DIRS_BZIP2_RELEASE}>
-                                                                      $<$<CONFIG:RelWithDebInfo>:${CONAN_INCLUDE_DIRS_BZIP2_RELWITHDEBINFO}>
-                                                                      $<$<CONFIG:MinSizeRel>:${CONAN_INCLUDE_DIRS_BZIP2_MINSIZEREL}>
-                                                                      $<$<CONFIG:Debug>:${CONAN_INCLUDE_DIRS_BZIP2_DEBUG}>)
-    set_property(TARGET CONAN_PKG::bzip2 PROPERTY INTERFACE_COMPILE_DEFINITIONS ${CONAN_COMPILE_DEFINITIONS_BZIP2}
-                                                                      $<$<CONFIG:Release>:${CONAN_COMPILE_DEFINITIONS_BZIP2_RELEASE}>
-                                                                      $<$<CONFIG:RelWithDebInfo>:${CONAN_COMPILE_DEFINITIONS_BZIP2_RELWITHDEBINFO}>
-                                                                      $<$<CONFIG:MinSizeRel>:${CONAN_COMPILE_DEFINITIONS_BZIP2_MINSIZEREL}>
-                                                                      $<$<CONFIG:Debug>:${CONAN_COMPILE_DEFINITIONS_BZIP2_DEBUG}>)
-    set_property(TARGET CONAN_PKG::bzip2 PROPERTY INTERFACE_COMPILE_OPTIONS ${CONAN_C_FLAGS_BZIP2_LIST} ${CONAN_CXX_FLAGS_BZIP2_LIST}
-                                                                  $<$<CONFIG:Release>:${CONAN_C_FLAGS_BZIP2_RELEASE_LIST} ${CONAN_CXX_FLAGS_BZIP2_RELEASE_LIST}>
-                                                                  $<$<CONFIG:RelWithDebInfo>:${CONAN_C_FLAGS_BZIP2_RELWITHDEBINFO_LIST} ${CONAN_CXX_FLAGS_BZIP2_RELWITHDEBINFO_LIST}>
-                                                                  $<$<CONFIG:MinSizeRel>:${CONAN_C_FLAGS_BZIP2_MINSIZEREL_LIST} ${CONAN_CXX_FLAGS_BZIP2_MINSIZEREL_LIST}>
-                                                                  $<$<CONFIG:Debug>:${CONAN_C_FLAGS_BZIP2_DEBUG_LIST}  ${CONAN_CXX_FLAGS_BZIP2_DEBUG_LIST}>)
-
-    set(CONAN_TARGETS CONAN_PKG::boost CONAN_PKG::zlib CONAN_PKG::bzip2)
-
-endmacro()
-
-
-macro(conan_basic_setup)
-    set(options TARGETS NO_OUTPUT_DIRS SKIP_RPATH KEEP_RPATHS SKIP_STD SKIP_FPIC)
-    cmake_parse_arguments(ARGUMENTS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-
-    if(CONAN_EXPORTED)
-        conan_message(STATUS "Conan: called by CMake conan helper")
-    endif()
-
-    if(CONAN_IN_LOCAL_CACHE)
-        conan_message(STATUS "Conan: called inside local cache")
-    endif()
-
-    if(NOT ARGUMENTS_NO_OUTPUT_DIRS)
-        conan_message(STATUS "Conan: Adjusting output directories")
-        conan_output_dirs_setup()
-    endif()
-
-    if(NOT ARGUMENTS_TARGETS)
-        conan_message(STATUS "Conan: Using cmake global configuration")
-        conan_global_flags()
-    else()
-        conan_message(STATUS "Conan: Using cmake targets configuration")
-        conan_define_targets()
-    endif()
-
-    if(ARGUMENTS_SKIP_RPATH)
-        # Change by "DEPRECATION" or "SEND_ERROR" when we are ready
-        conan_message(WARNING "Conan: SKIP_RPATH is deprecated, it has been renamed to KEEP_RPATHS")
-    endif()
-
-    if(NOT ARGUMENTS_SKIP_RPATH AND NOT ARGUMENTS_KEEP_RPATHS)
-        # Parameter has renamed, but we keep the compatibility with old SKIP_RPATH
-        conan_set_rpath()
-    endif()
-
-    if(NOT ARGUMENTS_SKIP_STD)
-        conan_set_std()
-    endif()
-
-    if(NOT ARGUMENTS_SKIP_FPIC)
-        conan_set_fpic()
-    endif()
-
-    conan_check_compiler()
-    conan_set_libcxx()
-    conan_set_vs_runtime()
-    conan_set_find_paths()
-    conan_include_build_modules()
-    conan_set_find_library_paths()
-endmacro()
-
-
-macro(conan_set_find_paths)
-    # CMAKE_MODULE_PATH does not have Debug/Release config, but there are variables
-    # CONAN_CMAKE_MODULE_PATH_DEBUG to be used by the consumer
-    # CMake can find findXXX.cmake files in the root of packages
-    set(CMAKE_MODULE_PATH ${CONAN_CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH})
-
-    # Make find_package() to work
-    set(CMAKE_PREFIX_PATH ${CONAN_CMAKE_MODULE_PATH} ${CMAKE_PREFIX_PATH})
-
-    # Set the find root path (cross build)
-    set(CMAKE_FIND_ROOT_PATH ${CONAN_CMAKE_FIND_ROOT_PATH} ${CMAKE_FIND_ROOT_PATH})
-    if(CONAN_CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
-        set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${CONAN_CMAKE_FIND_ROOT_PATH_MODE_PROGRAM})
-    endif()
-    if(CONAN_CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
-        set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ${CONAN_CMAKE_FIND_ROOT_PATH_MODE_LIBRARY})
-    endif()
-    if(CONAN_CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
-        set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ${CONAN_CMAKE_FIND_ROOT_PATH_MODE_INCLUDE})
-    endif()
-endmacro()
-
-
-macro(conan_set_find_library_paths)
-    # CMAKE_INCLUDE_PATH, CMAKE_LIBRARY_PATH does not have Debug/Release config, but there are variables
-    # CONAN_INCLUDE_DIRS_DEBUG/RELEASE CONAN_LIB_DIRS_DEBUG/RELEASE to be used by the consumer
-    # For find_library
-    set(CMAKE_INCLUDE_PATH ${CONAN_INCLUDE_DIRS} ${CMAKE_INCLUDE_PATH})
-    set(CMAKE_LIBRARY_PATH ${CONAN_LIB_DIRS} ${CMAKE_LIBRARY_PATH})
-endmacro()
-
-
-macro(conan_set_vs_runtime)
-    if(CONAN_LINK_RUNTIME)
-        conan_get_policy(CMP0091 policy_0091)
-        if(policy_0091 STREQUAL "NEW")
-            if(CONAN_LINK_RUNTIME MATCHES "MTd")
-                set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDebug")
-            elseif(CONAN_LINK_RUNTIME MATCHES "MDd")
-                set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDebugDLL")
-            elseif(CONAN_LINK_RUNTIME MATCHES "MT")
-                set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")
-            elseif(CONAN_LINK_RUNTIME MATCHES "MD")
-                set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
-            endif()
-        else()
-            foreach(flag CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE
-                         CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RELWITHDEBINFO
-                         CMAKE_C_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_MINSIZEREL)
-                if(DEFINED ${flag})
-                    string(REPLACE "/MD" ${CONAN_LINK_RUNTIME} ${flag} "${${flag}}")
-                endif()
-            endforeach()
-            foreach(flag CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG)
-                if(DEFINED ${flag})
-                    string(REPLACE "/MDd" ${CONAN_LINK_RUNTIME} ${flag} "${${flag}}")
-                endif()
-            endforeach()
-        endif()
-    endif()
-endmacro()
-
-
-macro(conan_flags_setup)
-    # Macro maintained for backwards compatibility
-    conan_set_find_library_paths()
-    conan_global_flags()
-    conan_set_rpath()
-    conan_set_vs_runtime()
-    conan_set_libcxx()
-endmacro()
-
-
-function(conan_message MESSAGE_OUTPUT)
-    if(NOT CONAN_CMAKE_SILENT_OUTPUT)
-        message(${ARGV${0}})
-    endif()
-endfunction()
-
-
-function(conan_get_policy policy_id policy)
-    if(POLICY "${policy_id}")
-        cmake_policy(GET "${policy_id}" _policy)
-        set(${policy} "${_policy}" PARENT_SCOPE)
-    else()
-        set(${policy} "" PARENT_SCOPE)
-    endif()
-endfunction()
-
-
-function(conan_find_libraries_abs_path libraries package_libdir libraries_abs_path)
-    foreach(_LIBRARY_NAME ${libraries})
-        find_library(CONAN_FOUND_LIBRARY NAMES ${_LIBRARY_NAME} PATHS ${package_libdir}
-                     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-        if(CONAN_FOUND_LIBRARY)
-            conan_message(STATUS "Library ${_LIBRARY_NAME} found ${CONAN_FOUND_LIBRARY}")
-            set(CONAN_FULLPATH_LIBS ${CONAN_FULLPATH_LIBS} ${CONAN_FOUND_LIBRARY})
-        else()
-            conan_message(STATUS "Library ${_LIBRARY_NAME} not found in package, might be system one")
-            set(CONAN_FULLPATH_LIBS ${CONAN_FULLPATH_LIBS} ${_LIBRARY_NAME})
-        endif()
-        unset(CONAN_FOUND_LIBRARY CACHE)
-    endforeach()
-    set(${libraries_abs_path} ${CONAN_FULLPATH_LIBS} PARENT_SCOPE)
-endfunction()
-
-
-function(conan_package_library_targets libraries package_libdir libraries_abs_path deps build_type package_name)
-    unset(_CONAN_ACTUAL_TARGETS CACHE)
-    unset(_CONAN_FOUND_SYSTEM_LIBS CACHE)
-    foreach(_LIBRARY_NAME ${libraries})
-        find_library(CONAN_FOUND_LIBRARY NAMES ${_LIBRARY_NAME} PATHS ${package_libdir}
-                     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-        if(CONAN_FOUND_LIBRARY)
-            conan_message(STATUS "Library ${_LIBRARY_NAME} found ${CONAN_FOUND_LIBRARY}")
-            set(_LIB_NAME CONAN_LIB::${package_name}_${_LIBRARY_NAME}${build_type})
-            add_library(${_LIB_NAME} UNKNOWN IMPORTED)
-            set_target_properties(${_LIB_NAME} PROPERTIES IMPORTED_LOCATION ${CONAN_FOUND_LIBRARY})
-            set(CONAN_FULLPATH_LIBS ${CONAN_FULLPATH_LIBS} ${_LIB_NAME})
-            set(_CONAN_ACTUAL_TARGETS ${_CONAN_ACTUAL_TARGETS} ${_LIB_NAME})
-        else()
-            conan_message(STATUS "Library ${_LIBRARY_NAME} not found in package, might be system one")
-            set(CONAN_FULLPATH_LIBS ${CONAN_FULLPATH_LIBS} ${_LIBRARY_NAME})
-            set(_CONAN_FOUND_SYSTEM_LIBS "${_CONAN_FOUND_SYSTEM_LIBS};${_LIBRARY_NAME}")
-        endif()
-        unset(CONAN_FOUND_LIBRARY CACHE)
-    endforeach()
-
-    # Add all dependencies to all targets
-    string(REPLACE " " ";" deps_list "${deps}")
-    foreach(_CONAN_ACTUAL_TARGET ${_CONAN_ACTUAL_TARGETS})
-        set_property(TARGET ${_CONAN_ACTUAL_TARGET} PROPERTY INTERFACE_LINK_LIBRARIES "${_CONAN_FOUND_SYSTEM_LIBS};${deps_list}")
-    endforeach()
-
-    set(${libraries_abs_path} ${CONAN_FULLPATH_LIBS} PARENT_SCOPE)
-endfunction()
-
-
-macro(conan_set_libcxx)
-    if(DEFINED CONAN_LIBCXX)
-        conan_message(STATUS "Conan: C++ stdlib: ${CONAN_LIBCXX}")
-        if(CONAN_COMPILER STREQUAL "clang" OR CONAN_COMPILER STREQUAL "apple-clang")
-            if(CONAN_LIBCXX STREQUAL "libstdc++" OR CONAN_LIBCXX STREQUAL "libstdc++11" )
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
-            elseif(CONAN_LIBCXX STREQUAL "libc++")
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-            endif()
-        endif()
-        if(CONAN_COMPILER STREQUAL "sun-cc")
-            if(CONAN_LIBCXX STREQUAL "libCstd")
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=Cstd")
-            elseif(CONAN_LIBCXX STREQUAL "libstdcxx")
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stdcxx4")
-            elseif(CONAN_LIBCXX STREQUAL "libstlport")
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
-            elseif(CONAN_LIBCXX STREQUAL "libstdc++")
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stdcpp")
-            endif()
-        endif()
-        if(CONAN_LIBCXX STREQUAL "libstdc++11")
-            add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
-        elseif(CONAN_LIBCXX STREQUAL "libstdc++")
-            add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
-        endif()
-    endif()
-endmacro()
-
-
-macro(conan_set_std)
-    conan_message(STATUS "Conan: Adjusting language standard")
-    # Do not warn "Manually-specified variables were not used by the project"
-    set(ignorevar "${CONAN_STD_CXX_FLAG}${CONAN_CMAKE_CXX_STANDARD}${CONAN_CMAKE_CXX_EXTENSIONS}")
-    if (CMAKE_VERSION VERSION_LESS "3.1" OR
-        (CMAKE_VERSION VERSION_LESS "3.12" AND ("${CONAN_CMAKE_CXX_STANDARD}" STREQUAL "20" OR "${CONAN_CMAKE_CXX_STANDARD}" STREQUAL "gnu20")))
-        if(CONAN_STD_CXX_FLAG)
-            conan_message(STATUS "Conan setting CXX_FLAGS flags: ${CONAN_STD_CXX_FLAG}")
-            set(CMAKE_CXX_FLAGS "${CONAN_STD_CXX_FLAG} ${CMAKE_CXX_FLAGS}")
-        endif()
-    else()
-        if(CONAN_CMAKE_CXX_STANDARD)
-            conan_message(STATUS "Conan setting CPP STANDARD: ${CONAN_CMAKE_CXX_STANDARD} WITH EXTENSIONS ${CONAN_CMAKE_CXX_EXTENSIONS}")
-            set(CMAKE_CXX_STANDARD ${CONAN_CMAKE_CXX_STANDARD})
-            set(CMAKE_CXX_EXTENSIONS ${CONAN_CMAKE_CXX_EXTENSIONS})
-        endif()
-    endif()
-endmacro()
-
-
-macro(conan_set_rpath)
-    conan_message(STATUS "Conan: Adjusting default RPATHs Conan policies")
-    if(APPLE)
-        # https://cmake.org/Wiki/CMake_RPATH_handling
-        # CONAN GUIDE: All generated libraries should have the id and dependencies to other
-        # dylibs without path, just the name, EX:
-        # libMyLib1.dylib:
-        #     libMyLib1.dylib (compatibility version 0.0.0, current version 0.0.0)
-        #     libMyLib0.dylib (compatibility version 0.0.0, current version 0.0.0)
-        #     /usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 120.0.0)
-        #     /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1197.1.1)
-        # AVOID RPATH FOR *.dylib, ALL LIBS BETWEEN THEM AND THE EXE
-        # SHOULD BE ON THE LINKER RESOLVER PATH (./ IS ONE OF THEM)
-        set(CMAKE_SKIP_RPATH 1 CACHE BOOL "rpaths" FORCE)
-        # Policy CMP0068
-        # We want the old behavior, in CMake >= 3.9 CMAKE_SKIP_RPATH won't affect the install_name in OSX
-        set(CMAKE_INSTALL_NAME_DIR "")
-    endif()
-endmacro()
-
-
-macro(conan_set_fpic)
-    if(DEFINED CONAN_CMAKE_POSITION_INDEPENDENT_CODE)
-        conan_message(STATUS "Conan: Adjusting fPIC flag (${CONAN_CMAKE_POSITION_INDEPENDENT_CODE})")
-        set(CMAKE_POSITION_INDEPENDENT_CODE ${CONAN_CMAKE_POSITION_INDEPENDENT_CODE})
-    endif()
-endmacro()
-
-
-macro(conan_output_dirs_setup)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
-
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-endmacro()
-
-
-macro(conan_split_version VERSION_STRING MAJOR MINOR)
-    #make a list from the version string
-    string(REPLACE "." ";" VERSION_LIST "${VERSION_STRING}")
-
-    #write output values
-    list(LENGTH VERSION_LIST _version_len)
-    list(GET VERSION_LIST 0 ${MAJOR})
-    if(${_version_len} GREATER 1)
-        list(GET VERSION_LIST 1 ${MINOR})
-    endif()
-endmacro()
-
-
-macro(conan_error_compiler_version)
-    message(FATAL_ERROR "Detected a mismatch for the compiler version between your conan profile settings and CMake: \n"
-                        "Compiler version specified in your conan profile: ${CONAN_COMPILER_VERSION}\n"
-                        "Compiler version detected in CMake: ${VERSION_MAJOR}.${VERSION_MINOR}\n"
-                        "Please check your conan profile settings (conan profile show [default|your_profile_name])\n"
-                        "P.S. You may set CONAN_DISABLE_CHECK_COMPILER CMake variable in order to disable this check."
-           )
-endmacro()
-
-set(_CONAN_CURRENT_DIR ${CMAKE_CURRENT_LIST_DIR})
-
-function(conan_get_compiler CONAN_INFO_COMPILER CONAN_INFO_COMPILER_VERSION)
-    conan_message(STATUS "Current conanbuildinfo.cmake directory: " ${_CONAN_CURRENT_DIR})
-    if(NOT EXISTS ${_CONAN_CURRENT_DIR}/conaninfo.txt)
-        conan_message(STATUS "WARN: conaninfo.txt not found")
-        return()
-    endif()
-
-    file (READ "${_CONAN_CURRENT_DIR}/conaninfo.txt" CONANINFO)
-
-    # MATCHALL will match all, including the last one, which is the full_settings one
-    string(REGEX MATCH "full_settings.*" _FULL_SETTINGS_MATCHED ${CONANINFO})
-    string(REGEX MATCH "compiler=([-A-Za-z0-9_ ]+)" _MATCHED ${_FULL_SETTINGS_MATCHED})
-    if(DEFINED CMAKE_MATCH_1)
-        string(STRIP "${CMAKE_MATCH_1}" _CONAN_INFO_COMPILER)
-        set(${CONAN_INFO_COMPILER} ${_CONAN_INFO_COMPILER} PARENT_SCOPE)
-    endif()
-
-    string(REGEX MATCH "compiler.version=([-A-Za-z0-9_.]+)" _MATCHED ${_FULL_SETTINGS_MATCHED})
-    if(DEFINED CMAKE_MATCH_1)
-        string(STRIP "${CMAKE_MATCH_1}" _CONAN_INFO_COMPILER_VERSION)
-        set(${CONAN_INFO_COMPILER_VERSION} ${_CONAN_INFO_COMPILER_VERSION} PARENT_SCOPE)
-    endif()
-endfunction()
-
-
-function(check_compiler_version)
-    conan_split_version(${CMAKE_CXX_COMPILER_VERSION} VERSION_MAJOR VERSION_MINOR)
-    if(DEFINED CONAN_SETTINGS_COMPILER_TOOLSET)
-       conan_message(STATUS "Conan: Skipping compiler check: Declared 'compiler.toolset'")
-       return()
-    endif()
-    if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-        # MSVC_VERSION is defined since 2.8.2 at least
-        # https://cmake.org/cmake/help/v2.8.2/cmake.html#variable:MSVC_VERSION
-        # https://cmake.org/cmake/help/v3.14/variable/MSVC_VERSION.html
-        if(
-            # 1930 = VS 17.0 (v143 toolset)
-            (CONAN_COMPILER_VERSION STREQUAL "17" AND NOT((MSVC_VERSION EQUAL 1930) OR (MSVC_VERSION GREATER 1930))) OR
-            # 1920-1929 = VS 16.0 (v142 toolset)
-            (CONAN_COMPILER_VERSION STREQUAL "16" AND NOT((MSVC_VERSION GREATER 1919) AND (MSVC_VERSION LESS 1930))) OR
-            # 1910-1919 = VS 15.0 (v141 toolset)
-            (CONAN_COMPILER_VERSION STREQUAL "15" AND NOT((MSVC_VERSION GREATER 1909) AND (MSVC_VERSION LESS 1920))) OR
-            # 1900      = VS 14.0 (v140 toolset)
-            (CONAN_COMPILER_VERSION STREQUAL "14" AND NOT(MSVC_VERSION EQUAL 1900)) OR
-            # 1800      = VS 12.0 (v120 toolset)
-            (CONAN_COMPILER_VERSION STREQUAL "12" AND NOT VERSION_MAJOR STREQUAL "18") OR
-            # 1700      = VS 11.0 (v110 toolset)
-            (CONAN_COMPILER_VERSION STREQUAL "11" AND NOT VERSION_MAJOR STREQUAL "17") OR
-            # 1600      = VS 10.0 (v100 toolset)
-            (CONAN_COMPILER_VERSION STREQUAL "10" AND NOT VERSION_MAJOR STREQUAL "16") OR
-            # 1500      = VS  9.0 (v90 toolset)
-            (CONAN_COMPILER_VERSION STREQUAL "9" AND NOT VERSION_MAJOR STREQUAL "15") OR
-            # 1400      = VS  8.0 (v80 toolset)
-            (CONAN_COMPILER_VERSION STREQUAL "8" AND NOT VERSION_MAJOR STREQUAL "14") OR
-            # 1310      = VS  7.1, 1300      = VS  7.0
-            (CONAN_COMPILER_VERSION STREQUAL "7" AND NOT VERSION_MAJOR STREQUAL "13") OR
-            # 1200      = VS  6.0
-            (CONAN_COMPILER_VERSION STREQUAL "6" AND NOT VERSION_MAJOR STREQUAL "12") )
-            conan_error_compiler_version()
-        endif()
-    elseif(CONAN_COMPILER STREQUAL "gcc")
-        conan_split_version(${CONAN_COMPILER_VERSION} CONAN_COMPILER_MAJOR CONAN_COMPILER_MINOR)
-        set(_CHECK_VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
-        set(_CONAN_VERSION ${CONAN_COMPILER_MAJOR}.${CONAN_COMPILER_MINOR})
-        if(NOT ${CONAN_COMPILER_VERSION} VERSION_LESS 5.0)
-            conan_message(STATUS "Conan: Compiler GCC>=5, checking major version ${CONAN_COMPILER_VERSION}")
-            conan_split_version(${CONAN_COMPILER_VERSION} CONAN_COMPILER_MAJOR CONAN_COMPILER_MINOR)
-            if("${CONAN_COMPILER_MINOR}" STREQUAL "")
-                set(_CHECK_VERSION ${VERSION_MAJOR})
-                set(_CONAN_VERSION ${CONAN_COMPILER_MAJOR})
-            endif()
-        endif()
-        conan_message(STATUS "Conan: Checking correct version: ${_CHECK_VERSION}")
-        if(NOT ${_CHECK_VERSION} VERSION_EQUAL ${_CONAN_VERSION})
-            conan_error_compiler_version()
-        endif()
-    elseif(CONAN_COMPILER STREQUAL "clang")
-        conan_split_version(${CONAN_COMPILER_VERSION} CONAN_COMPILER_MAJOR CONAN_COMPILER_MINOR)
-        set(_CHECK_VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
-        set(_CONAN_VERSION ${CONAN_COMPILER_MAJOR}.${CONAN_COMPILER_MINOR})
-        if(NOT ${CONAN_COMPILER_VERSION} VERSION_LESS 8.0)
-            conan_message(STATUS "Conan: Compiler Clang>=8, checking major version ${CONAN_COMPILER_VERSION}")
-            if("${CONAN_COMPILER_MINOR}" STREQUAL "")
-                set(_CHECK_VERSION ${VERSION_MAJOR})
-                set(_CONAN_VERSION ${CONAN_COMPILER_MAJOR})
-            endif()
-        endif()
-        conan_message(STATUS "Conan: Checking correct version: ${_CHECK_VERSION}")
-        if(NOT ${_CHECK_VERSION} VERSION_EQUAL ${_CONAN_VERSION})
-            conan_error_compiler_version()
-        endif()
-    elseif(CONAN_COMPILER STREQUAL "apple-clang" OR CONAN_COMPILER STREQUAL "sun-cc" OR CONAN_COMPILER STREQUAL "mcst-lcc")
-        conan_split_version(${CONAN_COMPILER_VERSION} CONAN_COMPILER_MAJOR CONAN_COMPILER_MINOR)
-        if(${CONAN_COMPILER_MAJOR} VERSION_GREATER_EQUAL "13" AND "${CONAN_COMPILER_MINOR}" STREQUAL "" AND ${CONAN_COMPILER_MAJOR} VERSION_EQUAL ${VERSION_MAJOR})
-           # This is correct,  13.X is considered 13
-        elseif(NOT ${VERSION_MAJOR}.${VERSION_MINOR} VERSION_EQUAL ${CONAN_COMPILER_MAJOR}.${CONAN_COMPILER_MINOR})
-           conan_error_compiler_version()
-        endif()
-    elseif(CONAN_COMPILER STREQUAL "intel")
-        conan_split_version(${CONAN_COMPILER_VERSION} CONAN_COMPILER_MAJOR CONAN_COMPILER_MINOR)
-        if(NOT ${CONAN_COMPILER_VERSION} VERSION_LESS 19.1)
-            if(NOT ${VERSION_MAJOR}.${VERSION_MINOR} VERSION_EQUAL ${CONAN_COMPILER_MAJOR}.${CONAN_COMPILER_MINOR})
-               conan_error_compiler_version()
-            endif()
-        else()
-            if(NOT ${VERSION_MAJOR} VERSION_EQUAL ${CONAN_COMPILER_MAJOR})
-               conan_error_compiler_version()
-            endif()
-        endif()
-    else()
-        conan_message(STATUS "WARN: Unknown compiler '${CONAN_COMPILER}', skipping the version check...")
-    endif()
-endfunction()
-
-
-function(conan_check_compiler)
-    if(CONAN_DISABLE_CHECK_COMPILER)
-        conan_message(STATUS "WARN: Disabled conan compiler checks")
-        return()
-    endif()
-    if(NOT DEFINED CMAKE_CXX_COMPILER_ID)
-        if(DEFINED CMAKE_C_COMPILER_ID)
-            conan_message(STATUS "This project seems to be plain C, using '${CMAKE_C_COMPILER_ID}' compiler")
-            set(CMAKE_CXX_COMPILER_ID ${CMAKE_C_COMPILER_ID})
-            set(CMAKE_CXX_COMPILER_VERSION ${CMAKE_C_COMPILER_VERSION})
-        else()
-            message(FATAL_ERROR "This project seems to be plain C, but no compiler defined")
-        endif()
-    endif()
-    if(NOT CMAKE_CXX_COMPILER_ID AND NOT CMAKE_C_COMPILER_ID)
-        # This use case happens when compiler is not identified by CMake, but the compilers are there and work
-        conan_message(STATUS "*** WARN: CMake was not able to identify a C or C++ compiler ***")
-        conan_message(STATUS "*** WARN: Disabling compiler checks. Please make sure your settings match your environment ***")
-        return()
-    endif()
-    if(NOT DEFINED CONAN_COMPILER)
-        conan_get_compiler(CONAN_COMPILER CONAN_COMPILER_VERSION)
-        if(NOT DEFINED CONAN_COMPILER)
-            conan_message(STATUS "WARN: CONAN_COMPILER variable not set, please make sure yourself that "
-                          "your compiler and version matches your declared settings")
-            return()
-        endif()
-    endif()
-
-    if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL ${CMAKE_SYSTEM_NAME})
-        set(CROSS_BUILDING 1)
-    endif()
-
-    # If using VS, verify toolset
-    if (CONAN_COMPILER STREQUAL "Visual Studio")
-        if (CONAN_SETTINGS_COMPILER_TOOLSET MATCHES "LLVM" OR
-            CONAN_SETTINGS_COMPILER_TOOLSET MATCHES "llvm" OR
-            CONAN_SETTINGS_COMPILER_TOOLSET MATCHES "clang" OR
-            CONAN_SETTINGS_COMPILER_TOOLSET MATCHES "Clang")
-            set(EXPECTED_CMAKE_CXX_COMPILER_ID "Clang")
-        elseif (CONAN_SETTINGS_COMPILER_TOOLSET MATCHES "Intel")
-            set(EXPECTED_CMAKE_CXX_COMPILER_ID "Intel")
-        else()
-            set(EXPECTED_CMAKE_CXX_COMPILER_ID "MSVC")
-        endif()
-
-        if (NOT CMAKE_CXX_COMPILER_ID MATCHES ${EXPECTED_CMAKE_CXX_COMPILER_ID})
-            message(FATAL_ERROR "Incorrect '${CONAN_COMPILER}'. Toolset specifies compiler as '${EXPECTED_CMAKE_CXX_COMPILER_ID}' "
-                                "but CMake detected '${CMAKE_CXX_COMPILER_ID}'")
-        endif()
-
-    # Avoid checks when cross compiling, apple-clang crashes because its APPLE but not apple-clang
-    # Actually CMake is detecting "clang" when you are using apple-clang, only if CMP0025 is set to NEW will detect apple-clang
-    elseif((CONAN_COMPILER STREQUAL "gcc" AND NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR
-        (CONAN_COMPILER STREQUAL "apple-clang" AND NOT CROSS_BUILDING AND (NOT APPLE OR NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")) OR
-        (CONAN_COMPILER STREQUAL "clang" AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR
-        (CONAN_COMPILER STREQUAL "sun-cc" AND NOT CMAKE_CXX_COMPILER_ID MATCHES "SunPro") )
-        message(FATAL_ERROR "Incorrect '${CONAN_COMPILER}', is not the one detected by CMake: '${CMAKE_CXX_COMPILER_ID}'")
-    endif()
-
-
-    if(NOT DEFINED CONAN_COMPILER_VERSION)
-        conan_message(STATUS "WARN: CONAN_COMPILER_VERSION variable not set, please make sure yourself "
-                             "that your compiler version matches your declared settings")
-        return()
-    endif()
-    check_compiler_version()
-endfunction()
-
-
-macro(conan_set_flags build_type)
-    set(CMAKE_CXX_FLAGS${build_type} "${CMAKE_CXX_FLAGS${build_type}} ${CONAN_CXX_FLAGS${build_type}}")
-    set(CMAKE_C_FLAGS${build_type} "${CMAKE_C_FLAGS${build_type}} ${CONAN_C_FLAGS${build_type}}")
-    set(CMAKE_SHARED_LINKER_FLAGS${build_type} "${CMAKE_SHARED_LINKER_FLAGS${build_type}} ${CONAN_SHARED_LINKER_FLAGS${build_type}}")
-    set(CMAKE_EXE_LINKER_FLAGS${build_type} "${CMAKE_EXE_LINKER_FLAGS${build_type}} ${CONAN_EXE_LINKER_FLAGS${build_type}}")
-endmacro()
-
-
-macro(conan_global_flags)
-    if(CONAN_SYSTEM_INCLUDES)
-        include_directories(SYSTEM ${CONAN_INCLUDE_DIRS}
-                                   "$<$<CONFIG:Release>:${CONAN_INCLUDE_DIRS_RELEASE}>"
-                                   "$<$<CONFIG:RelWithDebInfo>:${CONAN_INCLUDE_DIRS_RELWITHDEBINFO}>"
-                                   "$<$<CONFIG:MinSizeRel>:${CONAN_INCLUDE_DIRS_MINSIZEREL}>"
-                                   "$<$<CONFIG:Debug>:${CONAN_INCLUDE_DIRS_DEBUG}>")
-    else()
-        include_directories(${CONAN_INCLUDE_DIRS}
-                            "$<$<CONFIG:Release>:${CONAN_INCLUDE_DIRS_RELEASE}>"
-                            "$<$<CONFIG:RelWithDebInfo>:${CONAN_INCLUDE_DIRS_RELWITHDEBINFO}>"
-                            "$<$<CONFIG:MinSizeRel>:${CONAN_INCLUDE_DIRS_MINSIZEREL}>"
-                            "$<$<CONFIG:Debug>:${CONAN_INCLUDE_DIRS_DEBUG}>")
-    endif()
-
-    link_directories(${CONAN_LIB_DIRS})
-
-    conan_find_libraries_abs_path("${CONAN_LIBS_DEBUG}" "${CONAN_LIB_DIRS_DEBUG}"
-                                  CONAN_LIBS_DEBUG)
-    conan_find_libraries_abs_path("${CONAN_LIBS_RELEASE}" "${CONAN_LIB_DIRS_RELEASE}"
-                                  CONAN_LIBS_RELEASE)
-    conan_find_libraries_abs_path("${CONAN_LIBS_RELWITHDEBINFO}" "${CONAN_LIB_DIRS_RELWITHDEBINFO}"
-                                  CONAN_LIBS_RELWITHDEBINFO)
-    conan_find_libraries_abs_path("${CONAN_LIBS_MINSIZEREL}" "${CONAN_LIB_DIRS_MINSIZEREL}"
-                                  CONAN_LIBS_MINSIZEREL)
-
-    add_compile_options(${CONAN_DEFINES}
-                        "$<$<CONFIG:Debug>:${CONAN_DEFINES_DEBUG}>"
-                        "$<$<CONFIG:Release>:${CONAN_DEFINES_RELEASE}>"
-                        "$<$<CONFIG:RelWithDebInfo>:${CONAN_DEFINES_RELWITHDEBINFO}>"
-                        "$<$<CONFIG:MinSizeRel>:${CONAN_DEFINES_MINSIZEREL}>")
-
-    conan_set_flags("")
-    conan_set_flags("_RELEASE")
-    conan_set_flags("_DEBUG")
-
-endmacro()
-
-
-macro(conan_target_link_libraries target)
-    if(CONAN_TARGETS)
-        target_link_libraries(${target} ${CONAN_TARGETS})
-    else()
-        target_link_libraries(${target} ${CONAN_LIBS})
-        foreach(_LIB ${CONAN_LIBS_RELEASE})
-            target_link_libraries(${target} optimized ${_LIB})
-        endforeach()
-        foreach(_LIB ${CONAN_LIBS_DEBUG})
-            target_link_libraries(${target} debug ${_LIB})
-        endforeach()
-    endif()
-endmacro()
-
-
-macro(conan_include_build_modules)
-    if(CMAKE_BUILD_TYPE)
-        if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
-            set(CONAN_BUILD_MODULES_PATHS ${CONAN_BUILD_MODULES_PATHS_DEBUG} ${CONAN_BUILD_MODULES_PATHS})
-        elseif(${CMAKE_BUILD_TYPE} MATCHES "Release")
-            set(CONAN_BUILD_MODULES_PATHS ${CONAN_BUILD_MODULES_PATHS_RELEASE} ${CONAN_BUILD_MODULES_PATHS})
-        elseif(${CMAKE_BUILD_TYPE} MATCHES "RelWithDebInfo")
-            set(CONAN_BUILD_MODULES_PATHS ${CONAN_BUILD_MODULES_PATHS_RELWITHDEBINFO} ${CONAN_BUILD_MODULES_PATHS})
-        elseif(${CMAKE_BUILD_TYPE} MATCHES "MinSizeRel")
-            set(CONAN_BUILD_MODULES_PATHS ${CONAN_BUILD_MODULES_PATHS_MINSIZEREL} ${CONAN_BUILD_MODULES_PATHS})
-        endif()
-    endif()
-
-    foreach(_BUILD_MODULE_PATH ${CONAN_BUILD_MODULES_PATHS})
-        include(${_BUILD_MODULE_PATH})
-    endforeach()
-endmacro()
-
-
-### Definition of user declared vars (user_info) ###
-
-set(CONAN_USER_BOOST_stacktrace_addr2line_available "False")

build/conanbuildinfo.txt

@@ -1,353 +0,0 @@
-[includedirs]
-C:/.conan/029ec3/1/include
-C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/include
-C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/include
-
-[libdirs]
-C:/.conan/029ec3/1/lib
-C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/lib
-C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/lib
-
-[bindirs]
-C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/bin
-
-[resdirs]
-
-
-[builddirs]
-C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/
-C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/
-
-[libs]
-libboost_contract
-libboost_coroutine
-libboost_context
-libboost_graph
-libboost_iostreams
-libboost_json
-libboost_locale
-libboost_log_setup
-libboost_log
-libboost_math_c99
-libboost_math_c99f
-libboost_math_c99l
-libboost_math_tr1
-libboost_math_tr1f
-libboost_math_tr1l
-libboost_nowide
-libboost_program_options
-libboost_random
-libboost_regex
-libboost_stacktrace_noop
-libboost_stacktrace_windbg
-libboost_stacktrace_windbg_cached
-libboost_timer
-libboost_type_erasure
-libboost_thread
-libboost_chrono
-libboost_container
-libboost_date_time
-libboost_unit_test_framework
-libboost_prg_exec_monitor
-libboost_test_exec_monitor
-libboost_exception
-libboost_url
-libboost_wave
-libboost_filesystem
-libboost_atomic
-libboost_wserialization
-libboost_serialization
-zlib
-bz2
-
-[system_libs]
-ole32
-dbgeng
-bcrypt
-ntdll
-shell32
-Advapi32
-user32
-
-[defines]
-BOOST_STACKTRACE_USE_NOOP
-BOOST_STACKTRACE_USE_WINDBG
-BOOST_STACKTRACE_USE_WINDBG_CACHED
-BOOST_ALL_NO_LIB
-
-[cppflags]
-
-
-[cxxflags]
-
-
-[cflags]
-
-
-[sharedlinkflags]
-
-
-[exelinkflags]
-
-
-[sysroot]
-
-
-[frameworks]
-
-
-[frameworkdirs]
-
-
-
-[includedirs_boost]
-C:/.conan/029ec3/1/include
-
-[libdirs_boost]
-C:/.conan/029ec3/1/lib
-
-[bindirs_boost]
-
-
-[resdirs_boost]
-
-
-[builddirs_boost]
-
-
-[libs_boost]
-libboost_contract
-libboost_coroutine
-libboost_context
-libboost_graph
-libboost_iostreams
-libboost_json
-libboost_locale
-libboost_log_setup
-libboost_log
-libboost_math_c99
-libboost_math_c99f
-libboost_math_c99l
-libboost_math_tr1
-libboost_math_tr1f
-libboost_math_tr1l
-libboost_nowide
-libboost_program_options
-libboost_random
-libboost_regex
-libboost_stacktrace_noop
-libboost_stacktrace_windbg
-libboost_stacktrace_windbg_cached
-libboost_timer
-libboost_type_erasure
-libboost_thread
-libboost_chrono
-libboost_container
-libboost_date_time
-libboost_unit_test_framework
-libboost_prg_exec_monitor
-libboost_test_exec_monitor
-libboost_exception
-libboost_url
-libboost_wave
-libboost_filesystem
-libboost_atomic
-libboost_wserialization
-libboost_serialization
-
-[system_libs_boost]
-ole32
-dbgeng
-bcrypt
-ntdll
-shell32
-Advapi32
-user32
-
-[defines_boost]
-BOOST_STACKTRACE_USE_NOOP
-BOOST_STACKTRACE_USE_WINDBG
-BOOST_STACKTRACE_USE_WINDBG_CACHED
-BOOST_ALL_NO_LIB
-
-[cppflags_boost]
-
-
-[cxxflags_boost]
-
-
-[cflags_boost]
-
-
-[sharedlinkflags_boost]
-
-
-[exelinkflags_boost]
-
-
-[sysroot_boost]
-
-
-[frameworks_boost]
-
-
-[frameworkdirs_boost]
-
-
-[rootpath_boost]
-C:/.conan/029ec3/1
-
-[name_boost]
-boost
-
-[version_boost]
-1.84.0
-
-[generatornames_boost]
-cmake_find_package=Boost
-cmake_find_package_multi=Boost
-
-[generatorfilenames_boost]
-cmake_find_package=Boost
-cmake_find_package_multi=Boost
-
-
-[includedirs_zlib]
-C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/include
-
-[libdirs_zlib]
-C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/lib
-
-[bindirs_zlib]
-
-
-[resdirs_zlib]
-
-
-[builddirs_zlib]
-C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b/
-
-[libs_zlib]
-zlib
-
-[system_libs_zlib]
-
-
-[defines_zlib]
-
-
-[cppflags_zlib]
-
-
-[cxxflags_zlib]
-
-
-[cflags_zlib]
-
-
-[sharedlinkflags_zlib]
-
-
-[exelinkflags_zlib]
-
-
-[sysroot_zlib]
-
-
-[frameworks_zlib]
-
-
-[frameworkdirs_zlib]
-
-
-[rootpath_zlib]
-C:/Users/Антон/.conan/data/zlib/1.3.1/_/_/package/5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b
-
-[name_zlib]
-zlib
-
-[version_zlib]
-1.3.1
-
-[generatornames_zlib]
-cmake_find_package=ZLIB
-cmake_find_package_multi=ZLIB
-
-[generatorfilenames_zlib]
-
-
-
-[includedirs_bzip2]
-C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/include
-
-[libdirs_bzip2]
-C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/lib
-
-[bindirs_bzip2]
-C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/bin
-
-[resdirs_bzip2]
-
-
-[builddirs_bzip2]
-C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201/
-
-[libs_bzip2]
-bz2
-
-[system_libs_bzip2]
-
-
-[defines_bzip2]
-
-
-[cppflags_bzip2]
-
-
-[cxxflags_bzip2]
-
-
-[cflags_bzip2]
-
-
-[sharedlinkflags_bzip2]
-
-
-[exelinkflags_bzip2]
-
-
-[sysroot_bzip2]
-
-
-[frameworks_bzip2]
-
-
-[frameworkdirs_bzip2]
-
-
-[rootpath_bzip2]
-C:/Users/Антон/.conan/data/bzip2/1.0.8/_/_/package/53b5fd22ba061620078deefdae9a437c5f693201
-
-[name_bzip2]
-bzip2
-
-[version_bzip2]
-1.0.8
-
-[generatornames_bzip2]
-cmake_find_package=BZip2
-cmake_find_package_multi=BZip2
-
-[generatorfilenames_bzip2]
-
-
-
-[USER_boost]
-stacktrace_addr2line_available=False
-[USER_bzip2]
-[USER_zlib]
-[ENV_boost]
-BOOST_ROOT=C:\.conan\029ec3\1
-[ENV_zlib]
-[ENV_bzip2]
-PATH=["C:\Users\Антон\.conan\data\bzip2\1.0.8\_\_\package\53b5fd22ba061620078deefdae9a437c5f693201\bin"]

build/conaninfo.txt

@@ -1,102 +0,0 @@
-[settings]
-    arch=x86_64
-    build_type=Release
-    compiler=Visual Studio
-    compiler.runtime=MD
-    compiler.version=17
-    os=Windows
-
-[requires]
-    boost/1.Y.Z
-
-[options]
-
-
-[full_settings]
-    arch=x86_64
-    arch_build=x86_64
-    build_type=Release
-    compiler=Visual Studio
-    compiler.runtime=MD
-    compiler.version=17
-    os=Windows
-    os_build=Windows
-
-[full_requires]
-    boost/1.84.0:e50863e182b9f1a9ce9e711c031065f1fe5f7f78
-    bzip2/1.0.8:53b5fd22ba061620078deefdae9a437c5f693201
-    zlib/1.3.1:5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b
-
-[full_options]
-    boost:asio_no_deprecated=False
-    boost:buildid=None
-    boost:bzip2=True
-    boost:debug_level=0
-    boost:diagnostic_definitions=False
-    boost:error_code_header_only=False
-    boost:extra_b2_flags=None
-    boost:filesystem_no_deprecated=False
-    boost:filesystem_use_std_fs=False
-    boost:filesystem_version=None
-    boost:header_only=False
-    boost:i18n_backend=deprecated
-    boost:i18n_backend_iconv=off
-    boost:i18n_backend_icu=False
-    boost:layout=system
-    boost:lzma=False
-    boost:magic_autolink=False
-    boost:multithreading=True
-    boost:namespace=boost
-    boost:namespace_alias=False
-    boost:pch=True
-    boost:python_executable=None
-    boost:python_version=None
-    boost:segmented_stacks=False
-    boost:shared=False
-    boost:system_no_deprecated=False
-    boost:system_use_utf8=False
-    boost:visibility=hidden
-    boost:without_atomic=False
-    boost:without_chrono=False
-    boost:without_cobalt=True
-    boost:without_container=False
-    boost:without_context=False
-    boost:without_contract=False
-    boost:without_coroutine=False
-    boost:without_date_time=False
-    boost:without_exception=False
-    boost:without_fiber=True
-    boost:without_filesystem=False
-    boost:without_graph=False
-    boost:without_graph_parallel=True
-    boost:without_iostreams=False
-    boost:without_json=False
-    boost:without_locale=False
-    boost:without_log=False
-    boost:without_math=False
-    boost:without_mpi=True
-    boost:without_nowide=False
-    boost:without_program_options=False
-    boost:without_python=True
-    boost:without_random=False
-    boost:without_regex=False
-    boost:without_serialization=False
-    boost:without_stacktrace=False
-    boost:without_system=False
-    boost:without_test=False
-    boost:without_thread=False
-    boost:without_timer=False
-    boost:without_type_erasure=False
-    boost:without_url=False
-    boost:without_wave=False
-    boost:zlib=True
-    boost:zstd=False
-    bzip2:build_executable=True
-    bzip2:shared=False
-    zlib:shared=False
-
-[recipe_hash]
-
-
-[env]
-

build/graph_info.json

@@ -1,274 +0,0 @@
-{
- "options": [
-  [
-   "boost:asio_no_deprecated",
-   "False"
-  ],
-  [
-   "boost:buildid",
-   "None"
-  ],
-  [
-   "boost:bzip2",
-   "True"
-  ],
-  [
-   "boost:debug_level",
-   "0"
-  ],
-  [
-   "boost:diagnostic_definitions",
-   "False"
-  ],
-  [
-   "boost:error_code_header_only",
-   "False"
-  ],
-  [
-   "boost:extra_b2_flags",
-   "None"
-  ],
-  [
-   "boost:filesystem_no_deprecated",
-   "False"
-  ],
-  [
-   "boost:filesystem_use_std_fs",
-   "False"
-  ],
-  [
-   "boost:filesystem_version",
-   "None"
-  ],
-  [
-   "boost:header_only",
-   "False"
-  ],
-  [
-   "boost:i18n_backend",
-   "deprecated"
-  ],
-  [
-   "boost:i18n_backend_iconv",
-   "off"
-  ],
-  [
-   "boost:i18n_backend_icu",
-   "False"
-  ],
-  [
-   "boost:layout",
-   "system"
-  ],
-  [
-   "boost:lzma",
-   "False"
-  ],
-  [
-   "boost:magic_autolink",
-   "False"
-  ],
-  [
-   "boost:multithreading",
-   "True"
-  ],
-  [
-   "boost:namespace",
-   "boost"
-  ],
-  [
-   "boost:namespace_alias",
-   "False"
-  ],
-  [
-   "boost:pch",
-   "True"
-  ],
-  [
-   "boost:python_executable",
-   "None"
-  ],
-  [
-   "boost:python_version",
-   "None"
-  ],
-  [
-   "boost:segmented_stacks",
-   "False"
-  ],
-  [
-   "boost:shared",
-   "False"
-  ],
-  [
-   "boost:system_no_deprecated",
-   "False"
-  ],
-  [
-   "boost:system_use_utf8",
-   "False"
-  ],
-  [
-   "boost:visibility",
-   "hidden"
-  ],
-  [
-   "boost:without_atomic",
-   "False"
-  ],
-  [
-   "boost:without_chrono",
-   "False"
-  ],
-  [
-   "boost:without_cobalt",
-   "True"
-  ],
-  [
-   "boost:without_container",
-   "False"
-  ],
-  [
-   "boost:without_context",
-   "False"
-  ],
-  [
-   "boost:without_contract",
-   "False"
-  ],
-  [
-   "boost:without_coroutine",
-   "False"
-  ],
-  [
-   "boost:without_date_time",
-   "False"
-  ],
-  [
-   "boost:without_exception",
-   "False"
-  ],
-  [
-   "boost:without_fiber",
-   "True"
-  ],
-  [
-   "boost:without_filesystem",
-   "False"
-  ],
-  [
-   "boost:without_graph",
-   "False"
-  ],
-  [
-   "boost:without_graph_parallel",
-   "True"
-  ],
-  [
-   "boost:without_iostreams",
-   "False"
-  ],
-  [
-   "boost:without_json",
-   "False"
-  ],
-  [
-   "boost:without_locale",
-   "False"
-  ],
-  [
-   "boost:without_log",
-   "False"
-  ],
-  [
-   "boost:without_math",
-   "False"
-  ],
-  [
-   "boost:without_mpi",
-   "True"
-  ],
-  [
-   "boost:without_nowide",
-   "False"
-  ],
-  [
-   "boost:without_program_options",
-   "False"
-  ],
-  [
-   "boost:without_python",
-   "True"
-  ],
-  [
-   "boost:without_random",
-   "False"
-  ],
-  [
-   "boost:without_regex",
-   "False"
-  ],
-  [
-   "boost:without_serialization",
-   "False"
-  ],
-  [
-   "boost:without_stacktrace",
-   "False"
-  ],
-  [
-   "boost:without_system",
-   "False"
-  ],
-  [
-   "boost:without_test",
-   "False"
-  ],
-  [
-   "boost:without_thread",
-   "False"
-  ],
-  [
-   "boost:without_timer",
-   "False"
-  ],
-  [
-   "boost:without_type_erasure",
-   "False"
-  ],
-  [
-   "boost:without_url",
-   "False"
-  ],
-  [
-   "boost:without_wave",
-   "False"
-  ],
-  [
-   "boost:zlib",
-   "True"
-  ],
-  [
-   "boost:zstd",
-   "False"
-  ],
-  [
-   "bzip2:build_executable",
-   "True"
-  ],
-  [
-   "bzip2:shared",
-   "False"
-  ],
-  [
-   "zlib:shared",
-   "False"
-  ]
- ],
- "root": {
-  "name": null,
-  "version": null,
-  "user": null,
-  "channel": null
- }
-}

db_assets/sql_scripts/init.sql

@@ -72,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`),

src/DAO/MySQLUserDAO.h

@@ -1,4 +1,3 @@
-#pragma once
 #include <mysqlx/xdevapi.h>
 
 #include "IUserDAO.h"

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/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"
@@ -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> 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
 {
@@ -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"
@@ -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,8 +58,7 @@ 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 user;

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,22 +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>
@@ -21,7 +19,6 @@
 #include "./listener/Listener.h"
 #include "./db/mysql_connector.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,10 +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};
@@ -61,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) << "Приложение запущено2";
-
   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,168 +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"
-
-const std::string kUUID = std::to_string(uad::Random());
-
-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>;
-using Request = boost::beast::http::request<beast::http::string_body,
-                                            beast::http::basic_fields<std::allocator<char>>>;
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Cannot_Serialize_JSON, AuthFixture)
-{
-  auto& argv = boost::unit_test::framework::master_test_suite().argv;
-
-  const std::string mysql_credentials = argv[1];
-
-  mysqlx::Session* mysql_session = new mysqlx::Session(mysql_credentials);
-
-  uad::SetMySqlSession(mysql_session);
-
-  auto user_dao = make_shared<MySQLUserDAO>(GetMySqlSession());
-  auto auth_dao = make_shared<MemoryAuthDAO>(GetMySqlSession());
-  auto executor = RouteAuthLoginExecutor(GetMySqlSession(), user_dao, auth_dao);
-
-  Request req;
-
-  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;
-                        });
-
-  mysql_session->close();
-  delete mysql_session;
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Invalid_Login_Data, AuthFixture)
-{
-  auto& argv = boost::unit_test::framework::master_test_suite().argv;
-
-  const std::string mysql_credentials = argv[1];
-
-  mysqlx::Session* mysql_session = new mysqlx::Session(mysql_credentials);
-
-  uad::SetMySqlSession(mysql_session);
-
-  auto user_dao = make_shared<MySQLUserDAO>(GetMySqlSession());
-  auto auth_dao = make_shared<MemoryAuthDAO>(GetMySqlSession());
-  auto executor = RouteAuthLoginExecutor(GetMySqlSession(), user_dao, auth_dao);
-
-  Request req;
-  value req_body;
-
-  req_body.emplace_object();
-
-  req_body.as_object().emplace("login"s, "MyLogin123456780"s + kUUID);
-  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;
-                        });
-
-  mysql_session->close();
-  delete mysql_session;
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Invalid_Fields, AuthFixture)
-{
-  auto& argv = boost::unit_test::framework::master_test_suite().argv;
-
-  const std::string mysql_credentials = argv[1];
-
-  mysqlx::Session* mysql_session = new mysqlx::Session(mysql_credentials);
-
-  uad::SetMySqlSession(mysql_session);
-
-  auto user_dao = make_shared<MySQLUserDAO>(GetMySqlSession());
-  auto auth_dao = make_shared<MemoryAuthDAO>(GetMySqlSession());
-  auto executor = RouteAuthLoginExecutor(GetMySqlSession(), user_dao, auth_dao);
-
-  Request req;
-  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;
-                        });
-
-  mysql_session->close();
-  delete mysql_session;
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Succesful_Login, AuthFixture)
-{
-  auto& argv = boost::unit_test::framework::master_test_suite().argv;
-
-  const std::string mysql_credentials = argv[1];
-
-  mysqlx::Session* mysql_session = new mysqlx::Session(mysql_credentials);
-
-  uad::SetMySqlSession(mysql_session);
-
-  auto user_dao = make_shared<MySQLUserDAO>(GetMySqlSession());
-  auto auth_dao = make_shared<MemoryAuthDAO>(GetMySqlSession());
-  auto executor = RouteAuthLoginExecutor(GetMySqlSession(), user_dao, auth_dao);
-
-  Request req;
-  value req_body;
-
-  user_dao->Create({""s, "MyLogin123456780"s + kUUID, HashPassword("Qwerty123456"s)});
-
-  req_body.emplace_object();
-
-  req_body.as_object().emplace("login"s, "MyLogin123456780"s + kUUID);
-  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);
-
-  mysql_session->close();
-  delete mysql_session;
-}

tests/endpoint_handlers/AuthLogoutExecutor_TEST.cpp

@@ -1,129 +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"
-
-const std::string kUUID = std::to_string(uad::Random());
-
-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)
-{
-  auto& argv = boost::unit_test::framework::master_test_suite().argv;
-
-  const std::string mysql_credentials = argv[1];
-
-  mysqlx::Session* mysql_session = new mysqlx::Session(mysql_credentials);
-
-  uad::SetMySqlSession(mysql_session);
-
-  auto auth_dao = make_shared<MemoryAuthDAO>(GetMySqlSession());
-  auto executor = RouteAuthLogoutExecutor(GetMySqlSession(), auth_dao);
-
-  Request req;
-  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;
-                        });
-
-  mysql_session->close();
-  delete mysql_session;
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Cant_Revoke_Token, AuthFixture)
-{
-  auto& argv = boost::unit_test::framework::master_test_suite().argv;
-
-  const std::string mysql_credentials = argv[1];
-
-  mysqlx::Session* mysql_session = new mysqlx::Session(mysql_credentials);
-
-  uad::SetMySqlSession(mysql_session);
-
-  auto auth_dao = make_shared<MemoryAuthDAO>(GetMySqlSession());
-  auto executor = RouteAuthLogoutExecutor(GetMySqlSession(), auth_dao);
-
-  Request req;
-  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;
-                        });
-
-  mysql_session->close();
-  delete mysql_session;
-}
-
-BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Succesful_Auth, AuthFixture)
-{
-  auto& argv = boost::unit_test::framework::master_test_suite().argv;
-
-  const std::string mysql_credentials = argv[1];
-
-  mysqlx::Session* mysql_session = new mysqlx::Session(mysql_credentials);
-
-  uad::SetMySqlSession(mysql_session);
-
-  auto auth_dao = make_shared<MemoryAuthDAO>(GetMySqlSession());
-  auto executor = RouteAuthLogoutExecutor(GetMySqlSession(), auth_dao);
-
-  Request req;
-  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);
-
-  mysql_session->close();
-  delete mysql_session;
-}

tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp

@@ -1,90 +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"
-
-const std::string kUUID = std::to_string(uad::Random());
-
-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)
-{
-  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)
-{
-  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)
-{
-  value req_body;
-
-  req_body.emplace_object();
-
-  req_body.as_object().emplace("login"s, "MyLogin123456780"s + kUUID);
-  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_Login, AuthFixture)
-{
-  value req_body;
-
-  req_body.emplace_object();
-
-  req_body.as_object().emplace("login"s, "MyLogin123456780"s + kUUID);
-  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() :
-  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())),
-  executor(RouteAuthRegistrationExecutor(GetMySqlSession(), user_dao))
-{
-  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,39 +0,0 @@
-#pragma once
-
-#include <string>
-#include <boost/beast.hpp>
-#include <memory>
-
-#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
-{
-class AuthFixture {
-public:
-  using RouteAuthRegistrationExecutor = AuthRegistrationExecutor<boost::beast::http::string_body,
-                                                               std::allocator<char>,
-                                                               boost::beast::http::string_body>;
-  using Request = boost::beast::http::request<boost::beast::http::string_body,
-                                              boost::beast::http::basic_fields<std::allocator<char>>>;
-  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;
-  RouteAuthRegistrationExecutor executor;
-
-  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);
-};
-}