Merge pull request 'forntend-fixes' (#37) from forntend-fixes into master

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

.gitignore

@@ -29,3 +29,11 @@ build/
 
 ### VS Code ###
 .vscode/
+
+
+### Python ###
+__pycache__
+.pytest_cache
+
+### Parser ###
+parser/

.gitlab-ci.yml

@@ -0,0 +1,42 @@
+stages:
+  - build
+  - deploy
+
+build:
+  stage: build
+  image: maven
+  script:
+    - echo "Start building App"
+    - echo "spring.profiles.active=prod" > restservice/src/main/resources/application.properties
+    - mvn clean
+    - mvn install
+    - cd restservice
+    - mvn clean package spring-boot:repackage
+    - echo "Build successfully!"
+  artifacts:
+    expire_in: 1 hour
+    paths:
+      - restservice/target/
+  only:
+    - master
+
+deploy_production:
+  stage: deploy
+  before_script:
+    - apt-get update
+    - apt-get --yes --force-yes install rsync
+  script:
+    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+    - eval $(ssh-agent -s)
+    - ssh-add <(echo "$SSH_PRIVATE_KEY")
+    - mkdir -p ~/.ssh
+    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+    - echo "Deploying to server"
+    - ssh backend@wmi-backend-gc.plannaplan.pl -t "sudo systemctl stop plannaplan-backend"
+    - ssh backend@wmi-backend-gc.plannaplan.pl -t "rm -rf /opt/plannaplan-backend/backend.jar"
+    - rsync --progress restservice/target/*.jar backend@wmi-backend-gc.plannaplan.pl:/opt/plannaplan-backend/backend.jar
+    - sleep 5
+    - ssh backend@wmi-backend-gc.plannaplan.pl -t "sudo systemctl start plannaplan-backend"
+    - echo "Deployed"
+  only:
+    - master

README.md

@@ -3,41 +3,75 @@
 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`
 
 ```
-docker-compose -f stack.yml up
-```
-
-Nastepnie w `restservice/src/main/resources/application.properties` nalezy podac ip naszego kontenera.
-
-```
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
-spring.datasource.url=jdbc:mysql://localhost:3306/test
-spring.datasource.username=root
-spring.datasource.password=example
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.jpa.hibernate.ddl-auto=create
-
-server.port=1285
+docker-compose -f stack.yml up -d
 ```
 
 Następnym krokiem jest odpalenie poniższych komend w terminalu.
+
 ```
 cd restservice
 mvn spring-boot:run
 ```
 
+## 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
+
+```
+python gettoken.py
+```
+
+Na koniec w przęglądarce dostaniesz w odpowiedzi token. W samym pliku można zmienić porty aplikacji jeśli to potrzebne.
+
+## 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ę
+
+```
+spring.profiles.active=prod
+```
+
+Jeżeli chcemy zmienić jakieś opcję dla pordukcji to robimy to w tym sammym katalogi w pliku `application-prod.properties` i dla dev analogicznie w `application-dev.properties`.
+W paczce dla proda w protpertiesach poufne dane odczytywane są ze zmiennych środowiskowych systemu na którym odpalana jest aplikacja. Ustawić trzeba następujące zmienne:
+
+-   `PLANNAPLAN_MYSQL_DB_HOST` - host bazy danych np `localhost`
+-   `PLANNAPLAN_MYSQL_DB_PORT` - port na którym działa baza
+-   `PLANNAPLAN_MYSQL_DB` - nazwa bazy dancyh. W profilu **dev** jest to np test
+-   `PLANNAPLAN_MYSQL_DB_USERNAME` - nazwa użytkownika bazy
+-   `PLANNAPLAN_MYSQL_DB_PASSWORD` - hasło użytkownika bazy
+-   `PLANNAPLAN_EMAIL_HOST` - host naszego dostawcy maila z którego będziemy wssyłać wiadomości
+-   `PLANNAPLAN_EMAIL_PORT` - port naszego dostawcy maila
+-   `PLANNAPLAN_EMAIL_USERNAME` - login naszego maila
+-   `PLANNAPLAN_EMAIL_PASSWORD` - hasło naszego maila
+-   `PLANNAPLAN_EMAIL` - nasz adres maila
+
 ## Packaging
 
 Zeby spakowac apke do `jara` wystarcza dwie komendy zaczynajac z glownego katalogu projektu
 
 ```
-mvn clean
-mvn install
-cd restservice
-mvn clean package spring-boot:repackage
+mvn clean; mvn install; cd restservice; mvn clean package spring-boot:repackage
 ```
 
 Utworzony zostanie jar w `restservice/target/restservice-1.0-SNAPSHOT.jar`. Oczywiscie zeby jar zadzialal kontenery dockerowe musza byc odpalone (lub baza danych na serwerze jesli zmienialismy propertisy z localhost)
 
+## Generowanie dokumentacji
+
+### Javadocs
+
+```bash
+mvn javadoc:javadoc
+```
+
+### Api docs
+
+Żeby zobaczyć dokumentację api trzeba wejść w przeglądarce na `http://localhost:1285/swagger-ui.html` po odpaleniu aplikacji.
+
+#### 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
 
 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

buisnesslogic/pom.xml

@@ -16,8 +16,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>14</maven.compiler.source>
+    <maven.compiler.target>14</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -27,17 +27,17 @@
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.junit.vintage</groupId>
-					<artifactId>junit-vintage-engine</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.junit.vintage</groupId>
+          <artifactId>junit-vintage-engine</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
-      <version>3.17</version>
+      <version>4.0.0</version>
     </dependency>
 
     <!-- dependency used for XLS older file format
@@ -68,6 +68,12 @@
       <version>3.17</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-mail</artifactId>
+      <version>2.2.5.RELEASE</version>
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -84,6 +90,15 @@
           <artifactId>maven-resources-plugin</artifactId>
           <version>3.0.2</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.0.0</version>
+          <configuration>
+            <source>1.8</source>
+            <target>1.8</target>
+          </configuration>
+        </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.8.0</version>

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

@@ -0,0 +1,9 @@
+{
+    "properties": [
+        {
+            "name": "plannaplan.email",
+            "type": "java.lang.String",
+            "description": "Email from which app sends message"
+        }
+    ]
+}

buisnesslogic/src/main/java/com/plannaplan/Acceptor.java

@@ -1,9 +0,0 @@
-package com.plannaplan;
-
-public class Acceptor {
-    public Acceptor() {
-    }
-
-    public void run() {
-    }
-}

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

@@ -1,46 +0,0 @@
-package com.plannaplan;
-
-import java.util.Date;
-
-import com.plannaplan.types.AppStates;
-
-public class App {
-    private static App instance;
-    private Date round1;
-    private Date round2;
-    private AppStates state;
-
-    private App() {
-    }
-
-    public AppStates getState() {
-        return state;
-    }
-
-    public void setState(AppStates state) {
-        this.state = state;
-    }
-
-    public Date getRound2() {
-        return round2;
-    }
-
-    public void setRound2(Date round2) {
-        this.round2 = round2;
-    }
-
-    public Date getRound1() {
-        return round1;
-    }
-
-    public void setRound1(Date round1) {
-        this.round1 = round1;
-    }
-
-    public App getInstance() {
-        if (App.instance == null) {
-            App.instance = new App();
-        }
-        return App.instance;
-    }
-}

buisnesslogic/src/main/java/com/plannaplan/Assigner.java

@@ -1,26 +0,0 @@
-package com.plannaplan;
-
-import com.plannaplan.interfaces.Historable;
-import com.plannaplan.interfaces.ProtectedAction;
-
-public class Assigner implements Historable, ProtectedAction {
-
-    public Assigner() {
-    }
-
-    public void assing() {
-    }
-
-    @Override
-    public void validateAction() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void addActionToHistory() {
-        // TODO Auto-generated method stub
-
-    }
-
-}

buisnesslogic/src/main/java/com/plannaplan/Configurator.java

@@ -1,43 +0,0 @@
-package com.plannaplan;
-
-import com.plannaplan.interfaces.ProtectedAction;
-import com.plannaplan.models.ConfigData;
-import com.plannaplan.models.FileData;
-import com.plannaplan.services.CourseService;
-import com.plannaplan.services.GroupService;
-import com.plannaplan.services.LecturerService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.plannaplan.configutils.*;
-
-@Component
-public class Configurator implements ProtectedAction {
-
-    @Autowired
-    private LecturerService lecturerService;
-
-    @Autowired
-    private CourseService courseService;
-
-    @Autowired
-    private GroupService groupService;
-
-    public Configurator() {
-    }
-
-    public void config(ConfigData data) {
-        FileReader reader = new FileReader(data.getFilestream());
-        FileData coursesData = reader.read();
-        FileToDatabaseMigrator mgtr = new FileToDatabaseMigrator(lecturerService, courseService, groupService);
-        mgtr.migrate(coursesData);
-    }
-
-    @Override
-    public void validateAction() {
-        // TODO Auto-generated method stub
-
-    }
-
-}

buisnesslogic/src/main/java/com/plannaplan/Controller.java

@@ -1,41 +0,0 @@
-package com.plannaplan;
-
-import com.plannaplan.models.ConfigData;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class Controller {
-
-    @Autowired
-    private Configurator configurator;
-
-    public Controller() {
-    }
-
-    public void startApp() {
-    }
-
-    public void assignCourse() {
-    }
-
-    public void addUnavailibility() {
-    }
-
-    public void addGroup() {
-    }
-
-    public void editGroup() {
-    }
-
-    public void getHistoryAtPoint() {
-    }
-
-    public void config(ConfigData data) {
-        configurator.config(data);
-    }
-
-    public void createTransfer() {
-    }
-}

buisnesslogic/src/main/java/com/plannaplan/Emailer.java

@@ -1,9 +0,0 @@
-package com.plannaplan;
-
-public class Emailer {
-    public Emailer() {
-    }
-
-    public void performAllMails() {
-    }
-}

buisnesslogic/src/main/java/com/plannaplan/EventChcker.java

@@ -1,13 +0,0 @@
-package com.plannaplan;
-
-import com.plannaplan.interfaces.EventCreator;
-
-public class EventChcker implements EventCreator {
-
-    @Override
-    public void update() {
-        // TODO Auto-generated method stub
-
-    }
-
-}

buisnesslogic/src/main/java/com/plannaplan/GroupAdder.java

@@ -1,26 +0,0 @@
-package com.plannaplan;
-
-import com.plannaplan.interfaces.Historable;
-import com.plannaplan.interfaces.ProtectedAction;
-
-public class GroupAdder implements Historable, ProtectedAction {
-
-    public GroupAdder() {
-    }
-
-    public void addGroup() {
-    }
-
-    @Override
-    public void addActionToHistory() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void validateAction() {
-        // TODO Auto-generated method stub
-
-    }
-
-}

buisnesslogic/src/main/java/com/plannaplan/GroupEditor.java

@@ -1,19 +0,0 @@
-package com.plannaplan;
-
-import com.plannaplan.interfaces.ProtectedAction;
-
-public class GroupEditor implements ProtectedAction {
-
-    public GroupEditor() {
-    }
-
-    public void setNewCapacity(int capaity) {
-    }
-
-    @Override
-    public void validateAction() {
-        // TODO Auto-generated method stub
-
-    }
-
-}

buisnesslogic/src/main/java/com/plannaplan/HistoryResolver.java

@@ -1,22 +0,0 @@
-package com.plannaplan;
-
-import com.plannaplan.interfaces.ProtectedAction;
-
-public class HistoryResolver implements ProtectedAction {
-
-    public HistoryResolver() {
-    }
-
-    public void getHistoryAtPoint() {
-    }
-
-    public void reproduce() {
-    }
-
-    @Override
-    public void validateAction() {
-        // TODO Auto-generated method stub
-
-    }
-
-}

buisnesslogic/src/main/java/com/plannaplan/TransferCreator.java

@@ -1,26 +0,0 @@
-package com.plannaplan;
-
-import com.plannaplan.interfaces.Historable;
-import com.plannaplan.interfaces.ProtectedAction;
-
-public class TransferCreator implements Historable, ProtectedAction {
-
-    public TransferCreator() {
-    }
-
-    public void createTransfer() {
-    }
-
-    @Override
-    public void validateAction() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void addActionToHistory() {
-        // TODO Auto-generated method stub
-
-    }
-
-}

buisnesslogic/src/main/java/com/plannaplan/TransferValidator.java

@@ -1,19 +0,0 @@
-package com.plannaplan;
-
-import com.plannaplan.interfaces.Historable;
-
-public class TransferValidator implements Historable {
-
-    public TransferValidator() {
-    }
-
-    public void performAllTransfers() {
-    }
-
-    @Override
-    public void addActionToHistory() {
-        // TODO Auto-generated method stub
-
-    }
-
-}

buisnesslogic/src/main/java/com/plannaplan/UnavailabilityAdder.java

@@ -1,26 +0,0 @@
-package com.plannaplan;
-
-import com.plannaplan.interfaces.Historable;
-import com.plannaplan.interfaces.ProtectedAction;
-
-public class UnavailabilityAdder implements Historable, ProtectedAction {
-
-    public UnavailabilityAdder() {
-    }
-
-    public void add() {
-    }
-
-    @Override
-    public void validateAction() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void addActionToHistory() {
-        // TODO Auto-generated method stub
-
-    }
-
-}

buisnesslogic/src/main/java/com/plannaplan/abstracts/EventWatcher.java

@@ -1,26 +0,0 @@
-package com.plannaplan.abstracts;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.plannaplan.interfaces.EventCreator;
-
-public abstract class EventWatcher {
-
-    protected List<EventCreator> creators;
-
-    public EventWatcher() {
-        this.creators = new ArrayList<>();
-    }
-
-    public void attach(EventCreator creator) {
-        this.creators.add(creator);
-    }
-
-    public void detach(EventCreator creator) {
-        this.creators.remove(creator);
-    }
-
-    public void update() {
-    }
-}

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

@@ -2,7 +2,7 @@ package com.plannaplan.configutils;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Iterator;
 
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -11,6 +11,9 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import com.plannaplan.models.FileData;
 
+/**
+ *  FileReader is used for reading xls file from input stream.
+ */
 public class FileReader {
 
     private InputStream fileInputStream;
@@ -33,12 +36,12 @@ public class FileReader {
             Row row = rowIt.next();
             Iterator<Cell> cellIt = row.cellIterator();
 
-            Hashtable<String, Integer> keys = new Hashtable<>();
+            HashMap<String, Integer> keys = new HashMap<>();
             int index = 0;
             while (cellIt.hasNext()) {
                 Cell c = cellIt.next();
                 keys.put(c.toString(), index);
-                index+=1;
+                index += 1;
             }
 
             rowIt.remove();
@@ -53,4 +56,4 @@ public class FileReader {
         return result;
     }
 
-}
+}

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

@@ -1,7 +1,6 @@
 package com.plannaplan.configutils;
 
 import java.util.Iterator;
-
 import com.plannaplan.entities.Course;
 import com.plannaplan.entities.Groups;
 import com.plannaplan.entities.Lecturer;
@@ -9,140 +8,104 @@ 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.Cell;
 import org.apache.poi.ss.usermodel.Row;
+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
+ */
+@Component
 public class FileToDatabaseMigrator {
-    public static String LECTURER_NAME_STRING = "imie";
-    public static String LECTURER_SURNAME_STRING = "nazwisko";
-    public static String LECTURER_TITLE_STRING = "tytul";
 
-    public static String COURSE_SYMBOL_STRING = "sym";
-    public static String COURSE_NAME_STRING = "nazwa";
+    private static final String LECTURER_NAME_STRING = "imie";
+    private static final String LECTURER_SURNAME_STRING = "nazwisko";
+    private static final String LECTURER_TITLE_STRING = "tytul";
 
-    public static String GROUP_DAY_STRING = "dzien";
-    public static String GROUP_TIME_STRING = "godz_od";
-    public static String ROOM_STRING = "sala";
-    public static String CAPACITY_STRING = "Mc";
+    private static final String COURSE_SYMBOL_STRING = "sym";
+    private static final String COURSE_NAME_STRING = "nazwa";
 
-    LecturerService lecturerService;
-    CourseService courseService;
-    GroupService groupService;
+    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";
 
-    public FileToDatabaseMigrator(LecturerService lecturerService, CourseService courseService,
-            GroupService groupService) {
-        this.lecturerService = lecturerService;
-        this.groupService = groupService;
-        this.courseService = courseService;
+    private static final String ZAJ_CYK_ID = "zaj_cyk_id";
+    private static final String GR_NR = "gr_nr";
+
+    @Autowired
+    private LecturerService lecturerService;
+    @Autowired
+    private CourseService courseService;
+    @Autowired
+    private GroupService groupService;
+
+    public FileToDatabaseMigrator() {
     }
 
     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 course_name_index = data.getIndexOf(FileToDatabaseMigrator.COURSE_NAME_STRING);
-        int sym_index = data.getIndexOf(FileToDatabaseMigrator.COURSE_SYMBOL_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);
 
-        int title_index = data.getIndexOf(FileToDatabaseMigrator.LECTURER_TITLE_STRING);
-        int surname_index = data.getIndexOf(FileToDatabaseMigrator.LECTURER_SURNAME_STRING);
-        int name_index = data.getIndexOf(FileToDatabaseMigrator.LECTURER_NAME_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 day_index = data.getIndexOf(FileToDatabaseMigrator.GROUP_DAY_STRING);
-        int time_index = data.getIndexOf(FileToDatabaseMigrator.GROUP_TIME_STRING);
-        int room_index = data.getIndexOf(FileToDatabaseMigrator.ROOM_STRING);
-        int capacity_index = data.getIndexOf(FileToDatabaseMigrator.CAPACITY_STRING);
+        int zajCykIdIndex = data.getIndexOf(FileToDatabaseMigrator.ZAJ_CYK_ID);
+        int grNrIndex = data.getIndexOf(FileToDatabaseMigrator.GR_NR);
 
         while (rows.hasNext()) {
             Row row = rows.next();
 
-            Cell course_name_cell = row.getCell(course_name_index);
-            Cell sym = row.getCell(sym_index);
+            String courseName = row.getCell(courseNameIndex).toString().trim();
+            String symbol = row.getCell(symbolIndex).toString().trim();
 
-            Cell title_cell = row.getCell(title_index);
-            Cell name_cell = row.getCell(name_index);
-            Cell surname_cell = row.getCell(surname_index);
+            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()
+                    : "";
 
-            Cell day_cell = row.getCell(day_index);
-            Cell time_cell = row.getCell(time_index);
-            Cell room_cell = row.getCell(room_index);
-            Cell capacity_cell = row.getCell(capacity_index);
+            Integer zajCykId = row.getCell(zajCykIdIndex) != null ? (int) Double.parseDouble(row.getCell(zajCykIdIndex).toString().trim())
+                    : null;
+            
+            Integer grNr = row.getCell(grNrIndex) != null ? (int) Double.parseDouble(row.getCell(grNrIndex).toString().trim())
+                    : null;
 
-            String lecturer_title = "";
-            String lecturer_surname = "";
-            String lecturer_name = "";
+            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 course_name = course_name_cell.toString().trim();
-            String sym_str = sym.toString().trim();
+            Course course = this.courseService.getCourseByName(courseName)
+                    .orElseGet(() -> this.courseService.save(new Course(courseName, symbol)));
 
-            int day = (int) Double.parseDouble(day_cell.toString());
-            WeekDay group_day = WeekDay.getDay(day - 1);
-            String room = room_cell.toString().trim();
-            int time = this.parseTimeToInt(time_cell.toString());
+            Lecturer lecturer = this.lecturerService.getLecturer(lecturerTitle, lecturerName, lecturerSurname)
+                    .orElseGet(() -> this.lecturerService
+                            .save(new Lecturer(lecturerTitle, lecturerName, lecturerSurname)));
 
-            int capacity = (int) Double.parseDouble(capacity_cell.toString());
+            Groups group = this.groupService.find(zajCykId, grNr).orElseGet(
+                    () -> new Groups(capacity, room, course, time, groupDay, lecturer, zajCykId, grNr));
 
-            Groups group = groupService.find(time, capacity, room);
-
-            Course course = this.courseService.getCourseByName(course_name);
-
-            if (course == null) {
-                course = new Course();
-                course.setName(course_name);
-                course.setSymbol(sym_str);
-            }
-
-            courseService.save(course);
-
-            if (title_cell != null) {
-                lecturer_title = title_cell.toString().trim();
-            }
-            if (name_cell != null) {
-                lecturer_name = name_cell.toString().trim();
-            }
-            if (surname_cell != null) {
-                lecturer_surname = surname_cell.toString().trim();
-            }
-
-            Lecturer lecturer = lecturerService.getLecturer(lecturer_title, lecturer_name, lecturer_surname);
-
-            if (lecturer == null) {
-                lecturer = new Lecturer(lecturer_title, lecturer_name, lecturer_surname);
-                lecturerService.save(lecturer);
-            }
-
-            if (group == null) {
-                group = new Groups();
-                group.setCapacity(capacity);
-                group.setRoom(room);
-                group.setCourseId(course);
-                group.setTime(time);
-                if (capacity >= 50) {
-                    group.setType(GroupType.LECTURE);
-                } else {
-                    group.setType(GroupType.CLASS);
-                }
-                group.setDay(group_day);
-                group.setLecturer(lecturer);
-
-                groupService.save(group);
-            }
+                group.update(capacity, room, course, time, null, groupDay, lecturer);
+                
+                this.groupService.save(group);
 
         }
 
     }
 
-    private Integer parseTimeToInt(String time) {
-        String times[] = time.split("\\.");
-        if (times.length == 2) {
-            return Integer.parseInt(times[0]) * 60 + Integer.parseInt(times[1]);
-        }
-        times = time.split("\\:");
-        if (times.length == 2) {
-            return Integer.parseInt(times[0]) * 60 + Integer.parseInt(times[1]);
-        }
+    private static int parseTimeToInt(String time) {
+        String times[] = time.split("\\.|\\:");
+        return times.length == 2 ? Integer.parseInt(times[0]) * 60 + Integer.parseInt(times[1]) : 0;
 
-        return 0;
     }
 }

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

@@ -0,0 +1,118 @@
+package com.plannaplan.entities;
+
+import java.sql.Date;
+import java.sql.Timestamp;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import com.plannaplan.models.TourData;
+import com.plannaplan.types.AppState;
+
+/**
+ * entity that keeps app configurations
+ */
+@Entity
+public class AppConfig {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    private Date firstTourStart;
+    private Date firstTourEnd;
+    private Date secondTourStart;
+    private Date secondTourEnd;
+    private Timestamp configDate;
+
+    /**
+     * no parameter construcotor
+     */
+    public AppConfig() {
+    }
+
+    /**
+     * constructor
+     * 
+     * @param firstTour first TourData instacne
+     * @param scondTour second TourData instacne
+     */
+    public AppConfig(TourData firstTour, TourData scondTour) {
+        this.firstTourStart = firstTour.getStart();
+        this.firstTourEnd = firstTour.getEnd();
+        this.secondTourStart = scondTour.getStart();
+        this.secondTourEnd = scondTour.getEnd();
+        this.configDate = new Timestamp(System.currentTimeMillis());
+    }
+
+    /**
+     * 
+     * second tour end getter
+     * 
+     * @return Date inforamtion when second tour ends
+     */
+    public Date getSecondTourEnd() {
+        return secondTourEnd;
+    }
+
+    /**
+     * first second start getter
+     * 
+     * @return Date inforamtion when second tour start
+     */
+    public Date getSecondTourStart() {
+        return secondTourStart;
+    }
+
+    /**
+     * first tour end getter
+     * 
+     * @return Date inforamtion when first tour end
+     */
+    public Date getFirstTourEnd() {
+        return firstTourEnd;
+    }
+
+    /**
+     * first tour start getter
+     * 
+     * @return Date inforamtion when first tour start
+     */
+    public Date getFirstTourStart() {
+        return firstTourStart;
+    }
+
+    /**
+     * config date getter
+     * 
+     * @return Timestamp when configuration took place
+     */
+    public Timestamp getConfigDate() {
+        return configDate;
+    }
+
+    /**
+     * current state getter
+     * 
+     * @return AppState of app at the moment of calling method
+     */
+    public AppState getCurrentState() {
+        final Date now = new Date(System.currentTimeMillis());
+        if (this.secondTourEnd.before(now)) {
+            return AppState.NO_TOUR;
+        }
+        if (this.secondTourStart.before(now)) {
+            return AppState.SECOND_TOUR;
+        }
+        if (this.firstTourEnd.before(now)) {
+            return AppState.NO_TOUR;
+        }
+        if (this.firstTourStart.before(now)) {
+            return AppState.FIRST_TOUR;
+        }
+
+        return AppState.NO_TOUR;
+    }
+
+}

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

@@ -7,6 +7,11 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
+/**
+ *  Entity of Assignment grouping of state associated about group_id and commision_id
+ * 
+ */
+
 @Entity
 public class Assignment {
     @Id
@@ -16,9 +21,64 @@ public class Assignment {
     @JoinColumn(name = "group_id")
     private Groups group;
     @ManyToOne
-    @JoinColumn(name = "user_id")
-    private User user;
+    @JoinColumn(name = "commision_id")
+    private Commision commision;
+    private boolean isPastAssignment;
+ 
+    /**
+     * Assignment
+     * @param group group we would like to assign
+     * @param commision commision that assignment belongs to
+     * @param isPastAssignment is assignment past or no
+     */
+    public Assignment(Groups group, Commision commision, boolean isPastAssignment) {
+        this.commision = commision;
+        this.group = group;
+    }
+
+    /**
+     * Assignment
+     * @param group group we would like to assign
+     * @param commision commision that assignment belongs to
+     */
+    public Assignment(Groups group, Commision commision) {
+        this(group, commision, false);
+    }
 
     public Assignment() {
     }
+
+    /**
+     *  Id getter
+     *  @return id id of assignment
+     */
+
+    public Long getId() {
+        return this.id;
+    }
+
+    /**
+     *  getGroup 
+     * 
+     *  @return group
+     */
+    public Groups getGroup() {
+        return this.group;
+    }
+
+    /**
+     * isPastAssignment getter
+     * @return isPastAssignment
+     */
+    public boolean isPastAssignment() {
+        return isPastAssignment;
+    }
+
+    /**
+     * setter isPastAssignment
+     * @param isPastAssignment
+     */
+    public void setPastAssignment(boolean isPastAssignment) {
+        this.isPastAssignment = isPastAssignment;
+    }
 }

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

@@ -0,0 +1,105 @@
+package com.plannaplan.entities;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+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.OneToMany;
+import javax.persistence.OneToOne;
+
+/**
+ * Entity of Commision grouping of state associated about commison and owner_id
+ */
+
+@Entity
+public class Commision {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    @OneToOne
+    @JoinColumn(name = "owner_id")
+    private User commisionOwner;
+    @OneToOne
+    @JoinColumn(name = "commiter_id")
+    private User commisionCommiter;
+    private Timestamp commisionDate;
+
+    @OneToMany(mappedBy = "commision", fetch = FetchType.EAGER)
+    private List<Assignment> assignments;
+
+    /**
+     * 
+     * @param user owner of commission. Can not be null otherwise saving commision
+     *             will fail.
+     */
+    public Commision(User user) {
+        this.commisionDate = new Timestamp(System.currentTimeMillis());
+        this.commisionOwner = user;
+        this.commisionCommiter = user;
+    }
+
+    /**
+     * 
+     * @param user     user whose shedule is being commited
+     * @param commiter user that commited new schedule
+     */
+    public Commision(User user, User commiter) {
+        this(user);
+        this.commisionCommiter = commiter;
+    }
+
+    public Commision() {
+    }
+
+    /**
+     * Id getter
+     * 
+     * @return id id of commision
+     */
+    public Long getId() {
+        return this.id;
+    }
+
+    /**
+     * CommisionDate getter
+     * 
+     * @return commisionDate
+     */
+    public Timestamp getCommisionDate() {
+        return commisionDate;
+    }
+
+    /**
+     * User of given commision getter
+     * 
+     * @return User commisionOwner
+     */
+    public User getCommisionOwner() {
+        return commisionOwner;
+    }
+
+    /**
+     * @return User entity that created commision (can be owner or deanery user)
+     */
+    public User getCommisionCommiter() {
+        if (commisionCommiter == null) {
+            return commisionOwner;
+        }
+        return commisionCommiter;
+    }
+
+    /**
+     * Assigments getter
+     * 
+     * @return List of assignments
+     */
+    public List<Assignment> getAssignments() {
+        return this.assignments;
+    }
+
+}

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

@@ -10,6 +10,10 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 
+/**
+ *  Entity of Course grouping of state of course
+ */
+
 @Entity
 public class Course {
     @Id
@@ -17,34 +21,69 @@ public class Course {
     private Long id;
     private String name;
     private String symbol;
-    @OneToMany(mappedBy = "courseId", fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "course", fetch = FetchType.EAGER)
     private List<Groups> groups = new ArrayList<>();
 
     public Course() {
     }
 
+    /**
+     * Course
+     * 
+     * @param name name given to the course
+     * @param symbol symbol given to the course
+     */
+    public Course(String name, String symbol) {
+        this.name = name;
+        this.symbol = symbol;
+    }
+
+    /**
+     * getId
+     * @return id
+     */
     public Long getId() {
         return this.id;
     }
 
+    /**
+     * getName
+     * @return name
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * getSymbol
+     * @return symbol
+     */
     public String getSymbol() {
         return symbol;
     }
 
+    /**
+     * setSymbol
+     * @param symbol set symbol in the course
+     */
     public void setSymbol(String symbol) {
         this.symbol = symbol;
     }
-
+   
+    /**
+     * setName
+     * @param name set name in the course
+     */
     public void setName(String name) {
         this.name = name;
     }
 
-    public List<Groups> getGroups(){
+    /**
+     * getGroups
+     * @return groups return list groups
+     */
+    public List<Groups> getGroups() {
         return this.groups;
     }
 
-}
+}

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

@@ -1,32 +0,0 @@
-package com.plannaplan.entities;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
-import com.plannaplan.types.EventTypes;
-
-@Entity
-public class Event {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-    private EventTypes type;
-    @ManyToOne
-    @JoinColumn(name = "user_id")
-    private User user;
-
-    public Event() {
-    }
-
-    public EventTypes getType() {
-        return type;
-    }
-
-    public void setType(EventTypes type) {
-        this.type = type;
-    }
-}

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

@@ -10,15 +10,23 @@ import javax.persistence.ManyToOne;
 import com.plannaplan.types.GroupType;
 import com.plannaplan.types.WeekDay;
 
+/**
+ * Entity of Groups grouping of state ssociated about
+ * course,time,room,capacity,type,day
+ */
+
 @Entity
 public class Groups {
+    private static final int DEFAULT_CLASS_TIME = 90;
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
     @ManyToOne
     @JoinColumn(name = "course_id")
-    private Course courseId;
+    private Course course;
     private int time;
+    private int endTime;
     private String room;
     private int capacity;
     private GroupType type;
@@ -26,70 +34,292 @@ public class Groups {
     @ManyToOne
     @JoinColumn(name = "lecturer_id")
     private Lecturer lecturer;
+    private Integer zajCykId;
+    private Integer grNr;
 
     public Groups() {
     }
 
+    public Integer getGr_nr() {
+        return grNr;
+    }
+
+    public void setGr_nr(Integer grNr) {
+        this.grNr = grNr;
+    }
+
+    public Integer getZaj_cyk_id() {
+        return zajCykId;
+    }
+
+    public void setZaj_cyk_id(Integer zajCykId) {
+        this.zajCykId = zajCykId;
+    }
+
+
+    /**
+     * Groups
+     * 
+     * @param capacity capacity given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param endTime  end time of class in minutes
+     * @param day      day given to the groups
+     * @param lecturer lecturer given to the groups
+     */
+    public Groups(int capacity, String room, Course course, int time, int endTime, WeekDay day, Lecturer lecturer) {
+        this.capacity = capacity;
+        this.room = room;
+        this.course = course;
+        this.time = time;
+        this.endTime = endTime;
+        this.day = day;
+        this.lecturer = lecturer;
+        this.type = capacity >= 50 ? GroupType.LECTURE : GroupType.CLASS;
+    }
+
+    /**
+     * Groups
+     * 
+     * @param capacity capacity given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param endTime  end time of class in minutes
+     * @param day      day given to the groups
+     * @param lecturer lecturer given to the groups
+     * @param zajCykId number of class in the term
+     * @param gr_nr Number of class/course
+     */
+    public Groups(int capacity, String room, Course course, int time, int endTime, WeekDay day, Lecturer lecturer, Integer zajCykId, Integer grNr) {
+        this(capacity, room, course, time, endTime, day, lecturer);
+        this.zajCykId = zajCykId;
+        this.grNr = grNr;
+    }
+
+    /**
+     * Groups
+     * 
+     * @param capacity capacity given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param day      day given to the groups
+     * @param lecturer lecturer given to the groups
+     * @param zajCykId number of class in the term
+     * @param grNr Number of class/course
+     */
+    public Groups(int capacity, String room, Course course, int time, WeekDay day, Lecturer lecturer, Integer zajCykId, Integer grNr) {
+        this(capacity, room, course, time, time + DEFAULT_CLASS_TIME, day, lecturer);
+        this.zajCykId = zajCykId;
+        this.grNr = grNr;
+    }
+
+    /**
+     * Create groups with default class duration
+     * 
+     * @param capacity capacity given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param day      day given to the groups
+     * @param lecturer lecturer given to the groups
+     */
+    public Groups(int capacity, String room, Course course, int time, WeekDay day, Lecturer lecturer) {
+        this(capacity, room, course, time, time + DEFAULT_CLASS_TIME, day, lecturer);
+    }
+
+    /**
+     * Updates given values other that are not null
+     * 
+     * @param capacity capacity given to the groups
+     * @param room     room given to the groups
+     * @param course   course given to the groups
+     * @param time     time given to the groups
+     * @param endTime  end time of class in minutes
+     * @param day      day given to the groups
+     * @param lecturer lecturer given to the groups
+     */
+    public void update(Integer capacity, String room, Course course, Integer time, Integer endTime, WeekDay day, Lecturer lecturer){
+        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;
+        } 
+    }
+
+    /**
+     * get time of class end
+     * 
+     * @return hour of class finish time in minutes
+     */
+    public int getEndTime() {
+        return endTime;
+    }
+
+    /**
+     * getId
+     * 
+     * @return id
+     */
     public Long getId() {
         return this.id;
     }
 
+    /**
+     * getLecturer
+     * 
+     * @return lecturer
+     */
     public Lecturer getLecturer() {
         return lecturer;
     }
 
+    /**
+     * setLecturer
+     * 
+     * @param lecturer set lecturer into groups
+     */
     public void setLecturer(Lecturer lecturer) {
         this.lecturer = lecturer;
     }
 
+    /**
+     * WeekDay
+     * 
+     * @return day
+     */
     public WeekDay getDay() {
         return day;
     }
 
+    /**
+     * setLecturer
+     * 
+     * @param day set day into groups
+     */
     public void setDay(WeekDay day) {
         this.day = day;
     }
 
+    /**
+     * GroupType
+     * 
+     * @return type
+     */
     public GroupType getType() {
         return type;
     }
 
+    /**
+     * setType
+     * 
+     * @param type set type into groups
+     */
     public void setType(GroupType type) {
         this.type = type;
     }
 
+    /**
+     * getCapacity
+     * 
+     * @return capacity
+     */
     public int getCapacity() {
         return capacity;
     }
 
+    /**
+     * setCapacity
+     * 
+     * @param capacity set capacity into groups
+     */
     public void setCapacity(int capacity) {
         this.capacity = capacity;
     }
 
+    /**
+     * getRoom
+     * 
+     * @return room
+     */
     public String getRoom() {
         return room;
     }
 
+    /**
+     * setRoom
+     * 
+     * @param room set room into groups
+     */
     public void setRoom(String room) {
         this.room = room;
     }
 
+    /**
+     * getTime
+     * 
+     * @return time
+     */
     public int getTime() {
         return time;
     }
 
+    /**
+     * setTime
+     * 
+     * @param time set time into groups
+     */
     public void setTime(int time) {
         this.time = time;
     }
 
+    /**
+     * getCourseId
+     * 
+     * @return course
+     */
     public Course getCourseId() {
-        return courseId;
+        return course;
     }
 
+    /**
+     * setCourseId
+     * 
+     * @param courseId set courseId into groups
+     */
     public void setCourseId(Course courseId) {
-        this.courseId = courseId;
+        this.course = courseId;
     }
 
+    /**
+     * getTimeString
+     * 
+     * @return time as formated String
+     */
     public String getTimeString() {
         int minutes = this.getTime() % 60;
         String hoursString = Integer.toString(this.getTime() / 60);
@@ -99,4 +329,19 @@ public class Groups {
         }
         return String.format("%s.%s", hoursString, minutesString);
     }
-}
+
+    /**
+     * gets end time formated strins
+     * 
+     * @return end time as formated String
+     */
+    public String getEndTimeString() {
+        int minutes = this.getEndTime() % 60;
+        String hoursString = Integer.toString(this.getEndTime() / 60);
+        String minutesString = Integer.toString(minutes);
+        if (minutes < 10) {
+            minutesString = "0" + minutesString;
+        }
+        return String.format("%s.%s", hoursString, minutesString);
+    }
+}

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

@@ -1,25 +0,0 @@
-package com.plannaplan.entities;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
-@Entity
-public class HistoryElement {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-    @ManyToOne
-    @JoinColumn(name = "user_id")
-    private User user;
-    @ManyToOne
-    @JoinColumn(name = "incoming_id")
-    private Groups incoming;
-    @ManyToOne
-    @JoinColumn(name = "outcoming_id")
-    private Groups outcoming;
-
-}

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

@@ -5,6 +5,10 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
+/**
+ *  Entity of Lecturer grouping of state ssociated about id,title,name,surname
+ */
+
 @Entity
 public class Lecturer {
     @Id
@@ -14,30 +18,14 @@ public class Lecturer {
     private String name;
     private String surname;
 
-    public String getTitle() {
-        return title;
-    }
-
-    public String getSurname() {
-        return surname;
-    }
-
-    public void setSurname(String surname) {
-        this.surname = surname;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
 
+    /**
+     * Lecturer
+     *
+     * @param title title given to the lecturer
+     * @param name name given to the lecturer
+     * @param surname surname given to the lecturer
+     */
     public Lecturer(String title, String name, String surname) {
         this.title = title;
         this.name = name;
@@ -47,9 +35,63 @@ public class Lecturer {
     public Lecturer() {
     }
 
+    /**
+     *  getTitle
+     * @return title
+     *
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     *  getSurname
+     * @return surname
+     *
+     */
+    public String getSurname() {
+        return surname;
+    }
+
+    /**
+     *  setSurname
+     * @param surname set surname to the lecturer
+     *
+     */
+    public void setSurname(String surname) {
+        this.surname = surname;
+    }
+
+    /**
+     *  getName
+     * @return name
+     *
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     *  setName
+     * @param name set name to the lecturer
+     *
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     *  setTitle
+     * @param title set title to the lecturer
+     *
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     @Override
     public String toString() {
         return String.format("%s %s %s", this.title, this.name, this.surname);
     }
 
-}
+}

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

@@ -1,28 +0,0 @@
-package com.plannaplan.entities;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
-@Entity
-public class Transfer {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-    @ManyToOne
-    @JoinColumn(name = "owner_id")
-    private User ownerUser;
-    @ManyToOne
-    @JoinColumn(name = "group_id")
-    private Groups ownerGroup;
-    @ManyToOne
-    @JoinColumn(name = "target_id")
-    private Groups targetGroup;
-
-    public Transfer() {
-    }
-
-}

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

@@ -1,30 +0,0 @@
-package com.plannaplan.entities;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
-@Entity
-public class Unavailability {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-    @ManyToOne
-    @JoinColumn(name = "user_id")
-    private User lecturer;
-    private int time;
-
-    public Unavailability() {
-    }
-
-    public int getTime() {
-        return time;
-    }
-
-    public void setTime(int time) {
-        this.time = time;
-    }
-}

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

@@ -1,6 +1,8 @@
 package com.plannaplan.entities;
 
-import java.sql.Date;
+import java.sql.Timestamp;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -9,63 +11,198 @@ import javax.persistence.Id;
 
 import com.plannaplan.types.UserRoles;
 
+/**
+ * Entity of User grouping of state ssociated about
+ * id,name,surname,email,role,token,tokenCreatedDate
+ */
+
 @Entity
 public class User {
+    private static final float TOKEN_EXPIRE_MINUTES = 15;
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
     private String name;
     private String surname;
     private String email;
+    private String usosId;
     private UserRoles role;
     private String token;
-    private Date tokenCreatedDate;
+    private String refreshToken;
+    private Timestamp tokenUsageDate;
 
     public User() {
     }
 
+    /**
+     * 
+     * @param name    name given to the user
+     * @param surname surname given to the user
+     * @param mail    mail given to the user
+     * @param role
+     */
+    public User(String name, String surname, String mail, UserRoles role) {
+        this.name = name;
+        this.surname = surname;
+        this.email = mail;
+        this.role = role;
+    }
+
+    /**
+     * 
+     * @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
+     */
+    public User(String name, String surname, String mail, String usosId, UserRoles role) {
+        this(name, surname, mail, role);
+        this.usosId = usosId;
+    }
+
+    /**
+     * usos id getter
+     * 
+     * @return usosid
+     */
+    public String getUsosId() {
+        return usosId;
+    }
+
+    /**
+     * email getter
+     * 
+     * @return mailof user
+     */
     public String getEmail() {
         return email;
     }
 
+    /**
+     * email setter
+     * 
+     * @param email user email
+     */
     public void setEmail(String email) {
         this.email = email;
     }
 
-    public Date getTokenCreatedDate() {
-        return tokenCreatedDate;
+    /**
+     * token usage getter
+     * 
+     * @return Timestamp when token was used
+     */
+    public Timestamp getTokenUsageDate() {
+        return tokenUsageDate;
     }
 
+    /**
+     * token getter
+     * 
+     * @return user token
+     */
     public String getToken() {
         return token;
     }
 
-    public void setToken(String token) {
-        this.tokenCreatedDate = new Date(System.currentTimeMillis());
-        this.token = token;
+    /**
+     * @return token needed to call refresh token after it expired
+     */
+    public String getRefreshToken() {
+        return refreshToken;
     }
 
+    /**
+     * token seter. Sets token and automaticly set time when was set
+     * 
+     * @param token token to set
+     */
+    public void setToken(String token) {
+        this.tokenUsageDate = new Timestamp(System.currentTimeMillis());
+        this.token = token;
+        this.refreshToken = UUID.randomUUID().toString();
+    }
+
+    /**
+     * name setter
+     * 
+     * @return String user name
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * user rolse getter
+     * 
+     * @return UserRoles of user
+     */
     public UserRoles getRole() {
         return role;
     }
 
+    /**
+     * user role setter
+     * 
+     * @param role to be set
+     */
     public void setRole(UserRoles role) {
         this.role = role;
     }
 
+    /**
+     * surname getter
+     * 
+     * @return string surname
+     */
     public String getSurname() {
         return surname;
     }
 
+    /**
+     * surname setter
+     * 
+     * @param surname string to be set as surnames
+     */
     public void setSurname(String surname) {
         this.surname = surname;
     }
 
+    /**
+     * name stter
+     * 
+     * @param name stirng to be set as name
+     */
     public void setName(String name) {
         this.name = name;
     }
-}
+
+    /**
+     * id getter
+     * 
+     * @return id in database
+     */
+    public Long getId() {
+        return this.id;
+    }
+
+    /**
+     * it checks if given ammount of time passed since last token usage. If not
+     * retunr true and reset time otherwise return false and token won work anymore
+     * 
+     * @return boolena if credentials (token) is expired or not
+     */
+    public boolean isCredentialsNonExpired() {
+        final long diffInMilliseconds = Math
+                .abs(this.tokenUsageDate.getTime() - new Timestamp(System.currentTimeMillis()).getTime());
+        final long minutes = TimeUnit.MILLISECONDS.toMinutes(diffInMilliseconds);
+
+        if (minutes > TOKEN_EXPIRE_MINUTES) {
+            return false;
+        }
+        this.tokenUsageDate = new Timestamp(System.currentTimeMillis());
+        return true;
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.plannaplan.exceptions;
+
+public class TokenExpiredException extends RuntimeException {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    public TokenExpiredException(String message) {
+        super(message);
+    }
+
+}

buisnesslogic/src/main/java/com/plannaplan/interfaces/EventCreator.java

@@ -1,5 +0,0 @@
-package com.plannaplan.interfaces;
-
-public interface EventCreator {
-    void update();
-}

buisnesslogic/src/main/java/com/plannaplan/interfaces/Historable.java

@@ -1,5 +0,0 @@
-package com.plannaplan.interfaces;
-
-public interface Historable {
-    void addActionToHistory();
-}

buisnesslogic/src/main/java/com/plannaplan/interfaces/ProtectedAction.java

@@ -1,5 +0,0 @@
-package com.plannaplan.interfaces;
-
-public interface ProtectedAction {
-    void validateAction();
-}

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

@@ -1,29 +1,50 @@
 package com.plannaplan.models;
 
-import java.util.Date;
 import java.io.InputStream;
 
 public class ConfigData {
-    private Date start;
-    private Date end;
+    private TourData firstTour;
+    private TourData secondTour;
     private InputStream filestream;
 
-    public ConfigData(Date start, Date end, InputStream filestream) {
-        this.start = start;
-        this.end = end;
+    /**
+     * constructor
+     * 
+     * @param firstTour  date of first tours
+     * @param secondTour date of second tours
+     * @param filestream filestram with data to import
+     */
+    public ConfigData(TourData firstTour, TourData secondTour, InputStream filestream) {
+        this.firstTour = firstTour;
+        this.secondTour = secondTour;
         this.filestream = filestream;
     }
 
+    /**
+     * second tour getter
+     * 
+     * @return TourData second tour
+     */
+    public TourData getSecondTour() {
+        return secondTour;
+    }
+
+    /**
+     * first tour getter
+     * 
+     * @return TourData first tour
+     */
+    public TourData getFirstTour() {
+        return firstTour;
+    }
+
+    /**
+     * filestream getter
+     * 
+     * @return InputStream with data to import
+     */
     public InputStream getFilestream() {
         return filestream;
     }
 
-    public Date getEnd() {
-        return end;
-    }
-
-    public Date getStart() {
-        return start;
-    }
-
-}
+}

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

@@ -1,39 +1,65 @@
 package com.plannaplan.models;
 
-import java.util.Dictionary;
+import java.util.HashMap;
 import java.util.Iterator;
-
 import org.apache.poi.ss.usermodel.Row;
 
 public class FileData {
 
-    private Dictionary<String, Integer> keys;
+    private HashMap<String, Integer> keys;
     private Iterator<Row> rows;
 
-    public FileData(Dictionary<String, Integer> keys, Iterator<Row> rows) {
-        this.setKeys(keys);
-        this.setRows(rows);
+    /*
+     * 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) {
+        this.keys = keys;
+        this.rows = rows;
     }
 
+    /*
+     * getRows
+     *
+     * @return rows
+     */
     public Iterator<Row> getRows() {
         return rows;
     }
 
+    /*
+     * setRows
+     * @param rows set the rows to given function
+     */
     public void setRows(Iterator<Row> rows) {
         this.rows = rows;
     }
 
-    public Dictionary<String, Integer> getKeys() {
+    /*
+     * getKeys
+     * @return keys
+     */
+    public HashMap<String, Integer> getKeys() {
         return keys;
     }
 
-    public void setKeys(Dictionary<String, Integer> keys) {
+    /*
+     * setKeys
+     * @param keys set the key is being a struck of hashmap (String, Integer)
+     */
+    public void setKeys(HashMap<String, Integer> keys) {
         this.keys = keys;
     }
 
+    /*
+     * getIndexOf
+     * @return index
+     */
     public int getIndexOf(String key) {
         int index = this.keys.get(key);
         return index;
     }
 
-}
+}

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

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

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

@@ -0,0 +1,8 @@
+package com.plannaplan.repositories;
+
+import com.plannaplan.entities.AppConfig;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface AppConfigRepository extends JpaRepository<AppConfig, Long> {
+}

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

@@ -1,11 +1,25 @@
 package com.plannaplan.repositories;
 
+import java.util.List;
+
 import com.plannaplan.entities.Assignment;
 
 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;
 
+/**
+ *  AssignmentRepository.getByCommision:
+ *      Return list of:
+ *      SELECT * FROM Assignment WHERE commision_id = i .
+ * 
+ *      Where i, ?1 are equale to variables. 
+ */
 @Repository
 public interface AssignmentRepository extends JpaRepository<Assignment, Long> {
 
+    @Query("FROM Assignment WHERE commision_id = ?1")
+    List<Assignment> getByCommision(@Param("commision_id") Long id);
+
 }

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

@@ -0,0 +1,33 @@
+package com.plannaplan.repositories;
+
+import java.util.List;
+
+import com.plannaplan.entities.Commision;
+
+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;
+
+/**
+ *  CommisionRepository.getUsers:
+ *      Return list of:
+ *      SELECT * FROM Commision WHERE owner_id = i .
+ * 
+ *      Where i, ?1 are equale to variables. 
+ * 
+ *  CommisionRepository.getNewestCommision
+ *      Return list of:
+ *      SELECT * FROM Commision WHERE owner_id = i Order by commisionDate desc.
+ * 
+ *      Where i, ?1 are equale to variables.      
+ */
+@Repository
+public interface CommisionRepository extends JpaRepository<Commision, Long> {
+    @Query("FROM Commision WHERE owner_id = ?1")
+    List<Commision> getUsers(@Param("owner_id") Long id);
+
+    @Query("FROM Commision WHERE owner_id = ?1 order by commisionDate desc")
+    List<Commision> getNewestCommision(@Param("owner_id") Long id);
+
+}

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

@@ -1,5 +1,7 @@
 package com.plannaplan.repositories;
 
+import java.util.Optional;
+
 import com.plannaplan.entities.Course;
 
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,8 +9,15 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+/**
+ *  CourseRepository.findByName:
+ *      Return list of:
+ *      SELECT * FROM Course WHERE name = i .
+ * 
+ *      Where i, ?1 are equale to variables. 
+ */
 @Repository
 public interface CourseRepository extends JpaRepository<Course, Long> {
     @Query("FROM Course WHERE name = ?1")
-    Course findByName(@Param("name") String name);
+    Optional<Course> findByName(@Param("name") String name);
 }

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

@@ -1,11 +0,0 @@
-package com.plannaplan.repositories;
-
-import com.plannaplan.entities.Event;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface EventRepository extends JpaRepository<Event, Long> {
-
-}

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

@@ -1,6 +1,7 @@
 package com.plannaplan.repositories;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.plannaplan.entities.Groups;
 
@@ -9,12 +10,42 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+/**
+ *  GroupRepository.find:
+ *      Return list of:
+ *      SELECT * FROM Groups WHERE time = i AND room = j AND capacity = k .
+ * 
+ *      Where i, j, k, ?1, ?2, ?3 are equale to variables. 
+ * 
+ *  GroupRepository.getByCourse:
+ *      Return list of:
+ *      SELECT * FROM Groups WHERE course_id = i .
+ * 
+ *      Where i, ?1 are equale to variables. 
+ */
 @Repository
 public interface GroupRepository extends JpaRepository<Groups, Long> {
     @Query("FROM Groups WHERE time = ?1 AND room = ?2 AND capacity = ?3")
-    Groups find(@Param("time") int time, @Param("room") String room, @Param("capacity") int capacity);
+    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);
 
+    @Query("SELECT COUNT(*) AS assinged_times FROM Assignment WHERE isPastAssignment=false GROUP BY group HAVING group_id=?1")
+    Optional<Number> getAssignedAmount(Long groupId);
+
+    /**
+     * PLAIN SQL QUERY: SELECT group_id, COUNT(*) assinged_times FROM assignment
+     * WHERE is_past_assignment=0 GROUP BY group_id HAVING group_id IN (:ids)")
+     * 
+     * @param groupIds list of groups ids
+     * @return list of objects arrays where first object is Groups instance and
+     *         second is Long that is taken places value
+     */
+    @Query("SELECT group, COUNT(*) AS assinged_times FROM Assignment a WHERE a.isPastAssignment=false GROUP BY a.group HAVING group_id IN (:ids)")
+    List<Object[]> getAssignedAmounts(@Param("ids") List<Long> groupIds);
+
 }

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

@@ -1,11 +0,0 @@
-package com.plannaplan.repositories;
-
-import com.plannaplan.entities.HistoryElement;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface HistoryRepository extends JpaRepository<HistoryElement, Long> {
-
-}

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

@@ -1,5 +1,7 @@
 package com.plannaplan.repositories;
 
+import java.util.Optional;
+
 import com.plannaplan.entities.Lecturer;
 
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,8 +9,15 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+/**
+ *  LecturerRepository.find:
+ *      Return list of:
+ *      SELECT * FROM Lecturer WHERE title = i AND name = j AND surname = k.
+ * 
+ *      Where i, j, k, ?1, ?2, ?3 are equale to variables. 
+ */
 @Repository
 public interface LecturerRepository extends JpaRepository<Lecturer, Long> {
     @Query("FROM Lecturer WHERE title = ?1 AND name = ?2 AND surname = ?3")
-    Lecturer find(@Param("title") String title, @Param("name") String name, @Param("surname") String surname);
+    Optional<Lecturer> find(@Param("title") String title, @Param("name") String name, @Param("surname") String surname);
 }

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

@@ -1,11 +0,0 @@
-package com.plannaplan.repositories;
-
-import com.plannaplan.entities.Transfer;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface TransferRepository extends JpaRepository<Transfer, Long> {
-
-}

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

@@ -1,11 +0,0 @@
-package com.plannaplan.repositories;
-
-import com.plannaplan.entities.Unavailability;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface UnavailabilityRepository extends JpaRepository<Unavailability, Long> {
-
-}

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

@@ -1,17 +1,61 @@
 package com.plannaplan.repositories;
 
+import java.util.List;
+import java.util.Optional;
+
 import com.plannaplan.entities.User;
+import com.plannaplan.types.UserRoles;
 
 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;
 
+/**
+ * UserRepository.getByAuthority: Return list of: SELECT * FROM User WHERE email
+ * = i.
+ * 
+ * Where i, ?1 are equale to variables.
+ * 
+ * UserRepository.getByToken: Return list of: SELECT * FROM User WHERE token =
+ * i.
+ * 
+ * Where i, ?1 are equale to variables.
+ * 
+ * UserRepository.searchForUsers: Return list of: SELECT * FROM User WHERE (name
+ * LIKE %?1% OR surname LIKE %?1%).
+ * 
+ * Where i, ?1 are equale to variables.
+ * 
+ * UserRepository.searchForUsers with role: Return list of: SELECT * FROM User
+ * WHERE (name LIKE %?1% OR surname LIKE %?1%) AND role=?2").
+ * 
+ * Where i, ?1 are equale to variables.
+ */
+
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
+    @Query("FROM User WHERE email = ?1 OR usosId = ?1")
+    Optional<User> getByAuthority(@Param("authority") String authority);
+
     @Query("FROM User WHERE email = ?1")
-    User getByAuthority(@Param("authority") String authority);
+    Optional<User> getByEmail(@Param("authority") String authority);
+
+    @Query("FROM User WHERE refreshToken = ?1")
+    Optional<User> getByRefreshToken(@Param("refreshToken") String refreshToken);
 
     @Query("FROM User WHERE token = ?1")
-    User getByToken(@Param("token") String token);
+    Optional<User> getByToken(@Param("token") String token);
+
+    @Query("FROM User WHERE (name LIKE %?1% OR surname LIKE %?1%)")
+    List<User> searchForUsers(@Param("query") String query);
+
+    @Query("FROM User WHERE (name LIKE %?1% OR surname LIKE %?1%) AND role=?2")
+    List<User> searchForUsers(@Param("query") String query, @Param("role") UserRoles role);
+
+    @Query("FROM User WHERE role=?1")
+    List<User> getAllByRole(@Param("role") UserRoles role);
+
+    @Query("FROM User WHERE usosId = ?1")
+    Optional<User> getByUsosId(@Param("usosId") String usosId);
 }

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

@@ -1,17 +1,58 @@
 package com.plannaplan.services;
 
-import com.plannaplan.abstracts.EventWatcher;
+import java.util.List;
+import java.util.Optional;
+
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Commision;
 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
-public class AssignmentService extends EventWatcher {
+public class AssignmentService {
     @Autowired
     private AssignmentRepository repo;
 
     public AssignmentService() {
-        super();
     }
-}
+
+    /**
+     * Save given assignment
+     * @param assignment assignment to save
+     * @return assignment saved assignment with database id
+     */
+    public Assignment save(Assignment assignment) {
+        return this.repo.save(assignment);
+    }
+
+    /*
+     * getCommisionAssignments
+     * Return id of the commision
+     */
+    public List<Assignment> getCommisionAssignments(Commision com) {
+        return this.repo.getByCommision(com.getId());
+    }
+
+    /*
+     * getAssignmentsAmmount
+     * Return count assignments ammount
+     */
+    public long getAssignmentsAmmount() {
+        return this.repo.count();
+    }
+
+    /**
+     * Get assigmnent by id
+     * @param id id of assigmnent
+     * @return Optional of assignment
+     */
+    public Optional<Assignment> getById(Long id) {
+        return this.repo.findById(id);
+    }
+}

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

@@ -0,0 +1,71 @@
+package com.plannaplan.services;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.plannaplan.entities.Commision;
+import com.plannaplan.entities.User;
+import com.plannaplan.repositories.AssignmentRepository;
+import com.plannaplan.repositories.CommisionRepository;
+
+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
+public class CommisionService {
+    @Autowired
+    private CommisionRepository repo;
+    @Autowired
+    private AssignmentRepository aRepository;
+
+    public CommisionService() {
+    }
+
+    /*
+     * save
+     *
+     * @param commision which assignment should be save in service
+     * @return commision
+     */
+    public Commision save(Commision commision) {
+        Optional<Commision> lastCommision = this.getNewestCommision(commision.getCommisionOwner());
+        if (lastCommision.isPresent()) {
+            final Commision lastCom = lastCommision.get();
+            lastCom.getAssignments().forEach(assignment -> {
+                assignment.setPastAssignment(true);
+                this.aRepository.save(assignment);
+            });
+        }
+        this.repo.save(commision);
+        return commision;
+
+    }
+
+    /*
+     * getUsersCommisions
+     * Return given users id
+     */
+    public List<Commision> getUsersCommisions(User user) {
+        return this.repo.getUsers(user.getId());
+    }
+
+    /*
+     * getNewestCommision
+     * Return the newest commision of the user
+     */
+    public Optional<Commision> getNewestCommision(User user) {
+        return this.repo.getNewestCommision(user.getId()).stream().findFirst();
+    }
+
+    /*
+     * getCommisionsAmmount
+     * Return ammount of commisions
+     */
+    public long getCommisionsAmmount() {
+        return this.repo.count();
+    }
+}

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

@@ -0,0 +1,86 @@
+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.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.plannaplan.configutils.*;
+import com.plannaplan.entities.AppConfig;
+
+/**
+ * FileReader is used for reading xls file from input stream.
+ */
+@Component
+public class ConfiguratorService {
+
+    @Autowired
+    private FileToDatabaseMigrator migrator;
+    @Autowired
+    private AppConfigRepository configRepo;
+
+    public ConfiguratorService() {
+    }
+
+    /**
+     * methoid to config system
+     * 
+     * @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()));
+        migrator.migrate(coursesData);
+    }
+
+    /**
+     * Save tours to DataBase   
+     * @param firstTour First tour period.
+     * @param secondTour Second tour period.
+     */
+    public void saveTours(TourData firstTour, TourData secondTour) {
+        this.configRepo.save(new AppConfig(firstTour, secondTour));
+    }
+
+    /**
+     * current config getter
+     * 
+     * @return AppConfig with newest config_date
+     */
+    public AppConfig getCurrentConfig() {
+        final List<AppConfig> repsonse = this.configRepo.findAll().stream().sorted(new Comparator<AppConfig>() {
+            @Override
+            public int compare(AppConfig i1, AppConfig i2) {
+                if (i1.getConfigDate().after(i2.getConfigDate())) {
+                    return -1;
+                }
+                if (i1.getConfigDate().before(i2.getConfigDate())) {
+                    return 1;
+                }
+                return 0;
+
+            }
+        }).collect(Collectors.toList());
+
+        return repsonse.get(0);
+    }
+
+    /**
+     * 
+     * @param inputStream This input stream contains new courses to import.
+     */
+	public void importCoursesStream(InputStream inputStream) {
+        FileReader reader = new FileReader(inputStream);
+        FileData coursesData = reader.read();
+        migrator.migrate(coursesData);
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.plannaplan.services;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.plannaplan.entities.Course;
 import com.plannaplan.repositories.CourseRepository;
@@ -8,28 +9,53 @@ import com.plannaplan.repositories.CourseRepository;
 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
 public class CourseService {
     @Autowired
     private CourseRepository repo;
 
-    public Course getCourseByName(String name) {
+    /*
+     * getCourseByName
+     * Return Course By Name
+     */
+    public Optional<Course> getCourseByName(String name) {
         return this.repo.findByName(name);
     }
 
+    /*
+     * getAllCourses
+     * Return List of get courses
+     */
     public List<Course> getAllCourses() {
         return this.repo.findAll();
     }
 
-    public void save(Course course) {
+    /*
+     * save
+     * @param course which course you would like to save
+     */
+    public Course save(Course course) {
         this.repo.save(course);
+        return course;
     }
 
-    public void delete(Course course){
+    /*
+     * delete
+     * @param course which course you would like to delete
+     */
+    public void delete(Course course) {
         this.repo.delete(course);
     }
 
-    public int getCoursesAmmount(){
-        return (int)this.repo.count();
+    /*
+     * getCoursesAmmount
+     * Return a ammount of courses
+     */
+    public int getCoursesAmmount() {
+        return (int) this.repo.count();
     }
-}
+}

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

@@ -0,0 +1,38 @@
+package com.plannaplan.services;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Service;
+
+/**
+ * Service to send emails
+ */
+@Service
+public class EmailService {
+
+    @Autowired
+    private JavaMailSender emailSender;
+
+    @Value("${plannaplan.email}")
+    private String appEmail;
+
+    public EmailService() {
+    }
+
+    /**
+     * send simple text email
+     * 
+     * @param destination destitnaion mail
+     * @param message     text to be send
+     */
+    public void sendMail(String destination, String message) {
+        SimpleMailMessage mailMessage = new SimpleMailMessage();
+        mailMessage.setFrom(appEmail);
+        mailMessage.setTo(destination);
+        mailMessage.setSubject("[Plan na plan] INFO");
+        mailMessage.setText(message);
+        emailSender.send(mailMessage);
+    }
+}

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

@@ -1,12 +1,17 @@
 package com.plannaplan.services;
 
-import com.plannaplan.repositories.EventRepository;
-
-import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Service
 public class EventService {
-    @Autowired
-    private EventRepository repo;
-}
+
+    // @Autowired
+    // private EmailService emailService;
+
+    @Scheduled(cron = "0 2 17 * * *")
+    public void collectGroupLosses() {
+        System.out.println("Checking for groups");
+    }
+}

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

@@ -1,13 +1,24 @@
 package com.plannaplan.services;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.function.Function;
 
+import com.plannaplan.entities.Assignment;
 import com.plannaplan.entities.Groups;
 import com.plannaplan.repositories.GroupRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 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
@@ -16,23 +27,81 @@ public class GroupService {
     public GroupService() {
     }
 
-    public Groups find(int time, int capacity, String room) {
+    public Optional<Groups> find(int time, int capacity, String room) {
         return this.repo.find(time, room, capacity);
     }
 
+    public Optional<Groups> find(Integer zajCykId, Integer nrGr) {
+        return this.repo.find(zajCykId, nrGr);
+    }
+
     public List<Groups> getGroupsByCourse(Long id) {
         return this.repo.getByCourse(id);
     }
 
-    public void save(Groups group) {
-        this.repo.save(group);
+    public Groups save(Groups group) {
+        return this.repo.save(group);
     }
 
-    public void delete(Groups groups){
+    public void delete(Groups groups) {
         this.repo.delete(groups);
     }
 
-    public int getGroupsAmmount(){
-        return (int)this.repo.count();
+    public int getGroupsAmmount() {
+        return (int) this.repo.count();
+    }
+
+    public Optional<Groups> getGroupById(Long id) {
+        return this.repo.findById(id);
+    }
+
+    public Optional<Long> findNotExistingGroup(List<Long> ids) {
+        for (Long oneId : ids) {
+            if (this.repo.existsById(oneId) == false) {
+                return Optional.of(oneId);
+            }
+        }
+        return Optional.empty();
+
+    }
+
+    /**
+     * 
+     * @param assingemnts list of assingemnts 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
+     */
+    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
+     */
+    public HashMap<Long, Integer> getTakenPlaces(List<Groups> groups) {
+        HashMap<Long, Integer> response = new HashMap<>();
+
+        if (groups.size() == 0) {
+            return response;
+        }
+
+        List<Object[]> respoonses = this.repo
+                .getAssignedAmounts(groups.stream().filter(Objects::nonNull).map(new Function<Groups, Long>() {
+                    @Override
+                    public Long apply(Groups p) {
+                        final Long id = p.getId();
+                        response.put(id, 0);
+                        return id;
+                    }
+                }).collect(Collectors.toList()));
+
+        for (Object[] element : respoonses) {
+            response.put(((Groups) element[0]).getId(), ((Long) element[1]).intValue());
+        }
+
+        return response;
     }
 }

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

@@ -1,12 +0,0 @@
-package com.plannaplan.services;
-
-import com.plannaplan.repositories.HistoryRepository;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class HistoryService {
-    @Autowired
-    private HistoryRepository repo;
-}

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

@@ -1,29 +1,35 @@
 package com.plannaplan.services;
 
+import java.util.Optional;
+
 import com.plannaplan.entities.Lecturer;
 import com.plannaplan.repositories.LecturerRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+/**
+ *  Service of LecturerService which can get(Lecturer, Lecturers Ammount), save, delete lecturers.
+ */
 @Service
 public class LecturerService {
     @Autowired
     private LecturerRepository repo;
 
-    public Lecturer getLecturer(String title, String name, String surname) {
+    public Optional<Lecturer> getLecturer(String title, String name, String surname) {
         return repo.find(title, name, surname);
     }
 
-    public void save(Lecturer lecturer) {
+    public Lecturer save(Lecturer lecturer) {
         repo.save(lecturer);
+        return lecturer;
     }
 
     public void delete(Lecturer lecturer) {
         repo.delete(lecturer);
     }
 
-    public int getLecturersAmmount(){
-        return (int)this.repo.count();
+    public int getLecturersAmmount() {
+        return (int) this.repo.count();
     }
 }

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

@@ -1,17 +0,0 @@
-package com.plannaplan.services;
-
-import com.plannaplan.abstracts.EventWatcher;
-import com.plannaplan.repositories.TransferRepository;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TransferService extends EventWatcher {
-    @Autowired
-    private TransferRepository repo;
-
-    public TransferService() {
-        super();
-    }
-}

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

@@ -1,12 +0,0 @@
-package com.plannaplan.services;
-
-import com.plannaplan.repositories.UnavailabilityRepository;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class UnavailabilityService {
-    @Autowired
-    private UnavailabilityRepository repos;
-}

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

@@ -1,17 +1,22 @@
 package com.plannaplan.services;
 
+import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
-import com.plannaplan.abstracts.EventWatcher;
 import com.plannaplan.entities.User;
 import com.plannaplan.exceptions.UserNotFoundException;
 import com.plannaplan.repositories.UserRepository;
+import com.plannaplan.types.UserRoles;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+/**
+ * Service of UserService which can get(By Email), login, save user.
+ */
 @Service
-public class UserService extends EventWatcher {
+public class UserService {
     @Autowired
     private UserRepository repo;
 
@@ -19,27 +24,77 @@ public class UserService extends EventWatcher {
         super();
     }
 
-    public String login(String authority) throws UserNotFoundException {
-        User user = this.repo.getByAuthority(authority.replace("\n", "").trim());
-        if (user == null) {
-            throw new UserNotFoundException("Can not find user with given authority");
+    public User checkForUser(String email, String usosId) {
+        return this.checkForUser(email, usosId, UserRoles.STUDENT);
+    }
+
+    public User checkForUser(String email, String usosId, UserRoles roleIfNotExist) {
+        if (usosId == null) {
+            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(), roleIfNotExist);
+                return this.repo.save(newUser);
+            }
+        } else {
+            Optional<User> user = this.repo.getByUsosId(usosId.replace("\n", "").trim());
+            if (user.isPresent()) {
+                return user.get();
+            } else {
+                final User newUser = new User(null, null, email.replace("\n", "").trim(), usosId, roleIfNotExist);
+                return this.repo.save(newUser);
+            }
         }
-        String token = UUID.randomUUID().toString();
-        user.setToken(token);
-        this.repo.save(user);
-        return token;
     }
 
-    public void save(User user) {
-        this.repo.save(user);
+    public User login(User authority) throws UserNotFoundException {
+        final String token = UUID.randomUUID().toString();
+        try {
+            authority.setToken(token);
+            this.repo.save(authority);
+        } catch (Exception e) {
+            throw new UserNotFoundException(e.getMessage());
+        }
+        return authority;
     }
 
-    public User getUserByEmail(String email) {
-        return this.repo.getByAuthority(email.replace("\n", "").trim());
+    public User save(User user) {
+        return this.repo.save(user);
     }
 
-    public User getByToken(String token) {
+    public User getUserByEmail(String email) throws UserNotFoundException {
+        return this.repo.getByEmail(email.replace("\n", "").trim())
+                .orElseThrow(() -> new UserNotFoundException("Cannot find user with given authority"));
+
+    }
+
+    public Optional<User> getByAuthority(String authority) {
+        return this.repo.getByAuthority(authority);
+    }
+
+    public Optional<User> getByToken(String token) {
         return this.repo.getByToken(token);
     }
 
+    public List<User> searchForStudents(String query) {
+        return this.repo.searchForUsers(query, UserRoles.STUDENT);
+    }
+
+    public Optional<User> getById(Long userId) {
+        return this.repo.findById(userId);
+    }
+
+    public List<User> getAllStudents() {
+        return this.repo.getAllByRole(UserRoles.STUDENT);
+    }
+
+    public Optional<User> getUserByRefreshToken(String refreshToken) {
+        return this.repo.getByRefreshToken(refreshToken);
+    }
+
+    public boolean adminExists(){
+        return this.repo.getAllByRole(UserRoles.ADMIN).size() > 0;
+    } 
+
 }

buisnesslogic/src/main/java/com/plannaplan/statisticutils/Statistics.java

@@ -1,10 +0,0 @@
-package com.plannaplan.statisticutils;
-
-public class Statistics {
-
-    public Statistics() {
-    }
-
-    public void getAll() {
-    }
-}

buisnesslogic/src/main/java/com/plannaplan/transferutils/TransferMatcher.java

@@ -1,9 +0,0 @@
-package com.plannaplan.transferutils;
-
-public class TransferMatcher {
-    public TransferMatcher() {
-    }
-
-    public void findMatches() {
-    }
-}

buisnesslogic/src/main/java/com/plannaplan/transferutils/TransfersExecuter.java

@@ -1,9 +0,0 @@
-package com.plannaplan.transferutils;
-
-public class TransfersExecuter {
-    public TransfersExecuter() {
-    }
-
-    public void execute() {
-    }
-}

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

@@ -1,5 +0,0 @@
-package com.plannaplan.types;
-
-public enum ActionTypes {
-    ADD, DELETE, REPLACE
-}

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

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

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

@@ -1,5 +0,0 @@
-package com.plannaplan.types;
-
-public enum AppStates {
-    STOPPED, RUNNING, PAUSED
-}

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

@@ -1,5 +0,0 @@
-package com.plannaplan.types;
-
-public enum EventTypes {
-    DROPPED_OUT, TOUR_STARTED, TRANSFER_FOUND, TOUR_FINISHED, COURSES_ACCEPTED
-}

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

@@ -1,5 +1,9 @@
 package com.plannaplan.types;
 
+/**
+ *  GroupType contains types: LECTURE, CLASS
+ */
+
 public enum GroupType {
     LECTURE, CLASS
 }

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

@@ -1,5 +1,9 @@
 package com.plannaplan.types;
 
+/**
+ *  UserRoles contains types: STUDENT, DEANERY, ADMIN, TEST_USER
+ */
+ 
 public enum UserRoles {
     STUDENT, DEANERY, ADMIN, TEST_USER
 }

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

@@ -1,5 +1,9 @@
 package com.plannaplan.types;
 
+/**
+ *  WeekDay contains types: MONDAY(0), TUESDAY(1), WEDNESDAY(2), THURSDAY(3), FRIDAY(4), SATURDAY(5), SUNDAY(6).
+ */
+
 public enum WeekDay {
     MONDAY(0), TUESDAY(1), WEDNESDAY(2), THURSDAY(3), FRIDAY(4), SATURDAY(5), SUNDAY(6);
 

buisnesslogic/src/test/java/com/plannaplan/TestApplication.java

@@ -4,5 +4,5 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class TestApplication {
-    
+    public final static String TEST_CONFIG_FILE = "Zajecia.xlsx";
 }

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

@@ -11,11 +11,11 @@ import org.junit.Test;
 public class FileReaderTest {
     @Test
     public void shoulReturnNull() {
-        InputStream inputStream = getClass().getClassLoader().getResourceAsStream("Zajecia.xlsx");
-        FileReader r = new FileReader(inputStream);
-        FileData d = r.read();
+        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() == 24);
         assertTrue(d != null);
     }
 }

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

@@ -9,8 +9,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
 
-import com.plannaplan.Configurator;
-import com.plannaplan.models.ConfigData;
+import com.plannaplan.TestApplication;
 import com.plannaplan.services.CourseService;
 import com.plannaplan.services.GroupService;
 import com.plannaplan.services.LecturerService;
@@ -18,31 +17,29 @@ import com.plannaplan.services.LecturerService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @ContextConfiguration
 public class FileToDatabaseMigratorTest {
-    
-    private static String FILE_NAME = "Zajecia.xlsx";
 
-	@Autowired
-	private Configurator restTemplate;
-    
+    @Autowired
+    private FileToDatabaseMigrator migrator;
+
     @Autowired
     private CourseService courseService;
 
     @Autowired
     private GroupService groupService;
 
-    @Autowired 
+    @Autowired
     private LecturerService lecturerService;
 
     @Test
-	public void shouldImportDataFromFileToDatabase() throws Exception {
-        final InputStream inputStream = getClass().getClassLoader().getResourceAsStream(FILE_NAME);
-        final ConfigData data = new ConfigData(null, null, inputStream);
-        this.restTemplate.config(data);
+    public void shouldImportDataFromFileToDatabase() throws Exception {
+        final InputStream inputStream = getClass().getClassLoader()
+                .getResourceAsStream(TestApplication.TEST_CONFIG_FILE);
+        final FileReader reader = new FileReader(inputStream);
+        this.migrator.migrate(reader.read());
         int courses_ammount = this.courseService.getCoursesAmmount();
         int groups_ammount = this.groupService.getGroupsAmmount();
         int lecturers_ammount = this.lecturerService.getLecturersAmmount();

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

@@ -0,0 +1,141 @@
+package com.plannaplan.entities;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.sql.Date;
+
+import com.plannaplan.models.TourData;
+import com.plannaplan.types.AppState;
+
+import org.junit.Test;
+
+public class AppConfigTest {
+
+    private static long ONE_DAY = 86400000;
+
+    @Test
+    public void shouldReturnNoTourDueToTooEarly() {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() + ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() + 2 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() + 3 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getCurrentState() == AppState.NO_TOUR);
+    }
+
+    @Test
+    public void shouldReturnFirstTourDueToStart() throws InterruptedException {
+        final Date firtstTourStart = new Date(System.currentTimeMillis());
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() + 2 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() + 3 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        Thread.sleep(1000);
+        assertTrue(config.getCurrentState() == AppState.FIRST_TOUR);
+    }
+
+    @Test
+    public void shouldReturnFirstTourDueToInBetween() {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() + 2 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() + 3 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getCurrentState() == AppState.FIRST_TOUR);
+    }
+
+    @Test
+    public void shouldReturnNoTourInLastDay() throws InterruptedException {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis());
+        final Date secondTourStart = new Date(System.currentTimeMillis() + 3 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        Thread.sleep(1000);
+        assertTrue(config.getCurrentState() == AppState.NO_TOUR);
+    }
+
+    @Test
+    public void shouldReturnNoTourInBetween() {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 2 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() + 3 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getCurrentState() == AppState.NO_TOUR);
+    }
+
+    @Test
+    public void shouldReturnSecondTourInStart() throws InterruptedException {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 2 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis());
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        Thread.sleep(1000);
+        assertTrue(config.getCurrentState() == AppState.SECOND_TOUR);
+    }
+
+    @Test
+    public void shouldReturnSecondTourInBetween() {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 3 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() - 2 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + 4 * ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getCurrentState() == AppState.SECOND_TOUR);
+    }
+
+    @Test
+    public void shouldReturnNoTourDueToEndSecond() throws InterruptedException {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 3 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() - 2 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() - ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis());
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        Thread.sleep(1000);
+        assertTrue(config.getCurrentState() == AppState.NO_TOUR);
+    }
+
+    @Test
+    public void shouldReturnNoTourAfterSecondEnd() {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 4 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis() - 3 * ONE_DAY);
+        final Date secondTourStart = new Date(System.currentTimeMillis() - 2 * ONE_DAY);
+        final Date secondTourEnd = new Date(System.currentTimeMillis() - ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        assertTrue(config.getCurrentState() == AppState.NO_TOUR);
+    }
+
+    @Test
+    public void shouldReturnSecondTourWhereThereIsABrake() throws InterruptedException {
+        final Date firtstTourStart = new Date(System.currentTimeMillis() - 4 * ONE_DAY);
+        final Date firtstTourEnd = new Date(System.currentTimeMillis());
+        final Date secondTourStart = new Date(System.currentTimeMillis());
+        final Date secondTourEnd = new Date(System.currentTimeMillis() + ONE_DAY);
+
+        final AppConfig config = new AppConfig(new TourData(firtstTourStart, firtstTourEnd),
+                new TourData(secondTourStart, secondTourEnd));
+        Thread.sleep(1000);
+        assertTrue(config.getCurrentState() == AppState.SECOND_TOUR);
+    }
+
+}

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

@@ -0,0 +1,71 @@
+package com.plannaplan.entities;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.reflect.Field;
+import java.sql.Timestamp;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+public class UserTest {
+
+    @Test
+    public void shouldResturnTokenIsNotExpired() {
+        final User user = new User();
+        user.setToken("testowy-bezpieczny-token");
+        assertTrue(user.isCredentialsNonExpired(), "Credential shouldnt expire yet");
+
+        long minutes = this.getMinutesDiff(user.getTokenUsageDate());
+
+        assertTrue(minutes == 0, "Should update last token usage");
+
+    }
+
+    @Test
+    public void shouldResturnTokenIsNotExpiredWithLessThan15minutes()
+            throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+
+        final User user = new User();
+        user.setToken("testowy-bezpieczny-token");
+        this.setLastTokenUsage(user, new Timestamp(System.currentTimeMillis() - (6 * 60 * 1000)));
+
+        assertTrue(user.isCredentialsNonExpired(), "Credential shouldnt expire yet");
+
+        final long minutes = this.getMinutesDiff(user.getTokenUsageDate());
+        assertTrue(minutes == 0, "Should update last token usage");
+    }
+
+    @Test
+    public void shouldResturnTokenIsExpired()
+            throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+
+        final User user = new User();
+        user.setToken("testowy-bezpieczny-token");
+        this.setLastTokenUsage(user, new Timestamp(System.currentTimeMillis() - (25 * 60 * 1000)));
+
+        assertFalse(user.isCredentialsNonExpired(), "Credential should expire");
+
+        final long diffInMilliseconds = Math
+                .abs(user.getTokenUsageDate().getTime() - new Timestamp(System.currentTimeMillis()).getTime());
+        final long minutes = TimeUnit.MILLISECONDS.toMinutes(diffInMilliseconds);
+
+        assertTrue(minutes > 0, "Shouldn't update last token usage");
+    }
+
+    private long getMinutesDiff(Timestamp timestamp) {
+        final long diffInMilliseconds = Math
+                .abs(timestamp.getTime() - new Timestamp(System.currentTimeMillis()).getTime());
+        final long minutes = TimeUnit.MILLISECONDS.toMinutes(diffInMilliseconds);
+        return minutes;
+    }
+
+    private void setLastTokenUsage(User user, Timestamp timestampToSet)
+            throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
+        Field reader = User.class.getDeclaredField("tokenUsageDate");
+        reader.setAccessible(true);
+        reader.set(user, timestampToSet);
+    }
+
+}

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

@@ -0,0 +1,106 @@
+package com.plannaplan.repositories;
+
+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.Assert.assertTrue;
+
+import java.util.List;
+
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Commision;
+import com.plannaplan.entities.Groups;
+import com.plannaplan.entities.User;
+import com.plannaplan.services.AssignmentService;
+import com.plannaplan.services.CommisionService;
+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;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration
+public class GroupRepositoryTest {
+        @Autowired
+        private GroupRepository repository;
+        @Autowired
+        private AssignmentService assignmentService;
+        @Autowired
+        private GroupService groupService;
+        @Autowired
+        private UserService userService;
+
+        @Autowired
+        private CommisionService commisionService;
+
+        @Test
+        public void shouldReturnGroupAssignmentTimes() throws InterruptedException {
+                final Groups testGroup = groupService.save(new Groups(43, "A-41", null, 235, WeekDay.MONDAY, null));
+                int startGroupAmmount = this.repository.getAssignedAmount(testGroup.getId()).orElse(Integer.valueOf(0))
+                                .intValue();
+
+                final User user = this.userService.save(new User("Luis", "Vita",
+                                "shouldReturnGroupAssignmentTimes@grouprepository.test", UserRoles.STUDENT));
+                final Commision commision = this.commisionService.save(new Commision(user));
+
+                this.assignmentService.save(new Assignment(testGroup, commision));
+                Thread.sleep(1000);
+
+                int afterAssignedGroupAmmount = this.repository.getAssignedAmount(testGroup.getId())
+                                .orElse(Integer.valueOf(0)).intValue();
+
+                assertTrue(afterAssignedGroupAmmount > startGroupAmmount);
+
+                final Commision recommision = this.commisionService.save(new Commision(user));
+                this.assignmentService.save(new Assignment(testGroup, recommision));
+
+                Thread.sleep(1000);
+
+                int afterreAssignedGroupAmmount = this.repository.getAssignedAmount(testGroup.getId())
+                                .orElse(Integer.valueOf(0)).intValue();
+
+                assertTrue(afterAssignedGroupAmmount == afterreAssignedGroupAmmount);
+
+                this.commisionService.save(new Commision(user));
+
+                Thread.sleep(1000);
+
+                int afterdeAssignedGroupAmmount = this.repository.getAssignedAmount(testGroup.getId())
+                                .orElse(Integer.valueOf(0)).intValue();
+
+                assertTrue(afterdeAssignedGroupAmmount < afterreAssignedGroupAmmount);
+
+        }
+
+        @Test
+        public void shouldReturnGroupAssignmentTimesList() throws InterruptedException {
+                final Groups testGroup = groupService.save(new Groups(43, "A-41", null, 645, WeekDay.MONDAY, null));
+                final Groups testGroup2 = groupService.save(new Groups(433, "A-41", null, 235, WeekDay.TUESDAY, null));
+                final Groups testGroup3 = groupService.save(new Groups(23, "A-41", null, 340, WeekDay.MONDAY, null));
+                final User user = this.userService.save(new User("Dare", "Oc",
+                                "shouldReturnGroupAssignmentTimesList@grouprepository.test", UserRoles.STUDENT));
+                final Commision commision = this.commisionService.save(new Commision(user));
+
+                this.assignmentService.save(new Assignment(testGroup, commision));
+                this.assignmentService.save(new Assignment(testGroup2, commision));
+                this.assignmentService.save(new Assignment(testGroup3, commision));
+
+                Thread.sleep(1000);
+
+                List<Object[]> response = this.repository
+                                .getAssignedAmounts(List.of(testGroup.getId(), testGroup2.getId(), testGroup3.getId()));
+
+                assertTrue("Response should have size 3", response.size() == 3);
+                assertTrue("Instance of firest element should be Group", response.get(0)[0] instanceof Groups);
+                assertTrue("Instance of firest element should be Long", response.get(0)[1] instanceof Long);
+
+        }
+
+}

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

@@ -0,0 +1,64 @@
+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.Assert.assertTrue;
+
+import java.util.List;
+
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Commision;
+import com.plannaplan.entities.User;
+import com.plannaplan.types.UserRoles;
+
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration
+public class AssignmentServiceTest {
+
+    @Autowired
+    private AssignmentService service;
+    @Autowired
+    private CommisionService comServie;
+    @Autowired
+    private UserService userService;
+
+    @Test
+    public void shouldSaveAssignment() {
+        final User user = new User("Gibi", "Kovalsky", "shouldSaveAssignment@assignmentservice.test",
+                UserRoles.STUDENT);
+        this.userService.save(user);
+
+        long beginState = this.service.getAssignmentsAmmount();
+        Commision com = new Commision(user);
+        this.comServie.save(com);
+        this.addAssignmentToCommision(com);
+        assertTrue("Assign ammount should increase", this.service.getAssignmentsAmmount() > beginState);
+    }
+
+    @Test
+    public void shouldGetCommisionAssignments() {
+        final User user = new User("Gibi", "Kovalsky", "shouldGetCommisionAssignments@assignmentservice.test",
+                UserRoles.STUDENT);
+        this.userService.save(user);
+        Commision com = new Commision(user);
+        this.comServie.save(com);
+        this.addAssignmentToCommision(com);
+
+        final List<Assignment> response = this.service.getCommisionAssignments(com);
+        assertTrue("Returned list size should be 1", response.size() == 1);
+    }
+
+    private void addAssignmentToCommision(Commision com) {
+        Assignment a = new Assignment(null, com);
+        this.service.save(a);
+    }
+
+}

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

@@ -0,0 +1,94 @@
+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.Assert.assertTrue;
+
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Commision;
+import com.plannaplan.entities.User;
+import com.plannaplan.types.UserRoles;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration
+public class CommisionServiceTest {
+
+    @Autowired
+    private CommisionService service;
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private AssignmentService assignmentService;
+
+    @Test
+    public void shouldSaveCommision() {
+        User usr = new User();
+        this.userService.save(usr);
+        long beginState = this.service.getCommisionsAmmount();
+        this.service.save(new Commision(usr));
+        assertTrue("Commision ammount should have changed", this.service.getCommisionsAmmount() > beginState);
+    }
+
+    @Test
+    public void shouldGetUserCommisions() {
+        User usr = new User();
+        this.userService.save(usr);
+        this.service.save(new Commision(usr));
+
+        assertTrue("User should have one commision", this.service.getUsersCommisions(usr).size() == 1);
+    }
+
+    @Test
+    public void shouldGetNewestCommision() throws NullPointerException, InterruptedException {
+        User usr = new User();
+        this.userService.save(usr);
+        this.service.save(new Commision(usr));
+
+        Thread.sleep(2000);
+
+        final Commision newestCommision = new Commision(usr);
+        this.service.save(newestCommision);
+
+        final Commision result = this.service.getNewestCommision(usr)
+                .orElseThrow(() -> new NullPointerException("There was no commision"));
+
+        assertTrue("Wrong commision was returned", result.getId().equals(newestCommision.getId()));
+    }
+
+    @Test
+    public void shouldMarkAssignmentsOfPreviousCommisionPast() {
+        final User usr = new User("Trevor", "Hammolt",
+                "shouldMarkAssignmentsOfPreviousCommisionPast@commisionservice.test", UserRoles.STUDENT);
+        this.userService.save(usr);
+
+        final Commision firstCommision = new Commision(usr);
+        this.service.save(firstCommision);
+
+        Assignment firstCommisionAssignment = this.assignmentService.save(new Assignment(null, firstCommision));
+
+        assertTrue("FirstCommisionAssignment should be flaged as present assignment",
+                !firstCommisionAssignment.isPastAssignment());
+
+        final Commision secondCommision = new Commision(usr);
+        this.service.save(secondCommision);
+
+        Assignment secondCommisionAssignment = new Assignment(null, secondCommision);
+        this.assignmentService.save(secondCommisionAssignment);
+
+        assertTrue("SecondCommisionAssignment should be flaged as present assignment",
+                !secondCommisionAssignment.isPastAssignment());
+        assertTrue("FirstCommisionAssignment should be flaged as past assignment",
+                this.assignmentService.getById(firstCommisionAssignment.getId()).get().isPastAssignment());
+
+    }
+
+}

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

@@ -0,0 +1,104 @@
+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.sql.Date;
+import java.util.Optional;
+
+import com.plannaplan.TestApplication;
+import com.plannaplan.entities.AppConfig;
+import com.plannaplan.entities.Groups;
+import com.plannaplan.models.ConfigData;
+import com.plannaplan.models.TourData;
+import com.plannaplan.repositories.AppConfigRepository;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@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;
+
+    @Autowired
+    private CourseService courseService;
+
+    @Autowired
+    private GroupService groupService;
+
+    @Autowired
+    private LecturerService lecturerService;
+
+    @Autowired
+    private AppConfigRepository appConfigRepo;
+
+    @Test
+    public void shouldImportDataToDataBase() {
+        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);
+
+        int courses_ammount = this.courseService.getCoursesAmmount();
+        int groups_ammount = this.groupService.getGroupsAmmount();
+        int lecturers_ammount = this.lecturerService.getLecturersAmmount();
+
+        assertTrue(courses_ammount > 0 && groups_ammount > 0 && lecturers_ammount > 0);
+    }
+
+    @Test
+    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+    public void shouldUpdatePreviousImport(){
+        final InputStream inputStream = getClass().getClassLoader()
+        .getResourceAsStream(ConfiguratorServiceTest.BEFORE_UPDATE_FILE);
+        this.configuratorService.importCoursesStream(inputStream);
+        int groups_ammount = this.groupService.getGroupsAmmount();
+        
+        assertTrue(groups_ammount == 2);
+
+        final InputStream inputStream2 = getClass().getClassLoader()
+        .getResourceAsStream(ConfiguratorServiceTest.AFTER_UPDATE_FILE);
+        this.configuratorService.importCoursesStream(inputStream2);
+        int groups_ammount2 = this.groupService.getGroupsAmmount();
+
+        Optional<Groups> newGroup = this.groupService.find(456458, 3); 
+        Optional<Groups> updateGroup = this.groupService.find(456457, 2);
+
+        assertTrue(groups_ammount2 == 3);
+        assertTrue(newGroup.isPresent());
+        assertTrue(updateGroup.get().getLecturer().getSurname().equals("Murawski"));
+        assertTrue(updateGroup.get().getLecturer().getName().equals("Roman"));
+        assertTrue(updateGroup.get().getLecturer().getTitle().equals("prof. dr hab."));
+    }
+
+    @Test
+    public void shouldRetrunNewestConfig() throws InterruptedException {
+        final Date dateToCheck = new Date(System.currentTimeMillis());
+        this.appConfigRepo.save(new AppConfig(new TourData(null, null), new TourData(null, null)));
+        Thread.sleep(2000);
+        this.appConfigRepo.save(new AppConfig(new TourData(dateToCheck, null), new TourData(null, null)));
+
+        AppConfig response = this.configuratorService.getCurrentConfig();
+        assertTrue(response.getFirstTourStart() != null);
+
+    }
+
+}

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

@@ -17,20 +17,15 @@ import org.springframework.test.context.junit4.SpringRunner;
 public class CourseServiceTest {
     @Autowired
     private CourseService courseService;
-    
+
     @Test
     public void createAndDeleteCourse() {
-        Course course;
+        Course course = new Course("Testowy kurs", "TK");
         int startAmmount = this.courseService.getCoursesAmmount();
 
-        // Create course
-        course = new Course();
-        course.setName("Testowy kurs");
-        course.setSymbol("TK");
         courseService.save(course);
         assertTrue(this.courseService.getCoursesAmmount() > startAmmount);
 
-        // Delete course
         courseService.delete(course);
         assertTrue(this.courseService.getCoursesAmmount() == startAmmount);
     }

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

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

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

@@ -2,7 +2,15 @@ package com.plannaplan.services;
 
 import static org.junit.Assert.assertTrue;
 
+import java.util.HashMap;
+import java.util.List;
+
+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.Test;
 import org.junit.runner.RunWith;
@@ -18,20 +26,46 @@ public class GroupServiceTest {
 
     @Autowired
     private GroupService groupService;
+    @Autowired
+    private AssignmentService assignmentService;
+    @Autowired
+    private CommisionService commisionService;
+    @Autowired
+    private UserService userService;
 
     @Test
     public void createAndDeleteGroup() {
-        Groups group;
         int startAmmount = this.groupService.getGroupsAmmount();
 
-        //Create group
-        group = new Groups();
+        Groups group = new Groups();
         group.setRoom("A1");
         groupService.save(group);
         assertTrue(this.groupService.getGroupsAmmount() > startAmmount);
 
-        // Delete course
         groupService.delete(group);
         assertTrue(this.groupService.getGroupsAmmount() == startAmmount);
     }
+
+    @Test
+    public void shouldGetGroupsAssignmentsAmmounts() throws InterruptedException {
+        final Groups testGroup = groupService.save(new Groups(43, "A-41", null, 645, WeekDay.MONDAY, null));
+        final Groups testGroup2 = groupService.save(new Groups(433, "A-41", null, 235, WeekDay.TUESDAY, null));
+        final Groups testGroup3 = groupService.save(new Groups(23, "A-41", null, 340, WeekDay.MONDAY, null));
+        final User user = this.userService.save(
+                new User("Dare", "Oc", "shouldReturnGroupAssignmentTimesList@grouprepository.test", UserRoles.STUDENT));
+        final Commision commision = this.commisionService.save(new Commision(user));
+
+        this.assignmentService.save(new Assignment(testGroup, commision));
+        this.assignmentService.save(new Assignment(testGroup2, commision));
+        this.assignmentService.save(new Assignment(testGroup3, commision));
+
+        Thread.sleep(1000);
+
+        HashMap<Long, Integer> response = this.groupService.getTakenPlaces(List.of(testGroup, testGroup2, testGroup3));
+
+        assertTrue(response.size() == 3);
+        assertTrue(response.get(testGroup.getId()) == 1);
+        assertTrue(response.get(testGroup2.getId()) == 1);
+        assertTrue(response.get(testGroup3.getId()) == 1);
+    }
 }

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

@@ -17,21 +17,15 @@ import org.springframework.test.context.junit4.SpringRunner;
 public class LecturerServiceTest {
     @Autowired
     private LecturerService lecturerService;
-    
+
     @Test
-    public void createAndDeleteLecturer(){
-        Lecturer lecturer;
+    public void createAndDeleteLecturer() {
         int startAmmount = this.lecturerService.getLecturersAmmount();
 
-        // Create lecturer
-        lecturer = new Lecturer();
-        lecturer.setName("Tomasz");
-        lecturer.setSurname("Kowalski");
-        lecturer.setTitle("prof.");
+        Lecturer lecturer = new Lecturer("prof.", "Tomasz", "Kowalski");
         lecturerService.save(lecturer);
         assertTrue(this.lecturerService.getLecturersAmmount() > startAmmount);
 
-        // Delete lecturer
         lecturerService.delete(lecturer);
         assertTrue(this.lecturerService.getLecturersAmmount() == startAmmount);
     }

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

@@ -2,16 +2,19 @@ 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.jupiter.api.Assertions.assertTrue;
 
+import java.util.List;
+
 import com.plannaplan.entities.User;
 import com.plannaplan.exceptions.UserNotFoundException;
 import com.plannaplan.types.UserRoles;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
@@ -22,29 +25,21 @@ import org.junit.runner.RunWith;
 @ContextConfiguration
 @TestMethodOrder(OrderAnnotation.class)
 public class UserServiceTest {
-    public static String TEST_USER_MAIL = "noteexisitingmail@notexistingdomain.com";
-    public static String TEST_USER_NAME = "Tom";
-    public static String TEST_USER_SUERNAME = "Kovalsky";
+    private static String TEST_USER_MAIL = "noteexisitingmail@notexistingdomain.com";
+    private static String TEST_USER_NAME = "Tom";
+    private static String TEST_USER_SUERNAME = "Kovalsky";
 
     @Autowired
-    UserService userService;
-
-    @Before
-    public void initialize() {
-        User testUser = new User();
-        testUser.setEmail(TEST_USER_MAIL);
-        testUser.setName(TEST_USER_NAME);
-        testUser.setSurname(TEST_USER_SUERNAME);
-        testUser.setRole(UserRoles.TEST_USER);
-        this.userService.save(testUser);
-    }
+    private UserService userService;
 
     @Test
     public void shouldReturnToken() {
+        User testUser = this.userService
+                .save(new User(TEST_USER_NAME, TEST_USER_SUERNAME, TEST_USER_MAIL, UserRoles.TEST_USER));
         try {
-            String token = this.userService.login(TEST_USER_MAIL);
-            System.out.println("Returned token: " + token);
-            assertTrue(token != null);
+            testUser = this.userService.login(testUser);
+            System.out.println("Returned token: " + testUser.getToken());
+            assertTrue(testUser.getToken() != null);
             assertTrue(this.userService.getUserByEmail(TEST_USER_MAIL).getToken() != null);
         } catch (UserNotFoundException e) {
             e.printStackTrace();
@@ -53,12 +48,74 @@ public class UserServiceTest {
     }
 
     @Test
-    public void shouldThrowException() {
-        try {
-            this.userService.login("thiseamilisnotindatabase@gmail.com");
-            assertTrue(false);
-        } catch (UserNotFoundException e) {
-            assertTrue(true);
-        }
+    public void shouldFindStudents() {
+        this.userService.save(new User("Nemo", "TheFish", "Nemo@shouldFindStudents.test", UserRoles.STUDENT));
+        final List<User> response = this.userService.searchForStudents("Nemo");
+        assertTrue(response.size() >= 1);
+        assertTrue(containsName(response, "Nemo"));
+    }
+
+    @Test
+    public void shouldReturnAllStudents() {
+        final User veryWantedUser = new User("Xavier", "123", "Xavier@shouldReturnAllStudents.test", UserRoles.STUDENT);
+        final User littleLessWanted = new User("Ravier", "321", "Ravier@shouldReturnAllStudents.test",
+                UserRoles.STUDENT);
+        final User notWantadUser = new User("Fiona", "Raskolnikov", "Fiona@shouldReturnAllStudents.test",
+                UserRoles.DEANERY);
+
+        this.userService.save(veryWantedUser);
+        this.userService.save(littleLessWanted);
+        this.userService.save(notWantadUser);
+
+        final List<User> response = this.userService.searchForStudents("");
+        assertTrue(response.size() >= 2);
+        assertTrue(!containsName(response, notWantadUser.getName()));
+        assertTrue(containsName(response, littleLessWanted.getName()));
+        assertTrue(containsName(response, veryWantedUser.getName()));
+    }
+
+    @Test
+    public void shouldntFindStudents() {
+        this.userService.save(new User("Nadia", "Ladia", "Nadia@shouldntFindStudents.test", UserRoles.STUDENT));
+        final List<User> response = this.userService.searchForStudents(
+                "THISisIMPOIBLEQUEryThatShouldntReturnAnyPersonAtAllfnjiasdfjivlsdfnjgklsomerandomcharsjustinCaseXD");
+        assertTrue(response.size() == 0);
+    }
+
+    private boolean containsName(final List<User> list, final String name) {
+        return list.stream().map(User::getName).filter(name::equals).findFirst().isPresent();
+    }
+
+    @Test
+    public void shouldCreateUser() {
+
+        final User user = this.userService.checkForUser("shouldCreateUser@UserService.test", null);
+
+        assertTrue(user.getId() != null);
+    }
+
+    @Test
+    public void shouldReturnExistingUser() {
+        final String email = "shouldReturnExistingUser@UserService.test";
+        this.userService.save(new User("Tom", "Smieszne", email, UserRoles.TEST_USER));
+        final User user = this.userService.checkForUser(email, null);
+
+        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/resources/application.properties

@@ -6,5 +6,13 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.jpa.open-in-view=true
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jackson.serialization.fail-on-empty-beans=false
+spring.main.allow-bean-definition-overriding=true
+spring.jackson.default-property-inclusion = NON_NULL
+spring.mail.host=localhost
+spring.mail.port=1025
+spring.mail.properties.mail.smtp.auth=false
+spring.mail.properties.mail.smtp.starttls.enable=false
+
+plannaplan.email = plannaplan.kontakt@gmail.com
 
 server.port=1285

docs/api.md

@@ -1,88 +0,0 @@
-# Dokumetacja API
-
-| Api                                                           | Zadania endpointa                                                            |
-| ------------------------------------------------------------- | ---------------------------------------------------------------------------- |
-| [/api/v1/configurator/config](#config)                        | Załadowanie konfiguracji startowej do aplikacji PlanNaPlan                   |
-| [/api/v1/courses/getCoursesWithGroups](#getcourseswithgroups) | Zwrócenie wszytskich kursów razem z grupami                                  |
-| [/api/v1/groups/getCourseGroups](#getcoursegroups)            | Zwrócenie grup dla danego kursu                                              |
-| [/api/v1/courses/getCourses](#getcourses)                     | Zwrócenie wszystkich kursów                                                  |
-| [/token](#token)                                              | Wymienia ticket z CAS-a na token ktorym beda autoryzowane chronione requesty |
-
-## config
-
-Source code: [link](../restservice/src/main/java/com/plannaplan/controllers/ConfigController.java)
-
-```
-POST /config
-```
-
-#### Opis
-
-Endpoint konfigurujacy caly system i importujacy dane do bazy.
-
-#### Parametry
-
-| Type | Name                    | Consumes            | Opis                            | Type |
-| ---- | ----------------------- | ------------------- | ------------------------------- | ---- |
-| Body | **file** </br> required | multipart/form-data | Plik .xlsx z potrzebnymi danymi | file |
-
-## getCoursesWithGroups
-
-Source code: [link](../restservice/src/main/java/com/plannaplan/controllers/getCoursesWithGroups.java)
-
-```
-GET /api/v1/courses/getCoursesWithGroups
-```
-
-#### Opis
-
-Zwraca wszystkie dostepne kursy wraz z listą grup.
-
-## getCourseGroups
-
-Source code: [link](../restservice/src/main/java/com/plannaplan/controllers/GroupController.java)
-
-```
-GET /api/v1/groups/getCourseGroups
-```
-
-#### Opis
-
-Zwraca wszytskie grupy dla danego kursu.
-
-#### Parametry
-
-| Type        | Name                  | Consumes | Opis                                      | Type |
-| ----------- | --------------------- | -------- | ----------------------------------------- | ---- |
-| Query Param | **id** </br> required | -        | id kursu dla ktorego chcemy zwrocic grupy | int  |
-| Query Param | **capacity** </br>    | -        | czy ma zwrocic pole pojemnosci grupy      | bool |
-
-## getCourses
-
-Source code: [link](../restservice/src/main/java/com/plannaplan/controllers/CoursesController.java)
-
-```
-GET /api/v1/courses/getCourses
-```
-
-#### Opis
-
-Zwraca wszystkie dostepne kursy.
-
-## token
-
-Source code: [link](../restservice/src/main/java/com/plannaplan/controllers/TokenController.java)
-
-```
-GET /token?ticket=ST-668405-W0gfvSVDRBdMUWLweKzv-cas.amu.edu.pl
-```
-
-#### Opis
-
-Po odpytaniu tego endpointa z podanym ticketem system zrobi nma nim validate i dostanie uzytkownika dla ktorego zostal on wygenerowany. System utworzy dla niego access token i go zwroci w odpowiedzi
-
-#### Parametry
-
-| Type        | Name                      | Consumes | Opis                                    | Type   |
-| ----------- | ------------------------- | -------- | --------------------------------------- | ------ |
-| Query Param | **ticket** </br> required | -        | ticket uzyskany z logowania poprzez CAS | string |

gettoken.py

@@ -0,0 +1,42 @@
+import webbrowser
+from http.server import BaseHTTPRequestHandler, HTTPServer, SimpleHTTPRequestHandler
+import urllib.parse as urlparse
+from urllib.parse import parse_qs
+import sys
+import requests as r
+
+if len(sys.argv) > 1 :
+    API_ADDRESS = "http://" + sys.argv[1] + ":1285"
+else:
+    API_ADDRESS = "http://localhost:1285"
+
+PORT = 3000
+
+
+class S(BaseHTTPRequestHandler):
+    def _set_response(self):
+        self.send_response(200)
+        self.send_header('Content-type', 'text/html')
+        self.end_headers()
+
+    def do_GET(self):
+        parsed = urlparse.urlparse(str(self.path))
+        ticket = str(parse_qs(parsed.query)['ticket'][0])
+        print(ticket)
+        response = r.get(API_ADDRESS + "/token?ticket=" + ticket)
+        self._set_response()
+        self.wfile.write("Your token: {}".format(
+            response.text).encode('utf-8'))
+
+def wait_for_request(server_class=HTTPServer,
+                     handler_class=S):
+    server_address = ('localhost', PORT)
+    httpd = server_class(server_address, handler_class)
+    return httpd.handle_request()
+
+
+url = 'https://cas.amu.edu.pl/cas/login?service=http://localhost:' + \
+    str(PORT) + '&locale=pl'
+
+webbrowser.open_new_tab(url)
+wait_for_request()

init.sql

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

pom.xml

@@ -2,11 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.2.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.2.2.RELEASE</version>
+    <relativePath /> <!-- lookup parent from repository -->
+  </parent>
 
   <groupId>com.plannaplan</groupId>
   <artifactId>backend</artifactId>
@@ -19,8 +19,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>14</maven.compiler.source>
+    <maven.compiler.target>14</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -78,7 +78,7 @@
       </plugins>
     </pluginManagement>
   </build>
-<modules>  
+  <modules>
     <module>buisnesslogic</module>
     <module>restservice</module>
   </modules>

restservice/pom.xml

@@ -16,21 +16,46 @@
   <!-- FIXME change it to the project's website -->
   <url>http://www.example.com</url>
 
+  <profiles>
+    <profile>
+      <id>dev</id>
+      <properties>
+        <activatedProperties>dev</activatedProperties>
+      </properties>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
+    <profile>
+      <id>prod</id>
+      <properties>
+        <activatedProperties>prod</activatedProperties>
+      </properties>
+    </profile>
+  </profiles>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>14</maven.compiler.source>
+    <maven.compiler.target>14</maven.compiler.target>
     <start-class>com.plannaplan.App</start-class>
+    <swagger.version>2.9.2</swagger.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.vavr</groupId>
+      <artifactId>vavr</artifactId>
+      <version>0.9.0</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
@@ -42,6 +67,21 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
 
+    <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-test -->
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-test</artifactId>
+      <version>5.3.4.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- https://mvnrepository.com/artifact/org.jasig.cas.client/cas-client-core -->
+    <dependency>
+      <groupId>org.jasig.cas.client</groupId>
+      <artifactId>cas-client-core</artifactId>
+      <version>3.6.2</version>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-security</artifactId>
@@ -71,6 +111,22 @@
       <groupId>com.plannaplan</groupId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
+
+    <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger2</artifactId>
+      <version>${swagger.version}</version>
+    </dependency>
+
+    <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui -->
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger-ui</artifactId>
+      <version>${swagger.version}</version>
+    </dependency>
+
+
   </dependencies>
 
   <build>

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

@@ -1,38 +1,136 @@
 package com.plannaplan;
 
+import java.io.InputStream;
+import java.sql.Date;
+
+import com.plannaplan.models.ConfigData;
+import com.plannaplan.models.TourData;
 import com.plannaplan.entities.User;
 import com.plannaplan.services.UserService;
 import com.plannaplan.types.UserRoles;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
+
 import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+import com.plannaplan.services.ConfiguratorService;
 
 @SpringBootApplication
+@EnableScheduling
 public class App {
 
-    public final static String API_VERSION = "v1";
+        public final static String API_VERSION = "v1";
 
-    @Autowired
-    UserService userService;
+        @Autowired
+        private ConfiguratorService contrl;
 
-    public static void main(String[] args) {
-        Logo logo = new Logo("beta");
-        System.out.println(logo.getLogo());
-        System.out.println(
-                "|=============================================================================================|");
-        SpringApplication.run(App.class, args);
-    }
+        @Autowired
+        UserService userService;
 
-    @EventListener(ApplicationReadyEvent.class)
-    public void importData() {
-        User testUser = new User();
-        testUser.setEmail("filizy@st.amu.edu.pl");
-        testUser.setName("Filip");
-        testUser.setSurname("Izydorczyk");
-        testUser.setRole(UserRoles.STUDENT);
-        this.userService.save(testUser);
-    }
+        @Value("${plannaplan.dev}")
+        private boolean isDev;
+
+        public static void main(String[] args) {
+                Logo logo = new Logo("beta");
+                System.out.println(logo.getLogo());
+                System.out.println(
+                                "|=============================================================================================|");
+                SpringApplication.run(App.class, args);
+        }
+
+        /**
+         * method to import mocked data to testing app after startz. It is called only
+         * in dev profile
+         */
+        @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)),
+                                        new TourData(new Date(System.currentTimeMillis() + 86400000),
+                                                        new Date(System.currentTimeMillis() + 2 * 86400000)),
+                                        inputStream);
+                        this.contrl.config(data);
+
+                        User newuser = new User();
+                        newuser.setEmail("tommy@st.amu.edu.pl");
+                        newuser.setName("Tomek");
+                        newuser.setSurname("Atomek");
+                        newuser.setRole(UserRoles.STUDENT);
+                        this.userService.save(newuser);
+
+                        newuser = new User();
+                        newuser.setEmail("robercik@st.amu.edu.pl");
+                        newuser.setName("Robert");
+                        newuser.setSurname("Głowacki");
+                        newuser.setRole(UserRoles.STUDENT);
+                        this.userService.save(newuser);
+
+                        newuser = new User();
+                        newuser.setEmail("mewa@st.amu.edu.pl");
+                        newuser.setName("Poznanska");
+                        newuser.setSurname("Mewa");
+                        newuser.setRole(UserRoles.STUDENT);
+                        this.userService.save(newuser);
+
+                        newuser = new User();
+                        newuser.setEmail("tkul2@st.amu.edu.pl");
+                        newuser.setName("Tomasz");
+                        newuser.setSurname("Kula");
+                        newuser.setRole(UserRoles.STUDENT);
+                        this.userService.save(newuser);
+
+                        newuser = new User();
+                        newuser.setEmail("annana@st.amu.edu.pl");
+                        newuser.setName("Anna");
+                        newuser.setSurname("Na");
+                        newuser.setRole(UserRoles.STUDENT);
+                        this.userService.save(newuser);
+
+                        newuser = new User();
+                        newuser.setEmail("mnart@st.amu.edu.pl");
+                        newuser.setName("Marta");
+                        newuser.setSurname("Narta");
+                        newuser.setRole(UserRoles.STUDENT);
+                        this.userService.save(newuser);
+
+                        newuser = new User();
+                        newuser.setEmail("zmineniane@st.amu.edu.pl");
+                        newuser.setName("Tutaj");
+                        newuser.setSurname("Koncza");
+                        newuser.setRole(UserRoles.STUDENT);
+                        this.userService.save(newuser);
+
+                        newuser = new User();
+                        newuser.setEmail("mi@st.amu.edu.pl");
+                        newuser.setName("Mi");
+                        newuser.setSurname("Sie");
+                        newuser.setRole(UserRoles.STUDENT);
+                        this.userService.save(newuser);
+
+                        newuser = new User();
+                        newuser.setEmail("pms@st.amu.edu.pl");
+                        newuser.setName("Pomysly");
+                        newuser.setSurname("Sad");
+                        newuser.setRole(UserRoles.STUDENT);
+                        this.userService.save(newuser);
+
+                        newuser = new User();
+                        newuser.setEmail("iamnull@st.amu.edu.pl");
+                        newuser.setRole(UserRoles.STUDENT);
+                        this.userService.save(newuser);
+                }
+
+                System.out.println(Logo.getStartedInfo(isDev));
+
+        }
 }

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

@@ -1,11 +1,14 @@
 package com.plannaplan;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
 public class Logo {
 
     public static final String ANSI_RESET = "\u001B[0m";
     public static final String ANSI_YELLOW = "\u001B[33m";
     public static final String ANSI_BLUE = "\u001B[34m";
-    public static final String ANSI_BLACK = "\u001B[30m";
+    public static final String ANSI_BLACK = "\u001B[37m";
     private String version;
 
     public Logo(String version){
@@ -30,4 +33,25 @@ public class Logo {
 ANSI_RESET;
         return result;
     }
+
+
+    public static String getInitInfo(boolean isDev){
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");  
+        LocalDateTime now = LocalDateTime.now(); 
+
+        if(isDev){
+            return ANSI_BLACK + dtf.format(now) + ANSI_YELLOW + "  plannaplan" + ANSI_RESET + " initializing [" +ANSI_BLUE + "dev" + ANSI_RESET +"]";
+        }
+        return ANSI_BLACK + dtf.format(now) + ANSI_YELLOW + "  plannaplan" + ANSI_RESET + " initializing [" +ANSI_BLUE + "prod" + ANSI_RESET +"]";
+    }
+
+    public static String getStartedInfo(boolean isDev){
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");  
+        LocalDateTime now = LocalDateTime.now(); 
+
+        if(isDev){
+            return ANSI_BLACK + dtf.format(now) +ANSI_YELLOW + "  plannaplan" + ANSI_RESET + " started [" +ANSI_BLUE + "dev" + ANSI_RESET +"]";
+        }
+        return ANSI_BLACK + dtf.format(now) + ANSI_YELLOW + "  plannaplan" + ANSI_RESET + " started [" +ANSI_BLUE + "prod" + ANSI_RESET +"]";
+    }
 }

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

@@ -0,0 +1,46 @@
+package com.plannaplan;
+
+import java.util.Collections;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+
+import springfox.documentation.service.Parameter;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.ParameterBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.schema.ModelRef;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class Swagger2Config extends WebMvcConfigurationSupport {
+
+    @Bean
+    public Docket createRestApi() {
+        Parameter authHeader = new ParameterBuilder().parameterType("header").name("Authorization")
+                .modelRef(new ModelRef("string")).build();
+        return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select()
+                .apis(RequestHandlerSelectors.basePackage("com.plannaplan")).paths(PathSelectors.any()).build()
+                .globalOperationParameters(Collections.singletonList(authHeader));
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder().title("plannaplan").description("Aplikacja do zapisów na zajęcia UAM.")
+                .termsOfServiceUrl("https://plannaplan.pl/")
+                // .contact("")
+                .version("1.0").build();
+    }
+}