feat: 스페이스 생성 시 필드 복수개로 변경 (#46)

raymondanythings · web-flow · commit ef312296f4b4 · 2024-07-29T13:01:53.000+09:00
diff --git a/layer-api/src/main/java/org/layer/domain/space/dto/SpaceRequest.java b/layer-api/src/main/java/org/layer/domain/space/dto/SpaceRequest.java
@@ -8,6 +8,7 @@
 import org.layer.domain.space.entity.SpaceCategory;
 import org.layer.domain.space.entity.SpaceField;
 
+import java.util.List;
 import java.util.Optional;
 
 @Schema
@@ -23,8 +24,10 @@ public record CreateSpaceRequest(
             @NotNull
             SpaceCategory category,
             @Schema(description = "진행중인 프로젝트 유형")
+
             @NotNull
-            SpaceField field,
+            List<SpaceField> fieldList,
+
             @Schema(description = "이름")
             @NotNull
             String name,
@@ -35,7 +38,7 @@ public record CreateSpaceRequest(
         public Space toEntity(Long memberId) {
             return Space.builder()
                     .category(category)
-                    .field(field)
+                    .fieldList(fieldList)
                     .name(name)
                     .introduction(introduction)
                     .leaderId(memberId)
@@ -58,7 +61,7 @@ public record UpdateSpaceRequest(
             SpaceCategory category,
             @Schema(description = "진행중인 프로젝트 유형", nullable = true)
 
-            SpaceField field,
+            List<SpaceField> fieldList,
             @Schema(description = "이름", nullable = true)
 
             String name,
@@ -71,7 +74,7 @@ public Space toEntity(Long memberId) {
             return Space.builder()
                     .id(id)
                     .category(category)
-                    .field(field)
+                    .fieldList(fieldList)
                     .name(name)
                     .introduction(introduction)
                     .leaderId(memberId)
diff --git a/layer-api/src/main/java/org/layer/domain/space/dto/SpaceResponse.java b/layer-api/src/main/java/org/layer/domain/space/dto/SpaceResponse.java
@@ -27,7 +27,7 @@ public record SpaceWithMemberCountInfo(
             SpaceCategory category,
             @Schema(description = "진행중인 프로젝트 유형")
             @NotNull
-            SpaceField field,
+            List<SpaceField> fieldList,
 
             @Schema(description = "이름")
             @NotNull
@@ -45,7 +45,7 @@ public record SpaceWithMemberCountInfo(
         public static SpaceWithMemberCountInfo toResponse(SpaceWithMemberCount space) {
             return Optional.ofNullable(space)
                     .map(it -> SpaceWithMemberCountInfo.builder().id(it.getId()).category(it.getCategory())
-                            .field(it.getField()).name(it.getName()).introduction(it.getIntroduction())
+                            .fieldList(it.getFieldList()).name(it.getName()).introduction(it.getIntroduction())
                             .formId(it.getFormId()).memberCount(it.getMemberCount()).build())
                     .orElseThrow(() -> new BaseCustomException(INVALID_REFRESH_TOKEN));
         }
diff --git a/layer-api/src/main/java/org/layer/domain/space/service/SpaceService.java b/layer-api/src/main/java/org/layer/domain/space/service/SpaceService.java
@@ -54,7 +54,7 @@ public void createSpace(Long memberId, SpaceRequest.CreateSpaceRequest mutateSpa
     @Transactional
     public void updateSpace(Long memberId, SpaceRequest.UpdateSpaceRequest updateSpaceRequest) {
         spaceRepository.findByIdAndJoinedMemberId(updateSpaceRequest.id(), memberId).orElseThrow(() -> new SpaceException(SPACE_NOT_FOUND));
-        spaceRepository.updateSpace(updateSpaceRequest.id(), updateSpaceRequest.category(), updateSpaceRequest.field(), updateSpaceRequest.name(), updateSpaceRequest.introduction(), updateSpaceRequest.bannerUrl());
+        spaceRepository.updateSpace(updateSpaceRequest.id(), updateSpaceRequest.category(), updateSpaceRequest.fieldList(), updateSpaceRequest.name(), updateSpaceRequest.introduction(), updateSpaceRequest.bannerUrl());
     }
 
     public SpaceResponse.SpaceWithMemberCountInfo getSpaceById(Long memberId, Long spaceId) {
diff --git a/layer-common/src/main/java/org/layer/common/exception/GlobalExceptionHandler.java b/layer-common/src/main/java/org/layer/common/exception/GlobalExceptionHandler.java
@@ -3,6 +3,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -30,10 +31,18 @@ public ResponseEntity<ExceptionResponse> handleException(Exception e) {
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public ResponseEntity<ExceptionResponse> handleValidationException(MethodArgumentNotValidException e) {
         log.error(String.format(LOG_FORMAT, e.getMessage()), e);
-        
+
         // TODO: ValidException 타입 정의 후 교체
         return ResponseEntity.status(HttpStatus.BAD_REQUEST)
                 .body(ExceptionResponse.of(HttpStatus.BAD_REQUEST.name(), "유효하지 않은 값"));
     }
 
+    //TODO: JSON deserialize 에러 시 해당 에러 반환 -> enum 배열 받는 방법이 있다면 적용 후 제거
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    public ResponseEntity<ExceptionResponse> handleHttpMessageNotReadableException(Exception e) {
+        log.error(String.format(LOG_FORMAT, e.getMessage()), e);
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                .body(ExceptionResponse.of(HttpStatus.BAD_REQUEST.name(), "유효하지 않은 값."));
+    }
+
 }
diff --git a/layer-domain/src/main/java/org/layer/domain/form/entity/Form.java b/layer-domain/src/main/java/org/layer/domain/form/entity/Form.java
@@ -1,12 +1,9 @@
 package org.layer.domain.form.entity;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import org.hibernate.annotations.ColumnDefault;
 import org.layer.domain.BaseEntity;
-import org.layer.domain.form.converter.FormPublishedByConverter;
-import org.layer.domain.form.enums.FormPublishedBy;
 
 
 @Getter
diff --git a/layer-domain/src/main/java/org/layer/domain/space/converter/SpaceFieldConverter.java b/layer-domain/src/main/java/org/layer/domain/space/converter/SpaceFieldConverter.java
@@ -0,0 +1,34 @@
+package org.layer.domain.space.converter;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+import org.layer.domain.space.entity.SpaceField;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Converter
+public class SpaceFieldConverter implements AttributeConverter<List<SpaceField>, String> {
+
+    @Override
+    public String convertToDatabaseColumn(List<SpaceField> attribute) {
+        if (attribute == null || attribute.isEmpty()) {
+            return "";
+        }
+        return attribute.stream()
+                .map(Enum::name)
+                .collect(Collectors.joining(","));
+    }
+
+    @Override
+    public List<SpaceField> convertToEntityAttribute(String fieldsOfCommaSeperated) {
+        if (fieldsOfCommaSeperated == null || fieldsOfCommaSeperated.isEmpty()) {
+            return List.of();
+        }
+        return Arrays.stream(fieldsOfCommaSeperated.split(","))
+                .map(String::trim)
+                .map(SpaceField::valueOf)
+                .collect(Collectors.toList());
+    }
+}
diff --git a/layer-domain/src/main/java/org/layer/domain/space/dto/SpaceWithMemberCount.java b/layer-domain/src/main/java/org/layer/domain/space/dto/SpaceWithMemberCount.java
@@ -8,6 +8,7 @@
 import org.layer.domain.space.entity.SpaceField;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 @Getter
@@ -20,7 +21,7 @@ public class SpaceWithMemberCount {
     @NotNull
     private SpaceCategory category;
     @NotNull
-    private SpaceField field;
+    private List<SpaceField> fieldList;
     @NotNull
     private String name;
     private String introduction;
@@ -30,12 +31,12 @@ public class SpaceWithMemberCount {
     private Long memberCount;
 
     @QueryProjection
-    public SpaceWithMemberCount(Long id, LocalDateTime createdAt, LocalDateTime updatedAt, SpaceCategory category, SpaceField field, String name, String introduction, Long leaderId, Long formId, Long memberCount) {
+    public SpaceWithMemberCount(Long id, LocalDateTime createdAt, LocalDateTime updatedAt, SpaceCategory category, List<SpaceField> fieldList, String name, String introduction, Long leaderId, Long formId, Long memberCount) {
         this.id = id;
         this.createdAt = createdAt;
         this.updatedAt = updatedAt;
         this.category = category;
-        this.field = field;
+        this.fieldList = fieldList;
         this.name = name;
         this.introduction = introduction;
         this.leaderId = leaderId;
diff --git a/layer-domain/src/main/java/org/layer/domain/space/entity/Space.java b/layer-domain/src/main/java/org/layer/domain/space/entity/Space.java
@@ -1,13 +1,17 @@
 package org.layer.domain.space.entity;
 
+import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.layer.domain.BaseEntity;
+import org.layer.domain.space.converter.SpaceFieldConverter;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 @Getter
@@ -25,8 +29,8 @@ public class Space extends BaseEntity {
     private SpaceCategory category;
 
     @NotNull
-    @Enumerated(EnumType.STRING)
-    private SpaceField field;
+    @Convert(converter = SpaceFieldConverter.class)
+    private List<SpaceField> fieldList = new ArrayList<>();
 
     @NotNull
     private String name;
diff --git a/layer-domain/src/main/java/org/layer/domain/space/entity/SpaceField.java b/layer-domain/src/main/java/org/layer/domain/space/entity/SpaceField.java
@@ -1,10 +1,25 @@
 package org.layer.domain.space.entity;
 
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@JsonDeserialize
 public enum SpaceField {
-    DESIGN,
-    DEVELOPMENT,
-    MARKETING,
-    ACCOUNTING,
-    SPORTS,
-    ETC
+    PLANNER("PLANNER", "기획"),
+    EDUCATION("EDUCATION", "교육"),
+    DEVELOPMENT("DEVELOPMENT", "개발"),
+    DESIGN("DESIGN", "디자인"),
+    MANAGEMENT("MANAGEMENT", "운영 및 관리"),
+    DATA_ANALYSIS("DATA_ANALYSIS", "데이터 분석"),
+    MARKETING("MARKETING", "마케팅"),
+    RESEARCH("RESEARCH", "연구"),
+    ETC("ETC", "기타");
+
+
+    private final String value;
+    private final String name;
 }
diff --git a/layer-domain/src/main/java/org/layer/domain/space/repository/SpaceCustomRepository.java b/layer-domain/src/main/java/org/layer/domain/space/repository/SpaceCustomRepository.java
@@ -19,6 +19,6 @@ public interface SpaceCustomRepository {
 
     Optional<SpaceWithMemberCount> findByIdAndJoinedMemberId(Long spaceId, Long memberId);
 
-    Long updateSpace(Long spaceId, SpaceCategory category, SpaceField field, String name, String introduction, String bannerUrl);
+    Long updateSpace(Long spaceId, SpaceCategory category, List<SpaceField> fieldList, String name, String introduction, String bannerUrl);
 
 }
diff --git a/layer-domain/src/main/java/org/layer/domain/space/repository/SpaceRepositoryImpl.java b/layer-domain/src/main/java/org/layer/domain/space/repository/SpaceRepositoryImpl.java
@@ -12,6 +12,7 @@
 import org.layer.domain.space.entity.SpaceField;
 import org.springframework.stereotype.Repository;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -50,20 +51,20 @@ public Optional<SpaceWithMemberCount> findByIdAndJoinedMemberId(Long spaceId, Lo
                         .and(memberSpaceRelation.memberId.eq(memberId)))
                 .fetchOne();
 
-        if (isSpaceWithMemberCountEmpty(foundSpace)) {
+        if (foundSpace == null || isSpaceWithMemberCountEmpty(foundSpace)) {
             return Optional.empty();
         }
         // TODO: 커스텀 에러로 변경
         return Optional.of(foundSpace);
     }
 
     @Override
-    public Long updateSpace(Long spaceId, SpaceCategory category, SpaceField field, String name, String introduction, String bannerUrl) {
+    public Long updateSpace(Long spaceId, SpaceCategory category, List<SpaceField> fieldList, String name, String introduction, String bannerUrl) {
         var query = queryFactory.update(space);
 
         // null 값 제거
         Optional.ofNullable(category).ifPresent(it -> query.set(space.category, it));
-        Optional.ofNullable(field).ifPresent(it -> query.set(space.field, it));
+        Optional.ofNullable(fieldList).ifPresent(it -> query.set(new ArrayList<>(), it));
         Optional.ofNullable(name).ifPresent(it -> query.set(space.name, it));
         Optional.ofNullable(introduction).ifPresent(it -> query.set(space.introduction, it));
         Optional.ofNullable(bannerUrl).ifPresent(it -> query.set(space.bannerUrl, it));
@@ -79,7 +80,7 @@ private JPAQuery<SpaceWithMemberCount> getSpaceWithMemberCountQuery() {
                                 space.createdAt,
                                 space.updatedAt,
                                 space.category,
-                                space.field,
+                                space.fieldList,
                                 space.name,
                                 space.introduction,
                                 space.leaderId,

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void createSpace(Long memberId, SpaceRequest.CreateSpaceRequest mutateSpa`
`54`	`54`	`@Transactional`
`55`	`55`	`public void updateSpace(Long memberId, SpaceRequest.UpdateSpaceRequest updateSpaceRequest) {`
`56`	`56`	`spaceRepository.findByIdAndJoinedMemberId(updateSpaceRequest.id(), memberId).orElseThrow(() -> new SpaceException(SPACE_NOT_FOUND));`
`57`		`- spaceRepository.updateSpace(updateSpaceRequest.id(), updateSpaceRequest.category(), updateSpaceRequest.field(), updateSpaceRequest.name(), updateSpaceRequest.introduction(), updateSpaceRequest.bannerUrl());`
	`57`	`+ spaceRepository.updateSpace(updateSpaceRequest.id(), updateSpaceRequest.category(), updateSpaceRequest.fieldList(), updateSpaceRequest.name(), updateSpaceRequest.introduction(), updateSpaceRequest.bannerUrl());`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public SpaceResponse.SpaceWithMemberCountInfo getSpaceById(Long memberId, Long spaceId) {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ public interface SpaceCustomRepository {`
`19`	`19`
`20`	`20`	`Optional<SpaceWithMemberCount> findByIdAndJoinedMemberId(Long spaceId, Long memberId);`
`21`	`21`
`22`		`- Long updateSpace(Long spaceId, SpaceCategory category, SpaceField field, String name, String introduction, String bannerUrl);`
	`22`	`+ Long updateSpace(Long spaceId, SpaceCategory category, List<SpaceField> fieldList, String name, String introduction, String bannerUrl);`
`23`	`23`
`24`	`24`	`}`