From eedeac70dd3ad85076dd376e9ad26f5918a97c83 Mon Sep 17 00:00:00 2001 From: capDoYeonLee Date: Sat, 28 Sep 2024 16:08:03 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/error/build.gradle | 3 +++ BE/error/docker-compose.yml | 3 +-- .../response/ApiResponseBody.java | 2 +- .../dto/CreateScheduleRequest.java | 2 ++ .../application/model/ScheduleModel.java | 3 +++ .../converter/ScheduleEntityConverter.java | 1 + .../converter/ScheduleRequestConverter.java | 1 + .../application/service/ScheduleService.java | 19 +++++++++++++++++-- .../schedule/persistence/ScheduleEntity.java | 6 ++++-- 9 files changed, 33 insertions(+), 7 deletions(-) diff --git a/BE/error/build.gradle b/BE/error/build.gradle index c2d85da1..d2e66734 100644 --- a/BE/error/build.gradle +++ b/BE/error/build.gradle @@ -44,6 +44,7 @@ dependencies { runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' implementation 'io.jsonwebtoken:jjwt-api:0.11.5' implementation group: 'org.javassist', name: 'javassist', version: '3.15.0-GA' + implementation group: 'org.modelmapper', name: 'modelmapper', version: '2.3.9' // implementation 'org.springframework.cloud:spring-cloud-starter-config' // implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client' @@ -52,6 +53,8 @@ dependencies { implementation 'org.hibernate:hibernate-validator:5.2.4.Final' + implementation("org.slf4j:slf4j-simple:1.7.36") + //implementation 'org.springframework.boot:spring-boot-starter-security' } diff --git a/BE/error/docker-compose.yml b/BE/error/docker-compose.yml index 45e1743c..2a0e3b09 100644 --- a/BE/error/docker-compose.yml +++ b/BE/error/docker-compose.yml @@ -9,7 +9,7 @@ services: - MYSQL_ROOT_PASSWORD=root command: [ "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci", "--lower_case_table_names=1", "--max_connections=2048", "--wait_timeout=3600" ] ports: - - "13306:3306" + - "3306:3306" volumes: #볼륨 지정 - ./resources/develop-environment/mysql-init.d:/docker-entrypoint-initdb.d networks: #사용할 네트워크 지정 @@ -44,7 +44,6 @@ services: SPRING_REDIS_PORT: 6379 SPRING_REDIS_PASSWORD: root - networks: #사용할 네트워크 지정 - error-network # diff --git a/BE/error/src/main/java/com/example/demo/common/presentation/response/ApiResponseBody.java b/BE/error/src/main/java/com/example/demo/common/presentation/response/ApiResponseBody.java index 06438841..76e38616 100644 --- a/BE/error/src/main/java/com/example/demo/common/presentation/response/ApiResponseBody.java +++ b/BE/error/src/main/java/com/example/demo/common/presentation/response/ApiResponseBody.java @@ -8,7 +8,7 @@ public class ApiResponseBody { @Getter @AllArgsConstructor - public static class FailureBody implements Serializable { //직렬화를 왜 한거지? + public static class FailureBody implements Serializable { private String status; private String code; private String message; diff --git a/BE/error/src/main/java/com/example/demo/schedule/application/dto/CreateScheduleRequest.java b/BE/error/src/main/java/com/example/demo/schedule/application/dto/CreateScheduleRequest.java index 8d4204c1..9d5cfe26 100644 --- a/BE/error/src/main/java/com/example/demo/schedule/application/dto/CreateScheduleRequest.java +++ b/BE/error/src/main/java/com/example/demo/schedule/application/dto/CreateScheduleRequest.java @@ -1,5 +1,6 @@ package com.example.demo.schedule.application.dto; +import com.example.demo.auth.persistence.MemberEntity; import com.example.demo.common.support.dto.AbstractDto; import com.example.demo.filter.application.model.FilterModel; import com.example.demo.filter.persistence.FilterEntity; @@ -24,5 +25,6 @@ public class CreateScheduleRequest implements AbstractDto { private String eventPlace; private String scheduleType; private FilterEntity filter; + private MemberEntity member; } diff --git a/BE/error/src/main/java/com/example/demo/schedule/application/model/ScheduleModel.java b/BE/error/src/main/java/com/example/demo/schedule/application/model/ScheduleModel.java index cb0b6c81..3d98e112 100644 --- a/BE/error/src/main/java/com/example/demo/schedule/application/model/ScheduleModel.java +++ b/BE/error/src/main/java/com/example/demo/schedule/application/model/ScheduleModel.java @@ -1,6 +1,8 @@ package com.example.demo.schedule.application.model; +import com.example.demo.auth.application.support.Member; +import com.example.demo.auth.persistence.MemberEntity; import com.example.demo.common.support.AbstractModel; import com.example.demo.filter.application.model.FilterModel; import com.example.demo.filter.persistence.FilterEntity; @@ -24,6 +26,7 @@ public class ScheduleModel implements AbstractModel { private String eventPlace; private String scheduleType; private FilterEntity filter; + private MemberEntity member; public ScheduleModel update(ScheduleModel requestModel) { diff --git a/BE/error/src/main/java/com/example/demo/schedule/application/model/converter/ScheduleEntityConverter.java b/BE/error/src/main/java/com/example/demo/schedule/application/model/converter/ScheduleEntityConverter.java index 54e6b190..24283265 100644 --- a/BE/error/src/main/java/com/example/demo/schedule/application/model/converter/ScheduleEntityConverter.java +++ b/BE/error/src/main/java/com/example/demo/schedule/application/model/converter/ScheduleEntityConverter.java @@ -36,6 +36,7 @@ public ScheduleEntity toEntity(ScheduleModel source) { .eventPlace(source.getEventPlace()) .scheduleType(source.getScheduleType()) .filter(source.getFilter()) + .filter(source.getFilter()) .build(); } diff --git a/BE/error/src/main/java/com/example/demo/schedule/application/model/converter/ScheduleRequestConverter.java b/BE/error/src/main/java/com/example/demo/schedule/application/model/converter/ScheduleRequestConverter.java index cce27a07..fe29aaed 100644 --- a/BE/error/src/main/java/com/example/demo/schedule/application/model/converter/ScheduleRequestConverter.java +++ b/BE/error/src/main/java/com/example/demo/schedule/application/model/converter/ScheduleRequestConverter.java @@ -20,6 +20,7 @@ public ScheduleModel from(CreateScheduleRequest source) { .eventPlace(source.getEventPlace()) .scheduleType(source.getScheduleType()) .filter(source.getFilter()) + .member(source.getMember()) .build(); } diff --git a/BE/error/src/main/java/com/example/demo/schedule/application/service/ScheduleService.java b/BE/error/src/main/java/com/example/demo/schedule/application/service/ScheduleService.java index 540a32fa..d19046a9 100644 --- a/BE/error/src/main/java/com/example/demo/schedule/application/service/ScheduleService.java +++ b/BE/error/src/main/java/com/example/demo/schedule/application/service/ScheduleService.java @@ -11,9 +11,20 @@ import com.example.demo.schedule.persistence.ScheduleEntity; import com.example.demo.schedule.persistence.ScheduleRepository; import com.example.demo.schedule.persistence.ScheduleType; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.modelmapper.ModelMapper; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + import java.time.LocalDate; import java.time.temporal.WeekFields; import java.util.List; @@ -50,19 +61,24 @@ public List getYearSchedule(int year) { private final ScheduleEntityConverter entityConverter; private final ScheduleRepository scheduleRepository; private final ScheduleResponseConverter responseConverter; + private final ModelMapper modelMapper; @Override @Transactional public CreateScheduleResponse create(final CreateScheduleRequest request) { + + //ScheduleModel model = modelMapper.map(request, ScheduleModel.class); ScheduleModel model = requestConverter.from(request); Long saveId = createSchedule(model); return responseConverter.from(saveId); } private Long createSchedule(ScheduleModel model) { + ScheduleEntity entity = entityConverter.toEntity(model); ScheduleEntity save = scheduleRepository.save(entity); + //Long memberId = save.getMember().getId(); return save.getEventId(); } @@ -177,5 +193,4 @@ private List filterEntitiesByWeek(final LocalDate wantFindWeek) { .map(entityConverter::from) .collect(Collectors.toList()); } -} - +} \ No newline at end of file diff --git a/BE/error/src/main/java/com/example/demo/schedule/persistence/ScheduleEntity.java b/BE/error/src/main/java/com/example/demo/schedule/persistence/ScheduleEntity.java index f8f86db1..41a92472 100644 --- a/BE/error/src/main/java/com/example/demo/schedule/persistence/ScheduleEntity.java +++ b/BE/error/src/main/java/com/example/demo/schedule/persistence/ScheduleEntity.java @@ -1,5 +1,6 @@ package com.example.demo.schedule.persistence; +import com.example.demo.auth.persistence.MemberEntity; import com.example.demo.common.persistence.BaseEntity; import com.example.demo.filter.application.model.FilterModel; import com.example.demo.filter.persistence.FilterEntity; @@ -39,7 +40,6 @@ public class ScheduleEntity extends BaseEntity { @Column(nullable = false) private String eventPlace; - //@Enumerated(EnumType.STRING) @Column(nullable = false) private String scheduleType; @@ -47,5 +47,7 @@ public class ScheduleEntity extends BaseEntity { @JoinColumn(name = "filter_id") private FilterEntity filter; - + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private MemberEntity member; }