From e06df75713c8981a504311d4b499e143260985c0 Mon Sep 17 00:00:00 2001 From: mirageoasis Date: Fri, 5 Jan 2024 20:24:02 +0900 Subject: [PATCH] fixed: turned content into url and follwing fixes --- .../ceos/backend/domain/retrospect/domain/Retrospect.java | 8 ++++---- .../retrospect/dto/request/CreateRetrospectRequest.java | 6 +++--- .../retrospect/dto/request/UpdateRetrospectRequest.java | 6 +++--- .../retrospect/dto/response/GetRetrospectResponse.java | 4 ++-- .../retrospect/dto/response/GetRetrospectsElement.java | 2 ++ .../domain/retrospect/service/RetrospectService.java | 6 +++--- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/ceos/backend/domain/retrospect/domain/Retrospect.java b/src/main/java/ceos/backend/domain/retrospect/domain/Retrospect.java index 979f0b1..8d7f669 100644 --- a/src/main/java/ceos/backend/domain/retrospect/domain/Retrospect.java +++ b/src/main/java/ceos/backend/domain/retrospect/domain/Retrospect.java @@ -30,7 +30,7 @@ public class Retrospect extends BaseEntity { @NotBlank private String title; - @NotBlank private String content; + @NotBlank private String url; @NotBlank private String writer; @@ -41,9 +41,9 @@ public class Retrospect extends BaseEntity { private Part part; @Builder - public Retrospect(String title, String content, String writer, Integer generation, Part part) { + public Retrospect(String title, String url, String writer, Integer generation, Part part) { this.title = title; - this.content = content; + this.url = url; this.writer = writer; this.generation = generation; this.part = part; @@ -51,7 +51,7 @@ public Retrospect(String title, String content, String writer, Integer generatio public void update(CreateRetrospectRequest createRetrospectRequest) { title = createRetrospectRequest.getTitle(); - content = createRetrospectRequest.getContent(); + url = createRetrospectRequest.getUrl(); writer = createRetrospectRequest.getWriter(); generation = createRetrospectRequest.getGeneration(); part = createRetrospectRequest.getPart(); diff --git a/src/main/java/ceos/backend/domain/retrospect/dto/request/CreateRetrospectRequest.java b/src/main/java/ceos/backend/domain/retrospect/dto/request/CreateRetrospectRequest.java index 7188a91..99478a5 100644 --- a/src/main/java/ceos/backend/domain/retrospect/dto/request/CreateRetrospectRequest.java +++ b/src/main/java/ceos/backend/domain/retrospect/dto/request/CreateRetrospectRequest.java @@ -15,9 +15,9 @@ public class CreateRetrospectRequest { @Schema(type = "string", description = "회고 제목") private String title; - @NotBlank(message = "회고 내용을 입력해주세요") + @NotBlank(message = "회고 내용이 담긴 url을 입력해주세요") @Schema(type = "string", description = "회고 내용") - private String content; + private String url; @NotBlank(message = "작성자를 입력해주세요") @Schema(type = "string", description = "회고 제목") @@ -35,7 +35,7 @@ public class CreateRetrospectRequest { public Retrospect toEntity() { return Retrospect.builder() .title(title) - .content(content) + .url(url) .writer(writer) .generation(generation) .part(part) diff --git a/src/main/java/ceos/backend/domain/retrospect/dto/request/UpdateRetrospectRequest.java b/src/main/java/ceos/backend/domain/retrospect/dto/request/UpdateRetrospectRequest.java index 9f40ece..a00c459 100644 --- a/src/main/java/ceos/backend/domain/retrospect/dto/request/UpdateRetrospectRequest.java +++ b/src/main/java/ceos/backend/domain/retrospect/dto/request/UpdateRetrospectRequest.java @@ -13,9 +13,9 @@ public class UpdateRetrospectRequest { @Schema(type = "string", description = "회고 제목") private String title; - @NotBlank(message = "회고 내용을 입력해주세요") + @NotBlank(message = "회고 내용이 담긴 url을 입력해주세요") @Schema(type = "string", description = "회고 내용") - private String content; + private String url; @NotBlank(message = "작성자를 입력해주세요") @Schema(type = "string", description = "회고 제목") @@ -33,7 +33,7 @@ public class UpdateRetrospectRequest { public Retrospect toEntity() { return Retrospect.builder() .title(title) - .content(content) + .url(url) .writer(writer) .generation(generation) .part(part) diff --git a/src/main/java/ceos/backend/domain/retrospect/dto/response/GetRetrospectResponse.java b/src/main/java/ceos/backend/domain/retrospect/dto/response/GetRetrospectResponse.java index 73570f7..9fcb7ae 100644 --- a/src/main/java/ceos/backend/domain/retrospect/dto/response/GetRetrospectResponse.java +++ b/src/main/java/ceos/backend/domain/retrospect/dto/response/GetRetrospectResponse.java @@ -8,7 +8,7 @@ public class GetRetrospectResponse { private Long id; private String title; - private String content; + private String url; private String writer; public static GetRetrospectResponse fromEntity(Retrospect retrospect) { @@ -16,7 +16,7 @@ public static GetRetrospectResponse fromEntity(Retrospect retrospect) { getRetrospectResponse.setId(retrospect.getId()); getRetrospectResponse.setTitle(retrospect.getTitle()); - getRetrospectResponse.setContent(retrospect.getContent()); + getRetrospectResponse.setUrl(retrospect.getUrl()); getRetrospectResponse.setWriter(retrospect.getWriter()); return getRetrospectResponse; diff --git a/src/main/java/ceos/backend/domain/retrospect/dto/response/GetRetrospectsElement.java b/src/main/java/ceos/backend/domain/retrospect/dto/response/GetRetrospectsElement.java index 35bea67..356cf4b 100644 --- a/src/main/java/ceos/backend/domain/retrospect/dto/response/GetRetrospectsElement.java +++ b/src/main/java/ceos/backend/domain/retrospect/dto/response/GetRetrospectsElement.java @@ -10,6 +10,7 @@ public class GetRetrospectsElement { private Long id; private String title; + private String url; private String writer; private Integer generation; @@ -17,6 +18,7 @@ public static GetRetrospectsElement fromEntity(Retrospect retrospect) { return new GetRetrospectsElement( retrospect.getId(), retrospect.getTitle(), + retrospect.getUrl(), retrospect.getWriter(), retrospect.getGeneration()); } diff --git a/src/main/java/ceos/backend/domain/retrospect/service/RetrospectService.java b/src/main/java/ceos/backend/domain/retrospect/service/RetrospectService.java index 2bcbe62..905205f 100644 --- a/src/main/java/ceos/backend/domain/retrospect/service/RetrospectService.java +++ b/src/main/java/ceos/backend/domain/retrospect/service/RetrospectService.java @@ -41,7 +41,7 @@ public GetRetrospectsResponse getRetrospects(Integer pageNum, Integer limit) { public GetRetrospectResponse updateRetrospect( Long id, CreateRetrospectRequest createRetrospectRequest) { Retrospect retrospect = - retrospectRepository.findById(id).orElseThrow(() -> new RetrospectNotFound()); + retrospectRepository.findById(id).orElseThrow(RetrospectNotFound::new); retrospect.update(createRetrospectRequest); @@ -52,7 +52,7 @@ public GetRetrospectResponse updateRetrospect( @Transactional public void deleteRetrospect(Long id) { Retrospect retrospect = - retrospectRepository.findById(id).orElseThrow(() -> new RetrospectNotFound()); + retrospectRepository.findById(id).orElseThrow(RetrospectNotFound::new); retrospectRepository.delete(retrospect); } @@ -61,7 +61,7 @@ public void deleteRetrospect(Long id) { @Transactional(readOnly = true) public GetRetrospectResponse getRetrospect(Long id) { Retrospect retrospect = - retrospectRepository.findById(id).orElseThrow(() -> new RetrospectNotFound()); + retrospectRepository.findById(id).orElseThrow(RetrospectNotFound::new); return GetRetrospectResponse.fromEntity(retrospect); }