Compare commits
	
		
			47 Commits
		
	
	
		
			exchanges-
			...
			capacity-s
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 63def650c9 | |||
| 
						 | 
					a201bcc581 | ||
| e688f8b71d | |||
| 
						 | 
					389e557674 | ||
| dd82acc1de | |||
| 
						 | 
					bfa8eb6e3e | ||
| 
						 | 
					a910709798 | ||
| 
						 | 
					270e31f120 | ||
| 
						 | 
					6a0d425c37 | ||
| 
						 | 
					676070c8c7 | ||
| 
						 | 
					7045844653 | ||
| cd2665bd08 | |||
| 
						 | 
					0eccbfe9a3 | ||
| 
						 | 
					a304e25629 | ||
| 
						 | 
					af29d0a54a | ||
| 
						 | 
					20a6db61cc | ||
| 
						 | 
					20f52746b5 | ||
| 
						 | 
					cf875889b9 | ||
| 
						 | 
					08a4bdde06 | ||
| 
						 | 
					548e39dc63 | ||
| 
						 | 
					65ea502619 | ||
| c177314419 | |||
| 
						 | 
					847dd76fc8 | ||
| 
						 | 
					265315b874 | ||
| 
						 | 
					d1a54a93d6 | ||
| 
						 | 
					7f647f9b8a | ||
| 
						 | 
					7b9e334328 | ||
| 
						 | 
					d217536f2c | ||
| 
						 | 
					6a4ea45900 | ||
| 
						 | 
					06fb41b5dd | ||
| 
						 | 
					5ec41fa5d0 | ||
| 
						
						
							
						
						fa59845be8
	
				 | 
					
					
						|||
| c89d629c61 | |||
| 
						 | 
					5ed445449c | ||
| 
						 | 
					0103a028b4 | ||
| 
						 | 
					b740562e9d | ||
| 
						 | 
					4cf6cb58cb | ||
| 27b357fc86 | |||
| 3269a36239 | |||
| 
						 | 
					2d28abefea | ||
| 
						 | 
					ad3d4e6900 | ||
| 
						 | 
					3222faeab2 | ||
| 
						 | 
					c5f09a91ec | ||
| 
						 | 
					11ec43911e | ||
| 
						
						
							
						
						c762d7fd4b
	
				 | 
					
					
						|||
| 
						
						
							
						
						77c3b9e3a5
	
				 | 
					
					
						|||
| 
						 | 
					d4514affcc | 
							
								
								
									
										674
									
								
								COPYING
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										674
									
								
								COPYING
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,674 @@
 | 
			
		||||
                    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/philosophy/why-not-lgpl.html>.
 | 
			
		||||
