Merge pull request 'restrictions' (#42) from restrictions into master

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

.gitignore

@@ -34,3 +34,9 @@ build/
 ### Python ###
 __pycache__
 .pytest_cache
+
+### Parser ###
+parser/
+
+
+envs.sh

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ę
@@ -45,8 +57,12 @@ W paczce dla proda w protpertiesach poufne dane odczytywane są ze zmiennych śr
 -   `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
 
@@ -56,23 +72,23 @@ 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
 
@@ -80,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

@@ -74,6 +74,31 @@
       <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>

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

@@ -4,6 +4,21 @@
             "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

@@ -2,6 +2,8 @@ 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;
@@ -11,6 +13,8 @@ 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
  */
@@ -115,4 +119,53 @@ public class AppConfig {
         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,7 +8,8 @@ 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
  *
  */
 
@@ -27,8 +28,9 @@ public class Assignment {
 
     /**
      * 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 
+     * getGroup
      *
-     *  @return group
+     * @return group
      */
     public Groups getGroup() {
         return this.group;
@@ -68,6 +106,7 @@ public class Assignment {
 
     /**
      * isPastAssignment getter
+     *
      * @return isPastAssignment
      */
     public boolean isPastAssignment() {
@@ -76,7 +115,8 @@ 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/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,10 +1,15 @@
 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;
@@ -34,10 +39,41 @@ 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
      * 
@@ -60,6 +96,84 @@ public class Groups {
         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
      * 
@@ -74,6 +188,53 @@ public class Groups {
         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
      * 

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

@@ -1,14 +1,21 @@
 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;
 
 /**
@@ -31,6 +38,26 @@ public class User {
     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() {
     }
@@ -40,7 +67,7 @@ public class User {
      * @param name    name given to the user
      * @param surname surname given to the user
      * @param mail    mail given to the user
-     * @param role
+     * @param role    user's role
      */
     public User(String name, String surname, String mail, UserRoles role) {
         this.name = name;
@@ -55,13 +82,28 @@ public class User {
      * @param surname surname given to the user
      * @param mail    mail given to the user
      * @param usosId  id in the USOS system
-     * @param role
+     * @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;
     }
 
+    /**
+     *
+     * @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
      *
@@ -188,6 +230,35 @@ public class User {
         return this.id;
     }
 
+    /**
+     * Ranking points are [100;500]. It's calculated by gradesAvg*100*studiesYear
+     *
+     * @return ranking points [100;500]
+     */
+    public Integer getRanking() {
+        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

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

@@ -2,6 +2,9 @@ package com.plannaplan.models;
 
 import java.io.InputStream;
 
+/**
+ * Config data copntainer to keep tours dates and stream of dasta to import
+ */
 public class ConfigData {
     private TourData firstTour;
     private TourData secondTour;

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/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

@@ -2,6 +2,9 @@ package com.plannaplan.models;
 
 import java.sql.Date;
 
+/**
+ * Container for Tours dates
+ */
 public class TourData {
 
     private Date 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

@@ -4,5 +4,8 @@ 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/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

@@ -35,9 +35,18 @@ import org.springframework.stereotype.Repository;
 
 @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);
 
@@ -47,6 +56,13 @@ public interface UserRepository extends JpaRepository<User, Long> {
     @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);
 

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

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

@@ -12,7 +12,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
@@ -25,11 +26,12 @@ public class CommisionService {
     public CommisionService() {
     }
 
-    /*
-     * save
+    /**
+     * save to database commision. It also checks for missing assignments from
+     * previous commision (you can not get rid of accepted assignment)
      * 
-     * @param commision which assignment should be save in service
-     * @return commision
+     * @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,31 +41,38 @@ 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();

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

@@ -2,11 +2,15 @@ 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;
@@ -24,20 +28,40 @@ public class ConfiguratorService {
     private FileToDatabaseMigrator migrator;
     @Autowired
     private AppConfigRepository configRepo;
+    @Autowired
+    private EventService eventService;
+    @Autowired
+    private AssignmentService assignmentService;
 
     public ConfiguratorService() {
     }
 
     /**
-     * methoid to config system
+     * 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();
-        this.configRepo.save(new AppConfig(data.getFirstTour(), data.getSecondTour()));
+        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);
     }
 
     /**
@@ -62,4 +86,52 @@ public class ConfiguratorService {
 
         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

@@ -1,5 +1,14 @@
 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;
@@ -15,6 +24,9 @@ public class EmailService {
     @Autowired
     private JavaMailSender emailSender;
 
+    @Autowired
+    private UserService userService;
+
     @Value("${plannaplan.email}")
     private String appEmail;
 
@@ -35,4 +47,55 @@ public class EmailService {
         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

@@ -1,17 +1,71 @@
 package com.plannaplan.services;
 
-// import org.springframework.beans.factory.annotation.Autowired;
+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 EmailService emailService;
+    @Autowired
+    private ExchangeService exchangeService;
 
-    @Scheduled(cron = "0 2 17 * * *")
+    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

@@ -7,6 +7,7 @@ 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 +18,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 +26,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 +114,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<>();

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

@@ -3,9 +3,11 @@ package com.plannaplan.services;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import com.plannaplan.entities.User;
 import com.plannaplan.exceptions.UserNotFoundException;
+import com.plannaplan.models.UserApiResponse;
 import com.plannaplan.repositories.UserRepository;
 import com.plannaplan.types.UserRoles;
 
@@ -20,17 +22,40 @@ public class UserService {
     @Autowired
     private UserRepository repo;
 
+    @Autowired
+    private UsosApiService service;
+
     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 +63,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 +92,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);
     }
@@ -85,4 +150,23 @@ public class UserService {
         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());
+    }
+
 }

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/GroupType.java

@@ -1,9 +1,23 @@
 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;
+    }
+
+    public final static GroupType getType(String type) {
+        for (GroupType d : values()) {
+            if (d.type.equals(type)) {
+                return d;
+            }
+        }
+        return null;        
+    }
 }

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

@@ -138,4 +138,52 @@ public class AppConfigTest {
         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/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,16 +2,23 @@ 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;
@@ -24,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;
 
@@ -39,6 +49,9 @@ public class ConfiguratorServiceTest {
     @Autowired
     private AppConfigRepository appConfigRepo;
 
+    @Autowired
+    private EventService eventService;
+
     @Test
     public void shouldImportDataToDataBase() {
         final InputStream inputStream = getClass().getClassLoader()
@@ -57,6 +70,31 @@ 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());
@@ -69,4 +107,28 @@ public class ConfiguratorServiceTest {
 
     }
 
+    @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/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/resources/application.properties

@@ -14,5 +14,8 @@ 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
 
+no_browser = False
+API_ADDRESS = "http://localhost:1285"
+
 if len(sys.argv) > 1 :    
-    API_ADDRESS = "http://" + sys.argv[1] + ":1285"
-else:
-    API_ADDRESS = "http://localhost:1285"
+    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()

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

@@ -2,6 +2,7 @@ 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;
@@ -20,6 +21,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 
 import com.plannaplan.services.ConfiguratorService;
 
+/**
+ * Root class of Application.
+ */
 @SpringBootApplication
 @EnableScheduling
 public class App {
@@ -30,7 +34,7 @@ public class App {
         private ConfiguratorService contrl;
 
         @Autowired
-        UserService userService;
+        private UserService userService;
 
         @Value("${plannaplan.dev}")
         private boolean isDev;
@@ -45,17 +49,20 @@ public class App {
 
         /**
          * method to import mocked data to testing app after startz. It is called only
-         * in dev profile
+         * 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(
-                                        new TourData(new Date(System.currentTimeMillis()),
-                                                        new Date(System.currentTimeMillis() + 86400000)),
+                        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);
@@ -65,6 +72,7 @@ public class App {
                         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);
 
@@ -72,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);
 
@@ -79,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);
 
@@ -86,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);
 
@@ -93,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);
 
@@ -100,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);
 
@@ -107,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);
 
@@ -114,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);
 
@@ -121,11 +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,6 +18,9 @@ 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 {

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

@@ -22,7 +22,9 @@ 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.springframework.beans.factory.annotation.Autowired;
@@ -36,10 +38,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 
 import com.plannaplan.responses.mappers.AssignmentResponseMappers;
 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 +63,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 +81,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 +91,46 @@ 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 Optional<Commision> comPrev = this.commisionService.getNewestCommision(user);
                         final Commision com = new Commision(user, asker);
                         this.commisionService.save(com);
 
+                        final List<Long> addedGroups = 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);
+                                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.getId())) {
+                                                isBad = true;
+                                        }
+                                }
+
+                        }
+
+                        if (isBad) {
+                                return new ResponseEntity<>("Error. You can't delete accepted assignmet",
+                                                HttpStatus.BAD_REQUEST);
+                        }
+
                         return new ResponseEntity<>("Succes", HttpStatus.OK);
                 } catch (UserNotFoundException exception) {
                         return new ResponseEntity<>(exception.getMessage(), HttpStatus.NOT_FOUND);
@@ -100,6 +139,11 @@ 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(
@@ -119,6 +163,11 @@ public class CommisionController extends TokenBasedController {
                 return new ResponseEntity<>(result, 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 +176,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 +210,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.")

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

@@ -7,11 +7,20 @@ 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.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;
@@ -26,6 +35,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+/**
+ * Rest controller to Config related endpoints. More detailed api docs is
+ * available via swagger
+ */
 @RestController
 @CrossOrigin
 @RequestMapping("/api/" + App.API_VERSION + "/configurator")
@@ -33,9 +46,27 @@ 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;
 
+    @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")
@@ -63,4 +94,77 @@ 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);
+        }
+    }
 }

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())));
+                            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/ExchangeController.java

@@ -0,0 +1,172 @@
+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 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.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

@@ -27,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")
@@ -37,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(
@@ -61,6 +70,11 @@ 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")

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

@@ -26,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.")
@@ -40,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(
@@ -62,9 +70,13 @@ 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(

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,6 +54,9 @@ 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")
@@ -51,4 +65,38 @@ public class UsersController {
         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

@@ -11,9 +11,27 @@ import com.plannaplan.entities.Groups;
 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<>();
         assignments.stream().forEach((Assignment assignment) -> {
@@ -29,14 +47,23 @@ public class AssignmentResponseMappers {
             final Course course = entry.getKey();
             final List<Groups> 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()
                         .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));
+                }
 
             }
         }

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

@@ -8,11 +8,22 @@ import com.plannaplan.entities.Commision;
 import com.plannaplan.responses.models.CommisionResponse;
 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());

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) {
 
@@ -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) {
 
@@ -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/AssignmentResponse.java

@@ -1,11 +1,16 @@
 package com.plannaplan.responses.models;
 
+import java.util.HashMap;
+
 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;
@@ -13,6 +18,11 @@ public class AssignmentResponse {
     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();
@@ -20,23 +30,65 @@ public class AssignmentResponse {
         this.classes = classes == null ? null : new GroupWithCapacityResponse(classes);
     }
 
+    /**
+     * @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.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, group.getType() == GroupType.LECTURE ? group : null,
                 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, group.getType() == GroupType.LECTURE ? group : null,
+                group.getType() == GroupType.CLASS ? group : null, ammounts);
+    }
+
+    /**
+     * @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/CommisionResponse.java

@@ -5,6 +5,9 @@ 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")
@@ -19,6 +22,9 @@ public class CommisionResponse {
     @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();
@@ -27,18 +33,30 @@ public class CommisionResponse {
                 : 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/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/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;
     }

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

@@ -5,9 +5,21 @@ import com.plannaplan.responses.models.abstracts.CoursesResponse;
 
 import io.swagger.annotations.ApiModel;
 
+/**
+ * Courses Default Api Response. It extends abstract response - CoursesResponse.
+ * It was one of first repsones created in system. Later we resigned from
+ * asbstract and used settig
+ * <code>spring.jackson.default-property-inclusion = NON_NULL</code> in
+ * properties instead.
+ */
 @ApiModel(description = "Response shows information about course.", value = "CoursesDefaultResponse")
 public class CoursesDefaultResponse extends CoursesResponse {
 
+    /**
+     * create new instance
+     * 
+     * @param course course to map to api response
+     */
     public CoursesDefaultResponse(Course course) {
         super(course);
     }

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

@@ -9,35 +9,59 @@ import com.plannaplan.types.GroupType;
 
 import io.swagger.annotations.ApiModel;
 
+/**
+ * Courses With Groups Api Response . It extends abstract response -
+ * CoursesResponse. It was one of first repsones created in system. Later we
+ * resigned from asbstract and used settig
+ * <code>spring.jackson.default-property-inclusion = NON_NULL</code> in
+ * properties instead.
+ */
 @ApiModel(description = "Response shows information about groups to given course.", value = "CoursesWithGroupsResponse")
 public class CoursesWithGroupsResponse extends CoursesResponse {
 
-    private List<GroupDefaultResponse> lectures = new ArrayList<>();
-    private List<GroupDefaultResponse> classes = new ArrayList<>();
+    private List<GroupWithCapacityResponse> lectures = new ArrayList<>();
+    private List<GroupWithCapacityResponse> classes = new ArrayList<>();
 
+    /**
+     * create new instance
+     * 
+     * @param course course to map to api response
+     */
     public CoursesWithGroupsResponse(Course course) {
         super(course);
         course.getGroups().stream().forEach(group -> {
             if (group.getType() == GroupType.CLASS) {
-                this.classes.add(new GroupDefaultResponse(group));
+                this.classes.add(new GroupWithCapacityResponse(group));
             } else {
-                this.lectures.add(new GroupDefaultResponse(group));
+                this.lectures.add(new GroupWithCapacityResponse(group));
             }
         });
     }
 
-    public CoursesWithGroupsResponse(Course course, List<GroupDefaultResponse> lectures,
-            List<GroupDefaultResponse> classes) {
+    /**
+     * 
+     * @param course   course to map to api response
+     * @param lectures list of api resposnes of lectures
+     * @param classes  list of api resposnes of classes
+     */
+    public CoursesWithGroupsResponse(Course course, List<GroupWithCapacityResponse> lectures,
+            List<GroupWithCapacityResponse> classes) {
         super(course);
         this.lectures = lectures;
         this.classes = classes;
     }
 
-    public List<GroupDefaultResponse> getClasses() {
+    /**
+     * @return list of api resposnes of classes
+     */
+    public List<GroupWithCapacityResponse> getClasses() {
         return this.classes;
     }
 
-    public List<GroupDefaultResponse> getLectures() {
+    /**
+     * @return list of api resposnes of lectures
+     */
+    public List<GroupWithCapacityResponse> getLectures() {
         return this.lectures;
     }
 

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

@@ -0,0 +1,73 @@
+package com.plannaplan.responses.models;
+
+import com.plannaplan.entities.Exchange;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Exchange proposal api repsonse
+ */
+@ApiModel(description = "Response shows information about user exchanges", value = "CourseWithGroupsResponse")
+public class ExchangeResponse {
+	@ApiModelProperty(value = "Database id")
+	private Long id;
+	@ApiModelProperty(value = "Assignmetn that user want to trade")
+	private GroupDefaultResponse ownedAssignment;
+	@ApiModelProperty(value = "Group that user want to get")
+	private GroupDefaultResponse desiredGroup;
+
+	/**
+	 * creat new instance
+	 * 
+	 * @param exchange entity to map to api repsone
+	 */
+	public ExchangeResponse(Exchange exchange) {
+		this.id = exchange.getId();
+		this.ownedAssignment = new GroupDefaultResponse(exchange.getOwnedAssignment().getGroup());
+		this.desiredGroup = new GroupDefaultResponse(exchange.getDesiredAssignment());
+	}
+
+	/**
+	 * @return get api respondse of wanted byt user group
+	 */
+	public GroupDefaultResponse getDesiredGroup() {
+		return desiredGroup;
+	}
+
+	/**
+	 * @param desiredGroup set api respondse of wanted byt user group
+	 */
+	public void setDesiredGroup(GroupDefaultResponse desiredGroup) {
+		this.desiredGroup = desiredGroup;
+	}
+
+	/**
+	 * @return get api respondse of owned user group
+	 */
+	public GroupDefaultResponse getOwnedAssignment() {
+		return ownedAssignment;
+	}
+
+	/**
+	 * @param ownedAssignment set api respondse of owned user group
+	 */
+	public void setOwnedAssignment(GroupDefaultResponse ownedAssignment) {
+		this.ownedAssignment = ownedAssignment;
+	}
+
+	/**
+	 * @return database id
+	 */
+	public Long getId() {
+		return id;
+	}
+
+	/**
+	 * @param id set database id
+	 */
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+}

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

@@ -8,6 +8,9 @@ import com.plannaplan.types.GroupType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+/**
+ * Default api response for Groups entity
+ */
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @ApiModel(description = "Response shows information about given group.", value = "GroupDefaultResponse")
 public class GroupDefaultResponse {
@@ -36,6 +39,11 @@ public class GroupDefaultResponse {
     @ApiModelProperty(value = "Value shows how many places is already taken by other students.")
     private Integer takenPlaces;
 
+    /**
+     * creat new entity
+     * 
+     * @param group entity to map to api response
+     */
     public GroupDefaultResponse(Groups group) {
         this.id = group.getId() != null ? group.getId() : null;
         this.day = group.getDay() != null ? group.getDay().label : -1;
@@ -46,43 +54,77 @@ public class GroupDefaultResponse {
         this.type = group.getType() != null ? group.getType() : null;
     }
 
+    /**
+     * 
+     * @param group       entity to map to api response
+     * @param takenPlaces ammount of taken places for group by other users
+     */
     public GroupDefaultResponse(Groups group, int takenPlaces) {
         this(group);
         this.takenPlaces = takenPlaces;
     }
 
+    /**
+     * creat new entity
+     * 
+     * @param assignment entity to map to api response
+     */
     public GroupDefaultResponse(Assignment assignment) {
         this(assignment.getGroup());
     }
 
+    /**
+     * @return what typew of group is this (lecture or class)
+     */
     public GroupType getType() {
         return type;
     }
 
+    /**
+     * @return room where classes will take place
+     */
     public String getRoom() {
         return room;
     }
 
+    /**
+     * @return name of group lecturer
+     */
     public String getLecturer() {
         return lecturer;
     }
 
+    /**
+     * @return time when group is scheduled on
+     */
     public String getTime() {
         return time;
     }
 
+    /**
+     * @return time when class ends
+     */
     public String getEndTime() {
         return endTime;
     }
 
+    /**
+     * @return int what day is it. 0-6 (Monday - Sunday)
+     */
     public int getDay() {
         return day;
     }
 
+    /**
+     * @return db id
+     */
     public Long getId() {
         return id;
     }
 
+    /**
+     * @return ammount of taken places for group by other users
+     */
     public Integer getTakenPlaces() {
         return this.takenPlaces;
     }

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

@@ -4,29 +4,57 @@ import com.plannaplan.entities.Assignment;
 import com.plannaplan.entities.Groups;
 import io.swagger.annotations.ApiModel;
 
+/**
+ * Group api response featuring group capacity
+ */
 @ApiModel(description = "Response shows information about group with included capacity.", value = "GroupWithCapacityResponse")
 public class GroupWithCapacityResponse extends GroupDefaultResponse {
 
     private int capacity;
 
+    /**
+     * create new instance
+     * 
+     * @param group entity to map to api response
+     */
     public GroupWithCapacityResponse(Groups group) {
         super(group);
         this.capacity = group.getCapacity();
     }
 
+    /**
+     * create new instance
+     * 
+     * @param group       entity to map to api response
+     * @param takenPlaces group taken places
+     */
     public GroupWithCapacityResponse(Groups group, int takenPlaces) {
         super(group, takenPlaces);
         this.capacity = group.getCapacity();
     }
 
+    /**
+     * create new instance
+     * 
+     * @param assignment entity to map to api response
+     */
     public GroupWithCapacityResponse(Assignment assignment) {
         this(assignment.getGroup());
     }
 
+    /**
+     * create new instance
+     * 
+     * @param assignment  entity to map to api response
+     * @param takenPlaces group taken places
+     */
     public GroupWithCapacityResponse(Assignment assignment, int takenPlaces) {
         this(assignment.getGroup(), takenPlaces);
     }
 
+    /**
+     * @return group taken places
+     */
     public int getCapacity() {
         return capacity;
     }

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

@@ -5,6 +5,9 @@ import com.plannaplan.entities.User;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+/**
+ * Response to show after successfully login cation
+ */
 @ApiModel(description = "Response shows information about logged user.", value = "TokenResponse")
 public class TokenResponse {
     @ApiModelProperty(value = "user token used to verify requests")
@@ -18,6 +21,9 @@ public class TokenResponse {
     @ApiModelProperty(value = "user unviersity email")
     private String email;
 
+    /**
+     * @param user user to be mapped to api response
+     */
     public TokenResponse(User user) {
         this.id = user.getId();
         this.authorityRole = user.getRole().toString();
@@ -26,22 +32,37 @@ public class TokenResponse {
         this.refreshToken = user.getRefreshToken();
     }
 
+    /**
+     * @return user email
+     */
     public String getEmail() {
         return email;
     }
 
+    /**
+     * @return user role in system
+     */
     public String getAuthorityRole() {
         return authorityRole;
     }
 
+    /**
+     * @return db id
+     */
     public Long getId() {
         return id;
     }
 
+    /**
+     * @return user token to authorize other requests
+     */
     public String getToken() {
         return token;
     }
 
+    /**
+     * @return user refresh token
+     */
     public String getRefreshToken() {
         return this.refreshToken;
     }

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

@@ -4,6 +4,9 @@ import com.plannaplan.entities.User;
 
 import io.swagger.annotations.ApiModel;
 
+/**
+ * Model for api response for user serach results.
+ */
 @ApiModel(description = "Response shows information about user.", value = "UserResponse")
 public class UserResponse {
 
@@ -12,6 +15,9 @@ public class UserResponse {
     private String surname;
     private String email;
 
+    /**
+     * @param user entity to be mapped to api response
+     */
     public UserResponse(User user) {
         this.id = user.getId();
         this.name = user.getName() != null ? user.getName() : "";
@@ -19,18 +25,30 @@ public class UserResponse {
         this.email = user.getEmail();
     }
 
+    /**
+     * @return user email
+     */
     public String getEmail() {
         return email;
     }
 
+    /**
+     * @return user surname
+     */
     public String getSurname() {
         return surname;
     }
 
+    /**
+     * @return user name
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * @return db id
+     */
     public Long getId() {
         return id;
     }

restservice/src/main/java/com/plannaplan/responses/models/abstracts/CoursesResponse.java

@@ -2,20 +2,34 @@ package com.plannaplan.responses.models.abstracts;
 
 import com.plannaplan.entities.Course;
 
+/**
+ * Course entity api response
+ */
 public abstract class CoursesResponse {
 
     private Long id;
     private String name;
 
+    /**
+     * create instance
+     * 
+     * @param course entity to map to api response
+     */
     public CoursesResponse(Course course) {
         this.id = course.getId() != null ? course.getId() : null;
         this.name = course.getName() != null ? course.getName() : "";
     }
 
+    /**
+     * @return course name
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * @return db id
+     */
     public Long getId() {
         return id;
     }

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

@@ -0,0 +1,6 @@
+/**
+ * Abstract api responses
+ *
+ * @since 1.0
+ */
+package com.plannaplan.responses.models.abstracts;

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

@@ -0,0 +1,7 @@
+/**
+ * Provides models of all possible api responses. Convention for naming this
+ * class is EntityModifierRepsone. For Example CourseDefaultResponse
+ *
+ * @since 1.0
+ */
+package com.plannaplan.responses.models;

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

@@ -0,0 +1,6 @@
+/**
+ * Contains packeges realted to creating api responses
+ *
+ * @since 1.0
+ */
+package com.plannaplan.responses;

restservice/src/main/java/com/plannaplan/security/AuthenticationFilter.java

@@ -17,6 +17,9 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
 
+/**
+ * Spring authentication filter class
+ */
 public class AuthenticationFilter extends AbstractAuthenticationProcessingFilter {
 
     AuthenticationFilter(final RequestMatcher requiresAuth) {

restservice/src/main/java/com/plannaplan/security/AuthenticationProvider.java

@@ -16,6 +16,9 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Component;
 
+/**
+ * Spring authentication provider
+ */
 @Component
 public class AuthenticationProvider extends AbstractUserDetailsAuthenticationProvider {
 
@@ -25,8 +28,6 @@ public class AuthenticationProvider extends AbstractUserDetailsAuthenticationPro
     @Override
     protected void additionalAuthenticationChecks(UserDetails userDetails,
             UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
-        // is being done in other task
-
     }
 
     @Override

restservice/src/main/java/com/plannaplan/security/AuthorityRoles.java

@@ -6,6 +6,9 @@ import com.plannaplan.types.UserRoles;
 
 import org.springframework.security.core.GrantedAuthority;
 
+/**
+ * Users Roles for spring app
+ */
 public enum AuthorityRoles implements GrantedAuthority {
     STUDENT("ROLE_STUDENT"), DEANERY("ROLE_DEANERY"), ADMIN("ROLE_ADMIN"), TEST_USER("ROLE_TESTUSER");
 
@@ -20,6 +23,12 @@ public enum AuthorityRoles implements GrantedAuthority {
         return this.role;
     }
 
+    /**
+     * map buisness logic UserRoles enum to spring enum
+     * 
+     * @param role buisness logic enum
+     * @return restservice AuthorityRoles enum
+     */
     public static final Optional<AuthorityRoles> getAuthorityRole(UserRoles role) {
         switch (role) {
             case ADMIN:

restservice/src/main/java/com/plannaplan/security/WebSecurityConfig.java

@@ -16,9 +16,11 @@ import org.springframework.http.HttpStatus;
 import org.springframework.security.web.authentication.AnonymousAuthenticationFilter;
 import org.springframework.security.web.authentication.HttpStatusEntryPoint;
 
+/**
+ * Spring config class for security
+ */
 @Configuration
 @EnableWebSecurity
-
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     private static final RequestMatcher PROTECTED_URLS = new OrRequestMatcher(new AntPathRequestMatcher("/api/**"));

restservice/src/main/java/com/plannaplan/security/cas/CasUserIdentity.java

@@ -1,18 +1,35 @@
 package com.plannaplan.security.cas;
 
+/**
+ * Model to keep data from Cas response. It's important to remember that wee
+ * need to register our domain name in CAS in order to get this data. Otherwise
+ * CAS will retuned what user typed as login.
+ */
 public class CasUserIdentity {
     private String usosId;
     private String email;
 
-    public CasUserIdentity(String usosId, String email){
+    /**
+     * creates new instance
+     * 
+     * @param usosId usosId retured from CAS
+     * @param email  emial returned from CAS
+     */
+    public CasUserIdentity(String usosId, String email) {
         this.usosId = usosId;
         this.email = email;
     }
 
+    /**
+     * @return string with usosid
+     */
     public String getUsosId() {
         return usosId;
     }
 
+    /**
+     * @return string with email
+     */
     public String getEmail() {
         return email;
     }

restservice/src/main/java/com/plannaplan/security/cas/CasValidationExcepiton.java

@@ -1,9 +1,9 @@
 package com.plannaplan.security.cas;
 
+/**
+ * Exception to throw when cas didn't validate provided ticket
+ */
 public class CasValidationExcepiton extends RuntimeException {
-    /**
-     *
-     */
     private static final long serialVersionUID = 1L;
 
     public CasValidationExcepiton(String s) {

restservice/src/main/java/com/plannaplan/security/cas/CasValidator.java

@@ -1,6 +1,17 @@
 package com.plannaplan.security.cas;
 
+/**
+ * We can authorize in different contexts. For example if we rgister our domain
+ * we will get more info than on localhost. This abstraction let's us handle
+ * both cases based on spring profile
+ */
 public interface CasValidator {
 
+    /**
+     * validate ticket (should be provided in costructor or by setter)
+     * 
+     * @return CasUserIdentity instance with values from response or null if
+     *         validation failed
+     */
     CasUserIdentity validate();
 }