From 663df6a3132c447612faa34dda4ff54e961cd95e Mon Sep 17 00:00:00 2001 From: GokaPek Date: Fri, 14 Feb 2025 22:19:27 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=BE=D0=BD=D0=B0?= =?UTF-8?q?=D1=87=D0=B0=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F=20=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=20=D0=B7=D0=B0=D0=BA=D0=BE=D0=BD=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/unive/schedule/service/ClassroomService.java | 3 --- .../edu/unive/schedule/service/ClassroomServiceImpl.java | 6 +++--- .../java/edu/unive/schedule/service/ScheduleService.java | 2 -- .../edu/unive/schedule/service/ScheduleServiceImpl.java | 9 +++------ schedule/src/main/resources/application.yml | 3 ++- schedule/src/main/resources/db/migration/V1__Init.sql | 6 ++++-- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/schedule/src/main/java/edu/unive/schedule/service/ClassroomService.java b/schedule/src/main/java/edu/unive/schedule/service/ClassroomService.java index 1b72dc8..ab084b3 100644 --- a/schedule/src/main/java/edu/unive/schedule/service/ClassroomService.java +++ b/schedule/src/main/java/edu/unive/schedule/service/ClassroomService.java @@ -1,10 +1,7 @@ package edu.unive.schedule.service; import edu.unive.schedule.domain.Classroom; -import edu.unive.schedule.domain.entity.ClassroomEntity; -import org.springframework.stereotype.Service; -@Service public interface ClassroomService { void createClassroom(Classroom classroom); Classroom getClassroomById(Long id); diff --git a/schedule/src/main/java/edu/unive/schedule/service/ClassroomServiceImpl.java b/schedule/src/main/java/edu/unive/schedule/service/ClassroomServiceImpl.java index b9f2427..0debffb 100644 --- a/schedule/src/main/java/edu/unive/schedule/service/ClassroomServiceImpl.java +++ b/schedule/src/main/java/edu/unive/schedule/service/ClassroomServiceImpl.java @@ -1,13 +1,12 @@ package edu.unive.schedule.service; import edu.unive.schedule.domain.Classroom; -import edu.unive.schedule.domain.entity.ClassroomEntity; import edu.unive.schedule.domain.mapper.ClassroomEntityMapper; import edu.unive.schedule.domain.mapper.ClassroomMapper; import edu.unive.schedule.repository.ClassroomRepository; +import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @@ -20,7 +19,8 @@ public class ClassroomServiceImpl implements ClassroomService { @Override @Transactional public void createClassroom(Classroom classroomDTO) { - ClassroomEntity entity = classroomEntityMapper.ToEntity(classroomDTO); + var entity = classroomEntityMapper.ToEntity(classroomDTO); + entity.setId(null); classroomRepository.save(entity); } diff --git a/schedule/src/main/java/edu/unive/schedule/service/ScheduleService.java b/schedule/src/main/java/edu/unive/schedule/service/ScheduleService.java index d9d375c..fcf4f4f 100644 --- a/schedule/src/main/java/edu/unive/schedule/service/ScheduleService.java +++ b/schedule/src/main/java/edu/unive/schedule/service/ScheduleService.java @@ -1,9 +1,7 @@ package edu.unive.schedule.service; import edu.unive.schedule.domain.Schedule; -import org.springframework.stereotype.Service; -@Service public interface ScheduleService { void createSchedule(Schedule schedule); void updateSchedule(Long id, Schedule schedule); diff --git a/schedule/src/main/java/edu/unive/schedule/service/ScheduleServiceImpl.java b/schedule/src/main/java/edu/unive/schedule/service/ScheduleServiceImpl.java index 496d99c..0723a88 100644 --- a/schedule/src/main/java/edu/unive/schedule/service/ScheduleServiceImpl.java +++ b/schedule/src/main/java/edu/unive/schedule/service/ScheduleServiceImpl.java @@ -1,19 +1,15 @@ package edu.unive.schedule.service; -import edu.unive.schedule.domain.Classroom; import edu.unive.schedule.domain.Schedule; -import edu.unive.schedule.domain.entity.ClassroomEntity; import edu.unive.schedule.domain.entity.ScheduleEntity; import edu.unive.schedule.domain.mapper.ScheduleEntityMapper; -import edu.unive.schedule.domain.mapper.ScheduleMapper; -import edu.unive.schedule.repository.ClassroomRepository; import edu.unive.schedule.repository.ScheduleRepository; import jakarta.transaction.Transactional; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service -@AllArgsConstructor +@RequiredArgsConstructor public class ScheduleServiceImpl implements ScheduleService { private final ScheduleRepository scheduleRepository; @@ -24,6 +20,7 @@ public class ScheduleServiceImpl implements ScheduleService { @Override public void createSchedule(Schedule scheduleDTO) { ScheduleEntity entity = scheduleEntityMapper.toEntity(scheduleDTO); + entity.setId(null); scheduleRepository.save(entity); } diff --git a/schedule/src/main/resources/application.yml b/schedule/src/main/resources/application.yml index 0cfa47c..5c6d1be 100644 --- a/schedule/src/main/resources/application.yml +++ b/schedule/src/main/resources/application.yml @@ -14,4 +14,5 @@ spring: show-sql: true properties: hibernate: - format_sql: true \ No newline at end of file + format_sql: true + use_sql_comments: true \ No newline at end of file diff --git a/schedule/src/main/resources/db/migration/V1__Init.sql b/schedule/src/main/resources/db/migration/V1__Init.sql index 1d43e9f..08cb2cc 100644 --- a/schedule/src/main/resources/db/migration/V1__Init.sql +++ b/schedule/src/main/resources/db/migration/V1__Init.sql @@ -1,11 +1,13 @@ CREATE TABLE classroom ( - id BIGINT PRIMARY KEY, + id BIGSERIAL + CONSTRAINT classroom_pk PRIMARY KEY, name VARCHAR(255) NOT NULL, type VARCHAR(50) NOT NULL ); CREATE TABLE schedule ( - id BIGINT PRIMARY KEY, + id BIGSERIAL + CONSTRAINT schedule_pk PRIMARY KEY, start_time TIMESTAMP NOT NULL, end_time TIMESTAMP NOT NULL, classroom_id BIGINT,