@@ -48,8 +48,9 @@ public class User {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public void removeGroup(Long id) {
 | 
			
		||||
	final Groups groupToDelete = this.studentRegisteredGrups.stream().filter(e -> e.getId().equals(id)).findFirst().get();
 | 
			
		||||
	this.studentRegisteredGrups.remove(groupToDelete);
 | 
			
		||||
        final Groups groupToDelete = this.studentRegisteredGrups.stream().filter(e -> e.getId().equals(id)).findFirst()
 | 
			
		||||
                .get();
 | 
			
		||||
        this.studentRegisteredGrups.remove(groupToDelete);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public void claimGroup(Groups group) {
 | 
			
		||||
@@ -164,7 +165,7 @@ public class User {
 | 
			
		||||
    public void setToken(String token) {
 | 
			
		||||
        this.tokenUsageDate = new Timestamp(System.currentTimeMillis());
 | 
			
		||||
        this.token = token;
 | 
			
		||||
        this.refreshToken = UUID.randomUUID().toString();
 | 
			
		||||
        this.refreshToken = this.refreshToken == null ? UUID.randomUUID().toString() : this.refreshToken;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
@@ -236,6 +237,9 @@ public class User {
 | 
			
		||||
     * @return ranking points [100;500]
 | 
			
		||||
     */
 | 
			
		||||
    public Integer getRanking() {
 | 
			
		||||
        if (ranking == null) {
 | 
			
		||||
            return 100;
 | 
			
		||||
        }
 | 
			
		||||
        return ranking;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										86
									
								
								buisnesslogic/src/main/java/com/plannaplan/models/ExportData.java
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										86
									
								
								buisnesslogic/src/main/java/com/plannaplan/models/ExportData.java
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,86 @@
 | 
			
		||||
package com.plannaplan.models;
 | 
			
		||||
 | 
			
		||||
import java.util.stream.Collectors;
 | 
			
		||||
import java.util.stream.Stream;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Container to keep data to export
 | 
			
		||||
 */
 | 
			
		||||
public class ExportData {
 | 
			
		||||
 | 
			
		||||
    private static final String GROUP_FIELD = "gr_nr";
 | 
			
		||||
    private static final String USER_FIELD = "user_id";
 | 
			
		||||
    private static final String CYKL_FIELD = "zaj_cykl_id";
 | 
			
		||||
 | 
			
		||||
    private String userId;
 | 
			
		||||
    private String zajCyklId;
 | 
			
		||||
    private String grNr;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param userId    usosid
 | 
			
		||||
     * @param zajCyklId course cycle
 | 
			
		||||
     * @param grNr      group number
 | 
			
		||||
     */
 | 
			
		||||
    public ExportData(String userId, String zajCyklId, String grNr) {
 | 
			
		||||
        this.setUserId(userId);
 | 
			
		||||
        this.setZajCyklId(zajCyklId);
 | 
			
		||||
        this.setGrNr(grNr);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return group number
 | 
			
		||||
     */
 | 
			
		||||
    public String getGrNr() {
 | 
			
		||||
        return grNr;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param grNr group number
 | 
			
		||||
     */
 | 
			
		||||
    public void setGrNr(String grNr) {
 | 
			
		||||
        this.grNr = grNr;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return course cycle
 | 
			
		||||
     */
 | 
			
		||||
    public String getZajCyklId() {
 | 
			
		||||
        return zajCyklId;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param zajCyklId course cycle
 | 
			
		||||
     */
 | 
			
		||||
    public void setZajCyklId(String zajCyklId) {
 | 
			
		||||
        this.zajCyklId = zajCyklId;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return usosid
 | 
			
		||||
     */
 | 
			
		||||
    public String getUserId() {
 | 
			
		||||
        return userId;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param userId usosid
 | 
			
		||||
     */
 | 
			
		||||
    public void setUserId(String userId) {
 | 
			
		||||
        this.userId = userId;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return csv fromated line
 | 
			
		||||
     */
 | 
			
		||||
    public String convertToCSVRecord() {
 | 
			
		||||
        return Stream.of(this.userId, this.zajCyklId, this.grNr).collect(Collectors.joining(","));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return csv formated first line
 | 
			
		||||
     */
 | 
			
		||||
    public static String getCSVHeader() {
 | 
			
		||||
        return USER_FIELD + ", " + CYKL_FIELD + ", " + GROUP_FIELD;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -10,17 +10,15 @@ import org.springframework.data.repository.query.Param;
 | 
			
		||||
import org.springframework.stereotype.Repository;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 *  CommisionRepository.getUsers:
 | 
			
		||||
 *      Return list of:
 | 
			
		||||
 *      SELECT * FROM Commision WHERE owner_id = i .
 | 
			
		||||
 * CommisionRepository.getUsers: Return list of: SELECT * FROM Commision WHERE
 | 
			
		||||
 * owner_id = i .
 | 
			
		||||
 * 
 | 
			
		||||
 *      Where i, ?1 are equale to variables. 
 | 
			
		||||
 * Where i, ?1 are equale to variables.
 | 
			
		||||
 * 
 | 
			
		||||
 *  CommisionRepository.getNewestCommision
 | 
			
		||||
 *      Return list of:
 | 
			
		||||
 *      SELECT * FROM Commision WHERE owner_id = i Order by commisionDate desc.
 | 
			
		||||
 * CommisionRepository.getNewestCommision Return list of: SELECT * FROM
 | 
			
		||||
 * Commision WHERE owner_id = i Order by commisionDate desc.
 | 
			
		||||
 * 
 | 
			
		||||
 *      Where i, ?1 are equale to variables.      
 | 
			
		||||
 * Where i, ?1 are equale to variables.
 | 
			
		||||
 */
 | 
			
		||||
@Repository
 | 
			
		||||
public interface CommisionRepository extends JpaRepository<Commision, Long> {
 | 
			
		||||
@@ -30,4 +28,10 @@ public interface CommisionRepository extends JpaRepository<Commision, Long> {
 | 
			
		||||
    @Query("FROM Commision WHERE owner_id = ?1 order by commisionDate desc")
 | 
			
		||||
    List<Commision> getNewestCommision(@Param("owner_id") Long id);
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return ammount of uniqe users that have a commision placed on first array
 | 
			
		||||
     *         element
 | 
			
		||||
     */
 | 
			
		||||
    @Query("SELECT COUNT(DISTINCT owner_id) AS count FROM Commision")
 | 
			
		||||
    Object[] getUsersAssigned();
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -106,4 +106,12 @@ public class AssignmentService {
 | 
			
		||||
            this.emailService.sendAcceptationResult(e, new EmailAcceptedData(accepted, removed));
 | 
			
		||||
        });
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param toSave list of entites to save to db
 | 
			
		||||
     * @return list of assignments entities with ids from db
 | 
			
		||||
     */
 | 
			
		||||
    public List<Assignment> saveAll(List<Assignment> toSave) {
 | 
			
		||||
        return this.repo.saveAll(toSave);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,12 @@
 | 
			
		||||
package com.plannaplan.services;
 | 
			
		||||
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
import java.util.List;
 | 
			
		||||
import java.util.Optional;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.entities.Commision;
 | 
			
		||||
import com.plannaplan.entities.User;
 | 
			
		||||
import com.plannaplan.models.ExportData;
 | 
			
		||||
import com.plannaplan.repositories.AssignmentRepository;
 | 
			
		||||
import com.plannaplan.repositories.CommisionRepository;
 | 
			
		||||
 | 
			
		||||
@@ -22,6 +24,8 @@ public class CommisionService {
 | 
			
		||||
    private CommisionRepository repo;
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private AssignmentRepository aRepository;
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private UserService userService;
 | 
			
		||||
 | 
			
		||||
    public CommisionService() {
 | 
			
		||||
    }
 | 
			
		||||
@@ -77,4 +81,21 @@ public class CommisionService {
 | 
			
		||||
    public long getCommisionsAmmount() {
 | 
			
		||||
        return this.repo.count();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return list of ExportData inmstancces keeping data to exprt to file
 | 
			
		||||
     */
 | 
			
		||||
    public List<ExportData> getExportData() {
 | 
			
		||||
        final List<ExportData> response = new ArrayList<>();
 | 
			
		||||
 | 
			
		||||
        this.userService.getAllStudents().forEach(student -> {
 | 
			
		||||
            student.getStudentRegisteredGrups().forEach(group -> {
 | 
			
		||||
                response.add(new ExportData(student.getUsosId(), Integer.toString(group.getZajCykId()),
 | 
			
		||||
                        Integer.toString(group.getGrNr())));
 | 
			
		||||
            });
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
        return response;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
package com.plannaplan.services;
 | 
			
		||||
 | 
			
		||||
import java.util.HashMap;
 | 
			
		||||
import java.util.Iterator;
 | 
			
		||||
import java.util.List;
 | 
			
		||||
import java.util.Objects;
 | 
			
		||||
import java.util.Optional;
 | 
			
		||||
@@ -153,4 +154,22 @@ public class GroupService {
 | 
			
		||||
 | 
			
		||||
        return response;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return amount of groups with full capacity taken
 | 
			
		||||
     */
 | 
			
		||||
    public Integer getFullgroupsAmmount() {
 | 
			
		||||
        Integer response = 0;
 | 
			
		||||
        final Iterator<Groups> groups = this.repo.findAll().iterator();
 | 
			
		||||
 | 
			
		||||
        while (groups.hasNext()) {
 | 
			
		||||
            final Groups group = groups.next();
 | 
			
		||||
            if (group.getCapacity() <= group.getRegisteredStudents().size()) {
 | 
			
		||||
                response += 1;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        return response;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,13 +1,16 @@
 | 
			
		||||
package com.plannaplan.services;
 | 
			
		||||
 | 
			
		||||
import java.util.Iterator;
 | 
			
		||||
import java.util.List;
 | 
			
		||||
import java.util.Optional;
 | 
			
		||||
import java.util.UUID;
 | 
			
		||||
import java.util.stream.Collectors;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.entities.Commision;
 | 
			
		||||
import com.plannaplan.entities.User;
 | 
			
		||||
import com.plannaplan.exceptions.UserNotFoundException;
 | 
			
		||||
import com.plannaplan.models.UserApiResponse;
 | 
			
		||||
import com.plannaplan.repositories.CommisionRepository;
 | 
			
		||||
import com.plannaplan.repositories.UserRepository;
 | 
			
		||||
import com.plannaplan.types.UserRoles;
 | 
			
		||||
 | 
			
		||||
@@ -25,6 +28,12 @@ public class UserService {
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private UsosApiService service;
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private CommisionRepository comRepo;
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private CommisionService comService;
 | 
			
		||||
 | 
			
		||||
    public UserService() {
 | 
			
		||||
        super();
 | 
			
		||||
    }
 | 
			
		||||
@@ -169,4 +178,52 @@ public class UserService {
 | 
			
		||||
        }).collect(Collectors.toList());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return ammount of how many users created an assignment
 | 
			
		||||
     */
 | 
			
		||||
    public int getAmmountOfUsersWithAssignedGroups() {
 | 
			
		||||
        int response = 0;
 | 
			
		||||
 | 
			
		||||
        final Object dbResponse = this.comRepo.getUsersAssigned()[0];
 | 
			
		||||
        if (dbResponse != null) {
 | 
			
		||||
            response = ((Long) dbResponse).intValue();
 | 
			
		||||
        }
 | 
			
		||||
        return response;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return ammount of how many users haven't created an assignment yet
 | 
			
		||||
     */
 | 
			
		||||
    public Integer getAmmountOfUsersWithNoAssignedGroups() {
 | 
			
		||||
        return this.getAllStudents().size() - this.getAmmountOfUsersWithAssignedGroups();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return ammount of how many users have full schedule accepted
 | 
			
		||||
     */
 | 
			
		||||
    public Integer getAmmountOfUsersWithAcceptedSchedules() {
 | 
			
		||||
        final List<User> students = this.getAllStudents();
 | 
			
		||||
        Integer accepted = 0;
 | 
			
		||||
 | 
			
		||||
        final Iterator<User> it = students.iterator();
 | 
			
		||||
 | 
			
		||||
        while (it.hasNext()) {
 | 
			
		||||
            final User user = it.next();
 | 
			
		||||
            final Optional<Commision> com = this.comService.getNewestCommision(user);
 | 
			
		||||
            if (com.isPresent() && user.getStudentRegisteredGrups().size() == com.get().getAssignments().size()) {
 | 
			
		||||
                accepted += 1;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        return accepted;
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return ammount of how many users have partly or none schedule accepted
 | 
			
		||||
     */
 | 
			
		||||
    public Integer getAmmountOfUsersWithNoAcceptedSchedules() {
 | 
			
		||||
        return this.getAllStudents().size() - this.getAmmountOfUsersWithAcceptedSchedules();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,23 +1,39 @@
 | 
			
		||||
package com.plannaplan.types;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 *  GroupType contains types: LECTURE, CLASS, LAB, SEMINAR, CONSERVATORY, PRATICE
 | 
			
		||||
 * GroupType contains types: LECTURE, CLASS, LAB, SEMINAR, CONSERVATORY, PRATICE
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
public enum GroupType {
 | 
			
		||||
    LECTURE("Wykład"), CLASS("Ćwiczenia"), LAB("Laboratorium"), SEMINAR("Seminarium"),CONSERVATORY("Konwersatorium"), PRATICE("Praktyka");
 | 
			
		||||
    LECTURE("Wykład"), CLASS("Ćwiczenia"), LAB("Laboratorium"), SEMINAR("Seminarium"), CONSERVATORY("Konwersatorium"),
 | 
			
		||||
    PRATICE("Praktyka");
 | 
			
		||||
 | 
			
		||||
    public final String type;
 | 
			
		||||
 | 
			
		||||
    private GroupType(String type) {
 | 
			
		||||
        this.type = type;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param type as string
 | 
			
		||||
     * @return Enum converted from provided string
 | 
			
		||||
     */
 | 
			
		||||
    public final static GroupType getType(String type) {
 | 
			
		||||
        for (GroupType d : values()) {
 | 
			
		||||
            if (d.type.equals(type)) {
 | 
			
		||||
                return d;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        return null;        
 | 
			
		||||
        return null;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param type group type to check
 | 
			
		||||
     * @return general convertion to bring down tours to two generals LECTURE and
 | 
			
		||||
     *         CLASS. To class are included: CLASS, LAB, SEMINAR, CONSERVATORY,
 | 
			
		||||
     *         PRATICE.
 | 
			
		||||
     */
 | 
			
		||||
    public final static GroupType isLectureOrClass(GroupType type) {
 | 
			
		||||
        return type == GroupType.LECTURE ? GroupType.LECTURE : GroupType.CLASS;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,9 +1,9 @@
 | 
			
		||||
package com.plannaplan.types;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 *  UserRoles contains types: STUDENT, DEANERY, ADMIN, TEST_USER
 | 
			
		||||
 * UserRoles contains types: STUDENT, DEANERY, ADMIN, TEST_USER
 | 
			
		||||
 */
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
public enum UserRoles {
 | 
			
		||||
    STUDENT, DEANERY, ADMIN, TEST_USER
 | 
			
		||||
    STUDENT, DEANERY, ADMIN, TEST_USER, DEVELOPER
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										14
									
								
								buisnesslogic/src/test/java/com/plannaplan/models/ExportDataTest.java
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										14
									
								
								buisnesslogic/src/test/java/com/plannaplan/models/ExportDataTest.java
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,14 @@
 | 
			
		||||
package com.plannaplan.models;
 | 
			
		||||
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertTrue;
 | 
			
		||||
 | 
			
		||||
import org.junit.Test;
 | 
			
		||||
 | 
			
		||||
public class ExportDataTest {
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldConvertDataToCSVRecord() {
 | 
			
		||||
        final ExportData data = new ExportData("4234", "242352", "12");
 | 
			
		||||
        assertTrue(data.convertToCSVRecord().equals("4234,242352,12"));
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										68
									
								
								buisnesslogic/src/test/java/com/plannaplan/types/GroupTypeTest.java
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										68
									
								
								buisnesslogic/src/test/java/com/plannaplan/types/GroupTypeTest.java
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,68 @@
 | 
			
		||||
package com.plannaplan.types;
 | 
			
		||||
 | 
			
		||||
import static org.junit.Assert.assertTrue;
 | 
			
		||||
 | 
			
		||||
import org.junit.Test;
 | 
			
		||||
 | 
			
		||||
public class GroupTypeTest {
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldBeLecture() {
 | 
			
		||||
        assertTrue(GroupType.isLectureOrClass(GroupType.LECTURE) == GroupType.LECTURE);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldBeClass1() {
 | 
			
		||||
        assertTrue(GroupType.isLectureOrClass(GroupType.CLASS) == GroupType.CLASS);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldBeClass2() {
 | 
			
		||||
        assertTrue(GroupType.isLectureOrClass(GroupType.CONSERVATORY) == GroupType.CLASS);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldBeClass3() {
 | 
			
		||||
        assertTrue(GroupType.isLectureOrClass(GroupType.LAB) == GroupType.CLASS);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldBeClass4() {
 | 
			
		||||
        assertTrue(GroupType.isLectureOrClass(GroupType.PRATICE) == GroupType.CLASS);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldBeClass5() {
 | 
			
		||||
        assertTrue(GroupType.isLectureOrClass(GroupType.SEMINAR) == GroupType.CLASS);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldCastFromString1() {
 | 
			
		||||
        assertTrue(GroupType.getType("Ćwiczenia") == GroupType.CLASS);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldCastFromString2() {
 | 
			
		||||
        assertTrue(GroupType.getType("Wykład") == GroupType.LECTURE);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldCastFromString3() {
 | 
			
		||||
        assertTrue(GroupType.getType("Laboratorium") == GroupType.LAB);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldCastFromString4() {
 | 
			
		||||
        assertTrue(GroupType.getType("Seminarium") == GroupType.SEMINAR);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldCastFromString5() {
 | 
			
		||||
        assertTrue(GroupType.getType("Konwersatorium") == GroupType.CONSERVATORY);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldCastFromString6() {
 | 
			
		||||
        assertTrue(GroupType.getType("Praktyka") == GroupType.PRATICE);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -62,6 +62,14 @@
 | 
			
		||||
      <version>4.5.10</version>
 | 
			
		||||
    </dependency>
 | 
			
		||||
 | 
			
		||||
    <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>commons-io</groupId>
 | 
			
		||||
      <artifactId>commons-io</artifactId>
 | 
			
		||||
      <version>2.5</version>
 | 
			
		||||
    </dependency>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>org.springframework.boot</groupId>
 | 
			
		||||
      <artifactId>spring-boot-starter-web</artifactId>
 | 
			
		||||
 
 | 
			
		||||
@@ -12,12 +12,15 @@ import io.swagger.annotations.ApiParam;
 | 
			
		||||
import java.util.List;
 | 
			
		||||
import java.util.Optional;
 | 
			
		||||
 | 
			
		||||
import javax.servlet.http.HttpServletResponse;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.App;
 | 
			
		||||
import com.plannaplan.entities.Assignment;
 | 
			
		||||
import com.plannaplan.entities.Commision;
 | 
			
		||||
import com.plannaplan.entities.Groups;
 | 
			
		||||
import com.plannaplan.entities.User;
 | 
			
		||||
import com.plannaplan.exceptions.UserNotFoundException;
 | 
			
		||||
import com.plannaplan.models.ExportData;
 | 
			
		||||
import com.plannaplan.responses.mappers.CommisionResponseMappers;
 | 
			
		||||
import com.plannaplan.responses.models.CommisionResponse;
 | 
			
		||||
import com.plannaplan.services.AssignmentService;
 | 
			
		||||
@@ -27,6 +30,8 @@ import com.plannaplan.services.GroupService;
 | 
			
		||||
import com.plannaplan.types.AppState;
 | 
			
		||||
import com.plannaplan.types.UserRoles;
 | 
			
		||||
 | 
			
		||||
import org.apache.commons.io.IOUtils;
 | 
			
		||||
 | 
			
		||||
import org.springframework.beans.factory.annotation.Autowired;
 | 
			
		||||
import org.springframework.http.HttpStatus;
 | 
			
		||||
import org.springframework.http.ResponseEntity;
 | 
			
		||||
@@ -37,11 +42,14 @@ import org.springframework.util.Assert;
 | 
			
		||||
import org.springframework.web.bind.annotation.RequestMapping;
 | 
			
		||||
import org.springframework.web.bind.annotation.RequestParam;
 | 
			
		||||
 | 
			
		||||
import java.io.IOException;
 | 
			
		||||
import java.io.InputStream;
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
import java.util.HashMap;
 | 
			
		||||
import java.util.Iterator;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.responses.mappers.AssignmentResponseMappers;
 | 
			
		||||
import com.plannaplan.responses.models.AssignmentDetailedResponse;
 | 
			
		||||
import com.plannaplan.responses.models.AssignmentResponse;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
@@ -102,14 +110,16 @@ public class CommisionController extends TokenBasedController {
 | 
			
		||||
 | 
			
		||||
                        final Optional<Commision> comPrev = this.commisionService.getNewestCommision(user);
 | 
			
		||||
                        final Commision com = new Commision(user, asker);
 | 
			
		||||
                        this.commisionService.save(com);
 | 
			
		||||
 | 
			
		||||
                        final List<Long> addedGroups = new ArrayList<>();
 | 
			
		||||
                        final List<Assignment> addedAssignments = new ArrayList<>();
 | 
			
		||||
 | 
			
		||||
                        groups.stream().forEach((groupId) -> {
 | 
			
		||||
                                Groups group = this.groupServcicxe.getGroupById(groupId)
 | 
			
		||||
                                                .orElseThrow(() -> new NullPointerException());
 | 
			
		||||
                                Assignment a = new Assignment(group, com);
 | 
			
		||||
                                this.assignmentService.save(a);
 | 
			
		||||
                                addedAssignments.add(a);
 | 
			
		||||
                                // this.assignmentService.save(a);
 | 
			
		||||
                                addedGroups.add(groupId);
 | 
			
		||||
                        });
 | 
			
		||||
 | 
			
		||||
@@ -119,7 +129,7 @@ public class CommisionController extends TokenBasedController {
 | 
			
		||||
 | 
			
		||||
                                while (it.hasNext() && !isBad) {
 | 
			
		||||
                                        final Assignment a = it.next();
 | 
			
		||||
                                        if (a.isAccepted() && !addedGroups.contains(a.getId())) {
 | 
			
		||||
                                        if (a.isAccepted() && !addedGroups.contains(a.getGroup().getId())) {
 | 
			
		||||
                                                isBad = true;
 | 
			
		||||
                                        }
 | 
			
		||||
                                }
 | 
			
		||||
@@ -131,6 +141,9 @@ public class CommisionController extends TokenBasedController {
 | 
			
		||||
                                                HttpStatus.BAD_REQUEST);
 | 
			
		||||
                        }
 | 
			
		||||
 | 
			
		||||
                        this.commisionService.save(com);
 | 
			
		||||
                        this.assignmentService.saveAll(addedAssignments);
 | 
			
		||||
 | 
			
		||||
                        return new ResponseEntity<>("Succes", HttpStatus.OK);
 | 
			
		||||
                } catch (UserNotFoundException exception) {
 | 
			
		||||
                        return new ResponseEntity<>(exception.getMessage(), HttpStatus.NOT_FOUND);
 | 
			
		||||
@@ -147,20 +160,47 @@ public class CommisionController extends TokenBasedController {
 | 
			
		||||
        @GetMapping("/user")
 | 
			
		||||
        @ApiOperation("Return list of user all commisions (history of schedules)")
 | 
			
		||||
        public ResponseEntity<List<? extends CommisionResponse>> getAlCommisions(
 | 
			
		||||
                        @RequestParam(name = "groups", defaultValue = "false") @ApiParam(value = "Boolean if we want to display wiht commision's group ids") Boolean groups)
 | 
			
		||||
                        @RequestParam(name = "groups", defaultValue = "false") @ApiParam(value = "Boolean if we want to display wiht commision's group ids") Boolean groups,
 | 
			
		||||
                        @RequestParam(name = "extraInfo", defaultValue = "false") @ApiParam(value = "Boolean if we want to display extra info about listed groups. Works only if we have groups set top true") Boolean extraInfo)
 | 
			
		||||
                        throws UserNotFoundException {
 | 
			
		||||
                User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException());
 | 
			
		||||
 | 
			
		||||
                List<? extends CommisionResponse> result;
 | 
			
		||||
 | 
			
		||||
                final List<Commision> commisions = this.commisionService.getUsersCommisions(user);
 | 
			
		||||
                if (!groups) {
 | 
			
		||||
                        result = CommisionResponseMappers.mapToResponse(this.commisionService.getUsersCommisions(user));
 | 
			
		||||
                        result = CommisionResponseMappers.mapToResponse(commisions);
 | 
			
		||||
                } else {
 | 
			
		||||
                        result = CommisionResponseMappers
 | 
			
		||||
                                        .mapToResponseWithGroups(this.commisionService.getUsersCommisions(user));
 | 
			
		||||
                        if (extraInfo) {
 | 
			
		||||
                                result = CommisionResponseMappers.mapToResponseWithExtraInforGroups(commisions);
 | 
			
		||||
                        } else {
 | 
			
		||||
                                result = CommisionResponseMappers.mapToResponseWithGroups(commisions);
 | 
			
		||||
                        }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                return new ResponseEntity<>(result, HttpStatus.OK);
 | 
			
		||||
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        /**
 | 
			
		||||
         * @return list of user latests assignmets
 | 
			
		||||
         * @throws UserNotFoundException if user was not found bny token
 | 
			
		||||
         */
 | 
			
		||||
        @GetMapping("/user/assignments")
 | 
			
		||||
        @ApiOperation("Return list of latest user commision assignments. User is recognized via token")
 | 
			
		||||
        public ResponseEntity<List<AssignmentDetailedResponse>> getAllAssignmets() throws UserNotFoundException {
 | 
			
		||||
                final User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException());
 | 
			
		||||
 | 
			
		||||
                final Optional<Commision> latestCommision = this.commisionService.getNewestCommision(user);
 | 
			
		||||
 | 
			
		||||
                if (latestCommision.isEmpty()) {
 | 
			
		||||
                        return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK);
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                final List<AssignmentDetailedResponse> response = AssignmentResponseMappers
 | 
			
		||||
                                .mapAssignmetnToDetialedResponse(latestCommision.get().getAssignments());
 | 
			
		||||
 | 
			
		||||
                return new ResponseEntity<>(response, HttpStatus.OK);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        /**
 | 
			
		||||
@@ -236,4 +276,32 @@ public class CommisionController extends TokenBasedController {
 | 
			
		||||
                return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        /**
 | 
			
		||||
         * @param response spring response to set headers
 | 
			
		||||
         */
 | 
			
		||||
        @GetMapping("/export/csv")
 | 
			
		||||
        @PreAuthorize("hasRole('ROLE_ADMIN')")
 | 
			
		||||
        @ApiOperation(value = "Export acceptes assignmetns as csv file to import to usos. You need to provide ADMIN token in order to get access to this data.")
 | 
			
		||||
        public void getFile(HttpServletResponse response) {
 | 
			
		||||
                try {
 | 
			
		||||
                        String csvString = ExportData.getCSVHeader() + "\n";
 | 
			
		||||
                        final Iterator<ExportData> it = this.commisionService.getExportData().iterator();
 | 
			
		||||
                        while (it.hasNext()) {
 | 
			
		||||
                                final ExportData data = it.next();
 | 
			
		||||
                                csvString += (data.convertToCSVRecord() + "\n");
 | 
			
		||||
                        }
 | 
			
		||||
 | 
			
		||||
                        final InputStream is = IOUtils.toInputStream(csvString, "UTF-8");
 | 
			
		||||
 | 
			
		||||
                        IOUtils.copy(is, response.getOutputStream());
 | 
			
		||||
                        response.setContentType("application/csv");
 | 
			
		||||
                        response.setHeader("Content-Disposition", "attachment; filename=\"export.csv\"");
 | 
			
		||||
                        response.flushBuffer();
 | 
			
		||||
                } catch (IOException ex) {
 | 
			
		||||
 | 
			
		||||
                        throw new RuntimeException("IOError writing file to output stream");
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -10,6 +10,7 @@ import com.plannaplan.App;
 | 
			
		||||
import com.plannaplan.entities.User;
 | 
			
		||||
import com.plannaplan.models.ConfigData;
 | 
			
		||||
import com.plannaplan.models.TourData;
 | 
			
		||||
import com.plannaplan.responses.models.ConfigTourResponse;
 | 
			
		||||
import com.plannaplan.security.cas.CasUserIdentity;
 | 
			
		||||
import com.plannaplan.security.cas.CasValidationExcepiton;
 | 
			
		||||
import com.plannaplan.security.cas.CasValidator;
 | 
			
		||||
@@ -34,6 +35,7 @@ import org.springframework.web.multipart.MultipartFile;
 | 
			
		||||
import io.swagger.annotations.Api;
 | 
			
		||||
import io.swagger.annotations.ApiOperation;
 | 
			
		||||
import io.swagger.annotations.ApiParam;
 | 
			
		||||
import org.springframework.web.bind.annotation.GetMapping;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Rest controller to Config related endpoints. More detailed api docs is
 | 
			
		||||
@@ -167,4 +169,27 @@ public class ConfigController {
 | 
			
		||||
            return new ResponseEntity<>("Internal Server Error", HttpStatus.INTERNAL_SERVER_ERROR);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return api response entity
 | 
			
		||||
     */
 | 
			
		||||
    @GetMapping(path = "/config/tour")
 | 
			
		||||
    @ApiOperation("It will return what tour is currently on.")
 | 
			
		||||
    public ResponseEntity<ConfigTourResponse> getCurrentTourDate() {
 | 
			
		||||
        final ConfigTourResponse response = new ConfigTourResponse(this.contrl.getCurrentConfig().getCurrentState());
 | 
			
		||||
        return new ResponseEntity<>(response, HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return api response entity
 | 
			
		||||
     */
 | 
			
		||||
    @Deprecated
 | 
			
		||||
    @GetMapping(path = "/admin/tour")
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_ADMIN')")
 | 
			
		||||
    @ApiOperation("It will return what tour is currently on. You need to provide admin token. It is depreaceted use /configurator/config/tour isntead.")
 | 
			
		||||
    public ResponseEntity<ConfigTourResponse> getTourDate() {
 | 
			
		||||
        final ConfigTourResponse response = new ConfigTourResponse(this.contrl.getCurrentConfig().getCurrentState());
 | 
			
		||||
        return new ResponseEntity<>(response, HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -68,7 +68,7 @@ public class CoursesController {
 | 
			
		||||
                    final HashMap<Long, Integer> ammounts = this.groupService.getTakenPlaces(course.getGroups());
 | 
			
		||||
 | 
			
		||||
                    course.getGroups().stream().forEach(group -> {
 | 
			
		||||
                        if (group.getType() == GroupType.CLASS) {
 | 
			
		||||
                        if (GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS) {
 | 
			
		||||
                            classes.add(new GroupWithCapacityResponse(group, ammounts.get(group.getId())));
 | 
			
		||||
                        } else {
 | 
			
		||||
                            lectures.add(new GroupWithCapacityResponse(group, ammounts.get(group.getId())));
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										103
									
								
								restservice/src/main/java/com/plannaplan/controllers/DeveloperController.java
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										103
									
								
								restservice/src/main/java/com/plannaplan/controllers/DeveloperController.java
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,103 @@
 | 
			
		||||
package com.plannaplan.controllers;
 | 
			
		||||
 | 
			
		||||
import org.springframework.beans.factory.annotation.Autowired;
 | 
			
		||||
import org.springframework.http.HttpStatus;
 | 
			
		||||
import org.springframework.http.ResponseEntity;
 | 
			
		||||
import org.springframework.security.access.prepost.PreAuthorize;
 | 
			
		||||
import org.springframework.web.bind.annotation.CrossOrigin;
 | 
			
		||||
import org.springframework.web.bind.annotation.PostMapping;
 | 
			
		||||
import org.springframework.web.bind.annotation.RequestMapping;
 | 
			
		||||
import org.springframework.web.bind.annotation.RestController;
 | 
			
		||||
 | 
			
		||||
import io.swagger.annotations.Api;
 | 
			
		||||
 | 
			
		||||
import java.util.Date;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.App;
 | 
			
		||||
import com.plannaplan.models.TourData;
 | 
			
		||||
import com.plannaplan.services.AssignmentService;
 | 
			
		||||
import com.plannaplan.services.ConfiguratorService;
 | 
			
		||||
import com.plannaplan.services.ExchangeService;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Rest controller to enpoint that help deveopler test the app
 | 
			
		||||
 */
 | 
			
		||||
@RestController
 | 
			
		||||
@CrossOrigin
 | 
			
		||||
@RequestMapping("/api/" + App.API_VERSION + "/developer")
 | 
			
		||||
@Api(tags = {
 | 
			
		||||
        "DeveloperController" }, value = "DeveloperController", description = "All endpoints to use in development time to help app testing")
 | 
			
		||||
public class DeveloperController {
 | 
			
		||||
 | 
			
		||||
    private static final long ONE_DAY = 86400000;
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private AssignmentService assignmentService;
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private ExchangeService exchangeService;
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private ConfiguratorService configurationController;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return if accept algorythm was perfomed
 | 
			
		||||
     */
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_DEVELOPER')")
 | 
			
		||||
    @PostMapping(path = "/algorythm/accept")
 | 
			
		||||
    public ResponseEntity<String> performAcceptAlgorythm() {
 | 
			
		||||
        this.assignmentService.callAcceptAlgorythm();
 | 
			
		||||
        return new ResponseEntity<>("Success", HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return if exchange algorythm was perfomed
 | 
			
		||||
     */
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_DEVELOPER')")
 | 
			
		||||
    @PostMapping(path = "/algorythm/exchange")
 | 
			
		||||
    public ResponseEntity<String> performExchangeAlgorythm() {
 | 
			
		||||
        this.exchangeService.performExchange();
 | 
			
		||||
        return new ResponseEntity<>("Success", HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return if tour was set
 | 
			
		||||
     */
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_DEVELOPER')")
 | 
			
		||||
    @PostMapping(path = "/tours/first")
 | 
			
		||||
    public ResponseEntity<String> setFirstTour() {
 | 
			
		||||
        this.configurationController.saveTours(
 | 
			
		||||
                new TourData(new Date(System.currentTimeMillis() - ONE_DAY),
 | 
			
		||||
                        new Date(System.currentTimeMillis() + ONE_DAY)),
 | 
			
		||||
                new TourData(new Date(System.currentTimeMillis() + 2 * ONE_DAY),
 | 
			
		||||
                        new Date(System.currentTimeMillis() + 3 * ONE_DAY)));
 | 
			
		||||
        return new ResponseEntity<>("Success", HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return if tour was set
 | 
			
		||||
     */
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_DEVELOPER')")
 | 
			
		||||
    @PostMapping(path = "/tours/second")
 | 
			
		||||
    public ResponseEntity<String> setSecondTour() {
 | 
			
		||||
        this.configurationController.saveTours(
 | 
			
		||||
                new TourData(new Date(System.currentTimeMillis() - 3 * ONE_DAY),
 | 
			
		||||
                        new Date(System.currentTimeMillis() - 2 * ONE_DAY)),
 | 
			
		||||
                new TourData(new Date(System.currentTimeMillis() - ONE_DAY),
 | 
			
		||||
                        new Date(System.currentTimeMillis() + ONE_DAY)));
 | 
			
		||||
        return new ResponseEntity<>("Success", HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return if tour was set
 | 
			
		||||
     */
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_DEVELOPER')")
 | 
			
		||||
    @PostMapping(path = "/tours/no")
 | 
			
		||||
    public ResponseEntity<String> setNoTour() {
 | 
			
		||||
        this.configurationController.saveTours(
 | 
			
		||||
                new TourData(new Date(System.currentTimeMillis() - ONE_DAY), new Date(System.currentTimeMillis())),
 | 
			
		||||
                new TourData(new Date(System.currentTimeMillis() + ONE_DAY),
 | 
			
		||||
                        new Date(System.currentTimeMillis() + 2 * ONE_DAY)));
 | 
			
		||||
        return new ResponseEntity<>("Success", HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -16,6 +16,7 @@ import com.plannaplan.responses.models.ExchangeResponse;
 | 
			
		||||
import com.plannaplan.services.AssignmentService;
 | 
			
		||||
import com.plannaplan.services.ExchangeService;
 | 
			
		||||
import com.plannaplan.services.GroupService;
 | 
			
		||||
import com.plannaplan.types.GroupType;
 | 
			
		||||
 | 
			
		||||
import org.springframework.beans.factory.annotation.Autowired;
 | 
			
		||||
import org.springframework.http.HttpStatus;
 | 
			
		||||
@@ -88,6 +89,18 @@ public class ExchangeController extends TokenBasedController {
 | 
			
		||||
        final Assignment assignmentInstance = assignment.get();
 | 
			
		||||
        final Groups groupInstance = group.get();
 | 
			
		||||
 | 
			
		||||
        if (assignmentInstance.getGroup().getCourseId() != null
 | 
			
		||||
                && !assignmentInstance.getGroup().getCourseId().getId().equals(groupInstance.getCourseId().getId())) {
 | 
			
		||||
            System.out.println(assignmentInstance.getGroup().getCourseId().getId());
 | 
			
		||||
            System.out.println(groupInstance.getCourseId().getId());
 | 
			
		||||
            return new ResponseEntity<>("You can performe exchange only within one course.", HttpStatus.BAD_REQUEST);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (GroupType.isLectureOrClass(assignmentInstance.getGroup().getType()) != GroupType
 | 
			
		||||
                .isLectureOrClass(groupInstance.getType())) {
 | 
			
		||||
            return new ResponseEntity<>("You can't exchange lecture to class and otherwise.", HttpStatus.BAD_REQUEST);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (!(assignmentInstance.getCommision().getCommisionOwner().getId().equals(asker.getId())
 | 
			
		||||
                && assignmentInstance.isAccepted())) {
 | 
			
		||||
            return new ResponseEntity<>(
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										102
									
								
								restservice/src/main/java/com/plannaplan/controllers/StatisticsController.java
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										102
									
								
								restservice/src/main/java/com/plannaplan/controllers/StatisticsController.java
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,102 @@
 | 
			
		||||
package com.plannaplan.controllers;
 | 
			
		||||
 | 
			
		||||
import org.springframework.beans.factory.annotation.Autowired;
 | 
			
		||||
import org.springframework.http.HttpStatus;
 | 
			
		||||
import org.springframework.http.ResponseEntity;
 | 
			
		||||
import org.springframework.security.access.prepost.PreAuthorize;
 | 
			
		||||
import org.springframework.web.bind.annotation.CrossOrigin;
 | 
			
		||||
import org.springframework.web.bind.annotation.GetMapping;
 | 
			
		||||
import org.springframework.web.bind.annotation.RequestMapping;
 | 
			
		||||
import org.springframework.web.bind.annotation.RestController;
 | 
			
		||||
 | 
			
		||||
import io.swagger.annotations.Api;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.App;
 | 
			
		||||
import com.plannaplan.responses.models.StatisticSimpleNumberResponse;
 | 
			
		||||
import com.plannaplan.services.GroupService;
 | 
			
		||||
import com.plannaplan.services.UserService;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Rest controller to enpoint that help deveopler test the app
 | 
			
		||||
 */
 | 
			
		||||
@RestController
 | 
			
		||||
@CrossOrigin
 | 
			
		||||
@RequestMapping("/api/" + App.API_VERSION + "/statistics")
 | 
			
		||||
@Api(tags = {
 | 
			
		||||
        "StatisticsController" }, value = "StatisticsController", description = "Statistics are meant to be used by deanery only so in every endpoint you need to provide DEANERY token.")
 | 
			
		||||
 | 
			
		||||
public class StatisticsController {
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private GroupService groupService;
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private UserService userService;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return if tour was set
 | 
			
		||||
     */
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_DEANERY')")
 | 
			
		||||
    @GetMapping(path = "/groups/created")
 | 
			
		||||
    public ResponseEntity<StatisticSimpleNumberResponse> getGroupsAmmounts() {
 | 
			
		||||
        final StatisticSimpleNumberResponse response = new StatisticSimpleNumberResponse(
 | 
			
		||||
                this.groupService.getGroupsAmmount());
 | 
			
		||||
        return new ResponseEntity<>(response, HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return if tour was set
 | 
			
		||||
     */
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_DEANERY')")
 | 
			
		||||
    @GetMapping(path = "/groups/full")
 | 
			
		||||
    public ResponseEntity<StatisticSimpleNumberResponse> getGroupsFullAmmounts() {
 | 
			
		||||
        final StatisticSimpleNumberResponse response = new StatisticSimpleNumberResponse(
 | 
			
		||||
                this.groupService.getFullgroupsAmmount());
 | 
			
		||||
        return new ResponseEntity<>(response, HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return amount of registered to some groups
 | 
			
		||||
     */
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_DEANERY')")
 | 
			
		||||
    @GetMapping(path = "/users/registered")
 | 
			
		||||
    public ResponseEntity<StatisticSimpleNumberResponse> getCommisionsAmmounts() {
 | 
			
		||||
        final StatisticSimpleNumberResponse response = new StatisticSimpleNumberResponse(
 | 
			
		||||
                this.userService.getAmmountOfUsersWithAssignedGroups());
 | 
			
		||||
        return new ResponseEntity<>(response, HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return amount of students not registered to any groups
 | 
			
		||||
     */
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_DEANERY')")
 | 
			
		||||
    @GetMapping(path = "/users/noregistered")
 | 
			
		||||
    public ResponseEntity<StatisticSimpleNumberResponse> getNonCommisionsAmmounts() {
 | 
			
		||||
        final StatisticSimpleNumberResponse response = new StatisticSimpleNumberResponse(
 | 
			
		||||
                this.userService.getAmmountOfUsersWithNoAssignedGroups());
 | 
			
		||||
        return new ResponseEntity<>(response, HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return amount of students that have fully accepted schedules
 | 
			
		||||
     */
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_DEANERY')")
 | 
			
		||||
    @GetMapping(path = "/users/accepted")
 | 
			
		||||
    public ResponseEntity<StatisticSimpleNumberResponse> getAcceptedAmmounts() {
 | 
			
		||||
        final StatisticSimpleNumberResponse response = new StatisticSimpleNumberResponse(
 | 
			
		||||
                this.userService.getAmmountOfUsersWithAcceptedSchedules());
 | 
			
		||||
        return new ResponseEntity<>(response, HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return amount of students that have purtly accepted schedules
 | 
			
		||||
     */
 | 
			
		||||
    @PreAuthorize("hasRole('ROLE_DEANERY')")
 | 
			
		||||
    @GetMapping(path = "/users/accepted/partly")
 | 
			
		||||
    public ResponseEntity<StatisticSimpleNumberResponse> getAcceptedPartlyAmmounts() {
 | 
			
		||||
        final StatisticSimpleNumberResponse response = new StatisticSimpleNumberResponse(
 | 
			
		||||
                this.userService.getAmmountOfUsersWithNoAcceptedSchedules());
 | 
			
		||||
        return new ResponseEntity<>(response, HttpStatus.OK);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -4,10 +4,13 @@ import java.util.List;
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
import java.util.HashMap;
 | 
			
		||||
import java.util.Map;
 | 
			
		||||
import java.util.Objects;
 | 
			
		||||
import java.util.stream.Collectors;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.entities.Assignment;
 | 
			
		||||
import com.plannaplan.entities.Course;
 | 
			
		||||
import com.plannaplan.entities.Groups;
 | 
			
		||||
import com.plannaplan.responses.models.AssignmentDetailedResponse;
 | 
			
		||||
import com.plannaplan.responses.models.AssignmentResponse;
 | 
			
		||||
import com.plannaplan.types.GroupType;
 | 
			
		||||
 | 
			
		||||
@@ -33,19 +36,19 @@ public class AssignmentResponseMappers {
 | 
			
		||||
    public static final List<AssignmentResponse> mapToResponse(List<Assignment> assignments,
 | 
			
		||||
            HashMap<Long, Integer> ammounts) {
 | 
			
		||||
        List<AssignmentResponse> response = new ArrayList<>();
 | 
			
		||||
        HashMap<Course, List<Groups>> courses = new HashMap<>();
 | 
			
		||||
        HashMap<Course, List<Assignment>> courses = new HashMap<>();
 | 
			
		||||
        assignments.stream().forEach((Assignment assignment) -> {
 | 
			
		||||
            final Groups group = assignment.getGroup();
 | 
			
		||||
            final Course course = group.getCourseId();
 | 
			
		||||
            if (courses.get(course) == null) {
 | 
			
		||||
                courses.put(course, new ArrayList<>());
 | 
			
		||||
            }
 | 
			
		||||
            courses.get(course).add(group);
 | 
			
		||||
            courses.get(course).add(assignment);
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
        for (Map.Entry<Course, List<Groups>> entry : courses.entrySet()) {
 | 
			
		||||
        for (Map.Entry<Course, List<Assignment>> entry : courses.entrySet()) {
 | 
			
		||||
            final Course course = entry.getKey();
 | 
			
		||||
            final List<Groups> courseGroups = entry.getValue();
 | 
			
		||||
            final List<Assignment> courseGroups = entry.getValue();
 | 
			
		||||
            if (courseGroups.size() == 1) {
 | 
			
		||||
                if (ammounts != null) {
 | 
			
		||||
                    response.add(new AssignmentResponse(course, courseGroups.get(0), ammounts));
 | 
			
		||||
@@ -54,9 +57,11 @@ public class AssignmentResponseMappers {
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            if (courseGroups.size() == 2) {
 | 
			
		||||
                final Groups lecture = courseGroups.stream().filter(o -> o.getType() == GroupType.LECTURE).findFirst()
 | 
			
		||||
                        .get();
 | 
			
		||||
                final Groups classes = courseGroups.stream().filter(o -> o.getType() == GroupType.CLASS).findFirst()
 | 
			
		||||
                final Assignment lecture = courseGroups.stream()
 | 
			
		||||
                        .filter(o -> GroupType.isLectureOrClass(o.getGroup().getType()) == GroupType.LECTURE)
 | 
			
		||||
                        .findFirst().get();
 | 
			
		||||
                final Assignment classes = courseGroups.stream()
 | 
			
		||||
                        .filter(o -> GroupType.isLectureOrClass(o.getGroup().getType()) == GroupType.CLASS).findFirst()
 | 
			
		||||
                        .get();
 | 
			
		||||
 | 
			
		||||
                if (ammounts != null) {
 | 
			
		||||
@@ -69,4 +74,15 @@ public class AssignmentResponseMappers {
 | 
			
		||||
        }
 | 
			
		||||
        return response;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * map assignmetn to detailed response
 | 
			
		||||
     * 
 | 
			
		||||
     * @param assignments list of assignments to map
 | 
			
		||||
     * @return list of responses
 | 
			
		||||
     */
 | 
			
		||||
    public static final List<AssignmentDetailedResponse> mapAssignmetnToDetialedResponse(List<Assignment> assignments) {
 | 
			
		||||
        return assignments.stream().filter(Objects::nonNull).map(AssignmentDetailedResponse::new)
 | 
			
		||||
                .collect(Collectors.toList());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.entities.Commision;
 | 
			
		||||
import com.plannaplan.responses.models.CommisionResponse;
 | 
			
		||||
import com.plannaplan.responses.models.CommisionWithAcceptedGroupsResponse;
 | 
			
		||||
import com.plannaplan.responses.models.CommisionWithGroupsResponse;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
@@ -28,4 +29,14 @@ public class CommisionResponseMappers {
 | 
			
		||||
        return commisions.stream().filter(Objects::nonNull).map(CommisionWithGroupsResponse::new)
 | 
			
		||||
                .collect(Collectors.toList());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param commisions list of commisions to be mapped
 | 
			
		||||
     * @return list of api responses
 | 
			
		||||
     */
 | 
			
		||||
    public static final List<CommisionWithAcceptedGroupsResponse> mapToResponseWithExtraInforGroups(
 | 
			
		||||
            List<Commision> commisions) {
 | 
			
		||||
        return commisions.stream().filter(Objects::nonNull).map(CommisionWithAcceptedGroupsResponse::new)
 | 
			
		||||
                .collect(Collectors.toList());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -83,7 +83,7 @@ public class GroupsMappers {
 | 
			
		||||
        List<GroupDefaultResponse> classes = new ArrayList<>();
 | 
			
		||||
 | 
			
		||||
        groups.stream().forEach(group -> {
 | 
			
		||||
            if (group.getType() == GroupType.CLASS) {
 | 
			
		||||
            if (GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS) {
 | 
			
		||||
                if (taken != null) {
 | 
			
		||||
                    classes.add(new GroupDefaultResponse(group, taken.get(group.getId())));
 | 
			
		||||
                } else {
 | 
			
		||||
@@ -122,7 +122,7 @@ public class GroupsMappers {
 | 
			
		||||
        List<GroupWithCapacityResponse> classes = new ArrayList<>();
 | 
			
		||||
 | 
			
		||||
        groups.stream().forEach(group -> {
 | 
			
		||||
            if (group.getType() == GroupType.CLASS) {
 | 
			
		||||
            if (GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS) {
 | 
			
		||||
                if (taken != null) {
 | 
			
		||||
                    classes.add(new GroupWithCapacityResponse(group, taken.get(group.getId())));
 | 
			
		||||
                } else {
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,81 @@
 | 
			
		||||
package com.plannaplan.responses.models;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.entities.Assignment;
 | 
			
		||||
import com.plannaplan.entities.Groups;
 | 
			
		||||
import com.plannaplan.types.GroupType;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Assignment detailed response for api
 | 
			
		||||
 */
 | 
			
		||||
public class AssignmentDetailedResponse {
 | 
			
		||||
    public Long id;
 | 
			
		||||
    public String name;
 | 
			
		||||
    private int day;
 | 
			
		||||
    private String time;
 | 
			
		||||
    private String endTime;
 | 
			
		||||
    private String lecturer;
 | 
			
		||||
    private String type;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param assignment Assignment instance to map
 | 
			
		||||
     */
 | 
			
		||||
    public AssignmentDetailedResponse(Assignment assignment) {
 | 
			
		||||
        final Groups group = assignment.getGroup();
 | 
			
		||||
        this.id = assignment.getId();
 | 
			
		||||
        this.name = group.getCourseId().getName();
 | 
			
		||||
        this.day = group.getDay().label;
 | 
			
		||||
        this.time = group.getTimeString();
 | 
			
		||||
        this.endTime = group.getEndTimeString();
 | 
			
		||||
        this.lecturer = group.getLecturer().toString();
 | 
			
		||||
        this.type = GroupType.isLectureOrClass(group.getType()).toString();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return type of the lecture
 | 
			
		||||
     */
 | 
			
		||||
    public String getType() {
 | 
			
		||||
        return type;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return day as a value from 0-6
 | 
			
		||||
     */
 | 
			
		||||
    public int getDay() {
 | 
			
		||||
        return day;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return lecturer string fromated
 | 
			
		||||
     */
 | 
			
		||||
    public String getLecturer() {
 | 
			
		||||
        return lecturer;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return time formated string
 | 
			
		||||
     */
 | 
			
		||||
    public String getEndTime() {
 | 
			
		||||
        return endTime;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return time formated string
 | 
			
		||||
     */
 | 
			
		||||
    public String getTime() {
 | 
			
		||||
        return time;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return name of course that group belongs to
 | 
			
		||||
     */
 | 
			
		||||
    public String getName() {
 | 
			
		||||
        return this.name;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return db id of assignment
 | 
			
		||||
     */
 | 
			
		||||
    public Long getId() {
 | 
			
		||||
        return this.id;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -2,6 +2,7 @@ package com.plannaplan.responses.models;
 | 
			
		||||
 | 
			
		||||
import java.util.HashMap;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.entities.Assignment;
 | 
			
		||||
import com.plannaplan.entities.Course;
 | 
			
		||||
import com.plannaplan.entities.Groups;
 | 
			
		||||
import com.plannaplan.types.GroupType;
 | 
			
		||||
@@ -50,8 +51,8 @@ public class AssignmentResponse {
 | 
			
		||||
     * @param group  class/lecture entity
 | 
			
		||||
     */
 | 
			
		||||
    public AssignmentResponse(Course course, Groups group) {
 | 
			
		||||
        this(course, group.getType() == GroupType.LECTURE ? group : null,
 | 
			
		||||
                group.getType() == GroupType.CLASS ? group : null);
 | 
			
		||||
        this(course, GroupType.isLectureOrClass(group.getType()) == GroupType.LECTURE ? group : null,
 | 
			
		||||
                GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS ? group : null);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
@@ -61,8 +62,55 @@ public class AssignmentResponse {
 | 
			
		||||
     *                 places
 | 
			
		||||
     */
 | 
			
		||||
    public AssignmentResponse(Course course, Groups group, HashMap<Long, Integer> ammounts) {
 | 
			
		||||
        this(course, group.getType() == GroupType.LECTURE ? group : null,
 | 
			
		||||
                group.getType() == GroupType.CLASS ? group : null, ammounts);
 | 
			
		||||
        this(course, GroupType.isLectureOrClass(group.getType()) == GroupType.LECTURE ? group : null,
 | 
			
		||||
                GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS ? group : null, ammounts);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param course   course entity
 | 
			
		||||
     * @param group    class/lecture entity
 | 
			
		||||
     * @param ammounts map with ammounts key - group id, value - ammounts of taken
 | 
			
		||||
     *                 places
 | 
			
		||||
     */
 | 
			
		||||
    public AssignmentResponse(Course course, Assignment group, HashMap<Long, Integer> ammounts) {
 | 
			
		||||
        this(course, GroupType.isLectureOrClass(group.getGroup().getType()) == GroupType.LECTURE ? group : null,
 | 
			
		||||
                GroupType.isLectureOrClass(group.getGroup().getType()) == GroupType.CLASS ? group : null, ammounts);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 
 | 
			
		||||
     * @param course course entity
 | 
			
		||||
     * @param group  class/lecture entity
 | 
			
		||||
     */
 | 
			
		||||
    public AssignmentResponse(Course course, Assignment group) {
 | 
			
		||||
        this(course, GroupType.isLectureOrClass(group.getGroup().getType()) == GroupType.LECTURE ? group : null,
 | 
			
		||||
                GroupType.isLectureOrClass(group.getGroup().getType()) == GroupType.CLASS ? group : null);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param course   course entity
 | 
			
		||||
     * @param lecture  lecture Groups entity
 | 
			
		||||
     * @param classes  class Groups entity
 | 
			
		||||
     * @param ammounts map with ammounts key - group id, value - ammounts of taken
 | 
			
		||||
     *                 places
 | 
			
		||||
     */
 | 
			
		||||
    public AssignmentResponse(Course course, Assignment lecture, Assignment classes, HashMap<Long, Integer> ammounts) {
 | 
			
		||||
        this.id = course.getId();
 | 
			
		||||
        this.name = course.getName();
 | 
			
		||||
        this.classes = new GroupWithCapacityResponse(classes, ammounts.get(classes.getGroup().getId()));
 | 
			
		||||
        this.lecture = new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getGroup().getId()));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param course  course entity
 | 
			
		||||
     * @param lecture lecture Groups entity
 | 
			
		||||
     * @param classes class Groups entity
 | 
			
		||||
     */
 | 
			
		||||
    public AssignmentResponse(Course course, Assignment lecture, Assignment classes) {
 | 
			
		||||
        this.id = course.getId();
 | 
			
		||||
        this.name = course.getName();
 | 
			
		||||
        this.classes = new GroupWithCapacityResponse(classes);
 | 
			
		||||
        this.lecture = new GroupWithCapacityResponse(lecture);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,34 @@
 | 
			
		||||
package com.plannaplan.responses.models;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.entities.Assignment;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Repsonse for single assignment to use in commision repsonse
 | 
			
		||||
 */
 | 
			
		||||
public class AssignmentsSingleResponse {
 | 
			
		||||
    private Long id;
 | 
			
		||||
    private boolean isAccepted;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param assignment to map to response
 | 
			
		||||
     */
 | 
			
		||||
    public AssignmentsSingleResponse(Assignment assignment) {
 | 
			
		||||
        this.id = assignment.getGroup().getId();
 | 
			
		||||
        this.isAccepted = assignment.isAccepted();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return id of assigned group
 | 
			
		||||
     */
 | 
			
		||||
    public Long getId() {
 | 
			
		||||
        return id;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return is group already accepted or not
 | 
			
		||||
     */
 | 
			
		||||
    public boolean isAccepted() {
 | 
			
		||||
        return isAccepted;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -0,0 +1,43 @@
 | 
			
		||||
package com.plannaplan.responses.models;
 | 
			
		||||
 | 
			
		||||
import java.util.List;
 | 
			
		||||
import java.util.Objects;
 | 
			
		||||
import java.util.function.Function;
 | 
			
		||||
import java.util.stream.Collectors;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.entities.Assignment;
 | 
			
		||||
import com.plannaplan.entities.Commision;
 | 
			
		||||
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Commision With Groups api Response. It extends CommisionResponse repsone
 | 
			
		||||
 */
 | 
			
		||||
@ApiModel(description = "Response shows information about commision and its groups. It also has info about group state (is accepted or not)", value = "CommisionWithGroupsResponse")
 | 
			
		||||
public class CommisionWithAcceptedGroupsResponse extends CommisionResponse {
 | 
			
		||||
 | 
			
		||||
    private List<AssignmentsSingleResponse> groups;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param commision commision to map to api response
 | 
			
		||||
     */
 | 
			
		||||
    public CommisionWithAcceptedGroupsResponse(Commision commision) {
 | 
			
		||||
        super(commision);
 | 
			
		||||
        this.groups = commision.getAssignments().stream().filter(Objects::nonNull)
 | 
			
		||||
                .map(new Function<Assignment, AssignmentsSingleResponse>() {
 | 
			
		||||
 | 
			
		||||
                    @Override
 | 
			
		||||
                    public AssignmentsSingleResponse apply(Assignment arg0) {
 | 
			
		||||
                        return new AssignmentsSingleResponse(arg0);
 | 
			
		||||
                    }
 | 
			
		||||
                }).collect(Collectors.toList());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return lsit of fetured groups informations
 | 
			
		||||
     */
 | 
			
		||||
    public List<AssignmentsSingleResponse> getGroups() {
 | 
			
		||||
        return groups;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -0,0 +1,26 @@
 | 
			
		||||
package com.plannaplan.responses.models;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.types.AppState;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Api response for config tours entpoint
 | 
			
		||||
 */
 | 
			
		||||
public class ConfigTourResponse {
 | 
			
		||||
 | 
			
		||||
    private String currentTour;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param appState to send as a response
 | 
			
		||||
     */
 | 
			
		||||
    public ConfigTourResponse(AppState appState) {
 | 
			
		||||
        this.currentTour = appState.toString();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return current app state as string
 | 
			
		||||
     */
 | 
			
		||||
    public String getCurrentTour() {
 | 
			
		||||
        return currentTour;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -30,7 +30,7 @@ public class CoursesWithGroupsResponse extends CoursesResponse {
 | 
			
		||||
    public CoursesWithGroupsResponse(Course course) {
 | 
			
		||||
        super(course);
 | 
			
		||||
        course.getGroups().stream().forEach(group -> {
 | 
			
		||||
            if (group.getType() == GroupType.CLASS) {
 | 
			
		||||
            if (GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS) {
 | 
			
		||||
                this.classes.add(new GroupWithCapacityResponse(group));
 | 
			
		||||
            } else {
 | 
			
		||||
                this.lectures.add(new GroupWithCapacityResponse(group));
 | 
			
		||||
 
 | 
			
		||||
@@ -16,6 +16,7 @@ public class ExchangeResponse {
 | 
			
		||||
	private GroupDefaultResponse ownedAssignment;
 | 
			
		||||
	@ApiModelProperty(value = "Group that user want to get")
 | 
			
		||||
	private GroupDefaultResponse desiredGroup;
 | 
			
		||||
	private String courseName;
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
	 * creat new instance
 | 
			
		||||
@@ -26,6 +27,16 @@ public class ExchangeResponse {
 | 
			
		||||
		this.id = exchange.getId();
 | 
			
		||||
		this.ownedAssignment = new GroupDefaultResponse(exchange.getOwnedAssignment().getGroup());
 | 
			
		||||
		this.desiredGroup = new GroupDefaultResponse(exchange.getDesiredAssignment());
 | 
			
		||||
		this.courseName = exchange.getOwnedAssignment().getGroup().getCourseId() != null
 | 
			
		||||
				? exchange.getOwnedAssignment().getGroup().getCourseId().getName()
 | 
			
		||||
				: "";
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
	 * @return name of course related to exchange
 | 
			
		||||
	 */
 | 
			
		||||
	public String getCourseName() {
 | 
			
		||||
		return courseName;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
 
 | 
			
		||||
@@ -39,6 +39,11 @@ public class GroupDefaultResponse {
 | 
			
		||||
    @ApiModelProperty(value = "Value shows how many places is already taken by other students.")
 | 
			
		||||
    private Integer takenPlaces;
 | 
			
		||||
 | 
			
		||||
    @ApiModelProperty(value = "Used only in resposnes realted to user assignments. For example in /api/v1/users/schedule.")
 | 
			
		||||
    private Boolean isAccepted;
 | 
			
		||||
 | 
			
		||||
    private Integer grNr;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * creat new entity
 | 
			
		||||
     * 
 | 
			
		||||
@@ -51,7 +56,22 @@ public class GroupDefaultResponse {
 | 
			
		||||
        this.endTime = group.getEndTimeString() != null ? group.getEndTimeString() : "";
 | 
			
		||||
        this.lecturer = group.getLecturer() != null ? group.getLecturer().toString() : "";
 | 
			
		||||
        this.room = group.getRoom() != null ? group.getRoom() : "";
 | 
			
		||||
        this.type = group.getType() != null ? group.getType() : null;
 | 
			
		||||
        this.type = group.getType() != null ? GroupType.isLectureOrClass(group.getType()) : null;
 | 
			
		||||
        this.grNr = group.getGrNr() != null ? group.getGrNr() : null;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return group number
 | 
			
		||||
     */
 | 
			
		||||
    public Integer getGrNr() {
 | 
			
		||||
        return grNr;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return is group accepted if its related to assignmetn
 | 
			
		||||
     */
 | 
			
		||||
    public Boolean getIsAccepted() {
 | 
			
		||||
        return isAccepted;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
@@ -73,6 +93,16 @@ public class GroupDefaultResponse {
 | 
			
		||||
        this(assignment.getGroup());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 
 | 
			
		||||
     * @param assignment  entity to map to api response
 | 
			
		||||
     * @param takenPlaces map with ammounts of taken places
 | 
			
		||||
     */
 | 
			
		||||
    public GroupDefaultResponse(Assignment assignment, int takenPlaces) {
 | 
			
		||||
        this(assignment.getGroup(), takenPlaces);
 | 
			
		||||
        this.isAccepted = assignment.isAccepted();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return what typew of group is this (lecture or class)
 | 
			
		||||
     */
 | 
			
		||||
 
 | 
			
		||||
@@ -49,7 +49,7 @@ public class GroupWithCapacityResponse extends GroupDefaultResponse {
 | 
			
		||||
     * @param takenPlaces group taken places
 | 
			
		||||
     */
 | 
			
		||||
    public GroupWithCapacityResponse(Assignment assignment, int takenPlaces) {
 | 
			
		||||
        this(assignment.getGroup(), takenPlaces);
 | 
			
		||||
        super(assignment, takenPlaces);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,23 @@
 | 
			
		||||
package com.plannaplan.responses.models;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Simple api response for number statistics
 | 
			
		||||
 */
 | 
			
		||||
public class StatisticSimpleNumberResponse {
 | 
			
		||||
    private Integer ammount;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param ammount to return as api response
 | 
			
		||||
     */
 | 
			
		||||
    public StatisticSimpleNumberResponse(Integer ammount) {
 | 
			
		||||
        this.ammount = ammount;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return ammount
 | 
			
		||||
     */
 | 
			
		||||
    public Integer getAmmount() {
 | 
			
		||||
        return ammount;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -9,6 +9,7 @@ public abstract class CoursesResponse {
 | 
			
		||||
 | 
			
		||||
    private Long id;
 | 
			
		||||
    private String name;
 | 
			
		||||
    private String symbol;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * create instance
 | 
			
		||||
@@ -18,6 +19,7 @@ public abstract class CoursesResponse {
 | 
			
		||||
    public CoursesResponse(Course course) {
 | 
			
		||||
        this.id = course.getId() != null ? course.getId() : null;
 | 
			
		||||
        this.name = course.getName() != null ? course.getName() : "";
 | 
			
		||||
        this.symbol = course.getSymbol() != null ? course.getSymbol() : "";
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
@@ -27,6 +29,13 @@ public abstract class CoursesResponse {
 | 
			
		||||
        return name;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return course symbol
 | 
			
		||||
     */
 | 
			
		||||
    public String getSymbol() {
 | 
			
		||||
        return symbol;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return db id
 | 
			
		||||
     */
 | 
			
		||||
 
 | 
			
		||||
@@ -10,7 +10,8 @@ import org.springframework.security.core.GrantedAuthority;
 | 
			
		||||
 * Users Roles for spring app
 | 
			
		||||
 */
 | 
			
		||||
public enum AuthorityRoles implements GrantedAuthority {
 | 
			
		||||
    STUDENT("ROLE_STUDENT"), DEANERY("ROLE_DEANERY"), ADMIN("ROLE_ADMIN"), TEST_USER("ROLE_TESTUSER");
 | 
			
		||||
    STUDENT("ROLE_STUDENT"), DEANERY("ROLE_DEANERY"), ADMIN("ROLE_ADMIN"), TEST_USER("ROLE_TESTUSER"),
 | 
			
		||||
    DEVELOPER("ROLE_DEVELOPER");
 | 
			
		||||
 | 
			
		||||
    private String role;
 | 
			
		||||
 | 
			
		||||
@@ -39,6 +40,8 @@ public enum AuthorityRoles implements GrantedAuthority {
 | 
			
		||||
                return Optional.of(AuthorityRoles.STUDENT);
 | 
			
		||||
            case TEST_USER:
 | 
			
		||||
                return Optional.of(AuthorityRoles.TEST_USER);
 | 
			
		||||
            case DEVELOPER:
 | 
			
		||||
                return Optional.of(AuthorityRoles.DEVELOPER);
 | 
			
		||||
            default:
 | 
			
		||||
                return Optional.empty();
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -40,7 +40,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 | 
			
		||||
    @Override
 | 
			
		||||
    public void configure(final WebSecurity webSecurity) {
 | 
			
		||||
        webSecurity.ignoring().antMatchers("/token**").antMatchers("/token/refresh**")
 | 
			
		||||
                .antMatchers("/api/v1/courses/all").antMatchers("/api/v1/groups/course/{id}")
 | 
			
		||||
                .antMatchers("/api/v1/courses/all")
 | 
			
		||||
                .antMatchers("/api/v1/groups/course/{id}", "/api/v1/configurator/config/tour")
 | 
			
		||||
                .antMatchers("/v2/api-docs", "/configuration/ui", "/swagger-resources/**", "/configuration/security",
 | 
			
		||||
                        "/swagger-ui.html", "/webjars/**");
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -18,6 +18,7 @@ import com.plannaplan.entities.User;
 | 
			
		||||
import com.plannaplan.services.UserService;
 | 
			
		||||
import com.plannaplan.types.UserRoles;
 | 
			
		||||
 | 
			
		||||
import static org.junit.Assert.assertTrue;
 | 
			
		||||
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*;
 | 
			
		||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 | 
			
		||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 | 
			
		||||
@@ -31,11 +32,13 @@ public class CommisionControllerTest extends AbstractControllerTest {
 | 
			
		||||
    private UserService service;
 | 
			
		||||
 | 
			
		||||
    private static User user;
 | 
			
		||||
    private static User admin;
 | 
			
		||||
    private static User otherUser;
 | 
			
		||||
    private static User asker;
 | 
			
		||||
    private static User otherAsker;
 | 
			
		||||
 | 
			
		||||
    private static final String TEST_COMMISIONS_STUDENT_EMAIL = "commisions.student@notexisting.domain";
 | 
			
		||||
    private static final String TEST_COMMISIONS_ADMIN_EMAIL = "commisions.admin@notexisiting,domain";
 | 
			
		||||
    private static final String TEST_COMMISIONS_OTHER_STUDENT_EMAIL = "commisions.student2@notexisting.domain";
 | 
			
		||||
    private static final String TEST_COMMISIONS_DEANERY_EMAIL = "commisions.deanery@notexisting.domain";
 | 
			
		||||
    private static final String TEST_COMMISIONS_OTHER_DEANERY_EMAIL = "commisions.deanery2@notexisting.domain";
 | 
			
		||||
@@ -44,6 +47,9 @@ public class CommisionControllerTest extends AbstractControllerTest {
 | 
			
		||||
    private static final String GET_COMMISIONS_ENDPOINT = "/api/v1/commisions/user";
 | 
			
		||||
    private static final String GET_SOMEONE_COMMISIONS_ENDPOINT = "/api/v1/commisions/user";
 | 
			
		||||
    private static final String GET_USER_SCHEDULE_ENDPOINT = "/api/v1/commisions/user/schedule";
 | 
			
		||||
    private static final String GET_ASSIGNMENTS_ENDPOINT = "/api/v1/commisions/user/assignments";
 | 
			
		||||
 | 
			
		||||
    private static final String EXPORT_DATA = "/api/v1/commisions/export/csv";
 | 
			
		||||
 | 
			
		||||
    private static final MediaType APPLICATION_JSON_UTF8 = new MediaType(MediaType.APPLICATION_JSON.getType(),
 | 
			
		||||
            MediaType.APPLICATION_JSON.getSubtype(), Charset.forName("utf8"));
 | 
			
		||||
@@ -254,6 +260,10 @@ public class CommisionControllerTest extends AbstractControllerTest {
 | 
			
		||||
                    UserRoles.STUDENT);
 | 
			
		||||
            this.service.save(otherUser);
 | 
			
		||||
        }
 | 
			
		||||
        if (CommisionControllerTest.admin == null) {
 | 
			
		||||
            CommisionControllerTest.admin = new User(null, null, TEST_COMMISIONS_ADMIN_EMAIL, UserRoles.ADMIN);
 | 
			
		||||
            this.service.save(admin);
 | 
			
		||||
        }
 | 
			
		||||
        if (CommisionControllerTest.asker == null) {
 | 
			
		||||
            CommisionControllerTest.asker = new User(null, null, TEST_COMMISIONS_DEANERY_EMAIL, UserRoles.DEANERY);
 | 
			
		||||
            this.service.save(asker);
 | 
			
		||||
@@ -264,4 +274,50 @@ public class CommisionControllerTest extends AbstractControllerTest {
 | 
			
		||||
            this.service.save(otherAsker);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldExportData() throws Exception {
 | 
			
		||||
        this.checkUsers();
 | 
			
		||||
        final User admin = this.service.checkForUser(TEST_COMMISIONS_ADMIN_EMAIL, null);
 | 
			
		||||
        final String token = this.service.login(admin).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(EXPORT_DATA).header("Authorization", "Bearer " + token)).andExpect(status().isOk());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldNotExportDataDueToWrongPermision() throws Exception {
 | 
			
		||||
        this.checkUsers();
 | 
			
		||||
        final User student = this.service.checkForUser(TEST_COMMISIONS_STUDENT_EMAIL, null);
 | 
			
		||||
        final String token = this.service.login(student).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(EXPORT_DATA).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldExportDataBeCsvFile() throws Exception {
 | 
			
		||||
        this.checkUsers();
 | 
			
		||||
        final User admin = this.service.checkForUser(TEST_COMMISIONS_ADMIN_EMAIL, null);
 | 
			
		||||
        final String token = this.service.login(admin).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
 | 
			
		||||
        assertTrue(
 | 
			
		||||
                mockMvc.perform(get(EXPORT_DATA).header("Authorization", "Bearer " + token)).andExpect(status().isOk())
 | 
			
		||||
                        .andReturn().getResponse().getContentAsString().contains("user_id, zaj_cykl_id, gr_nr"));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldRetrunOkForAssignmentEnpoint() throws Exception {
 | 
			
		||||
        this.checkUsers();
 | 
			
		||||
        final User admin = this.service.checkForUser(TEST_COMMISIONS_STUDENT_EMAIL, null);
 | 
			
		||||
        final String token = this.service.login(admin).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
 | 
			
		||||
        mockMvc.perform(get(GET_ASSIGNMENTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -40,6 +40,7 @@ public class ConfigControllerTest extends AbstractControllerTest {
 | 
			
		||||
    private static final String COURSE_ENDPOINT = "/api/v1/configurator/config/courses";
 | 
			
		||||
    private static final String TOURS_ENDPOINT = "/api/v1/configurator/config/tours";
 | 
			
		||||
    private static final String ADMIN_INIT_ENDPOINT = "/api/v1/configurator/admin/init";
 | 
			
		||||
    private static final String TOUR_GET_ENDPOINT = "/api/v1/configurator/admin/tour";
 | 
			
		||||
    private static final String FIRST_TOUR_START = "firstTourBegin";
 | 
			
		||||
    private static final String FIRST_TOUR_END = "firstTourEnd";
 | 
			
		||||
    private static final String SECOND_TOUR_START = "secondTourBegin";
 | 
			
		||||
@@ -230,19 +231,19 @@ public class ConfigControllerTest extends AbstractControllerTest {
 | 
			
		||||
    @Test
 | 
			
		||||
    @Ignore
 | 
			
		||||
    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
 | 
			
		||||
    public void shouldCreateAdminBecouseOfEmptyDatabase() throws Exception{
 | 
			
		||||
    public void shouldCreateAdminBecouseOfEmptyDatabase() throws Exception {
 | 
			
		||||
        // have no idea how to make this test independent from user that run this
 | 
			
		||||
        final String ticket = "";
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
 | 
			
		||||
        mockMvc.perform(get(ADMIN_INIT_ENDPOINT).param("ticket", ticket)).andExpect(status().isOk());        
 | 
			
		||||
        mockMvc.perform(get(ADMIN_INIT_ENDPOINT).param("ticket", ticket)).andExpect(status().isOk());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailDueToExistingAdmin() throws Exception{
 | 
			
		||||
    public void shouldFailDueToExistingAdmin() throws Exception {
 | 
			
		||||
        this.service.save(new User(null, null, "shouldFailDueToExistingAdmin@ConfigController.Test", UserRoles.ADMIN));
 | 
			
		||||
        final String ticket = "hfewlhfjlewhipfqwehipqwef";
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
 | 
			
		||||
        mockMvc.perform(get(ADMIN_INIT_ENDPOINT).param("ticket", ticket)).andExpect(status().is4xxClientError());        
 | 
			
		||||
        mockMvc.perform(get(ADMIN_INIT_ENDPOINT).param("ticket", ticket)).andExpect(status().is4xxClientError());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
@@ -282,10 +283,9 @@ public class ConfigControllerTest extends AbstractControllerTest {
 | 
			
		||||
        final String token = this.service.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(TOURS_ENDPOINT).param(FIRST_TOUR_START, "12.12.2020")
 | 
			
		||||
                .param(FIRST_TOUR_END, "14.12.2020").param(SECOND_TOUR_START, "16.12.2020")
 | 
			
		||||
                .param(SECOND_TOUR_END, "20.12.2020").header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
        mockMvc.perform(post(TOURS_ENDPOINT).param(FIRST_TOUR_START, "12.12.2020").param(FIRST_TOUR_END, "14.12.2020")
 | 
			
		||||
                .param(SECOND_TOUR_START, "16.12.2020").param(SECOND_TOUR_END, "20.12.2020")
 | 
			
		||||
                .header("Authorization", "Bearer " + token)).andExpect(status().isOk());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
@@ -295,10 +295,9 @@ public class ConfigControllerTest extends AbstractControllerTest {
 | 
			
		||||
        final String token = this.service.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(TOURS_ENDPOINT).param(FIRST_TOUR_START, "12.12.2020")
 | 
			
		||||
                .param(FIRST_TOUR_END, "14.12.2020").param(SECOND_TOUR_START, "16.12.2020")
 | 
			
		||||
                .param(SECOND_TOUR_END, "13.12.2020").header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
        mockMvc.perform(post(TOURS_ENDPOINT).param(FIRST_TOUR_START, "12.12.2020").param(FIRST_TOUR_END, "14.12.2020")
 | 
			
		||||
                .param(SECOND_TOUR_START, "16.12.2020").param(SECOND_TOUR_END, "13.12.2020")
 | 
			
		||||
                .header("Authorization", "Bearer " + token)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -309,10 +308,9 @@ public class ConfigControllerTest extends AbstractControllerTest {
 | 
			
		||||
        final String token = this.service.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(TOURS_ENDPOINT).param(FIRST_TOUR_START, "12.12.2020")
 | 
			
		||||
                .param(FIRST_TOUR_END, "10.12.2020").param(SECOND_TOUR_START, "16.12.2020")
 | 
			
		||||
                .param(SECOND_TOUR_END, "20.12.2020").header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
        mockMvc.perform(post(TOURS_ENDPOINT).param(FIRST_TOUR_START, "12.12.2020").param(FIRST_TOUR_END, "10.12.2020")
 | 
			
		||||
                .param(SECOND_TOUR_START, "16.12.2020").param(SECOND_TOUR_END, "20.12.2020")
 | 
			
		||||
                .header("Authorization", "Bearer " + token)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -323,10 +321,9 @@ public class ConfigControllerTest extends AbstractControllerTest {
 | 
			
		||||
        final String token = this.service.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(TOURS_ENDPOINT).param(FIRST_TOUR_START, "12.12.2020")
 | 
			
		||||
                .param(FIRST_TOUR_END, "14.12.2020").param(SECOND_TOUR_START, "13.12.2020")
 | 
			
		||||
                .param(SECOND_TOUR_END, "20.12.2020").header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
        mockMvc.perform(post(TOURS_ENDPOINT).param(FIRST_TOUR_START, "12.12.2020").param(FIRST_TOUR_END, "14.12.2020")
 | 
			
		||||
                .param(SECOND_TOUR_START, "13.12.2020").param(SECOND_TOUR_END, "20.12.2020")
 | 
			
		||||
                .header("Authorization", "Bearer " + token)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -337,10 +334,41 @@ public class ConfigControllerTest extends AbstractControllerTest {
 | 
			
		||||
        final String token = this.service.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(TOURS_ENDPOINT).param(FIRST_TOUR_START, "12.12.2020")
 | 
			
		||||
                .param(FIRST_TOUR_END, "14.12.2020").param(SECOND_TOUR_START, "16.12.2020")
 | 
			
		||||
                .param(SECOND_TOUR_END, "20.12.2020").header("Authorization", "Bearer " + token))
 | 
			
		||||
        mockMvc.perform(post(TOURS_ENDPOINT).param(FIRST_TOUR_START, "12.12.2020").param(FIRST_TOUR_END, "14.12.2020")
 | 
			
		||||
                .param(SECOND_TOUR_START, "16.12.2020").param(SECOND_TOUR_END, "20.12.2020")
 | 
			
		||||
                .header("Authorization", "Bearer " + token)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldReturnOKAuthorizedForGetTours() throws Exception {
 | 
			
		||||
        final String mail = "shouldReturnOKAuthorizedForGetTours@ConfigController.test";
 | 
			
		||||
        final User usr = this.service.save(new User(null, null, mail, UserRoles.ADMIN));
 | 
			
		||||
 | 
			
		||||
        final String token = this.service.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(TOUR_GET_ENDPOINT).header("Authorization", "Bearer " + token)).andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldDenyForGetTours() throws Exception {
 | 
			
		||||
        final String mail = "shouldDenyForGetTours@ConfigController.test";
 | 
			
		||||
        final User usr = this.service.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.service.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(TOUR_GET_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }    
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldDenyWithNoToken() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(TOUR_GET_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -0,0 +1,205 @@
 | 
			
		||||
package com.plannaplan.controllers;
 | 
			
		||||
 | 
			
		||||
import org.junit.Test;
 | 
			
		||||
import org.junit.runner.RunWith;
 | 
			
		||||
import org.springframework.beans.factory.annotation.Autowired;
 | 
			
		||||
import org.springframework.boot.test.context.SpringBootTest;
 | 
			
		||||
import org.springframework.test.context.ContextConfiguration;
 | 
			
		||||
import org.springframework.test.context.junit4.SpringRunner;
 | 
			
		||||
import org.springframework.test.web.servlet.MockMvc;
 | 
			
		||||
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 | 
			
		||||
 | 
			
		||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 | 
			
		||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 | 
			
		||||
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.entities.User;
 | 
			
		||||
import com.plannaplan.services.UserService;
 | 
			
		||||
import com.plannaplan.types.UserRoles;
 | 
			
		||||
 | 
			
		||||
@RunWith(SpringRunner.class)
 | 
			
		||||
@SpringBootTest
 | 
			
		||||
@ContextConfiguration
 | 
			
		||||
public class DeveloperControllerTest extends AbstractControllerTest {
 | 
			
		||||
    private static final String ACCEPT_ENDPOINT = "/api/v1/developer/algorythm/accept";
 | 
			
		||||
    private static final String EXCHANGE_ENDPOINT = "/api/v1/developer/algorythm/exchange";
 | 
			
		||||
    private static final String FIRST_TOUR_ENDPOINT = "/api/v1/developer/tours/first";
 | 
			
		||||
    private static final String NO_TOUR_ENDPOINT = "/api/v1/developer/tours/no";
 | 
			
		||||
    private static final String SECOND_TOUR_ENDPOINT = "/api/v1/developer/tours/second";
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private UserService userService;
 | 
			
		||||
 | 
			
		||||
    /* ACCEPT TESTS */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithWrongAcces() throws Exception {
 | 
			
		||||
        final String mail = "shouldFailWithWrongAcces@DeveloperController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(ACCEPT_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldOkPerformingAcceptAlgotyrhm() throws Exception {
 | 
			
		||||
        final String mail = "shouldOkPerformingAcceptAlgotyrhm@DeveloperController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.DEVELOPER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(ACCEPT_ENDPOINT).header("Authorization", "Bearer " + token)).andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithNoToken() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(ACCEPT_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* EXCHANGE TESTS */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailExchangeWithWrongAcces() throws Exception {
 | 
			
		||||
        final String mail = "shouldFailExchangeWithWrongAcces@DeveloperController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldOkExchangeAlgotyrhm() throws Exception {
 | 
			
		||||
        final String mail = "shouldOkExchangeAlgotyrhm@DeveloperController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.DEVELOPER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token)).andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailExchaneWithNoToken() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* FIRST TOUR */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailFirstTourWithWrongAcces() throws Exception {
 | 
			
		||||
        final String mail = "shouldFailFirstTourWithWrongAcces@DeveloperController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(FIRST_TOUR_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldOkFirstTourAlgotyrhm() throws Exception {
 | 
			
		||||
        final String mail = "shouldOkFirstTourAlgotyrhm@DeveloperController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.DEVELOPER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(FIRST_TOUR_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFirstTourWithNoToken() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(FIRST_TOUR_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* SECOND TOUR */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailSecondTourWithWrongAcces() throws Exception {
 | 
			
		||||
        final String mail = "shouldFailSecondTourWithWrongAcces@DeveloperController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(SECOND_TOUR_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldOkSecondTourAlgotyrhm() throws Exception {
 | 
			
		||||
        final String mail = "shouldOkSecondTourAlgotyrhm@DeveloperController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.DEVELOPER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(SECOND_TOUR_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailSecondTourWithNoToken() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(SECOND_TOUR_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* NO TOUR */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldNoTourWithWrongAcces() throws Exception {
 | 
			
		||||
        final String mail = "shouldNoTourWithWrongAcces@DeveloperController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(NO_TOUR_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldOkNoAlgotyrhm() throws Exception {
 | 
			
		||||
        final String mail = "shouldOkNoAlgotyrhm@DeveloperController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.DEVELOPER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(NO_TOUR_ENDPOINT).header("Authorization", "Bearer " + token)).andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailNoTourWithNoToken() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(NO_TOUR_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -22,11 +22,13 @@ import java.nio.charset.Charset;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.entities.Assignment;
 | 
			
		||||
import com.plannaplan.entities.Commision;
 | 
			
		||||
import com.plannaplan.entities.Course;
 | 
			
		||||
import com.plannaplan.entities.Exchange;
 | 
			
		||||
import com.plannaplan.entities.Groups;
 | 
			
		||||
import com.plannaplan.entities.User;
 | 
			
		||||
import com.plannaplan.services.AssignmentService;
 | 
			
		||||
import com.plannaplan.services.CommisionService;
 | 
			
		||||
import com.plannaplan.services.CourseService;
 | 
			
		||||
import com.plannaplan.services.ExchangeService;
 | 
			
		||||
import com.plannaplan.services.GroupService;
 | 
			
		||||
import com.plannaplan.services.UserService;
 | 
			
		||||
@@ -57,11 +59,14 @@ public class ExchangeControllerTest extends AbstractControllerTest {
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private ExchangeService exchangeService;
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private CourseService courseService;
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
 | 
			
		||||
    public void shouldGetAllUsersExchanges() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
        "shouldGetAllUsersExchanges@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
                "shouldGetAllUsersExchanges@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(215, "A2-2", null, 520, WeekDay.TUESDAY, null));
 | 
			
		||||
        final Groups groupDesired = this.groupService.save(new Groups(216, "A2-3", null, 530, WeekDay.MONDAY, null));
 | 
			
		||||
@@ -70,26 +75,27 @@ public class ExchangeControllerTest extends AbstractControllerTest {
 | 
			
		||||
        this.exchangeService.save(new Exchange(assignment, groupDesired));
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(EXCHANGE_ENDPOINT + "/all").header("Authorization", "Bearer " +
 | 
			
		||||
        token)).andExpect(status().isOk());
 | 
			
		||||
        mockMvc.perform(get(EXCHANGE_ENDPOINT + "/all").header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailGettingNotExistingExchange() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldFailGettingNotExistingExchange@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
                "shouldFailGettingNotExistingExchange@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(EXCHANGE_ENDPOINT + "/" + user.getId()).header("Authorization", "Bearer " + token)).andExpect(status().isBadRequest());
 | 
			
		||||
        mockMvc.perform(get(EXCHANGE_ENDPOINT + "/" + user.getId()).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
 | 
			
		||||
    public void shouldGetSingleExchange() throws Exception{
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldGetSingleExchange@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
    public void shouldGetSingleExchange() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null, "shouldGetSingleExchange@ExchangeController.test",
 | 
			
		||||
                "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(215, "A2-2", null, 520, WeekDay.TUESDAY, null));
 | 
			
		||||
        final Groups groupDesired = this.groupService.save(new Groups(216, "A2-3", null, 530, WeekDay.MONDAY, null));
 | 
			
		||||
@@ -98,14 +104,14 @@ public class ExchangeControllerTest extends AbstractControllerTest {
 | 
			
		||||
        final Exchange exchange = this.exchangeService.save(new Exchange(assignment, groupDesired));
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(EXCHANGE_ENDPOINT + "/" + exchange.getId()).header("Authorization", "Bearer " +
 | 
			
		||||
        token)).andExpect(status().isOk());
 | 
			
		||||
        mockMvc.perform(get(EXCHANGE_ENDPOINT + "/" + exchange.getId()).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailGettingExchangeDueToPermission() throws Exception{
 | 
			
		||||
    public void shouldFailGettingExchangeDueToPermission() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldFailGettingExchangeDueToPermission@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
                "shouldFailGettingExchangeDueToPermission@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(215, "A2-2", null, 520, WeekDay.TUESDAY, null));
 | 
			
		||||
        final Groups groupDesired = this.groupService.save(new Groups(216, "A2-3", null, 530, WeekDay.MONDAY, null));
 | 
			
		||||
        final Commision commision = this.commisionService.save(new Commision(user));
 | 
			
		||||
@@ -113,32 +119,33 @@ public class ExchangeControllerTest extends AbstractControllerTest {
 | 
			
		||||
        final Exchange exchange = this.exchangeService.save(new Exchange(assignment, groupDesired));
 | 
			
		||||
 | 
			
		||||
        final User user2 = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldFailGettingExchangeDueToPermission2@ExchangeController.test", "11112", UserRoles.STUDENT, 321));
 | 
			
		||||
                "shouldFailGettingExchangeDueToPermission2@ExchangeController.test", "11112", UserRoles.STUDENT, 321));
 | 
			
		||||
        final String token2 = this.userService.login(user2).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT + "/" + exchange.getId()).header("Authorization", "Bearer " +
 | 
			
		||||
        token2)).andExpect(status().is4xxClientError());
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT + "/" + exchange.getId()).header("Authorization", "Bearer " + token2))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailPostDueToAssignmentNotFound() throws Exception{
 | 
			
		||||
    public void shouldFailPostDueToAssignmentNotFound() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldFailPostDueToAssignmentNotFound@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
                "shouldFailPostDueToAssignmentNotFound@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(212, "A2-1", null, 420, WeekDay.WEDNESDAY, null));
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc =
 | 
			
		||||
        MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " +
 | 
			
		||||
        token).contentType(APPLICATION_JSON_UTF8).content("{\"assignment\": "+ user.getId() +", \"group\": "+ group.getId() +" }")).andExpect(status().isBadRequest());
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(
 | 
			
		||||
                post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token).contentType(APPLICATION_JSON_UTF8)
 | 
			
		||||
                        .content("{\"assignment\": " + user.getId() + ", \"group\": " + group.getId() + " }"))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
 | 
			
		||||
    public void shouldInsertExchange() throws Exception{
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldInsertExchange@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
    public void shouldInsertExchange() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(
 | 
			
		||||
                new User(null, null, "shouldInsertExchange@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(215, "A2-2", null, 520, WeekDay.TUESDAY, null));
 | 
			
		||||
        final Groups groupDesired = this.groupService.save(new Groups(216, "A2-3", null, 530, WeekDay.MONDAY, null));
 | 
			
		||||
@@ -148,49 +155,55 @@ public class ExchangeControllerTest extends AbstractControllerTest {
 | 
			
		||||
        this.assignmentService.callAcceptAlgorythm();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " +
 | 
			
		||||
        token).contentType(APPLICATION_JSON_UTF8).content("{\"assignment\": "+ assignment.getId() +", \"group\": "+ groupDesired.getId() +" }")).andExpect(status().isOk());
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token)
 | 
			
		||||
                .contentType(APPLICATION_JSON_UTF8)
 | 
			
		||||
                .content("{\"assignment\": " + assignment.getId() + ", \"group\": " + groupDesired.getId() + " }"))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailInsertExchangeDueToMissingGroup() throws Exception{
 | 
			
		||||
    public void shouldFailInsertExchangeDueToMissingGroup() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldFailInsertExchangeDueToMissingGroup@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
                "shouldFailInsertExchangeDueToMissingGroup@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " +
 | 
			
		||||
        token).contentType(APPLICATION_JSON_UTF8).content("{\"assignment\": "+ user.getId() +" }")).andExpect(status().isBadRequest());
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token)
 | 
			
		||||
                .contentType(APPLICATION_JSON_UTF8).content("{\"assignment\": " + user.getId() + " }"))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailInsertExchangeDueToMissingAssignment() throws Exception{
 | 
			
		||||
    public void shouldFailInsertExchangeDueToMissingAssignment() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldFailInsertExchangeDueToMissingAssignment@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
                "shouldFailInsertExchangeDueToMissingAssignment@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(212, "A2-1", null, 420, WeekDay.WEDNESDAY, null));
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " +
 | 
			
		||||
        token).contentType(APPLICATION_JSON_UTF8).content("{\"group\": "+ group.getId() +" }")).andExpect(status().isBadRequest());
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token)
 | 
			
		||||
                .contentType(APPLICATION_JSON_UTF8).content("{\"group\": " + group.getId() + " }"))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailInsertExchangeDueToMissingParam() throws Exception{
 | 
			
		||||
    public void shouldFailInsertExchangeDueToMissingParam() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldFailInsertExchangeDueToMissingParam@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
                "shouldFailInsertExchangeDueToMissingParam@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " +
 | 
			
		||||
        token).contentType(APPLICATION_JSON_UTF8)).andExpect(status().isBadRequest());
 | 
			
		||||
        mockMvc.perform(
 | 
			
		||||
                post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token).contentType(APPLICATION_JSON_UTF8))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
 | 
			
		||||
    public void shouldDenyExchangeDueToAssigmentOverlapping() throws Exception{
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
        "shouldDenyExchangeDueToAssigmentOverlapping@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
    public void shouldDenyExchangeDueToAssigmentOverlapping() throws Exception {
 | 
			
		||||
        final User user = this.userService
 | 
			
		||||
                .save(new User(null, null, "shouldDenyExchangeDueToAssigmentOverlapping@ExchangeController.test",
 | 
			
		||||
                        "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(215, "A2-2", null, 520, WeekDay.TUESDAY, null));
 | 
			
		||||
        final Commision commision = this.commisionService.save(new Commision(user));
 | 
			
		||||
@@ -198,30 +211,34 @@ public class ExchangeControllerTest extends AbstractControllerTest {
 | 
			
		||||
        this.exchangeService.save(new Exchange(assignment, group));
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " +
 | 
			
		||||
        token).contentType(APPLICATION_JSON_UTF8).content("{\"assignment\": "+ user.getId() +", \"group\": "+ group.getId() +" }")).andExpect(status().isBadRequest());
 | 
			
		||||
        mockMvc.perform(
 | 
			
		||||
                post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token).contentType(APPLICATION_JSON_UTF8)
 | 
			
		||||
                        .content("{\"assignment\": " + user.getId() + ", \"group\": " + group.getId() + " }"))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldDenyPostDueToAssignmentNotAccepted() throws Exception{
 | 
			
		||||
    public void shouldDenyPostDueToAssignmentNotAccepted() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldDenyPostDueToAssignmentNotAccepted@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
                "shouldDenyPostDueToAssignmentNotAccepted@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(212, "A2-1", null, 420, WeekDay.WEDNESDAY, null));
 | 
			
		||||
        final Groups group2 = this.groupService.save(new Groups(213, "A2-2", null, 420, WeekDay.MONDAY, null));
 | 
			
		||||
        final Commision commision =  this.commisionService.save(new Commision(user));
 | 
			
		||||
        final Assignment assignment = this.assignmentService.save(new Assignment(group,commision));
 | 
			
		||||
        final Commision commision = this.commisionService.save(new Commision(user));
 | 
			
		||||
        final Assignment assignment = this.assignmentService.save(new Assignment(group, commision));
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " +
 | 
			
		||||
        token).contentType(APPLICATION_JSON_UTF8).content("{\"assignment\": "+ assignment.getId() +", \"group\": "+ group2.getId() +" }")).andExpect(status().isBadRequest());
 | 
			
		||||
        mockMvc.perform(
 | 
			
		||||
                post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token).contentType(APPLICATION_JSON_UTF8)
 | 
			
		||||
                        .content("{\"assignment\": " + assignment.getId() + ", \"group\": " + group2.getId() + " }"))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
 | 
			
		||||
    public void shouldDeleteExchange() throws Exception{
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldDeleteExchange@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
    public void shouldDeleteExchange() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(
 | 
			
		||||
                new User(null, null, "shouldDeleteExchange@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(215, "A2-2", null, 520, WeekDay.TUESDAY, null));
 | 
			
		||||
        final Groups groupDesired = this.groupService.save(new Groups(216, "A2-3", null, 530, WeekDay.MONDAY, null));
 | 
			
		||||
@@ -230,14 +247,14 @@ public class ExchangeControllerTest extends AbstractControllerTest {
 | 
			
		||||
        final Exchange exchange = this.exchangeService.save(new Exchange(assignment, groupDesired));
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(delete(EXCHANGE_ENDPOINT + "/" + exchange.getId()).header("Authorization", "Bearer " +
 | 
			
		||||
        token)).andExpect(status().isOk());
 | 
			
		||||
        mockMvc.perform(delete(EXCHANGE_ENDPOINT + "/" + exchange.getId()).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailDeleteDueToWrongPermissions() throws Exception{
 | 
			
		||||
    public void shouldFailDeleteDueToWrongPermissions() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldFailDeleteDueToWrongPermissions@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
                "shouldFailDeleteDueToWrongPermissions@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(215, "A2-2", null, 520, WeekDay.TUESDAY, null));
 | 
			
		||||
        final Groups groupDesired = this.groupService.save(new Groups(216, "A2-3", null, 530, WeekDay.MONDAY, null));
 | 
			
		||||
        final Commision commision = this.commisionService.save(new Commision(user));
 | 
			
		||||
@@ -245,39 +262,41 @@ public class ExchangeControllerTest extends AbstractControllerTest {
 | 
			
		||||
        final Exchange exchange = this.exchangeService.save(new Exchange(assignment, groupDesired));
 | 
			
		||||
 | 
			
		||||
        final User user2 = this.userService.save(new User(null, null,
 | 
			
		||||
        "shouldFailDeleteDueToWrongPermissions@ExchangeController2.test", "11112", UserRoles.STUDENT, 322));
 | 
			
		||||
                "shouldFailDeleteDueToWrongPermissions@ExchangeController2.test", "11112", UserRoles.STUDENT, 322));
 | 
			
		||||
        final String token2 = this.userService.login(user2).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(EXCHANGE_ENDPOINT + "/" + exchange.getId()).header("Authorization", "Bearer " +
 | 
			
		||||
        token2)).andExpect(status().isBadRequest());
 | 
			
		||||
        mockMvc.perform(get(EXCHANGE_ENDPOINT + "/" + exchange.getId()).header("Authorization", "Bearer " + token2))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailDeleteDueToMissingParam() throws Exception{
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
        "shouldFailDeleteDueToMissingParam@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
    public void shouldFailDeleteDueToMissingParam() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(
 | 
			
		||||
                new User(null, null, "shouldFailDeleteDueToMissingParam@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(delete(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token)).andExpect(status().is4xxClientError());
 | 
			
		||||
        mockMvc.perform(delete(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailDeleteDueToExchangeNotFound() throws Exception{
 | 
			
		||||
    public void shouldFailDeleteDueToExchangeNotFound() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                                "shouldFailDeleteDueToExchangeNotFound@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
                "shouldFailDeleteDueToExchangeNotFound@ExchangeController.test", UserRoles.STUDENT));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(delete(EXCHANGE_ENDPOINT + "/" + user.getId()).header("Authorization", "Bearer " +
 | 
			
		||||
        token)).andExpect(status().isBadRequest());
 | 
			
		||||
        mockMvc.perform(delete(EXCHANGE_ENDPOINT + "/" + user.getId()).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
 | 
			
		||||
    public void shouldFailPostDueToGroupAlreadyAccepted() throws Exception{
 | 
			
		||||
        final User user = this.userService.save(new User(null, null, "shouldFailPostDueToGroupAlreadyAccepted@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
    public void shouldFailPostDueToGroupAlreadyAccepted() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(new User(null, null,
 | 
			
		||||
                "shouldFailPostDueToGroupAlreadyAccepted@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(215, "A2-2", null, 520, WeekDay.TUESDAY, null));
 | 
			
		||||
        final Groups group2 = this.groupService.save(new Groups(216, "A2-3", null, 530, WeekDay.MONDAY, null));
 | 
			
		||||
@@ -288,7 +307,55 @@ public class ExchangeControllerTest extends AbstractControllerTest {
 | 
			
		||||
        this.exchangeService.save(new Exchange(assignment, group2));
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " +
 | 
			
		||||
        token).contentType(APPLICATION_JSON_UTF8).content("{\"assignment\": "+ assignment.getId() +", \"group\": "+ group2.getId() +" }")).andExpect(status().isBadRequest());
 | 
			
		||||
        mockMvc.perform(
 | 
			
		||||
                post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token).contentType(APPLICATION_JSON_UTF8)
 | 
			
		||||
                        .content("{\"assignment\": " + assignment.getId() + ", \"group\": " + group2.getId() + " }"))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
 | 
			
		||||
    public void shouldFailForDiffrentCoursesExchange() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(
 | 
			
		||||
                new User(null, null, "shouldInsertExchange@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
        final Course course = this.courseService
 | 
			
		||||
                .save(new Course("shouldFailForDiffrentCoursesExchangeCourse", "SFFDCEC"));
 | 
			
		||||
        final Course course2 = this.courseService
 | 
			
		||||
                .save(new Course("shouldFailForDiffrentCoursesExchangeCourse2", "SFFDCEC-2"));
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(215, "A2-2", course, 520, WeekDay.TUESDAY, null));
 | 
			
		||||
        final Groups groupDesired = this.groupService.save(new Groups(216, "A2-3", course2, 530, WeekDay.MONDAY, null));
 | 
			
		||||
        final Commision commision = this.commisionService.save(new Commision(user));
 | 
			
		||||
        final Assignment assignment = this.assignmentService.save(new Assignment(group, commision));
 | 
			
		||||
 | 
			
		||||
        this.assignmentService.callAcceptAlgorythm();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token)
 | 
			
		||||
                .contentType(APPLICATION_JSON_UTF8)
 | 
			
		||||
                .content("{\"assignment\": " + assignment.getId() + ", \"group\": " + groupDesired.getId() + " }"))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
 | 
			
		||||
    public void shouldFailForDiffrentGroupTypesExchange() throws Exception {
 | 
			
		||||
        final User user = this.userService.save(
 | 
			
		||||
                new User(null, null, "shouldInsertExchange@ExchangeController.test", "11111", UserRoles.STUDENT, 320));
 | 
			
		||||
        final String token = this.userService.login(user).getToken();
 | 
			
		||||
        final Course course = this.courseService
 | 
			
		||||
                .save(new Course("shouldFailForDiffrentCoursesExchangeCourse", "SFFDCEC"));
 | 
			
		||||
        final Groups group = this.groupService.save(new Groups(12, "A2-2", course, 520, WeekDay.TUESDAY, null));
 | 
			
		||||
        final Groups groupDesired = this.groupService.save(new Groups(216, "A2-3", course, 530, WeekDay.MONDAY, null));
 | 
			
		||||
        final Commision commision = this.commisionService.save(new Commision(user));
 | 
			
		||||
        final Assignment assignment = this.assignmentService.save(new Assignment(group, commision));
 | 
			
		||||
 | 
			
		||||
        this.assignmentService.callAcceptAlgorythm();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(post(EXCHANGE_ENDPOINT).header("Authorization", "Bearer " + token)
 | 
			
		||||
                .contentType(APPLICATION_JSON_UTF8)
 | 
			
		||||
                .content("{\"assignment\": " + assignment.getId() + ", \"group\": " + groupDesired.getId() + " }"))
 | 
			
		||||
                .andExpect(status().isBadRequest());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,244 @@
 | 
			
		||||
package com.plannaplan.controllers;
 | 
			
		||||
 | 
			
		||||
import org.junit.Test;
 | 
			
		||||
import org.junit.runner.RunWith;
 | 
			
		||||
import org.springframework.beans.factory.annotation.Autowired;
 | 
			
		||||
import org.springframework.boot.test.context.SpringBootTest;
 | 
			
		||||
import org.springframework.test.context.ContextConfiguration;
 | 
			
		||||
import org.springframework.test.context.junit4.SpringRunner;
 | 
			
		||||
import org.springframework.test.web.servlet.MockMvc;
 | 
			
		||||
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 | 
			
		||||
 | 
			
		||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 | 
			
		||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 | 
			
		||||
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*;
 | 
			
		||||
 | 
			
		||||
import com.plannaplan.entities.User;
 | 
			
		||||
import com.plannaplan.services.UserService;
 | 
			
		||||
import com.plannaplan.types.UserRoles;
 | 
			
		||||
 | 
			
		||||
@RunWith(SpringRunner.class)
 | 
			
		||||
@SpringBootTest
 | 
			
		||||
@ContextConfiguration
 | 
			
		||||
public class StatisticsControllerTest extends AbstractControllerTest {
 | 
			
		||||
 | 
			
		||||
    private static final String GROUP_AMMOUNTS_ENDPOINT = "/api/v1/statistics/groups/created";
 | 
			
		||||
    private static final String GROUP_FULL_AMMOUNTS_ENDPOINT = "/api/v1/statistics/groups/full";
 | 
			
		||||
    private static final String USER_ASSIGNED_AMMOUNTS_ENDPOINT = "/api/v1/statistics/users/registered";
 | 
			
		||||
    private static final String USER_NO_ASSIGNED_AMMOUNTS_ENDPOINT = "/api/v1/statistics/users/noregistered";
 | 
			
		||||
    private static final String USER_ACCEPTED_AMMOUNTS_ENDPOINT = "/api/v1/statistics/users/accepted";
 | 
			
		||||
    private static final String USER_PARTLY_ACCEPTED_AMMOUNTS_ENDPOINT = "/api/v1/statistics/users/accepted/partly";
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private UserService userService;
 | 
			
		||||
 | 
			
		||||
    /* GROUP AMMOUNTS TESTS */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithWrongAccesGroupsAmmounts() throws Exception {
 | 
			
		||||
        final String mail = "shouldFailWithWrongAccesGroupsAmmounts@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(GROUP_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldOkGettingGroupsAmmounts() throws Exception {
 | 
			
		||||
        final String mail = "shouldOkGettingGroupsAmmounts@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.DEANERY));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(GROUP_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithNoTokenGroupsAmmounts() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(GROUP_AMMOUNTS_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* USERS ASSIGNED TESTS */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithWrongAccesRegisteredStudentsAmmount() throws Exception {
 | 
			
		||||
        final String mail = "shouldFailWithWrongAccesRegisteredStudentsAmmount@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_ASSIGNED_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldOkGettingRegisteredStudentsAmmount() throws Exception {
 | 
			
		||||
        final String mail = "shouldOkGettingRegisteredStudentsAmmount@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.DEANERY));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_ASSIGNED_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithNoTokenRegisteredStudentsAmmount() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_ASSIGNED_AMMOUNTS_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* USERS NO ASSIGNED TESTS */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithWrongAccesNoRegisteredStudentsAmmount() throws Exception {
 | 
			
		||||
        final String mail = "shouldFailWithWrongAccesNoRegisteredStudentsAmmount@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_NO_ASSIGNED_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldOkGettingNoRegisteredStudentsAmmount() throws Exception {
 | 
			
		||||
        final String mail = "shouldOkGettingNoRegisteredStudentsAmmount@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.DEANERY));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_NO_ASSIGNED_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithNoTokenNoRegisteredStudentsAmmount() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_NO_ASSIGNED_AMMOUNTS_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* USERS FULL ACCPTED TESTS */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithWrongAccessAcceptedStudentsAmmount() throws Exception {
 | 
			
		||||
        final String mail = "shouldFailWithWrongAccessAcceptedStudentsAmmount@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_ACCEPTED_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldOkGettingAcceptedStudentsAmmount() throws Exception {
 | 
			
		||||
        final String mail = "shouldOkGettingAcceptedStudentsAmmount@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.DEANERY));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_ACCEPTED_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithNoTokenAcceptedStudentsAmmount() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_ACCEPTED_AMMOUNTS_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* USERS PARTLY ACCPTED TESTS */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithWrongAccessPartlyAcceptedStudentsAmmount() throws Exception {
 | 
			
		||||
        final String mail = "shouldFailWithWrongAccessPartlyAcceptedStudentsAmmount@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_PARTLY_ACCEPTED_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldOkGettingPartlyAcceptedStudentsAmmount() throws Exception {
 | 
			
		||||
        final String mail = "shouldOkGettingPartlyAcceptedStudentsAmmount@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.DEANERY));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_PARTLY_ACCEPTED_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithNoTokenPartlyAcceptedStudentsAmmount() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(USER_PARTLY_ACCEPTED_AMMOUNTS_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* USERS FULL TAKEN GROUPS TESTS */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithWrongAccessFullGroupsAmmount() throws Exception {
 | 
			
		||||
        final String mail = "shouldFailWithWrongAccessFullGroupsAmmount@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.TEST_USER));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(GROUP_FULL_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldOkGettingFullGroupsAmmount() throws Exception {
 | 
			
		||||
        final String mail = "shouldOkGettingFullGroupsAmmount@StatisticsController.test";
 | 
			
		||||
        final User usr = this.userService.save(new User(null, null, mail, UserRoles.DEANERY));
 | 
			
		||||
 | 
			
		||||
        final String token = this.userService.login(usr).getToken();
 | 
			
		||||
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(GROUP_FULL_AMMOUNTS_ENDPOINT).header("Authorization", "Bearer " + token))
 | 
			
		||||
                .andExpect(status().isOk());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void shouldFailWithNoTokenFullGroupsAmmount() throws Exception {
 | 
			
		||||
        MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build();
 | 
			
		||||
        mockMvc.perform(get(GROUP_FULL_AMMOUNTS_ENDPOINT)).andExpect(status().is4xxClientError());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user