Merge pull request 'single group fix' (#54) from single0-group-fix into master

Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/54

.gitignore

@@ -33,4 +33,10 @@ build/
 
 ### Python ###
 __pycache__
-.pytest_cache
+.pytest_cache
+
+### Parser ###
+parser/
+
+
+envs.sh

.gitlab-ci.yml

@@ -17,6 +17,8 @@ build:
     expire_in: 1 hour
     paths:
       - restservice/target/
+  only:
+    - master
 
 deploy_production:
   stage: deploy

COPYING

@@ -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>.

README.md

@@ -1,4 +1,4 @@
-## Start aplikacji
+# Start aplikacji
 
 Zeby wystartowac aplikacje backendu najpierw nalezy postawic testowa baze danych na naszym komputerze za pomoca dockera. Jesli raz juz go odpalimy przy nastepnym razem bardzo mozliwe, ze wlaczy sie sam. AAby sprawdzic czy docker jesty wystartowany mozna uzyc `docker ps`
 
@@ -13,17 +13,29 @@ cd restservice
 mvn spring-boot:run
 ```
 
-## Token obtaining
+# Token obtaining
 
 Żeby tesotwać API wpełni potrzebny nam jest token który otrzymujemy na podstawie ticketa z systemu autoryzacyjnego **CAS**. Z tego powodu system autoryzacji działa inaczej niż w "książkowych" restowych aplikacjach i np Postman za nas jej nie dokona. Musimy mu podać już uzyskany token. Aby łatwo go uzyskać odpal skrypt
 
-```
+```bash
 python gettoken.py
 ```
 
+Jeżeli chcesz używać skryptu zmiejaniąc gdzie znajduje się backend wpisz:
+
+```bash
+python gettoken.py 192.168.0.212
+```
+
+Jeżeli chcesz używać skryptu bez uruchamiania przeglądarki wpisz:
+
+```bash
+python gettoken.py no-browser
+```
+
 Na koniec w przęglądarce dostaniesz w odpowiedzi token. W samym pliku można zmienić porty aplikacji jeśli to potrzebne.
 
-## Profiles
+# Profiles
 
 W aplikacji posiadamy dwa profile. `dev` i `prod`. **Dev** używamy do testowania aplikacji lokalnie. **Pord** służy do stworzenia builda na produkcję.
 Profil wybieramy w pliku `restservice/src/main/resources/application.properties` wpisując odpowiednią nazwę
@@ -35,42 +47,48 @@ spring.profiles.active=prod
 Jeżeli chcemy zmienić jakieś opcję dla pordukcji to robimy to w tym sammym katalogi w pliku `application-prod.properties` i dla dev analogicznie w `application-dev.properties`.
 W paczce dla proda w protpertiesach poufne dane odczytywane są ze zmiennych środowiskowych systemu na którym odpalana jest aplikacja. Ustawić trzeba następujące zmienne:
 
--   PLANNAPLAN_MYSQL_DB_HOST - host bazy danych np `localhost`
--   PLANNAPLAN_MYSQL_DB_PORT - port na którym działa baza
--   PLANNAPLAN_MYSQL_DB - nazwa bazy dancyh. W profilu **dev** jest to np test
--   PLANNAPLAN_MYSQL_DB_USERNAME - nazwa użytkownika bazy
--   PLANNAPLAN_MYSQL_DB_PASSWORD - hasło użytkownika bazy
+-   `PLANNAPLAN_MYSQL_DB_HOST` - host bazy danych np `localhost`
+-   `PLANNAPLAN_MYSQL_DB_PORT` - port na którym działa baza
+-   `PLANNAPLAN_MYSQL_DB` - nazwa bazy dancyh. W profilu **dev** jest to np test
+-   `PLANNAPLAN_MYSQL_DB_USERNAME` - nazwa użytkownika bazy
+-   `PLANNAPLAN_MYSQL_DB_PASSWORD` - hasło użytkownika bazy
+-   `PLANNAPLAN_EMAIL_HOST` - host naszego dostawcy maila z którego będziemy wssyłać wiadomości
+-   `PLANNAPLAN_EMAIL_PORT` - port naszego dostawcy maila
+-   `PLANNAPLAN_EMAIL_USERNAME` - login naszego maila
+-   `PLANNAPLAN_EMAIL_PASSWORD` - hasło naszego maila
+-   `PLANNAPLAN_EMAIL` - nasz adres maila
+-   `PLANNAPLAN_CONSUMER_KEY` - nasz klucz do usos api
+-   `PLANNAPLAN_CONSUMER_SECRET` - secret naszego klucza
 
-## Packaging
+Należy też pamiętać, że zmienne `PLANNAPLAN_CONSUMER_KEY` oraz `PLANNAPLAN_CONSUMER_SECRET` są potrzebne również w profilu `dev` więc trzeba je dodać w celu tesotowania do zmiennych we własnym systemie
+
+# Packaging
 
 Zeby spakowac apke do `jara` wystarcza dwie komendy zaczynajac z glownego katalogu projektu
 
 ```
-mvn clean
-mvn install
-cd restservice
-mvn clean package spring-boot:repackage
+mvn clean; mvn install; cd restservice; mvn clean package spring-boot:repackage
 ```
 
 Utworzony zostanie jar w `restservice/target/restservice-1.0-SNAPSHOT.jar`. Oczywiscie zeby jar zadzialal kontenery dockerowe musza byc odpalone (lub baza danych na serwerze jesli zmienialismy propertisy z localhost)
 
-## Generowanie dokumentacji
+# Generowanie dokumentacji
 
-### Javadocs
+## Javadocs
 
 ```bash
 mvn javadoc:javadoc
 ```
 
-### Api docs
+## Api docs
 
 Żeby zobaczyć dokumentację api trzeba wejść w przeglądarce na `http://localhost:1285/swagger-ui.html` po odpaleniu aplikacji.
 
-#### Nazewnictwo odpowiedzi
+### Nazewnictwo odpowiedzi
 
 Każdą odpowiedź zaczynamy od modelu, który opisuje np. `Courses` a kończymy na `Response`. Między tymi dwoma członami możemy dodawać modyfikatory opisujące dokładniej odpowiedź np. `Default`. W ten sposób możemy otrzymać nazwę `CoursesDefaultResponse.java`
 
-## Troubleshooting
+# Troubleshooting
 
 Spring chyba cacheuje jakies dane dotyczace polaczenia wiec jesli spring wywali Ci blad `Connection Refused`, a wiesz, ze ta baza stoi na podanym ip i porcie to sprobuj
 
@@ -78,3 +96,28 @@ Spring chyba cacheuje jakies dane dotyczace polaczenia wiec jesli spring wywali
 mvn clean
 mvn install
 ```
+
+Jeżeli używasz VSCode i testy, które wymagają podanych zmiennych środowiskowych (testy odpytywania usos api) trzeba podać te zmienne w pliku `.vscode/settings.json`
+
+```json
+{
+    "files.exclude": {
+        "**/.classpath": true,
+        "**/.project": true,
+        "**/.settings": true,
+        "**/.factorypath": true
+    },
+    "java.configuration.updateBuildConfiguration": "disabled",
+    "java.format.settings.url": "eclipse-formatter.xml",
+    "java.test.config": [
+        {
+            "name": "myConfiguration",
+            "workingDirectory": "${workspaceFolder}",
+            "env": {
+                "PLANNAPLAN_CONSUMER_KEY": "value",
+                "PLANNAPLAN_CONSUMER_SECRET": "value"
+            }
+        }
+    ]
+}
+```

buisnesslogic/pom.xml

@@ -68,6 +68,37 @@
       <version>3.17</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-mail</artifactId>
+      <version>2.2.5.RELEASE</version>
+    </dependency>
+
+    <!-- https://mvnrepository.com/artifact/org.springframework.social/spring-social-core -->
+
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.12</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.scribejava</groupId>
+      <artifactId>scribejava-core</artifactId>
+      <version>8.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.9.8</version>
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -85,14 +116,14 @@
           <version>3.0.2</version>
         </plugin>
         <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.0.0</version>
-        <configuration>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.0.0</version>
+          <configuration>
             <source>1.8</source>
             <target>1.8</target>
-        </configuration>
-	    </plugin>
+          </configuration>
+        </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.8.0</version>

buisnesslogic/src/main/java/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,24 @@
+{
+    "properties": [
+        {
+            "name": "plannaplan.email",
+            "type": "java.lang.String",
+            "description": "Email from which app sends message"
+        },
+        {
+            "name": "plannaplan.apiurl",
+            "type": "java.lang.String",
+            "description": "Url to usos api endpoints"
+        },
+        {
+            "name": "plannaplan.apikey",
+            "type": "java.lang.String",
+            "description": "Api consumer key"
+        },
+        {
+            "name": "plannaplan.apisecret",
+            "type": "java.lang.String",
+            "description": "Api consumer secret"
+        }
+    ]
+}

buisnesslogic/src/main/java/com/plannaplan/api/UsosOauth1Service.java

@@ -0,0 +1,61 @@
+package com.plannaplan.api;
+
+import com.github.scribejava.core.builder.api.DefaultApi10a;
+
+/**
+ * singleton class to sign usos api requests with oauth
+ */
+public class UsosOauth1Service extends DefaultApi10a {
+
+    private static final String AUTHORIZE_URL = "https://usosapidemo.amu.edu.pl/services/oauth/authorize";
+    private static final String REQUEST_TOKEN_URL = "https://usosapidemo.amu.edu.pl/services/oauth/request_token";
+
+    private final String scopesAsString;
+
+    protected UsosOauth1Service() {
+        scopesAsString = null;
+    }
+
+    protected UsosOauth1Service(String... scopes) {
+        final StringBuilder builder = new StringBuilder();
+        for (String scope : scopes) {
+            builder.append('+').append(scope);
+        }
+        scopesAsString = "?scope=" + builder.substring(1);
+    }
+
+    private static class InstanceHolder {
+
+        private static final UsosOauth1Service INSTANCE = new UsosOauth1Service();
+    }
+
+    public static UsosOauth1Service instance() {
+        return InstanceHolder.INSTANCE;
+    }
+
+    /**
+     * get instance withj scopes
+     * 
+     * @param scopes to get instance with
+     * @return UsosOauth1Service instance
+     */
+    public static UsosOauth1Service instance(String... scopes) {
+        return scopes == null || scopes.length == 0 ? instance() : new UsosOauth1Service(scopes);
+    }
+
+    @Override
+    public String getRequestTokenEndpoint() {
+        return scopesAsString == null ? REQUEST_TOKEN_URL : REQUEST_TOKEN_URL + scopesAsString;
+    }
+
+    @Override
+    public String getAccessTokenEndpoint() {
+        return "https://usosapidemo.amu.edu.pl/services/oauth/access_token";
+    }
+
+    @Override
+    protected String getAuthorizationBaseUrl() {
+        return AUTHORIZE_URL;
+    }
+
+}

buisnesslogic/src/main/java/com/plannaplan/api/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * Provides the classes necessary to obtain usos authentication with Oauth1
+ *
+ * @since 1.0
+ */
+package com.plannaplan.api;

buisnesslogic/src/main/java/com/plannaplan/configutils/FileReader.java

@@ -12,16 +12,29 @@ import org.apache.poi.ss.usermodel.Row;
 import com.plannaplan.models.FileData;
 
 /**
- *  FileReader is used for reading xls file from input stream.
+ * FileReader is used for reading xls file from input stream.
  */
 public class FileReader {
 
     private InputStream fileInputStream;
 
+    /**
+     * @param fileInputStream stream of stadarized file contains courses and gropups
+     *                        to import. File needs to be .xlsx file that has
+     *                        fields: zaj_cyk_id, typ, sym, nazwa, gr_nr, Mc, dzien,
+     *                        godz_od, sala, tytul, nazwisko, imie. Order doesn't
+     *                        have impact on import. Any change name of given field
+     *                        can be performed in FileToDatabaseMigrator class
+     */
     public FileReader(InputStream fileInputStream) {
         this.fileInputStream = fileInputStream;
     }
 
+    /**
+     * read data rom file
+     * 
+     * @return instance of class FileData
+     */
     public FileData read() {
 
         FileData result = null;

buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java

@@ -8,6 +8,7 @@ import com.plannaplan.models.FileData;
 import com.plannaplan.services.CourseService;
 import com.plannaplan.services.GroupService;
 import com.plannaplan.services.LecturerService;
+import com.plannaplan.types.GroupType;
 import com.plannaplan.types.WeekDay;
 
 import org.apache.poi.ss.usermodel.Row;
@@ -15,81 +16,119 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- *  FileToDatabaseMigrator is used for migrate data from file (it reads line by line) and push it into database
+ * FileToDatabaseMigrator is used for migrate data from file (it reads line by
+ * line) and push it into database
  */
 @Component
 public class FileToDatabaseMigrator {
 
-    private static final String LECTURER_NAME_STRING = "imie";
-    private static final String LECTURER_SURNAME_STRING = "nazwisko";
-    private static final String LECTURER_TITLE_STRING = "tytul";
+        private static final String LECTURER_NAME_STRING = "imie";
+        private static final String LECTURER_SURNAME_STRING = "nazwisko";
+        private static final String LECTURER_TITLE_STRING = "tytul";
 
-    private static final String COURSE_SYMBOL_STRING = "sym";
-    private static final String COURSE_NAME_STRING = "nazwa";
+        private static final String COURSE_SYMBOL_STRING = "sym";
+        private static final String COURSE_NAME_STRING = "nazwa";
 
-    private static final String groupDay_STRING = "dzien";
-    private static final String GROUP_TIME_STRING = "godz_od";
-    private static final String ROOM_STRING = "sala";
-    private static final String CAPACITY_STRING = "Mc";
+        private static final String groupDay_STRING = "dzien";
+        private static final String GROUP_TIME_STRING = "godz_od";
+        private static final String ROOM_STRING = "sala";
+        private static final String CAPACITY_STRING = "Mc";
+        private static final String TYPE_GROUP = "typ";
 
-    @Autowired
-    private LecturerService lecturerService;
-    @Autowired
-    private CourseService courseService;
-    @Autowired
-    private GroupService groupService;
+        private static final String ZAJ_CYK_ID = "zaj_cyk_id";
+        private static final String GR_NR = "gr_nr";
 
-    public FileToDatabaseMigrator() {
-    }
+        @Autowired
+        private LecturerService lecturerService;
+        @Autowired
+        private CourseService courseService;
+        @Autowired
+        private GroupService groupService;
 
-    public void migrate(FileData data) {
-        Iterator<Row> rows = data.getRows();
-        int courseNameIndex = data.getIndexOf(FileToDatabaseMigrator.COURSE_NAME_STRING);
-        int symbolIndex = data.getIndexOf(FileToDatabaseMigrator.COURSE_SYMBOL_STRING);
+        public FileToDatabaseMigrator() {
+        }
 
-        int titleIndex = data.getIndexOf(FileToDatabaseMigrator.LECTURER_TITLE_STRING);
-        int surnameIndex = data.getIndexOf(FileToDatabaseMigrator.LECTURER_SURNAME_STRING);
-        int nameIndex = data.getIndexOf(FileToDatabaseMigrator.LECTURER_NAME_STRING);
+        /**
+         * insert data to database
+         * 
+         * @param data FileData imported from file
+         */
+        public void migrate(FileData data) {
+                Iterator<Row> rows = data.getRows();
+                int courseNameIndex = data.getIndexOf(FileToDatabaseMigrator.COURSE_NAME_STRING);
+                int symbolIndex = data.getIndexOf(FileToDatabaseMigrator.COURSE_SYMBOL_STRING);
 
-        int dayIndex = data.getIndexOf(FileToDatabaseMigrator.groupDay_STRING);
-        int timeIndex = data.getIndexOf(FileToDatabaseMigrator.GROUP_TIME_STRING);
-        int roomIndex = data.getIndexOf(FileToDatabaseMigrator.ROOM_STRING);
-        int capacityIndex = data.getIndexOf(FileToDatabaseMigrator.CAPACITY_STRING);
+                int titleIndex = data.getIndexOf(FileToDatabaseMigrator.LECTURER_TITLE_STRING);
+                int surnameIndex = data.getIndexOf(FileToDatabaseMigrator.LECTURER_SURNAME_STRING);
+                int nameIndex = data.getIndexOf(FileToDatabaseMigrator.LECTURER_NAME_STRING);
 
-        while (rows.hasNext()) {
-            Row row = rows.next();
+                int dayIndex = data.getIndexOf(FileToDatabaseMigrator.groupDay_STRING);
+                int timeIndex = data.getIndexOf(FileToDatabaseMigrator.GROUP_TIME_STRING);
+                int roomIndex = data.getIndexOf(FileToDatabaseMigrator.ROOM_STRING);
+                int capacityIndex = data.getIndexOf(FileToDatabaseMigrator.CAPACITY_STRING);
+                int typeGroupIndex = data.getIndexOf(FileToDatabaseMigrator.TYPE_GROUP);
 
-            String courseName = row.getCell(courseNameIndex).toString().trim();
-            String symbol = row.getCell(symbolIndex).toString().trim();
+                int zajCykIdIndex = data.getIndexOf(FileToDatabaseMigrator.ZAJ_CYK_ID);
+                int grNrIndex = data.getIndexOf(FileToDatabaseMigrator.GR_NR);
 
-            String lecturerTitle = row.getCell(titleIndex) != null ? row.getCell(titleIndex).toString().trim() : "";
-            String lecturerName = row.getCell(nameIndex) != null ? row.getCell(nameIndex).toString().trim() : "";
-            String lecturerSurname = row.getCell(surnameIndex) != null ? row.getCell(surnameIndex).toString().trim()
-                    : "";
+                while (rows.hasNext()) {
+                        Row row = rows.next();
 
-            int day = (int) Double.parseDouble(row.getCell(dayIndex).toString());
-            WeekDay groupDay = WeekDay.getDay(day - 1);
-            int time = parseTimeToInt(row.getCell(timeIndex).toString());
-            String room = row.getCell(roomIndex).toString().trim();
-            int capacity = (int) Double.parseDouble(row.getCell(capacityIndex).toString());
+                        String courseName = row.getCell(courseNameIndex).toString().trim();
+                        String symbol = row.getCell(symbolIndex).toString().trim();
 
-            Course course = this.courseService.getCourseByName(courseName)
-                    .orElseGet(() -> this.courseService.save(new Course(courseName, symbol)));
+                        String lecturerTitle = row.getCell(titleIndex) != null
+                                        ? row.getCell(titleIndex).toString().trim()
+                                        : "";
+                        String lecturerName = row.getCell(nameIndex) != null ? row.getCell(nameIndex).toString().trim()
+                                        : "";
+                        String lecturerSurname = row.getCell(surnameIndex) != null
+                                        ? row.getCell(surnameIndex).toString().trim()
+                                        : "";
 
-            Lecturer lecturer = this.lecturerService.getLecturer(lecturerTitle, lecturerName, lecturerSurname)
-                    .orElseGet(() -> this.lecturerService
-                            .save(new Lecturer(lecturerTitle, lecturerName, lecturerSurname)));
+                        Integer zajCykId = row.getCell(zajCykIdIndex) != null
+                                        ? (int) Double.parseDouble(row.getCell(zajCykIdIndex).toString().trim())
+                                        : null;
 
-            this.groupService.find(time, capacity, room).orElseGet(
-                    () -> this.groupService.save(new Groups(capacity, room, course, time, groupDay, lecturer)));
+                        Integer grNr = row.getCell(grNrIndex) != null
+                                        ? (int) Double.parseDouble(row.getCell(grNrIndex).toString().trim())
+                                        : null;
+
+                        int day = row.getCell(dayIndex) != null
+                                        ? (int) Double.parseDouble(row.getCell(dayIndex).toString())
+                                        : 0;
+                        WeekDay groupDay = WeekDay.getDay(day - 1);
+                        int time = parseTimeToInt(row.getCell(timeIndex).toString());
+                        String room = row.getCell(roomIndex).toString().trim();
+                        int capacity = (int) Double.parseDouble(row.getCell(capacityIndex).toString());
+                        GroupType typeGroup = GroupType.getType(row.getCell(typeGroupIndex).toString());
+
+                        Course course = this.courseService.getCourseByName(courseName)
+                                        .orElseGet(() -> this.courseService.save(new Course(courseName, symbol)));
+
+                        Lecturer lecturer = this.lecturerService
+                                        .getLecturer(lecturerTitle, lecturerName, lecturerSurname)
+                                        .orElseGet(() -> this.lecturerService.save(
+                                                        new Lecturer(lecturerTitle, lecturerName, lecturerSurname)));
+
+                        Groups group = this.groupService.find(zajCykId, grNr).orElseGet(() -> new Groups(capacity, room,
+                                        course, time, groupDay, lecturer, zajCykId, grNr, typeGroup));
+                        group.update(capacity, room, course, time, null, groupDay, lecturer, typeGroup);
+
+                        this.groupService.save(group);
+
+                }
 
         }
 
-    }
+        /**
+         * 
+         * @param time time string in formaT hh:mm or hh.mm
+         * @return int time witch is minutes from 00:00
+         */
+        private static int parseTimeToInt(String time) {
+                String times[] = time.split("\\.|\\:");
+                return times.length == 2 ? Integer.parseInt(times[0]) * 60 + Integer.parseInt(times[1]) : 0;
 
-    private static int parseTimeToInt(String time) {
-        String times[] = time.split("\\.|\\:");
-        return times.length == 2 ? Integer.parseInt(times[0]) * 60 + Integer.parseInt(times[1]) : 0;
-
-    }
+        }
 }

buisnesslogic/src/main/java/com/plannaplan/configutils/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * Provides the classes necessary to to config and import related operations in
+ * the app
+ *
+ * @since 1.0
+ */
+package com.plannaplan.configutils;

buisnesslogic/src/main/java/com/plannaplan/entities/AppConfig.java

@@ -0,0 +1,171 @@
+package com.plannaplan.entities;
+
+import java.sql.Date;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.util.TimeZone;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import com.plannaplan.models.TourData;
+import com.plannaplan.types.AppState;
+
+import org.springframework.scheduling.support.CronTrigger;
+
+/**
+ * entity that keeps app configurations
+ */
+@Entity
+public class AppConfig {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    private Date firstTourStart;
+    private Date firstTourEnd;
+    private Date secondTourStart;
+    private Date secondTourEnd;
+    private Timestamp configDate;
+
+    /**
+     * no parameter construcotor
+     */
+    public AppConfig() {
+    }
+
+    /**
+     * constructor
+     * 
+     * @param firstTour first TourData instacne
+     * @param scondTour second TourData instacne
+     */
+    public AppConfig(TourData firstTour, TourData scondTour) {
+        this.firstTourStart = firstTour.getStart();
+        this.firstTourEnd = firstTour.getEnd();
+        this.secondTourStart = scondTour.getStart();
+        this.secondTourEnd = scondTour.getEnd();
+        this.configDate = new Timestamp(System.currentTimeMillis());
+    }
+
+    /**
+     * 
+     * second tour end getter
+     * 
+     * @return Date inforamtion when second tour ends
+     */
+    public Date getSecondTourEnd() {
+        return secondTourEnd;
+    }
+
+    /**
+     * first second start getter
+     * 
+     * @return Date inforamtion when second tour start
+     */
+    public Date getSecondTourStart() {
+        return secondTourStart;
+    }
+
+    /**
+     * first tour end getter
+     * 
+     * @return Date inforamtion when first tour end
+     */
+    public Date getFirstTourEnd() {
+        return firstTourEnd;
+    }
+
+    /**
+     * first tour start getter
+     * 
+     * @return Date inforamtion when first tour start
+     */
+    public Date getFirstTourStart() {
+        return firstTourStart;
+    }
+
+    /**
+     * config date getter
+     * 
+     * @return Timestamp when configuration took place
+     */
+    public Timestamp getConfigDate() {
+        return configDate;
+    }
+
+    /**
+     * current state getter
+     * 
+     * @return AppState of app at the moment of calling method
+     */
+    public AppState getCurrentState() {
+        final Date now = new Date(System.currentTimeMillis());
+        if (this.secondTourEnd.before(now)) {
+            return AppState.NO_TOUR;
+        }
+        if (this.secondTourStart.before(now)) {
+            return AppState.SECOND_TOUR;
+        }
+        if (this.firstTourEnd.before(now)) {
+            return AppState.NO_TOUR;
+        }
+        if (this.firstTourStart.before(now)) {
+            return AppState.FIRST_TOUR;
+        }
+
+        return AppState.NO_TOUR;
+    }
+
+    /**
+     * get cron expression of first tour end
+     * 
+     * @return spring cron expression
+     */
+    public CronTrigger getFirstTourEndCron() {
+        return getCron(this.firstTourEnd);
+    }
+
+    /**
+     * get cron expression of second tour end
+     * 
+     * @return spring cron expression
+     */
+    public CronTrigger getSecondTourEndCron() {
+        return getCron(this.secondTourEnd);
+    }
+
+    /**
+     * get cron expression of first tour start
+     * 
+     * @return spring cron expression
+     */
+    public CronTrigger getFirstTourStartCron() {
+        return getCron(this.firstTourStart);
+    }
+
+    /**
+     * get cron expression of second tour start
+     * 
+     * @return spring cron expression
+     */
+    public CronTrigger getSecondTourStartCron() {
+        return getCron(this.secondTourStart);
+    }
+
+    /**
+     * create spring cron expression
+     * 
+     * @param date date to create cron exp from
+     * @return spring cron expression. Remember that spring's cron deosn't contain
+     *         year in it.
+     */
+    private CronTrigger getCron(Date date) {
+        final LocalDate tourEnd = date.toLocalDate();
+        return new CronTrigger("0 0 0 " + tourEnd.getDayOfMonth() + " " + tourEnd.getMonthValue() + " ?",
+                TimeZone.getTimeZone(TimeZone.getDefault().getID()));
+    }
+
+}

buisnesslogic/src/main/java/com/plannaplan/entities/Assignment.java

@@ -8,8 +8,9 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
 /**
- *  Entity of Assignment grouping of state associated about group_id and commision_id
- * 
+ * Entity of Assignment grouping of state associated about group_id and
+ * commision_id
+ *
  */
 
 @Entity
@@ -24,11 +25,12 @@ public class Assignment {
     @JoinColumn(name = "commision_id")
     private Commision commision;
     private boolean isPastAssignment;
- 
+
     /**
      * Assignment
-     * @param group group we would like to assign
-     * @param commision commision that assignment belongs to
+     *
+     * @param group            group we would like to assign
+     * @param commision        commision that assignment belongs to
      * @param isPastAssignment is assignment past or no
      */
     public Assignment(Groups group, Commision commision, boolean isPastAssignment) {
@@ -36,9 +38,37 @@ public class Assignment {
         this.group = group;
     }
 
+    /**
+     * 
+     * @param oldAssignment old assignment that we want to move to new commision
+     * @param newCommision  commsion to move assiongment
+     */
+    public static Assignment getNewFromAssignment(Assignment oldAssignment, Commision newCommision) {
+        return new Assignment(oldAssignment.getGroup(), newCommision);
+    }
+
+    /**
+     * If it returns trues it mesans u are assigned to group accepted by algorythm
+     *
+     * @return boolean isAccepted
+     */
+    public boolean isAccepted() {
+        return this.group.getRegisteredStudents().contains(this.commision.getCommisionOwner());
+    }
+
+    /**
+     * Getter of commision
+     * 
+     * @return Commision Commision of given assignments
+     */
+    public Commision getCommision() {
+        return this.commision;
+    }
+
     /**
      * Assignment
-     * @param group group we would like to assign
+     *
+     * @param group     group we would like to assign
      * @param commision commision that assignment belongs to
      */
     public Assignment(Groups group, Commision commision) {
@@ -49,8 +79,16 @@ public class Assignment {
     }
 
     /**
-     *  Id getter
-     *  @return id id of assignment
+     * @param commision commision to set
+     */
+    public void setCommision(Commision commision) {
+        this.commision = commision;
+    }
+
+    /**
+     * Id getter
+     *
+     * @return id id of assignment
      */
 
     public Long getId() {
@@ -58,9 +96,9 @@ public class Assignment {
     }
 
     /**
-     *  getGroup 
-     * 
-     *  @return group
+     * getGroup
+     *
+     * @return group
      */
     public Groups getGroup() {
         return this.group;
@@ -68,6 +106,7 @@ public class Assignment {
 
     /**
      * isPastAssignment getter
+     *
      * @return isPastAssignment
      */
     public boolean isPastAssignment() {
@@ -76,9 +115,10 @@ public class Assignment {
 
     /**
      * setter isPastAssignment
-     * @param isPastAssignment
+     *
+     * @param isPastAssignment is assignment past or not
      */
     public void setPastAssignment(boolean isPastAssignment) {
         this.isPastAssignment = isPastAssignment;
     }
-}
+}

buisnesslogic/src/main/java/com/plannaplan/entities/Commision.java

@@ -13,7 +13,7 @@ import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 
 /**
- *  Entity of Commision grouping of state associated about commison and owner_id
+ * Entity of Commision grouping of state associated about commison and owner_id
  */
 
 @Entity
@@ -24,6 +24,9 @@ public class Commision {
     @OneToOne
     @JoinColumn(name = "owner_id")
     private User commisionOwner;
+    @OneToOne
+    @JoinColumn(name = "commiter_id")
+    private User commisionCommiter;
     private Timestamp commisionDate;
 
     @OneToMany(mappedBy = "commision", fetch = FetchType.EAGER)
@@ -37,37 +40,62 @@ public class Commision {
     public Commision(User user) {
         this.commisionDate = new Timestamp(System.currentTimeMillis());
         this.commisionOwner = user;
+        this.commisionCommiter = user;
+    }
+
+    /**
+     * 
+     * @param user     user whose shedule is being commited
+     * @param commiter user that commited new schedule
+     */
+    public Commision(User user, User commiter) {
+        this(user);
+        this.commisionCommiter = commiter;
     }
 
     public Commision() {
     }
 
     /**
-     *  Id getter 
-     *  @return id id of commision
+     * Id getter
+     * 
+     * @return id id of commision
      */
     public Long getId() {
         return this.id;
     }
 
     /**
-     *  CommisionDate getter
-     *  @return commisionDate 
+     * CommisionDate getter
+     * 
+     * @return commisionDate
      */
     public Timestamp getCommisionDate() {
         return commisionDate;
     }
 
     /**
-     *  User of given commision getter
-     *  @return User commisionOwner
+     * User of given commision getter
+     * 
+     * @return User commisionOwner
      */
     public User getCommisionOwner() {
         return commisionOwner;
     }
 
+    /**
+     * @return User entity that created commision (can be owner or deanery user)
+     */
+    public User getCommisionCommiter() {
+        if (commisionCommiter == null) {
+            return commisionOwner;
+        }
+        return commisionCommiter;
+    }
+
     /**
      * Assigments getter
+     * 
      * @return List of assignments
      */
     public List<Assignment> getAssignments() {

buisnesslogic/src/main/java/com/plannaplan/entities/Exchange.java

@@ -0,0 +1,102 @@
+package com.plannaplan.entities;
+
+import java.sql.Timestamp;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+
+/**
+ * Entity that keeps user exchange offer.
+ */
+@Entity
+public class Exchange {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @OneToOne
+    @JoinColumn(name = "owned_id")
+    private Assignment ownedAssignment;
+
+    @OneToOne
+    @JoinColumn(name = "desired_id")
+    private Groups desiredAssignment;
+
+    private Long ownerId;
+
+    private Timestamp dateExchange;
+
+    public Exchange(){
+
+    }
+
+    /**
+     * @return Long ID of exchange trader
+     */
+    public Long getOwnerId() {
+        return ownerId;
+    }
+
+    /**
+     * @param ownerId ID of exchange trader
+     */
+    public void setOwnerId(Long ownerId) {
+        this.ownerId = ownerId;
+    }
+
+    public Timestamp getDataExchange() {
+	return this.dateExchange;
+    }
+
+    /**
+     *
+     * @param ownedAssignment  Assignment which owner would like to trade
+     * @param desiredAssignment Groups instance that trader wants
+     */
+    public Exchange(Assignment ownedAssignment, Groups desiredAssignment) {
+        this.ownedAssignment = ownedAssignment;
+        this.desiredAssignment = desiredAssignment;
+	this.ownerId = this.ownedAssignment != null ? this.ownedAssignment.getCommision().getCommisionOwner().getId() : null;
+	this.dateExchange = new Timestamp(System.currentTimeMillis());
+    }
+
+    /**
+     * @return Long ID in database
+     */
+    public Long getId(){
+        return this.id;
+    }
+
+    /**
+     * @return Groups Target group
+     */
+    public Groups getDesiredAssignment() {
+        return desiredAssignment;
+    }
+
+    /**
+     * @param desiredAssignment Target group
+     */
+    public void setDesiredAssignment(Groups desiredAssignment) {
+        this.desiredAssignment = desiredAssignment;
+    }
+
+    /**
+     * @return Assignment Owned assignment
+     */
+    public Assignment getOwnedAssignment() {
+        return ownedAssignment;
+    }
+
+    /**
+     * @param ownedAssignment Owned assignment
+     */
+    public void setOwnedAssignment(Assignment ownedAssignment) {
+        this.ownedAssignment = ownedAssignment;
+    }
+}

buisnesslogic/src/main/java/com/plannaplan/entities/Groups.java

@@ -1,21 +1,29 @@
 package com.plannaplan.entities;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 
 import com.plannaplan.types.GroupType;
 import com.plannaplan.types.WeekDay;
 
 /**
- *  Entity of Groups grouping of state ssociated about course,time,room,capacity,type,day
+ * Entity of Groups grouping of state ssociated about
+ * course,time,room,capacity,type,day
  */
 
 @Entity
 public class Groups {
+    private static final int DEFAULT_CLASS_TIME = 90;
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
@@ -23,6 +31,7 @@ public class Groups {
     @JoinColumn(name = "course_id")
     private Course course;
     private int time;
+    private int endTime;
     private String room;
     private int capacity;
     private GroupType type;
@@ -30,32 +39,214 @@ public class Groups {
     @ManyToOne
     @JoinColumn(name = "lecturer_id")
     private Lecturer lecturer;
+    private Integer zajCykId;
+    private Integer grNr;
+    @ManyToMany(mappedBy = "studentRegisteredGrups", fetch = FetchType.EAGER)
+    private Set<User> registeredStudents;
+
+    public Set<User> getRegisteredStudents() {
+        return this.registeredStudents;
+    }
+
+    public void assignUser(User user) {
+        if (this.registeredStudents == null) {
+            this.registeredStudents = new HashSet<>();
+        }
+        this.registeredStudents.add(user);
+    }
 
     public Groups() {
     }
 
+    public Integer getGrNr() {
+        return grNr;
+    }
+
+    public void setGrNr(Integer grNr) {
+        this.grNr = grNr;
+    }
+
+    public Integer getZajCykId() {
+        return zajCykId;
+    }
+
+    public void setZajCykId(Integer zajCykId) {
+        this.zajCykId = zajCykId;
+    }
+
     /**
      * Groups
      * 
      * @param capacity capacity given to the groups
-     * @param room room given to the groups
-     * @param course course given to the groups
-     * @param time time given to the groups
-     * @param day day given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param endTime  end time of class in minutes
+     * @param day      day given to the groups
      * @param lecturer lecturer given to the groups
      */
-    public Groups(int capacity, String room, Course course, int time, WeekDay day, Lecturer lecturer) {
+    public Groups(int capacity, String room, Course course, int time, int endTime, WeekDay day, Lecturer lecturer) {
         this.capacity = capacity;
         this.room = room;
         this.course = course;
         this.time = time;
+        this.endTime = endTime;
         this.day = day;
         this.lecturer = lecturer;
         this.type = capacity >= 50 ? GroupType.LECTURE : GroupType.CLASS;
     }
 
+    /**
+     * Groups
+     * 
+     * @param capacity capacity given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param endTime  end time of class in minutes
+     * @param day      day given to the groups
+     * @param lecturer lecturer given to the groups
+     * @param zajCykId number of class in the term
+     * @param grNr     Number of class/course
+     * @param type     type of class/cource
+     */
+    public Groups(int capacity, String room, Course course, int time, int endTime, WeekDay day, Lecturer lecturer,
+            Integer zajCykId, Integer grNr, GroupType type) {
+        this(capacity, room, course, time, endTime, day, lecturer, zajCykId, grNr);
+        this.type = type;
+    }
+
+    /**
+     * Groups
+     * 
+     * @param capacity capacity given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param day      day given to the groups
+     * @param lecturer lecturer given to the groups
+     * @param zajCykId number of class in the term
+     * @param grNr     Number of class/course
+     * @param type     type of class/cource
+     */
+    public Groups(int capacity, String room, Course course, int time, WeekDay day, Lecturer lecturer,
+            Integer zajCykId, Integer grNr, GroupType type) {
+        this(capacity, room, course, time, time + DEFAULT_CLASS_TIME, day, lecturer, zajCykId, grNr);
+        this.type = type;
+    }
+
+    /**
+     * Groups
+     * 
+     * @param capacity capacity given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param endTime  end time of class in minutes
+     * @param day      day given to the groups
+     * @param lecturer lecturer given to the groups
+     * @param zajCykId number of class in the term
+     * @param grNr     Number of class/course
+     */
+    public Groups(int capacity, String room, Course course, int time, int endTime, WeekDay day, Lecturer lecturer,
+            Integer zajCykId, Integer grNr) {
+        this(capacity, room, course, time, endTime, day, lecturer);
+        this.zajCykId = zajCykId;
+        this.grNr = grNr;
+    }
+
+    /**
+     * Groups
+     * 
+     * @param capacity capacity given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param day      day given to the groups
+     * @param lecturer lecturer given to the groups
+     * @param zajCykId number of class in the term
+     * @param grNr     Number of class/course
+     */
+    public Groups(int capacity, String room, Course course, int time, WeekDay day, Lecturer lecturer, Integer zajCykId,
+            Integer grNr) {
+        this(capacity, room, course, time, time + DEFAULT_CLASS_TIME, day, lecturer);
+        this.zajCykId = zajCykId;
+        this.grNr = grNr;
+    }
+
+    /**
+     * Create groups with default class duration
+     * 
+     * @param capacity capacity given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param day      day given to the groups
+     * @param lecturer lecturer given to the groups
+     */
+    public Groups(int capacity, String room, Course course, int time, WeekDay day, Lecturer lecturer) {
+        this(capacity, room, course, time, time + DEFAULT_CLASS_TIME, day, lecturer);
+    }
+
+    /**
+     * Updates given values other that are not null
+     * 
+     * @param capacity capacity given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param endTime  end time of class in minutes
+     * @param day      day given to the groups
+     * @param lecturer lecturer given to the groups
+     * @param type     type given to the groups
+     */
+    public void update(Integer capacity, String room, Course course, Integer time, Integer endTime, WeekDay day,
+            Lecturer lecturer, GroupType type) {
+        if (capacity != null) {
+            this.capacity = capacity;
+        }
+
+        if (room != null) {
+            this.room = room;
+        }
+
+        if (course != null) {
+            this.course = course;
+        }
+
+        if (time != null) {
+            this.time = time;
+        }
+
+        if (endTime != null) {
+            this.endTime = endTime;
+        }
+
+        if (day != null) {
+            this.day = day;
+        }
+
+        if (lecturer != null) {
+            this.lecturer = lecturer;
+        }
+
+        if (type != null) {
+            this.type = type;
+        }
+    }
+
+    /**
+     * get time of class end
+     * 
+     * @return hour of class finish time in minutes
+     */
+    public int getEndTime() {
+        return endTime;
+    }
+
     /**
      * getId
+     * 
      * @return id
      */
     public Long getId() {
@@ -64,6 +255,7 @@ public class Groups {
 
     /**
      * getLecturer
+     * 
      * @return lecturer
      */
     public Lecturer getLecturer() {
@@ -72,6 +264,7 @@ public class Groups {
 
     /**
      * setLecturer
+     * 
      * @param lecturer set lecturer into groups
      */
     public void setLecturer(Lecturer lecturer) {
@@ -80,6 +273,7 @@ public class Groups {
 
     /**
      * WeekDay
+     * 
      * @return day
      */
     public WeekDay getDay() {
@@ -88,6 +282,7 @@ public class Groups {
 
     /**
      * setLecturer
+     * 
      * @param day set day into groups
      */
     public void setDay(WeekDay day) {
@@ -96,6 +291,7 @@ public class Groups {
 
     /**
      * GroupType
+     * 
      * @return type
      */
     public GroupType getType() {
@@ -104,6 +300,7 @@ public class Groups {
 
     /**
      * setType
+     * 
      * @param type set type into groups
      */
     public void setType(GroupType type) {
@@ -112,6 +309,7 @@ public class Groups {
 
     /**
      * getCapacity
+     * 
      * @return capacity
      */
     public int getCapacity() {
@@ -120,6 +318,7 @@ public class Groups {
 
     /**
      * setCapacity
+     * 
      * @param capacity set capacity into groups
      */
     public void setCapacity(int capacity) {
@@ -128,6 +327,7 @@ public class Groups {
 
     /**
      * getRoom
+     * 
      * @return room
      */
     public String getRoom() {
@@ -136,6 +336,7 @@ public class Groups {
 
     /**
      * setRoom
+     * 
      * @param room set room into groups
      */
     public void setRoom(String room) {
@@ -144,6 +345,7 @@ public class Groups {
 
     /**
      * getTime
+     * 
      * @return time
      */
     public int getTime() {
@@ -152,6 +354,7 @@ public class Groups {
 
     /**
      * setTime
+     * 
      * @param time set time into groups
      */
     public void setTime(int time) {
@@ -160,6 +363,7 @@ public class Groups {
 
     /**
      * getCourseId
+     * 
      * @return course
      */
     public Course getCourseId() {
@@ -168,6 +372,7 @@ public class Groups {
 
     /**
      * setCourseId
+     * 
      * @param courseId set courseId into groups
      */
     public void setCourseId(Course courseId) {
@@ -176,6 +381,7 @@ public class Groups {
 
     /**
      * getTimeString
+     * 
      * @return time as formated String
      */
     public String getTimeString() {
@@ -187,4 +393,19 @@ public class Groups {
         }
         return String.format("%s.%s", hoursString, minutesString);
     }
+
+    /**
+     * gets end time formated strins
+     * 
+     * @return end time as formated String
+     */
+    public String getEndTimeString() {
+        int minutes = this.getEndTime() % 60;
+        String hoursString = Integer.toString(this.getEndTime() / 60);
+        String minutesString = Integer.toString(minutes);
+        if (minutes < 10) {
+            minutesString = "0" + minutesString;
+        }
+        return String.format("%s.%s", hoursString, minutesString);
+    }
 }

buisnesslogic/src/main/java/com/plannaplan/entities/User.java

@@ -1,17 +1,26 @@
 package com.plannaplan.entities;
 
 import java.sql.Timestamp;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
 
+import com.plannaplan.models.UserApiResponse;
 import com.plannaplan.types.UserRoles;
 
 /**
- *  Entity of User grouping of state ssociated about id,name,surname,email,role,token,tokenCreatedDate
+ * Entity of User grouping of state ssociated about
+ * id,name,surname,email,role,token,tokenCreatedDate
  */
 
 @Entity
@@ -27,19 +36,39 @@ public class User {
     private String usosId;
     private UserRoles role;
     private String token;
+    private String refreshToken;
     private Timestamp tokenUsageDate;
-    
+    private Integer ranking;
+    @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinTable
+    private Set<Groups> studentRegisteredGrups;
+
+    public Set<Groups> getStudentRegisteredGrups() {
+        return this.studentRegisteredGrups;
+    }
+
+    public void removeGroup(Long id) {
+        final Groups groupToDelete = this.studentRegisteredGrups.stream().filter(e -> e.getId().equals(id)).findFirst()
+                .get();
+        this.studentRegisteredGrups.remove(groupToDelete);
+    }
+
+    public void claimGroup(Groups group) {
+        if (this.studentRegisteredGrups == null) {
+            this.studentRegisteredGrups = new HashSet<>();
+        }
+        this.studentRegisteredGrups.add(group);
+    }
 
     public User() {
     }
 
-    /*
-     * User
+    /**
      *
-     * @param name name given to the user
+     * @param name    name given to the user
      * @param surname surname given to the user
-     * @param email mail given to the user
-     * @param role role given to the user
+     * @param mail    mail given to the user
+     * @param role    user's role
      */
     public User(String name, String surname, String mail, UserRoles role) {
         this.name = name;
@@ -48,136 +77,199 @@ public class User {
         this.role = role;
     }
 
-    /*
-     * User
+    /**
      *
-     * @param name name given to the user
+     * @param name    name given to the user
      * @param surname surname given to the user
-     * @param email mail given to the user
-     * @param usosId id in the USOS system
-     * @param role role given to the user
+     * @param mail    mail given to the user
+     * @param usosId  id in the USOS system
+     * @param role    user's role
      */
-    public User(String name, String surname, String mail, String usosId, UserRoles role){
-        this(name,surname,mail,role);
-        this.usosId = usosId;     
+    public User(String name, String surname, String mail, String usosId, UserRoles role) {
+        this(name, surname, mail, role);
+        this.usosId = usosId;
     }
 
-    /*
-     * getusosId
+    /**
      *
-     * @return usosId
+     * @param name    name given to the user
+     * @param surname surname given to the user
+     * @param mail    mail given to the user
+     * @param usosId  id in the USOS system
+     * @param role    user's role
+     * @param ranking ranking points [100;500]. It's calculated by
+     *                gradesAvg*100*studiesYear
+     */
+    public User(String name, String surname, String mail, String usosId, UserRoles role, Integer ranking) {
+        this(name, surname, mail, usosId, role);
+        this.ranking = ranking;
+    }
+
+    /**
+     * usos id getter
+     *
+     * @return usosid
      */
     public String getUsosId() {
         return usosId;
     }
 
-    /*
-     * getEmail
+    /**
+     * email getter
      *
-     * @return email
+     * @return mailof user
      */
     public String getEmail() {
         return email;
     }
 
-    /*
-     * setEmail
+    /**
+     * email setter
      *
-     * @param email set email to the user
+     * @param email user email
      */
     public void setEmail(String email) {
         this.email = email;
     }
 
-    /*
-     * getTokenUsageDate
+    /**
+     * token usage getter
      *
-     * @return tokenUsageDate
+     * @return Timestamp when token was used
      */
     public Timestamp getTokenUsageDate() {
         return tokenUsageDate;
     }
 
-    /*
-     * getToken
+    /**
+     * token getter
      *
-     * @return token
+     * @return user token
      */
     public String getToken() {
         return token;
     }
 
-    /*
-     * setToken
+    /**
+     * @return token needed to call refresh token after it expired
+     */
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    /**
+     * token seter. Sets token and automaticly set time when was set
      *
-     * @param token set token to the entity
+     * @param token token to set
      */
     public void setToken(String token) {
         this.tokenUsageDate = new Timestamp(System.currentTimeMillis());
         this.token = token;
+        this.refreshToken = this.refreshToken == null ? UUID.randomUUID().toString() : this.refreshToken;
     }
 
-    /* getName
+    /**
+     * name setter
      *
-     * @return name
+     * @return String user name
      */
     public String getName() {
         return name;
     }
 
-    /* getRole
+    /**
+     * user rolse getter
      *
-     * @return role
+     * @return UserRoles of user
      */
     public UserRoles getRole() {
         return role;
     }
 
-    /* setRole
+    /**
+     * user role setter
      *
-     * @param role set role to the entity
+     * @param role to be set
      */
     public void setRole(UserRoles role) {
         this.role = role;
     }
 
-    /*
-     * getSurname
-     * @return surname
+    /**
+     * surname getter
+     *
+     * @return string surname
      */
     public String getSurname() {
         return surname;
     }
 
-    /*
-     * setSurname
-     * @param surname set surname into entity user
+    /**
+     * surname setter
+     *
+     * @param surname string to be set as surnames
      */
     public void setSurname(String surname) {
         this.surname = surname;
     }
 
-    /*
-     * setName
-     * @param name set name into entity user
+    /**
+     * name stter
+     *
+     * @param name stirng to be set as name
      */
     public void setName(String name) {
         this.name = name;
     }
 
-    /*
-     * getId
-     * @return id
+    /**
+     * id getter
+     *
+     * @return id in database
      */
     public Long getId() {
         return this.id;
     }
 
-    /*
-     * isCredentialsNonExpired
-     * Returns TRUE if is Credentials Non Expired in the otherwise it returns false
+    /**
+     * Ranking points are [100;500]. It's calculated by gradesAvg*100*studiesYear
+     *
+     * @return ranking points [100;500]
      */
-     public boolean isCredentialsNonExpired() {
+    public Integer getRanking() {
+        if (ranking == null) {
+            return 100;
+        }
+        return ranking;
+    }
+
+    /**
+     * Ranking points setter. Ranking points are [100;500]. It's calculated by
+     * gradesAvg*100*studiesYear
+     *
+     * @param ranking ranking points [100;500]
+     */
+    public void setRanking(Integer ranking) {
+        this.ranking = ranking;
+    }
+
+    /**
+     * updates user entity with data got by UsosApiService::getUserData
+     *
+     * @param usosData UserApiResponse model with needed data
+     */
+    public void updateWithUsosData(UserApiResponse usosData) {
+        this.name = usosData.getName();
+        this.surname = usosData.getSurname();
+    }
+
+    /**
+     * it checks if given ammount of time passed since last token usage. If not
+     * retunr true and reset time otherwise return false and token won work anymore
+     *
+     * @return boolena if credentials (token) is expired or not
+     */
+    public boolean isCredentialsNonExpired() {
         final long diffInMilliseconds = Math
                 .abs(this.tokenUsageDate.getTime() - new Timestamp(System.currentTimeMillis()).getTime());
         final long minutes = TimeUnit.MILLISECONDS.toMinutes(diffInMilliseconds);

buisnesslogic/src/main/java/com/plannaplan/entities/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * Provides all entieites that are created in database by Hibernate
+ *
+ * @since 1.0
+ */
+package com.plannaplan.entities;

buisnesslogic/src/main/java/com/plannaplan/exceptions/TokenExpiredException.java

@@ -1,9 +1,9 @@
 package com.plannaplan.exceptions;
 
+/**
+ * Excepction to be thrown when provided token is expired
+ */
 public class TokenExpiredException extends RuntimeException {
-    /**
-     *
-     */
     private static final long serialVersionUID = 1L;
 
     public TokenExpiredException(String message) {

buisnesslogic/src/main/java/com/plannaplan/exceptions/UserNotFoundException.java

@@ -1,9 +1,9 @@
 package com.plannaplan.exceptions;
 
+/**
+ * Exception to be thrown when provided user does not exist in database
+ */
 public class UserNotFoundException extends Exception {
-    /**
-     *
-     */
     private static final long serialVersionUID = 1L;
 
     public UserNotFoundException(String message) {

buisnesslogic/src/main/java/com/plannaplan/exceptions/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * Provides custom for our app exceptions to get more accutrate errors info
+ *
+ * @since 1.0
+ */
+package com.plannaplan.exceptions;

buisnesslogic/src/main/java/com/plannaplan/models/ConfigData.java

@@ -1,51 +1,53 @@
 package com.plannaplan.models;
 
-import java.util.Date;
 import java.io.InputStream;
 
+/**
+ * Config data copntainer to keep tours dates and stream of dasta to import
+ */
 public class ConfigData {
-    private Date start;
-    private Date end;
+    private TourData firstTour;
+    private TourData secondTour;
     private InputStream filestream;
 
-    /*
-     * ConfigData
-     *
-     * @param start when the configdata begins
-     * @param end when the configdata ends
-     * @param filestream where the filestream is
+    /**
+     * constructor
+     * 
+     * @param firstTour  date of first tours
+     * @param secondTour date of second tours
+     * @param filestream filestram with data to import
      */
-    public ConfigData(Date start, Date end, InputStream filestream) {
-        this.start = start;
-        this.end = end;
+    public ConfigData(TourData firstTour, TourData secondTour, InputStream filestream) {
+        this.firstTour = firstTour;
+        this.secondTour = secondTour;
         this.filestream = filestream;
     }
 
-    /*
-     * getFilestream
-     *
-     * @return filestream
+    /**
+     * second tour getter
+     * 
+     * @return TourData second tour
+     */
+    public TourData getSecondTour() {
+        return secondTour;
+    }
+
+    /**
+     * first tour getter
+     * 
+     * @return TourData first tour
+     */
+    public TourData getFirstTour() {
+        return firstTour;
+    }
+
+    /**
+     * filestream getter
+     * 
+     * @return InputStream with data to import
      */
     public InputStream getFilestream() {
         return filestream;
     }
 
-    /*
-     * getEnd
-     *
-     * @return end
-     */
-    public Date getEnd() {
-        return end;
-    }
-
-    /*
-     * getStart
-     *
-     * @return start
-     */
-    public Date getStart() {
-        return start;
-    }
-
 }

buisnesslogic/src/main/java/com/plannaplan/models/EmailAcceptedData.java

@@ -0,0 +1,97 @@
+package com.plannaplan.models;
+
+import java.util.Iterator;
+import java.util.List;
+
+import com.plannaplan.entities.Groups;
+
+/**
+ * Instance to keep data to send in mail about accepted courses results
+ */
+public class EmailAcceptedData {
+    private List<Groups> accepted;
+    private List<Groups> removed;
+
+    public EmailAcceptedData() {
+
+    }
+
+    /**
+     * creates instance of class
+     * 
+     * @param accepted list of groups that user joined to
+     * @param removed  lsit of groups that user failed to join
+     */
+    public EmailAcceptedData(List<Groups> accepted, List<Groups> removed) {
+        this.accepted = accepted;
+        this.removed = removed;
+    }
+
+    /**
+     * get list of removed assignments
+     * 
+     * @return removed assingments
+     */
+    public List<Groups> getRemoved() {
+        return removed;
+    }
+
+    /**
+     * set list of removed assignments
+     * 
+     * @param removed list of removed assignments
+     */
+    public void setRemoved(List<Groups> removed) {
+        this.removed = removed;
+    }
+
+    /**
+     * get list of accepted assignments
+     * 
+     * @return accepted assingments
+     */
+    public List<Groups> getAccepted() {
+        return accepted;
+    }
+
+    /**
+     * set list of accepted assignments
+     * 
+     * @param accepted list of accepted assignments
+     */
+    public void setAccepted(List<Groups> accepted) {
+        this.accepted = accepted;
+    }
+
+    /**
+     * it creates and return email message body
+     * 
+     * @return string with emiale massage
+     */
+    public String getEmailMessage() {
+        String response = "Akceptacja Twoich przedmiotów właśnie dobiegła końca.\n\n";
+        if (this.accepted != null && this.accepted.size() > 0) {
+            response += "Zatwierdzone grupy: \n";
+            Iterator<Groups> iterator = accepted.iterator();
+            while (iterator.hasNext()) {
+                final Groups gorup = iterator.next();
+                final String courseName = gorup.getCourseId() != null ? gorup.getCourseId().getName()
+                        : "Nieznana grupa";
+                response += (" - " + courseName + " - " + gorup.getType() + "\n");
+            }
+
+        }
+        if (this.removed != null && this.removed.size() > 0) {
+            response += "Usunięte grupy: \n";
+            Iterator<Groups> iterator = removed.iterator();
+            while (iterator.hasNext()) {
+                final Groups gorup = iterator.next();
+                final String courseName = gorup.getCourseId() != null ? gorup.getCourseId().getName()
+                        : "Nieznana grupa";
+                response += (" - " + courseName + " - " + gorup.getType() + "\n");
+            }
+
+        }
+        return response;
+    }
+}

buisnesslogic/src/main/java/com/plannaplan/models/EmailExchangesData.java

@@ -0,0 +1,45 @@
+package com.plannaplan.models;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.plannaplan.entities.Exchange;
+import com.plannaplan.entities.User;
+
+/**
+ * Class to keepm data to be send after exchanges being accept
+ */
+public class EmailExchangesData {
+    private Map<Long, List<Exchange>> data;
+
+    public EmailExchangesData() {
+        this.data = new HashMap<>();
+    }
+
+    /**
+     * method to add user and his event to data to be send
+     * 
+     * @param user owner of exchange being performed
+     * @param data exchange that was executed
+     */
+    public void addExchange(User user, Exchange data) {
+        final Long id = user.getId();
+        if (this.data.get(id) == null) {
+            this.data.put(id, new ArrayList<>());
+        }
+        this.data.get(id).add(data);
+    }
+
+    /**
+     * get datas entry set
+     * 
+     * @return set with entries that contains Long that is user id and list of hiss
+     *         performed Exchanges
+     */
+    public Set<Map.Entry<Long, List<Exchange>>> getDataEntry() {
+        return this.data.entrySet();
+    }
+}

buisnesslogic/src/main/java/com/plannaplan/models/ExportData.java

@@ -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;
+    }
+
+}

buisnesslogic/src/main/java/com/plannaplan/models/FileData.java

@@ -4,6 +4,9 @@ import java.util.HashMap;
 import java.util.Iterator;
 import org.apache.poi.ss.usermodel.Row;
 
+/**
+ * Wrapper for data readed from file
+ */
 public class FileData {
 
     private HashMap<String, Integer> keys;
@@ -13,6 +16,7 @@ public class FileData {
      * FileData
      *
      * @param keys this is a hashmap of String and Integer
+     * 
      * @param rows this is a iterator of rows.
      */
     public FileData(HashMap<String, Integer> keys, Iterator<Row> rows) {
@@ -31,6 +35,7 @@ public class FileData {
 
     /*
      * setRows
+     * 
      * @param rows set the rows to given function
      */
     public void setRows(Iterator<Row> rows) {
@@ -39,6 +44,7 @@ public class FileData {
 
     /*
      * getKeys
+     * 
      * @return keys
      */
     public HashMap<String, Integer> getKeys() {
@@ -47,6 +53,7 @@ public class FileData {
 
     /*
      * setKeys
+     * 
      * @param keys set the key is being a struck of hashmap (String, Integer)
      */
     public void setKeys(HashMap<String, Integer> keys) {
@@ -55,6 +62,7 @@ public class FileData {
 
     /*
      * getIndexOf
+     * 
      * @return index
      */
     public int getIndexOf(String key) {

buisnesslogic/src/main/java/com/plannaplan/models/MatchData.java

@@ -0,0 +1,95 @@
+package com.plannaplan.models;
+
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Exchange;
+
+/**
+ * Match of users Exchange's to be performed
+ */
+public class MatchData {
+	private Exchange exchangeOne;
+	private Exchange exchangeTwo;
+
+	/**
+	 * create MatchData
+	 * 
+	 * @param exchangeOne first Exchange of found match
+	 * @param exchangeTwo second Exchange of found match
+	 */
+	public MatchData(Exchange exchangeOne, Exchange exchangeTwo) {
+		this.exchangeOne = exchangeOne;
+		this.exchangeTwo = exchangeTwo;
+	}
+
+	/**
+	 * @return first Exchange
+	 */
+	public Exchange getExchangeOne() {
+		return this.exchangeOne;
+	}
+
+	/**
+	 * @return second Exchange
+	 */
+	public Exchange getExchangeTwo() {
+		return this.exchangeTwo;
+	}
+
+	/**
+	 * @return second Exchange's owned assignmetn
+	 */
+	public Assignment getAssignmentTwo() {
+		return this.exchangeTwo.getOwnedAssignment();
+	}
+
+	/**
+	 * @return first Exchange's owned assignmetn
+	 */
+	public Assignment getAssignmentOne() {
+		return this.exchangeOne.getOwnedAssignment();
+	}
+
+	@Override
+	public int hashCode() {
+		return this.getAssignmentOne().hashCode() + this.getAssignmentTwo().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (o == this) {
+			return true;
+		}
+
+		if (!(o instanceof MatchData)) {
+			return false;
+		}
+
+		MatchData c = (MatchData) o;
+
+		return (this.getAssignmentOne().equals(c.getAssignmentOne())
+				&& this.getAssignmentTwo().equals(c.getAssignmentTwo()))
+				|| (this.getAssignmentOne().equals(c.getAssignmentTwo())
+						&& this.getAssignmentTwo().equals(c.getAssignmentOne()));
+	}
+
+	/**
+	 * comparator for MatchData. It compare it by sum of both exchange's times. For
+	 * example MatchData with Exchanges 11:00 and 12:00 will be less than with
+	 * Exchanges 12:00 and 12:00
+	 * 
+	 * @param m1 MatchData instance to compare to
+	 * @return int less than 0 if m1 is "less than", 0 if it's equal and more than 0
+	 *         otherwise
+	 */
+	public int compare(MatchData m1) {
+		return Long.compare(m1.getExchangesMsValue(), this.getExchangesMsValue());
+	}
+
+	/**
+	 * @return sum of both exchanges java.sql.Timestanp::getTime"
+	 */
+	public long getExchangesMsValue() {
+		return this.exchangeOne.getDataExchange().getTime() + this.exchangeTwo.getDataExchange().getTime();
+	}
+}

buisnesslogic/src/main/java/com/plannaplan/models/TourData.java

@@ -0,0 +1,52 @@
+package com.plannaplan.models;
+
+import java.sql.Date;
+
+/**
+ * Container for Tours dates
+ */
+public class TourData {
+
+    private Date start;
+    private Date end;
+
+    /**
+     * construcotr for java.sql.Date
+     * 
+     * @param start Date when tour start
+     * @param end   Date when tour end
+     */
+    public TourData(Date start, Date end) {
+        this.start = start;
+        this.end = end;
+    }
+
+    /**
+     * constructor construcotr for java.util.Date
+     * 
+     * @param start Date when tour start
+     * @param end   Date when tour end
+     */
+    public TourData(java.util.Date start, java.util.Date end) {
+        this.start = new Date(start.getTime());
+        this.end = new Date(end.getTime());
+    }
+
+    /**
+     * tour end getter
+     * 
+     * @return Date end of tour
+     */
+    public Date getEnd() {
+        return end;
+    }
+
+    /**
+     * tour start getter
+     * 
+     * @return Date beginning of tour
+     */
+    public Date getStart() {
+        return start;
+    }
+}

buisnesslogic/src/main/java/com/plannaplan/models/UserApiResponse.java

@@ -0,0 +1,47 @@
+package com.plannaplan.models;
+
+/**
+ * Model to keep data from /services/users/user response called in
+ * UsosApiService
+ */
+public class UserApiResponse {
+    private String name;
+    private String surname;
+
+    public UserApiResponse() {
+    }
+
+    /**
+     * @return user's Surname
+     */
+    public String getSurname() {
+        return surname;
+    }
+
+    /**
+     * setter for name. Reson to have setters for this class is for case if there
+     * would be name and no surname or otherwise
+     * 
+     * @param surname name to set that was obtained by api request
+     */
+    public void setSurname(String surname) {
+        this.surname = surname;
+    }
+
+    /**
+     * @return user's Name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * setter for surname. Reson to have setters for this class is for case if there
+     * would be name and no surname or otherwise
+     * 
+     * @param name name to set that was obtained by api request
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+}

buisnesslogic/src/main/java/com/plannaplan/models/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * Provides readonly (mostly) classes to keep data for diffrent pourposes
+ *
+ * @since 1.0
+ */
+package com.plannaplan.models;

buisnesslogic/src/main/java/com/plannaplan/repositories/AppConfigRepository.java

@@ -0,0 +1,11 @@
+package com.plannaplan.repositories;
+
+import com.plannaplan.entities.AppConfig;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Repository for app config
+ */
+public interface AppConfigRepository extends JpaRepository<AppConfig, Long> {
+}

buisnesslogic/src/main/java/com/plannaplan/repositories/CommisionRepository.java

@@ -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();
 }

buisnesslogic/src/main/java/com/plannaplan/repositories/ExchangeRepository.java

@@ -0,0 +1,26 @@
+package com.plannaplan.repositories;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Exchange;
+import com.plannaplan.entities.Groups;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ExchangeRepository extends JpaRepository<Exchange, Long>{
+
+    @Query("FROM Exchange WHERE owned_id = ?1 AND desired_id = ?2")
+    Optional<Exchange> checkForExchange(@Param("owned_id") Assignment assignment, @Param("desired_id") Groups group);
+
+    @Query("FROM Exchange WHERE ownerId = ?1")
+    List<Exchange> getByUserId(@Param("id") Long id);
+
+    @Query("Select e1,e2 FROM Exchange e1, Exchange e2 WHERE e1.ownedAssignment.group.id = e2.desiredAssignment.id")
+    List<Object[]> getMatches();
+}

buisnesslogic/src/main/java/com/plannaplan/repositories/GroupRepository.java

@@ -28,6 +28,9 @@ public interface GroupRepository extends JpaRepository<Groups, Long> {
     @Query("FROM Groups WHERE time = ?1 AND room = ?2 AND capacity = ?3")
     Optional<Groups> find(@Param("time") int time, @Param("room") String room, @Param("capacity") int capacity);
 
+    @Query("FROM Groups WHERE zajCykId = ?1 AND grNr = ?2")
+    Optional<Groups> find(@Param("zajCykId") Integer zaj_cyk_id, @Param("grNr") Integer gr_nr);
+
     @Query("FROM Groups WHERE course_id = ?1")
     List<Groups> getByCourse(@Param("id") Long id);
 

buisnesslogic/src/main/java/com/plannaplan/repositories/UserRepository.java

@@ -12,45 +12,63 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 /**
- *  UserRepository.getByAuthority:
- *      Return list of:
- *      SELECT * FROM User WHERE email = i.
+ * UserRepository.getByAuthority: Return list of: SELECT * FROM User WHERE email
+ * = i.
  * 
- *      Where i, ?1 are equale to variables. 
+ * Where i, ?1 are equale to variables.
  * 
- *  UserRepository.getByToken:
- *      Return list of:
- *      SELECT * FROM User WHERE token = i.
+ * UserRepository.getByToken: Return list of: SELECT * FROM User WHERE token =
+ * i.
  * 
- *      Where i, ?1 are equale to variables.  
+ * Where i, ?1 are equale to variables.
  * 
- *  UserRepository.searchForUsers:
- *      Return list of:
- *      SELECT * FROM User WHERE (name LIKE %?1% OR surname LIKE %?1%).
+ * UserRepository.searchForUsers: Return list of: SELECT * FROM User WHERE (name
+ * LIKE %?1% OR surname LIKE %?1%).
  * 
- *      Where i, ?1 are equale to variables.   
+ * Where i, ?1 are equale to variables.
  * 
- *  UserRepository.searchForUsers with role:
- *      Return list of:
- *      SELECT * FROM User WHERE (name LIKE %?1% OR surname LIKE %?1%) AND role=?2").
+ * UserRepository.searchForUsers with role: Return list of: SELECT * FROM User
+ * WHERE (name LIKE %?1% OR surname LIKE %?1%) AND role=?2").
  * 
- *      Where i, ?1 are equale to variables.
+ * Where i, ?1 are equale to variables.
  */
 
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
-    @Query("FROM User WHERE email = ?1")
+    /**
+     * return user by given authority
+     * 
+     * @param authority user usosId or email
+     * @return optional with user if found
+     */
+    @Query("FROM User WHERE email = ?1 OR usosId = ?1")
     Optional<User> getByAuthority(@Param("authority") String authority);
 
+    @Query("FROM User WHERE email = ?1")
+    Optional<User> getByEmail(@Param("authority") String authority);
+
+    @Query("FROM User WHERE refreshToken = ?1")
+    Optional<User> getByRefreshToken(@Param("refreshToken") String refreshToken);
+
     @Query("FROM User WHERE token = ?1")
     Optional<User> getByToken(@Param("token") String token);
 
     @Query("FROM User WHERE (name LIKE %?1% OR surname LIKE %?1%)")
     List<User> searchForUsers(@Param("query") String query);
 
+    /**
+     * search for user with given query
+     * 
+     * @param query string that will be matched to users name and surname
+     * @param role  limits results by role
+     * @return list opf results
+     */
     @Query("FROM User WHERE (name LIKE %?1% OR surname LIKE %?1%) AND role=?2")
     List<User> searchForUsers(@Param("query") String query, @Param("role") UserRoles role);
 
+    @Query("FROM User WHERE role=?1")
+    List<User> getAllByRole(@Param("role") UserRoles role);
+
     @Query("FROM User WHERE usosId = ?1")
     Optional<User> getByUsosId(@Param("usosId") String usosId);
 }

buisnesslogic/src/main/java/com/plannaplan/repositories/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * Provides jpa repositories interfaces to comunicate with database. These are
+ * used exclusively in services
+ *
+ * @since 1.0
+ */
+package com.plannaplan.repositories;

buisnesslogic/src/main/java/com/plannaplan/services/AssignmentService.java

@@ -1,17 +1,22 @@
 package com.plannaplan.services;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 import com.plannaplan.entities.Assignment;
 import com.plannaplan.entities.Commision;
+import com.plannaplan.entities.Groups;
+import com.plannaplan.entities.User;
+import com.plannaplan.models.EmailAcceptedData;
 import com.plannaplan.repositories.AssignmentRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
- *  Service of Assignment which can save assignments, diplay assignments, get ammount of assigments.
+ * Service of Assignment which can save assignments, diplay assignments, get
+ * ammount of assigments.
  */
 
 @Service
@@ -19,11 +24,21 @@ public class AssignmentService {
     @Autowired
     private AssignmentRepository repo;
 
+    @Autowired
+    private CommisionService service;
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private EmailService emailService;
+
     public AssignmentService() {
     }
 
     /**
      * Save given assignment
+     * 
      * @param assignment assignment to save
      * @return assignment saved assignment with database id
      */
@@ -31,17 +46,20 @@ public class AssignmentService {
         return this.repo.save(assignment);
     }
 
-    /*
-     * getCommisionAssignments
-     * Return id of the commision
+    /**
+     * gets list of assignments of given commision
+     * 
+     * @param com Commision to get assinments from
+     * @return list of assignments
      */
     public List<Assignment> getCommisionAssignments(Commision com) {
         return this.repo.getByCommision(com.getId());
     }
 
-    /*
-     * getAssignmentsAmmount
-     * Return count assignments ammount
+    /**
+     * get ammount of all assignments (not only for selected commision)
+     * 
+     * @return long - ammount of assingments
      */
     public long getAssignmentsAmmount() {
         return this.repo.count();
@@ -49,10 +67,51 @@ public class AssignmentService {
 
     /**
      * Get assigmnent by id
+     * 
      * @param id id of assigmnent
      * @return Optional of assignment
      */
     public Optional<Assignment> getById(Long id) {
         return this.repo.findById(id);
     }
+
+    /**
+     * this method will activate accept algorythm for all students. Algorythm is
+     * takeing each student in order defined by ranking and accept for him groups
+     * that are joinable for him
+     */
+    public void callAcceptAlgorythm() {
+        final List<User> students = this.userService.getStudentsSortedByRanking();
+
+        students.forEach(e -> {
+            final Optional<Commision> com = this.service.getNewestCommision(e);
+            final List<Groups> accepted = new ArrayList<>();
+            final List<Groups> removed = new ArrayList<>();
+
+            if (com.isPresent()) {
+                final List<Assignment> assignments = this.getCommisionAssignments(com.get());
+                assignments.forEach(a -> {
+                    if (a.isAccepted() == false) {
+                        final Groups group = a.getGroup();
+                        if (group.getCapacity() > group.getRegisteredStudents().size()) {
+                            e.claimGroup(group);
+                            accepted.add(group);
+                        } else {
+                            removed.add(group);
+                        }
+                    }
+                });
+            }
+            this.userService.save(e);
+            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);
+    }
 }

buisnesslogic/src/main/java/com/plannaplan/services/CommisionService.java

@@ -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;
 
@@ -12,7 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
- *  Service of CommisionService which can save commision, get user's commisions, get newest user's commision, get ammount of commisions.
+ * Service of CommisionService which can save commision, get user's commisions,
+ * get newest user's commision, get ammount of commisions.
  */
 
 @Service
@@ -21,15 +24,18 @@ public class CommisionService {
     private CommisionRepository repo;
     @Autowired
     private AssignmentRepository aRepository;
+    @Autowired
+    private UserService userService;
 
     public CommisionService() {
     }
 
-    /*
-     * save
-     *
-     * @param commision which assignment should be save in service
-     * @return commision
+    /**
+     * save to database commision. It also checks for missing assignments from
+     * previous commision (you can not get rid of accepted assignment)
+     * 
+     * @param commision to save to db
+     * @return Commision instance with id from database
      */
     public Commision save(Commision commision) {
         Optional<Commision> lastCommision = this.getNewestCommision(commision.getCommisionOwner());
@@ -39,33 +45,57 @@ public class CommisionService {
                 assignment.setPastAssignment(true);
                 this.aRepository.save(assignment);
             });
+
         }
         this.repo.save(commision);
         return commision;
 
     }
 
-    /*
-     * getUsersCommisions
-     * Return given users id
+    /**
+     * gets user commisions
+     * 
+     * @param user owner of commisions
+     * @return list of user commisions
      */
     public List<Commision> getUsersCommisions(User user) {
         return this.repo.getUsers(user.getId());
     }
 
-    /*
-     * getNewestCommision
-     * Return the newest commision of the user
+    /**
+     * get newest commision ov given user
+     * 
+     * @param user owener of commision we attemp to get
+     * @return optional if commition was found
      */
     public Optional<Commision> getNewestCommision(User user) {
         return this.repo.getNewestCommision(user.getId()).stream().findFirst();
     }
 
-    /*
-     * getCommisionsAmmount
-     * Return ammount of commisions
+    /**
+     * get ammpounts of commisions
+     * 
+     * @return long - ammounts of commisions (all even from history, not only
+     *         cutrrent one)
      */
     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;
+    }
+
 }

buisnesslogic/src/main/java/com/plannaplan/services/ConfiguratorService.java

@@ -2,28 +2,136 @@ package com.plannaplan.services;
 
 import com.plannaplan.models.ConfigData;
 import com.plannaplan.models.FileData;
+import com.plannaplan.models.TourData;
+import com.plannaplan.repositories.AppConfigRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.io.InputStream;
+import java.sql.Date;
+import java.time.LocalDate;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import com.plannaplan.configutils.*;
+import com.plannaplan.entities.AppConfig;
 
 /**
- *  FileReader is used for reading xls file from input stream.
+ * FileReader is used for reading xls file from input stream.
  */
 @Component
 public class ConfiguratorService {
 
     @Autowired
     private FileToDatabaseMigrator migrator;
+    @Autowired
+    private AppConfigRepository configRepo;
+    @Autowired
+    private EventService eventService;
+    @Autowired
+    private AssignmentService assignmentService;
 
     public ConfiguratorService() {
     }
 
+    /**
+     * methoid to config system. it shedules PerformAcceptAlgorythmTask as a side
+     * effect
+     * 
+     * @param data ConfigData containng system configs
+     */
     public void config(ConfigData data) {
         FileReader reader = new FileReader(data.getFilestream());
         FileData coursesData = reader.read();
+        final AppConfig config = new AppConfig(data.getFirstTour(), data.getSecondTour());
+        this.configRepo.save(config);
+        migrator.migrate(coursesData);
+        this.shceduleTaskAfterToursDateChange(config);
+    }
+
+    /**
+     * Save tours to DataBase and shedule PerformAcceptAlgorythmTask as a side
+     * effect
+     * 
+     * @param firstTour  First tour period.
+     * @param secondTour Second tour period.
+     */
+    public void saveTours(TourData firstTour, TourData secondTour) {
+        final AppConfig config = new AppConfig(firstTour, secondTour);
+        this.configRepo.save(config);
+        this.shceduleTaskAfterToursDateChange(config);
+    }
+
+    /**
+     * current config getter
+     * 
+     * @return AppConfig with newest config_date
+     */
+    public AppConfig getCurrentConfig() {
+        final List<AppConfig> repsonse = this.configRepo.findAll().stream().sorted(new Comparator<AppConfig>() {
+            @Override
+            public int compare(AppConfig i1, AppConfig i2) {
+                if (i1.getConfigDate().after(i2.getConfigDate())) {
+                    return -1;
+                }
+                if (i1.getConfigDate().before(i2.getConfigDate())) {
+                    return 1;
+                }
+                return 0;
+
+            }
+        }).collect(Collectors.toList());
+
+        return repsonse.get(0);
+    }
+
+    /**
+     * 
+     * @param inputStream This input stream contains new courses to import.
+     */
+    public void importCoursesStream(InputStream inputStream) {
+        FileReader reader = new FileReader(inputStream);
+        FileData coursesData = reader.read();
         migrator.migrate(coursesData);
     }
 
+    private void shceduleTaskAfterToursDateChange(AppConfig config) {
+
+        this.eventService.scheduleTask(EventService.FIRST_TOUR_SCHEDULE,
+                new AlgorythmAcceptTask(config.getFirstTourEnd()), config.getFirstTourEndCron());
+
+        this.eventService.scheduleTask(EventService.SECOND_TOUR_SCHEDULE,
+                new AlgorythmAcceptTask(config.getSecondTourEnd()), config.getSecondTourEndCron());
+    }
+
+    /**
+     * It's local class to perform accept Task. It's needed to be here due to have
+     * acces to AssignmentService.
+     */
+    private class AlgorythmAcceptTask implements Runnable {
+
+        private LocalDate localDate;
+
+        /**
+         * create instance of AlgorythmAcceptTask
+         * 
+         * @param date date of algorythm perform. Needed to check if ti's being called
+         *             in correct year
+         */
+        public AlgorythmAcceptTask(Date date) {
+            this.localDate = date.toLocalDate();
+        }
+
+        @Override
+        public void run() {
+            System.out.println("Performing event");
+            if (localDate.getYear() == LocalDate.now().getYear()) {
+                assignmentService.callAcceptAlgorythm();
+            }
+
+        }
+
+    }
 }

buisnesslogic/src/main/java/com/plannaplan/services/CourseService.java

@@ -10,7 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
- *  Service of CourseService which can get(Course By Name, All Courses, Courses Ammount ), save, delete course.
+ * Service of CourseService which can get(Course By Name, All Courses, Courses
+ * Ammount ), save, delete course.
  */
 
 @Service
@@ -18,42 +19,46 @@ public class CourseService {
     @Autowired
     private CourseRepository repo;
 
-    /*
+    /**
      * getCourseByName
-     * Return Course By Name
+     * 
+     * @param name name of course to be found
+     * @return Course By Name
      */
     public Optional<Course> getCourseByName(String name) {
         return this.repo.findByName(name);
     }
 
-    /*
-     * getAllCourses
-     * Return List of get courses
+    /**
+     * 
+     * @return all courses from db
      */
     public List<Course> getAllCourses() {
         return this.repo.findAll();
     }
 
-    /*
-     * save
+    /**
+     * save to db
+     * 
      * @param course which course you would like to save
+     * @return Course instance with id from db
      */
     public Course save(Course course) {
         this.repo.save(course);
         return course;
     }
 
-    /*
-     * delete
+    /**
+     * delete course from db
+     * 
      * @param course which course you would like to delete
      */
     public void delete(Course course) {
         this.repo.delete(course);
     }
 
-    /*
-     * getCoursesAmmount
-     * Return a ammount of courses
+    /**
+     * @return ammount of courses in db
      */
     public int getCoursesAmmount() {
         return (int) this.repo.count();

buisnesslogic/src/main/java/com/plannaplan/services/EmailService.java

@@ -0,0 +1,101 @@
+package com.plannaplan.services;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import com.plannaplan.entities.Exchange;
+import com.plannaplan.entities.User;
+import com.plannaplan.models.EmailAcceptedData;
+import com.plannaplan.models.EmailExchangesData;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Service;
+
+/**
+ * Service to send emails
+ */
+@Service
+public class EmailService {
+
+    @Autowired
+    private JavaMailSender emailSender;
+
+    @Autowired
+    private UserService userService;
+
+    @Value("${plannaplan.email}")
+    private String appEmail;
+
+    public EmailService() {
+    }
+
+    /**
+     * send simple text email
+     * 
+     * @param destination destitnaion mail
+     * @param message     text to be send
+     */
+    public void sendMail(String destination, String message) {
+        SimpleMailMessage mailMessage = new SimpleMailMessage();
+        mailMessage.setFrom(appEmail);
+        mailMessage.setTo(destination);
+        mailMessage.setSubject("[Plan na plan] INFO");
+        mailMessage.setText(message);
+        emailSender.send(mailMessage);
+    }
+
+    /**
+     * sends email with infromation about accepted groups
+     * 
+     * @param user user to send a mail
+     * @param data EmailAcceptedData instance containing informations about accepted
+     *             and removed groups
+     */
+    public void sendAcceptationResult(User user, EmailAcceptedData data) {
+        SimpleMailMessage mailMessage = new SimpleMailMessage();
+        mailMessage.setFrom(appEmail);
+        mailMessage.setTo(user.getEmail());
+        mailMessage.setSubject("[PlanNaPlan] Akceptacja przedmiotów");
+        mailMessage.setText(data.getEmailMessage());
+        emailSender.send(mailMessage);
+    }
+
+    /**
+     * method to send email for students whose groups were swaped
+     * 
+     * @param data EmailExchangesData instance that contains pair of datas user and
+     *             list of performed exhanges
+     */
+    public void sendExchangesResults(EmailExchangesData data) {
+        for (Map.Entry<Long, List<Exchange>> entry : data.getDataEntry()) {
+            final User user = this.userService.getById(entry.getKey()).get();
+            String response = "Znaleźliśmy dla Ciebie osobę, która zamieniła się z Tobą przedmiotami!!!\n Zamienione przedmioty: \n";
+
+            final Iterator<Exchange> interator = entry.getValue().iterator();
+
+            while (interator.hasNext()) {
+                final Exchange exchange = interator.next();
+                final String courseFrom = exchange.getDesiredAssignment().getCourseId() != null
+                        ? exchange.getDesiredAssignment().getCourseId().getName()
+                        : "Nieznane zajęcie";
+                final String courseTo = exchange.getOwnedAssignment().getGroup().getCourseId() != null
+                        ? exchange.getOwnedAssignment().getGroup().getCourseId().getName()
+                        : "Nieznane zajęcie";
+
+                response += (" - " + courseFrom + " za " + courseTo.toLowerCase());
+            }
+
+            SimpleMailMessage mailMessage = new SimpleMailMessage();
+            mailMessage.setFrom(appEmail);
+            mailMessage.setTo(user.getEmail());
+            mailMessage.setSubject("[PlanNaPlan] Zamiana przedmiotów");
+            mailMessage.setText(response);
+            emailSender.send(mailMessage);
+
+        }
+    }
+}

buisnesslogic/src/main/java/com/plannaplan/services/EventService.java

@@ -0,0 +1,71 @@
+package com.plannaplan.services;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ScheduledFuture;
+
+import javax.annotation.PostConstruct;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.stereotype.Service;
+
+/**
+ * Service to manage app events
+ */
+@Service
+public class EventService {
+
+    @Autowired
+    private ExchangeService exchangeService;
+
+    public static final int FIRST_TOUR_SCHEDULE = 0;
+    public static final int SECOND_TOUR_SCHEDULE = 1;
+
+    private ThreadPoolTaskScheduler scheduler;
+    private Map<Integer, ScheduledFuture<?>> jobsMap = new HashMap<>();
+
+    @Scheduled(cron = "0 24 17 * * *")
+    public void collectGroupLosses() {
+        System.out.println("Checking for groups");
+    }
+
+    /**
+     * perfroms checks for matching exchanges daily
+     */
+    @Scheduled(cron = "0 0 0 * * *")
+    public void performExchangeService() {
+        System.out.println("Performing Exchange");
+        this.exchangeService.performExchange();
+    }
+
+    /**
+     * Schedule provided task to perform
+     *
+     * @param taskId      static filed of this class that represents to what event
+     *                    we want to assign task
+     * @param task        runnable class that perform task in implemented run method
+     * @param cronTrigger CronTrigger instance with date to perform
+     */
+    public void scheduleTask(int taskId, Runnable task, CronTrigger cronTrigger) {
+        ScheduledFuture<?> scheduledTask = jobsMap.get(taskId);
+        if (scheduledTask != null) {
+            scheduledTask.cancel(true);
+            jobsMap.put(taskId, null);
+        }
+        scheduledTask = this.scheduler.schedule(task, cronTrigger);
+        jobsMap.put(taskId, scheduledTask);
+    }
+
+    /**
+     * init resources needed for dynamicly creating new tasks (needed to set tours
+     * end events)
+     */
+    @PostConstruct
+    public void initialize() {
+        this.scheduler = new ThreadPoolTaskScheduler();
+        this.scheduler.initialize();
+    }
+}

buisnesslogic/src/main/java/com/plannaplan/services/ExchangeService.java

@@ -0,0 +1,158 @@
+package com.plannaplan.services;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Commision;
+import com.plannaplan.entities.Exchange;
+import com.plannaplan.entities.Groups;
+import com.plannaplan.entities.User;
+import com.plannaplan.models.EmailExchangesData;
+import com.plannaplan.models.MatchData;
+import com.plannaplan.repositories.ExchangeRepository;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Service to manage Exchanges
+ */
+@Service
+public class ExchangeService {
+
+    @Autowired
+    private ExchangeRepository repo;
+
+    @Autowired
+    private AssignmentService assignmentService;
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private EmailService emailService;
+
+    /**
+     * @param exchange Instance to save in database
+     * @return Exchange Instance contains database id
+     */
+    public Exchange save(Exchange exchange) {
+        return this.repo.save(exchange);
+    }
+
+    /**
+     * @param id Id of exchange in database
+     * @return Optional Exchange if found
+     */
+    public Optional<Exchange> getById(Long id) {
+        return this.repo.findById(id);
+    }
+
+    /**
+     * @return list of all exchanges in database
+     */
+    public List<Exchange> getAllExchanges() {
+        return this.repo.findAll();
+    }
+
+    /**
+     * @param id Id of user
+     * @return List of exchanges that belong to user
+     */
+    public List<Exchange> getByUserId(Long id) {
+        return this.repo.getByUserId(id);
+    }
+
+    /**
+     * @param entity Exchange entity which we would like to delete
+     */
+    public void deleteExchange(Exchange entity) {
+        this.repo.delete(entity);
+    }
+
+    /**
+     * @param assignment Assignment to trade for
+     * @param group      Desired group
+     * @return Optional with Exchange if exist
+     */
+    public Optional<Exchange> checkForExchange(Assignment assignment, Groups group) {
+        return this.repo.checkForExchange(assignment, group);
+    }
+
+    /**
+     * method to perform Exchange algorythm. It search for matches and swap
+     * assignments between latests user commisions if it can be performed. After
+     * swap we block users matches that contains switched groups. After algorythm
+     * email is being sent to all users with information about performed exchanges
+     */
+    public void performExchange() {
+        final List<MatchData> matchData = this.getMatches();
+        final List<Long> performedAssignmentExchanges = new ArrayList<>();
+        final EmailExchangesData emailData = new EmailExchangesData();
+        final List<Exchange> exchangesToDelete = new ArrayList<>();
+
+        matchData.forEach(m -> {
+            final Assignment assignmentOne = m.getAssignmentOne();
+            final Assignment assignmentTwo = m.getAssignmentTwo();
+
+            final Exchange exchange1 = m.getExchangeOne();
+            final Exchange exchange2 = m.getExchangeTwo();
+
+            if (!(performedAssignmentExchanges.contains(assignmentOne.getId())
+                    || performedAssignmentExchanges.contains(assignmentTwo.getId()))) {
+                final Commision commisionOne = assignmentOne.getCommision();
+                final User userOne = commisionOne.getCommisionOwner();
+                final Commision commisionTwo = assignmentTwo.getCommision();
+                final User userTwo = commisionTwo.getCommisionOwner();
+
+                assignmentOne.setCommision(commisionTwo);
+                assignmentTwo.setCommision(commisionOne);
+
+                userOne.removeGroup(assignmentOne.getGroup().getId());
+                userTwo.removeGroup(assignmentTwo.getGroup().getId());
+
+                userOne.claimGroup(assignmentTwo.getGroup());
+                userTwo.claimGroup(assignmentOne.getGroup());
+
+                this.assignmentService.save(assignmentOne);
+                this.assignmentService.save(assignmentTwo);
+
+                this.userService.save(userOne);
+                this.userService.save(userTwo);
+
+                performedAssignmentExchanges.add(assignmentOne.getId());
+                performedAssignmentExchanges.add(assignmentTwo.getId());
+
+                emailData.addExchange(exchange1.getOwnedAssignment().getCommision().getCommisionOwner(), exchange1);
+                emailData.addExchange(exchange2.getOwnedAssignment().getCommision().getCommisionOwner(), exchange2);
+            }
+
+            exchangesToDelete.add(exchange1);
+            exchangesToDelete.add(exchange2);
+        });
+        this.emailService.sendExchangesResults(emailData);
+        this.repo.deleteAll(exchangesToDelete);
+    }
+
+    /**
+     * @return list of matches found in database
+     */
+    public List<MatchData> getMatches() {
+        final List<MatchData> matches = this.repo.getMatches().stream().map(m -> {
+            final Exchange exchangeOne = (Exchange) m[0];
+            final Exchange exchangeTwo = (Exchange) m[1];
+            return new MatchData(exchangeOne, exchangeTwo);
+        }).collect(Collectors.toList());
+
+        final Set<MatchData> uniqData = new HashSet<>(matches);
+        final List<MatchData> matchDataListSorted = uniqData.stream().sorted((m1, m2) -> -1 * m1.compare(m2))
+                .collect(Collectors.toList());
+
+        return matchDataListSorted;
+    }
+}

buisnesslogic/src/main/java/com/plannaplan/services/GroupService.java

@@ -1,12 +1,14 @@
 package com.plannaplan.services;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.function.Function;
 
+import com.plannaplan.entities.Assignment;
 import com.plannaplan.entities.Groups;
 import com.plannaplan.repositories.GroupRepository;
 
@@ -17,7 +19,6 @@ import org.springframework.stereotype.Service;
  * Service of GroupService which can find(optional), get(By Course, Groups
  * Ammount, Group By Id, find Not Existing Group), save, delete group.
  */
-
 @Service
 public class GroupService {
     @Autowired
@@ -26,30 +27,84 @@ public class GroupService {
     public GroupService() {
     }
 
+    /**
+     * find group with given properties
+     * 
+     * @param time     scheduled time for group as int of minutes passed from 00:00
+     * @param capacity capacity of group
+     * @param room     class room
+     * @return optional with Groups instance if found
+     */
     public Optional<Groups> find(int time, int capacity, String room) {
         return this.repo.find(time, room, capacity);
     }
 
+    /**
+     * find group with given properties
+     * 
+     * @param zajCykId proteprty from usos
+     * @param nrGr     group number
+     * @return optional with Groups instance if found
+     */
+    public Optional<Groups> find(Integer zajCykId, Integer nrGr) {
+        return this.repo.find(zajCykId, nrGr);
+    }
+
+    /**
+     * find group with given properties
+     * 
+     * @param id course id of groups belogns to
+     * @return list of found groups
+     */
     public List<Groups> getGroupsByCourse(Long id) {
         return this.repo.getByCourse(id);
     }
 
+    /**
+     * save group to database
+     * 
+     * @param group insatnce to be saved
+     * @return new instance that has id form database
+     */
     public Groups save(Groups group) {
         return this.repo.save(group);
     }
 
+    /**
+     * delete from database
+     * 
+     * @param groups isntance to delete
+     */
     public void delete(Groups groups) {
         this.repo.delete(groups);
     }
 
+    /**
+     * get hom manyh groups are in database in general
+     * 
+     * @return int - groups ammount
+     */
     public int getGroupsAmmount() {
         return (int) this.repo.count();
     }
 
+    /**
+     * find group with given properties
+     * 
+     * @param id group id
+     * @return optional with group if found
+     */
     public Optional<Groups> getGroupById(Long id) {
         return this.repo.findById(id);
     }
 
+    /**
+     * get wich of provided id is not existind groups
+     * 
+     * @param ids list of ids to check
+     * @return optional with id that is not group if found. If there is multiple
+     *         will be returned first found
+     */
     public Optional<Long> findNotExistingGroup(List<Long> ids) {
         for (Long oneId : ids) {
             if (this.repo.existsById(oneId) == false) {
@@ -60,11 +115,21 @@ public class GroupService {
 
     }
 
+    /**
+     * 
+     * @param assignments list of assignments you want to get taken places ammount
+     * @return HashMap of Long to Integer where Long is group id and Integer is how
+     *         many places in gorup is already taken
+     */
+    public HashMap<Long, Integer> getTakenPlacesOfAssignments(List<Assignment> assignments) {
+        return getTakenPlaces(assignments.stream().map(Assignment::getGroup).collect(Collectors.toList()));
+    }
+
     /**
      * 
      * @param groups list of groups you want to get taken places ammount
-     * @return HashMap<Long, Integer> where Long is group id and Integer is how many
-     *         places in gorup is already taken
+     * @return HashMap of Long to Integer where Long is group id and Integer is how
+     *         many places in gorup is already taken
      */
     public HashMap<Long, Integer> getTakenPlaces(List<Groups> groups) {
         HashMap<Long, Integer> response = new HashMap<>();
@@ -89,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;
+    }
 }

buisnesslogic/src/main/java/com/plannaplan/services/UserService.java

@@ -1,11 +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;
 
@@ -20,17 +25,46 @@ public class UserService {
     @Autowired
     private UserRepository repo;
 
+    @Autowired
+    private UsosApiService service;
+
+    @Autowired
+    private CommisionRepository comRepo;
+
+    @Autowired
+    private CommisionService comService;
+
     public UserService() {
         super();
     }
 
+    /**
+     * checks if user exist and return him or creates new one with student role
+     * otherwise
+     *
+     * @param email  user email in usos
+     * @param usosId user id in usos
+     * @return user entity instace containing changes saved in database
+     */
     public User checkForUser(String email, String usosId) {
+        return this.checkForUser(email, usosId, UserRoles.STUDENT);
+    }
+
+    /**
+     * checks if user exist and creates new one if doesn't
+     *
+     * @param email          user email in usos
+     * @param usosId         user id in usos
+     * @param roleIfNotExist role to be set in case user is not in database yet
+     * @return user entity instace containing changes saved in database
+     */
+    public User checkForUser(String email, String usosId, UserRoles roleIfNotExist) {
         if (usosId == null) {
-            Optional<User> user = this.repo.getByAuthority(email.replace("\n", "").trim());
+            Optional<User> user = this.repo.getByEmail(email.replace("\n", "").trim());
             if (user.isPresent()) {
                 return user.get();
             } else {
-                final User newUser = new User(null, null, email.replace("\n", "").trim(), UserRoles.STUDENT);
+                final User newUser = new User(null, null, email.replace("\n", "").trim(), roleIfNotExist);
                 return this.repo.save(newUser);
             }
         } else {
@@ -38,14 +72,26 @@ public class UserService {
             if (user.isPresent()) {
                 return user.get();
             } else {
-                final User newUser = new User(null, null, email.replace("\n", "").trim(), usosId, UserRoles.STUDENT);
+                final User newUser = new User(null, null, email.replace("\n", "").trim(), usosId, roleIfNotExist);
                 return this.repo.save(newUser);
             }
         }
     }
 
+    /**
+     * generates token for user and if user don't have name in database it will
+     * attemp to obtain these from usos api and saves changes in database
+     *
+     * @param authority user we want to login
+     * @return user with changed values after save in db
+     * @throws UserNotFoundException throwed if user doesn't exist
+     */
     public User login(User authority) throws UserNotFoundException {
         final String token = UUID.randomUUID().toString();
+        if ((authority.getName() == null || authority.getSurname() == null) && authority.getUsosId() != null) {
+            final UserApiResponse resp = this.service.getUserData(authority.getUsosId());
+            authority.updateWithUsosData(resp);
+        }
         try {
             authority.setToken(token);
             this.repo.save(authority);
@@ -55,20 +101,48 @@ public class UserService {
         return authority;
     }
 
+    /**
+     * sacves user to databse and return instatnce with id
+     *
+     * @param user to be saved
+     * @return instatnce with bd id
+     */
     public User save(User user) {
         return this.repo.save(user);
     }
 
+    /**
+     *
+     * @param email of user to be find
+     * @return user with given mail
+     * @throws UserNotFoundException throwed if user doesn't exist
+     */
     public User getUserByEmail(String email) throws UserNotFoundException {
-        return this.repo.getByAuthority(email.replace("\n", "").trim())
+        return this.repo.getByEmail(email.replace("\n", "").trim())
                 .orElseThrow(() -> new UserNotFoundException("Cannot find user with given authority"));
 
     }
 
+    /**
+     * return user by given authority
+     *
+     * @param authority user usosId or email
+     * @return optional with user if found
+     */
+    public Optional<User> getByAuthority(String authority) {
+        return this.repo.getByAuthority(authority);
+    }
+
     public Optional<User> getByToken(String token) {
         return this.repo.getByToken(token);
     }
 
+    /**
+     * search for user with given query
+     *
+     * @param query string that will be matched to users name and surname
+     * @return list opf results
+     */
     public List<User> searchForStudents(String query) {
         return this.repo.searchForUsers(query, UserRoles.STUDENT);
     }
@@ -77,4 +151,79 @@ public class UserService {
         return this.repo.findById(userId);
     }
 
-}
+    public List<User> getAllStudents() {
+        return this.repo.getAllByRole(UserRoles.STUDENT);
+    }
+
+    public Optional<User> getUserByRefreshToken(String refreshToken) {
+        return this.repo.getByRefreshToken(refreshToken);
+    }
+
+    public boolean adminExists() {
+        return this.repo.getAllByRole(UserRoles.ADMIN).size() > 0;
+    }
+
+    public void saveAll(List<User> users) {
+        this.repo.saveAll(users);
+    }
+
+    /**
+     * get students sorted by their ranking
+     *
+     * @return list of students
+     */
+    public List<User> getStudentsSortedByRanking() {
+        return this.repo.getAllByRole(UserRoles.STUDENT).stream().sorted((u1, u2) -> {
+            return -1 * u1.getRanking().compareTo(u2.getRanking());
+        }).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();
+    }
+
+}

buisnesslogic/src/main/java/com/plannaplan/services/UsosApiService.java

@@ -0,0 +1,75 @@
+package com.plannaplan.services;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import com.github.scribejava.core.builder.ServiceBuilder;
+import com.github.scribejava.core.model.OAuth1AccessToken;
+import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Response;
+import com.github.scribejava.core.model.Verb;
+import com.github.scribejava.core.oauth.OAuth10aService;
+import com.plannaplan.api.UsosOauth1Service;
+import com.plannaplan.models.UserApiResponse;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+/**
+ * service to call usos api endpoints
+ */
+@Service
+public class UsosApiService {
+
+    private static final String NAME_FIELD = "first_name";
+    private static final String SURNAME_FIELD = "last_name";
+
+    @Value("${plannaplan.apiurl}")
+    private String apiUrl;
+
+    @Value("${plannaplan.apikey}")
+    private String apikey;
+
+    @Value("${plannaplan.apisecret}")
+    private String apisecret;
+
+    public UsosApiService() {
+
+    }
+
+    /**
+     * /services/users/user
+     *
+     * @param usosId user id in usos
+     * @return UserApiResponse modle contatining desired values
+     */
+    public UserApiResponse getUserData(String usosId) {
+	final UserApiResponse apiResponse = new UserApiResponse();
+	try {
+	    final OAuth10aService service = new ServiceBuilder(apikey).apiSecret(apisecret)
+		.build(UsosOauth1Service.instance());
+
+	    final OAuthRequest request = new OAuthRequest(Verb.GET, apiUrl + "/services/users/user?user_id=" + usosId);
+	    service.signRequest(new OAuth1AccessToken("", ""), request);
+	    try (Response response = service.execute(request)) {
+		final String json = response.getBody();
+		if (!json.equals("null")){
+		    final ObjectMapper mapper = new ObjectMapper();
+		    Map<String, String> map = mapper.readValue(json, new TypeReference<Map<String, String>>() {
+			});
+		    apiResponse.setName(map.get(NAME_FIELD));
+		    apiResponse.setSurname(map.get(SURNAME_FIELD));
+		}
+	    }
+	} catch (IOException | InterruptedException | ExecutionException e) {
+	    e.printStackTrace();
+	}
+
+	return apiResponse;
+    }
+
+}

buisnesslogic/src/main/java/com/plannaplan/services/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * Provides service classes to make operations with entities or comunicate with
+ * external systems.
+ *
+ * @since 1.0
+ */
+package com.plannaplan.services;

buisnesslogic/src/main/java/com/plannaplan/types/AppState.java

@@ -0,0 +1,5 @@
+package com.plannaplan.types;
+
+public enum AppState {
+    FIRST_TOUR, SECOND_TOUR, NO_TOUR
+}

buisnesslogic/src/main/java/com/plannaplan/types/GroupType.java

@@ -1,9 +1,39 @@
 package com.plannaplan.types;
 
 /**
- *  GroupType contains types: LECTURE, CLASS
+ * GroupType contains types: LECTURE, CLASS, LAB, SEMINAR, CONSERVATORY, PRATICE
  */
 
 public enum GroupType {
-    LECTURE, CLASS
+    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;
+    }
+
+    /**
+     * @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;
+    }
 }

buisnesslogic/src/main/java/com/plannaplan/types/UserRoles.java

@@ -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
 }

buisnesslogic/src/main/java/com/plannaplan/types/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * Provides enums for different goals.
+ *
+ * @since 1.0
+ */
+package com.plannaplan.types;

buisnesslogic/src/test/java/com/plannaplan/configutils/FileReaderTest.java

@@ -10,12 +10,11 @@ import org.junit.Test;
 
 public class FileReaderTest {
     @Test
-    public void shoulReturnNull() {
+    public void shouldNotReturnNull() {
         final InputStream inputStream = getClass().getClassLoader().getResourceAsStream("Zajecia.xlsx");
         final FileReader r = new FileReader(inputStream);
         final FileData d = r.read();
-        assertTrue(d.getRows().next().getCell(0).toString().equals("1.0"));
-        assertTrue(d.getKeys().size() == 22);
+        assertTrue(d.getKeys().size() == 12);
         assertTrue(d != null);
     }
 }

buisnesslogic/src/test/java/com/plannaplan/entities/AppConfigTest.java

@@ -0,0 +1,189 @@
+package com.plannaplan.entities;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.sql.Date;
+
+import com.plannaplan.models.TourData;
+import com.plannaplan.types.AppState;
+
+import org.junit.Test;
+
+public class AppConfigTest {
+
+    private static long ONE_DAY = 86400000;
+
+    @Test
+    public void shouldReturnNoTourDueToTooEarly() {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() + ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() + 2 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() + 3 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getCurrentState() == AppState.NO_TOUR);
+    }
+
+    @Test
+    public void shouldReturnFirstTourDueToStart() throws InterruptedException {
+        final Date firtstTourStart = new Date(System.currentTimeMillis());
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() + 2 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() + 3 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        Thread.sleep(1000);
+        assertTrue(config.getCurrentState() == AppState.FIRST_TOUR);
+    }
+
+    @Test
+    public void shouldReturnFirstTourDueToInBetween() {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() + 2 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() + 3 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getCurrentState() == AppState.FIRST_TOUR);
+    }
+
+    @Test
+    public void shouldReturnNoTourInLastDay() throws InterruptedException {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis());
+        final Date secondTourStart = new Date(System.currentTimeMillis() + 3 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        Thread.sleep(1000);
+        assertTrue(config.getCurrentState() == AppState.NO_TOUR);
+    }
+
+    @Test
+    public void shouldReturnNoTourInBetween() {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 2 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() + 3 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getCurrentState() == AppState.NO_TOUR);
+    }
+
+    @Test
+    public void shouldReturnSecondTourInStart() throws InterruptedException {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 2 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis());
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        Thread.sleep(1000);
+        assertTrue(config.getCurrentState() == AppState.SECOND_TOUR);
+    }
+
+    @Test
+    public void shouldReturnSecondTourInBetween() {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 3 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() - 2 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getCurrentState() == AppState.SECOND_TOUR);
+    }
+
+    @Test
+    public void shouldReturnNoTourDueToEndSecond() throws InterruptedException {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 3 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() - 2 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis());
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        Thread.sleep(1000);
+        assertTrue(config.getCurrentState() == AppState.NO_TOUR);
+    }
+
+    @Test
+    public void shouldReturnNoTourAfterSecondEnd() {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 4 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() - 3 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() - 2 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() - ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getCurrentState() == AppState.NO_TOUR);
+    }
+
+    @Test
+    public void shouldReturnSecondTourWhereThereIsABrake() throws InterruptedException {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 4 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis());
+        final Date secondTourStart = new Date(System.currentTimeMillis());
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        Thread.sleep(1000);
+        assertTrue(config.getCurrentState() == AppState.SECOND_TOUR);
+    }
+
+    @Test
+    public void shouldReturnFirstStartDatesCorns() {
+        final Date firtstTourStart = Date.valueOf("2020-11-12");
+        final Date firtstTourEnd = Date.valueOf("2020-11-13");
+        final Date secondTourStart = Date.valueOf("2020-11-14");
+        final Date secondTourEnd = Date.valueOf("2020-11-15");
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getFirstTourStartCron().getExpression().equals("0 0 0 12 11 ?"));
+    }
+
+    @Test
+    public void shouldReturnSecondStartDatesCorns() {
+        final Date firtstTourStart = Date.valueOf("2020-11-12");
+        final Date firtstTourEnd = Date.valueOf("2020-11-13");
+        final Date secondTourStart = Date.valueOf("2020-11-14");
+        final Date secondTourEnd = Date.valueOf("2020-11-15");
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getSecondTourStartCron().getExpression().equals("0 0 0 14 11 ?"));
+    }
+
+    @Test
+    public void shouldReturnFirstEndDatesCorns() {
+        final Date firtstTourStart = Date.valueOf("2020-11-12");
+        final Date firtstTourEnd = Date.valueOf("2020-11-13");
+        final Date secondTourStart = Date.valueOf("2020-11-14");
+        final Date secondTourEnd = Date.valueOf("2020-11-15");
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getFirstTourEndCron().getExpression().equals("0 0 0 13 11 ?"));
+    }
+
+    @Test
+    public void shouldReturnSecondEndDatesCorns() {
+        final Date firtstTourStart = Date.valueOf("2020-11-12");
+        final Date firtstTourEnd = Date.valueOf("2020-11-13");
+        final Date secondTourStart = Date.valueOf("2020-11-14");
+        final Date secondTourEnd = Date.valueOf("2020-11-15");
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getSecondTourEndCron().getExpression().equals("0 0 0 15 11 ?"));
+    }
+
+}

buisnesslogic/src/test/java/com/plannaplan/models/ExportDataTest.java

@@ -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"));
+    }
+}

buisnesslogic/src/test/java/com/plannaplan/repositories/ExchangeRepositoryTest.java

@@ -0,0 +1,69 @@
+package com.plannaplan.repositories;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Commision;
+import com.plannaplan.entities.Exchange;
+import com.plannaplan.entities.Groups;
+import com.plannaplan.entities.User;
+import com.plannaplan.services.AssignmentService;
+import com.plannaplan.services.GroupService;
+import com.plannaplan.services.UserService;
+import com.plannaplan.types.UserRoles;
+import com.plannaplan.types.WeekDay;
+
+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.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.MethodMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration
+public class ExchangeRepositoryTest{
+    @Autowired
+    private ExchangeRepository exchangeRepository;
+
+    @Autowired
+    private AssignmentService assignmentService;
+
+    @Autowired
+    private GroupService groupService;
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private CommisionRepository commisionRepository;
+
+    @Test
+    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+    public void shouldReturnMatches() {
+	final User user1 = this.userService.save(
+						 new User(null, null, "shouldReturnMatches@ExchangeRepository.test", "123454", UserRoles.STUDENT, 451));
+	final Groups group1 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.MONDAY, null));
+	final Commision commision1 = this.commisionRepository.save(new Commision(user1));
+	final User user2 = this.userService.save(
+						 new User(null, null, "shouldReturnMatches@ExchangeRepository.test", "123454", UserRoles.STUDENT, 451));
+	final Groups group2 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.MONDAY, null));
+	final Commision commision2 = this.commisionRepository.save(new Commision(user2));
+	final Assignment assignmentUser1 = this.assignmentService.save(new Assignment(group1, commision1));
+	final Assignment assignmentUser2 = this.assignmentService.save(new Assignment(group2, commision2));
+
+	this.assignmentService.callAcceptAlgorythm();
+
+	this.exchangeRepository.save(new Exchange(assignmentUser1, group2));
+	this.exchangeRepository.save(new Exchange(assignmentUser2, group1));
+
+	final List<Object[]> exchangeRepoMatches = this.exchangeRepository.getMatches();
+	assertTrue(exchangeRepoMatches.size() == 2);
+    }
+}

buisnesslogic/src/test/java/com/plannaplan/repositories/UserRepositoryTest.java

@@ -0,0 +1,52 @@
+package com.plannaplan.repositories;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Optional;
+
+import com.plannaplan.entities.User;
+import com.plannaplan.services.UserService;
+import com.plannaplan.types.UserRoles;
+
+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;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration
+public class UserRepositoryTest {
+    
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Test
+    public void shouldReturnByAuthorityWithGivenEmail(){
+        final String email = "shouldReturnByAuthorityWithGivenEmail@UserRepository.Test";
+        final String usosId = "45678";
+        final User user = this.userService.save(new User("shouldReturnByAuthority", "WithGivenEmail", email, usosId, UserRoles.TEST_USER));
+
+        final Optional<User> response = this.userRepository.getByAuthority(email);
+        assertTrue(response.get().getEmail().equals(email));
+        assertTrue(response.get().getUsosId().equals(usosId));
+        assertTrue(response.get().getId().equals(user.getId())); 
+    }
+
+    @Test
+    public void shouldReturnByAuthorityWithUsosId(){
+        final String email = "shouldReturnByAuthorityWithUsosId@UserRepository.Test";
+        final String usosId = "45678";
+        final User user = this.userService.save(new User("shouldReturnByAuthority", "WithGivenEmail", email, usosId, UserRoles.TEST_USER));
+
+        final Optional<User> response = this.userRepository.getByAuthority(usosId);
+        assertTrue(response.get().getEmail().equals(email)); 
+        assertTrue(response.get().getUsosId().equals(usosId));
+        assertTrue(response.get().getId().equals(user.getId())); 
+    }
+}

buisnesslogic/src/test/java/com/plannaplan/services/AssignmentServiceTest.java

@@ -2,18 +2,27 @@ package com.plannaplan.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.MethodMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.junit.Assert.assertTrue;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.stream.IntStream;
 
 import com.plannaplan.entities.Assignment;
 import com.plannaplan.entities.Commision;
+import com.plannaplan.entities.Groups;
 import com.plannaplan.entities.User;
 import com.plannaplan.types.UserRoles;
+import com.plannaplan.types.WeekDay;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.junit.runner.RunWith;
@@ -29,6 +38,8 @@ public class AssignmentServiceTest {
     private CommisionService comServie;
     @Autowired
     private UserService userService;
+    @Autowired
+    private GroupService groupService;
 
     @Test
     public void shouldSaveAssignment() {
@@ -56,6 +67,98 @@ public class AssignmentServiceTest {
         assertTrue("Returned list size should be 1", response.size() == 1);
     }
 
+    @Test
+    @Ignore
+    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+    public void shouldPerformAcceptAlgorythm() {
+        final Random generator = new Random();
+
+        final List<Groups> groups = new ArrayList<>();
+
+        IntStream.range(0, 418).forEach(i -> {
+            groups.add(this.groupService.save(new Groups(generator.nextInt(80) + 20, null, null,
+                    generator.nextInt(9) * 30 + 9 * 30, WeekDay.getDay(generator.nextInt(5)), null)));
+        });
+
+        IntStream.range(0, 1700).forEach(i -> {
+            final User user = this.userService.save(new User(null, null,
+                    "shouldPerformAcceptAlgorythm-" + UUID.randomUUID().toString() + "@AssignmentService.test", null,
+                    UserRoles.STUDENT, generator.nextInt(400) + 100));
+            final Commision com = this.comServie.save(new Commision(user));
+            IntStream.range(0, 5).forEach(j -> {
+                this.service.save(new Assignment(groups.get(generator.nextInt(groups.size())), com));
+            });
+        });
+        this.service.callAcceptAlgorythm();
+    }
+
+    /**
+     * This test will also sand a mail to users as a side effect. U can check them
+     * in mailcater
+     */
+    @Test
+    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+    public void shouldNotAcceptForOnePerson() {
+        final Random generator = new Random();
+        final Groups group = this.groupService.save(new Groups(5, null, null, 840, WeekDay.MONDAY, null));
+
+        IntStream.range(0, 6).forEach(i -> {
+            final User user = this.userService.save(new User(null, null,
+                    "shouldNotAcceptForOnePerson-" + UUID.randomUUID().toString() + "@AssignmentService.test", null,
+                    UserRoles.STUDENT, generator.nextInt(400) + 100));
+
+            final Commision com = this.comServie.save(new Commision(user));
+
+            this.service.save(new Assignment(group, com));
+        });
+
+        this.service.callAcceptAlgorythm();
+
+        final List<User> users = this.userService.getStudentsSortedByRanking();
+        final User loser = users.get(users.size() - 1);
+
+        assertTrue(loser.getStudentRegisteredGrups().size() == 0);
+
+        users.forEach(u -> {
+            final Commision com = this.comServie.getNewestCommision(u).get();
+            final List<Assignment> assignments = com.getAssignments();
+            if (u.getId() == loser.getId()) {
+                assertTrue(!assignments.get(0).isAccepted());
+            } else {
+                assertTrue(assignments.get(0).isAccepted());
+            }
+        });
+
+    }
+
+    @Test
+    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+    public void shouldAcceptTwoTours() throws InterruptedException {
+        final Groups group = this.groupService.save(new Groups(5, null, null, 840, WeekDay.MONDAY, null));
+        final Groups group2 = this.groupService.save(new Groups(5, null, null, 840, WeekDay.MONDAY, null));
+
+        User user = this.userService.save(new User(null, null,
+                "shouldNotAcceptForOnePerson-" + UUID.randomUUID().toString() + "@AssignmentService.test", null,
+                UserRoles.STUDENT, 234));
+
+        final Commision com = this.comServie.save(new Commision(user));
+
+        this.service.save(new Assignment(group, com));
+
+        this.service.callAcceptAlgorythm();
+
+        user = this.userService.getById(user.getId()).get();
+        assertTrue(user.getStudentRegisteredGrups().size() == 1);
+
+        this.service.save(new Assignment(group2, com));
+
+        this.service.callAcceptAlgorythm();
+
+        user = this.userService.getById(user.getId()).get();
+        assertTrue(user.getStudentRegisteredGrups().size() == 2);
+
+    }
+
     private void addAssignmentToCommision(Commision com) {
         Assignment a = new Assignment(null, com);
         this.service.save(a);

buisnesslogic/src/test/java/com/plannaplan/services/ConfiguratorServiceTest.java

@@ -2,15 +2,26 @@ package com.plannaplan.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.MethodMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.sql.Date;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ScheduledFuture;
 
 import com.plannaplan.TestApplication;
+import com.plannaplan.entities.AppConfig;
+import com.plannaplan.entities.Groups;
 import com.plannaplan.models.ConfigData;
+import com.plannaplan.models.TourData;
+import com.plannaplan.repositories.AppConfigRepository;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,6 +31,9 @@ import org.junit.runner.RunWith;
 @ContextConfiguration
 public class ConfiguratorServiceTest {
 
+    private final static String BEFORE_UPDATE_FILE = "ZajeciaBeforeUpdate.xlsx";
+    private final static String AFTER_UPDATE_FILE = "ZajeciaAfterUpdate.xlsx";
+
     @Autowired
     private ConfiguratorService configuratorService;
 
@@ -32,11 +46,21 @@ public class ConfiguratorServiceTest {
     @Autowired
     private LecturerService lecturerService;
 
+    @Autowired
+    private AppConfigRepository appConfigRepo;
+
+    @Autowired
+    private EventService eventService;
+
     @Test
     public void shouldImportDataToDataBase() {
         final InputStream inputStream = getClass().getClassLoader()
                 .getResourceAsStream(TestApplication.TEST_CONFIG_FILE);
-        final ConfigData data = new ConfigData(null, null, inputStream);
+        final ConfigData data = new ConfigData(
+                new TourData(new Date(System.currentTimeMillis()), new Date(System.currentTimeMillis() + 86400000)),
+                new TourData(new Date(System.currentTimeMillis() + 86400000),
+                        new Date(System.currentTimeMillis() + 2 * 86400000)),
+                inputStream);
         this.configuratorService.config(data);
 
         int courses_ammount = this.courseService.getCoursesAmmount();
@@ -46,4 +70,65 @@ public class ConfiguratorServiceTest {
         assertTrue(courses_ammount > 0 && groups_ammount > 0 && lecturers_ammount > 0);
     }
 
+    @Test
+    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+    public void shouldUpdatePreviousImport() {
+        final InputStream inputStream = getClass().getClassLoader()
+                .getResourceAsStream(ConfiguratorServiceTest.BEFORE_UPDATE_FILE);
+        this.configuratorService.importCoursesStream(inputStream);
+        int groups_ammount = this.groupService.getGroupsAmmount();
+
+        assertTrue(groups_ammount == 2);
+
+        final InputStream inputStream2 = getClass().getClassLoader()
+                .getResourceAsStream(ConfiguratorServiceTest.AFTER_UPDATE_FILE);
+        this.configuratorService.importCoursesStream(inputStream2);
+        int groups_ammount2 = this.groupService.getGroupsAmmount();
+
+        Optional<Groups> newGroup = this.groupService.find(456458, 3);
+        Optional<Groups> updateGroup = this.groupService.find(456457, 2);
+
+        assertTrue(groups_ammount2 == 3);
+        assertTrue(newGroup.isPresent());
+        assertTrue(updateGroup.get().getLecturer().getSurname().equals("Murawski"));
+        assertTrue(updateGroup.get().getLecturer().getName().equals("Roman"));
+        assertTrue(updateGroup.get().getLecturer().getTitle().equals("prof. dr hab."));
+    }
+
+    @Test
+    public void shouldRetrunNewestConfig() throws InterruptedException {
+        final Date dateToCheck = new Date(System.currentTimeMillis());
+        this.appConfigRepo.save(new AppConfig(new TourData(null, null), new TourData(null, null)));
+        Thread.sleep(2000);
+        this.appConfigRepo.save(new AppConfig(new TourData(dateToCheck, null), new TourData(null, null)));
+
+        AppConfig response = this.configuratorService.getCurrentConfig();
+        assertTrue(response.getFirstTourStart() != null);
+
+    }
+
+    @Test
+    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+    public void shlouldScheduleTaskWhenSetTourDate()
+            throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+        final InputStream inputStream = getClass().getClassLoader()
+                .getResourceAsStream(TestApplication.TEST_CONFIG_FILE);
+        final ConfigData data = new ConfigData(
+                new TourData(new Date(System.currentTimeMillis()), new Date(System.currentTimeMillis() + 86400000)),
+                new TourData(new Date(System.currentTimeMillis() + 86400000),
+                        new Date(System.currentTimeMillis() + 2 * 86400000)),
+                inputStream);
+        this.configuratorService.config(data);
+
+        final Field reader = EventService.class.getDeclaredField("jobsMap");
+        reader.setAccessible(true);
+
+        @SuppressWarnings("unchecked")
+        final Map<Integer, ScheduledFuture<?>> map = (Map<Integer, ScheduledFuture<?>>) reader.get(this.eventService);
+
+        assertTrue(map.size() == 2);
+        assertTrue(map.get(EventService.FIRST_TOUR_SCHEDULE).isDone() == false);
+        assertTrue(map.get(EventService.SECOND_TOUR_SCHEDULE).isDone() == false);
+    }
+
 }

buisnesslogic/src/test/java/com/plannaplan/services/EmailServiceTest.java

@@ -0,0 +1,29 @@
+package com.plannaplan.services;
+
+import org.junit.Ignore;
+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;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration
+public class EmailServiceTest {
+
+    @Autowired
+    private EmailService service;
+
+    @Test
+    @Ignore
+    /**
+     * This test is ignored because we don't have way to check if email has arrived.
+     * Check mailchater to check this manually
+     */
+    public void shouldSendSimpleEmail() {
+        this.service.sendMail("shouldSendSimpleEmail@EmailService.test", "This is totally simple message");
+    }
+
+}

buisnesslogic/src/test/java/com/plannaplan/services/ExchangeServiceTest.java

@@ -0,0 +1,208 @@
+package com.plannaplan.services;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Commision;
+import com.plannaplan.entities.Exchange;
+import com.plannaplan.entities.Groups;
+import com.plannaplan.entities.User;
+import com.plannaplan.models.MatchData;
+import com.plannaplan.repositories.CommisionRepository;
+import com.plannaplan.types.UserRoles;
+import com.plannaplan.types.WeekDay;
+
+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.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.MethodMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration
+public class ExchangeServiceTest {
+
+	@Autowired
+	private AssignmentService assignmentService;
+
+	@Autowired
+	private GroupService groupService;
+
+	@Autowired
+	private UserService userService;
+
+	@Autowired
+	private CommisionRepository commisionRepository;
+
+	@Autowired
+	private ExchangeService exchangeService;
+
+	@Test
+	@DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+	public void shouldReturnUniqMatches() {
+		final User user1 = this.userService.save(
+				new User(null, null, "shouldReturnMatches@ExchangeRepository.test", "123454", UserRoles.STUDENT, 451));
+		final Groups group1 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.MONDAY, null));
+		final Commision commision1 = this.commisionRepository.save(new Commision(user1));
+		final User user2 = this.userService.save(
+				new User(null, null, "shouldReturnMatches@ExchangeRepository.test", "123454", UserRoles.STUDENT, 451));
+		final Groups group2 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.MONDAY, null));
+		final Commision commision2 = this.commisionRepository.save(new Commision(user2));
+		final Assignment assignmentUser1 = this.assignmentService.save(new Assignment(group1, commision1));
+		final Assignment assignmentUser2 = this.assignmentService.save(new Assignment(group2, commision2));
+
+		this.assignmentService.callAcceptAlgorythm();
+
+		this.exchangeService.save(new Exchange(assignmentUser1, group2));
+		this.exchangeService.save(new Exchange(assignmentUser2, group1));
+
+		final List<MatchData> uniqList = this.exchangeService.getMatches();
+		assertTrue(uniqList.size() == 1);
+	}
+
+	@Test
+	@DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+	public void shouldPerformExchange() throws Exception{
+		User user1 = this.userService.save(
+				new User(null, null, "1shouldReturnMatches@ExchangeRepository.test", "123454", UserRoles.STUDENT, 451));
+		final Long user1Id = user1.getId();
+		final Groups group1 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.MONDAY, null));
+		final Commision commision1 = this.commisionRepository.save(new Commision(user1));
+
+		User user2 = this.userService.save(
+				new User(null, null, "2shouldReturnMatches@ExchangeRepository.test", "123455", UserRoles.STUDENT, 452));
+		final Long user2Id = user2.getId();
+		final Groups group2 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.THURSDAY, null));
+		final Commision commision2 = this.commisionRepository.save(new Commision(user2));
+
+		User user3 = this.userService.save(
+				new User(null, null, "3shouldReturnMatches@ExchangeRepository.test", "123456", UserRoles.STUDENT, 453));
+		final Long user3Id = user3.getId();
+		final Groups group3 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.WEDNESDAY, null));
+		final Commision commision3 = this.commisionRepository.save(new Commision(user3));
+
+		User user4 = this.userService.save(
+				new User(null, null, "2shouldReturnMatches@ExchangeRepository.test", "123457", UserRoles.STUDENT, 455));
+		final Long user4Id = user4.getId();
+		final Groups group4 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.FRIDAY, null));
+		final Commision commision4 = this.commisionRepository.save(new Commision(user4));
+
+		final Assignment assignmentUser1 = this.assignmentService.save(new Assignment(group1, commision1));
+		final Assignment assignmentUser2 = this.assignmentService.save(new Assignment(group2, commision2));
+		final Assignment assignmentUser3 = this.assignmentService.save(new Assignment(group2, commision3));
+		final Assignment assignmentUser4 = this.assignmentService.save(new Assignment(group4, commision4));
+
+		this.assignmentService.callAcceptAlgorythm();
+
+		this.exchangeService.save(new Exchange(assignmentUser1, group2));
+		Thread.sleep(1000);
+		this.exchangeService.save(new Exchange(assignmentUser2, group1));
+		Thread.sleep(1000);
+		this.exchangeService.save(new Exchange(assignmentUser3, group1));
+		Thread.sleep(1000);
+		this.exchangeService.save(new Exchange(assignmentUser4, group3));
+
+		this.exchangeService.performExchange();
+
+		user1 = this.userService.getById(user1Id).get();
+		Thread.sleep(1000);
+		user2 = this.userService.getById(user2Id).get();
+		Thread.sleep(1000);
+		user3 = this.userService.getById(user3Id).get();
+		Thread.sleep(1000);
+		user4 = this.userService.getById(user4Id).get();
+		Thread.sleep(1000);
+
+		final List<Long> listGroupsOfUser1 = user1.getStudentRegisteredGrups().stream().map(Groups::getId)
+				.collect(Collectors.toList());
+		final List<Long> listGroupsOfUser2 = user2.getStudentRegisteredGrups().stream().map(Groups::getId)
+				.collect(Collectors.toList());
+		final List<Long> listGroupsOfUser3 = user3.getStudentRegisteredGrups().stream().map(Groups::getId)
+				.collect(Collectors.toList());
+		final List<Long> listGroupsOfUser4 = user4.getStudentRegisteredGrups().stream().map(Groups::getId)
+				.collect(Collectors.toList());
+
+		assertTrue(listGroupsOfUser1.contains(group2.getId()));
+		assertTrue(listGroupsOfUser2.contains(group1.getId()));
+		assertTrue(listGroupsOfUser3.contains(group2.getId()));
+		assertTrue(listGroupsOfUser4.contains(group4.getId()));
+	}
+
+	@Test
+	@DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+	public void shouldRemoveOutDatedExchnages() throws Exception {
+		User user1 = this.userService.save(
+				new User(null, null, "1shouldReturnMatches@ExchangeRepository.test", "123454", UserRoles.STUDENT, 451));
+		final Long user1Id = user1.getId();
+		final Groups group1 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.MONDAY, null));
+		final Commision commision1 = this.commisionRepository.save(new Commision(user1));
+
+		User user2 = this.userService.save(
+				new User(null, null, "2shouldReturnMatches@ExchangeRepository.test", "123455", UserRoles.STUDENT, 452));
+		final Long user2Id = user2.getId();
+		final Groups group2 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.THURSDAY, null));
+		final Commision commision2 = this.commisionRepository.save(new Commision(user2));
+
+		final Groups group3 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.THURSDAY, null));
+		final Groups group4 = this.groupService.save(new Groups(123, "A2-3", null, 430, WeekDay.THURSDAY, null));
+
+		final Assignment assignmentUser1 = this.assignmentService.save(new Assignment(group1, commision1));
+		final Assignment assignmentUser2 = this.assignmentService.save(new Assignment(group2, commision2));
+
+		this.assignmentService.callAcceptAlgorythm();
+
+		this.exchangeService.save(new Exchange(assignmentUser1, group2));
+		Thread.sleep(1000);
+		this.exchangeService.save(new Exchange(assignmentUser2, group1));
+		Thread.sleep(1000);
+		this.exchangeService.save(new Exchange(assignmentUser1, group3));
+		Thread.sleep(1000);
+		this.exchangeService.save(new Exchange(assignmentUser1, group4));
+		Thread.sleep(1000);
+
+		this.exchangeService.performExchange();
+
+		user1 = this.userService.getById(user1Id).get();
+		user2 = this.userService.getById(user2Id).get();
+
+		final List<Long> listGroupsOfUser1 = user1.getStudentRegisteredGrups().stream().map(Groups::getId)
+				.collect(Collectors.toList());
+		final List<Long> listGroupsOfUser2 = user2.getStudentRegisteredGrups().stream().map(Groups::getId)
+				.collect(Collectors.toList());
+
+		assertTrue(listGroupsOfUser1.contains(group2.getId()));
+		assertTrue(listGroupsOfUser2.contains(group1.getId()));
+		assertTrue(this.exchangeService.getAllExchanges().size() == 2);
+	}
+
+    @Test
+    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+    public void shouldSortExchanges() throws Exception{
+	final List<MatchData> listMatrix = new ArrayList<>();
+	final Exchange exchange1 = new Exchange(null, null);
+	Thread.sleep(1000);
+	final Exchange exchange2 = new Exchange(null, null);
+	Thread.sleep(1000);
+	final Exchange exchange3 = new Exchange(null, null);
+	Thread.sleep(1000);
+	final Exchange exchange4 = new Exchange(null, null);
+	Thread.sleep(1000);
+
+	listMatrix.add(new MatchData(exchange2, exchange4));
+	listMatrix.add(new MatchData(exchange1, exchange3));
+
+	final List<MatchData> matchDataListSorted = listMatrix.stream().sorted((m1, m2) -> -1 * m1.compare(m2)).collect(Collectors.toList());
+
+	assertTrue(listMatrix.get(0).equals(matchDataListSorted.get(1)));
+	assertTrue(listMatrix.get(1).equals(matchDataListSorted.get(0)));
+	assertTrue(matchDataListSorted.size() == 2);
+    }
+}

buisnesslogic/src/test/java/com/plannaplan/services/UserServiceTest.java

@@ -2,6 +2,8 @@ package com.plannaplan.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.MethodMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -100,4 +102,20 @@ public class UserServiceTest {
 
         assertTrue(user.getName() != "Tom");
     }
+    
+    @Test
+    public void shouldReturnAdminExists() {
+        final String email = "shouldReturnAdminExists@UserService.test";
+        this.userService.save(new User("AdminTom", "Smieszny", email, UserRoles.ADMIN));
+        assertTrue(userService.adminExists());
+    }
+    
+    
+    @Test
+    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+     public void shouldReturnNotAdminExists() {
+        final String email = "shouldReturnNotAdminExists@UserService.test";
+        this.userService.save(new User("StudentTom", "Smieszny", email, UserRoles.STUDENT));
+        assertTrue(userService.adminExists() == false);
+    }
 }

buisnesslogic/src/test/java/com/plannaplan/services/UsosApiServiceTest.java

@@ -0,0 +1,38 @@
+package com.plannaplan.services;
+
+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 static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+
+import com.plannaplan.models.UserApiResponse;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration
+public class UsosApiServiceTest {
+
+    @Autowired
+    private UsosApiService service;
+
+    @Test
+    @Ignore
+    public void shouldReturnPersonalData() throws IOException, InterruptedException, ExecutionException {
+
+        final UserApiResponse response = this.service.getUserData("499054");
+
+        assertTrue(response.getName().equals("Marcin"));
+        assertTrue(response.getSurname().equals("Woźniak"));
+
+    }
+
+}

buisnesslogic/src/test/java/com/plannaplan/types/GroupTypeTest.java

@@ -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);
+    }
+
+}

buisnesslogic/src/test/resources/application.properties

@@ -8,5 +8,14 @@ spring.jpa.hibernate.ddl-auto=create-drop
 spring.jackson.serialization.fail-on-empty-beans=false
 spring.main.allow-bean-definition-overriding=true
 spring.jackson.default-property-inclusion = NON_NULL
+spring.mail.host=localhost
+spring.mail.port=1025
+spring.mail.properties.mail.smtp.auth=false
+spring.mail.properties.mail.smtp.starttls.enable=false
+
+plannaplan.email = plannaplan.kontakt@gmail.com
+plannaplan.apiurl = https://usosapidemo.amu.edu.pl
+plannaplan.apikey=${PLANNAPLAN_CONSUMER_KEY}
+plannaplan.apisecret=${PLANNAPLAN_CONSUMER_SECRET}
 
 server.port=1285

gettoken.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python
 import webbrowser
 from http.server import BaseHTTPRequestHandler, HTTPServer, SimpleHTTPRequestHandler
 import urllib.parse as urlparse
@@ -5,10 +6,14 @@ from urllib.parse import parse_qs
 import sys
 import requests as r
 
-if len(sys.argv) > 1 :
-    API_ADDRESS = "http://" + sys.argv[1] + ":1285"
-else:
-    API_ADDRESS = "http://localhost:1285"
+no_browser = False
+API_ADDRESS = "http://localhost:1285"
+
+if len(sys.argv) > 1 :    
+    if (sys.argv[1] == "no-browser" or sys.argv[2] == "no-browser"):
+        no_browser = True
+    else:
+        API_ADDRESS = "http://" + sys.argv[1] + ":1285"
 
 PORT = 3000
 
@@ -38,5 +43,6 @@ def wait_for_request(server_class=HTTPServer,
 url = 'https://cas.amu.edu.pl/cas/login?service=http://localhost:' + \
     str(PORT) + '&locale=pl'
 
-webbrowser.open_new_tab(url)
+if no_browser == False:
+    webbrowser.open_new_tab(url)
 wait_for_request()

init.sql

@@ -1 +1,2 @@
-CREATE DATABASE IF NOT EXISTS test;
+CREATE DATABASE IF NOT EXISTS test;
+SET GLOBAL time_zone = '+1:00';

restservice/pom.xml

@@ -17,21 +17,21 @@
   <url>http://www.example.com</url>
 
   <profiles>
-      <profile>
-          <id>dev</id>
-          <properties>
-              <activatedProperties>dev</activatedProperties>
-          </properties>
-          <activation>
-              <activeByDefault>true</activeByDefault>
-          </activation>
-      </profile>
-      <profile>
-          <id>prod</id>
-          <properties>
-              <activatedProperties>prod</activatedProperties>
-          </properties>
-      </profile>
+    <profile>
+      <id>dev</id>
+      <properties>
+        <activatedProperties>dev</activatedProperties>
+      </properties>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
+    <profile>
+      <id>prod</id>
+      <properties>
+        <activatedProperties>prod</activatedProperties>
+      </properties>
+    </profile>
   </profiles>
 
   <properties>
@@ -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>

restservice/src/main/java/com/plannaplan/App.java

@@ -1,8 +1,11 @@
 package com.plannaplan;
 
 import java.io.InputStream;
+import java.sql.Date;
+import java.util.Random;
 
 import com.plannaplan.models.ConfigData;
+import com.plannaplan.models.TourData;
 import com.plannaplan.entities.User;
 import com.plannaplan.services.UserService;
 import com.plannaplan.types.UserRoles;
@@ -14,9 +17,15 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 
 import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
 import com.plannaplan.services.ConfiguratorService;
 
+/**
+ * Root class of Application.
+ */
 @SpringBootApplication
+@EnableScheduling
 public class App {
 
         public final static String API_VERSION = "v1";
@@ -25,7 +34,7 @@ public class App {
         private ConfiguratorService contrl;
 
         @Autowired
-        UserService userService;
+        private UserService userService;
 
         @Value("${plannaplan.dev}")
         private boolean isDev;
@@ -38,19 +47,32 @@ public class App {
                 SpringApplication.run(App.class, args);
         }
 
+        /**
+         * method to import mocked data to testing app after startz. It is called only
+         * in dev profile. Note that tests are written to this app state so if you
+         * change ConfigData it can have an impact to other tests like
+         * CommisionControllerTest
+         */
         @EventListener(ApplicationReadyEvent.class)
         public void importData() {
                 System.out.println(Logo.getInitInfo(isDev));
 
                 if (this.isDev) {
-                        InputStream inputStream = getClass().getClassLoader().getResourceAsStream("Zajecia.xlsx");
-                        ConfigData data = new ConfigData(null, null, inputStream);
+                        final Random generator = new Random();
+                        final InputStream inputStream = getClass().getClassLoader().getResourceAsStream("Zajecia.xlsx");
+                        final ConfigData data = new ConfigData(
+                                        new TourData(new Date(System.currentTimeMillis() - 86400000),
+                                                        new Date(System.currentTimeMillis())),
+                                        new TourData(new Date(System.currentTimeMillis() + 86400000),
+                                                        new Date(System.currentTimeMillis() + 2 * 86400000)),
+                                        inputStream);
                         this.contrl.config(data);
 
                         User newuser = new User();
                         newuser.setEmail("tommy@st.amu.edu.pl");
                         newuser.setName("Tomek");
                         newuser.setSurname("Atomek");
+                        newuser.setRanking(generator.nextInt(400) + 100);
                         newuser.setRole(UserRoles.STUDENT);
                         this.userService.save(newuser);
 
@@ -58,6 +80,7 @@ public class App {
                         newuser.setEmail("robercik@st.amu.edu.pl");
                         newuser.setName("Robert");
                         newuser.setSurname("Głowacki");
+                        newuser.setRanking(generator.nextInt(400) + 100);
                         newuser.setRole(UserRoles.STUDENT);
                         this.userService.save(newuser);
 
@@ -65,6 +88,7 @@ public class App {
                         newuser.setEmail("mewa@st.amu.edu.pl");
                         newuser.setName("Poznanska");
                         newuser.setSurname("Mewa");
+                        newuser.setRanking(generator.nextInt(400) + 100);
                         newuser.setRole(UserRoles.STUDENT);
                         this.userService.save(newuser);
 
@@ -72,6 +96,7 @@ public class App {
                         newuser.setEmail("tkul2@st.amu.edu.pl");
                         newuser.setName("Tomasz");
                         newuser.setSurname("Kula");
+                        newuser.setRanking(generator.nextInt(400) + 100);
                         newuser.setRole(UserRoles.STUDENT);
                         this.userService.save(newuser);
 
@@ -79,6 +104,7 @@ public class App {
                         newuser.setEmail("annana@st.amu.edu.pl");
                         newuser.setName("Anna");
                         newuser.setSurname("Na");
+                        newuser.setRanking(generator.nextInt(400) + 100);
                         newuser.setRole(UserRoles.STUDENT);
                         this.userService.save(newuser);
 
@@ -86,6 +112,7 @@ public class App {
                         newuser.setEmail("mnart@st.amu.edu.pl");
                         newuser.setName("Marta");
                         newuser.setSurname("Narta");
+                        newuser.setRanking(generator.nextInt(400) + 100);
                         newuser.setRole(UserRoles.STUDENT);
                         this.userService.save(newuser);
 
@@ -93,6 +120,7 @@ public class App {
                         newuser.setEmail("zmineniane@st.amu.edu.pl");
                         newuser.setName("Tutaj");
                         newuser.setSurname("Koncza");
+                        newuser.setRanking(generator.nextInt(400) + 100);
                         newuser.setRole(UserRoles.STUDENT);
                         this.userService.save(newuser);
 
@@ -100,6 +128,7 @@ public class App {
                         newuser.setEmail("mi@st.amu.edu.pl");
                         newuser.setName("Mi");
                         newuser.setSurname("Sie");
+                        newuser.setRanking(generator.nextInt(400) + 100);
                         newuser.setRole(UserRoles.STUDENT);
                         this.userService.save(newuser);
 
@@ -107,6 +136,13 @@ public class App {
                         newuser.setEmail("pms@st.amu.edu.pl");
                         newuser.setName("Pomysly");
                         newuser.setSurname("Sad");
+                        newuser.setRanking(generator.nextInt(400) + 100);
+                        newuser.setRole(UserRoles.STUDENT);
+                        this.userService.save(newuser);
+
+                        newuser = new User();
+                        newuser.setEmail("iamnull@st.amu.edu.pl");
+                        newuser.setRanking(generator.nextInt(400) + 100);
                         newuser.setRole(UserRoles.STUDENT);
                         this.userService.save(newuser);
                 }

restservice/src/main/java/com/plannaplan/Logo.java

@@ -3,6 +3,9 @@ package com.plannaplan;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
+/**
+ * Class to generate logo string on start application and make logs info
+ */
 public class Logo {
 
     public static final String ANSI_RESET = "\u001B[0m";
@@ -35,6 +38,11 @@ ANSI_RESET;
     }
 
 
+    /**
+     * return init string to log
+     * @param isDev is spring profile dev
+     * @return string to print in log
+     */
     public static String getInitInfo(boolean isDev){
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");  
         LocalDateTime now = LocalDateTime.now(); 
@@ -45,6 +53,11 @@ ANSI_RESET;
         return ANSI_BLACK + dtf.format(now) + ANSI_YELLOW + "  plannaplan" + ANSI_RESET + " initializing [" +ANSI_BLUE + "prod" + ANSI_RESET +"]";
     }
 
+    /**
+     * return start string to log
+     * @param isDev is spring profile dev
+     * @return string to print in log
+     */
     public static String getStartedInfo(boolean isDev){
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");  
         LocalDateTime now = LocalDateTime.now(); 

restservice/src/main/java/com/plannaplan/Swagger2Config.java

@@ -18,20 +18,19 @@ import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
+/**
+ * Config class of Swagger to generate rest api documentation
+ */
 @Configuration
 @EnableSwagger2
 public class Swagger2Config extends WebMvcConfigurationSupport {
 
     @Bean
     public Docket createRestApi() {
-        Parameter authHeader = new ParameterBuilder()
-        .parameterType("header")
-        .name("Authorization")
-        .modelRef(new ModelRef("string"))
-        .build();
+        Parameter authHeader = new ParameterBuilder().parameterType("header").name("Authorization")
+                .modelRef(new ModelRef("string")).build();
         return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select()
-                .apis(RequestHandlerSelectors.basePackage("com.plannaplan")).paths(PathSelectors.any())
-                .build()
+                .apis(RequestHandlerSelectors.basePackage("com.plannaplan")).paths(PathSelectors.any()).build()
                 .globalOperationParameters(Collections.singletonList(authHeader));
     }
 

restservice/src/main/java/com/plannaplan/controllers/CommisionController.java

@@ -12,19 +12,26 @@ 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;
 import com.plannaplan.services.CommisionService;
+import com.plannaplan.services.ConfiguratorService;
 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;
@@ -35,11 +42,20 @@ 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;
 
+/**
+ * Rest controller to Commision and Assignment related endpoints. More detailed
+ * api docs is available via swagger
+ */
 @RestController
 @CrossOrigin
 @RequestMapping("/api/" + App.API_VERSION + "/commisions")
@@ -55,9 +71,17 @@ public class CommisionController extends TokenBasedController {
         @Autowired
         private AssignmentService assignmentService;
 
+        @Autowired
+        private ConfiguratorService configuratorService;
+
         public CommisionController() {
         }
 
+        /**
+         * @param groups to make assignmetns
+         * @param userId user to assign to groups
+         * @return was operations success
+         */
         @PostMapping(value = { "/user", "/user/{id}" })
         @ApiOperation(value = "Create commision with assignents to given groups. If group doesn't exist error will be thrown")
         public ResponseEntity<String> addCommision(
@@ -65,7 +89,7 @@ public class CommisionController extends TokenBasedController {
                         @PathVariable(name = "id", required = false) Long userId) {
 
                 try {
-
+                        final AppState appState = this.configuratorService.getCurrentConfig().getCurrentState();
                         final User asker = this.getCurrentUser()
                                         .orElseThrow(() -> new UserNotFoundException("Invalid token"));
 
@@ -75,23 +99,51 @@ public class CommisionController extends TokenBasedController {
                                         : asker;
 
                         Assert.isTrue((asker.getRole() == UserRoles.DEANERY && user.getRole() == UserRoles.STUDENT
-                                        || (asker.getId().equals(user.getId()) && user.getRole() == UserRoles.STUDENT)),
+                                        && appState == AppState.NO_TOUR
+                                        || (asker.getId().equals(user.getId()) && user.getRole() == UserRoles.STUDENT
+                                                        && appState != AppState.NO_TOUR)),
                                         "Incorrect attempt to change plan");
 
                         Optional<Long> notExistingGroup = this.groupServcicxe.findNotExistingGroup(groups);
                         Assert.isTrue(!notExistingGroup.isPresent(), "Group "
                                         + notExistingGroup.orElse(Long.MIN_VALUE).toString() + "doesn't exist");
 
-                        final Commision com = new Commision(user);
-                        this.commisionService.save(com);
+                        final Optional<Commision> comPrev = this.commisionService.getNewestCommision(user);
+                        final Commision com = new Commision(user, asker);
+
+                        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);
                         });
 
+                        boolean isBad = false;
+                        if (comPrev.isPresent()) {
+                                final Iterator<Assignment> it = comPrev.get().getAssignments().iterator();
+
+                                while (it.hasNext() && !isBad) {
+                                        final Assignment a = it.next();
+                                        if (a.isAccepted() && !addedGroups.contains(a.getGroup().getId())) {
+                                                isBad = true;
+                                        }
+                                }
+
+                        }
+
+                        if (isBad) {
+                                return new ResponseEntity<>("Error. You can't delete accepted assignmet",
+                                                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);
@@ -100,25 +152,62 @@ public class CommisionController extends TokenBasedController {
                 }
         }
 
+        /**
+         * @param groups should include groups list in response
+         * @return list of user all commisions (history of schedules)
+         * @throws UserNotFoundException if user was found
+         */
         @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);
+        }
+
+        /**
+         * @return current schedule of user indenified via token
+         * @throws Exception if incorrect role was trying to see self schedule (for
+         *                   example DEANERY don't have a schedule)
+         */
         @GetMapping("/user/schedule")
         @ApiOperation(value = "Return user current assignemts (from newest commision). STUDENT Token needs to be provided.")
         public ResponseEntity<List<AssignmentResponse>> getCurrentAssignments() throws Exception {
@@ -127,12 +216,21 @@ public class CommisionController extends TokenBasedController {
 
                 if (com.isPresent()) {
                         List<Assignment> respone = this.assignmentService.getCommisionAssignments(com.get());
-                        return new ResponseEntity<>(AssignmentResponseMappers.mapToResponse(respone), HttpStatus.OK);
+                        final HashMap<Long, Integer> ammounts = this.groupServcicxe
+                                        .getTakenPlacesOfAssignments(respone);
+                        return new ResponseEntity<>(AssignmentResponseMappers.mapToResponse(respone, ammounts),
+                                        HttpStatus.OK);
                 }
 
                 return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK);
         }
 
+        /**
+         * @param userId user id in db
+         * @param groups should commision include assigned groups list
+         * @return list of commisions for given user
+         * @throws UserNotFoundException
+         */
         @PreAuthorize("hasRole('ROLE_DEANERY')")
         @GetMapping("/user/{id}")
         @ApiOperation("Return list of commisions for given user. To be able to access this data u need to provide DEANERY token")
@@ -152,6 +250,11 @@ public class CommisionController extends TokenBasedController {
                 return new ResponseEntity<>(result, HttpStatus.OK);
         }
 
+        /**
+         * @param userId schedule to display owner
+         * @return user's schedule
+         * @throws Exception if incorrect access atempt occured
+         */
         @PreAuthorize("hasRole('ROLE_DEANERY')")
         @GetMapping("/user/{id}/schedule")
         @ApiOperation(value = "Return given user current assignemts (from newest commision). DEANERY Token needs to be provided.")
@@ -173,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");
+                }
+
+        }
+
 }

restservice/src/main/java/com/plannaplan/controllers/ConfigController.java

@@ -4,12 +4,25 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.util.Date;
 
 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;
+import com.plannaplan.security.cas.CustomUAMCasValidator;
+import com.plannaplan.security.cas.DefaultUAMCasValidator;
 import com.plannaplan.services.ConfiguratorService;
+import com.plannaplan.services.UserService;
+import com.plannaplan.types.UserRoles;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -22,7 +35,12 @@ 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
+ * available via swagger
+ */
 @RestController
 @CrossOrigin
 @RequestMapping("/api/" + App.API_VERSION + "/configurator")
@@ -30,16 +48,47 @@ import io.swagger.annotations.ApiParam;
 @Api(tags = { "ConfigController" }, value = "ConfigController", description = "All endpoints to configure an app")
 public class ConfigController {
 
+    @Value("${plannaplan.frontendUrl}")
+    private String serviceUrl;
+
+    @Value("${plannaplan.dev}")
+    private boolean isDev;
+
     @Autowired
     private ConfiguratorService contrl;
 
-    @PostMapping("/config")
+    @Autowired
+    private UserService userService;
+
+    /**
+     * @param file            file .xlsx that contains courses and groups with
+     *                        apoinnted rules
+     * @param firstTourBegin  formated string dd.MM.yyyy
+     * @param firstTourEnd    formated string dd.MM.yyyy
+     * @param secondTourBegin formated string dd.MM.yyyy
+     * @param secondTourEnd   formated string dd.MM.yyyy
+     * @return was config success
+     */
+    @PostMapping(path = "/config", consumes = { "multipart/form-data" })
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @ApiOperation("Imports data to system. To call you need to provide ADMIN token")
     public ResponseEntity<String> configApp(
-            @RequestParam("file") @ApiParam(value = "file .xlsx that contains courses and groups with apoinnted rules") MultipartFile file) {
+            @RequestParam("file") @ApiParam(value = "file .xlsx that contains courses and groups with apoinnted rules") MultipartFile file,
+            @RequestParam("firstTourBegin") @DateTimeFormat(pattern = "dd.MM.yyyy") @ApiParam(value = "Date when first tour begin in format dd.MM.yyyy") Date firstTourBegin,
+            @RequestParam("firstTourEnd") @DateTimeFormat(pattern = "dd.MM.yyyy") @ApiParam(value = "Date when first tour ends in format dd.MM.yyyy") Date firstTourEnd,
+            @RequestParam("secondTourBegin") @DateTimeFormat(pattern = "dd.MM.yyyy") @ApiParam(value = "Date when second tour begin in format dd.MM.yyyy") Date secondTourBegin,
+            @RequestParam("secondTourEnd") @DateTimeFormat(pattern = "dd.MM.yyyy") @ApiParam(value = "Date when second tour ends in format dd.MM.yyyy") Date secondTourEnd) {
         try {
-            final ConfigData data = new ConfigData(null, null, file.getInputStream());
+            if (!(firstTourBegin.before(firstTourEnd)
+                    && (firstTourEnd.before(secondTourBegin) || firstTourEnd.equals(secondTourBegin))
+                    && secondTourBegin.before(secondTourEnd))) {
+                return new ResponseEntity<>("Bad dates", HttpStatus.BAD_REQUEST);
+            }
+
+            final TourData firstTour = new TourData(firstTourBegin, firstTourEnd);
+            final TourData secondTour = new TourData(secondTourBegin, secondTourEnd);
+
+            final ConfigData data = new ConfigData(firstTour, secondTour, file.getInputStream());
             this.contrl.config(data);
             return new ResponseEntity<>("Sucess", HttpStatus.OK);
         } catch (IOException e) {
@@ -47,4 +96,100 @@ public class ConfigController {
         }
     }
 
+    /**
+     * @param firstTourBegin  formated string dd.MM.yyyy
+     * @param firstTourEnd    formated string dd.MM.yyyy
+     * @param secondTourBegin formated string dd.MM.yyyy
+     * @param secondTourEnd   formated string dd.MM.yyyy
+     * @return was operation successful
+     */
+    @PostMapping(path = "/config/tours")
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    @ApiOperation("Set tours dates. To call you need to provide ADMIN token")
+    public ResponseEntity<String> configToursApp(
+            @RequestParam("firstTourBegin") @DateTimeFormat(pattern = "dd.MM.yyyy") @ApiParam(value = "Date when first tour begin in format dd.MM.yyyy") Date firstTourBegin,
+            @RequestParam("firstTourEnd") @DateTimeFormat(pattern = "dd.MM.yyyy") @ApiParam(value = "Date when first tour ends in format dd.MM.yyyy") Date firstTourEnd,
+            @RequestParam("secondTourBegin") @DateTimeFormat(pattern = "dd.MM.yyyy") @ApiParam(value = "Date when second tour begin in format dd.MM.yyyy") Date secondTourBegin,
+            @RequestParam("secondTourEnd") @DateTimeFormat(pattern = "dd.MM.yyyy") @ApiParam(value = "Date when second tour ends in format dd.MM.yyyy") Date secondTourEnd) {
+        if (!(firstTourBegin.before(firstTourEnd)
+                && (firstTourEnd.before(secondTourBegin) || firstTourEnd.equals(secondTourBegin))
+                && secondTourBegin.before(secondTourEnd))) {
+            return new ResponseEntity<>("Bad dates", HttpStatus.BAD_REQUEST);
+        }
+
+        final TourData firstTour = new TourData(firstTourBegin, firstTourEnd);
+        final TourData secondTour = new TourData(secondTourBegin, secondTourEnd);
+
+        this.contrl.saveTours(firstTour, secondTour);
+        return new ResponseEntity<>("Sucess", HttpStatus.OK);
+    }
+
+    /**
+     * @param file file .xlsx that contains courses and groups with
+     * @return was operation successfull
+     */
+    @PostMapping(path = "/config/courses", consumes = { "multipart/form-data" })
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    @ApiOperation("Imports data to system. To call you need to provide ADMIN token")
+    public ResponseEntity<String> configAppChangeCources(
+            @RequestParam("file") @ApiParam(value = "file .xlsx that contains courses and groups with apoinnted rules") MultipartFile file) {
+        try {
+            this.contrl.importCoursesStream(file.getInputStream());
+            return new ResponseEntity<>("Sucess", HttpStatus.OK);
+        } catch (IOException e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    /**
+     * @param ticket CAS ticket to get user wuthority
+     * @return was admin created
+     */
+    @PostMapping(path = "/admin/init")
+    @ApiOperation("It can be run only in the initialization of the application. It will create admin user to manage the application.")
+    public ResponseEntity<String> initAdmin(
+            @RequestParam("ticket") @ApiParam(value = "Ticket for validation.") String ticket) {
+        if (this.userService.adminExists()) {
+            return new ResponseEntity<>("Admin had been already created.", HttpStatus.FORBIDDEN);
+        }
+
+        final CasValidator validator = isDev ? new DefaultUAMCasValidator(serviceUrl, ticket)
+                : new CustomUAMCasValidator(serviceUrl, ticket);
+
+        try {
+            final CasUserIdentity casUserIdentity = validator.validate();
+            final String usosId = casUserIdentity.getUsosId();
+            final String authority = casUserIdentity.getEmail();
+            this.userService.save(new User(null, null, authority, usosId, UserRoles.ADMIN));
+
+            return new ResponseEntity<>("Success", HttpStatus.OK);
+        } catch (CasValidationExcepiton e) {
+            return new ResponseEntity<>("CAS validation failed", HttpStatus.UNAUTHORIZED);
+        } catch (Exception e) {
+            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);
+    }
+
 }

restservice/src/main/java/com/plannaplan/controllers/CoursesController.java

@@ -9,7 +9,7 @@ import com.plannaplan.entities.Course;
 import com.plannaplan.responses.mappers.CoursesResponseMappers;
 import com.plannaplan.responses.models.CoursesDefaultResponse;
 import com.plannaplan.responses.models.CoursesWithGroupsResponse;
-import com.plannaplan.responses.models.GroupDefaultResponse;
+import com.plannaplan.responses.models.GroupWithCapacityResponse;
 import com.plannaplan.services.CourseService;
 import com.plannaplan.services.GroupService;
 import com.plannaplan.types.GroupType;
@@ -29,6 +29,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.plannaplan.responses.models.abstracts.CoursesResponse;
 
+/**
+ * Rest controller to Courses related endpoints. More detailed api docs is
+ * available via swagger
+ */
 @RestController
 @CrossOrigin
 @RequestMapping("/api/" + App.API_VERSION + "/courses")
@@ -41,6 +45,11 @@ public class CoursesController {
     @Autowired
     private GroupService groupService;
 
+    /**
+     * @param groups      should include groups in response
+     * @param takenPlaces should include groups in response
+     * @return list of all courses in system
+     */
     @GetMapping("/all")
     @ApiOperation(value = "Return all courses")
     public ResponseEntity<List<? extends CoursesResponse>> getMethodName(
@@ -53,16 +62,16 @@ public class CoursesController {
                 final List<CoursesWithGroupsResponse> response = new ArrayList<>();
 
                 courses.forEach(course -> {
-                    final List<GroupDefaultResponse> lectures = new ArrayList<>();
-                    final List<GroupDefaultResponse> classes = new ArrayList<>();
+                    final List<GroupWithCapacityResponse> lectures = new ArrayList<>();
+                    final List<GroupWithCapacityResponse> classes = new ArrayList<>();
 
                     final HashMap<Long, Integer> ammounts = this.groupService.getTakenPlaces(course.getGroups());
 
                     course.getGroups().stream().forEach(group -> {
-                        if (group.getType() == GroupType.CLASS) {
-                            classes.add(new GroupDefaultResponse(group, ammounts.get(group.getId())));
+                        if (GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS) {
+                            classes.add(new GroupWithCapacityResponse(group, ammounts.get(group.getId())));
                         } else {
-                            lectures.add(new GroupDefaultResponse(group, ammounts.get(group.getId())));
+                            lectures.add(new GroupWithCapacityResponse(group, ammounts.get(group.getId())));
                         }
                     });
 

restservice/src/main/java/com/plannaplan/controllers/DeveloperController.java

@@ -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);
+    }
+}

restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java

@@ -0,0 +1,185 @@
+package com.plannaplan.controllers;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.plannaplan.App;
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Exchange;
+import com.plannaplan.entities.Groups;
+import com.plannaplan.entities.User;
+import com.plannaplan.exceptions.UserNotFoundException;
+import com.plannaplan.responses.mappers.ExchangeResponseMappers;
+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;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+/**
+ * Rest controller to Exchange related endpoints. More detailed api docs is
+ * available via swagger
+ */
+@RestController
+@CrossOrigin
+@RequestMapping("/api/" + App.API_VERSION + "/exchanges")
+@Api(tags = { "Exchange" }, value = "Exchange", description = "Endpoint to exchange with accepted assignments.")
+public class ExchangeController extends TokenBasedController {
+
+    @Autowired
+    private GroupService groupService;
+
+    @Autowired
+    private AssignmentService assignmentService;
+
+    @Autowired
+    private ExchangeService exchangeService;
+
+    /**
+     * @param exchangeRequest mapped json body with requierd paramas (groupid and
+     *                        assignment)
+     * @return was job successfull
+     * @throws UserNotFoundException if user was not found
+     */
+    @PostMapping("/exchange")
+    @ApiOperation(value = "Creates exchange offer.")
+    public ResponseEntity<String> createExchange(
+            @ApiParam(value = "Json object that contains assignment to trade and desired group. For example: { \"assignment\": 3, \"group\":32 }") @RequestBody Map<String, Long> exchangeRequest)
+            throws UserNotFoundException {
+
+        final User asker = this.getCurrentUser().orElseThrow(() -> new UserNotFoundException("Invalid token"));
+        final Long assignmentId = exchangeRequest.get("assignment");
+        final Long groupId = exchangeRequest.get("group");
+        final List<Long> ownedGroups = asker.getStudentRegisteredGrups().stream().map(Groups::getId)
+                .collect(Collectors.toList());
+
+        if (ownedGroups.contains(groupId)) {
+            return new ResponseEntity<>("User has already got this group.", HttpStatus.BAD_REQUEST);
+        }
+
+        if (assignmentId == null || groupId == null) {
+            return new ResponseEntity<>("Some of values are missing", HttpStatus.BAD_REQUEST);
+        }
+
+        final Optional<Assignment> assignment = this.assignmentService.getById(assignmentId);
+        final Optional<Groups> group = this.groupService.getGroupById(groupId);
+
+        if (assignment.isEmpty() || group.isEmpty()) {
+            return new ResponseEntity<>("Some of provided value does not exist.", HttpStatus.BAD_REQUEST);
+        }
+
+        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<>(
+                    "Some of problems appeared. Check if you have access to given assignment and if it is accepted or the exchange has not been already added.",
+                    HttpStatus.BAD_REQUEST);
+        }
+
+        this.exchangeService.save(new Exchange(assignmentInstance, groupInstance));
+
+        return new ResponseEntity<>("Success", HttpStatus.OK);
+    }
+
+    /**
+     * @param offerId id to delwete from db
+     * @return was jub successful
+     * @throws UserNotFoundException if user was not found
+     */
+    @DeleteMapping("/exchange/{id}")
+    @ApiOperation(value = "Delete exchange offer")
+    public ResponseEntity<String> deleteExchange(@PathVariable(name = "id", required = false) Long offerId)
+            throws UserNotFoundException {
+
+        final User asker = this.getCurrentUser().orElseThrow(() -> new UserNotFoundException("Invalid token"));
+
+        final Optional<Exchange> exchange = this.exchangeService.getById(offerId);
+
+        if (exchange.isEmpty()) {
+            return new ResponseEntity<>("Given offer does not exist.", HttpStatus.BAD_REQUEST);
+        }
+
+        final Exchange exchangeToDelete = exchange.get();
+
+        if (!(exchangeToDelete.getOwnedAssignment().getCommision().getCommisionOwner().getId().equals(asker.getId()))) {
+            return new ResponseEntity<>("You have not permission for that action.", HttpStatus.BAD_REQUEST);
+        }
+
+        this.exchangeService.deleteExchange(exchangeToDelete);
+        return new ResponseEntity<>("Success", HttpStatus.OK);
+    }
+
+    /**
+     * @return return all user's exchange offers
+     * @throws UserNotFoundException iF user was not found
+     */
+    @GetMapping("/exchange/all")
+    @ApiOperation(value = "Get exchange offers")
+    public ResponseEntity<List<ExchangeResponse>> getExchange() throws UserNotFoundException {
+
+        final User asker = this.getCurrentUser().orElseThrow(() -> new UserNotFoundException("Invalid token"));
+
+        final List<Exchange> response = exchangeService.getByUserId(asker.getId());
+        final List<ExchangeResponse> listOfResponses = ExchangeResponseMappers.mapToDefaultResponse(response);
+
+        return new ResponseEntity<>(listOfResponses, HttpStatus.OK);
+    }
+
+    /**
+     * @param offerId id of exchange in db
+     * @return Exchage response
+     * @throws UserNotFoundException if user was not found
+     */
+    @GetMapping("/exchange/{id}")
+    @ApiOperation(value = "Get exchange offer")
+    public ResponseEntity<ExchangeResponse> getExchangeById(@PathVariable(name = "id", required = false) Long offerId)
+            throws UserNotFoundException {
+
+        final User asker = this.getCurrentUser().orElseThrow(() -> new UserNotFoundException("Invalid token"));
+
+        final Optional<Exchange> exchange = this.exchangeService.getById(offerId);
+
+        if (exchange.isEmpty()) {
+            return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
+        }
+
+        final Exchange exchangeInstance = exchange.get();
+        if (!exchangeInstance.getOwnerId().equals(asker.getId())) {
+            return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
+        }
+
+        return new ResponseEntity<>(new ExchangeResponse(exchangeInstance), HttpStatus.OK);
+    }
+}

restservice/src/main/java/com/plannaplan/controllers/GroupController.java

@@ -2,6 +2,7 @@ package com.plannaplan.controllers;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 
 import com.plannaplan.App;
 import com.plannaplan.entities.Groups;
@@ -13,9 +14,11 @@ import com.plannaplan.services.GroupService;
 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.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,9 +27,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+/**
+ * Rest controller to Groups related endpoints. More detailed api docs is
+ * available via swagger
+ */
 @RestController
 @CrossOrigin
-
 @RequestMapping("/api/" + App.API_VERSION + "/groups")
 @Api(tags = {
         "Group" }, value = "Group", description = "Enpoints to deal with gorups. Group is related directly to course and can be either class and lecture")
@@ -34,6 +40,12 @@ public class GroupController {
     @Autowired
     private GroupService groupService;
 
+    /**
+     * @param id          course to display with groups
+     * @param capacity    should include capaticty in response
+     * @param takenPlaces should include takenPlaces in response
+     * @return CourseWithGroupsResponse
+     */
     @GetMapping("/course/{id}")
     @ApiOperation(value = "Return list of lectures and classes (if present) given course")
     public ResponseEntity<CourseWithGroupsResponse<? extends GroupDefaultResponse>> getCourses(
@@ -57,4 +69,25 @@ public class GroupController {
         }
         return new ResponseEntity<>(GroupsMappers.mapToGetCourseGroupsDefaultResponse(groups), HttpStatus.OK);
     }
+
+    /**
+     * @param id          group id to change capacity
+     * @param newcapacity new capacity to insert
+     * @return ResponseEntity was action success
+     */
+    @PutMapping("/{id}/capacity")
+    @PreAuthorize("hasRole('ROLE_DEANERY')")
+    @ApiOperation(value = "Change capacity of given group. You need to provide DEANERY token to be ale to change capacity")
+    public ResponseEntity<String> updateCapacity(
+            @PathVariable(name = "id", required = true) @ApiParam(value = "id of group to change capacity") Long id,
+            @RequestParam(name = "newcapacity", required = true) Integer newcapacity) {
+        final Optional<Groups> group = this.groupService.getGroupById(id);
+        if (group.isEmpty()) {
+            return new ResponseEntity<>("Given group doens't exist", HttpStatus.NOT_FOUND);
+        }
+        final Groups gr = group.get();
+        gr.setCapacity(newcapacity);
+        this.groupService.save(gr);
+        return new ResponseEntity<>("Success", HttpStatus.OK);
+    }
 }

restservice/src/main/java/com/plannaplan/controllers/StatisticsController.java

@@ -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);
+    }
+
+}

restservice/src/main/java/com/plannaplan/controllers/TokenBasedController.java

@@ -11,6 +11,10 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 
+/**
+ * Abstract class for controllers that requires token to extra authorize action
+ * beyond spring security
+ */
 public abstract class TokenBasedController {
     @Autowired
     protected UserService userService;
@@ -18,6 +22,10 @@ public abstract class TokenBasedController {
     public TokenBasedController() {
     }
 
+    /**
+     * @return get currect user based no current spring context
+     * @throws UserNotFoundException if user was not fount
+     */
     protected Optional<User> getCurrentUser() throws UserNotFoundException {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 

restservice/src/main/java/com/plannaplan/controllers/TokenController.java

@@ -1,5 +1,8 @@
 package com.plannaplan.controllers;
 
+import java.util.Optional;
+import java.util.UUID;
+
 import com.plannaplan.entities.User;
 import com.plannaplan.exceptions.UserNotFoundException;
 import com.plannaplan.responses.models.TokenResponse;
@@ -23,6 +26,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+/**
+ * Rest controller to Token related endpoints. More detailed api docs is
+ * available via swagger
+ */
 @RestController
 @CrossOrigin
 @Api(tags = { "Token" }, value = "Token", description = "Enpoints to get authorization.")
@@ -37,6 +44,10 @@ public class TokenController {
     @Autowired
     private UserService userService;
 
+    /**
+     * @param ticket via CAS obtained ticket - it's base to auth user
+     * @return TokenResponse if operation was success
+     */
     @GetMapping("/token")
     @ApiOperation(value = "Endpoint to access token required to call secured endpoints. In order to access token we need to provide access token comming from unviersity CAS system")
     public ResponseEntity<TokenResponse> getToken(
@@ -59,6 +70,26 @@ public class TokenController {
         } catch (Exception e) {
             return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
         }
+    }
+
+    /**
+     * @param refreshToken refresh token obtained via /token endpoint
+     * @return TokenResponse if operation was success
+     * @throws NullPointerException is thrown if user was not found by refrshtoken
+     */
+    @GetMapping("/token/refresh")
+    @ApiOperation(value = "Endpoint to access new token based on refresh token. It's needed when request with provided token fail with code 403")
+    public ResponseEntity<TokenResponse> getRefreshToken(
+            @RequestParam("refreshToken") @ApiParam(value = "Refresh token obtained in /token request") final String refreshToken)
+            throws NullPointerException {
+        Optional<User> userResult = this.userService.getUserByRefreshToken(refreshToken);
+        if (userResult.isEmpty()) {
+            return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);
+        }
+        User user = userResult.get();
+        user.setToken(UUID.randomUUID().toString());
+        user = this.userService.save(user);
+        return new ResponseEntity<>(new TokenResponse(user), HttpStatus.OK);
 
     }
 }

restservice/src/main/java/com/plannaplan/controllers/UsersController.java

@@ -1,12 +1,14 @@
 package com.plannaplan.controllers;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.plannaplan.App;
 import com.plannaplan.entities.User;
 import com.plannaplan.responses.mappers.UserResponseMappers;
 import com.plannaplan.responses.models.UserResponse;
 import com.plannaplan.services.UserService;
+import com.plannaplan.types.UserRoles;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -21,9 +23,14 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+/**
+ * Rest controller to assignments related endpoints. More detailed api docs is
+ * available via swagger
+ */
 @RestController
 @CrossOrigin
 @RequestMapping("/api/" + App.API_VERSION + "/users")
@@ -33,6 +40,10 @@ public class UsersController {
     @Autowired
     private UserService userService;
 
+    /**
+     * @param query to filrer userst with STUDENT role
+     * @return list found
+     */
     @GetMapping("/student/search")
     @PreAuthorize("hasRole('ROLE_DEANERY')")
     @ApiOperation(value = "Serch for user by providing query. If query is empty it will return all students. You need token with DEANERY role to call this")
@@ -43,12 +54,49 @@ public class UsersController {
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
+    /**
+     * @return list of all studnents
+     */
     @GetMapping("/students")
     @PreAuthorize("hasRole('ROLE_DEANERY')")
     @ApiOperation(value = "Gets all students. You need token with DEANERY role to call this")
     public ResponseEntity<List<UserResponse>> getAllStudents() {
-        final List<User> searches = this.userService.searchForStudents("");
+        final List<User> searches = this.userService.getAllStudents();
         final List<UserResponse> response = UserResponseMappers.mapToDefaultResponse(searches);
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
-}
+
+    /**
+     * @param authority USOS ID or E-mail. If user does not exist it should be USOS
+     *                  ID
+     * @return response entity was operation with succcesss
+     */
+    @PostMapping(path = "/admin")
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    @ApiOperation(value = "Adds new admin user.")
+    public ResponseEntity<String> addAdmin(
+            @RequestParam("authority") @ApiParam(value = "USOS ID or E-mail. If user does not exist it should be USOS ID") String authority) {
+        final Optional<User> userResponse = this.userService.getByAuthority(authority);
+        final User user = userResponse.orElseGet(() -> new User(null, null, null, authority, UserRoles.ADMIN));
+        user.setRole(UserRoles.ADMIN);
+        this.userService.save(user);
+        return new ResponseEntity<>("Success", HttpStatus.OK);
+    }
+
+    /**
+     * @param authority USOS ID or E-mail. If user does not exist it should be USOS
+     *                  ID
+     * @return response entity was operation with succcesss
+     */
+    @PostMapping(path = "/deanery")
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    @ApiOperation(value = "Adds new deanery user.")
+    public ResponseEntity<String> addDeanery(
+            @RequestParam("authority") @ApiParam(value = "USOS ID or E-mail. If user does not exist it should be USOS ID") String authority) {
+        final Optional<User> userResponse = this.userService.getByAuthority(authority);
+        final User user = userResponse.orElseGet(() -> new User(null, null, null, authority, UserRoles.DEANERY));
+        user.setRole(UserRoles.DEANERY);
+        this.userService.save(user);
+        return new ResponseEntity<>("Success", HttpStatus.OK);
+    }
+}

restservice/src/main/java/com/plannaplan/controllers/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * Provides rest controllers that defines endpoints and their accessibility
+ *
+ * @since 1.0
+ */
+package com.plannaplan.controllers;

restservice/src/main/java/com/plannaplan/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * Root package of project
+ *
+ * @since 1.0
+ */
+package com.plannaplan;

restservice/src/main/java/com/plannaplan/responses/mappers/AssignmentResponseMappers.java

@@ -4,42 +4,85 @@ 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;
 
+/**
+ * Mappers for Assingnmetns to api responses
+ */
 public class AssignmentResponseMappers {
 
+    /**
+     * @param assignments lsit of assignments to be maped
+     * @return list of api responses
+     */
     public static final List<AssignmentResponse> mapToResponse(List<Assignment> assignments) {
+        return mapToResponse(assignments, null);
+    }
+
+    /**
+     * 
+     * @param assignments lsit of assignments to be maped
+     * @param ammounts    ammounts to be take into account
+     * @return list of api responses
+     */
+    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) {
-                response.add(new AssignmentResponse(course, courseGroups.get(0)));
+                if (ammounts != null) {
+                    response.add(new AssignmentResponse(course, courseGroups.get(0), ammounts));
+                } else {
+                    response.add(new AssignmentResponse(course, courseGroups.get(0)));
+                }
             }
             if (courseGroups.size() == 2) {
-                final Groups lecture = courseGroups.stream().filter(o -> o.getType() == GroupType.LECTURE).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();
-                final Groups classes = courseGroups.stream().filter(o -> o.getType() == GroupType.CLASS).findFirst()
-                        .get();
-                response.add(new AssignmentResponse(course, lecture, classes));
+
+                if (ammounts != null) {
+                    response.add(new AssignmentResponse(course, lecture, classes, ammounts));
+                } else {
+                    response.add(new AssignmentResponse(course, lecture, classes));
+                }
 
             }
         }
         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());
+    }
 }

restservice/src/main/java/com/plannaplan/responses/mappers/CommisionResponseMappers.java

@@ -6,15 +6,37 @@ 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;
 
+/**
+ * Mappers for Commisions to api responses
+ */
 public class CommisionResponseMappers {
+    /**
+     * @param commisions list of commisions to be mapped
+     * @return list of api responses
+     */
     public static final List<CommisionResponse> mapToResponse(List<Commision> commisions) {
         return commisions.stream().filter(Objects::nonNull).map(CommisionResponse::new).collect(Collectors.toList());
     }
 
+    /**
+     * @param commisions list of commisions to be mapped
+     * @return list of api responses
+     */
     public static final List<CommisionWithGroupsResponse> mapToResponseWithGroups(List<Commision> commisions) {
         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());
+    }
 }

restservice/src/main/java/com/plannaplan/responses/mappers/CoursesResponseMappers.java

@@ -8,11 +8,22 @@ import com.plannaplan.entities.Course;
 import com.plannaplan.responses.models.CoursesDefaultResponse;
 import com.plannaplan.responses.models.CoursesWithGroupsResponse;
 
+/**
+ * Mappers for Courses to api responses
+ */
 public class CoursesResponseMappers {
+    /**
+     * @param courses list of courses to be mapped
+     * @return list of api responses
+     */
     public static final List<CoursesDefaultResponse> mapToGetCoursesResponse(List<Course> courses) {
         return courses.stream().filter(Objects::nonNull).map(CoursesDefaultResponse::new).collect(Collectors.toList());
     }
 
+    /**
+     * @param courses list of courses to be mapped
+     * @return list of api responses
+     */
     public static final List<CoursesWithGroupsResponse> mapToGetCoursesWithGroupsResponse(List<Course> courses) {
         return courses.stream().filter(Objects::nonNull).map(CoursesWithGroupsResponse::new)
                 .collect(Collectors.toList());

restservice/src/main/java/com/plannaplan/responses/mappers/ExchangeResponseMappers.java

@@ -0,0 +1,21 @@
+package com.plannaplan.responses.mappers;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import com.plannaplan.entities.Exchange;
+import com.plannaplan.responses.models.ExchangeResponse;
+
+/**
+ * Mappers for Exchange to api responses
+ */
+public class ExchangeResponseMappers {
+    /**
+     * @param exchanges lsit of exchanges to be mapped
+     * @return list of api responses
+     */
+    public static final List<ExchangeResponse> mapToDefaultResponse(List<Exchange> exchanges) {
+        return exchanges.stream().filter(Objects::nonNull).map(ExchangeResponse::new).collect(Collectors.toList());
+    }
+}

restservice/src/main/java/com/plannaplan/responses/mappers/GroupsMappers.java

@@ -13,7 +13,15 @@ import com.plannaplan.responses.models.CourseWithGroupsResponse;
 import com.plannaplan.responses.models.GroupWithCapacityResponse;
 import com.plannaplan.types.GroupType;
 
+/**
+ * Mappers for Groups to api responses
+ */
 public class GroupsMappers {
+    /**
+     * @param groups list of groups to be mapped
+     * @param taken  ammoints to be take into account
+     * @return list of api responses
+     */
     public static List<GroupDefaultResponse> mapToDefaultResponse(List<Groups> groups, HashMap<Long, Integer> taken) {
         return groups.stream().filter(Objects::nonNull).map(new Function<Groups, GroupDefaultResponse>() {
             @Override
@@ -27,10 +35,20 @@ public class GroupsMappers {
         }).collect(Collectors.toList());
     }
 
+    /**
+     * 
+     * @param groups list of groups to be mapped
+     * @return ammoints to be take into account
+     */
     public static List<GroupDefaultResponse> mapToDefaultResponse(List<Groups> groups) {
         return GroupsMappers.mapToDefaultResponse(groups, null);
     }
 
+    /**
+     * @param groups list of groups to be mapped
+     * @param taken  ammoints to be take into account
+     * @return list of api responses
+     */
     public static List<GroupWithCapacityResponse> mapToCapacityResponse(List<Groups> groups,
             HashMap<Long, Integer> taken) {
         return groups.stream().filter(Objects::nonNull).map(new Function<Groups, GroupWithCapacityResponse>() {
@@ -45,10 +63,19 @@ public class GroupsMappers {
         }).collect(Collectors.toList());
     }
 
+    /**
+     * @param groups list of groups to be mapped
+     * @return ammoints to be take into account
+     */
     public static List<GroupWithCapacityResponse> mapToCapacityResponse(List<Groups> groups) {
         return GroupsMappers.mapToCapacityResponse(groups, null);
     }
 
+    /**
+     * @param groups list of groups to be mapped
+     * @param taken  ammoints to be take into account
+     * @return list of api responses
+     */
     public static CourseWithGroupsResponse<GroupDefaultResponse> mapToGetCourseGroupsDefaultResponse(
             List<Groups> groups, HashMap<Long, Integer> taken) {
 
@@ -56,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 {
@@ -74,11 +101,20 @@ public class GroupsMappers {
         return new CourseWithGroupsResponse<>(classes, lectures);
     }
 
+    /**
+     * @param groups list of groups to be mapped
+     * @return ammoints to be take into account
+     */
     public static CourseWithGroupsResponse<GroupDefaultResponse> mapToGetCourseGroupsDefaultResponse(
             List<Groups> groups) {
         return GroupsMappers.mapToGetCourseGroupsDefaultResponse(groups, null);
     }
 
+    /**
+     * @param groups list of groups to be mapped
+     * @param taken  ammoints to be take into account
+     * @return list of api responses
+     */
     public static CourseWithGroupsResponse<GroupWithCapacityResponse> mapToGetCourseGroupsWithCapacityResponse(
             List<Groups> groups, HashMap<Long, Integer> taken) {
 
@@ -86,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 {
@@ -105,6 +141,10 @@ public class GroupsMappers {
         return new CourseWithGroupsResponse<>(classes, lectures);
     }
 
+    /**
+     * @param groups list of groups to be mapped
+     * @return ammoints to be take into account
+     */
     public static CourseWithGroupsResponse<GroupWithCapacityResponse> mapToGetCourseGroupsWithCapacityResponse(
             List<Groups> groups) {
         return GroupsMappers.mapToGetCourseGroupsWithCapacityResponse(groups, null);

restservice/src/main/java/com/plannaplan/responses/mappers/UserResponseMappers.java

@@ -7,9 +7,15 @@ import java.util.stream.Collectors;
 import com.plannaplan.entities.User;
 import com.plannaplan.responses.models.UserResponse;
 
+/**
+ * Mappers for Users to api responses
+ */
 public class UserResponseMappers {
+    /**
+     * @param groups list of groups to be mapped
+     * @return list of api responses
+     */
     public static List<UserResponse> mapToDefaultResponse(List<User> groups) {
-        return groups.stream().filter(Objects::nonNull).map(UserResponse::new)
-                .collect(Collectors.toList());
+        return groups.stream().filter(Objects::nonNull).map(UserResponse::new).collect(Collectors.toList());
     }
 }

restservice/src/main/java/com/plannaplan/responses/mappers/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * Provides mappers to map mutiple entites from db to single api response
+ *
+ * @since 1.0
+ */
+package com.plannaplan.responses.mappers;

restservice/src/main/java/com/plannaplan/responses/models/AssignmentDetailedResponse.java

@@ -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;
+    }
+}

restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java

@@ -1,42 +1,158 @@
 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;
 
 import io.swagger.annotations.ApiModel;
 
+/**
+ * Assignment entity api response
+ */
 @ApiModel(description = "Response shows information about given assigment to course.", value = "AssignmentResponse")
 public class AssignmentResponse {
     private Long id;
     private String name;
+    private String symbol;
     private GroupWithCapacityResponse classes;
     private GroupWithCapacityResponse lecture;
 
+    /**
+     * @param course  course entity
+     * @param lecture lecture Groups entity
+     * @param classes class Groups entity
+     */
     public AssignmentResponse(Course course, Groups lecture, Groups classes) {
         this.id = course.getId();
         this.name = course.getName();
+        this.symbol = course.getSymbol();
         this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture);
         this.classes = classes == null ? null : new GroupWithCapacityResponse(classes);
     }
 
-    public AssignmentResponse(Course course, Groups group) {
-        this(course, group.getType() == GroupType.LECTURE ? group : null,
-                group.getType() == GroupType.CLASS ? group : null);
+    /**
+     * @return returns symbol of assigned course
+     */
+    public String getSymbol() {
+        return symbol;
     }
 
+    /**
+     * @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, Groups lecture, Groups classes, HashMap<Long, Integer> ammounts) {
+        this.id = course.getId();
+        this.name = course.getName();
+        this.symbol = course.getSymbol();
+        this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getId()));
+        this.classes = classes == null ? null : new GroupWithCapacityResponse(classes, ammounts.get(classes.getId()));
+    }
+
+    /**
+     * 
+     * @param course course entity
+     * @param group  class/lecture entity
+     */
+    public AssignmentResponse(Course course, Groups group) {
+        this(course, GroupType.isLectureOrClass(group.getType()) == GroupType.LECTURE ? group : null,
+                GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS ? group : null);
+    }
+
+    /**
+     * @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, Groups group, HashMap<Long, Integer> 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.symbol = course.getSymbol();
+        this.classes = classes != null
+                ? new GroupWithCapacityResponse(classes, ammounts.get(classes.getGroup().getId()))
+                : null;
+        this.lecture = lecture != null
+                ? new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getGroup().getId()))
+                : null;
+    }
+
+    /**
+     * @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.symbol = course.getSymbol();
+        this.classes = classes != null ? new GroupWithCapacityResponse(classes) : null;
+        this.lecture = lecture != null ? new GroupWithCapacityResponse(lecture) : null;
+    }
+
+    /**
+     * @return Lecture in api response forms
+     */
     public GroupWithCapacityResponse getLecture() {
         return this.lecture;
     }
 
+    /**
+     * @return Class in api response forms
+     */
     public GroupWithCapacityResponse getClasses() {
         return this.classes;
     }
 
+    /**
+     * @return String course name
+     */
     public String getName() {
         return this.name;
     }
 
+    /**
+     * @return db assignment id
+     */
     public Long getId() {
         return this.id;
     }

restservice/src/main/java/com/plannaplan/responses/models/AssignmentsSingleResponse.java

@@ -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;
+    }
+
+}

restservice/src/main/java/com/plannaplan/responses/models/CommisionResponse.java

@@ -5,23 +5,58 @@ import com.plannaplan.entities.Commision;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+/**
+ * Commision api response
+ */
 @ApiModel(description = "Response shows information about commision.", value = "CommisionResponse")
 public class CommisionResponse {
     @ApiModelProperty(value = "ID created by database")
     private Long id;
 
+    @ApiModelProperty(value = "ID of user that commision belongs to")
+    private UserResponse owner;
+
+    @ApiModelProperty(value = "ID of user that created commision")
+    private UserResponse commiter;
+
     @ApiModelProperty(value = "Timestamp where the user commit the commision")
     private String commisionDate;
 
+    /**
+     * @param commision commision to map to api response
+     */
     public CommisionResponse(Commision commision) {
         this.id = commision.getId();
         this.commisionDate = commision.getCommisionDate().toString();
+        this.owner = commision.getCommisionOwner() != null ? new UserResponse(commision.getCommisionOwner()) : null;
+        this.commiter = commision.getCommisionCommiter() != null ? new UserResponse(commision.getCommisionCommiter())
+                : null;
     }
 
+    /**
+     * @return get Commiter user as api response
+     */
+    public UserResponse getCommiter() {
+        return commiter;
+    }
+
+    /**
+     * @return get Owner user as api response
+     */
+    public UserResponse getOwner() {
+        return owner;
+    }
+
+    /**
+     * @return when commision was created string formated
+     */
     public String getCommisionDate() {
         return commisionDate;
     }
 
+    /**
+     * @return db id
+     */
     public Long getId() {
         return id;
     }

restservice/src/main/java/com/plannaplan/responses/models/CommisionWithAcceptedGroupsResponse.java

@@ -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;
+    }
+
+}

restservice/src/main/java/com/plannaplan/responses/models/CommisionWithGroupsResponse.java

@@ -11,12 +11,18 @@ import com.plannaplan.entities.Commision;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+/**
+ * Commision With Groups api Response. It extends CommisionResponse repsone
+ */
 @ApiModel(description = "Response shows information about commision and its groups.", value = "CommisionWithGroupsResponse")
 public class CommisionWithGroupsResponse extends CommisionResponse {
 
     @ApiModelProperty(value = "List of groups ids in databse that belongs to commision")
     private List<Long> groups;
 
+    /**
+     * @param commision commision to map to api response
+     */
     public CommisionWithGroupsResponse(Commision commision) {
         super(commision);
         this.groups = commision.getAssignments().stream().filter(Objects::nonNull)
@@ -29,6 +35,9 @@ public class CommisionWithGroupsResponse extends CommisionResponse {
                 }).collect(Collectors.toList());
     }
 
+    /**
+     * @return lsit of fetured groups ids
+     */
     public List<Long> getGroups() {
         return groups;
     }

restservice/src/main/java/com/plannaplan/responses/models/ConfigTourResponse.java

@@ -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;
+    }
+
+}

restservice/src/main/java/com/plannaplan/responses/models/CourseWithGroupsResponse.java

@@ -5,21 +5,36 @@ import java.util.List;
 
 import io.swagger.annotations.ApiModel;
 
+/**
+ * Course respose with all realted groups as api response. Alse needs to specify
+ * what type of Groups api response will be kept here. For excmaple it can be
+ * <b> GroupDefaultRespnse </b>
+ */
 @ApiModel(description = "Response shows information about groups to given course.", value = "CourseWithGroupsResponse")
-public class CourseWithGroupsResponse <T> {
+public class CourseWithGroupsResponse<T> {
 
     private List<T> lectures = new ArrayList<>();
     private List<T> classes = new ArrayList<>();
 
-    public CourseWithGroupsResponse(List<T> classes, List<T> lectures ){
+    /**
+     * @param classes  realted classes Groups instance
+     * @param lectures realted lectures Groups instance
+     */
+    public CourseWithGroupsResponse(List<T> classes, List<T> lectures) {
         this.lectures = lectures;
         this.classes = classes;
     }
 
+    /**
+     * @return realted classes Groups instance
+     */
     public List<T> getClasses() {
         return this.classes;
     }
 
+    /**
+     * @return realted lectures Groups instance
+     */
     public List<T> getLectures() {
         return this.lectures;
     }