generated from Sithas/conan_template
Compare commits
1 Commits
bea195ca80
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
 Антон
|
e48d3f30cb |
+4
-78
@@ -3,7 +3,7 @@ project(UpAndDown)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 23)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
add_definitions(-D_WIN32_WINNT=0x0602)
|
||||
|
||||
if(POLICY CMP0167)
|
||||
cmake_policy(SET CMP0167 OLD)
|
||||
endif()
|
||||
@@ -48,12 +48,10 @@ add_executable(App ./src/main.cpp
|
||||
./src/DAO/MemoryAuthDAO.cpp
|
||||
./src/DAO/MemoryAuthDAO.h
|
||||
./src/endpoints_handlers/AuthLogoutExecutor.h
|
||||
./src/endpoints_handlers/AuthLoginExecutor.h
|
||||
./src/exceptions/session_exception.cpp
|
||||
./src/exceptions/session_exception.h
|
||||
src/log/Log.h
|
||||
src/log/Log.cpp
|
||||
tests/fixtures/AuthFixture.h
|
||||
)
|
||||
|
||||
target_link_libraries(App PRIVATE Boost::boost
|
||||
@@ -71,7 +69,7 @@ endif ()
|
||||
add_executable(HelpersTests ./tests/helpers/helpers_TEST.cpp
|
||||
./src/helpers/helpers.h
|
||||
./src/helpers/helpers.cpp)
|
||||
target_link_libraries(HelpersTests PRIVATE Boost::boost Boost::json Boost::log)
|
||||
target_link_libraries(HelpersTests PRIVATE Boost::boost)
|
||||
add_test(HelpersTests HelpersTests)
|
||||
|
||||
add_executable(ControllerTests ./tests/endpoint_handlers/Controller_TEST.cpp
|
||||
@@ -81,85 +79,13 @@ 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)
|
||||
./src/endpoints_handlers/AuthRegistrationExecutor.h)
|
||||
target_link_libraries(AuthRegistrationExecutorTests PRIVATE Boost::boost Boost::json mysql::concpp)
|
||||
add_test(AuthRegistrationExecutorTests AuthRegistrationExecutorTests)
|
||||
|
||||
add_executable(AuthLoginExecutorTests ./tests/endpoint_handlers/AuthLoginExecutor_TEST.cpp
|
||||
./src/endpoints_handlers/AuthRegistrationExecutor.h
|
||||
./src/exceptions/session_exception.cpp
|
||||
./src/exceptions/session_exception.h
|
||||
./src/helpers/helpers.h
|
||||
./src/helpers/helpers.cpp
|
||||
./src/DAO/MySQLUserDAO.h
|
||||
./src/DAO/MySQLUserDAO.cpp
|
||||
./src/DAO/MemoryAuthDAO.h
|
||||
./src/DAO/MemoryAuthDAO.cpp
|
||||
./src/db/mysql_connector.h
|
||||
./src/db/mysql_connector.cpp
|
||||
tests/fixtures/AuthFixture.h
|
||||
tests/fixtures/AuthFixture.cpp
|
||||
./tests/fixtures/fixture_session_initialization_helper.h
|
||||
./tests/fixtures/fixture_session_initialization_helper.cpp)
|
||||
target_link_libraries(AuthLoginExecutorTests PRIVATE Boost::boost
|
||||
Boost::json
|
||||
Boost::log
|
||||
Boost::system
|
||||
Boost::filesystem
|
||||
Threads::Threads
|
||||
mysql::concpp)
|
||||
add_test(AuthLoginExecutorTests AuthLoginExecutorTests)
|
||||
|
||||
add_executable(AuthLogoutExecutorTests ./tests/endpoint_handlers/AuthLogoutExecutor_TEST.cpp
|
||||
./src/endpoints_handlers/AuthRegistrationExecutor.h
|
||||
./src/exceptions/session_exception.cpp
|
||||
./src/exceptions/session_exception.h
|
||||
./src/helpers/helpers.h
|
||||
./src/helpers/helpers.cpp
|
||||
./src/DAO/MySQLUserDAO.h
|
||||
./src/DAO/MySQLUserDAO.cpp
|
||||
./src/DAO/MemoryAuthDAO.h
|
||||
./src/DAO/MemoryAuthDAO.cpp
|
||||
./src/db/mysql_connector.h
|
||||
./src/db/mysql_connector.cpp
|
||||
tests/fixtures/AuthFixture.h
|
||||
tests/fixtures/AuthFixture.cpp
|
||||
./tests/fixtures/fixture_session_initialization_helper.h
|
||||
./tests/fixtures/fixture_session_initialization_helper.cpp)
|
||||
target_link_libraries(AuthLogoutExecutorTests PRIVATE Boost::boost
|
||||
Boost::json
|
||||
Boost::log
|
||||
Boost::system
|
||||
Boost::filesystem
|
||||
Threads::Threads
|
||||
mysql::concpp)
|
||||
add_test(AuthLogoutExecutorTests AuthLogoutExecutorTests)
|
||||
|
||||
if (WIN32)
|
||||
target_compile_definitions(App PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
|
||||
target_compile_definitions(HelpersTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
|
||||
target_compile_definitions(ControllerTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
|
||||
target_compile_definitions(AuthRegistrationExecutorTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
|
||||
target_compile_definitions(AuthLoginExecutorTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
|
||||
target_compile_definitions(AuthLogoutExecutorTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
|
||||
endif()
|
||||
|
||||
-674
@@ -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>.
|
||||
@@ -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))
|
||||
|
||||
@@ -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`),
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#pragma once
|
||||
#include <mysqlx/xdevapi.h>
|
||||
|
||||
#include "IUserDAO.h"
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
#include "Listener.h"
|
||||
|
||||
namespace uad
|
||||
{
|
||||
Listener::Listener(boost::asio::io_context& ioc,
|
||||
boost::asio::ip::tcp::endpoint endpoint,
|
||||
const std::shared_ptr<const std::string>& doc_root)
|
||||
: ioc_(ioc), acceptor_(net::make_strand(ioc)), doc_root_(doc_root)
|
||||
{
|
||||
beast::error_code ec;
|
||||
|
||||
acceptor_.open(endpoint.protocol(), ec);
|
||||
if (ec)
|
||||
{
|
||||
uad::Fail(ec, "open");
|
||||
return;
|
||||
}
|
||||
|
||||
acceptor_.set_option(net::socket_base::reuse_address(true), ec);
|
||||
if (ec)
|
||||
{
|
||||
uad::Fail(ec, "set_option");
|
||||
return;
|
||||
}
|
||||
|
||||
acceptor_.bind(endpoint, ec);
|
||||
if (ec)
|
||||
{
|
||||
uad::Fail(ec, "bind");
|
||||
return;
|
||||
}
|
||||
|
||||
acceptor_.listen(
|
||||
net::socket_base::max_listen_connections, ec);
|
||||
if (ec)
|
||||
{
|
||||
uad::Fail(ec, "listen");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void Listener::Run()
|
||||
{
|
||||
DoAccept();
|
||||
}
|
||||
|
||||
void Listener::DoAccept()
|
||||
{
|
||||
acceptor_.async_accept(
|
||||
net::make_strand(ioc_),
|
||||
beast::bind_front_handler(
|
||||
&Listener::OnAccept,
|
||||
shared_from_this()));
|
||||
}
|
||||
|
||||
void Listener::OnAccept(beast::error_code ec, tcp::socket socket)
|
||||
{
|
||||
if (ec)
|
||||
{
|
||||
uad::Fail(ec, "accept");
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
std::make_shared<uad::Session>(
|
||||
std::move(socket),
|
||||
doc_root_)->Run();
|
||||
}
|
||||
|
||||
DoAccept();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
#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>
|
||||
|
||||
#include "helpers.h"
|
||||
#include "Session.h"
|
||||
|
||||
namespace uad
|
||||
{
|
||||
namespace beast = boost::beast;
|
||||
namespace http = beast::http;
|
||||
namespace net = boost::asio;
|
||||
using tcp = boost::asio::ip::tcp;
|
||||
|
||||
class Listener : public std::enable_shared_from_this<Listener>
|
||||
{
|
||||
net::io_context& ioc_;
|
||||
tcp::acceptor acceptor_;
|
||||
std::shared_ptr<std::string const> doc_root_;
|
||||
|
||||
public:
|
||||
Listener(
|
||||
net::io_context& ioc,
|
||||
tcp::endpoint endpoint,
|
||||
std::shared_ptr<std::string const> const& doc_root);
|
||||
|
||||
void Run();
|
||||
|
||||
private:
|
||||
void DoAccept();
|
||||
|
||||
void OnAccept(beast::error_code ec, tcp::socket socket);
|
||||
};
|
||||
}
|
||||
@@ -1,12 +1,13 @@
|
||||
#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 <boost/log/trivial.hpp>
|
||||
#include <boost/log/utility/setup/common_attributes.hpp>
|
||||
|
||||
#include "IExecutor.h"
|
||||
#include "../DAO/IUserDAO.h"
|
||||
#include "../DAO/IAuthDAO.h"
|
||||
@@ -39,7 +40,7 @@ public:
|
||||
using namespace boost::beast;
|
||||
using namespace std::string_literals;
|
||||
|
||||
BOOST_LOG_TRIVIAL(info) << "POST /api/v1/Auth/Login - Request";
|
||||
// BOOST_LOG_TRIVIAL(info) << "Auth/Login - Request";
|
||||
|
||||
const auto body = req.body();
|
||||
value req_json;
|
||||
@@ -50,8 +51,8 @@ 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");
|
||||
// BOOST_LOG_TRIVIAL(error) << "Auth/Login - Error 400";
|
||||
throw session_exception(http::status::bad_request, "cannot deserialize json");
|
||||
}
|
||||
|
||||
|
||||
@@ -60,15 +61,15 @@ public:
|
||||
|
||||
if (login.empty() || password.empty())
|
||||
{
|
||||
BOOST_LOG_TRIVIAL(info) << "POST /api/v1/Auth/Login - Response 422: Login or password are empty";
|
||||
// BOOST_LOG_TRIVIAL(error) << "Auth/Login - Error 422";
|
||||
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";
|
||||
// BOOST_LOG_TRIVIAL(error) << "Auth/Login - Error 403";
|
||||
throw session_exception(http::status::forbidden,"Incorrect login or password");
|
||||
}
|
||||
const std::string token = GenerateUUID();
|
||||
@@ -84,6 +85,8 @@ public:
|
||||
res.set(http::field::content_type, "application/json");
|
||||
res.content_length(res.body().size());
|
||||
|
||||
// BOOST_LOG_TRIVIAL(info) << "Auth/Login - Success - 200";
|
||||
|
||||
return res;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
#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 <boost/log/trivial.hpp>
|
||||
#include <boost/log/utility/setup/common_attributes.hpp>
|
||||
|
||||
#include "IExecutor.h"
|
||||
#include "../DAO/IUserDAO.h"
|
||||
#include "../DAO/IAuthDAO.h"
|
||||
#include "../exceptions/session_exception.h"
|
||||
#include "../helpers/helpers.h"
|
||||
|
||||
namespace uad
|
||||
{
|
||||
@@ -32,7 +37,7 @@ public:
|
||||
using namespace boost::beast;
|
||||
using namespace std::string_literals;
|
||||
|
||||
BOOST_LOG_TRIVIAL(info) << "POST /api/v1/Auth/Logout - Request";
|
||||
// BOOST_LOG_TRIVIAL(info) << "Auth/Logout - Request";
|
||||
|
||||
const auto body = req.body();
|
||||
value req_json;
|
||||
@@ -43,16 +48,16 @@ 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::bad_request, "cannot deserialize json"s);
|
||||
// BOOST_LOG_TRIVIAL(error) << "Auth/Login - Error 500";
|
||||
throw session_exception(http::status::internal_server_error, "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);
|
||||
// BOOST_LOG_TRIVIAL(error) << "Auth/Login - Error 400";
|
||||
throw session_exception(http::status::bad_request, "token is not authorized"s);
|
||||
}
|
||||
|
||||
http::response<ResponseType> res{http::status::ok, req.version()};
|
||||
@@ -61,6 +66,8 @@ public:
|
||||
res.set(http::field::content_type, "application/json");
|
||||
res.content_length(res.body().size());
|
||||
|
||||
// BOOST_LOG_TRIVIAL(info) << "Auth/Login - Success 200";
|
||||
|
||||
return res;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
#pragma once
|
||||
#include <boost/log/trivial.hpp>
|
||||
|
||||
#include <regex>
|
||||
#include <boost/json.hpp>
|
||||
#include <mysqlx/xdevapi.h>
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/log/utility/setup/common_attributes.hpp>
|
||||
|
||||
#include "IExecutor.h"
|
||||
#include "../DAO/IUserDAO.h"
|
||||
@@ -33,7 +34,7 @@ public:
|
||||
using namespace boost::beast;
|
||||
using namespace std::string_literals;
|
||||
|
||||
BOOST_LOG_TRIVIAL(info) << "POST /api/v1/Auth/Registration - Request";
|
||||
// BOOST_LOG_TRIVIAL(info) << "Auth/Registration - Request";
|
||||
|
||||
const auto& body = req.body();
|
||||
value req_json;
|
||||
@@ -44,8 +45,8 @@ 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");
|
||||
// BOOST_LOG_TRIVIAL(error) << "Auth/Logout - Error 400";
|
||||
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 +54,7 @@ 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.";
|
||||
// BOOST_LOG_TRIVIAL(error) << "Auth/Logout - Error 422";
|
||||
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 +63,8 @@ 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);
|
||||
// BOOST_LOG_TRIVIAL(error) << "Auth/Logout - Error 409";
|
||||
throw session_exception(http::status::conflict, "user with login "s + login + " exists"s);
|
||||
}
|
||||
|
||||
user user;
|
||||
@@ -93,6 +94,8 @@ public:
|
||||
res.set(http::field::content_type, "application/json");
|
||||
res.content_length(res.body().size());
|
||||
|
||||
// BOOST_LOG_TRIVIAL(info) << "Auth/Logout - Created 201";
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
+4
-5
@@ -11,12 +11,11 @@ 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::file_name = "app_%Y-%m-%d_%H-%M-%S.log", // Имя файла с timestamp
|
||||
logging::keywords::rotation_size = 10 * 1024 * 1024, // Ротация при достижении 10 МБ
|
||||
logging::keywords::time_based_rotation =
|
||||
logging::sinks::file::rotation_at_time_point(0, 0, 0),
|
||||
logging::keywords::format = "[%TimeStamp%] [%Severity%]: %Message%"
|
||||
logging::sinks::file::rotation_at_time_point(0, 0, 0), // Ротация каждый день в полночь
|
||||
logging::keywords::format = "[%TimeStamp%] [%Severity%]: %Message%" // Формат записи
|
||||
);
|
||||
logging::add_common_attributes();
|
||||
}
|
||||
}
|
||||
|
||||
+6
-3
@@ -1,9 +1,8 @@
|
||||
#include <boost/log/trivial.hpp>
|
||||
#ifdef WIN32
|
||||
#define _WIN32_WINNT 0x0602
|
||||
#include <sdkddkver.h>
|
||||
#endif
|
||||
|
||||
|
||||
#include <algorithm>
|
||||
#include <boost/asio/signal_set.hpp>
|
||||
#include <boost/beast/core.hpp>
|
||||
@@ -16,6 +15,9 @@
|
||||
#include <string>
|
||||
#include <thread>
|
||||
#include <vector>
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/log/utility/setup/file.hpp>
|
||||
#include <boost/log/utility/setup/common_attributes.hpp>
|
||||
|
||||
#include "./session/WebsocketSession.h"
|
||||
#include "./listener/Listener.h"
|
||||
@@ -51,6 +53,7 @@ int main(int argc, char* argv[])
|
||||
InitLogs();
|
||||
|
||||
// Добавление общих атрибутов (включая время)
|
||||
logging::add_common_attributes();
|
||||
|
||||
uad::SetMySqlSession(new mysqlx::Session(mysql_credentials));
|
||||
|
||||
@@ -61,7 +64,7 @@ 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";
|
||||
BOOST_LOG_TRIVIAL(info) << "Приложение запущено";
|
||||
|
||||
std::vector<std::thread> v;
|
||||
v.reserve(threads - 1);
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
#include <memory>
|
||||
#include <boost/beast.hpp>
|
||||
#include <boost/asio.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/log/utility/setup/file.hpp>
|
||||
#include <boost/log/utility/setup/common_attributes.hpp>
|
||||
|
||||
namespace uad
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -6,85 +6,22 @@
|
||||
|
||||
#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)
|
||||
BOOST_AUTO_TEST_CASE(AuthRegistrationExecutor_Succesful_Login)
|
||||
{
|
||||
req.body() = "{ \"login\": ABS3 }"s;
|
||||
auto user_dao = make_shared<MySQLUserDAO>(GetMySqlSession());
|
||||
auto executor = make_shared<RouteAuthRegistrationExecutor>(GetMySqlSession(), user_dao);
|
||||
|
||||
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;
|
||||
});
|
||||
BOOST_CHECK(true == true);
|
||||
}
|
||||
|
||||
Vendored
-36
@@ -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");
|
||||
}
|
||||
}
|
||||
Vendored
-39
@@ -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();
|
||||
};
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user