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.14</maven.compiler.source>
-    <maven.compiler.target>1.14</maven.compiler.target>
+    <maven.compiler.source>14</maven.compiler.source>
+    <maven.compiler.target>14</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -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/configutils/FileReader.java

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

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

@@ -14,6 +14,9 @@ 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 {
 
@@ -29,6 +32,9 @@ public class FileToDatabaseMigrator {
     private static final String ROOM_STRING = "sala";
     private static final String CAPACITY_STRING = "Mc";
 
+    private static final String ZAJ_CYK_ID = "zaj_cyk_id";
+    private static final String GR_NR = "gr_nr";
+
     @Autowired
     private LecturerService lecturerService;
     @Autowired
@@ -53,6 +59,9 @@ public class FileToDatabaseMigrator {
         int roomIndex = data.getIndexOf(FileToDatabaseMigrator.ROOM_STRING);
         int capacityIndex = 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();
 
@@ -64,6 +73,12 @@ public class FileToDatabaseMigrator {
             String lecturerSurname = row.getCell(surnameIndex) != null ? row.getCell(surnameIndex).toString().trim()
                     : "";
 
+            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;
+
             int day = (int) Double.parseDouble(row.getCell(dayIndex).toString());
             WeekDay groupDay = WeekDay.getDay(day - 1);
             int time = parseTimeToInt(row.getCell(timeIndex).toString());
@@ -77,8 +92,12 @@ public class FileToDatabaseMigrator {
                     .orElseGet(() -> this.lecturerService
                             .save(new Lecturer(lecturerTitle, lecturerName, lecturerSurname)));
 
-            this.groupService.find(time, capacity, room).orElseGet(
-                    () -> this.groupService.save(new Groups(capacity, room, course, time, groupDay, lecturer)));
+            Groups group = this.groupService.find(zajCykId, grNr).orElseGet(
+                    () -> new Groups(capacity, room, course, time, groupDay, lecturer, zajCykId, grNr));
+
+                group.update(capacity, room, course, time, null, groupDay, lecturer);
+                
+                this.groupService.save(group);
 
         }
 

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
@@ -18,20 +23,62 @@ public class Assignment {
     @ManyToOne
     @JoinColumn(name = "commision_id")
     private Commision commision;
+    private boolean isPastAssignment;
  
-    public Assignment(Groups group, Commision commision) {
+    /**
+     * 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

@@ -4,6 +4,7 @@ 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;
@@ -11,6 +12,10 @@ 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
@@ -19,29 +24,82 @@ public class Commision {
     @OneToOne
     @JoinColumn(name = "owner_id")
     private User commisionOwner;
+    @OneToOne
+    @JoinColumn(name = "commiter_id")
+    private User commisionCommiter;
     private Timestamp commisionDate;
 
-    @OneToMany(mappedBy = "commision")
+    @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
@@ -23,31 +27,61 @@ public class Course {
     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;
     }
 
+    /**
+     * getGroups
+     * @return groups return list groups
+     */
     public List<Groups> getGroups() {
         return this.groups;
     }

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

@@ -10,10 +10,15 @@ 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;
@@ -21,6 +26,7 @@ public class Groups {
     @JoinColumn(name = "course_id")
     private Course course;
     private int time;
+    private int endTime;
     private String room;
     private int capacity;
     private GroupType type;
@@ -28,80 +34,292 @@ public class Groups {
     @ManyToOne
     @JoinColumn(name = "lecturer_id")
     private Lecturer lecturer;
+    private Integer zajCykId;
+    private Integer grNr;
 
     public Groups() {
     }
 
-    public Groups(int capacity, String room, Course course, int time, WeekDay day, Lecturer lecturer) {
+    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 course;
     }
 
+    /**
+     * setCourseId
+     * 
+     * @param courseId set courseId into groups
+     */
     public void setCourseId(Course 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);
@@ -111,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/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,6 +35,60 @@ 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/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,21 +11,37 @@ 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;
@@ -31,52 +49,160 @@ public class User {
         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/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

@@ -9,27 +9,54 @@ public class FileData {
     private HashMap<String, Integer> keys;
     private Iterator<Row> 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;
     }
 
+    /*
+     * getKeys
+     * @return keys
+     */
     public HashMap<String, Integer> getKeys() {
         return 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

@@ -9,6 +9,13 @@ 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> {
 

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

@@ -9,6 +9,19 @@ 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")

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

@@ -9,6 +9,13 @@ 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")

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

@@ -10,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")
     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/LecturerRepository.java

@@ -9,6 +9,13 @@ 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")

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

@@ -11,11 +11,39 @@ 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")
+    @Query("FROM User WHERE email = ?1 OR usosId = ?1")
     Optional<User> getByAuthority(@Param("authority") String authority);
 
+    @Query("FROM User WHERE email = ?1")
+    Optional<User> getByEmail(@Param("authority") String authority);
+
+    @Query("FROM User WHERE refreshToken = ?1")
+    Optional<User> getByRefreshToken(@Param("refreshToken") String refreshToken);
+
     @Query("FROM User WHERE token = ?1")
     Optional<User> getByToken(@Param("token") String token);
 
@@ -24,4 +52,10 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
     @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,6 +1,7 @@
 package com.plannaplan.services;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.plannaplan.entities.Assignment;
 import com.plannaplan.entities.Commision;
@@ -9,6 +10,10 @@ 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 {
     @Autowired
@@ -17,15 +22,37 @@ public class AssignmentService {
     public AssignmentService() {
     }
 
-    public void save(Assignment assignment) {
-        this.repo.save(assignment);
+    /**
+     * 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

@@ -5,33 +5,66 @@ 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

@@ -2,25 +2,85 @@ 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 com.plannaplan.configutils.*;
+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

@@ -9,28 +9,52 @@ 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;
 
+    /*
+     * 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();
     }
 
+    /*
+     * save
+     * @param course which course you would like to save
+     */
     public Course save(Course course) {
         this.repo.save(course);
         return course;
     }
 
+    /*
+     * delete
+     * @param course which course you would like to delete
+     */
     public void delete(Course course) {
         this.repo.delete(course);
     }
 
+    /*
+     * 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

@@ -0,0 +1,17 @@
+package com.plannaplan.services;
+
+// import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EventService {
+
+    // @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,14 +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
@@ -21,13 +31,16 @@ public class GroupService {
         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 Groups save(Groups group) {
-        this.repo.save(group);
-        return group;
+        return this.repo.save(group);
     }
 
     public void delete(Groups groups) {
@@ -41,4 +54,54 @@ public class GroupService {
     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/LecturerService.java

@@ -8,6 +8,9 @@ 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

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

@@ -12,6 +12,9 @@ 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 {
     @Autowired
@@ -21,26 +24,55 @@ public class UserService {
         super();
     }
 
-    public String login(String authority) throws UserNotFoundException {
-        User user = this.repo.getByAuthority(authority.replace("\n", "").trim())
-                .orElseThrow(() -> new UserNotFoundException("Can not find user with given authority"));
-
-        final String token = UUID.randomUUID().toString();
-        user.setToken(token);
-        this.repo.save(user);
-        return token;
+    public User checkForUser(String email, String usosId) {
+        return this.checkForUser(email, usosId, UserRoles.STUDENT);
     }
 
-    public void save(User user) {
-        this.repo.save(user);
+    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);
+            }
+        }
+    }
+
+    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 save(User user) {
+        return this.repo.save(user);
     }
 
     public User getUserByEmail(String email) throws UserNotFoundException {
-        return this.repo.getByAuthority(email.replace("\n", "").trim())
+        return this.repo.getByEmail(email.replace("\n", "").trim())
                 .orElseThrow(() -> new UserNotFoundException("Cannot find user with given authority"));
 
     }
 
+    public Optional<User> getByAuthority(String authority) {
+        return this.repo.getByAuthority(authority);
+    }
+
     public Optional<User> getByToken(String token) {
         return this.repo.getByToken(token);
     }
@@ -49,4 +81,20 @@ public class UserService {
         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/types/AppState.java

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

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

@@ -1,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/configutils/FileReaderTest.java

@@ -15,7 +15,7 @@ public class FileReaderTest {
         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/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

@@ -11,8 +11,9 @@ 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.Before;
 import org.junit.Test;
 
 import org.junit.runner.RunWith;
@@ -26,24 +27,31 @@ public class AssignmentServiceTest {
     private AssignmentService service;
     @Autowired
     private CommisionService comServie;
-    private Commision com;
-
-    @Before
-    public void init() {
-        this.com = new Commision();
-        this.comServie.save(this.com);
-    }
+    @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();
-        this.addAssignmentToCommision(this.com);
+        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() {
-        this.addAssignmentToCommision(this.com);
+        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);
     }

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

@@ -7,8 +7,10 @@ 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;
@@ -24,10 +26,15 @@ public class CommisionServiceTest {
     @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());
+        this.service.save(new Commision(usr));
         assertTrue("Commision ammount should have changed", this.service.getCommisionsAmmount() > beginState);
     }
 
@@ -57,4 +64,31 @@ public class CommisionServiceTest {
         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

@@ -2,15 +2,23 @@ package com.plannaplan.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.MethodMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
+import java.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;
@@ -20,6 +28,9 @@ import org.junit.runner.RunWith;
 @ContextConfiguration
 public class ConfiguratorServiceTest {
 
+    private final static String BEFORE_UPDATE_FILE = "ZajeciaBeforeUpdate.xlsx";
+    private final static String AFTER_UPDATE_FILE = "ZajeciaAfterUpdate.xlsx";
+
     @Autowired
     private ConfiguratorService configuratorService;
 
@@ -32,11 +43,18 @@ public class ConfiguratorServiceTest {
     @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(null, null, inputStream);
+        final ConfigData data = new ConfigData(
+                new TourData(new Date(System.currentTimeMillis()), new Date(System.currentTimeMillis() + 86400000)),
+                new TourData(new Date(System.currentTimeMillis() + 86400000),
+                        new Date(System.currentTimeMillis() + 2 * 86400000)),
+                inputStream);
         this.configuratorService.config(data);
 
         int courses_ammount = this.courseService.getCoursesAmmount();
@@ -46,4 +64,41 @@ public class ConfiguratorServiceTest {
         assertTrue(courses_ammount > 0 && groups_ammount > 0 && lecturers_ammount > 0);
     }
 
+    @Test
+    @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
+    public void shouldUpdatePreviousImport(){
+        final InputStream inputStream = getClass().getClassLoader()
+        .getResourceAsStream(ConfiguratorServiceTest.BEFORE_UPDATE_FILE);
+        this.configuratorService.importCoursesStream(inputStream);
+        int groups_ammount = this.groupService.getGroupsAmmount();
+        
+        assertTrue(groups_ammount == 2);
+
+        final InputStream inputStream2 = getClass().getClassLoader()
+        .getResourceAsStream(ConfiguratorServiceTest.AFTER_UPDATE_FILE);
+        this.configuratorService.importCoursesStream(inputStream2);
+        int groups_ammount2 = this.groupService.getGroupsAmmount();
+
+        Optional<Groups> newGroup = this.groupService.find(456458, 3); 
+        Optional<Groups> updateGroup = this.groupService.find(456457, 2);
+
+        assertTrue(groups_ammount2 == 3);
+        assertTrue(newGroup.isPresent());
+        assertTrue(updateGroup.get().getLecturer().getSurname().equals("Murawski"));
+        assertTrue(updateGroup.get().getLecturer().getName().equals("Roman"));
+        assertTrue(updateGroup.get().getLecturer().getTitle().equals("prof. dr hab."));
+    }
+
+    @Test
+    public void shouldRetrunNewestConfig() throws InterruptedException {
+        final Date dateToCheck = new Date(System.currentTimeMillis());
+        this.appConfigRepo.save(new AppConfig(new TourData(null, null), new TourData(null, null)));
+        Thread.sleep(2000);
+        this.appConfigRepo.save(new AppConfig(new TourData(dateToCheck, null), new TourData(null, null)));
+
+        AppConfig response = this.configuratorService.getCurrentConfig();
+        assertTrue(response.getFirstTourStart() != null);
+
+    }
+
 }

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,6 +26,12 @@ public class GroupServiceTest {
 
     @Autowired
     private GroupService groupService;
+    @Autowired
+    private AssignmentService assignmentService;
+    @Autowired
+    private CommisionService commisionService;
+    @Autowired
+    private UserService userService;
 
     @Test
     public void createAndDeleteGroup() {
@@ -31,4 +45,27 @@ public class GroupServiceTest {
         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/UserServiceTest.java

@@ -2,6 +2,8 @@ package com.plannaplan.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.MethodMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -32,12 +34,12 @@ public class UserServiceTest {
 
     @Test
     public void shouldReturnToken() {
-        final User testUser = new User(TEST_USER_NAME, TEST_USER_SUERNAME, TEST_USER_MAIL, UserRoles.TEST_USER);
-        this.userService.save(testUser);
+        User testUser = this.userService
+                .save(new User(TEST_USER_NAME, TEST_USER_SUERNAME, TEST_USER_MAIL, UserRoles.TEST_USER));
         try {
-            final 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();
@@ -45,16 +47,6 @@ public class UserServiceTest {
         }
     }
 
-    @Test
-    public void shouldThrowException() {
-        try {
-            this.userService.login("thiseamilisnotindatabase@gmail.com");
-            assertTrue(false);
-        } catch (UserNotFoundException e) {
-            assertTrue(true);
-        }
-    }
-
     @Test
     public void shouldFindStudents() {
         this.userService.save(new User("Nemo", "TheFish", "Nemo@shouldFindStudents.test", UserRoles.STUDENT));
@@ -93,4 +85,37 @@ public class UserServiceTest {
     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

@@ -7,5 +7,12 @@ 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;
+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>
@@ -78,7 +78,7 @@
       </plugins>
     </pluginManagement>
   </build>
-<modules>  
+  <modules>
     <module>buisnesslogic</module>
     <module>restservice</module>
   </modules>

restservice/pom.xml

@@ -16,11 +16,30 @@
   <!-- 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.14</maven.compiler.source>
-    <maven.compiler.target>1.14</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>
@@ -56,6 +75,13 @@
       <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>
@@ -85,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,23 +1,40 @@
 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";
 
+        @Autowired
+        private ConfiguratorService contrl;
+
         @Autowired
         UserService userService;
 
+        @Value("${plannaplan.dev}")
+        private boolean isDev;
+
         public static void main(String[] args) {
                 Logo logo = new Logo("beta");
                 System.out.println(logo.getLogo());
@@ -26,35 +43,94 @@ public class App {
                 SpringApplication.run(App.class, args);
         }
 
+        /**
+         * method to import mocked data to testing app after startz. It is called only
+         * in dev profile
+         */
         @EventListener(ApplicationReadyEvent.class)
         public void importData() {
-                User filip = new User();
-                filip.setEmail("filizy@st.amu.edu.pl");
-                filip.setName("Filip");
-                filip.setSurname("Izydorczyk");
-                filip.setRole(UserRoles.DEANERY);
-                this.userService.save(filip);
+                System.out.println(Logo.getInitInfo(isDev));
 
-                User hub = new User();
-                hub.setEmail("hubwrz1@st.amu.edu.pl");
-                hub.setName("Hubert");
-                hub.setSurname("Wrzesiński");
-                hub.setRole(UserRoles.STUDENT);
-                this.userService.save(hub);
+                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 mac = new User();
-                mac.setEmail("macglo2@st.amu.edu.pl");
-                mac.setName("Maciej");
-                mac.setSurname("Głowacki");
-                mac.setRole(UserRoles.STUDENT);
-                this.userService.save(mac);
+                        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);
 
-                User mar = new User();
-                mar.setEmail("marwoz16@st.amu.edu.pl");
-                mar.setName("Marcin");
-                mar.setSurname("Woźniak");
-                mar.setRole(UserRoles.STUDENT);
-                this.userService.save(mar);
+                        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();
+    }
+}

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

@@ -4,6 +4,10 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -12,7 +16,7 @@ import com.plannaplan.entities.Assignment;
 import com.plannaplan.entities.Commision;
 import com.plannaplan.entities.User;
 import com.plannaplan.responses.mappers.AssignmentResponseMappers;
-import com.plannaplan.responses.models.GetCurrentAssignmentsResponse;
+import com.plannaplan.responses.models.AssignmentResponse;
 import com.plannaplan.services.AssignmentService;
 import com.plannaplan.services.CommisionService;
 
@@ -24,6 +28,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RestController
 @CrossOrigin
 @RequestMapping("/api/" + App.API_VERSION + "/assignments")
+@Api(tags = {
+        "Assignments" }, value = "Assignments", description = "Assignment is representation of student willing to join given group (lecture or calss). This comtroller is depreaceted. Use commission instead")
+@Deprecated
 public class AssignmentsController extends TokenBasedController {
 
     @Autowired
@@ -32,8 +39,10 @@ public class AssignmentsController extends TokenBasedController {
     @Autowired
     private AssignmentService assignmentService;
 
-    @GetMapping("/getCurrentAssignments")
-    public ResponseEntity<List<GetCurrentAssignmentsResponse>> getCurrentAssignments() throws Exception {
+    @GetMapping("/user")
+    @ApiOperation(value = "Return user current assignemts (from newest commision). STUDENT Token needs to be provided. This method is depreaceted. Use `/api/v1/commisions/user/schedule` instead.")
+    @Deprecated
+    public ResponseEntity<List<AssignmentResponse>> getCurrentAssignments() throws Exception {
         User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException("User not found"));
         Optional<Commision> com = this.commisionService.getNewestCommision(user);
 
@@ -42,6 +51,6 @@ public class AssignmentsController extends TokenBasedController {
             return new ResponseEntity<>(AssignmentResponseMappers.mapToResponse(respone), HttpStatus.OK);
         }
 
-        return new ResponseEntity<>(null, HttpStatus.OK);
+        return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK);
     }
 }

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

@@ -3,8 +3,14 @@ package com.plannaplan.controllers;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.plannaplan.App;
 import com.plannaplan.entities.Assignment;
@@ -17,53 +23,158 @@ import com.plannaplan.responses.models.CommisionResponse;
 import com.plannaplan.services.AssignmentService;
 import com.plannaplan.services.CommisionService;
 import com.plannaplan.services.GroupService;
+import com.plannaplan.types.UserRoles;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import com.plannaplan.responses.mappers.AssignmentResponseMappers;
+import com.plannaplan.responses.models.AssignmentResponse;
 
 @RestController
 @CrossOrigin
 @RequestMapping("/api/" + App.API_VERSION + "/commisions")
+@Api(tags = { "Commisions" }, value = "Commisions", description = "Commision is representation of student selected assignments at time. All assignments are attached to some commision so we can see current assignments and also browse history of changes for given user")
 public class CommisionController extends TokenBasedController {
 
-    @Autowired
-    private CommisionService commisionService;
+        @Autowired
+        private CommisionService commisionService;
 
-    @Autowired
-    private GroupService groupServcicxe;
+        @Autowired
+        private GroupService groupServcicxe;
 
-    @Autowired
-    private AssignmentService assignmentService;
+        @Autowired
+        private AssignmentService assignmentService;
 
-    public CommisionController() {
-    }
+        public CommisionController() {
+        }
 
-    @PostMapping("/add")
-    public ResponseEntity<String> addCommision(@RequestBody List<Long> groups) throws UserNotFoundException {
+        @PostMapping(value = { "/user", "/user/{id}" })
+        @ApiOperation(value = "Create commision with assignents to given groups. If group doesn't exist error will be thrown")
+        public ResponseEntity<String> addCommision(
+                        @RequestBody @ApiParam(value = "List of groups ids user want to assign to. If group doesnt exisit error will be thrown") List<Long> groups,
+                        @PathVariable(name = "id", required = false) Long userId) {
 
-        User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException());
-        Commision com = new Commision(user);
-        this.commisionService.save(com);
+                try {
 
-        groups.stream().forEach((groupId) -> {
-            Groups group = this.groupServcicxe.getGroupById(groupId).orElseThrow(() -> new NullPointerException());
-            Assignment a = new Assignment(group, com);
-            this.assignmentService.save(a);
-        });
+                        final User asker = this.getCurrentUser()
+                                        .orElseThrow(() -> new UserNotFoundException("Invalid token"));
 
-        return new ResponseEntity<>("Succes", HttpStatus.OK);
-    }
+                        final User user = userId != null
+                                        ? userService.getById(userId).orElseThrow(
+                                                        () -> new UserNotFoundException("Given user id not exist"))
+                                        : asker;
 
-    @GetMapping("/getAllCommisions")
-    public ResponseEntity<List<CommisionResponse>> getAlCommisions() throws UserNotFoundException {
-        User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException());
-        List<CommisionResponse> result = CommisionResponseMappers
-                .mapToResponse(this.commisionService.getUsersCommisions(user));
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
+                        Assert.isTrue((asker.getRole() == UserRoles.DEANERY && user.getRole() == UserRoles.STUDENT
+                                        || (asker.getId().equals(user.getId()) && user.getRole() == UserRoles.STUDENT)),
+                                        "Incorrect attempt to change plan");
+
+                        Optional<Long> notExistingGroup = this.groupServcicxe.findNotExistingGroup(groups);
+                        Assert.isTrue(!notExistingGroup.isPresent(), "Group "
+                                        + notExistingGroup.orElse(Long.MIN_VALUE).toString() + "doesn't exist");
+
+                        final Commision com = new Commision(user, asker);
+                        this.commisionService.save(com);
+
+                        groups.stream().forEach((groupId) -> {
+                                Groups group = this.groupServcicxe.getGroupById(groupId)
+                                                .orElseThrow(() -> new NullPointerException());
+                                Assignment a = new Assignment(group, com);
+                                this.assignmentService.save(a);
+                        });
+
+                        return new ResponseEntity<>("Succes", HttpStatus.OK);
+                } catch (UserNotFoundException exception) {
+                        return new ResponseEntity<>(exception.getMessage(), HttpStatus.NOT_FOUND);
+                } catch (IllegalArgumentException exception) {
+                        return new ResponseEntity<>(exception.getMessage(), HttpStatus.BAD_REQUEST);
+                }
+        }
+
+        @GetMapping("/user")
+        @ApiOperation("Return list of user all commisions (history of schedules)")
+        public ResponseEntity<List<? extends CommisionResponse>> getAlCommisions(
+                        @RequestParam(name = "groups", defaultValue = "false") @ApiParam(value = "Boolean if we want to display wiht commision's group ids") Boolean groups)
+                        throws UserNotFoundException {
+                User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException());
+
+                List<? extends CommisionResponse> result;
+
+                if (!groups) {
+                        result = CommisionResponseMappers.mapToResponse(this.commisionService.getUsersCommisions(user));
+                } else {
+                        result = CommisionResponseMappers
+                                        .mapToResponseWithGroups(this.commisionService.getUsersCommisions(user));
+                }
+
+                return new ResponseEntity<>(result, HttpStatus.OK);
+        }
+
+        @GetMapping("/user/schedule")
+        @ApiOperation(value = "Return user current assignemts (from newest commision). STUDENT Token needs to be provided.")
+        public ResponseEntity<List<AssignmentResponse>> getCurrentAssignments() throws Exception {
+                User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException("User not found"));
+                Optional<Commision> com = this.commisionService.getNewestCommision(user);
+
+                if (com.isPresent()) {
+                        List<Assignment> respone = this.assignmentService.getCommisionAssignments(com.get());
+                        final HashMap<Long, Integer> ammounts = this.groupServcicxe
+                                        .getTakenPlacesOfAssignments(respone);
+                        return new ResponseEntity<>(AssignmentResponseMappers.mapToResponse(respone, ammounts),
+                                        HttpStatus.OK);
+                }
+
+                return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK);
+        }
+
+        @PreAuthorize("hasRole('ROLE_DEANERY')")
+        @GetMapping("/user/{id}")
+        @ApiOperation("Return list of commisions for given user. To be able to access this data u need to provide DEANERY token")
+        public ResponseEntity<List<? extends CommisionResponse>> getCommision(@PathVariable(name = "id") Long userId,
+                        @RequestParam(name = "groups", defaultValue = "false") @ApiParam(value = "Boolean if we want to display wiht commision's group ids") Boolean groups)
+                        throws UserNotFoundException {
+                User user = this.userService.getById(userId).orElseThrow(() -> new NullPointerException());
+                List<? extends CommisionResponse> result;
+
+                if (!groups) {
+                        result = CommisionResponseMappers.mapToResponse(this.commisionService.getUsersCommisions(user));
+                } else {
+                        result = CommisionResponseMappers
+                                        .mapToResponseWithGroups(this.commisionService.getUsersCommisions(user));
+                }
+
+                return new ResponseEntity<>(result, HttpStatus.OK);
+        }
+
+        @PreAuthorize("hasRole('ROLE_DEANERY')")
+        @GetMapping("/user/{id}/schedule")
+        @ApiOperation(value = "Return given user current assignemts (from newest commision). DEANERY Token needs to be provided.")
+        public ResponseEntity<List<AssignmentResponse>> getCurrentAssignmentsDeanery(
+                        @PathVariable(name = "id") Long userId) throws Exception {
+                User user = this.userService.getById(userId).orElseThrow(() -> new NullPointerException());
+
+                if (user.getRole() == UserRoles.DEANERY) {
+                        return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
+                }
+
+                Optional<Commision> com = this.commisionService.getNewestCommision(user);
+
+                if (com.isPresent()) {
+                        List<Assignment> respone = this.assignmentService.getCommisionAssignments(com.get());
+                        return new ResponseEntity<>(AssignmentResponseMappers.mapToResponse(respone), HttpStatus.OK);
+                }
+
+                return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK);
+        }
 
 }

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

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

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

@@ -1,43 +1,82 @@
 package com.plannaplan.controllers;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 import com.plannaplan.App;
 import com.plannaplan.entities.Course;
 import com.plannaplan.responses.mappers.CoursesResponseMappers;
-import com.plannaplan.responses.models.GetCoursesResponse;
-import com.plannaplan.responses.models.GetCoursesWithGroupsResponse;
+import com.plannaplan.responses.models.CoursesDefaultResponse;
+import com.plannaplan.responses.models.CoursesWithGroupsResponse;
+import com.plannaplan.responses.models.GroupWithCapacityResponse;
 import com.plannaplan.services.CourseService;
+import com.plannaplan.services.GroupService;
+import com.plannaplan.types.GroupType;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.plannaplan.responses.models.abstracts.CoursesResponse;
 
 @RestController
 @CrossOrigin
 @RequestMapping("/api/" + App.API_VERSION + "/courses")
+@Api(tags = {
+        "Course" }, value = "Course", description = "Endpoints to deal with courses. All courses can have classes, lectures or both.")
 public class CoursesController {
     @Autowired
     private CourseService courseService;
 
-    @GetMapping("/getCourses")
-    public ResponseEntity<List<GetCoursesResponse>> getMethodName() {
+    @Autowired
+    private GroupService groupService;
+
+    @GetMapping("/all")
+    @ApiOperation(value = "Return all courses")
+    public ResponseEntity<List<? extends CoursesResponse>> getMethodName(
+            @RequestParam(name = "groups", defaultValue = "false") @ApiParam(value = "Boolean if you want to have resopnse with associated groups or without") Boolean groups,
+            @RequestParam(name = "takenPlaces", defaultValue = "false") @ApiParam(value = "Boolean if we want to have respoonse with information about taken places by other students. Needs to be set groups true first") Boolean takenPlaces) {
         List<Course> courses = this.courseService.getAllCourses();
-        List<GetCoursesResponse> response = CoursesResponseMappers.mapToGetCoursesResponse(courses);
+        if (groups) {
+            if (takenPlaces) {
+
+                final List<CoursesWithGroupsResponse> response = new ArrayList<>();
+
+                courses.forEach(course -> {
+                    final List<GroupWithCapacityResponse> lectures = new ArrayList<>();
+                    final List<GroupWithCapacityResponse> classes = new ArrayList<>();
+
+                    final HashMap<Long, Integer> ammounts = this.groupService.getTakenPlaces(course.getGroups());
+
+                    course.getGroups().stream().forEach(group -> {
+                        if (group.getType() == GroupType.CLASS) {
+                            classes.add(new GroupWithCapacityResponse(group, ammounts.get(group.getId())));
+                        } else {
+                            lectures.add(new GroupWithCapacityResponse(group, ammounts.get(group.getId())));
+                        }
+                    });
+
+                    response.add(new CoursesWithGroupsResponse(course, lectures, classes));
+                });
+
+                return new ResponseEntity<>(response, HttpStatus.OK);
+            }
+
+            final List<CoursesWithGroupsResponse> response = CoursesResponseMappers
+                    .mapToGetCoursesWithGroupsResponse(courses);
+            return new ResponseEntity<>(response, HttpStatus.OK);
+        }
+        final List<CoursesDefaultResponse> response = CoursesResponseMappers.mapToGetCoursesResponse(courses);
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
-
-    @GetMapping("/getCoursesWithGroups")
-    public ResponseEntity<List<GetCoursesWithGroupsResponse>> getCoursesWithGroups() {
-        final List<Course> courses = this.courseService.getAllCourses();
-        final List<GetCoursesWithGroupsResponse> response = CoursesResponseMappers
-                .mapToGetCoursesWithGroupsResponse(courses);
-        return new ResponseEntity<>(response, HttpStatus.OK);
-
-    }
-
 }

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

@@ -1,37 +1,79 @@
 package com.plannaplan.controllers;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 
 import com.plannaplan.App;
 import com.plannaplan.entities.Groups;
 import com.plannaplan.responses.mappers.GroupsMappers;
-import com.plannaplan.responses.models.DefaultGroupResponse;
-import com.plannaplan.responses.models.GetCourseGroupsResponse;
+import com.plannaplan.responses.models.GroupDefaultResponse;
+import com.plannaplan.responses.models.CourseWithGroupsResponse;
 import com.plannaplan.services.GroupService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
 @RestController
 @CrossOrigin
+
 @RequestMapping("/api/" + App.API_VERSION + "/groups")
+@Api(tags = {
+        "Group" }, value = "Group", description = "Enpoints to deal with gorups. Group is related directly to course and can be either class and lecture")
 public class GroupController {
     @Autowired
     private GroupService groupService;
 
-    @GetMapping("/getCourseGroups")
-    public ResponseEntity<GetCourseGroupsResponse<? extends DefaultGroupResponse>> getCourses(@RequestParam("id") Long id,
-            @RequestParam(name = "capacity", defaultValue = "true") Boolean capacity) {
+    @GetMapping("/course/{id}")
+    @ApiOperation(value = "Return list of lectures and classes (if present) given course")
+    public ResponseEntity<CourseWithGroupsResponse<? extends GroupDefaultResponse>> getCourses(
+            @PathVariable(name = "id") Long id,
+            @RequestParam(name = "capacity", defaultValue = "true") @ApiParam(value = "Boolean if we want to have capacity field in response") Boolean capacity,
+            @RequestParam(name = "takenPlaces", defaultValue = "false") @ApiParam(value = "Boolean if we want to have respoonse with information about taken places by other students") Boolean takenPlaces) {
         List<Groups> groups = this.groupService.getGroupsByCourse(id);
+
+        if (takenPlaces) {
+            HashMap<Long, Integer> ammounts = this.groupService.getTakenPlaces(groups);
+            if (capacity) {
+                return new ResponseEntity<>(GroupsMappers.mapToGetCourseGroupsWithCapacityResponse(groups, ammounts),
+                        HttpStatus.OK);
+            }
+            return new ResponseEntity<>(GroupsMappers.mapToGetCourseGroupsDefaultResponse(groups, ammounts),
+                    HttpStatus.OK);
+        }
+
         if (capacity) {
             return new ResponseEntity<>(GroupsMappers.mapToGetCourseGroupsWithCapacityResponse(groups), HttpStatus.OK);
         }
         return new ResponseEntity<>(GroupsMappers.mapToGetCourseGroupsDefaultResponse(groups), HttpStatus.OK);
     }
+
+    @PutMapping("/{id}/capacity")
+    @PreAuthorize("hasRole('ROLE_DEANERY')")
+    @ApiOperation(value = "Change capacity of given group. You need to provide DEANERY token to be ale to change capacity")
+    public ResponseEntity<String> updateCapacity(
+            @PathVariable(name = "id", required = true) @ApiParam(value = "id of group to change capacity") Long id,
+            @RequestParam(name = "newcapacity", required = true) Integer newcapacity) {
+        final Optional<Groups> group = this.groupService.getGroupById(id);
+        if (group.isEmpty()) {
+            return new ResponseEntity<>("Given group doens't exist", HttpStatus.NOT_FOUND);
+        }
+        final Groups gr = group.get();
+        gr.setCapacity(newcapacity);
+        this.groupService.save(gr);
+        return new ResponseEntity<>("Success", HttpStatus.OK);
+    }
 }

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

@@ -1,11 +1,20 @@
 package com.plannaplan.controllers;
 
+import java.util.Optional;
+import java.util.UUID;
+
+import com.plannaplan.entities.User;
 import com.plannaplan.exceptions.UserNotFoundException;
-import com.plannaplan.security.CasValidationExcepiton;
-import com.plannaplan.security.CasValidator;
+import com.plannaplan.responses.models.TokenResponse;
+import com.plannaplan.security.cas.CasUserIdentity;
+import com.plannaplan.security.cas.CasValidationExcepiton;
+import com.plannaplan.security.cas.CasValidator;
+import com.plannaplan.security.cas.CustomUAMCasValidator;
+import com.plannaplan.security.cas.DefaultUAMCasValidator;
 import com.plannaplan.services.UserService;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -13,30 +22,61 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
 @RestController
 @CrossOrigin
+@Api(tags = { "Token" }, value = "Token", description = "Enpoints to get authorization.")
 public class TokenController {
 
-    private final static String SERVICE_URL = "http://localhost:3000";
+    @Value("${plannaplan.frontendUrl}")
+    private String serviceUrl;
+
+    @Value("${plannaplan.dev}")
+    private boolean isDev;
 
     @Autowired
     private UserService userService;
 
     @GetMapping("/token")
-    public ResponseEntity<String> getToken(@RequestParam("ticket") final String ticket) {
-        final CasValidator validator = new CasValidator(SERVICE_URL, ticket);
+    @ApiOperation(value = "Endpoint to access token required to call secured endpoints. In order to access token we need to provide access token comming from unviersity CAS system")
+    public ResponseEntity<TokenResponse> getToken(
+            @RequestParam("ticket") @ApiParam(value = "Ticket get from CAS system. It should look like ST-1376572-wo41gty5R0JCZFKMMie2-cas.amu.edu.psl") final String ticket) {
+        final CasValidator validator = isDev ? new DefaultUAMCasValidator(serviceUrl, ticket)
+                : new CustomUAMCasValidator(serviceUrl, ticket);
 
         try {
-            String authority = validator.validate();
-            String token = this.userService.login(authority);
-            return new ResponseEntity<>(token, HttpStatus.OK);
+            final CasUserIdentity casUserIdentity = validator.validate();
+            final String usosId = casUserIdentity.getUsosId();
+            final String authority = casUserIdentity.getEmail();
+            User user = this.userService.checkForUser(authority, usosId);
+            user = this.userService.login(user);
+
+            return new ResponseEntity<>(new TokenResponse(user), HttpStatus.OK);
         } catch (CasValidationExcepiton e) {
-            return new ResponseEntity<>("Wrong ticket", HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(null, HttpStatus.UNAUTHORIZED);
         } catch (UserNotFoundException e) {
-            return new ResponseEntity<>("User not found", HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);
         } catch (Exception e) {
-            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
         }
+    }
+
+    @GetMapping("/token/refresh")
+    @ApiOperation(value = "Endpoint to access new token based on refresh token. It's needed when request with provided token fail with code 403")
+    public ResponseEntity<TokenResponse> getRefreshToken(
+            @RequestParam("refreshToken") @ApiParam(value = "Refresh token obtained in /token request") final String refreshToken)
+            throws NullPointerException {
+        Optional<User> userResult = this.userService.getUserByRefreshToken(refreshToken);
+        if (userResult.isEmpty()) {
+            return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);
+        }
+        User user = userResult.get();
+        user.setToken(UUID.randomUUID().toString());
+        user = this.userService.save(user);
+        return new ResponseEntity<>(new TokenResponse(user), HttpStatus.OK);
 
     }
 }

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

@@ -1,12 +1,14 @@
 package com.plannaplan.controllers;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.plannaplan.App;
 import com.plannaplan.entities.User;
 import com.plannaplan.responses.mappers.UserResponseMappers;
-import com.plannaplan.responses.models.SearchForStudentsResponse;
+import com.plannaplan.responses.models.UserResponse;
 import com.plannaplan.services.UserService;
+import com.plannaplan.types.UserRoles;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -15,7 +17,13 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -23,16 +31,49 @@ import org.springframework.web.bind.annotation.RequestParam;
 @CrossOrigin
 @RequestMapping("/api/" + App.API_VERSION + "/users")
 @EnableGlobalMethodSecurity(prePostEnabled = true)
+@Api(tags = { "Users" }, value = "Users", description = "Endpoints to deal with users.")
 public class UsersController {
     @Autowired
     private UserService userService;
 
-    @GetMapping("/searchForStudents")
+    @GetMapping("/student/search")
     @PreAuthorize("hasRole('ROLE_DEANERY')")
-
-    public ResponseEntity<List<SearchForStudentsResponse>> configApp(@RequestParam("query") String query) {
+    @ApiOperation(value = "Serch for user by providing query. If query is empty it will return all students. You need token with DEANERY role to call this")
+    public ResponseEntity<List<UserResponse>> searchForStudent(
+            @RequestParam("query") @ApiParam(value = "Query to filter all students. If empty will match everyone") String query) {
         final List<User> searches = this.userService.searchForStudents(query);
-        final List<SearchForStudentsResponse> response = UserResponseMappers.mapToDefaultResponse(searches);
+        final List<UserResponse> response = UserResponseMappers.mapToDefaultResponse(searches);
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
+
+    @GetMapping("/students")
+    @PreAuthorize("hasRole('ROLE_DEANERY')")
+    @ApiOperation(value = "Gets all students. You need token with DEANERY role to call this")
+    public ResponseEntity<List<UserResponse>> getAllStudents() {
+        final List<User> searches = this.userService.getAllStudents();
+        final List<UserResponse> response = UserResponseMappers.mapToDefaultResponse(searches);
+        return new ResponseEntity<>(response, HttpStatus.OK);
+    }
+
+    @PostMapping(path = "/admin")
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    @ApiOperation(value = "Adds new admin user.")
+    public ResponseEntity<String> addAdmin(@RequestParam("authority") @ApiParam(value = "USOS ID or E-mail. If user does not exist it should be USOS ID") String authority) {
+        final Optional<User> userResponse = this.userService.getByAuthority(authority);
+        final User user = userResponse.orElseGet(() -> new User(null, null, null, authority, UserRoles.ADMIN));
+        user.setRole(UserRoles.ADMIN);
+        this.userService.save(user);
+        return new ResponseEntity<>("Success", HttpStatus.OK);
+    }
+
+    @PostMapping(path = "/deanery")
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    @ApiOperation(value = "Adds new deanery user.")
+    public ResponseEntity<String> addDeanery(@RequestParam("authority") @ApiParam(value = "USOS ID or E-mail. If user does not exist it should be USOS ID") String authority) {
+        final Optional<User> userResponse = this.userService.getByAuthority(authority);
+        final User user = userResponse.orElseGet(() -> new User(null, null, null, authority, UserRoles.DEANERY));
+        user.setRole(UserRoles.DEANERY);
+        this.userService.save(user);
+        return new ResponseEntity<>("Success", HttpStatus.OK);
+    }
 }

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

@@ -1,16 +1,59 @@
 package com.plannaplan.responses.mappers;
 
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 import com.plannaplan.entities.Assignment;
-import com.plannaplan.responses.models.GetCurrentAssignmentsResponse;
+import com.plannaplan.entities.Course;
+import com.plannaplan.entities.Groups;
+import com.plannaplan.responses.models.AssignmentResponse;
+import com.plannaplan.types.GroupType;
 
 public class AssignmentResponseMappers {
 
-    public static final List<GetCurrentAssignmentsResponse> mapToResponse(List<Assignment> assignments) {
-        return assignments.stream().filter(Objects::nonNull).map(GetCurrentAssignmentsResponse::new)
-                .collect(Collectors.toList());
+    public static final List<AssignmentResponse> mapToResponse(List<Assignment> assignments) {
+        return mapToResponse(assignments, null);
+    }
+
+    public static final List<AssignmentResponse> mapToResponse(List<Assignment> assignments,
+            HashMap<Long, Integer> ammounts) {
+        List<AssignmentResponse> response = new ArrayList<>();
+        HashMap<Course, List<Groups>> courses = new HashMap<>();
+        assignments.stream().forEach((Assignment assignment) -> {
+            final Groups group = assignment.getGroup();
+            final Course course = group.getCourseId();
+            if (courses.get(course) == null) {
+                courses.put(course, new ArrayList<>());
+            }
+            courses.get(course).add(group);
+        });
+
+        for (Map.Entry<Course, List<Groups>> entry : courses.entrySet()) {
+            final Course course = entry.getKey();
+            final List<Groups> courseGroups = entry.getValue();
+            if (courseGroups.size() == 1) {
+                if (ammounts != null) {
+                    response.add(new AssignmentResponse(course, courseGroups.get(0), ammounts));
+                } else {
+                    response.add(new AssignmentResponse(course, courseGroups.get(0)));
+                }
+            }
+            if (courseGroups.size() == 2) {
+                final Groups lecture = courseGroups.stream().filter(o -> o.getType() == GroupType.LECTURE).findFirst()
+                        .get();
+                final Groups classes = courseGroups.stream().filter(o -> o.getType() == GroupType.CLASS).findFirst()
+                        .get();
+
+                if (ammounts != null) {
+                    response.add(new AssignmentResponse(course, lecture, classes, ammounts));
+                } else {
+                    response.add(new AssignmentResponse(course, lecture, classes));
+                }
+
+            }
+        }
+        return response;
     }
 }

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

@@ -6,9 +6,15 @@ import java.util.stream.Collectors;
 
 import com.plannaplan.entities.Commision;
 import com.plannaplan.responses.models.CommisionResponse;
+import com.plannaplan.responses.models.CommisionWithGroupsResponse;
 
 public class CommisionResponseMappers {
     public static final List<CommisionResponse> mapToResponse(List<Commision> commisions) {
         return commisions.stream().filter(Objects::nonNull).map(CommisionResponse::new).collect(Collectors.toList());
     }
+
+    public static final List<CommisionWithGroupsResponse> mapToResponseWithGroups(List<Commision> commisions) {
+        return commisions.stream().filter(Objects::nonNull).map(CommisionWithGroupsResponse::new)
+                .collect(Collectors.toList());
+    }
 }

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

@@ -5,16 +5,16 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 import com.plannaplan.entities.Course;
-import com.plannaplan.responses.models.GetCoursesResponse;
-import com.plannaplan.responses.models.GetCoursesWithGroupsResponse;
+import com.plannaplan.responses.models.CoursesDefaultResponse;
+import com.plannaplan.responses.models.CoursesWithGroupsResponse;
 
 public class CoursesResponseMappers {
-    public static final List<GetCoursesResponse> mapToGetCoursesResponse(List<Course> courses) {
-        return courses.stream().filter(Objects::nonNull).map(GetCoursesResponse::new).collect(Collectors.toList());
+    public static final List<CoursesDefaultResponse> mapToGetCoursesResponse(List<Course> courses) {
+        return courses.stream().filter(Objects::nonNull).map(CoursesDefaultResponse::new).collect(Collectors.toList());
     }
 
-    public static final List<GetCoursesWithGroupsResponse> mapToGetCoursesWithGroupsResponse(List<Course> courses) {
-        return courses.stream().filter(Objects::nonNull).map(GetCoursesWithGroupsResponse::new)
+    public static final List<CoursesWithGroupsResponse> mapToGetCoursesWithGroupsResponse(List<Course> courses) {
+        return courses.stream().filter(Objects::nonNull).map(CoursesWithGroupsResponse::new)
                 .collect(Collectors.toList());
     }
 }

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

@@ -1,58 +1,113 @@
 package com.plannaplan.responses.mappers;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import com.plannaplan.entities.Groups;
-import com.plannaplan.responses.models.DefaultGroupResponse;
-import com.plannaplan.responses.models.GetCourseGroupsResponse;
-import com.plannaplan.responses.models.WithCapacityGroupResponse;
+import com.plannaplan.responses.models.GroupDefaultResponse;
+import com.plannaplan.responses.models.CourseWithGroupsResponse;
+import com.plannaplan.responses.models.GroupWithCapacityResponse;
 import com.plannaplan.types.GroupType;
 
 public class GroupsMappers {
-    public static List<DefaultGroupResponse> mapToDefaultResponse(List<Groups> groups) {
-        return groups.stream().filter(Objects::nonNull).map(DefaultGroupResponse::new).collect(Collectors.toList());
+    public static List<GroupDefaultResponse> mapToDefaultResponse(List<Groups> groups, HashMap<Long, Integer> taken) {
+        return groups.stream().filter(Objects::nonNull).map(new Function<Groups, GroupDefaultResponse>() {
+            @Override
+            public GroupDefaultResponse apply(Groups p) {
+                if (taken != null) {
+                    return new GroupDefaultResponse(p, taken.get(p.getId()));
+                } else {
+                    return new GroupDefaultResponse(p);
+                }
+            }
+        }).collect(Collectors.toList());
     }
 
-    public static List<WithCapacityGroupResponse> mapToCapacityResponse(List<Groups> groups) {
-        return groups.stream().filter(Objects::nonNull).map(WithCapacityGroupResponse::new)
-                .collect(Collectors.toList());
+    public static List<GroupDefaultResponse> mapToDefaultResponse(List<Groups> groups) {
+        return GroupsMappers.mapToDefaultResponse(groups, null);
     }
 
-    public static GetCourseGroupsResponse<DefaultGroupResponse> mapToGetCourseGroupsDefaultResponse (List<Groups> groups){
+    public static List<GroupWithCapacityResponse> mapToCapacityResponse(List<Groups> groups,
+            HashMap<Long, Integer> taken) {
+        return groups.stream().filter(Objects::nonNull).map(new Function<Groups, GroupWithCapacityResponse>() {
+            @Override
+            public GroupWithCapacityResponse apply(Groups p) {
+                if (taken != null) {
+                    return new GroupWithCapacityResponse(p, taken.get(p.getId()));
+                } else {
+                    return new GroupWithCapacityResponse(p);
+                }
+            }
+        }).collect(Collectors.toList());
+    }
 
-        List<DefaultGroupResponse> lectures = new ArrayList<>();
-        List<DefaultGroupResponse> classes = new ArrayList<>();
+    public static List<GroupWithCapacityResponse> mapToCapacityResponse(List<Groups> groups) {
+        return GroupsMappers.mapToCapacityResponse(groups, null);
+    }
+
+    public static CourseWithGroupsResponse<GroupDefaultResponse> mapToGetCourseGroupsDefaultResponse(
+            List<Groups> groups, HashMap<Long, Integer> taken) {
+
+        List<GroupDefaultResponse> lectures = new ArrayList<>();
+        List<GroupDefaultResponse> classes = new ArrayList<>();
 
         groups.stream().forEach(group -> {
             if (group.getType() == GroupType.CLASS) {
-                classes.add(new DefaultGroupResponse(group));
+                if (taken != null) {
+                    classes.add(new GroupDefaultResponse(group, taken.get(group.getId())));
+                } else {
+                    classes.add(new GroupDefaultResponse(group));
+                }
             } else {
-                lectures.add(new DefaultGroupResponse(group));
+                if (taken != null) {
+                    lectures.add(new GroupDefaultResponse(group, taken.get(group.getId())));
+                } else {
+                    lectures.add(new GroupDefaultResponse(group));
+                }
             }
         });
 
-
-        return new GetCourseGroupsResponse<>(classes, lectures);
+        return new CourseWithGroupsResponse<>(classes, lectures);
     }
 
-    public static GetCourseGroupsResponse<WithCapacityGroupResponse> mapToGetCourseGroupsWithCapacityResponse (List<Groups> groups){
+    public static CourseWithGroupsResponse<GroupDefaultResponse> mapToGetCourseGroupsDefaultResponse(
+            List<Groups> groups) {
+        return GroupsMappers.mapToGetCourseGroupsDefaultResponse(groups, null);
+    }
 
-        List<WithCapacityGroupResponse> lectures = new ArrayList<>();
-        List<WithCapacityGroupResponse> classes = new ArrayList<>();
+    public static CourseWithGroupsResponse<GroupWithCapacityResponse> mapToGetCourseGroupsWithCapacityResponse(
+            List<Groups> groups, HashMap<Long, Integer> taken) {
+
+        List<GroupWithCapacityResponse> lectures = new ArrayList<>();
+        List<GroupWithCapacityResponse> classes = new ArrayList<>();
 
         groups.stream().forEach(group -> {
             if (group.getType() == GroupType.CLASS) {
-                classes.add(new WithCapacityGroupResponse(group));
+                if (taken != null) {
+                    classes.add(new GroupWithCapacityResponse(group, taken.get(group.getId())));
+                } else {
+                    classes.add(new GroupWithCapacityResponse(group));
+                }
+
             } else {
-                lectures.add(new WithCapacityGroupResponse(group));
+                if (taken != null) {
+                    lectures.add(new GroupWithCapacityResponse(group, taken.get(group.getId())));
+                } else {
+                    lectures.add(new GroupWithCapacityResponse(group));
+                }
             }
         });
 
+        return new CourseWithGroupsResponse<>(classes, lectures);
+    }
 
-        return new GetCourseGroupsResponse<>(classes, lectures);
+    public static CourseWithGroupsResponse<GroupWithCapacityResponse> mapToGetCourseGroupsWithCapacityResponse(
+            List<Groups> groups) {
+        return GroupsMappers.mapToGetCourseGroupsWithCapacityResponse(groups, null);
     }
 
 }

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

@@ -5,11 +5,11 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 import com.plannaplan.entities.User;
-import com.plannaplan.responses.models.SearchForStudentsResponse;
+import com.plannaplan.responses.models.UserResponse;
 
 public class UserResponseMappers {
-    public static List<SearchForStudentsResponse> mapToDefaultResponse(List<User> groups) {
-        return groups.stream().filter(Objects::nonNull).map(SearchForStudentsResponse::new)
+    public static List<UserResponse> mapToDefaultResponse(List<User> groups) {
+        return groups.stream().filter(Objects::nonNull).map(UserResponse::new)
                 .collect(Collectors.toList());
     }
 }

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

@@ -0,0 +1,58 @@
+package com.plannaplan.responses.models;
+
+import java.util.HashMap;
+
+import com.plannaplan.entities.Course;
+import com.plannaplan.entities.Groups;
+import com.plannaplan.types.GroupType;
+
+import io.swagger.annotations.ApiModel;
+
+@ApiModel(description = "Response shows information about given assigment to course.", value = "AssignmentResponse")
+public class AssignmentResponse {
+    private Long id;
+    private String name;
+    private GroupWithCapacityResponse classes;
+    private GroupWithCapacityResponse lecture;
+
+    public AssignmentResponse(Course course, Groups lecture, Groups classes) {
+        this.id = course.getId();
+        this.name = course.getName();
+        this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture);
+        this.classes = classes == null ? null : new GroupWithCapacityResponse(classes);
+    }
+
+    public AssignmentResponse(Course course, Groups lecture, Groups classes, HashMap<Long, Integer> ammounts) {
+        this.id = course.getId();
+        this.name = course.getName();
+        this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getId()));
+        this.classes = classes == null ? null : new GroupWithCapacityResponse(classes, ammounts.get(classes.getId()));
+    }
+
+    public AssignmentResponse(Course course, Groups group) {
+        this(course, group.getType() == GroupType.LECTURE ? group : null,
+                group.getType() == GroupType.CLASS ? group : null);
+    }
+
+    public AssignmentResponse(Course course, Groups group, HashMap<Long, Integer> ammounts) {
+        this(course, group.getType() == GroupType.LECTURE ? group : null,
+                group.getType() == GroupType.CLASS ? group : null, ammounts);
+    }
+
+    public GroupWithCapacityResponse getLecture() {
+        return this.lecture;
+    }
+
+    public GroupWithCapacityResponse getClasses() {
+        return this.classes;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public Long getId() {
+        return this.id;
+    }
+
+}

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

@@ -1,19 +1,41 @@
 package com.plannaplan.responses.models;
 
-import java.sql.Timestamp;
-
 import com.plannaplan.entities.Commision;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(description = "Response shows information about commision.", value = "CommisionResponse")
 public class CommisionResponse {
+    @ApiModelProperty(value = "ID created by database")
     private Long id;
-    private Timestamp commisionDate;
+
+    @ApiModelProperty(value = "ID of user that commision belongs to")
+    private UserResponse owner;
+
+    @ApiModelProperty(value = "ID of user that created commision")
+    private UserResponse commiter;
+
+    @ApiModelProperty(value = "Timestamp where the user commit the commision")
+    private String commisionDate;
 
     public CommisionResponse(Commision commision) {
         this.id = commision.getId();
-        this.commisionDate = commision.getCommisionDate();
+        this.commisionDate = commision.getCommisionDate().toString();
+        this.owner = commision.getCommisionOwner() != null ? new UserResponse(commision.getCommisionOwner()) : null;
+        this.commiter = commision.getCommisionCommiter() != null ? new UserResponse(commision.getCommisionCommiter())
+                : null;
     }
 
-    public Timestamp getCommisionDate() {
+    public UserResponse getCommiter() {
+        return commiter;
+    }
+
+    public UserResponse getOwner() {
+        return owner;
+    }
+
+    public String getCommisionDate() {
         return commisionDate;
     }
 

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

@@ -0,0 +1,36 @@
+package com.plannaplan.responses.models;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Commision;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(description = "Response shows information about commision and its groups.", value = "CommisionWithGroupsResponse")
+public class CommisionWithGroupsResponse extends CommisionResponse {
+
+    @ApiModelProperty(value = "List of groups ids in databse that belongs to commision")
+    private List<Long> groups;
+
+    public CommisionWithGroupsResponse(Commision commision) {
+        super(commision);
+        this.groups = commision.getAssignments().stream().filter(Objects::nonNull)
+                .map(new Function<Assignment, Long>() {
+
+                    @Override
+                    public Long apply(Assignment arg0) {
+                        return arg0.getGroup().getId();
+                    }
+                }).collect(Collectors.toList());
+    }
+
+    public List<Long> getGroups() {
+        return groups;
+    }
+
+}

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

@@ -3,12 +3,15 @@ package com.plannaplan.responses.models;
 import java.util.ArrayList;
 import java.util.List;
 
-public class GetCourseGroupsResponse <T> {
+import io.swagger.annotations.ApiModel;
+
+@ApiModel(description = "Response shows information about groups to given course.", value = "CourseWithGroupsResponse")
+public class CourseWithGroupsResponse <T> {
 
     private List<T> lectures = new ArrayList<>();
     private List<T> classes = new ArrayList<>();
 
-    public GetCourseGroupsResponse(List<T> classes, List<T> lectures ){
+    public CourseWithGroupsResponse(List<T> classes, List<T> lectures ){
         this.lectures = lectures;
         this.classes = classes;
     }

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

@@ -0,0 +1,15 @@
+package com.plannaplan.responses.models;
+
+import com.plannaplan.entities.Course;
+import com.plannaplan.responses.models.abstracts.CoursesResponse;
+
+import io.swagger.annotations.ApiModel;
+
+@ApiModel(description = "Response shows information about course.", value = "CoursesDefaultResponse")
+public class CoursesDefaultResponse extends CoursesResponse {
+
+    public CoursesDefaultResponse(Course course) {
+        super(course);
+    }
+
+}

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

@@ -0,0 +1,44 @@
+package com.plannaplan.responses.models;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.plannaplan.entities.Course;
+import com.plannaplan.responses.models.abstracts.CoursesResponse;
+import com.plannaplan.types.GroupType;
+
+import io.swagger.annotations.ApiModel;
+
+@ApiModel(description = "Response shows information about groups to given course.", value = "CoursesWithGroupsResponse")
+public class CoursesWithGroupsResponse extends CoursesResponse {
+
+    private List<GroupWithCapacityResponse> lectures = new ArrayList<>();
+    private List<GroupWithCapacityResponse> classes = new ArrayList<>();
+
+    public CoursesWithGroupsResponse(Course course) {
+        super(course);
+        course.getGroups().stream().forEach(group -> {
+            if (group.getType() == GroupType.CLASS) {
+                this.classes.add(new GroupWithCapacityResponse(group));
+            } else {
+                this.lectures.add(new GroupWithCapacityResponse(group));
+            }
+        });
+    }
+
+    public CoursesWithGroupsResponse(Course course, List<GroupWithCapacityResponse> lectures,
+            List<GroupWithCapacityResponse> classes) {
+        super(course);
+        this.lectures = lectures;
+        this.classes = classes;
+    }
+
+    public List<GroupWithCapacityResponse> getClasses() {
+        return this.classes;
+    }
+
+    public List<GroupWithCapacityResponse> getLectures() {
+        return this.lectures;
+    }
+
+}

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

@@ -1,53 +0,0 @@
-package com.plannaplan.responses.models;
-
-import com.plannaplan.entities.Assignment;
-import com.plannaplan.entities.Groups;
-import com.plannaplan.types.GroupType;
-
-public class DefaultGroupResponse {
-
-    private Long id;
-    private int day;
-    private String time;
-    private String lecturer;
-    private String room;
-    private GroupType type;
-
-    public DefaultGroupResponse(Groups group) {
-        this.id = group.getId() != null ? group.getId() : null;
-        this.day = group.getDay() != null ? group.getDay().label : -1;
-        this.time = group.getTimeString() != null ? group.getTimeString() : "";
-        this.lecturer = group.getLecturer() != null ? group.getLecturer().toString() : "";
-        this.room = group.getRoom() != null ? group.getRoom() : "";
-        this.type = group.getType() != null ? group.getType() : null;
-    }
-
-    public DefaultGroupResponse(Assignment assignment) {
-        this(assignment.getGroup());
-    }
-
-    public GroupType getType() {
-        return type;
-    }
-
-    public String getRoom() {
-        return room;
-    }
-
-    public String getLecturer() {
-        return lecturer;
-    }
-
-    public String getTime() {
-        return time;
-    }
-
-    public int getDay() {
-        return day;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-}

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

@@ -1,12 +0,0 @@
-package com.plannaplan.responses.models;
-
-import com.plannaplan.entities.Course;
-import com.plannaplan.responses.models.abstracts.CoursesResponse;
-
-public class GetCoursesResponse extends CoursesResponse {
-
-    public GetCoursesResponse(Course course) {
-        super(course);
-    }
-
-}

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

@@ -1,34 +0,0 @@
-package com.plannaplan.responses.models;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.plannaplan.entities.Course;
-import com.plannaplan.responses.models.abstracts.CoursesResponse;
-import com.plannaplan.types.GroupType;
-
-public class GetCoursesWithGroupsResponse extends CoursesResponse {
-
-    private List<DefaultGroupResponse> lectures = new ArrayList<>();
-    private List<DefaultGroupResponse> classes = new ArrayList<>();
-
-    public GetCoursesWithGroupsResponse(Course course) {
-        super(course);
-        course.getGroups().stream().forEach(group -> {
-            if (group.getType() == GroupType.CLASS) {
-                this.classes.add(new DefaultGroupResponse(group));
-            } else {
-                this.lectures.add(new DefaultGroupResponse(group));
-            }
-        });
-    }
-
-    public List<DefaultGroupResponse> getClasses() {
-        return this.classes;
-    }
-
-    public List<DefaultGroupResponse> getLectures() {
-        return this.lectures;
-    }
-
-}

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

@@ -1,11 +0,0 @@
-package com.plannaplan.responses.models;
-
-import com.plannaplan.entities.Assignment;
-
-public class GetCurrentAssignmentsResponse extends WithCapacityGroupResponse {
-
-    public GetCurrentAssignmentsResponse(Assignment assignment) {
-        super(assignment);
-    }
-
-}

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

@@ -0,0 +1,90 @@
+package com.plannaplan.responses.models;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Groups;
+import com.plannaplan.types.GroupType;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@ApiModel(description = "Response shows information about given group.", value = "GroupDefaultResponse")
+public class GroupDefaultResponse {
+
+    @ApiModelProperty(value = "ID created by database.")
+    private Long id;
+
+    @ApiModelProperty(value = "Value shows what day when the course is. Example 0 is Monday.")
+    private int day;
+
+    @ApiModelProperty(value = "Value shows time when the course takes.")
+    private String time;
+
+    @ApiModelProperty(value = "Value shows time when the course ends.")
+    private String endTime;
+
+    @ApiModelProperty(value = "Value shows degree, name and surname.")
+    private String lecturer;
+
+    @ApiModelProperty(value = "Value shows room where the class takes.")
+    private String room;
+
+    @ApiModelProperty(value = "Value shows kind of group. The types are LECTURE or CLASS.")
+    private GroupType type;
+
+    @ApiModelProperty(value = "Value shows how many places is already taken by other students.")
+    private Integer takenPlaces;
+
+    public GroupDefaultResponse(Groups group) {
+        this.id = group.getId() != null ? group.getId() : null;
+        this.day = group.getDay() != null ? group.getDay().label : -1;
+        this.time = group.getTimeString() != null ? group.getTimeString() : "";
+        this.endTime = group.getEndTimeString() != null ? group.getEndTimeString() : "";
+        this.lecturer = group.getLecturer() != null ? group.getLecturer().toString() : "";
+        this.room = group.getRoom() != null ? group.getRoom() : "";
+        this.type = group.getType() != null ? group.getType() : null;
+    }
+
+    public GroupDefaultResponse(Groups group, int takenPlaces) {
+        this(group);
+        this.takenPlaces = takenPlaces;
+    }
+
+    public GroupDefaultResponse(Assignment assignment) {
+        this(assignment.getGroup());
+    }
+
+    public GroupType getType() {
+        return type;
+    }
+
+    public String getRoom() {
+        return room;
+    }
+
+    public String getLecturer() {
+        return lecturer;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public int getDay() {
+        return day;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public Integer getTakenPlaces() {
+        return this.takenPlaces;
+    }
+
+}

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

@@ -0,0 +1,34 @@
+package com.plannaplan.responses.models;
+
+import com.plannaplan.entities.Assignment;
+import com.plannaplan.entities.Groups;
+import io.swagger.annotations.ApiModel;
+
+@ApiModel(description = "Response shows information about group with included capacity.", value = "GroupWithCapacityResponse")
+public class GroupWithCapacityResponse extends GroupDefaultResponse {
+
+    private int capacity;
+
+    public GroupWithCapacityResponse(Groups group) {
+        super(group);
+        this.capacity = group.getCapacity();
+    }
+
+    public GroupWithCapacityResponse(Groups group, int takenPlaces) {
+        super(group, takenPlaces);
+        this.capacity = group.getCapacity();
+    }
+
+    public GroupWithCapacityResponse(Assignment assignment) {
+        this(assignment.getGroup());
+    }
+
+    public GroupWithCapacityResponse(Assignment assignment, int takenPlaces) {
+        this(assignment.getGroup(), takenPlaces);
+    }
+
+    public int getCapacity() {
+        return capacity;
+    }
+
+}

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

@@ -0,0 +1,49 @@
+package com.plannaplan.responses.models;
+
+import com.plannaplan.entities.User;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(description = "Response shows information about logged user.", value = "TokenResponse")
+public class TokenResponse {
+    @ApiModelProperty(value = "user token used to verify requests")
+    private String token;
+    @ApiModelProperty(value = "user token needed to refresh")
+    private String refreshToken;
+    @ApiModelProperty(value = "user id in database")
+    private Long id;
+    @ApiModelProperty(value = "user app role")
+    private String authorityRole;
+    @ApiModelProperty(value = "user unviersity email")
+    private String email;
+
+    public TokenResponse(User user) {
+        this.id = user.getId();
+        this.authorityRole = user.getRole().toString();
+        this.email = user.getEmail();
+        this.token = user.getToken();
+        this.refreshToken = user.getRefreshToken();
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getAuthorityRole() {
+        return authorityRole;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public String getRefreshToken() {
+        return this.refreshToken;
+    }
+
+}

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

@@ -2,17 +2,20 @@ package com.plannaplan.responses.models;
 
 import com.plannaplan.entities.User;
 
-public class SearchForStudentsResponse {
+import io.swagger.annotations.ApiModel;
+
+@ApiModel(description = "Response shows information about user.", value = "UserResponse")
+public class UserResponse {
 
     private Long id;
     private String name;
     private String surname;
     private String email;
 
-    public SearchForStudentsResponse(User user) {
+    public UserResponse(User user) {
         this.id = user.getId();
-        this.name = user.getName();
-        this.surname = user.getSurname();
+        this.name = user.getName() != null ? user.getName() : "";
+        this.surname = user.getSurname() != null ? user.getSurname() : "";
         this.email = user.getEmail();
     }
 

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

@@ -1,23 +0,0 @@
-package com.plannaplan.responses.models;
-
-import com.plannaplan.entities.Assignment;
-import com.plannaplan.entities.Groups;
-
-public class WithCapacityGroupResponse extends DefaultGroupResponse {
-
-    private int capacity;
-
-    public WithCapacityGroupResponse(Groups group) {
-        super(group);
-        this.capacity = group.getCapacity();
-    }
-
-    public WithCapacityGroupResponse(Assignment assignment) {
-        this(assignment.getGroup());
-    }
-
-    public int getCapacity() {
-        return capacity;
-    }
-
-}

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

@@ -70,8 +70,11 @@ public class AuthenticationProvider extends AbstractUserDetailsAuthenticationPro
 
             @Override
             public boolean isCredentialsNonExpired() {
-                // is being done in other task
-                return true;
+                if (user.isCredentialsNonExpired()) {
+                    userService.save(user);
+                    return true;
+                }
+                return false;
             }
 
             @Override

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

@@ -1,45 +0,0 @@
-package com.plannaplan.security;
-
-import java.net.URLEncoder;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-
-public class CasValidator {
-    private static String CAS_URL = "https://cas.amu.edu.pl/cas";
-    private final CloseableHttpClient httpClient = HttpClients.createDefault();
-    private String service;
-    private String ticket;
-
-    public CasValidator(String service, String ticket) {
-        this.service = service;
-        this.ticket = ticket;
-    }
-
-    public String validate() throws Exception, CasValidationExcepiton {
-        HttpGet request = new HttpGet(CasValidator.CAS_URL + "/validate?service="
-                + URLEncoder.encode(this.service, "UTF-8") + "&ticket=" + URLEncoder.encode(this.ticket, "UTF-8"));
-        try (CloseableHttpResponse response = httpClient.execute(request)) {
-
-            HttpEntity entity = response.getEntity();
-
-            String result = null;
-            if (entity != null) {
-                // return it as a String
-                result = EntityUtils.toString(entity);
-                if (result.replace("\n", "").trim().equals("no")) {
-                    throw new CasValidationExcepiton("Validation failed");
-                }
-            }
-
-            String res = result.substring(result.indexOf('\n') + 1);
-            return res;
-
-        }
-
-    }
-}

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

@@ -18,6 +18,7 @@ import org.springframework.security.web.authentication.HttpStatusEntryPoint;
 
 @Configuration
 @EnableWebSecurity
+
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     private static final RequestMatcher PROTECTED_URLS = new OrRequestMatcher(new AntPathRequestMatcher("/api/**"));
@@ -36,8 +37,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Override
     public void configure(final WebSecurity webSecurity) {
-        webSecurity.ignoring().antMatchers("/token**").antMatchers("/api/v1/courses/getCourses")
-                .antMatchers("/api/v1/groups/getCourseGroups").antMatchers("/api/v1/courses/getCoursesWithGroups");
+        webSecurity.ignoring().antMatchers("/token**").antMatchers("/token/refresh**")
+                .antMatchers("/api/v1/courses/all").antMatchers("/api/v1/groups/course/{id}")
+                .antMatchers("/v2/api-docs", "/configuration/ui", "/swagger-resources/**", "/configuration/security",
+                        "/swagger-ui.html", "/webjars/**");
     }
 
     @Override

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

@@ -0,0 +1,19 @@
+package com.plannaplan.security.cas;
+
+public class CasUserIdentity {
+    private String usosId;
+    private String email;
+    
+    public CasUserIdentity(String usosId, String email){
+        this.usosId = usosId;
+        this.email = email;
+    }
+
+    public String getUsosId() {
+        return usosId;
+    } 
+
+    public String getEmail() {
+        return email;
+    } 
+}

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

@@ -1,4 +1,4 @@
-package com.plannaplan.security;
+package com.plannaplan.security.cas;
 
 public class CasValidationExcepiton extends RuntimeException {
     /**

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

@@ -0,0 +1,6 @@
+package com.plannaplan.security.cas;
+
+public interface CasValidator {
+ 
+    CasUserIdentity validate();
+}

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

@@ -0,0 +1,46 @@
+package com.plannaplan.security.cas;
+
+import org.jasig.cas.client.validation.Assertion;
+import org.jasig.cas.client.validation.Cas20ServiceTicketValidator;
+import org.jasig.cas.client.validation.TicketValidationException;
+
+public class CustomUAMCasValidator implements CasValidator {
+    private static String CAS_URL = "https://cas.amu.edu.pl/cas";
+    private static String EMAIL_FIELD = "mail";
+    private static String USOS_ID = "usos_id";
+    private String service;
+    private String ticket;
+
+    public CustomUAMCasValidator(String service, String ticket){
+        this.service = service;
+        this.ticket = ticket;
+    }
+
+    @Override
+    public CasUserIdentity validate() {
+        /* 
+        * TO DO 
+        * Dodać case z CAS10/CAS20/CAS30
+        */
+        final Cas20ServiceTicketValidator validator = new Cas20ServiceTicketValidator(CustomUAMCasValidator.CAS_URL);
+
+        try {
+            final Assertion assertion = validator.validate(this.ticket, this.service);
+            
+            if (assertion == null) {
+                throw new CasValidationExcepiton("Validation failed. Assertion could not be retrieved for ticket " + "");
+            }
+
+            final String usosid = assertion.getPrincipal().getAttributes().get(CustomUAMCasValidator.USOS_ID).toString();
+            
+            final String mail = assertion.getPrincipal().getAttributes().get(CustomUAMCasValidator.EMAIL_FIELD).toString();
+
+            return new CasUserIdentity(usosid,mail);
+
+        } catch (TicketValidationException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.plannaplan.security.cas;
+
+import java.net.URLEncoder;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+public class DefaultUAMCasValidator implements CasValidator {
+    private static String CAS_URL = "https://cas.amu.edu.pl/cas";
+    private final CloseableHttpClient httpClient = HttpClients.createDefault();
+    private String service;
+    private String ticket;
+
+    public DefaultUAMCasValidator(String service, String ticket) {
+        this.service = service;
+        this.ticket = ticket;
+    }
+
+    @Override
+    public CasUserIdentity validate() {
+        try {
+            HttpGet request = new HttpGet(DefaultUAMCasValidator.CAS_URL + "/validate?service="
+                    + URLEncoder.encode(this.service, "UTF-8") + "&ticket=" + URLEncoder.encode(this.ticket, "UTF-8"));
+            try (CloseableHttpResponse response = httpClient.execute(request)) {
+
+                HttpEntity entity = response.getEntity();
+
+                String result = null;
+                if (entity != null) {
+                    // return it as a String
+                    result = EntityUtils.toString(entity);
+                    if (result.replace("\n", "").trim().equals("no")) {
+                        throw new CasValidationExcepiton("Validation failed");
+                    }
+                }
+
+                String res = result.substring(result.indexOf('\n') + 1);
+                return new CasUserIdentity(null,res);
+
+            }
+        }
+
+        catch (Exception e) {
+            throw new CasValidationExcepiton("Cas Validation has failed."); 
+        }
+    }
+}

restservice/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,19 @@
+{
+    "properties": [
+        {
+            "name": "plannaplan.dev",
+            "type": "java.lang.String",
+            "description": "Should application create resorces for development or not"
+        },
+        {
+            "name": "plannaplan.frontendUrl",
+            "type": "java.lang.String",
+            "description": "Url where frontend app is located"
+        },
+        {
+            "name": "plannaplan.email",
+            "type": "java.lang.String",
+            "description": "Email from which app sends message"
+        }
+    ]
+}

restservice/src/main/resources/application-dev.properties

@@ -0,0 +1,21 @@
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
+spring.datasource.url=jdbc:mysql://localhost:3306/test?useUnicode=yes&characterEncoding=UTF-8
+spring.datasource.username=root
+spring.datasource.password=example
+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.username=<login user to smtp server>
+# spring.mail.password=<login password to smtp server>
+spring.mail.properties.mail.smtp.auth=false
+spring.mail.properties.mail.smtp.starttls.enable=false
+logging.level.io.swagger.models.parameters.AbstractSerializableParameter=ERROR
+server.port=1285
+plannaplan.dev = true
+plannaplan.frontendUrl = http://localhost:3000
+plannaplan.email = plannaplan.kontakt@gmail.com

restservice/src/main/resources/application-prod.properties

@@ -0,0 +1,27 @@
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
+spring.datasource.url = jdbc:mysql://${PLANNAPLAN_MYSQL_DB_HOST}:${PLANNAPLAN_MYSQL_DB_PORT}/${PLANNAPLAN_MYSQL_DB}?useUnicode=yes&characterEncoding=UTF-8
+spring.datasource.username = ${PLANNAPLAN_MYSQL_DB_USERNAME}
+spring.datasource.password = ${PLANNAPLAN_MYSQL_DB_PASSWORD}
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.jpa.open-in-view=true
+spring.jpa.hibernate.ddl-auto=update
+spring.jackson.serialization.fail-on-empty-beans=false
+spring.main.allow-bean-definition-overriding=true
+spring.jackson.default-property-inclusion = NON_NULL
+logging.level.io.swagger.models.parameters.AbstractSerializableParameter=ERROR
+spring.mail.host=${PLANNAPLAN_EMAIL_HOST}
+spring.mail.port=${PLANNAPLAN_EMAIL_PORT}
+spring.mail.username=${PLANNAPLAN_EMAIL_USERNAME}
+spring.mail.password=${PLANNAPLAN_EMAIL_PASSWORD}
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+server.port=1285
+
+plannaplan.email = ${PLANNAPLAN_EMAIL}
+plannaplan.dev = false
+plannaplan.frontendUrl= https://wmi.plannaplan.pl
+security.require-ssl=true
+server.ssl.key-store=/keys/keystore.p12
+server.ssl.key-store-password=
+server.ssl.keyStoreType=PKCS12
+server.ssl.keyAlias=tomcat