diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/.gitignore b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/.gitignore new file mode 100644 index 00000000..e62c33c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml + +target/ diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/pom.xml b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/pom.xml new file mode 100644 index 00000000..e967e902 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + ru.otus + jpql-exercise + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + + 11 + 11 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.h2database + h2 + runtime + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java new file mode 100644 index 00000000..8d4b413c --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java @@ -0,0 +1,13 @@ +package ru.otus.example.ormdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class OrmDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(OrmDemoApplication.class, args); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/Avatar.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/Avatar.java new file mode 100644 index 00000000..e54749c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/Avatar.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "avatars") +public class Avatar { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "photo_url", nullable = false, unique = true) + private String photoUrl; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/Course.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/Course.java new file mode 100644 index 00000000..cfb3c968 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/Course.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "courses") +public class Course { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "name", nullable = false, unique = true) + private String name; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/EMail.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/EMail.java new file mode 100644 index 00000000..7e2d6dde --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/EMail.java @@ -0,0 +1,22 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "emails") +public class EMail { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "email", nullable = false, unique = true) + private String email; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java new file mode 100644 index 00000000..f3822503 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java @@ -0,0 +1,39 @@ +package ru.otus.example.ormdemo.models; + +import lombok.*; + +import javax.persistence.*; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity // Указывает, что данный класс является сущностью +@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность +public class OtusStudent { + @Id // Позволяет указать какое поле является идентификатором + @GeneratedValue(strategy = GenerationType.IDENTITY) // Стратегия генерации идентификаторов + private long id; + + // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности + @Column(name = "name", nullable = false, unique = true) + private String name; + + // Указывает на связь между таблицами "один к одному" + @OneToOne(targetEntity = Avatar.class, cascade = CascadeType.ALL) + // Задает поле, по которому происходит объединение с таблицей для хранения связанной сущности + @JoinColumn(name = "avatar_id") + private Avatar avatar; + + // Указывает на связь между таблицами "один ко многим" + @OneToMany(targetEntity = EMail.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @JoinColumn(name = "student_id") + private List emails; + + // Указывает на связь между таблицами "многие ко многим" + @ManyToMany(targetEntity = Course.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL) + // Задает таблицу связей между таблицами для хранения родительской и связанной сущностью + @JoinTable(name = "student_courses", joinColumns = @JoinColumn(name = "student_id"), + inverseJoinColumns = @JoinColumn(name = "course_id")) + private List courses; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java new file mode 100644 index 00000000..44cc6a58 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java @@ -0,0 +1,18 @@ +package ru.otus.example.ormdemo.repositories; + + +import ru.otus.example.ormdemo.models.OtusStudent; + +import java.util.List; +import java.util.Optional; + +public interface OtusStudentRepository { + OtusStudent save(OtusStudent student); + Optional findById(long id); + + List findAll(); + List findByName(String name); + + void updateNameById(long id, String name); + void deleteById(long id); +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java new file mode 100644 index 00000000..bcab757b --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java @@ -0,0 +1,58 @@ +package ru.otus.example.ormdemo.repositories; + +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; +import ru.otus.example.ormdemo.models.OtusStudent; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +// @Transactional должна стоять на методе сервиса. +// Причем, если метод не подразумевает изменения данных в БД то категорически желательно +// выставить у аннотации параметр readOnly в true. +// Но это только упражнение и транзакции мы пока не проходили. +// Поэтому, для упрощения, пока вешаем над классом репозитория +@Transactional +@Repository +public class OtusStudentRepositoryJpa implements OtusStudentRepository { + + @PersistenceContext + private final EntityManager em; + + public OtusStudentRepositoryJpa(EntityManager em) { + this.em = em; + } + + @Override + public OtusStudent save(OtusStudent student) { + return null; + } + + @Override + public Optional findById(long id) { + return Optional.empty(); + } + + @Override + public List findAll() { + return Collections.emptyList(); + } + + @Override + public List findByName(String name) { + return Collections.emptyList(); + } + + @Override + public void updateNameById(long id, String name) { + + } + + @Override + public void deleteById(long id) { + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/resources/application.yml new file mode 100644 index 00000000..8d633961 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + hibernate: + ddl-auto: none + + show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/resources/schema.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/resources/schema.sql new file mode 100644 index 00000000..43a684bb --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/main/resources/schema.sql @@ -0,0 +1,31 @@ +create table avatars( + id bigserial, + photo_url varchar(8000), + primary key (id) +); + +create table courses( + id bigserial, + name varchar(255), + primary key (id) +); + +create table otus_students( + id bigserial, + name varchar(255), + avatar_id bigint references avatars (id), + primary key (id) +); + +create table emails( + id bigserial, + student_id bigint references otus_students(id) on delete cascade, + email varchar(255), + primary key (id) +); + +create table student_courses( + student_id bigint references otus_students(id) on delete cascade, + course_id bigint references courses(id), + primary key (student_id, course_id) +); \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java new file mode 100644 index 00000000..acbc6261 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java @@ -0,0 +1,126 @@ +package ru.otus.example.ormdemo.repositories; + +import lombok.val; +import org.hibernate.SessionFactory; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.context.annotation.Import; +import ru.otus.example.ormdemo.models.OtusStudent; +import ru.otus.example.ormdemo.models.Avatar; +import ru.otus.example.ormdemo.models.Course; +import ru.otus.example.ormdemo.models.EMail; + +import java.util.Collections; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +@DisplayName("Репозиторий на основе Jpa для работы со студентами ") +@DataJpaTest +@Import(OtusStudentRepositoryJpa.class) +class OtusStudentRepositoryJpaTest { + + private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; + private static final long FIRST_STUDENT_ID = 1L; + private static final String FIRST_STUDENT_NAME = "student_01"; + + private static final int EXPECTED_QUERIES_COUNT = 31; + + private static final String STUDENT_AVATAR_URL = "где-то там"; + private static final String STUDENT_EMAIL = "any@mail.com"; + private static final String COURSE_NAME = "Spring"; + private static final String STUDENT_NAME = "Вася"; + + @Autowired + private OtusStudentRepositoryJpa repositoryJpa; + + @Autowired + private TestEntityManager em; + + @DisplayName(" должен загружать информацию о нужном студенте по его id") + @Test + void shouldFindExpectedStudentById() { + val optionalActualStudent = repositoryJpa.findById(FIRST_STUDENT_ID); + val expectedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(optionalActualStudent).isPresent().get() + .usingRecursiveComparison().isEqualTo(expectedStudent); + } + + @DisplayName("должен загружать список всех студентов с полной информацией о них") + @Test + void shouldReturnCorrectStudentsListWithAllInfo() { + SessionFactory sessionFactory = em.getEntityManager().getEntityManagerFactory() + .unwrap(SessionFactory.class); + sessionFactory.getStatistics().setStatisticsEnabled(true); + + + System.out.println("\n\n\n\n----------------------------------------------------------------------------------------------------------"); + val students = repositoryJpa.findAll(); + assertThat(students).isNotNull().hasSize(EXPECTED_NUMBER_OF_STUDENTS) + .allMatch(s -> !s.getName().equals("")) + .allMatch(s -> s.getCourses() != null && s.getCourses().size() > 0) + .allMatch(s -> s.getAvatar() != null) + .allMatch(s -> s.getEmails() != null && s.getEmails().size() > 0); + System.out.println("----------------------------------------------------------------------------------------------------------\n\n\n\n"); + assertThat(sessionFactory.getStatistics().getPrepareStatementCount()).isEqualTo(EXPECTED_QUERIES_COUNT); + } + + @DisplayName(" должен корректно сохранять всю информацию о студенте") + @Test + void shouldSaveAllStudentInfo() { + val avatar = new Avatar(0, STUDENT_AVATAR_URL); + val email = new EMail(0, STUDENT_EMAIL); + val emails = Collections.singletonList(email); + + val course = new Course(0, COURSE_NAME); + val courses = Collections.singletonList(course); + + + val vasya = new OtusStudent(0, STUDENT_NAME, avatar, emails, courses); + repositoryJpa.save(vasya); + assertThat(vasya.getId()).isGreaterThan(0); + + val actualStudent = em.find(OtusStudent.class, vasya.getId()); + assertThat(actualStudent).isNotNull().matches(s -> !s.getName().equals("")) + .matches(s -> s.getCourses() != null && s.getCourses().size() > 0 && s.getCourses().get(0).getId() > 0) + .matches(s -> s.getAvatar() != null) + .matches(s -> s.getEmails() != null && s.getEmails().size() > 0); + } + + @DisplayName(" должен загружать информацию о нужном студенте по его имени") + @Test + void shouldFindExpectedStudentByName() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + List students = repositoryJpa.findByName(FIRST_STUDENT_NAME); + assertThat(students).containsOnlyOnce(firstStudent); + } + + @DisplayName(" должен изменять имя заданного студента по его id") + @Test + void shouldUpdateStudentNameById() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + String oldName = firstStudent.getName(); + em.detach(firstStudent); + + repositoryJpa.updateNameById(FIRST_STUDENT_ID, STUDENT_NAME); + val updatedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + + assertThat(updatedStudent.getName()).isNotEqualTo(oldName).isEqualTo(STUDENT_NAME); + } + + @DisplayName(" должен удалять заданного студента по его id") + @Test + void shouldDeleteStudentNameById() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(firstStudent).isNotNull(); + em.detach(firstStudent); + + repositoryJpa.deleteById(FIRST_STUDENT_ID); + val deletedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + + assertThat(deletedStudent).isNull(); + } +} \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/test/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/test/resources/application.yml new file mode 100644 index 00000000..d2b811a4 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/test/resources/application.yml @@ -0,0 +1,17 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + #generate-ddl: true + hibernate: + ddl-auto: none + #ddl-auto: create-drop + + #show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/test/resources/data.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/test/resources/data.sql new file mode 100644 index 00000000..a8db6b85 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-exercise/src/test/resources/data.sql @@ -0,0 +1,29 @@ +insert into avatars(photo_url) +values ('photoUrl_01'), ('photoUrl_02'), ('photoUrl_03'), ('photoUrl_04'), ('photoUrl_05'), + ('photoUrl_06'), ('photoUrl_07'), ('photoUrl_08'), ('photoUrl_09'), ('photoUrl_10'); + +insert into courses(name) +values ('course_name_01'), ('course_name_02'), ('course_name_03'), ('course_name_04'), ('course_name_05'), + ('course_name_06'), ('course_name_07'), ('course_name_08'), ('course_name_09'), ('course_name_10'), ('not_used_11'); + +insert into otus_students(name, avatar_id) +values ('student_01', 1), ('student_02', 2), ('student_03', 3), ('student_04', 4), ('student_05', 5), + ('student_06', 6), ('student_07', 7), ('student_08', 8), ('student_09', 9), ('student_10', 10); + + +insert into emails(email, student_id) +values ('email_01', 1), ('email_02', 1), ('email_03', 2), ('email_04', 2), ('email_05', 3), ('email_06', 4), + ('email_07', 5), ('email_08', 6), ('email_09', 7), ('email_10', 8), ('email_11', 9), ('email_12', 10); + + +insert into student_courses(student_id, course_id) +values (1, 1), (1, 2), (1, 3), + (2, 2), (2, 4), (2, 5), + (3, 3), (3, 6), (3, 7), + (4, 4), (4, 8), (4, 9), + (5, 5), (5, 10), (5, 1), + (6, 6), (6, 2), (6, 3), + (7, 7), (7, 4), (7, 5), + (8, 8), (8, 6), (8, 7), + (9, 9), (9, 8), (9, 10), + (10, 10), (10, 1), (10, 2); diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/.gitignore b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/.gitignore new file mode 100644 index 00000000..e62c33c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml + +target/ diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/pom.xml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/pom.xml new file mode 100644 index 00000000..f5d27a55 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + ru.otus + jpql-solution-01 + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + + 11 + 11 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.h2database + h2 + runtime + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java new file mode 100644 index 00000000..8d4b413c --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java @@ -0,0 +1,13 @@ +package ru.otus.example.ormdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class OrmDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(OrmDemoApplication.class, args); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/Avatar.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/Avatar.java new file mode 100644 index 00000000..e54749c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/Avatar.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "avatars") +public class Avatar { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "photo_url", nullable = false, unique = true) + private String photoUrl; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/Course.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/Course.java new file mode 100644 index 00000000..cfb3c968 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/Course.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "courses") +public class Course { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "name", nullable = false, unique = true) + private String name; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/EMail.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/EMail.java new file mode 100644 index 00000000..7e2d6dde --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/EMail.java @@ -0,0 +1,22 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "emails") +public class EMail { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "email", nullable = false, unique = true) + private String email; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java new file mode 100644 index 00000000..f3822503 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java @@ -0,0 +1,39 @@ +package ru.otus.example.ormdemo.models; + +import lombok.*; + +import javax.persistence.*; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity // Указывает, что данный класс является сущностью +@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность +public class OtusStudent { + @Id // Позволяет указать какое поле является идентификатором + @GeneratedValue(strategy = GenerationType.IDENTITY) // Стратегия генерации идентификаторов + private long id; + + // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности + @Column(name = "name", nullable = false, unique = true) + private String name; + + // Указывает на связь между таблицами "один к одному" + @OneToOne(targetEntity = Avatar.class, cascade = CascadeType.ALL) + // Задает поле, по которому происходит объединение с таблицей для хранения связанной сущности + @JoinColumn(name = "avatar_id") + private Avatar avatar; + + // Указывает на связь между таблицами "один ко многим" + @OneToMany(targetEntity = EMail.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @JoinColumn(name = "student_id") + private List emails; + + // Указывает на связь между таблицами "многие ко многим" + @ManyToMany(targetEntity = Course.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL) + // Задает таблицу связей между таблицами для хранения родительской и связанной сущностью + @JoinTable(name = "student_courses", joinColumns = @JoinColumn(name = "student_id"), + inverseJoinColumns = @JoinColumn(name = "course_id")) + private List courses; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java new file mode 100644 index 00000000..44cc6a58 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java @@ -0,0 +1,18 @@ +package ru.otus.example.ormdemo.repositories; + + +import ru.otus.example.ormdemo.models.OtusStudent; + +import java.util.List; +import java.util.Optional; + +public interface OtusStudentRepository { + OtusStudent save(OtusStudent student); + Optional findById(long id); + + List findAll(); + List findByName(String name); + + void updateNameById(long id, String name); + void deleteById(long id); +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java new file mode 100644 index 00000000..fc627eb2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java @@ -0,0 +1,64 @@ +package ru.otus.example.ormdemo.repositories; + +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; +import ru.otus.example.ormdemo.models.OtusStudent; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +// @Transactional должна стоять на методе сервиса. +// Причем, если метод не подразумевает изменения данных в БД то категорически желательно +// выставить у аннотации параметр readOnly в true. +// Но это только упражнение и транзакции мы пока не проходили. +// Поэтому, для упрощения, пока вешаем над классом репозитория +@Transactional +@Repository +public class OtusStudentRepositoryJpa implements OtusStudentRepository { + + @PersistenceContext + private final EntityManager em; + + public OtusStudentRepositoryJpa(EntityManager em) { + this.em = em; + } + + @Override + public OtusStudent save(OtusStudent student) { + if (student.getId() <= 0) { + em.persist(student); + return student; + } else { + return em.merge(student); + } + } + + @Override + public Optional findById(long id) { + return Optional.ofNullable(em.find(OtusStudent.class, id)); + } + + @Override + public List findAll() { + return Collections.emptyList(); + } + + @Override + public List findByName(String name) { + return Collections.emptyList(); + } + + @Override + public void updateNameById(long id, String name) { + + } + + @Override + public void deleteById(long id) { + + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/resources/application.yml new file mode 100644 index 00000000..8d633961 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + hibernate: + ddl-auto: none + + show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/resources/schema.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/resources/schema.sql new file mode 100644 index 00000000..43a684bb --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/main/resources/schema.sql @@ -0,0 +1,31 @@ +create table avatars( + id bigserial, + photo_url varchar(8000), + primary key (id) +); + +create table courses( + id bigserial, + name varchar(255), + primary key (id) +); + +create table otus_students( + id bigserial, + name varchar(255), + avatar_id bigint references avatars (id), + primary key (id) +); + +create table emails( + id bigserial, + student_id bigint references otus_students(id) on delete cascade, + email varchar(255), + primary key (id) +); + +create table student_courses( + student_id bigint references otus_students(id) on delete cascade, + course_id bigint references courses(id), + primary key (student_id, course_id) +); \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java new file mode 100644 index 00000000..acbc6261 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java @@ -0,0 +1,126 @@ +package ru.otus.example.ormdemo.repositories; + +import lombok.val; +import org.hibernate.SessionFactory; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.context.annotation.Import; +import ru.otus.example.ormdemo.models.OtusStudent; +import ru.otus.example.ormdemo.models.Avatar; +import ru.otus.example.ormdemo.models.Course; +import ru.otus.example.ormdemo.models.EMail; + +import java.util.Collections; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +@DisplayName("Репозиторий на основе Jpa для работы со студентами ") +@DataJpaTest +@Import(OtusStudentRepositoryJpa.class) +class OtusStudentRepositoryJpaTest { + + private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; + private static final long FIRST_STUDENT_ID = 1L; + private static final String FIRST_STUDENT_NAME = "student_01"; + + private static final int EXPECTED_QUERIES_COUNT = 31; + + private static final String STUDENT_AVATAR_URL = "где-то там"; + private static final String STUDENT_EMAIL = "any@mail.com"; + private static final String COURSE_NAME = "Spring"; + private static final String STUDENT_NAME = "Вася"; + + @Autowired + private OtusStudentRepositoryJpa repositoryJpa; + + @Autowired + private TestEntityManager em; + + @DisplayName(" должен загружать информацию о нужном студенте по его id") + @Test + void shouldFindExpectedStudentById() { + val optionalActualStudent = repositoryJpa.findById(FIRST_STUDENT_ID); + val expectedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(optionalActualStudent).isPresent().get() + .usingRecursiveComparison().isEqualTo(expectedStudent); + } + + @DisplayName("должен загружать список всех студентов с полной информацией о них") + @Test + void shouldReturnCorrectStudentsListWithAllInfo() { + SessionFactory sessionFactory = em.getEntityManager().getEntityManagerFactory() + .unwrap(SessionFactory.class); + sessionFactory.getStatistics().setStatisticsEnabled(true); + + + System.out.println("\n\n\n\n----------------------------------------------------------------------------------------------------------"); + val students = repositoryJpa.findAll(); + assertThat(students).isNotNull().hasSize(EXPECTED_NUMBER_OF_STUDENTS) + .allMatch(s -> !s.getName().equals("")) + .allMatch(s -> s.getCourses() != null && s.getCourses().size() > 0) + .allMatch(s -> s.getAvatar() != null) + .allMatch(s -> s.getEmails() != null && s.getEmails().size() > 0); + System.out.println("----------------------------------------------------------------------------------------------------------\n\n\n\n"); + assertThat(sessionFactory.getStatistics().getPrepareStatementCount()).isEqualTo(EXPECTED_QUERIES_COUNT); + } + + @DisplayName(" должен корректно сохранять всю информацию о студенте") + @Test + void shouldSaveAllStudentInfo() { + val avatar = new Avatar(0, STUDENT_AVATAR_URL); + val email = new EMail(0, STUDENT_EMAIL); + val emails = Collections.singletonList(email); + + val course = new Course(0, COURSE_NAME); + val courses = Collections.singletonList(course); + + + val vasya = new OtusStudent(0, STUDENT_NAME, avatar, emails, courses); + repositoryJpa.save(vasya); + assertThat(vasya.getId()).isGreaterThan(0); + + val actualStudent = em.find(OtusStudent.class, vasya.getId()); + assertThat(actualStudent).isNotNull().matches(s -> !s.getName().equals("")) + .matches(s -> s.getCourses() != null && s.getCourses().size() > 0 && s.getCourses().get(0).getId() > 0) + .matches(s -> s.getAvatar() != null) + .matches(s -> s.getEmails() != null && s.getEmails().size() > 0); + } + + @DisplayName(" должен загружать информацию о нужном студенте по его имени") + @Test + void shouldFindExpectedStudentByName() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + List students = repositoryJpa.findByName(FIRST_STUDENT_NAME); + assertThat(students).containsOnlyOnce(firstStudent); + } + + @DisplayName(" должен изменять имя заданного студента по его id") + @Test + void shouldUpdateStudentNameById() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + String oldName = firstStudent.getName(); + em.detach(firstStudent); + + repositoryJpa.updateNameById(FIRST_STUDENT_ID, STUDENT_NAME); + val updatedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + + assertThat(updatedStudent.getName()).isNotEqualTo(oldName).isEqualTo(STUDENT_NAME); + } + + @DisplayName(" должен удалять заданного студента по его id") + @Test + void shouldDeleteStudentNameById() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(firstStudent).isNotNull(); + em.detach(firstStudent); + + repositoryJpa.deleteById(FIRST_STUDENT_ID); + val deletedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + + assertThat(deletedStudent).isNull(); + } +} \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/test/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/test/resources/application.yml new file mode 100644 index 00000000..d2b811a4 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/test/resources/application.yml @@ -0,0 +1,17 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + #generate-ddl: true + hibernate: + ddl-auto: none + #ddl-auto: create-drop + + #show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/test/resources/data.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/test/resources/data.sql new file mode 100644 index 00000000..a8db6b85 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-01/src/test/resources/data.sql @@ -0,0 +1,29 @@ +insert into avatars(photo_url) +values ('photoUrl_01'), ('photoUrl_02'), ('photoUrl_03'), ('photoUrl_04'), ('photoUrl_05'), + ('photoUrl_06'), ('photoUrl_07'), ('photoUrl_08'), ('photoUrl_09'), ('photoUrl_10'); + +insert into courses(name) +values ('course_name_01'), ('course_name_02'), ('course_name_03'), ('course_name_04'), ('course_name_05'), + ('course_name_06'), ('course_name_07'), ('course_name_08'), ('course_name_09'), ('course_name_10'), ('not_used_11'); + +insert into otus_students(name, avatar_id) +values ('student_01', 1), ('student_02', 2), ('student_03', 3), ('student_04', 4), ('student_05', 5), + ('student_06', 6), ('student_07', 7), ('student_08', 8), ('student_09', 9), ('student_10', 10); + + +insert into emails(email, student_id) +values ('email_01', 1), ('email_02', 1), ('email_03', 2), ('email_04', 2), ('email_05', 3), ('email_06', 4), + ('email_07', 5), ('email_08', 6), ('email_09', 7), ('email_10', 8), ('email_11', 9), ('email_12', 10); + + +insert into student_courses(student_id, course_id) +values (1, 1), (1, 2), (1, 3), + (2, 2), (2, 4), (2, 5), + (3, 3), (3, 6), (3, 7), + (4, 4), (4, 8), (4, 9), + (5, 5), (5, 10), (5, 1), + (6, 6), (6, 2), (6, 3), + (7, 7), (7, 4), (7, 5), + (8, 8), (8, 6), (8, 7), + (9, 9), (9, 8), (9, 10), + (10, 10), (10, 1), (10, 2); diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/.gitignore b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/.gitignore new file mode 100644 index 00000000..e62c33c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml + +target/ diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/pom.xml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/pom.xml new file mode 100644 index 00000000..eebefd9a --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + ru.otus + jpql-solution-02 + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + + 11 + 11 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.h2database + h2 + runtime + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java new file mode 100644 index 00000000..8d4b413c --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java @@ -0,0 +1,13 @@ +package ru.otus.example.ormdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class OrmDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(OrmDemoApplication.class, args); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/Avatar.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/Avatar.java new file mode 100644 index 00000000..e54749c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/Avatar.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "avatars") +public class Avatar { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "photo_url", nullable = false, unique = true) + private String photoUrl; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/Course.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/Course.java new file mode 100644 index 00000000..cfb3c968 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/Course.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "courses") +public class Course { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "name", nullable = false, unique = true) + private String name; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/EMail.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/EMail.java new file mode 100644 index 00000000..7e2d6dde --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/EMail.java @@ -0,0 +1,22 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "emails") +public class EMail { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "email", nullable = false, unique = true) + private String email; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java new file mode 100644 index 00000000..f3822503 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java @@ -0,0 +1,39 @@ +package ru.otus.example.ormdemo.models; + +import lombok.*; + +import javax.persistence.*; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity // Указывает, что данный класс является сущностью +@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность +public class OtusStudent { + @Id // Позволяет указать какое поле является идентификатором + @GeneratedValue(strategy = GenerationType.IDENTITY) // Стратегия генерации идентификаторов + private long id; + + // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности + @Column(name = "name", nullable = false, unique = true) + private String name; + + // Указывает на связь между таблицами "один к одному" + @OneToOne(targetEntity = Avatar.class, cascade = CascadeType.ALL) + // Задает поле, по которому происходит объединение с таблицей для хранения связанной сущности + @JoinColumn(name = "avatar_id") + private Avatar avatar; + + // Указывает на связь между таблицами "один ко многим" + @OneToMany(targetEntity = EMail.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @JoinColumn(name = "student_id") + private List emails; + + // Указывает на связь между таблицами "многие ко многим" + @ManyToMany(targetEntity = Course.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL) + // Задает таблицу связей между таблицами для хранения родительской и связанной сущностью + @JoinTable(name = "student_courses", joinColumns = @JoinColumn(name = "student_id"), + inverseJoinColumns = @JoinColumn(name = "course_id")) + private List courses; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java new file mode 100644 index 00000000..44cc6a58 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java @@ -0,0 +1,18 @@ +package ru.otus.example.ormdemo.repositories; + + +import ru.otus.example.ormdemo.models.OtusStudent; + +import java.util.List; +import java.util.Optional; + +public interface OtusStudentRepository { + OtusStudent save(OtusStudent student); + Optional findById(long id); + + List findAll(); + List findByName(String name); + + void updateNameById(long id, String name); + void deleteById(long id); +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java new file mode 100644 index 00000000..2d00e72d --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java @@ -0,0 +1,70 @@ +package ru.otus.example.ormdemo.repositories; + +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; +import ru.otus.example.ormdemo.models.OtusStudent; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.TypedQuery; +import java.util.List; +import java.util.Optional; + +// @Transactional должна стоять на методе сервиса. +// Причем, если метод не подразумевает изменения данных в БД то категорически желательно +// выставить у аннотации параметр readOnly в true. +// Но это только упражнение и транзакции мы пока не проходили. +// Поэтому, для упрощения, пока вешаем над классом репозитория +@Transactional +@Repository +public class OtusStudentRepositoryJpa implements OtusStudentRepository { + + @PersistenceContext + private final EntityManager em; + + public OtusStudentRepositoryJpa(EntityManager em) { + this.em = em; + } + + @Override + public OtusStudent save(OtusStudent student) { + if (student.getId() <= 0) { + em.persist(student); + return student; + } else { + return em.merge(student); + } + } + + @Override + public Optional findById(long id) { + return Optional.ofNullable(em.find(OtusStudent.class, id)); + } + + @Override + public List findAll() { + return em.createQuery("select s from OtusStudent s", OtusStudent.class) + .getResultList(); + } + + @Override + public List findByName(String name) { + TypedQuery query = em.createQuery("select s " + + "from OtusStudent s " + + "where s.name = :name", + OtusStudent.class); + query.setParameter("name", name); + return query.getResultList(); + } + + @Override + public void updateNameById(long id, String name) { + + } + + @Override + public void deleteById(long id) { + + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/resources/application.yml new file mode 100644 index 00000000..8d633961 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + hibernate: + ddl-auto: none + + show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/resources/schema.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/resources/schema.sql new file mode 100644 index 00000000..43a684bb --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/main/resources/schema.sql @@ -0,0 +1,31 @@ +create table avatars( + id bigserial, + photo_url varchar(8000), + primary key (id) +); + +create table courses( + id bigserial, + name varchar(255), + primary key (id) +); + +create table otus_students( + id bigserial, + name varchar(255), + avatar_id bigint references avatars (id), + primary key (id) +); + +create table emails( + id bigserial, + student_id bigint references otus_students(id) on delete cascade, + email varchar(255), + primary key (id) +); + +create table student_courses( + student_id bigint references otus_students(id) on delete cascade, + course_id bigint references courses(id), + primary key (student_id, course_id) +); \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java new file mode 100644 index 00000000..acbc6261 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java @@ -0,0 +1,126 @@ +package ru.otus.example.ormdemo.repositories; + +import lombok.val; +import org.hibernate.SessionFactory; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.context.annotation.Import; +import ru.otus.example.ormdemo.models.OtusStudent; +import ru.otus.example.ormdemo.models.Avatar; +import ru.otus.example.ormdemo.models.Course; +import ru.otus.example.ormdemo.models.EMail; + +import java.util.Collections; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +@DisplayName("Репозиторий на основе Jpa для работы со студентами ") +@DataJpaTest +@Import(OtusStudentRepositoryJpa.class) +class OtusStudentRepositoryJpaTest { + + private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; + private static final long FIRST_STUDENT_ID = 1L; + private static final String FIRST_STUDENT_NAME = "student_01"; + + private static final int EXPECTED_QUERIES_COUNT = 31; + + private static final String STUDENT_AVATAR_URL = "где-то там"; + private static final String STUDENT_EMAIL = "any@mail.com"; + private static final String COURSE_NAME = "Spring"; + private static final String STUDENT_NAME = "Вася"; + + @Autowired + private OtusStudentRepositoryJpa repositoryJpa; + + @Autowired + private TestEntityManager em; + + @DisplayName(" должен загружать информацию о нужном студенте по его id") + @Test + void shouldFindExpectedStudentById() { + val optionalActualStudent = repositoryJpa.findById(FIRST_STUDENT_ID); + val expectedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(optionalActualStudent).isPresent().get() + .usingRecursiveComparison().isEqualTo(expectedStudent); + } + + @DisplayName("должен загружать список всех студентов с полной информацией о них") + @Test + void shouldReturnCorrectStudentsListWithAllInfo() { + SessionFactory sessionFactory = em.getEntityManager().getEntityManagerFactory() + .unwrap(SessionFactory.class); + sessionFactory.getStatistics().setStatisticsEnabled(true); + + + System.out.println("\n\n\n\n----------------------------------------------------------------------------------------------------------"); + val students = repositoryJpa.findAll(); + assertThat(students).isNotNull().hasSize(EXPECTED_NUMBER_OF_STUDENTS) + .allMatch(s -> !s.getName().equals("")) + .allMatch(s -> s.getCourses() != null && s.getCourses().size() > 0) + .allMatch(s -> s.getAvatar() != null) + .allMatch(s -> s.getEmails() != null && s.getEmails().size() > 0); + System.out.println("----------------------------------------------------------------------------------------------------------\n\n\n\n"); + assertThat(sessionFactory.getStatistics().getPrepareStatementCount()).isEqualTo(EXPECTED_QUERIES_COUNT); + } + + @DisplayName(" должен корректно сохранять всю информацию о студенте") + @Test + void shouldSaveAllStudentInfo() { + val avatar = new Avatar(0, STUDENT_AVATAR_URL); + val email = new EMail(0, STUDENT_EMAIL); + val emails = Collections.singletonList(email); + + val course = new Course(0, COURSE_NAME); + val courses = Collections.singletonList(course); + + + val vasya = new OtusStudent(0, STUDENT_NAME, avatar, emails, courses); + repositoryJpa.save(vasya); + assertThat(vasya.getId()).isGreaterThan(0); + + val actualStudent = em.find(OtusStudent.class, vasya.getId()); + assertThat(actualStudent).isNotNull().matches(s -> !s.getName().equals("")) + .matches(s -> s.getCourses() != null && s.getCourses().size() > 0 && s.getCourses().get(0).getId() > 0) + .matches(s -> s.getAvatar() != null) + .matches(s -> s.getEmails() != null && s.getEmails().size() > 0); + } + + @DisplayName(" должен загружать информацию о нужном студенте по его имени") + @Test + void shouldFindExpectedStudentByName() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + List students = repositoryJpa.findByName(FIRST_STUDENT_NAME); + assertThat(students).containsOnlyOnce(firstStudent); + } + + @DisplayName(" должен изменять имя заданного студента по его id") + @Test + void shouldUpdateStudentNameById() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + String oldName = firstStudent.getName(); + em.detach(firstStudent); + + repositoryJpa.updateNameById(FIRST_STUDENT_ID, STUDENT_NAME); + val updatedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + + assertThat(updatedStudent.getName()).isNotEqualTo(oldName).isEqualTo(STUDENT_NAME); + } + + @DisplayName(" должен удалять заданного студента по его id") + @Test + void shouldDeleteStudentNameById() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(firstStudent).isNotNull(); + em.detach(firstStudent); + + repositoryJpa.deleteById(FIRST_STUDENT_ID); + val deletedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + + assertThat(deletedStudent).isNull(); + } +} \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/test/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/test/resources/application.yml new file mode 100644 index 00000000..d2b811a4 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/test/resources/application.yml @@ -0,0 +1,17 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + #generate-ddl: true + hibernate: + ddl-auto: none + #ddl-auto: create-drop + + #show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/test/resources/data.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/test/resources/data.sql new file mode 100644 index 00000000..a8db6b85 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-02/src/test/resources/data.sql @@ -0,0 +1,29 @@ +insert into avatars(photo_url) +values ('photoUrl_01'), ('photoUrl_02'), ('photoUrl_03'), ('photoUrl_04'), ('photoUrl_05'), + ('photoUrl_06'), ('photoUrl_07'), ('photoUrl_08'), ('photoUrl_09'), ('photoUrl_10'); + +insert into courses(name) +values ('course_name_01'), ('course_name_02'), ('course_name_03'), ('course_name_04'), ('course_name_05'), + ('course_name_06'), ('course_name_07'), ('course_name_08'), ('course_name_09'), ('course_name_10'), ('not_used_11'); + +insert into otus_students(name, avatar_id) +values ('student_01', 1), ('student_02', 2), ('student_03', 3), ('student_04', 4), ('student_05', 5), + ('student_06', 6), ('student_07', 7), ('student_08', 8), ('student_09', 9), ('student_10', 10); + + +insert into emails(email, student_id) +values ('email_01', 1), ('email_02', 1), ('email_03', 2), ('email_04', 2), ('email_05', 3), ('email_06', 4), + ('email_07', 5), ('email_08', 6), ('email_09', 7), ('email_10', 8), ('email_11', 9), ('email_12', 10); + + +insert into student_courses(student_id, course_id) +values (1, 1), (1, 2), (1, 3), + (2, 2), (2, 4), (2, 5), + (3, 3), (3, 6), (3, 7), + (4, 4), (4, 8), (4, 9), + (5, 5), (5, 10), (5, 1), + (6, 6), (6, 2), (6, 3), + (7, 7), (7, 4), (7, 5), + (8, 8), (8, 6), (8, 7), + (9, 9), (9, 8), (9, 10), + (10, 10), (10, 1), (10, 2); diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/.gitignore b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/.gitignore new file mode 100644 index 00000000..e62c33c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml + +target/ diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/pom.xml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/pom.xml new file mode 100644 index 00000000..33b2e712 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + ru.otus + jpql-solution-03 + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + + 11 + 11 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.h2database + h2 + runtime + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java new file mode 100644 index 00000000..8d4b413c --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java @@ -0,0 +1,13 @@ +package ru.otus.example.ormdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class OrmDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(OrmDemoApplication.class, args); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/Avatar.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/Avatar.java new file mode 100644 index 00000000..e54749c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/Avatar.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "avatars") +public class Avatar { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "photo_url", nullable = false, unique = true) + private String photoUrl; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/Course.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/Course.java new file mode 100644 index 00000000..cfb3c968 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/Course.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "courses") +public class Course { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "name", nullable = false, unique = true) + private String name; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/EMail.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/EMail.java new file mode 100644 index 00000000..7e2d6dde --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/EMail.java @@ -0,0 +1,22 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "emails") +public class EMail { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "email", nullable = false, unique = true) + private String email; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java new file mode 100644 index 00000000..f3822503 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java @@ -0,0 +1,39 @@ +package ru.otus.example.ormdemo.models; + +import lombok.*; + +import javax.persistence.*; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity // Указывает, что данный класс является сущностью +@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность +public class OtusStudent { + @Id // Позволяет указать какое поле является идентификатором + @GeneratedValue(strategy = GenerationType.IDENTITY) // Стратегия генерации идентификаторов + private long id; + + // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности + @Column(name = "name", nullable = false, unique = true) + private String name; + + // Указывает на связь между таблицами "один к одному" + @OneToOne(targetEntity = Avatar.class, cascade = CascadeType.ALL) + // Задает поле, по которому происходит объединение с таблицей для хранения связанной сущности + @JoinColumn(name = "avatar_id") + private Avatar avatar; + + // Указывает на связь между таблицами "один ко многим" + @OneToMany(targetEntity = EMail.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @JoinColumn(name = "student_id") + private List emails; + + // Указывает на связь между таблицами "многие ко многим" + @ManyToMany(targetEntity = Course.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL) + // Задает таблицу связей между таблицами для хранения родительской и связанной сущностью + @JoinTable(name = "student_courses", joinColumns = @JoinColumn(name = "student_id"), + inverseJoinColumns = @JoinColumn(name = "course_id")) + private List courses; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java new file mode 100644 index 00000000..44cc6a58 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java @@ -0,0 +1,18 @@ +package ru.otus.example.ormdemo.repositories; + + +import ru.otus.example.ormdemo.models.OtusStudent; + +import java.util.List; +import java.util.Optional; + +public interface OtusStudentRepository { + OtusStudent save(OtusStudent student); + Optional findById(long id); + + List findAll(); + List findByName(String name); + + void updateNameById(long id, String name); + void deleteById(long id); +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java new file mode 100644 index 00000000..c11b2b02 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java @@ -0,0 +1,76 @@ +package ru.otus.example.ormdemo.repositories; + +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; +import ru.otus.example.ormdemo.models.OtusStudent; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; +import javax.persistence.TypedQuery; +import java.util.List; +import java.util.Optional; + +// @Transactional должна стоять на методе сервиса. +// Причем, если метод не подразумевает изменения данных в БД то категорически желательно +// выставить у аннотации параметр readOnly в true. +// Но это только упражнение и транзакции мы пока не проходили. +// Поэтому, для упрощения, пока вешаем над классом репозитория +@Transactional +@Repository +public class OtusStudentRepositoryJpa implements OtusStudentRepository { + + @PersistenceContext + private EntityManager em; + + @Override + public OtusStudent save(OtusStudent student) { + if (student.getId() <= 0) { + em.persist(student); + return student; + } else { + return em.merge(student); + } + } + + @Override + public Optional findById(long id) { + return Optional.ofNullable(em.find(OtusStudent.class, id)); + } + + @Override + public List findAll() { + return em.createQuery("select s from OtusStudent s", OtusStudent.class) + .getResultList(); + } + + @Override + public List findByName(String name) { + TypedQuery query = em.createQuery("select s " + + "from OtusStudent s " + + "where s.name = :name", + OtusStudent.class); + query.setParameter("name", name); + return query.getResultList(); + } + + @Override + public void updateNameById(long id, String name) { + Query query = em.createQuery("update OtusStudent s " + + "set s.name = :name " + + "where s.id = :id"); + query.setParameter("name", name); + query.setParameter("id", id); + query.executeUpdate(); + } + + @Override + public void deleteById(long id) { + Query query = em.createQuery("delete " + + "from OtusStudent s " + + "where s.id = :id"); + query.setParameter("id", id); + query.executeUpdate(); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/resources/application.yml new file mode 100644 index 00000000..8d633961 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + hibernate: + ddl-auto: none + + show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/resources/schema.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/resources/schema.sql new file mode 100644 index 00000000..43a684bb --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/main/resources/schema.sql @@ -0,0 +1,31 @@ +create table avatars( + id bigserial, + photo_url varchar(8000), + primary key (id) +); + +create table courses( + id bigserial, + name varchar(255), + primary key (id) +); + +create table otus_students( + id bigserial, + name varchar(255), + avatar_id bigint references avatars (id), + primary key (id) +); + +create table emails( + id bigserial, + student_id bigint references otus_students(id) on delete cascade, + email varchar(255), + primary key (id) +); + +create table student_courses( + student_id bigint references otus_students(id) on delete cascade, + course_id bigint references courses(id), + primary key (student_id, course_id) +); \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java new file mode 100644 index 00000000..acbc6261 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java @@ -0,0 +1,126 @@ +package ru.otus.example.ormdemo.repositories; + +import lombok.val; +import org.hibernate.SessionFactory; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.context.annotation.Import; +import ru.otus.example.ormdemo.models.OtusStudent; +import ru.otus.example.ormdemo.models.Avatar; +import ru.otus.example.ormdemo.models.Course; +import ru.otus.example.ormdemo.models.EMail; + +import java.util.Collections; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +@DisplayName("Репозиторий на основе Jpa для работы со студентами ") +@DataJpaTest +@Import(OtusStudentRepositoryJpa.class) +class OtusStudentRepositoryJpaTest { + + private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; + private static final long FIRST_STUDENT_ID = 1L; + private static final String FIRST_STUDENT_NAME = "student_01"; + + private static final int EXPECTED_QUERIES_COUNT = 31; + + private static final String STUDENT_AVATAR_URL = "где-то там"; + private static final String STUDENT_EMAIL = "any@mail.com"; + private static final String COURSE_NAME = "Spring"; + private static final String STUDENT_NAME = "Вася"; + + @Autowired + private OtusStudentRepositoryJpa repositoryJpa; + + @Autowired + private TestEntityManager em; + + @DisplayName(" должен загружать информацию о нужном студенте по его id") + @Test + void shouldFindExpectedStudentById() { + val optionalActualStudent = repositoryJpa.findById(FIRST_STUDENT_ID); + val expectedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(optionalActualStudent).isPresent().get() + .usingRecursiveComparison().isEqualTo(expectedStudent); + } + + @DisplayName("должен загружать список всех студентов с полной информацией о них") + @Test + void shouldReturnCorrectStudentsListWithAllInfo() { + SessionFactory sessionFactory = em.getEntityManager().getEntityManagerFactory() + .unwrap(SessionFactory.class); + sessionFactory.getStatistics().setStatisticsEnabled(true); + + + System.out.println("\n\n\n\n----------------------------------------------------------------------------------------------------------"); + val students = repositoryJpa.findAll(); + assertThat(students).isNotNull().hasSize(EXPECTED_NUMBER_OF_STUDENTS) + .allMatch(s -> !s.getName().equals("")) + .allMatch(s -> s.getCourses() != null && s.getCourses().size() > 0) + .allMatch(s -> s.getAvatar() != null) + .allMatch(s -> s.getEmails() != null && s.getEmails().size() > 0); + System.out.println("----------------------------------------------------------------------------------------------------------\n\n\n\n"); + assertThat(sessionFactory.getStatistics().getPrepareStatementCount()).isEqualTo(EXPECTED_QUERIES_COUNT); + } + + @DisplayName(" должен корректно сохранять всю информацию о студенте") + @Test + void shouldSaveAllStudentInfo() { + val avatar = new Avatar(0, STUDENT_AVATAR_URL); + val email = new EMail(0, STUDENT_EMAIL); + val emails = Collections.singletonList(email); + + val course = new Course(0, COURSE_NAME); + val courses = Collections.singletonList(course); + + + val vasya = new OtusStudent(0, STUDENT_NAME, avatar, emails, courses); + repositoryJpa.save(vasya); + assertThat(vasya.getId()).isGreaterThan(0); + + val actualStudent = em.find(OtusStudent.class, vasya.getId()); + assertThat(actualStudent).isNotNull().matches(s -> !s.getName().equals("")) + .matches(s -> s.getCourses() != null && s.getCourses().size() > 0 && s.getCourses().get(0).getId() > 0) + .matches(s -> s.getAvatar() != null) + .matches(s -> s.getEmails() != null && s.getEmails().size() > 0); + } + + @DisplayName(" должен загружать информацию о нужном студенте по его имени") + @Test + void shouldFindExpectedStudentByName() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + List students = repositoryJpa.findByName(FIRST_STUDENT_NAME); + assertThat(students).containsOnlyOnce(firstStudent); + } + + @DisplayName(" должен изменять имя заданного студента по его id") + @Test + void shouldUpdateStudentNameById() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + String oldName = firstStudent.getName(); + em.detach(firstStudent); + + repositoryJpa.updateNameById(FIRST_STUDENT_ID, STUDENT_NAME); + val updatedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + + assertThat(updatedStudent.getName()).isNotEqualTo(oldName).isEqualTo(STUDENT_NAME); + } + + @DisplayName(" должен удалять заданного студента по его id") + @Test + void shouldDeleteStudentNameById() { + val firstStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(firstStudent).isNotNull(); + em.detach(firstStudent); + + repositoryJpa.deleteById(FIRST_STUDENT_ID); + val deletedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + + assertThat(deletedStudent).isNull(); + } +} \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/test/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/test/resources/application.yml new file mode 100644 index 00000000..d2b811a4 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/test/resources/application.yml @@ -0,0 +1,17 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + #generate-ddl: true + hibernate: + ddl-auto: none + #ddl-auto: create-drop + + #show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/test/resources/data.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/test/resources/data.sql new file mode 100644 index 00000000..a8db6b85 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-03/src/test/resources/data.sql @@ -0,0 +1,29 @@ +insert into avatars(photo_url) +values ('photoUrl_01'), ('photoUrl_02'), ('photoUrl_03'), ('photoUrl_04'), ('photoUrl_05'), + ('photoUrl_06'), ('photoUrl_07'), ('photoUrl_08'), ('photoUrl_09'), ('photoUrl_10'); + +insert into courses(name) +values ('course_name_01'), ('course_name_02'), ('course_name_03'), ('course_name_04'), ('course_name_05'), + ('course_name_06'), ('course_name_07'), ('course_name_08'), ('course_name_09'), ('course_name_10'), ('not_used_11'); + +insert into otus_students(name, avatar_id) +values ('student_01', 1), ('student_02', 2), ('student_03', 3), ('student_04', 4), ('student_05', 5), + ('student_06', 6), ('student_07', 7), ('student_08', 8), ('student_09', 9), ('student_10', 10); + + +insert into emails(email, student_id) +values ('email_01', 1), ('email_02', 1), ('email_03', 2), ('email_04', 2), ('email_05', 3), ('email_06', 4), + ('email_07', 5), ('email_08', 6), ('email_09', 7), ('email_10', 8), ('email_11', 9), ('email_12', 10); + + +insert into student_courses(student_id, course_id) +values (1, 1), (1, 2), (1, 3), + (2, 2), (2, 4), (2, 5), + (3, 3), (3, 6), (3, 7), + (4, 4), (4, 8), (4, 9), + (5, 5), (5, 10), (5, 1), + (6, 6), (6, 2), (6, 3), + (7, 7), (7, 4), (7, 5), + (8, 8), (8, 6), (8, 7), + (9, 9), (9, 8), (9, 10), + (10, 10), (10, 1), (10, 2); diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/.gitignore b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/.gitignore new file mode 100644 index 00000000..e62c33c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml + +target/ diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/pom.xml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/pom.xml new file mode 100644 index 00000000..5a0219db --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + ru.otus + jpql-solution-04 + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + + 11 + 11 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.h2database + h2 + runtime + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java new file mode 100644 index 00000000..8d4b413c --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java @@ -0,0 +1,13 @@ +package ru.otus.example.ormdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class OrmDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(OrmDemoApplication.class, args); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/Avatar.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/Avatar.java new file mode 100644 index 00000000..e54749c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/Avatar.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "avatars") +public class Avatar { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "photo_url", nullable = false, unique = true) + private String photoUrl; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/Course.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/Course.java new file mode 100644 index 00000000..cfb3c968 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/Course.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "courses") +public class Course { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "name", nullable = false, unique = true) + private String name; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/EMail.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/EMail.java new file mode 100644 index 00000000..7e2d6dde --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/EMail.java @@ -0,0 +1,22 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "emails") +public class EMail { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "email", nullable = false, unique = true) + private String email; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java new file mode 100644 index 00000000..da9bbb0f --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java @@ -0,0 +1,42 @@ +package ru.otus.example.ormdemo.models; + +import lombok.*; + +import javax.persistence.*; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity // Указывает, что данный класс является сущностью +@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность +// Позволяет указать какие связи родительской сущности загружать в одном с ней запросе +@NamedEntityGraph(name = "otus-student-avatars-entity-graph", + attributeNodes = {@NamedAttributeNode("avatar")}) +public class OtusStudent { + @Id // Позволяет указать какое поле является идентификатором + @GeneratedValue(strategy = GenerationType.IDENTITY) // Стратегия генерации идентификаторов + private long id; + + // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности + @Column(name = "name", nullable = false, unique = true) + private String name; + + // Указывает на связь между таблицами "один к одному" + @OneToOne(targetEntity = Avatar.class, cascade = CascadeType.ALL) + // Задает поле, по которому происходит объединение с таблицей для хранения связанной сущности + @JoinColumn(name = "avatar_id") + private Avatar avatar; + + // Указывает на связь между таблицами "один ко многим" + @OneToMany(targetEntity = EMail.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @JoinColumn(name = "student_id") + private List emails; + + // Указывает на связь между таблицами "многие ко многим" + @ManyToMany(targetEntity = Course.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL) + // Задает таблицу связей между таблицами для хранения родительской и связанной сущностью + @JoinTable(name = "student_courses", joinColumns = @JoinColumn(name = "student_id"), + inverseJoinColumns = @JoinColumn(name = "course_id")) + private List courses; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java new file mode 100644 index 00000000..44cc6a58 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java @@ -0,0 +1,18 @@ +package ru.otus.example.ormdemo.repositories; + + +import ru.otus.example.ormdemo.models.OtusStudent; + +import java.util.List; +import java.util.Optional; + +public interface OtusStudentRepository { + OtusStudent save(OtusStudent student); + Optional findById(long id); + + List findAll(); + List findByName(String name); + + void updateNameById(long id, String name); + void deleteById(long id); +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java new file mode 100644 index 00000000..c3d3d22a --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java @@ -0,0 +1,79 @@ +package ru.otus.example.ormdemo.repositories; + +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; +import ru.otus.example.ormdemo.models.OtusStudent; + +import javax.persistence.*; +import java.util.List; +import java.util.Optional; + +// @Transactional должна стоять на методе сервиса. +// Причем, если метод не подразумевает изменения данных в БД то категорически желательно +// выставить у аннотации параметр readOnly в true. +// Но это только упражнение и транзакции мы пока не проходили. +// Поэтому, для упрощения, пока вешаем над классом репозитория +@Transactional +@Repository +public class OtusStudentRepositoryJpa implements OtusStudentRepository { + + @PersistenceContext + private final EntityManager em; + + public OtusStudentRepositoryJpa(EntityManager em) { + this.em = em; + } + + @Override + public OtusStudent save(OtusStudent student) { + if (student.getId() <= 0) { + em.persist(student); + return student; + } else { + return em.merge(student); + } + } + + @Override + public Optional findById(long id) { + return Optional.ofNullable(em.find(OtusStudent.class, id)); + } + + @Override + public List findAll() { + EntityGraph entityGraph = em.getEntityGraph("otus-student-avatars-entity-graph"); + TypedQuery query = em.createQuery("select s from OtusStudent s", OtusStudent.class); + query.setHint("javax.persistence.fetchgraph", entityGraph); + return query.getResultList(); + } + + @Override + public List findByName(String name) { + TypedQuery query = em.createQuery("select s " + + "from OtusStudent s " + + "where s.name = :name", + OtusStudent.class); + query.setParameter("name", name); + return query.getResultList(); + } + + @Override + public void updateNameById(long id, String name) { + Query query = em.createQuery("update OtusStudent s " + + "set s.name = :name " + + "where s.id = :id"); + query.setParameter("name", name); + query.setParameter("id", id); + query.executeUpdate(); + } + + @Override + public void deleteById(long id) { + Query query = em.createQuery("delete " + + "from OtusStudent s " + + "where s.id = :id"); + query.setParameter("id", id); + query.executeUpdate(); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/resources/application.yml new file mode 100644 index 00000000..8d633961 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + hibernate: + ddl-auto: none + + show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/resources/schema.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/resources/schema.sql new file mode 100644 index 00000000..43a684bb --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/main/resources/schema.sql @@ -0,0 +1,31 @@ +create table avatars( + id bigserial, + photo_url varchar(8000), + primary key (id) +); + +create table courses( + id bigserial, + name varchar(255), + primary key (id) +); + +create table otus_students( + id bigserial, + name varchar(255), + avatar_id bigint references avatars (id), + primary key (id) +); + +create table emails( + id bigserial, + student_id bigint references otus_students(id) on delete cascade, + email varchar(255), + primary key (id) +); + +create table student_courses( + student_id bigint references otus_students(id) on delete cascade, + course_id bigint references courses(id), + primary key (student_id, course_id) +); \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java new file mode 100644 index 00000000..c78cffc2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java @@ -0,0 +1,58 @@ +package ru.otus.example.ormdemo.repositories; + +import lombok.val; +import org.hibernate.SessionFactory; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.context.annotation.Import; +import ru.otus.example.ormdemo.models.OtusStudent; + +import static org.assertj.core.api.Assertions.assertThat; + +@DisplayName("Репозиторий на основе Jpa для работы со студентами ") +@DataJpaTest +@Import(OtusStudentRepositoryJpa.class) +class OtusStudentRepositoryJpaTest { + + private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; + private static final long FIRST_STUDENT_ID = 1L; + + private static final int EXPECTED_QUERIES_COUNT = 21; + + @Autowired + private OtusStudentRepositoryJpa repositoryJpa; + + @Autowired + private TestEntityManager em; + + @DisplayName(" должен загружать информацию о нужном студенте по его id") + @Test + void shouldFindExpectedStudentById() { + val optionalActualStudent = repositoryJpa.findById(FIRST_STUDENT_ID); + val expectedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(optionalActualStudent).isPresent().get() + .usingRecursiveComparison().isEqualTo(expectedStudent); + } + + @DisplayName("должен загружать список всех студентов с полной информацией о них") + @Test + void shouldReturnCorrectStudentsListWithAllInfo() { + SessionFactory sessionFactory = em.getEntityManager().getEntityManagerFactory() + .unwrap(SessionFactory.class); + sessionFactory.getStatistics().setStatisticsEnabled(true); + + + System.out.println("\n\n\n\n----------------------------------------------------------------------------------------------------------"); + val students = repositoryJpa.findAll(); + assertThat(students).isNotNull().hasSize(EXPECTED_NUMBER_OF_STUDENTS) + .allMatch(s -> !s.getName().equals("")) + .allMatch(s -> s.getCourses() != null && s.getCourses().size() > 0) + .allMatch(s -> s.getAvatar() != null) + .allMatch(s -> s.getEmails() != null && s.getEmails().size() > 0); + System.out.println("----------------------------------------------------------------------------------------------------------\n\n\n\n"); + assertThat(sessionFactory.getStatistics().getPrepareStatementCount()).isEqualTo(EXPECTED_QUERIES_COUNT); + } +} \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/test/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/test/resources/application.yml new file mode 100644 index 00000000..d2b811a4 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/test/resources/application.yml @@ -0,0 +1,17 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + #generate-ddl: true + hibernate: + ddl-auto: none + #ddl-auto: create-drop + + #show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/test/resources/data.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/test/resources/data.sql new file mode 100644 index 00000000..a8db6b85 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-04/src/test/resources/data.sql @@ -0,0 +1,29 @@ +insert into avatars(photo_url) +values ('photoUrl_01'), ('photoUrl_02'), ('photoUrl_03'), ('photoUrl_04'), ('photoUrl_05'), + ('photoUrl_06'), ('photoUrl_07'), ('photoUrl_08'), ('photoUrl_09'), ('photoUrl_10'); + +insert into courses(name) +values ('course_name_01'), ('course_name_02'), ('course_name_03'), ('course_name_04'), ('course_name_05'), + ('course_name_06'), ('course_name_07'), ('course_name_08'), ('course_name_09'), ('course_name_10'), ('not_used_11'); + +insert into otus_students(name, avatar_id) +values ('student_01', 1), ('student_02', 2), ('student_03', 3), ('student_04', 4), ('student_05', 5), + ('student_06', 6), ('student_07', 7), ('student_08', 8), ('student_09', 9), ('student_10', 10); + + +insert into emails(email, student_id) +values ('email_01', 1), ('email_02', 1), ('email_03', 2), ('email_04', 2), ('email_05', 3), ('email_06', 4), + ('email_07', 5), ('email_08', 6), ('email_09', 7), ('email_10', 8), ('email_11', 9), ('email_12', 10); + + +insert into student_courses(student_id, course_id) +values (1, 1), (1, 2), (1, 3), + (2, 2), (2, 4), (2, 5), + (3, 3), (3, 6), (3, 7), + (4, 4), (4, 8), (4, 9), + (5, 5), (5, 10), (5, 1), + (6, 6), (6, 2), (6, 3), + (7, 7), (7, 4), (7, 5), + (8, 8), (8, 6), (8, 7), + (9, 9), (9, 8), (9, 10), + (10, 10), (10, 1), (10, 2); diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/.gitignore b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/.gitignore new file mode 100644 index 00000000..e62c33c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml + +target/ diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/pom.xml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/pom.xml new file mode 100644 index 00000000..9955f3cd --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + ru.otus + jpql-solution-05 + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + + 11 + 11 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.h2database + h2 + runtime + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java new file mode 100644 index 00000000..8d4b413c --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java @@ -0,0 +1,13 @@ +package ru.otus.example.ormdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class OrmDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(OrmDemoApplication.class, args); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/Avatar.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/Avatar.java new file mode 100644 index 00000000..e54749c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/Avatar.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "avatars") +public class Avatar { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "photo_url", nullable = false, unique = true) + private String photoUrl; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/Course.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/Course.java new file mode 100644 index 00000000..cfb3c968 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/Course.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "courses") +public class Course { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "name", nullable = false, unique = true) + private String name; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/EMail.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/EMail.java new file mode 100644 index 00000000..7e2d6dde --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/EMail.java @@ -0,0 +1,22 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "emails") +public class EMail { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "email", nullable = false, unique = true) + private String email; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java new file mode 100644 index 00000000..da9bbb0f --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java @@ -0,0 +1,42 @@ +package ru.otus.example.ormdemo.models; + +import lombok.*; + +import javax.persistence.*; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity // Указывает, что данный класс является сущностью +@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность +// Позволяет указать какие связи родительской сущности загружать в одном с ней запросе +@NamedEntityGraph(name = "otus-student-avatars-entity-graph", + attributeNodes = {@NamedAttributeNode("avatar")}) +public class OtusStudent { + @Id // Позволяет указать какое поле является идентификатором + @GeneratedValue(strategy = GenerationType.IDENTITY) // Стратегия генерации идентификаторов + private long id; + + // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности + @Column(name = "name", nullable = false, unique = true) + private String name; + + // Указывает на связь между таблицами "один к одному" + @OneToOne(targetEntity = Avatar.class, cascade = CascadeType.ALL) + // Задает поле, по которому происходит объединение с таблицей для хранения связанной сущности + @JoinColumn(name = "avatar_id") + private Avatar avatar; + + // Указывает на связь между таблицами "один ко многим" + @OneToMany(targetEntity = EMail.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @JoinColumn(name = "student_id") + private List emails; + + // Указывает на связь между таблицами "многие ко многим" + @ManyToMany(targetEntity = Course.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL) + // Задает таблицу связей между таблицами для хранения родительской и связанной сущностью + @JoinTable(name = "student_courses", joinColumns = @JoinColumn(name = "student_id"), + inverseJoinColumns = @JoinColumn(name = "course_id")) + private List courses; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java new file mode 100644 index 00000000..44cc6a58 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java @@ -0,0 +1,18 @@ +package ru.otus.example.ormdemo.repositories; + + +import ru.otus.example.ormdemo.models.OtusStudent; + +import java.util.List; +import java.util.Optional; + +public interface OtusStudentRepository { + OtusStudent save(OtusStudent student); + Optional findById(long id); + + List findAll(); + List findByName(String name); + + void updateNameById(long id, String name); + void deleteById(long id); +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java new file mode 100644 index 00000000..7c8c406b --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java @@ -0,0 +1,79 @@ +package ru.otus.example.ormdemo.repositories; + +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; +import ru.otus.example.ormdemo.models.OtusStudent; + +import javax.persistence.*; +import java.util.List; +import java.util.Optional; + +// @Transactional должна стоять на методе сервиса. +// Причем, если метод не подразумевает изменения данных в БД то категорически желательно +// выставить у аннотации параметр readOnly в true. +// Но это только упражнение и транзакции мы пока не проходили. +// Поэтому, для упрощения, пока вешаем над классом репозитория +@Transactional +@Repository +public class OtusStudentRepositoryJpa implements OtusStudentRepository { + + @PersistenceContext + private final EntityManager em; + + public OtusStudentRepositoryJpa(EntityManager em) { + this.em = em; + } + + @Override + public OtusStudent save(OtusStudent student) { + if (student.getId() <= 0) { + em.persist(student); + return student; + } else { + return em.merge(student); + } + } + + @Override + public Optional findById(long id) { + return Optional.ofNullable(em.find(OtusStudent.class, id)); + } + + @Override + public List findAll() { + EntityGraph entityGraph = em.getEntityGraph("otus-student-avatars-entity-graph"); + TypedQuery query = em.createQuery("select s from OtusStudent s join fetch s.emails", OtusStudent.class); + query.setHint("javax.persistence.fetchgraph", entityGraph); + return query.getResultList(); + } + + @Override + public List findByName(String name) { + TypedQuery query = em.createQuery("select s " + + "from OtusStudent s " + + "where s.name = :name", + OtusStudent.class); + query.setParameter("name", name); + return query.getResultList(); + } + + @Override + public void updateNameById(long id, String name) { + Query query = em.createQuery("update OtusStudent s " + + "set s.name = :name " + + "where s.id = :id"); + query.setParameter("name", name); + query.setParameter("id", id); + query.executeUpdate(); + } + + @Override + public void deleteById(long id) { + Query query = em.createQuery("delete " + + "from OtusStudent s " + + "where s.id = :id"); + query.setParameter("id", id); + query.executeUpdate(); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/resources/application.yml new file mode 100644 index 00000000..8d633961 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + hibernate: + ddl-auto: none + + show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/resources/schema.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/resources/schema.sql new file mode 100644 index 00000000..43a684bb --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/main/resources/schema.sql @@ -0,0 +1,31 @@ +create table avatars( + id bigserial, + photo_url varchar(8000), + primary key (id) +); + +create table courses( + id bigserial, + name varchar(255), + primary key (id) +); + +create table otus_students( + id bigserial, + name varchar(255), + avatar_id bigint references avatars (id), + primary key (id) +); + +create table emails( + id bigserial, + student_id bigint references otus_students(id) on delete cascade, + email varchar(255), + primary key (id) +); + +create table student_courses( + student_id bigint references otus_students(id) on delete cascade, + course_id bigint references courses(id), + primary key (student_id, course_id) +); \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java new file mode 100644 index 00000000..26285f75 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java @@ -0,0 +1,58 @@ +package ru.otus.example.ormdemo.repositories; + +import lombok.val; +import org.hibernate.SessionFactory; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.context.annotation.Import; +import ru.otus.example.ormdemo.models.OtusStudent; + +import static org.assertj.core.api.Assertions.assertThat; + +@DisplayName("Репозиторий на основе Jpa для работы со студентами ") +@DataJpaTest +@Import(OtusStudentRepositoryJpa.class) +class OtusStudentRepositoryJpaTest { + + private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; + private static final long FIRST_STUDENT_ID = 1L; + + private static final int EXPECTED_QUERIES_COUNT = 11; + + @Autowired + private OtusStudentRepositoryJpa repositoryJpa; + + @Autowired + private TestEntityManager em; + + @DisplayName(" должен загружать информацию о нужном студенте по его id") + @Test + void shouldFindExpectedStudentById() { + val optionalActualStudent = repositoryJpa.findById(FIRST_STUDENT_ID); + val expectedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(optionalActualStudent).isPresent().get() + .usingRecursiveComparison().isEqualTo(expectedStudent); + } + + @DisplayName("должен загружать список всех студентов с полной информацией о них") + @Test + void shouldReturnCorrectStudentsListWithAllInfo() { + SessionFactory sessionFactory = em.getEntityManager().getEntityManagerFactory() + .unwrap(SessionFactory.class); + sessionFactory.getStatistics().setStatisticsEnabled(true); + + + System.out.println("\n\n\n\n----------------------------------------------------------------------------------------------------------"); + val students = repositoryJpa.findAll(); + assertThat(students).isNotNull().hasSize(EXPECTED_NUMBER_OF_STUDENTS) + .allMatch(s -> !s.getName().equals("")) + .allMatch(s -> s.getCourses() != null && s.getCourses().size() > 0) + .allMatch(s -> s.getAvatar() != null) + .allMatch(s -> s.getEmails() != null && s.getEmails().size() > 0); + System.out.println("----------------------------------------------------------------------------------------------------------\n\n\n\n"); + assertThat(sessionFactory.getStatistics().getPrepareStatementCount()).isEqualTo(EXPECTED_QUERIES_COUNT); + } +} \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/test/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/test/resources/application.yml new file mode 100644 index 00000000..d2b811a4 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/test/resources/application.yml @@ -0,0 +1,17 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + #generate-ddl: true + hibernate: + ddl-auto: none + #ddl-auto: create-drop + + #show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/test/resources/data.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/test/resources/data.sql new file mode 100644 index 00000000..a8db6b85 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-05/src/test/resources/data.sql @@ -0,0 +1,29 @@ +insert into avatars(photo_url) +values ('photoUrl_01'), ('photoUrl_02'), ('photoUrl_03'), ('photoUrl_04'), ('photoUrl_05'), + ('photoUrl_06'), ('photoUrl_07'), ('photoUrl_08'), ('photoUrl_09'), ('photoUrl_10'); + +insert into courses(name) +values ('course_name_01'), ('course_name_02'), ('course_name_03'), ('course_name_04'), ('course_name_05'), + ('course_name_06'), ('course_name_07'), ('course_name_08'), ('course_name_09'), ('course_name_10'), ('not_used_11'); + +insert into otus_students(name, avatar_id) +values ('student_01', 1), ('student_02', 2), ('student_03', 3), ('student_04', 4), ('student_05', 5), + ('student_06', 6), ('student_07', 7), ('student_08', 8), ('student_09', 9), ('student_10', 10); + + +insert into emails(email, student_id) +values ('email_01', 1), ('email_02', 1), ('email_03', 2), ('email_04', 2), ('email_05', 3), ('email_06', 4), + ('email_07', 5), ('email_08', 6), ('email_09', 7), ('email_10', 8), ('email_11', 9), ('email_12', 10); + + +insert into student_courses(student_id, course_id) +values (1, 1), (1, 2), (1, 3), + (2, 2), (2, 4), (2, 5), + (3, 3), (3, 6), (3, 7), + (4, 4), (4, 8), (4, 9), + (5, 5), (5, 10), (5, 1), + (6, 6), (6, 2), (6, 3), + (7, 7), (7, 4), (7, 5), + (8, 8), (8, 6), (8, 7), + (9, 9), (9, 8), (9, 10), + (10, 10), (10, 1), (10, 2); diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/.gitignore b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/.gitignore new file mode 100644 index 00000000..e62c33c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml + +target/ diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/pom.xml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/pom.xml new file mode 100644 index 00000000..38201b68 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + ru.otus + jpql-solution-06 + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + + 11 + 11 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.h2database + h2 + runtime + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java new file mode 100644 index 00000000..8d4b413c --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java @@ -0,0 +1,13 @@ +package ru.otus.example.ormdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class OrmDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(OrmDemoApplication.class, args); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/Avatar.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/Avatar.java new file mode 100644 index 00000000..e54749c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/Avatar.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "avatars") +public class Avatar { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "photo_url", nullable = false, unique = true) + private String photoUrl; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/Course.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/Course.java new file mode 100644 index 00000000..cfb3c968 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/Course.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "courses") +public class Course { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "name", nullable = false, unique = true) + private String name; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/EMail.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/EMail.java new file mode 100644 index 00000000..7e2d6dde --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/EMail.java @@ -0,0 +1,22 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "emails") +public class EMail { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "email", nullable = false, unique = true) + private String email; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java new file mode 100644 index 00000000..aba63679 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java @@ -0,0 +1,48 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; + +import javax.persistence.*; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity // Указывает, что данный класс является сущностью +@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность +// Позволяет указать какие связи родительской сущности загружать в одном с ней запросе +@NamedEntityGraph(name = "otus-student-avatars-entity-graph", + attributeNodes = {@NamedAttributeNode("avatar")}) +public class OtusStudent { + @Id // Позволяет указать какое поле является идентификатором + @GeneratedValue(strategy = GenerationType.IDENTITY) // Стратегия генерации идентификаторов + private long id; + + // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности + @Column(name = "name", nullable = false, unique = true) + private String name; + + // Указывает на связь между таблицами "один к одному" + @OneToOne(targetEntity = Avatar.class, cascade = CascadeType.ALL) + // Задает поле, по которому происходит объединение с таблицей для хранения связанной сущности + @JoinColumn(name = "avatar_id") + private Avatar avatar; + + // Указывает на связь между таблицами "один ко многим" + @OneToMany(targetEntity = EMail.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @JoinColumn(name = "student_id") + private List emails; + + // Все данные талицы будут загружены в память отдельным запросом и соединены с родительской сущностью + @Fetch(FetchMode.SUBSELECT) + // Указывает на связь между таблицами "многие ко многим" + @ManyToMany(targetEntity = Course.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL) + // Задает таблицу связей между таблицами для хранения родительской и связанной сущностью + @JoinTable(name = "student_courses", joinColumns = @JoinColumn(name = "student_id"), + inverseJoinColumns = @JoinColumn(name = "course_id")) + private List courses; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java new file mode 100644 index 00000000..44cc6a58 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java @@ -0,0 +1,18 @@ +package ru.otus.example.ormdemo.repositories; + + +import ru.otus.example.ormdemo.models.OtusStudent; + +import java.util.List; +import java.util.Optional; + +public interface OtusStudentRepository { + OtusStudent save(OtusStudent student); + Optional findById(long id); + + List findAll(); + List findByName(String name); + + void updateNameById(long id, String name); + void deleteById(long id); +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java new file mode 100644 index 00000000..7c8c406b --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java @@ -0,0 +1,79 @@ +package ru.otus.example.ormdemo.repositories; + +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; +import ru.otus.example.ormdemo.models.OtusStudent; + +import javax.persistence.*; +import java.util.List; +import java.util.Optional; + +// @Transactional должна стоять на методе сервиса. +// Причем, если метод не подразумевает изменения данных в БД то категорически желательно +// выставить у аннотации параметр readOnly в true. +// Но это только упражнение и транзакции мы пока не проходили. +// Поэтому, для упрощения, пока вешаем над классом репозитория +@Transactional +@Repository +public class OtusStudentRepositoryJpa implements OtusStudentRepository { + + @PersistenceContext + private final EntityManager em; + + public OtusStudentRepositoryJpa(EntityManager em) { + this.em = em; + } + + @Override + public OtusStudent save(OtusStudent student) { + if (student.getId() <= 0) { + em.persist(student); + return student; + } else { + return em.merge(student); + } + } + + @Override + public Optional findById(long id) { + return Optional.ofNullable(em.find(OtusStudent.class, id)); + } + + @Override + public List findAll() { + EntityGraph entityGraph = em.getEntityGraph("otus-student-avatars-entity-graph"); + TypedQuery query = em.createQuery("select s from OtusStudent s join fetch s.emails", OtusStudent.class); + query.setHint("javax.persistence.fetchgraph", entityGraph); + return query.getResultList(); + } + + @Override + public List findByName(String name) { + TypedQuery query = em.createQuery("select s " + + "from OtusStudent s " + + "where s.name = :name", + OtusStudent.class); + query.setParameter("name", name); + return query.getResultList(); + } + + @Override + public void updateNameById(long id, String name) { + Query query = em.createQuery("update OtusStudent s " + + "set s.name = :name " + + "where s.id = :id"); + query.setParameter("name", name); + query.setParameter("id", id); + query.executeUpdate(); + } + + @Override + public void deleteById(long id) { + Query query = em.createQuery("delete " + + "from OtusStudent s " + + "where s.id = :id"); + query.setParameter("id", id); + query.executeUpdate(); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/resources/application.yml new file mode 100644 index 00000000..8d633961 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + hibernate: + ddl-auto: none + + show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/resources/schema.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/resources/schema.sql new file mode 100644 index 00000000..43a684bb --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/main/resources/schema.sql @@ -0,0 +1,31 @@ +create table avatars( + id bigserial, + photo_url varchar(8000), + primary key (id) +); + +create table courses( + id bigserial, + name varchar(255), + primary key (id) +); + +create table otus_students( + id bigserial, + name varchar(255), + avatar_id bigint references avatars (id), + primary key (id) +); + +create table emails( + id bigserial, + student_id bigint references otus_students(id) on delete cascade, + email varchar(255), + primary key (id) +); + +create table student_courses( + student_id bigint references otus_students(id) on delete cascade, + course_id bigint references courses(id), + primary key (student_id, course_id) +); \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java new file mode 100644 index 00000000..6f08f3f1 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java @@ -0,0 +1,58 @@ +package ru.otus.example.ormdemo.repositories; + +import lombok.val; +import org.hibernate.SessionFactory; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.context.annotation.Import; +import ru.otus.example.ormdemo.models.OtusStudent; + +import static org.assertj.core.api.Assertions.assertThat; + +@DisplayName("Репозиторий на основе Jpa для работы со студентами ") +@DataJpaTest +@Import(OtusStudentRepositoryJpa.class) +class OtusStudentRepositoryJpaTest { + + private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; + private static final long FIRST_STUDENT_ID = 1L; + + private static final int EXPECTED_QUERIES_COUNT = 2; + + @Autowired + private OtusStudentRepositoryJpa repositoryJpa; + + @Autowired + private TestEntityManager em; + + @DisplayName(" должен загружать информацию о нужном студенте по его id") + @Test + void shouldFindExpectedStudentById() { + val optionalActualStudent = repositoryJpa.findById(FIRST_STUDENT_ID); + val expectedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(optionalActualStudent).isPresent().get() + .usingRecursiveComparison().isEqualTo(expectedStudent); + } + + @DisplayName("должен загружать список всех студентов с полной информацией о них") + @Test + void shouldReturnCorrectStudentsListWithAllInfo() { + SessionFactory sessionFactory = em.getEntityManager().getEntityManagerFactory() + .unwrap(SessionFactory.class); + sessionFactory.getStatistics().setStatisticsEnabled(true); + + + System.out.println("\n\n\n\n----------------------------------------------------------------------------------------------------------"); + val students = repositoryJpa.findAll(); + assertThat(students).isNotNull().hasSize(EXPECTED_NUMBER_OF_STUDENTS) + .allMatch(s -> !s.getName().equals("")) + .allMatch(s -> s.getCourses() != null && s.getCourses().size() > 0) + .allMatch(s -> s.getAvatar() != null) + .allMatch(s -> s.getEmails() != null && s.getEmails().size() > 0); + System.out.println("----------------------------------------------------------------------------------------------------------\n\n\n\n"); + assertThat(sessionFactory.getStatistics().getPrepareStatementCount()).isEqualTo(EXPECTED_QUERIES_COUNT); + } +} \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/test/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/test/resources/application.yml new file mode 100644 index 00000000..d2b811a4 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/test/resources/application.yml @@ -0,0 +1,17 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + #generate-ddl: true + hibernate: + ddl-auto: none + #ddl-auto: create-drop + + #show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/test/resources/data.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/test/resources/data.sql new file mode 100644 index 00000000..a8db6b85 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-06/src/test/resources/data.sql @@ -0,0 +1,29 @@ +insert into avatars(photo_url) +values ('photoUrl_01'), ('photoUrl_02'), ('photoUrl_03'), ('photoUrl_04'), ('photoUrl_05'), + ('photoUrl_06'), ('photoUrl_07'), ('photoUrl_08'), ('photoUrl_09'), ('photoUrl_10'); + +insert into courses(name) +values ('course_name_01'), ('course_name_02'), ('course_name_03'), ('course_name_04'), ('course_name_05'), + ('course_name_06'), ('course_name_07'), ('course_name_08'), ('course_name_09'), ('course_name_10'), ('not_used_11'); + +insert into otus_students(name, avatar_id) +values ('student_01', 1), ('student_02', 2), ('student_03', 3), ('student_04', 4), ('student_05', 5), + ('student_06', 6), ('student_07', 7), ('student_08', 8), ('student_09', 9), ('student_10', 10); + + +insert into emails(email, student_id) +values ('email_01', 1), ('email_02', 1), ('email_03', 2), ('email_04', 2), ('email_05', 3), ('email_06', 4), + ('email_07', 5), ('email_08', 6), ('email_09', 7), ('email_10', 8), ('email_11', 9), ('email_12', 10); + + +insert into student_courses(student_id, course_id) +values (1, 1), (1, 2), (1, 3), + (2, 2), (2, 4), (2, 5), + (3, 3), (3, 6), (3, 7), + (4, 4), (4, 8), (4, 9), + (5, 5), (5, 10), (5, 1), + (6, 6), (6, 2), (6, 3), + (7, 7), (7, 4), (7, 5), + (8, 8), (8, 6), (8, 7), + (9, 9), (9, 8), (9, 10), + (10, 10), (10, 1), (10, 2); diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/.gitignore b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/.gitignore new file mode 100644 index 00000000..e62c33c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml + +target/ diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/pom.xml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/pom.xml new file mode 100644 index 00000000..533d2f33 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + ru.otus + jpql-solution-final + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + + 11 + 11 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.h2database + h2 + runtime + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java new file mode 100644 index 00000000..8d4b413c --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/OrmDemoApplication.java @@ -0,0 +1,13 @@ +package ru.otus.example.ormdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class OrmDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(OrmDemoApplication.class, args); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/Avatar.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/Avatar.java new file mode 100644 index 00000000..e54749c2 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/Avatar.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "avatars") +public class Avatar { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "photo_url", nullable = false, unique = true) + private String photoUrl; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/Course.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/Course.java new file mode 100644 index 00000000..cfb3c968 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/Course.java @@ -0,0 +1,21 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "courses") +public class Course { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "name", nullable = false, unique = true) + private String name; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/EMail.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/EMail.java new file mode 100644 index 00000000..7e2d6dde --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/EMail.java @@ -0,0 +1,22 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "emails") +public class EMail { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "email", nullable = false, unique = true) + private String email; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java new file mode 100644 index 00000000..ecdbf955 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/models/OtusStudent.java @@ -0,0 +1,48 @@ +package ru.otus.example.ormdemo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.BatchSize; +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; + +import javax.persistence.*; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity // Указывает, что данный класс является сущностью +@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность +@NamedEntityGraph(name = "otus-student-avatars-entity-graph", + attributeNodes = {@NamedAttributeNode("avatar")}) +public class OtusStudent { + @Id // Позволяет указать какое поле является идентификатором + @GeneratedValue(strategy = GenerationType.IDENTITY) // Стратегия генерации идентификаторов + private long id; + + // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности + @Column(name = "name", nullable = false, unique = true) + private String name; + + // Указывает на связь между таблицами "один к одному" + @OneToOne(targetEntity = Avatar.class, cascade = CascadeType.ALL) + // Задает поле, по которому происходит объединение с таблицей для хранения связанной сущности + @JoinColumn(name = "avatar_id") + private Avatar avatar; + + // Указывает на связь между таблицами "один ко многим" + @OneToMany(targetEntity = EMail.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @JoinColumn(name = "student_id") + private List emails; + + @Fetch(FetchMode.SELECT) + @BatchSize(size = 5) + // Указывает на связь между таблицами "многие ко многим" + @ManyToMany(targetEntity = Course.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL) + // Задает таблицу связей между таблицами для хранения родительской и связанной сущностью + @JoinTable(name = "student_courses", joinColumns = @JoinColumn(name = "student_id"), + inverseJoinColumns = @JoinColumn(name = "course_id")) + private List courses; +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java new file mode 100644 index 00000000..44cc6a58 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepository.java @@ -0,0 +1,18 @@ +package ru.otus.example.ormdemo.repositories; + + +import ru.otus.example.ormdemo.models.OtusStudent; + +import java.util.List; +import java.util.Optional; + +public interface OtusStudentRepository { + OtusStudent save(OtusStudent student); + Optional findById(long id); + + List findAll(); + List findByName(String name); + + void updateNameById(long id, String name); + void deleteById(long id); +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java new file mode 100644 index 00000000..7c8c406b --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java @@ -0,0 +1,79 @@ +package ru.otus.example.ormdemo.repositories; + +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; +import ru.otus.example.ormdemo.models.OtusStudent; + +import javax.persistence.*; +import java.util.List; +import java.util.Optional; + +// @Transactional должна стоять на методе сервиса. +// Причем, если метод не подразумевает изменения данных в БД то категорически желательно +// выставить у аннотации параметр readOnly в true. +// Но это только упражнение и транзакции мы пока не проходили. +// Поэтому, для упрощения, пока вешаем над классом репозитория +@Transactional +@Repository +public class OtusStudentRepositoryJpa implements OtusStudentRepository { + + @PersistenceContext + private final EntityManager em; + + public OtusStudentRepositoryJpa(EntityManager em) { + this.em = em; + } + + @Override + public OtusStudent save(OtusStudent student) { + if (student.getId() <= 0) { + em.persist(student); + return student; + } else { + return em.merge(student); + } + } + + @Override + public Optional findById(long id) { + return Optional.ofNullable(em.find(OtusStudent.class, id)); + } + + @Override + public List findAll() { + EntityGraph entityGraph = em.getEntityGraph("otus-student-avatars-entity-graph"); + TypedQuery query = em.createQuery("select s from OtusStudent s join fetch s.emails", OtusStudent.class); + query.setHint("javax.persistence.fetchgraph", entityGraph); + return query.getResultList(); + } + + @Override + public List findByName(String name) { + TypedQuery query = em.createQuery("select s " + + "from OtusStudent s " + + "where s.name = :name", + OtusStudent.class); + query.setParameter("name", name); + return query.getResultList(); + } + + @Override + public void updateNameById(long id, String name) { + Query query = em.createQuery("update OtusStudent s " + + "set s.name = :name " + + "where s.id = :id"); + query.setParameter("name", name); + query.setParameter("id", id); + query.executeUpdate(); + } + + @Override + public void deleteById(long id) { + Query query = em.createQuery("delete " + + "from OtusStudent s " + + "where s.id = :id"); + query.setParameter("id", id); + query.executeUpdate(); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/resources/application.yml new file mode 100644 index 00000000..8d633961 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + hibernate: + ddl-auto: none + + show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/resources/schema.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/resources/schema.sql new file mode 100644 index 00000000..43a684bb --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/main/resources/schema.sql @@ -0,0 +1,31 @@ +create table avatars( + id bigserial, + photo_url varchar(8000), + primary key (id) +); + +create table courses( + id bigserial, + name varchar(255), + primary key (id) +); + +create table otus_students( + id bigserial, + name varchar(255), + avatar_id bigint references avatars (id), + primary key (id) +); + +create table emails( + id bigserial, + student_id bigint references otus_students(id) on delete cascade, + email varchar(255), + primary key (id) +); + +create table student_courses( + student_id bigint references otus_students(id) on delete cascade, + course_id bigint references courses(id), + primary key (student_id, course_id) +); \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java new file mode 100644 index 00000000..da64c75f --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java @@ -0,0 +1,58 @@ +package ru.otus.example.ormdemo.repositories; + +import lombok.val; +import org.hibernate.SessionFactory; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.context.annotation.Import; +import ru.otus.example.ormdemo.models.OtusStudent; + +import static org.assertj.core.api.Assertions.assertThat; + +@DisplayName("Репозиторий на основе Jpa для работы со студентами ") +@DataJpaTest +@Import(OtusStudentRepositoryJpa.class) +class OtusStudentRepositoryJpaTest { + + private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; + private static final long FIRST_STUDENT_ID = 1L; + + private static final int EXPECTED_QUERIES_COUNT = 3; + + @Autowired + private OtusStudentRepositoryJpa repositoryJpa; + + @Autowired + private TestEntityManager em; + + @DisplayName(" должен загружать информацию о нужном студенте по его id") + @Test + void shouldFindExpectedStudentById() { + val optionalActualStudent = repositoryJpa.findById(FIRST_STUDENT_ID); + val expectedStudent = em.find(OtusStudent.class, FIRST_STUDENT_ID); + assertThat(optionalActualStudent).isPresent().get() + .usingRecursiveComparison().isEqualTo(expectedStudent); + } + + @DisplayName("должен загружать список всех студентов с полной информацией о них") + @Test + void shouldReturnCorrectStudentsListWithAllInfo() { + SessionFactory sessionFactory = em.getEntityManager().getEntityManagerFactory() + .unwrap(SessionFactory.class); + sessionFactory.getStatistics().setStatisticsEnabled(true); + + + System.out.println("\n\n\n\n----------------------------------------------------------------------------------------------------------"); + val students = repositoryJpa.findAll(); + assertThat(students).isNotNull().hasSize(EXPECTED_NUMBER_OF_STUDENTS) + .allMatch(s -> !s.getName().equals("")) + .allMatch(s -> s.getCourses() != null && s.getCourses().size() > 0) + .allMatch(s -> s.getAvatar() != null) + .allMatch(s -> s.getEmails() != null && s.getEmails().size() > 0); + System.out.println("----------------------------------------------------------------------------------------------------------\n\n\n\n"); + assertThat(sessionFactory.getStatistics().getPrepareStatementCount()).isEqualTo(EXPECTED_QUERIES_COUNT); + } +} \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/test/resources/application.yml b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/test/resources/application.yml new file mode 100644 index 00000000..d2b811a4 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/test/resources/application.yml @@ -0,0 +1,17 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + #generate-ddl: true + hibernate: + ddl-auto: none + #ddl-auto: create-drop + + #show-sql: true + +logging: + level: + ROOT: ERROR \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/test/resources/data.sql b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/test/resources/data.sql new file mode 100644 index 00000000..a8db6b85 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/jpql-solution-final/src/test/resources/data.sql @@ -0,0 +1,29 @@ +insert into avatars(photo_url) +values ('photoUrl_01'), ('photoUrl_02'), ('photoUrl_03'), ('photoUrl_04'), ('photoUrl_05'), + ('photoUrl_06'), ('photoUrl_07'), ('photoUrl_08'), ('photoUrl_09'), ('photoUrl_10'); + +insert into courses(name) +values ('course_name_01'), ('course_name_02'), ('course_name_03'), ('course_name_04'), ('course_name_05'), + ('course_name_06'), ('course_name_07'), ('course_name_08'), ('course_name_09'), ('course_name_10'), ('not_used_11'); + +insert into otus_students(name, avatar_id) +values ('student_01', 1), ('student_02', 2), ('student_03', 3), ('student_04', 4), ('student_05', 5), + ('student_06', 6), ('student_07', 7), ('student_08', 8), ('student_09', 9), ('student_10', 10); + + +insert into emails(email, student_id) +values ('email_01', 1), ('email_02', 1), ('email_03', 2), ('email_04', 2), ('email_05', 3), ('email_06', 4), + ('email_07', 5), ('email_08', 6), ('email_09', 7), ('email_10', 8), ('email_11', 9), ('email_12', 10); + + +insert into student_courses(student_id, course_id) +values (1, 1), (1, 2), (1, 3), + (2, 2), (2, 4), (2, 5), + (3, 3), (3, 6), (3, 7), + (4, 4), (4, 8), (4, 9), + (5, 5), (5, 10), (5, 1), + (6, 6), (6, 2), (6, 3), + (7, 7), (7, 4), (7, 5), + (8, 8), (8, 6), (8, 7), + (9, 9), (9, 8), (9, 10), + (10, 10), (10, 1), (10, 2); diff --git a/2021-08/spring-09-jpql/jpql-class-work/pom.xml b/2021-08/spring-09-jpql/jpql-class-work/pom.xml new file mode 100644 index 00000000..6f781fad --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-class-work/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + ru.otus + jpql-class-work + 1.0 + + pom + + + jpql-exercise + jpql-solution-01 + jpql-solution-02 + jpql-solution-03 + jpql-solution-04 + jpql-solution-05 + jpql-solution-06 + jpql-solution-final + + diff --git a/2021-08/spring-09-jpql/jpql-demo/.gitignore b/2021-08/spring-09-jpql/jpql-demo/.gitignore new file mode 100644 index 00000000..153c9335 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/.gitignore @@ -0,0 +1,29 @@ +HELP.md +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +/build/ + +### VS Code ### +.vscode/ diff --git a/2021-08/spring-09-jpql/jpql-demo/README.md b/2021-08/spring-09-jpql/jpql-demo/README.md new file mode 100644 index 00000000..67632929 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/README.md @@ -0,0 +1,6 @@ +## Пример работы с JPQL + +В примере демонстрируется: +* *репозитории на Spring ORM с использованием JPA и JPQL* +* *использование JPQL для написания разного рода запросов (в т.ч. для выборки, агрегации, изменения и удаления данных)* +* *тестирование репозиториев на Spring ORM с использованием @DataJpaTest* diff --git a/2021-08/spring-09-jpql/jpql-demo/pom.xml b/2021-08/spring-09-jpql/jpql-demo/pom.xml new file mode 100644 index 00000000..ac07fac8 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + + ru.otus.example + jpql-demo + 0.0.1-SNAPSHOT + jpql-demo + Demo project for Spring Boot + + + 11 + 11 + 11 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.springframework.shell + spring-shell-starter + 2.0.1.RELEASE + + + + org.springframework.boot + spring-boot-devtools + runtime + + + + com.h2database + h2 + runtime + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/JpqlDemoApplication.java b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/JpqlDemoApplication.java new file mode 100644 index 00000000..5588b288 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/JpqlDemoApplication.java @@ -0,0 +1,13 @@ +package ru.otus.example.jpql_demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class JpqlDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(JpqlDemoApplication.class, args); + } + +} diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/dto/CitySalary.java b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/dto/CitySalary.java new file mode 100644 index 00000000..29078c2f --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/dto/CitySalary.java @@ -0,0 +1,15 @@ +package ru.otus.example.jpql_demo.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class CitySalary { + private String city; + private Double salary; + +} diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/dto/EmployeeProjects.java b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/dto/EmployeeProjects.java new file mode 100644 index 00000000..7f73ba5c --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/dto/EmployeeProjects.java @@ -0,0 +1,16 @@ +package ru.otus.example.jpql_demo.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import ru.otus.example.jpql_demo.models.Employee; + + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EmployeeProjects { + private Employee employee; + private long projectsCount; + +} diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Address.java b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Address.java new file mode 100644 index 00000000..96a03d58 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Address.java @@ -0,0 +1,24 @@ +package ru.otus.example.jpql_demo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; + +import javax.persistence.*; +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "addresses") +public class Address { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "city") + private String city; +} diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Department.java b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Department.java new file mode 100644 index 00000000..79110620 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Department.java @@ -0,0 +1,21 @@ +package ru.otus.example.jpql_demo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "departments") +public class Department { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column + private String name; +} diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Employee.java b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Employee.java new file mode 100644 index 00000000..0bcd8123 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Employee.java @@ -0,0 +1,53 @@ +package ru.otus.example.jpql_demo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.BatchSize; +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; + +import javax.persistence.*; +import java.math.BigDecimal; +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "employees") +public class Employee { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "first_name") + private String firstName; + + @Column(name = "last_name") + private String lastName; + + @Column(name = "salary") + private BigDecimal salary; + + @ManyToOne + @JoinColumn(name = "department_id", referencedColumnName = "id") + private Department department; + + @ManyToOne + @JoinColumn(name = "address_id", referencedColumnName = "id") + private Address address; + + @BatchSize(size = 100) + @ManyToMany + @JoinTable(name = "employees_projects", + joinColumns = @JoinColumn(name = "employee_id", referencedColumnName = "id"), + inverseJoinColumns = @JoinColumn(name = "project_id", referencedColumnName = "id")) + private List projects; + + + public Employee(String firstName, String lastName) { + this.firstName = firstName; + this.lastName = lastName; + } +} diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Project.java b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Project.java new file mode 100644 index 00000000..f22e4242 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/models/Project.java @@ -0,0 +1,21 @@ +package ru.otus.example.jpql_demo.models; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "projects") +public class Project { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(name = "name") + private String name; +} diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/EmployeeRepository.java b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/EmployeeRepository.java new file mode 100644 index 00000000..3c00881c --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/EmployeeRepository.java @@ -0,0 +1,49 @@ +package ru.otus.example.jpql_demo.repositories; + +import ru.otus.example.jpql_demo.dto.CitySalary; +import ru.otus.example.jpql_demo.dto.EmployeeProjects; +import ru.otus.example.jpql_demo.models.Employee; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Optional; + +public interface EmployeeRepository { + + List findAll(); + Optional findEmployeeById(long id); + List findAllEmployeesWithSalaryOver100000(); + List findEmployeesFirstNames(); + List findEmployeesFirstAndLastNames(); + long calcEmployeesCount(); + BigDecimal findMaxEmployeeSalary(); + Double calcAvgEmployeeSalary(); + + + List calcAvgSalaryByCities(); + List calcAvgSalaryByCitiesSorted(); + List calcAvgSalaryByCitiesHavingValueOver100000(); + + + List findEmployeesWithGivenProjects(String p1Name, String p2Name); + List findEmployeesProjectsCount(); + + + List findEmployeesWithGivenFirstNames(String name1, String name2); + List findEmployeesWithFirstNamesFromGivenList(List names); + List findEmployeeNameSakes(Employee employee); + + + Employee findEmployeeNameSake(Employee employee); + List findEmployeesWithSalaryLessThanGivenEmployee(Employee employee); + List findEmployeeWithNameMatchingAnyOtherEmployeesNames(); + List findEmployeesWithSalaryLessThanAllEmployees(); + + + int updateEmployeesSalary(BigDecimal oldSalary, BigDecimal newSalary); + int doubleEmployeesSalary(BigDecimal oldSalary); + int deleteEmployeesWithoutDepartment(); + + + +} diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpa.java b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpa.java new file mode 100644 index 00000000..36c2eff9 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpa.java @@ -0,0 +1,241 @@ +package ru.otus.example.jpql_demo.repositories; + +import org.springframework.stereotype.Repository; +import ru.otus.example.jpql_demo.dto.CitySalary; +import ru.otus.example.jpql_demo.dto.EmployeeProjects; +import ru.otus.example.jpql_demo.models.Employee; + +import javax.persistence.*; +import java.math.BigDecimal; +import java.util.List; +import java.util.Optional; + +@Repository +public class EmployeeRepositoryJpa implements EmployeeRepository { + + @PersistenceContext + private final EntityManager em; + + public EmployeeRepositoryJpa(EntityManager em) { + this.em = em; + } + + @Override + public List findAll() { + return em.createQuery("select e from Employee e", Employee.class).getResultList(); + } + + @Override + public Optional findEmployeeById(long id) { + TypedQuery query = em.createQuery( + "select e from Employee e where e.id = :id" + , Employee.class); + query.setParameter("id", id); + try { + return Optional.of(query.getSingleResult()); + } catch (NoResultException e) { + return Optional.empty(); + } + } + + @Override + public List findAllEmployeesWithSalaryOver100000() { + return em.createQuery( + "select e from Employee e where e.salary > 100000" + , Employee.class).getResultList(); + } + + @Override + public List findEmployeesFirstNames() { + return em.createQuery( + "select e.firstName from Employee e" + , String.class).getResultList(); + } + + @SuppressWarnings("unchecked") + @Override + public List findEmployeesFirstAndLastNames() { + return em.createQuery( + "select e.firstName, e.lastName from Employee e" + ).getResultList(); + } + + @Override + public long calcEmployeesCount() { + return em.createQuery( + "select count(e) from Employee e" + , Long.class).getSingleResult(); + } + + @Override + public BigDecimal findMaxEmployeeSalary() { + return em.createQuery( + "select max(e.salary) from Employee e" + , BigDecimal.class).getSingleResult(); + } + + @Override + public Double calcAvgEmployeeSalary() { + return em.createQuery( + "select avg(e.salary) from Employee e" + , Double.class).getSingleResult(); + } + + //------------------------------------------------------------------------------------------------------- + + @Override + public List calcAvgSalaryByCities() { + return em.createQuery( + "select new ru.otus.example.jpql_demo.dto.CitySalary(e.address.city, avg(e.salary)) " + + "from Employee e " + + "group by e.address.city" + , CitySalary.class).getResultList(); + } + + @Override + public List calcAvgSalaryByCitiesSorted() { + return em.createQuery( + "select new ru.otus.example.jpql_demo.dto.CitySalary(e.address.city, avg(e.salary)) " + + "from Employee e " + + "group by e.address.city " + + "order by avg(e.salary)" + , CitySalary.class).getResultList(); + } + + @Override + public List calcAvgSalaryByCitiesHavingValueOver100000() { + return em.createQuery( + "select new ru.otus.example.jpql_demo.dto.CitySalary(e.address.city, avg(e.salary)) " + + "from Employee e " + + "group by e.address.city " + + "having avg(e.salary) > 100000" + + "order by avg(e.salary) " + , CitySalary.class).getResultList(); + } + + //------------------------------------------------------------------------------------------------------- + + @Override + public List findEmployeesWithGivenProjects(String p1Name, String p2Name) { + TypedQuery query = em.createQuery( + "select e " + + "from Employee e join e.projects p1 join e.projects p2 " + + "where p1.name = :p1 and p2.name = :p2" + , Employee.class); + query.setParameter("p1", p1Name); + query.setParameter("p2", p2Name); + return query.getResultList(); + } + + @Override + public List findEmployeesProjectsCount() { + return em.createQuery( + "select new ru.otus.example.jpql_demo.dto.EmployeeProjects(e, count(p)) " + + "from Employee e left join e.projects p " + + "group by e " + + "order by count(p) desc " + , EmployeeProjects.class).getResultList(); + } + + //------------------------------------------------------------------------------------------------------- + + @Override + public List findEmployeesWithGivenFirstNames(String name1, String name2) { + TypedQuery query = em.createQuery( + "select e " + + "from Employee e " + + "where e.firstName in (:name1, :name2) " + , Employee.class); + query.setParameter("name1", name1); + query.setParameter("name2", name2); + return query.getResultList(); + } + + @Override + public List findEmployeesWithFirstNamesFromGivenList(List names) { + TypedQuery query = em.createQuery( + "select e " + + "from Employee e " + + "where e.firstName in :names " + , Employee.class); + query.setParameter("names", names); + return query.getResultList(); + } + + @Override + public List findEmployeeNameSakes(Employee employee) { + TypedQuery query = em.createQuery( + "select e " + + "from Employee e " + + "where e.firstName in (select e2.firstName from Employee e2 where e2.lastName = :lastName and e2.id <> :id) " + , Employee.class); + query.setParameter("lastName", employee.getLastName()); + query.setParameter("id", employee.getId()); + return query.getResultList(); + } + + //------------------------------------------------------------------------------------------------------- + + @Override + public Employee findEmployeeNameSake(Employee employee) { + TypedQuery query = em.createQuery( + "select e " + + "from Employee e " + + "where e.firstName = (select e2.firstName from Employee e2 where e2.id = :id) and e.id <> :id " + , Employee.class); + query.setParameter("id", employee.getId()); + return query.getSingleResult(); + } + + @Override + public List findEmployeesWithSalaryLessThanGivenEmployee(Employee employee) { + TypedQuery query = em.createQuery( + "select e " + + "from Employee e " + + "where e.salary < (select e2.salary from Employee e2 where e2.id = :id) " + , Employee.class); + query.setParameter("id", employee.getId()); + return query.getResultList(); + } + + @Override + public List findEmployeeWithNameMatchingAnyOtherEmployeesNames() { + return em.createQuery( + "select e " + + "from Employee e " + + "where e.firstName = any(select e2.firstName from Employee e2 where e2.id <> e.id) " + , Employee.class).getResultList(); + } + + @Override + public List findEmployeesWithSalaryLessThanAllEmployees() { + return em.createQuery( + "select e " + + "from Employee e " + + "where e.salary <= all(select e2.salary from Employee e2) " + , Employee.class).getResultList(); + } + + //------------------------------------------------------------------------------------------------------- + + @Override + public int updateEmployeesSalary(BigDecimal oldSalary, BigDecimal newSalary) { + Query query = em.createQuery("update Employee e set e.salary = :newSalary where e.salary = :oldSalary"); + query.setParameter("newSalary", newSalary); + query.setParameter("oldSalary", oldSalary); + return query.executeUpdate(); + } + + @Override + public int doubleEmployeesSalary(BigDecimal oldSalary) { + Query query = em.createQuery("update Employee e set e.salary = e.salary * 2 where e.salary = :oldSalary"); + query.setParameter("oldSalary", oldSalary); + return query.executeUpdate(); + } + + @Override + public int deleteEmployeesWithoutDepartment() { + return em.createQuery("delete from Employee e where e.department is null") + .executeUpdate(); + } +} diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/resources/application.yml b/2021-08/spring-09-jpql/jpql-demo/src/main/resources/application.yml new file mode 100644 index 00000000..d9f3dc49 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + + jpa: + generate-ddl: false + hibernate: + ddl-auto: none + + show-sql: true + properties: + hibernate: + #format_sql: true + diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/resources/jpql.sql b/2021-08/spring-09-jpql/jpql-demo/src/main/resources/jpql.sql new file mode 100644 index 00000000..8fcc220f --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/resources/jpql.sql @@ -0,0 +1,74 @@ +select e from Employee e where e.id = :id +---------------------------------------------------------------------------------- +select e from Employee e where e.salary > 100000 +---------------------------------------------------------------------------------- +select e.firstName from Employee e +---------------------------------------------------------------------------------- +select e.firstName, e.lastName from Employee e +---------------------------------------------------------------------------------- +select count(e) from Employee e +---------------------------------------------------------------------------------- +select max(e.salary) from Employee e +---------------------------------------------------------------------------------- +select new ru.otus.example.jpql_demo.dto.CitySalary(e.address.city, avg(e.salary)) +from Employee e +group by e.address.city +---------------------------------------------------------------------------------- +select new ru.otus.example.jpql_demo.dto.CitySalary(e.address.city, avg(e.salary)) +from Employee e +group by e.address.city +order by avg(e.salary) +---------------------------------------------------------------------------------- +select new ru.otus.example.jpql_demo.dto.CitySalary(e.address.city, avg(e.salary)) +from Employee e +group by e.address.city +having avg(e.salary) > 100000 +order by avg(e.salary) +---------------------------------------------------------------------------------- +select e +from Employee e join e.projects p1 join e.projects p2 +where p1.name = :p1 and p2.name = :p2 +---------------------------------------------------------------------------------- +select new ru.otus.example.jpql_demo.dto.EmployeeProjects(e, count(p)) +from Employee e left join e.projects p +group by e +order by count(p) desc +---------------------------------------------------------------------------------- +select e +from Employee e +where e.firstName in (:name1, :name2) +---------------------------------------------------------------------------------- +select e +from Employee e +where e.firstName in :names +---------------------------------------------------------------------------------- +select e +from Employee e +where e.firstName in (select e2.firstName + from Employee e2 + where e2.lastName = :lastName and + e2.id <> :id) +---------------------------------------------------------------------------------- +select e +from Employee e +where e.firstName = (select e2.firstName + from Employee e2 + where e2.id = :id) and e.id <> :id +---------------------------------------------------------------------------------- +select e +from Employee e +where e.salary < (select e2.salary + from Employee e2 + where e2.id = :id) +---------------------------------------------------------------------------------- +select e +from Employee e +where e.firstName = any(select e2.firstName + from Employee e2 + where e2.id <> e.id) +---------------------------------------------------------------------------------- +select e +from Employee e +where e.salary <= all(select e2.salary + from Employee e2) +---------------------------------------------------------------------------------- \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-demo/src/main/resources/schema.sql b/2021-08/spring-09-jpql/jpql-demo/src/main/resources/schema.sql new file mode 100644 index 00000000..f1425901 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/main/resources/schema.sql @@ -0,0 +1,39 @@ +DROP TABLE IF EXISTS employees_projects; +DROP TABLE IF EXISTS addresses; +DROP TABLE IF EXISTS departments; +DROP TABLE IF EXISTS projects; +DROP TABLE IF EXISTS employees; + +CREATE TABLE addresses ( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + city VARCHAR(255) +); + +CREATE TABLE departments ( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(255) +); + +CREATE TABLE projects ( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(255) +); + + +CREATE TABLE employees ( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + first_name VARCHAR(255), + last_name VARCHAR(255), + salary BIGINT, + address_id BIGINT, + department_id BIGINT, + FOREIGN KEY(address_id) REFERENCES addresses(id) ON DELETE CASCADE, + FOREIGN KEY(department_id) REFERENCES departments(id) ON DELETE CASCADE +); + +CREATE TABLE employees_projects ( + employee_id BIGINT, + project_id BIGINT, + FOREIGN KEY(employee_id) REFERENCES employees(id) ON DELETE CASCADE, + FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE +); \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpaTest.java b/2021-08/spring-09-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpaTest.java new file mode 100644 index 00000000..8126c5c8 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpaTest.java @@ -0,0 +1,282 @@ +package ru.otus.example.jpql_demo.repositories; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.context.annotation.Import; +import ru.otus.example.jpql_demo.dto.CitySalary; +import ru.otus.example.jpql_demo.dto.EmployeeProjects; +import ru.otus.example.jpql_demo.models.Employee; + +import javax.persistence.NonUniqueResultException; +import java.math.BigDecimal; +import java.util.List; +import java.util.Optional; +import java.util.stream.IntStream; + +import static org.assertj.core.api.Assertions.*; + +@DisplayName("Репозиторий Employee должен") +@DataJpaTest +@Import(EmployeeRepositoryJpa.class) +class EmployeeRepositoryJpaTest { + + private static final long FIRST_EMPLOYEE_ID = 1L; + private static final long SECOND_EMPLOYEE_ID = 2L; + private static final long THIRD_EMPLOYEE_ID = 3L; + private static final long FOURTH_EMPLOYEE_ID = 4L; + private static final long SEVENTH_EMPLOYEE_ID = 7L; + private static final long EIGTH_EMPLOYEE_ID = 8L; + + private static final int EMPLOYEES_COUNT = 8; + private static final String FIRST_EMPLOYEE_FIRST_NAME = "fn1"; + + private static final String PROJECT_3 = "Project #3"; + private static final String PROJECT_4 = "Project #4"; + + private static final CitySalary SARATOV_SALARY = new CitySalary("Saratov", 66666.0); + private static final CitySalary OMSK_SALARY = new CitySalary("Omsk", 170000.0); + private static final CitySalary MOSCOW_SALARY = new CitySalary("Moscow", 330100.0); + + private static final int MAX_SALARY = 1000000; + private static final double AVG_SALARY = 211299.75d; + private static final int EMPLOYEES_WITH_SALARY_OVER_100000_COUNT = 4; + private static final int FOURTH_EMPLOYEE_PROJECTS_COUNT = 4; + private static final String NAME_SAKE_NAME_1 = "NameSake1"; + private static final String NAME_SAKE_NAME_2 = "NameSake2"; + + @Autowired + private TestEntityManager em; + + @Autowired + private EmployeeRepositoryJpa employeeRepository; + + + @DisplayName("возвращать список всех сотрудников") + @Test + void shouldFindAllEmployees() { + List employees = employeeRepository.findAll(); + assertThat(employees).hasSize(EMPLOYEES_COUNT); + } + + @DisplayName("возвращать сотрудника по его id") + @Test + void shouldFindEmployeeById() { + Optional employee = employeeRepository.findEmployeeById(FIRST_EMPLOYEE_ID); + assertThat(employee).isNotEmpty().get() + .hasFieldOrPropertyWithValue("firstName", FIRST_EMPLOYEE_FIRST_NAME); + } + + @DisplayName("возвращать список всех сотрудников c окладом более 100000") + @Test + void shouldFindAllEmployeesWithSalaryOver100000() { + List allEmployeesWithSalaryOver100000 = employeeRepository.findAllEmployeesWithSalaryOver100000(); + assertThat(allEmployeesWithSalaryOver100000).size().isEqualTo(EMPLOYEES_WITH_SALARY_OVER_100000_COUNT); + } + + @DisplayName("возвращать список имен всех сотрудников") + @Test + void shouldFindEmployeesFirstNames() { + List employeesFirstNames = employeeRepository.findEmployeesFirstNames(); + assertThat(employeesFirstNames) + .containsExactlyInAnyOrder("fn1", "fn2", "fn3", "fn4", "fn5", "fn6", "fn7", "fn8"); + } + + @DisplayName("возвращать список имен и фамилий всех сотрудников") + @Test + void shouldFindEmployeesFirstAndLastNames() { + List employeesFirstAndLastNames = employeeRepository.findEmployeesFirstAndLastNames(); + String[][] expectedFirstAndLastNames = new String[EMPLOYEES_COUNT][2]; + IntStream.range(1, EMPLOYEES_COUNT + 1) + .forEachOrdered(i -> expectedFirstAndLastNames[i - 1] = new String[]{"fn" + i, "ln" + i}); + assertThat(employeesFirstAndLastNames).containsExactlyInAnyOrder(expectedFirstAndLastNames); + } + + @DisplayName("считать общее количество сотрудников") + @Test + void shouldCalcEmployeesCount() { + long employeesCount = employeeRepository.calcEmployeesCount(); + assertThat(employeesCount).isEqualTo(EMPLOYEES_COUNT); + } + + @DisplayName("находить максимальный оклад сотрудников") + @Test + void shouldFindMaxEmployeeSalary() { + BigDecimal maxSalary = employeeRepository.findMaxEmployeeSalary(); + assertThat(maxSalary).isEqualTo(new BigDecimal(MAX_SALARY)); + } + + @DisplayName("считать средний оклад всех сотрудников") + @Test + void shouldCalcAvgEmployeeSalary() { + Double avgSalary = employeeRepository.calcAvgEmployeeSalary(); + assertThat(avgSalary).isEqualTo(AVG_SALARY, offset(0.01d)); + } + + //------------------------------------------------------------------------------------------------------- + + @DisplayName("возвращать список окладов по городам") + @Test + void shouldCalcAvgEmployeeSalaryByCities() { + List avgSalaryByCities = employeeRepository.calcAvgSalaryByCities(); + assertThat(avgSalaryByCities) + .containsExactlyInAnyOrder(SARATOV_SALARY, MOSCOW_SALARY, OMSK_SALARY); + } + + @DisplayName("возвращать сортированный список окладов по городам") + @Test + void shouldCalcAvgEmployeeSalaryByCitiesSorted() { + List avgSalaryByCities = employeeRepository.calcAvgSalaryByCitiesSorted(); + assertThat(avgSalaryByCities) + .containsExactly(SARATOV_SALARY, OMSK_SALARY, MOSCOW_SALARY); + } + + @DisplayName("возвращать список окладов по городам, где средний доход сотрудников более 100000") + @Test + void shouldCalcAvgEmployeeSalaryByCitiesHavingValueOver100000() { + List avgSalaryByCities = employeeRepository.calcAvgSalaryByCitiesHavingValueOver100000(); + assertThat(avgSalaryByCities).containsExactly(OMSK_SALARY, MOSCOW_SALARY); + } + + //------------------------------------------------------------------------------------------------------- + + @DisplayName("возвращать список всех сотрудников работающих над заданными проектами") + @Test + void shouldFindEmployeesWithGivenProjects() { + Employee employee2 = em.find(Employee.class, SECOND_EMPLOYEE_ID); + Employee employee4 = em.find(Employee.class, FOURTH_EMPLOYEE_ID); + List employees = employeeRepository.findEmployeesWithGivenProjects(PROJECT_3, PROJECT_4); + assertThat(employees).hasSize(2).containsExactlyInAnyOrder(employee2, employee4); + } + + @DisplayName("возвращать количество проектов по сотрудникам") + @Test + void shouldFindEmployeesProjectsCount() { + Employee employee4 = em.find(Employee.class, FOURTH_EMPLOYEE_ID); + List employeeProjects = employeeRepository.findEmployeesProjectsCount(); + assertThat(employeeProjects).hasSize(EMPLOYEES_COUNT) + .contains(new EmployeeProjects(employee4, FOURTH_EMPLOYEE_PROJECTS_COUNT)); + } + + //------------------------------------------------------------------------------------------------------- + + @DisplayName("возвращать список всех сотрудников имеющих одно из двух заданных имен") + @Test + void shouldFindEmployeesWithGivenFirstNames() { + Employee employee1 = em.find(Employee.class, FIRST_EMPLOYEE_ID); + Employee employee7 = em.find(Employee.class, SEVENTH_EMPLOYEE_ID); + List employees = employeeRepository.findEmployeesWithGivenFirstNames("fn1", "fn7"); + assertThat(employees).hasSize(2).containsExactlyInAnyOrder(employee1, employee7); + } + + @DisplayName("возвращать список всех сотрудников имеющих имя, совпадающее с одним из заданного списка") + @Test + void shouldFindEmployeesWithFirstNamesFromGivenList() { + Employee employee1 = em.find(Employee.class, FIRST_EMPLOYEE_ID); + Employee employee7 = em.find(Employee.class, SEVENTH_EMPLOYEE_ID); + List employees = employeeRepository.findEmployeesWithFirstNamesFromGivenList(List.of("fn1", "fn7")); + assertThat(employees).hasSize(2).containsExactlyInAnyOrder(employee1, employee7); + } + + @DisplayName("возвращать список всех однофамильцев заданного сотрудника") + @Test + void shouldFindEmployeesNameSakes() { + Employee employee1 = em.find(Employee.class, FIRST_EMPLOYEE_ID); + Employee employee9 = em.persistAndFlush(new Employee(NAME_SAKE_NAME_1, employee1.getLastName())); + Employee employee10 = em.persistAndFlush(new Employee(NAME_SAKE_NAME_2, employee1.getLastName())); + List nameSakes = employeeRepository.findEmployeeNameSakes(employee1); + assertThat(nameSakes).hasSize(2).containsExactlyInAnyOrder(employee9, employee10); + } + + //------------------------------------------------------------------------------------------------------- + + @DisplayName("возвращать список всех тезок заданного сотрудника") + @Test + void shouldFindEmployeeNameSake() { + Employee employee1 = em.find(Employee.class, FIRST_EMPLOYEE_ID); + Employee employee9 = em.persistAndFlush(new Employee(employee1.getFirstName(), NAME_SAKE_NAME_1)); + Employee nameSake = employeeRepository.findEmployeeNameSake(employee1); + assertThat(nameSake).usingRecursiveComparison().isEqualTo(employee9); + + em.persistAndFlush(new Employee(employee1.getFirstName(), NAME_SAKE_NAME_2)); + assertThatCode(() -> employeeRepository.findEmployeeNameSake(employee1)) + .isInstanceOf(NonUniqueResultException.class); + } + + @DisplayName("возвращать список всех сотрудников имеющих оклад меньше, чем у заданного сотрудника") + @Test + void shouldFindEmployeesWithSalaryLessThanGivenEmployee() { + Employee employee1 = em.find(Employee.class, FIRST_EMPLOYEE_ID); + Employee employee2 = em.find(Employee.class, SECOND_EMPLOYEE_ID); + Employee employee3 = em.find(Employee.class, THIRD_EMPLOYEE_ID); + Employee employee7 = em.find(Employee.class, SEVENTH_EMPLOYEE_ID); + List employees = employeeRepository.findEmployeesWithSalaryLessThanGivenEmployee(employee7); + assertThat(employees).hasSize(3).containsExactlyInAnyOrder(employee1, employee2, employee3); + } + + @DisplayName("возвращать сотрудника, являющегося тезкой любому другому сотруднику") + @Test + void shouldFindEmployeeWithNameMatchingAnyOtherEmployeesNames() { + Employee employee1 = em.find(Employee.class, FIRST_EMPLOYEE_ID); + Employee employee9 = em.persistAndFlush(new Employee(employee1.getFirstName(), NAME_SAKE_NAME_1)); + List nameSakes = employeeRepository.findEmployeeWithNameMatchingAnyOtherEmployeesNames(); + assertThat(nameSakes).hasSize(2).containsExactlyInAnyOrder(employee9, employee1); + } + + @DisplayName("возвращать сотрудника имеющго оклад меньше, чем у всех") + @Test + void shouldFindEmployeesWithSalaryLessThanAllEmployees() { + Employee employee3 = em.find(Employee.class, THIRD_EMPLOYEE_ID); + List employees = employeeRepository.findEmployeesWithSalaryLessThanAllEmployees(); + assertThat(employees).hasSize(1).containsOnly(employee3); + + } + + //------------------------------------------------------------------------------------------------------- + + @DisplayName("изменять значение оклада сотрудника имеющего заданный оклад") + @Test + void shouldUpdateEmployeesSalary() { + Employee employee3 = em.find(Employee.class, THIRD_EMPLOYEE_ID); + BigDecimal oldSalary = employee3.getSalary(); + BigDecimal newSalary = oldSalary.multiply(new BigDecimal(2)); + em.detach(employee3); + employeeRepository.updateEmployeesSalary(oldSalary, newSalary); + + employee3 = em.find(Employee.class, THIRD_EMPLOYEE_ID); + assertThat(employee3.getSalary()).isEqualTo(newSalary); + } + + @DisplayName("изменять значение оклада в два раза, у сотрудника имеющего заданный оклад") + @Test + void shouldDoubleEmployeesSalary() { + Employee employee3 = em.find(Employee.class, THIRD_EMPLOYEE_ID); + BigDecimal oldSalary = employee3.getSalary(); + BigDecimal newSalary = oldSalary.multiply(new BigDecimal(2)); + em.detach(employee3); + employeeRepository.doubleEmployeesSalary(oldSalary); + + employee3 = em.find(Employee.class, THIRD_EMPLOYEE_ID); + assertThat(employee3.getSalary()).isEqualTo(newSalary); + } + + @DisplayName("удалять сотрудников не относящихся ни к одному отделу") + @Test + void shouldDeleteEmployeesWithoutDepartment() { + Employee employee2 = em.find(Employee.class, SECOND_EMPLOYEE_ID); + Employee employee8 = em.find(Employee.class, EIGTH_EMPLOYEE_ID); + assertThat(employee2).isNotNull(); + assertThat(employee8).isNotNull(); + employeeRepository.deleteEmployeesWithoutDepartment(); + + em.clear(); + + employee2 = em.find(Employee.class, SECOND_EMPLOYEE_ID); + employee8 = em.find(Employee.class, EIGTH_EMPLOYEE_ID); + assertThat(employee2).isNull(); + assertThat(employee8).isNull(); + } + +} \ No newline at end of file diff --git a/2021-08/spring-09-jpql/jpql-demo/src/test/resources/application.yml b/2021-08/spring-09-jpql/jpql-demo/src/test/resources/application.yml new file mode 100644 index 00000000..30cb8ab6 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/test/resources/application.yml @@ -0,0 +1,16 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + initialization-mode: always + data: test-data.sql + + jpa: + generate-ddl: false + hibernate: + ddl-auto: none + + show-sql: true + properties: + hibernate: + #format_sql: true + diff --git a/2021-08/spring-09-jpql/jpql-demo/src/test/resources/test-data.sql b/2021-08/spring-09-jpql/jpql-demo/src/test/resources/test-data.sql new file mode 100644 index 00000000..6ac15df5 --- /dev/null +++ b/2021-08/spring-09-jpql/jpql-demo/src/test/resources/test-data.sql @@ -0,0 +1,21 @@ +INSERT INTO addresses (city) VALUES ('Saratov'), ('Omsk'), ('Moscow'); +INSERT INTO departments (name) VALUES ('IT'), ('AHO'); +INSERT INTO projects (name) VALUES ('Project #1'), ('Project #2'), ('Project #3'), ('Project #4'); + +INSERT INTO employees (first_name, last_name, salary, address_id, department_id) +VALUES ('fn1', 'ln1', 70000, 1, 1), + ('fn2', 'ln2', 99998, 1, null), + ('fn3', 'ln3', 30000, 1, 2), + + ('fn4', 'ln4', 170000, 2, 1), + + ('fn5', 'ln5', 120000, 3, 1), + ('fn6', 'ln6', 100400, 3, 1), + ('fn7', 'ln7', 100000, 3, 1), + ('fn8', 'ln8', 1000000, 3, null); + + +INSERT INTO employees_projects (employee_id, project_id) +VALUES (1, 1), (1, 2), (1, 3), + (2, 3), (2, 4), + (4, 1), (4, 2), (4, 3), (4, 4); \ No newline at end of file