From 430e8c9e7d34df45a4be2d4585a50c83d049f675 Mon Sep 17 00:00:00 2001 From: Filip Izydorczyk Date: Tue, 4 Aug 2020 18:15:00 +0200 Subject: [PATCH] Checkpoint config --- .../plannaplan/configutils/FileToDatabaseMigrator.java | 10 ++++++---- .../plannaplan/repositories/LecturerRepository.java | 5 ++++- .../java/com/plannaplan/services/LecturerService.java | 4 ++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java index d2d00b0..8276817 100644 --- a/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java +++ b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java @@ -29,7 +29,7 @@ public class FileToDatabaseMigrator { while (rows.hasNext()) { Row row = rows.next(); - + Cell title_cell = row.getCell(title_index); Cell name_cell = row.getCell(name_index); Cell surname_cell = row.getCell(surname_index); @@ -48,9 +48,11 @@ public class FileToDatabaseMigrator { lecturer_surname = surname_cell.toString(); } - Lecturer newLecturer = new Lecturer(lecturer_title, lecturer_name, lecturer_surname); - lecturerService.save(newLecturer); - + if (lecturerService.getLecturer(lecturer_title, lecturer_name, lecturer_surname) == null) { + Lecturer newLecturer = new Lecturer(lecturer_title, lecturer_name, lecturer_surname); + lecturerService.save(newLecturer); + } + } } diff --git a/buisnesslogic/src/main/java/com/plannaplan/repositories/LecturerRepository.java b/buisnesslogic/src/main/java/com/plannaplan/repositories/LecturerRepository.java index 9a9e02c..7f0516b 100644 --- a/buisnesslogic/src/main/java/com/plannaplan/repositories/LecturerRepository.java +++ b/buisnesslogic/src/main/java/com/plannaplan/repositories/LecturerRepository.java @@ -3,9 +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/LecturerService.java b/buisnesslogic/src/main/java/com/plannaplan/services/LecturerService.java index 7706d85..2eb1415 100644 --- a/buisnesslogic/src/main/java/com/plannaplan/services/LecturerService.java +++ b/buisnesslogic/src/main/java/com/plannaplan/services/LecturerService.java @@ -11,6 +11,10 @@ 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); }