diff --git a/README.md b/README.md
index d056b53..6d62888 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,18 @@ cd restservice
mvn spring-boot:run
```
+## Packaging
+
+Zeby spakowac apke do `jara` wystarcza dwie komendy
+
+```
+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)
+
## 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
diff --git a/buisnesslogic/pom.xml b/buisnesslogic/pom.xml
index 5bd658b..77e0dd0 100644
--- a/buisnesslogic/pom.xml
+++ b/buisnesslogic/pom.xml
@@ -36,19 +36,35 @@
2.3.0
- mysql
- mysql-connector-java
- 8.0.18
-
-
- org.springframework.boot
- spring-boot-starter-data-jpa
-
-
+ mysql
+ mysql-connector-java
+ 8.0.18
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+
+
+ org.apache.poi
+ poi-ooxml
+ 3.17
+
+
+
+
+ org.apache.poi
+ poi
+ 3.17
+
+
-
+
+
diff --git a/buisnesslogic/src/main/java/com/plannaplan/Configurator.java b/buisnesslogic/src/main/java/com/plannaplan/Configurator.java
index 1d131d6..21367d8 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/Configurator.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/Configurator.java
@@ -2,13 +2,36 @@ package com.plannaplan;
import com.plannaplan.interfaces.ProtectedAction;
import com.plannaplan.models.ConfigData;
+import com.plannaplan.models.FileData;
+import com.plannaplan.services.CourseService;
+import com.plannaplan.services.GroupService;
+import com.plannaplan.services.LecturerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.plannaplan.configutils.*;
+
+@Component
public class Configurator implements ProtectedAction {
+ @Autowired
+ private LecturerService lecturerService;
+
+ @Autowired
+ private CourseService courseService;
+
+ @Autowired
+ private GroupService groupService;
+
public Configurator() {
}
public void config(ConfigData data) {
+ FileReader reader = new FileReader(data.getFilestream());
+ FileData coursesData = reader.read();
+ FileToDatabaseMigrator mgtr = new FileToDatabaseMigrator(lecturerService, courseService, groupService);
+ mgtr.migrate(coursesData);
}
@Override
diff --git a/buisnesslogic/src/main/java/com/plannaplan/Controller.java b/buisnesslogic/src/main/java/com/plannaplan/Controller.java
index e9384ea..f16ff41 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/Controller.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/Controller.java
@@ -1,6 +1,16 @@
package com.plannaplan;
+import com.plannaplan.models.ConfigData;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
public class Controller {
+
+ @Autowired
+ private Configurator configurator;
+
public Controller() {
}
@@ -22,7 +32,8 @@ public class Controller {
public void getHistoryAtPoint() {
}
- public void config() {
+ public void config(ConfigData data) {
+ configurator.config(data);
}
public void createTransfer() {
diff --git a/buisnesslogic/src/main/java/com/plannaplan/configutils/FileReader.java b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileReader.java
new file mode 100644
index 0000000..88e91f2
--- /dev/null
+++ b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileReader.java
@@ -0,0 +1,56 @@
+package com.plannaplan.configutils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import com.plannaplan.models.FileData;
+
+public class FileReader {
+
+ private InputStream fileInputStream;
+
+ public FileReader(InputStream fileInputStream) {
+ this.fileInputStream = fileInputStream;
+ }
+
+ public FileData read() {
+
+ FileData result = null;
+
+ try {
+ InputStream fis = this.fileInputStream;
+ XSSFWorkbook workbook = new XSSFWorkbook(fis);
+ XSSFSheet sheet = workbook.getSheetAt(0);
+
+ Iterator rowIt = sheet.iterator();
+
+ Row row = rowIt.next();
+ Iterator cellIt = row.cellIterator();
+
+ Hashtable keys = new Hashtable<>();
+ int index = 0;
+ while (cellIt.hasNext()) {
+ Cell c = cellIt.next();
+ keys.put(c.toString(), index);
+ index+=1;
+ }
+
+ rowIt.remove();
+ result = new FileData(keys, rowIt);
+ workbook.close();
+ fis.close();
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return result;
+ }
+
+}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java
index a19a5eb..6a0513d 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java
@@ -1,12 +1,148 @@
package com.plannaplan.configutils;
-import java.io.File;
+import java.util.Iterator;
+
+import com.plannaplan.entities.Course;
+import com.plannaplan.entities.Groups;
+import com.plannaplan.entities.Lecturer;
+import com.plannaplan.models.FileData;
+import com.plannaplan.services.CourseService;
+import com.plannaplan.services.GroupService;
+import com.plannaplan.services.LecturerService;
+import com.plannaplan.types.GroupType;
+import com.plannaplan.types.WeekDay;
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
public class FileToDatabaseMigrator {
- public FileToDatabaseMigrator() {
+ public static String LECTURER_NAME_STRING = "imie";
+ public static String LECTURER_SURNAME_STRING = "nazwisko";
+ public static String LECTURER_TITLE_STRING = "tytul";
+
+ public static String COURSE_SYMBOL_STRING = "sym";
+ public static String COURSE_NAME_STRING = "nazwa";
+
+ public static String GROUP_DAY_STRING = "dzien";
+ public static String GROUP_TIME_STRING = "godz_od";
+ public static String ROOM_STRING = "sala";
+ public static String CAPACITY_STRING = "Mc";
+
+ LecturerService lecturerService;
+ CourseService courseService;
+ GroupService groupService;
+
+ public FileToDatabaseMigrator(LecturerService lecturerService, CourseService courseService,
+ GroupService groupService) {
+ this.lecturerService = lecturerService;
+ this.groupService = groupService;
+ this.courseService = courseService;
}
- public void migrate(File file) {
+ public void migrate(FileData data) {
+ Iterator rows = data.getRows();
+ int course_name_index = data.getIndexOf(FileToDatabaseMigrator.COURSE_NAME_STRING);
+ int sym_index = data.getIndexOf(FileToDatabaseMigrator.COURSE_SYMBOL_STRING);
+
+ int title_index = data.getIndexOf(FileToDatabaseMigrator.LECTURER_TITLE_STRING);
+ int surname_index = data.getIndexOf(FileToDatabaseMigrator.LECTURER_SURNAME_STRING);
+ int name_index = data.getIndexOf(FileToDatabaseMigrator.LECTURER_NAME_STRING);
+
+ int day_index = data.getIndexOf(FileToDatabaseMigrator.GROUP_DAY_STRING);
+ int time_index = data.getIndexOf(FileToDatabaseMigrator.GROUP_TIME_STRING);
+ int room_index = data.getIndexOf(FileToDatabaseMigrator.ROOM_STRING);
+ int capacity_index = data.getIndexOf(FileToDatabaseMigrator.CAPACITY_STRING);
+
+ while (rows.hasNext()) {
+ Row row = rows.next();
+
+ Cell course_name_cell = row.getCell(course_name_index);
+ Cell sym = row.getCell(sym_index);
+
+ Cell title_cell = row.getCell(title_index);
+ Cell name_cell = row.getCell(name_index);
+ Cell surname_cell = row.getCell(surname_index);
+
+ Cell day_cell = row.getCell(day_index);
+ Cell time_cell = row.getCell(time_index);
+ Cell room_cell = row.getCell(room_index);
+ Cell capacity_cell = row.getCell(capacity_index);
+
+ String lecturer_title = "";
+ String lecturer_surname = "";
+ String lecturer_name = "";
+
+ String course_name = course_name_cell.toString().trim();
+ String sym_str = sym.toString().trim();
+
+ int day = (int) Double.parseDouble(day_cell.toString());
+ WeekDay group_day = WeekDay.getDay(day);
+ String room = room_cell.toString().trim();
+ int time = this.parseTimeToInt(time_cell.toString());
+
+ int capacity = (int) Double.parseDouble(capacity_cell.toString());
+
+ Groups group = groupService.find(time, capacity, room);
+
+ Course course = this.courseService.getCourseByName(course_name);
+
+ if (course == null) {
+ course = new Course();
+ course.setName(course_name);
+ course.setSymbol(sym_str);
+ }
+
+ courseService.save(course);
+
+ if (title_cell != null) {
+ lecturer_title = title_cell.toString().trim();
+ }
+ if (name_cell != null) {
+ lecturer_name = name_cell.toString().trim();
+ }
+ if (surname_cell != null) {
+ lecturer_surname = surname_cell.toString().trim();
+ }
+
+ Lecturer lecturer = lecturerService.getLecturer(lecturer_title, lecturer_name, lecturer_surname);
+
+ if (lecturer == null) {
+ lecturer = new Lecturer(lecturer_title, lecturer_name, lecturer_surname);
+ lecturerService.save(lecturer);
+ }
+
+ if (group == null) {
+ group = new Groups();
+ group.setCapacity(capacity);
+ group.setRoom(room);
+ group.setCourseId(course);
+ group.setTime(time);
+ if (capacity >= 50) {
+ group.setType(GroupType.LECTURE);
+ } else {
+ group.setType(GroupType.CLASS);
+ }
+ group.setDay(group_day);
+ group.setLecturer(lecturer);
+
+ groupService.save(group);
+ }
+
+ }
+
+ }
+
+ private Integer parseTimeToInt(String time) {
+ String times[] = time.split("\\.");
+ if (times.length == 2) {
+ return Integer.parseInt(times[0]) * 60 + Integer.parseInt(times[1]);
+ }
+ times = time.split("\\:");
+ if (times.length == 2) {
+ return Integer.parseInt(times[0]) * 60 + Integer.parseInt(times[1]);
+ }
+
+ return 0;
}
}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/entities/Course.java b/buisnesslogic/src/main/java/com/plannaplan/entities/Course.java
index b17983d..be2767e 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/entities/Course.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/entities/Course.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
@@ -16,12 +17,16 @@ public class Course {
private Long id;
private String name;
private String symbol;
- @OneToMany(mappedBy = "id")
+ @OneToMany(mappedBy = "courseId", fetch = FetchType.EAGER)
private List groups = new ArrayList<>();
public Course() {
}
+ public Long getId() {
+ return this.id;
+ }
+
public String getName() {
return name;
}
@@ -38,4 +43,8 @@ public class Course {
this.name = name;
}
+ public List getGroups(){
+ return this.groups;
+ }
+
}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/entities/Groups.java b/buisnesslogic/src/main/java/com/plannaplan/entities/Groups.java
index 016a6f2..ec5aa38 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/entities/Groups.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/entities/Groups.java
@@ -30,6 +30,10 @@ public class Groups {
public Groups() {
}
+ public Long getId() {
+ return this.id;
+ }
+
public Lecturer getLecturer() {
return lecturer;
}
@@ -85,4 +89,14 @@ public class Groups {
public void setCourseId(Course courseId) {
this.courseId = courseId;
}
+
+ public String getTimeString() {
+ int minutes = this.getTime() % 60;
+ String hoursString = Integer.toString(this.getTime() / 60);
+ String minutesString = Integer.toString(minutes);
+ if (minutes < 10) {
+ minutesString = "0" + minutesString;
+ }
+ return String.format("%s.%s", hoursString, minutesString);
+ }
}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/entities/Lecturer.java b/buisnesslogic/src/main/java/com/plannaplan/entities/Lecturer.java
index 61d5e9a..68501cd 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/entities/Lecturer.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/entities/Lecturer.java
@@ -14,9 +14,6 @@ public class Lecturer {
private String name;
private String surname;
- public Lecturer() {
- }
-
public String getTitle() {
return title;
}
@@ -41,4 +38,18 @@ public class Lecturer {
this.title = title;
}
+ public Lecturer(String title, String name, String surname) {
+ this.title = title;
+ this.name = name;
+ this.surname = surname;
+ }
+
+ public Lecturer() {
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s %s %s", this.title, this.name, this.surname);
+ }
+
}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/models/ConfigData.java b/buisnesslogic/src/main/java/com/plannaplan/models/ConfigData.java
index 15be230..724e96d 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/models/ConfigData.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/models/ConfigData.java
@@ -1,21 +1,21 @@
package com.plannaplan.models;
-import java.io.File;
import java.util.Date;
+import java.io.InputStream;
public class ConfigData {
private Date start;
private Date end;
- private File file;
+ private InputStream filestream;
- public ConfigData(Date start, Date end, File file) {
+ public ConfigData(Date start, Date end, InputStream filestream) {
this.start = start;
this.end = end;
- this.file = file;
+ this.filestream = filestream;
}
- public File getFile() {
- return file;
+ public InputStream getFilestream() {
+ return filestream;
}
public Date getEnd() {
diff --git a/buisnesslogic/src/main/java/com/plannaplan/models/FileData.java b/buisnesslogic/src/main/java/com/plannaplan/models/FileData.java
new file mode 100644
index 0000000..a058206
--- /dev/null
+++ b/buisnesslogic/src/main/java/com/plannaplan/models/FileData.java
@@ -0,0 +1,39 @@
+package com.plannaplan.models;
+
+import java.util.Dictionary;
+import java.util.Iterator;
+
+import org.apache.poi.ss.usermodel.Row;
+
+public class FileData {
+
+ private Dictionary keys;
+ private Iterator rows;
+
+ public FileData(Dictionary keys, Iterator rows) {
+ this.setKeys(keys);
+ this.setRows(rows);
+ }
+
+ public Iterator getRows() {
+ return rows;
+ }
+
+ public void setRows(Iterator rows) {
+ this.rows = rows;
+ }
+
+ public Dictionary getKeys() {
+ return keys;
+ }
+
+ public void setKeys(Dictionary keys) {
+ this.keys = keys;
+ }
+
+ public int getIndexOf(String key) {
+ int index = this.keys.get(key);
+ return index;
+ }
+
+}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/repositories/CourseRepository.java b/buisnesslogic/src/main/java/com/plannaplan/repositories/CourseRepository.java
index df838d2..55227a1 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/repositories/CourseRepository.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/repositories/CourseRepository.java
@@ -3,9 +3,12 @@ package com.plannaplan.repositories;
import com.plannaplan.entities.Course;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
@Repository
public interface CourseRepository extends JpaRepository {
-
+ @Query(value = "SELECT * FROM course WHERE name = :name", nativeQuery = true)
+ Course findByName(@Param("name") String name);
}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/repositories/GroupRepository.java b/buisnesslogic/src/main/java/com/plannaplan/repositories/GroupRepository.java
index 060685f..08e607d 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/repositories/GroupRepository.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/repositories/GroupRepository.java
@@ -1,11 +1,20 @@
package com.plannaplan.repositories;
+import java.util.List;
+
import com.plannaplan.entities.Groups;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
@Repository
public interface GroupRepository extends JpaRepository {
+ @Query(value = "SELECT * FROM groups WHERE time = :time AND room = :room AND capacity = :capacity ", nativeQuery = true)
+ Groups find(@Param("time") int time, @Param("room") String room, @Param("capacity") int capacity);
+
+ @Query(value = "SELECT * FROM groups WHERE course_id = :id", nativeQuery = true)
+ List getByCourse(@Param("id") Long id);
}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/repositories/LecturerRepository.java b/buisnesslogic/src/main/java/com/plannaplan/repositories/LecturerRepository.java
index 1651bdb..7f0516b 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/repositories/LecturerRepository.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/repositories/LecturerRepository.java
@@ -3,10 +3,12 @@ package com.plannaplan.repositories;
import com.plannaplan.entities.Lecturer;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
@Repository
-
public interface LecturerRepository extends JpaRepository {
-
+ @Query(value = "SELECT * FROM lecturer WHERE name = :name AND surname = :surname AND title = :title ", nativeQuery = true)
+ Lecturer find(@Param("title") String title, @Param("name") String name, @Param("surname") String surname);
}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/services/CourseService.java b/buisnesslogic/src/main/java/com/plannaplan/services/CourseService.java
index 008519b..e5933cc 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/services/CourseService.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/services/CourseService.java
@@ -1,5 +1,8 @@
package com.plannaplan.services;
+import java.util.List;
+
+import com.plannaplan.entities.Course;
import com.plannaplan.repositories.CourseRepository;
import org.springframework.beans.factory.annotation.Autowired;
@@ -9,4 +12,16 @@ import org.springframework.stereotype.Service;
public class CourseService {
@Autowired
private CourseRepository repo;
+
+ public Course getCourseByName(String name) {
+ return this.repo.findByName(name);
+ }
+
+ public List getAllCourses() {
+ return this.repo.findAll();
+ }
+
+ public void save(Course course) {
+ this.repo.save(course);
+ }
}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/services/GroupService.java b/buisnesslogic/src/main/java/com/plannaplan/services/GroupService.java
index 5c61643..dee884b 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/services/GroupService.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/services/GroupService.java
@@ -1,5 +1,8 @@
package com.plannaplan.services;
+import java.util.List;
+
+import com.plannaplan.entities.Groups;
import com.plannaplan.repositories.GroupRepository;
import org.springframework.beans.factory.annotation.Autowired;
@@ -9,4 +12,19 @@ import org.springframework.stereotype.Service;
public class GroupService {
@Autowired
private GroupRepository repo;
+
+ public GroupService() {
+ }
+
+ public Groups find(int time, int capacity, String room) {
+ return this.repo.find(time, room, capacity);
+ }
+
+ public List getGroupsByCourse(Long id) {
+ return this.repo.getByCourse(id);
+ }
+
+ public void save(Groups group) {
+ this.repo.save(group);
+ }
}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/services/LecturerService.java b/buisnesslogic/src/main/java/com/plannaplan/services/LecturerService.java
index 306ff1e..2eb1415 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/services/LecturerService.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/services/LecturerService.java
@@ -1,5 +1,6 @@
package com.plannaplan.services;
+import com.plannaplan.entities.Lecturer;
import com.plannaplan.repositories.LecturerRepository;
import org.springframework.beans.factory.annotation.Autowired;
@@ -9,4 +10,12 @@ import org.springframework.stereotype.Service;
public class LecturerService {
@Autowired
private LecturerRepository repo;
+
+ public Lecturer getLecturer(String title, String name, String surname) {
+ return repo.find(title, name, surname);
+ }
+
+ public void save(Lecturer lecturer) {
+ repo.save(lecturer);
+ }
}
\ No newline at end of file
diff --git a/buisnesslogic/src/main/java/com/plannaplan/types/WeekDay.java b/buisnesslogic/src/main/java/com/plannaplan/types/WeekDay.java
index bee55b2..2db8277 100644
--- a/buisnesslogic/src/main/java/com/plannaplan/types/WeekDay.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/types/WeekDay.java
@@ -8,4 +8,13 @@ public enum WeekDay {
private WeekDay(int label) {
this.label = label;
}
+
+ public static WeekDay getDay(int index) {
+ for (WeekDay d : values()) {
+ if (d.label == index) {
+ return d;
+ }
+ }
+ return null;
+ }
}
\ No newline at end of file
diff --git a/buisnesslogic/src/test/java/com/plannaplan/configutils/FileReaderTest.java b/buisnesslogic/src/test/java/com/plannaplan/configutils/FileReaderTest.java
new file mode 100644
index 0000000..f293f74
--- /dev/null
+++ b/buisnesslogic/src/test/java/com/plannaplan/configutils/FileReaderTest.java
@@ -0,0 +1,21 @@
+package com.plannaplan.configutils;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.InputStream;
+
+import com.plannaplan.models.FileData;
+
+import org.junit.Test;
+
+public class FileReaderTest {
+ @Test
+ public void shoulReturnNull() {
+ InputStream inputStream = getClass().getClassLoader().getResourceAsStream("Zajecia.xlsx");
+ FileReader r = new FileReader(inputStream);
+ FileData d = r.read();
+ assertTrue(d.getRows().next().getCell(0).toString().equals("1.0"));
+ assertTrue(d.getKeys().size() == 22);
+ assertTrue(d != null);
+ }
+}
\ No newline at end of file
diff --git a/buisnesslogic/src/test/java/com/plannaplan/configutils/FileToDatabaseMigratorTest.java b/buisnesslogic/src/test/java/com/plannaplan/configutils/FileToDatabaseMigratorTest.java
new file mode 100644
index 0000000..36afe31
--- /dev/null
+++ b/buisnesslogic/src/test/java/com/plannaplan/configutils/FileToDatabaseMigratorTest.java
@@ -0,0 +1,19 @@
+package com.plannaplan.configutils;
+
+import java.io.InputStream;
+
+import com.plannaplan.models.FileData;
+
+import org.junit.Test;
+
+public class FileToDatabaseMigratorTest {
+ @Test
+ public void shouldInsertToDatabase() {
+ // FileToDatabaseMigrator migrator = new FileToDatabaseMigrator();
+ // InputStream inputStream =
+ // getClass().getClassLoader().getResourceAsStream("Zajecia.xlsx");
+ // FileReader r = new FileReader(inputStream);
+ // FileData d = r.read();
+ // migrator.migrate(d);
+ }
+}
\ No newline at end of file
diff --git a/buisnesslogic/src/test/resources/Zajecia.xlsx b/buisnesslogic/src/test/resources/Zajecia.xlsx
new file mode 100644
index 0000000..57c8e9c
Binary files /dev/null and b/buisnesslogic/src/test/resources/Zajecia.xlsx differ
diff --git a/buisnesslogic/src/test/resources/application.properties b/buisnesslogic/src/test/resources/application.properties
index 0a4a0a2..bd77a4e 100644
--- a/buisnesslogic/src/test/resources/application.properties
+++ b/buisnesslogic/src/test/resources/application.properties
@@ -1,6 +1,10 @@
spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
-spring.datasource.url=jdbc:mysql://172.20.0.2:3306/test
+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
+
+server.port=1285
\ No newline at end of file
diff --git a/docs/api.md b/docs/api.md
new file mode 100644
index 0000000..30c31b6
--- /dev/null
+++ b/docs/api.md
@@ -0,0 +1,56 @@
+# Dokumetacja API
+
+| Api | Zadania tej klasy |
+| ---------------------------------------------- | ---------------------------------------------------------------- |
+| [/config](#config) | Załadowanie konfiguracji startowej do aplikacji PlanNaPlan |
+| [/getCoursesWithGroups](#getCoursesWithGroups) | Zwrócenie wszytskich kursów (ćwiczenia, wykłady) razem z grupami |
+| [/getCourseGroups](#getCourseGroups) | Zwrócenie grup dla danego kursu |
+
+## config
+
+Source code: [link](../restservice/src/main/java/com/plannaplan/controllers/ConfigController.java)
+
+```
+POST /config
+```
+
+#### Description
+
+Endpoint konfigurujacy caly system i importujacy dane do bazy.
+
+#### Parameters
+
+| Type | Name | Consumes | Description | Type |
+| ---- | ----------------------- | ------------------- | ------------------------------- | ---- |
+| Body | **file** required | multipart/form-data | Plik .xlsx z potrzebnymi danymi | file |
+
+## getCoursesWithGroups
+
+Source code: [link](../restservice/src/main/java/com/plannaplan/controllers/getCoursesWithGroups.java)
+
+```
+GET /getCoursesWithGroups
+```
+
+#### Description
+
+Zwraca wszystkie dostepne kursy wraz z lista grup dla poszczegolnych kursow.
+
+## getCourseGroups
+
+Source code: [link](../restservice/src/main/java/com/plannaplan/controllers/GroupController.java)
+
+```
+GET /getCourseGroups
+```
+
+#### Description
+
+Endpoint konfigurujacy caly system i importujacy dane do bazy.
+
+#### Parameters
+
+| Type | Name | Consumes | Description | Type |
+| ----------- | --------------------- | -------- | ----------------------------------------- | ---- |
+| Query Param | **id** required | - | id kursu dla ktorego chcemy zwrocic grupy | int |
+| Query Param | **capacity** |