chore: 프로젝트 형태 삭제로 인한 수정사항 적용

mikekks · mikekks · commit 23a4cd7424d3 · 2025-08-16T16:31:07.000+09:00
diff --git a/layer-api/src/main/java/org/layer/domain/space/controller/dto/SpaceRequest.java b/layer-api/src/main/java/org/layer/domain/space/controller/dto/SpaceRequest.java
@@ -2,17 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
 
 import org.layer.annotation.AtLeastNotNull;
 import org.layer.domain.space.entity.Space;
 import org.layer.domain.space.entity.SpaceCategory;
-import org.layer.domain.space.entity.SpaceField;
-
-import java.util.List;
-import java.util.Optional;
 
 @Schema
 @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -26,11 +20,6 @@ public record CreateSpaceRequest(
             @Schema(description = "프로젝트 유형 카테고리", example = "INDIVIDUAL")
             @NotNull
             SpaceCategory category,
-            @Schema(description = "진행중인 프로젝트 유형")
-            @NotNull
-            @Size(min = 1)
-            List<SpaceField> fieldList,
-
             @Schema(description = "이름")
             @NotNull
             String name,
@@ -41,7 +30,6 @@ public record CreateSpaceRequest(
         public Space toEntity(Long memberId) {
             return Space.builder()
                     .category(category)
-                    .fieldList(fieldList)
                     .name(name)
                     .introduction(introduction)
                     .leaderId(memberId)
diff --git a/layer-api/src/main/java/org/layer/domain/space/controller/dto/SpaceResponse.java b/layer-api/src/main/java/org/layer/domain/space/controller/dto/SpaceResponse.java
@@ -12,7 +12,6 @@
 import org.layer.domain.space.dto.SpaceWithMemberCount;
 import org.layer.domain.space.entity.Space;
 import org.layer.domain.space.entity.SpaceCategory;
-import org.layer.domain.space.entity.SpaceField;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -29,9 +28,6 @@ public record SpaceWithMemberCountInfo(
 		@Schema(description = "프로젝트 유형 카테고리")
 		@NotNull
 		SpaceCategory category,
-		@Schema(description = "진행중인 프로젝트 유형")
-		@NotNull
-		List<SpaceField> fieldList,
 		@Schema(description = "이름")
 		@NotNull
 		String name,
@@ -57,7 +53,6 @@ public static SpaceWithMemberCountInfo of(Space space, Form form, Long memberCou
 			return SpaceWithMemberCountInfo.builder()
 				.id(space.getId())
 				.category(space.getCategory())
-				.fieldList(space.getFieldList())
 				.name(space.getName())
 				.introduction(space.getIntroduction())
 				.formId(space.getFormId())
@@ -79,9 +74,6 @@ public record SpaceWithMemberCountAndRetrospectCount(
 		@Schema(description = "프로젝트 유형 카테고리")
 		@NotNull
 		SpaceCategory category,
-		@Schema(description = "진행중인 프로젝트 유형")
-		@NotNull
-		List<SpaceField> fieldList,
 		@Schema(description = "이름")
 		@NotNull
 		String name,
@@ -111,7 +103,6 @@ public static SpaceWithMemberCountAndRetrospectCount toResponse(SpaceWithMemberC
 			return SpaceWithMemberCountAndRetrospectCount.builder()
 				.id(space.getId())
 				.category(space.getCategory())
-				.fieldList(space.getFieldList())
 				.name(space.getName())
 				.introduction(space.getIntroduction())
 				.formId(space.getFormId())
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
@@ -95,7 +95,7 @@ public Long createSpace(Long memberId, SpaceRequest.CreateSpaceRequest createSpa
 
 		String bannerUrl = createSpaceRequest.bannerUrl();
 		if (!storageService.validateBannerUrl(bannerUrl)) {
-			bannerUrl = storageService.getDefaultBannerUrl(space.getFieldList());
+			bannerUrl = storageService.getDefaultBannerUrl();
 		}
 		space.updateBannerUrl(bannerUrl);
 
diff --git a/layer-api/src/main/java/org/layer/jwt/JwtAuthenticationFilter.java b/layer-api/src/main/java/org/layer/jwt/JwtAuthenticationFilter.java
@@ -26,7 +26,6 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
         String accessToken = getJwtFromRequest(request);
 
-
         if (isValidToken(accessToken)) {
             Long memberId = jwtValidator.getMemberIdFromToken(accessToken);
             List<String> role = jwtValidator.getRoleFromToken(accessToken);
diff --git a/layer-api/src/test/java/org/layer/domain/fixture/SpaceFixture.java b/layer-api/src/test/java/org/layer/domain/fixture/SpaceFixture.java
@@ -1,18 +1,14 @@
 package org.layer.domain.fixture;
 
-import java.util.List;
-
 import org.layer.domain.space.entity.Space;
 import org.layer.domain.space.entity.SpaceCategory;
-import org.layer.domain.space.entity.SpaceField;
 
 public class SpaceFixture {
 
 	public static Space createFixture(Long leaderId, Long formId){
 		return Space.builder()
 			.bannerUrl("url1")
 			.category(SpaceCategory.TEAM)
-			.fieldList(List.of(SpaceField.DESIGN, SpaceField.DEVELOPMENT))
 			.name("스페이스 이름1")
 			.introduction("스페이스 소개1")
 			.leaderId(leaderId)
diff --git a/layer-api/src/test/java/org/layer/domain/retrospect/service/RetrospectServiceTest.java b/layer-api/src/test/java/org/layer/domain/retrospect/service/RetrospectServiceTest.java
@@ -1,7 +1,5 @@
 package org.layer.domain.retrospect.service;
 
-import static org.layer.domain.space.entity.SpaceField.*;
-
 import java.time.LocalDateTime;
 import java.util.List;
 
diff --git a/layer-api/src/test/java/org/layer/domain/space/SpaceServiceTest.java b/layer-api/src/test/java/org/layer/domain/space/SpaceServiceTest.java
@@ -25,7 +25,6 @@
 import org.layer.domain.space.entity.MemberSpaceRelation;
 import org.layer.domain.space.entity.Space;
 import org.layer.domain.space.entity.SpaceCategory;
-import org.layer.domain.space.entity.SpaceField;
 import org.layer.domain.space.exception.MemberSpaceRelationException;
 import org.layer.domain.space.exception.SpaceException;
 import org.layer.domain.space.repository.MemberSpaceRelationRepository;
@@ -164,8 +163,7 @@ void createSpaceTest1() {
 			// given
 			Long memberId = 1L;
 			SpaceRequest.CreateSpaceRequest req = new SpaceRequest.CreateSpaceRequest(null,
-				SpaceCategory.TEAM,
-				List.of(SpaceField.DESIGN, SpaceField.DEVELOPMENT), "스페이스 이름1", "스페이스 소개1");
+				SpaceCategory.TEAM,"스페이스 이름1", "스페이스 소개1");
 
 			// when
 			Long spaceId = spaceService.createSpace(memberId, req);
@@ -174,9 +172,8 @@ void createSpaceTest1() {
 			Space space = spaceRepository.findByIdOrThrow(spaceId);
 			assertThat(space.getName()).isEqualTo("스페이스 이름1");
 			assertThat(space.getIntroduction()).isEqualTo("스페이스 소개1");
-			assertThat(space.getBannerUrl()).containsSubsequence("DESIGN");
+			assertThat(space.getBannerUrl()).containsSubsequence("EDUCATION");
 			assertThat(space.getCategory()).isEqualTo(SpaceCategory.TEAM);
-			assertThat(space.getFieldList()).isEqualTo(List.of(SpaceField.DESIGN, SpaceField.DEVELOPMENT));
 		}
 
 		@Test
@@ -185,8 +182,7 @@ void createSpaceTest2() {
 			// given
 			Long memberId = 1L;
 			SpaceRequest.CreateSpaceRequest req = new SpaceRequest.CreateSpaceRequest("invalid url",
-				SpaceCategory.TEAM,
-				List.of(SpaceField.DESIGN, SpaceField.DEVELOPMENT), "스페이스 이름1", "스페이스 소개1");
+				SpaceCategory.TEAM,"스페이스 이름1", "스페이스 소개1");
 
 			// when, then
 			assertThatThrownBy(() -> spaceService.createSpace(memberId, req));
diff --git a/layer-api/src/test/java/org/layer/domain/space/SpaceServiceWithMockedStorageTest.java b/layer-api/src/test/java/org/layer/domain/space/SpaceServiceWithMockedStorageTest.java
@@ -4,15 +4,12 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-import java.util.List;
-
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.layer.domain.space.controller.dto.SpaceRequest;
 import org.layer.domain.space.entity.Space;
 import org.layer.domain.space.entity.SpaceCategory;
-import org.layer.domain.space.entity.SpaceField;
 import org.layer.domain.space.repository.SpaceRepository;
 import org.layer.domain.space.service.SpaceService;
 import org.layer.storage.service.StorageService;
@@ -44,8 +41,7 @@ void createSpaceTest1() {
 			// given
 			Long memberId = 1L;
 			SpaceRequest.CreateSpaceRequest req = new SpaceRequest.CreateSpaceRequest("new url1",
-				SpaceCategory.TEAM,
-				List.of(SpaceField.DESIGN, SpaceField.DEVELOPMENT), "스페이스 이름1", "스페이스 소개1");
+				SpaceCategory.TEAM,"스페이스 이름1", "스페이스 소개1");
 
 			doReturn(true).when(mockStorageService).validateBannerUrl(any());
 
@@ -58,7 +54,6 @@ void createSpaceTest1() {
 			assertThat(space.getIntroduction()).isEqualTo("스페이스 소개1");
 			assertThat(space.getBannerUrl()).isEqualTo("new url1");
 			assertThat(space.getCategory()).isEqualTo(SpaceCategory.TEAM);
-			assertThat(space.getFieldList()).isEqualTo(List.of(SpaceField.DESIGN, SpaceField.DEVELOPMENT));
 		}
 	}
 }
diff --git a/layer-api/src/test/resources/sql/answer-service-test-data.sql b/layer-api/src/test/resources/sql/answer-service-test-data.sql
@@ -3,9 +3,9 @@ VALUES
     (1, '2024-12-27 00:00:00', '2024-12-27 00:00:00', 'user1@example.com', 'USER', '홍길동', 'https://example.com/image1.png', 'social_id_1', 'KAKAO', NULL),
     (2, '2024-12-27 00:00:00', '2024-12-27 00:00:00', 'user2@example.com', 'USER', '김철수', 'https://example.com/image2.png', 'social_id_2', 'KAKAO', NULL);
 
-INSERT INTO space (id, created_at, updated_at, banner_url, category, field_list, form_id, introduction, leader_id, name)
+INSERT INTO space (id, created_at, updated_at, banner_url, category, form_id, introduction, leader_id, name)
 VALUES
-    (1, '2024-12-27 00:00:00', '2024-12-27 00:00:00', 'https://example.com/banner1.jpg', 'INDIVIDUAL', 'EDUCATION,DEVELOPMENT', NULL, '개인 프로젝트를 위한 공간입니다.', 1, '개인 공간 1');
+    (1, '2024-12-27 00:00:00', '2024-12-27 00:00:00', 'https://example.com/banner1.jpg', 'INDIVIDUAL', NULL, '개인 프로젝트를 위한 공간입니다.', 1, '개인 공간 1');
 
 INSERT INTO member_space_relation (created_at, updated_at, member_id, space_id)
 VALUES
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
@@ -6,11 +6,8 @@
 import org.layer.domain.form.enums.FormTag;
 import org.layer.domain.member.entity.Member;
 import org.layer.domain.space.entity.SpaceCategory;
-import org.layer.domain.space.entity.SpaceField;
 
 import java.time.LocalDateTime;
-import java.util.List;
-
 
 @Getter
 @Setter
@@ -20,7 +17,6 @@ public class SpaceWithMemberCount {
     private LocalDateTime createdAt;
     private LocalDateTime updatedAt;
     private SpaceCategory category;
-    private List<SpaceField> fieldList;
     private String name;
     private String introduction;
     private Leader leader;
@@ -30,12 +26,11 @@ public class SpaceWithMemberCount {
     private String bannerUrl;
 
     @QueryProjection
-    public SpaceWithMemberCount(Long id, LocalDateTime createdAt, LocalDateTime updatedAt, SpaceCategory category, List<SpaceField> fieldList, String name, String introduction, Member leader, Long formId, FormTag formTag, Long memberCount, String bannerUrl) {
+    public SpaceWithMemberCount(Long id, LocalDateTime createdAt, LocalDateTime updatedAt, SpaceCategory category, String name, String introduction, Member leader, Long formId, FormTag formTag, Long memberCount, String bannerUrl) {
         this.id = id;
         this.createdAt = createdAt;
         this.updatedAt = updatedAt;
         this.category = category;
-        this.fieldList = fieldList;
         this.name = name;
         this.introduction = introduction;
         this.leader = leader == null ? null : Leader.builder().id(leader.getId()).name(leader.getName()).build();
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
@@ -49,7 +49,6 @@ public CursorPageRes<SpaceWithMemberCount> findAllSpacesByMemberIdAndCategoryAnd
 				space.createdAt,
 				space.updatedAt,
 				space.category,
-				space.fieldList,
 				space.name,
 				space.introduction,
 				member,
diff --git a/layer-external/src/main/java/org/layer/storage/service/StorageService.java b/layer-external/src/main/java/org/layer/storage/service/StorageService.java
@@ -10,6 +10,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import org.layer.domain.common.random.CustomRandom;
 import org.layer.domain.space.entity.SpaceField;
 import org.layer.storage.dto.StorageResponse;
 import org.layer.storage.enums.ImageDomain;
@@ -18,7 +19,6 @@
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
-import java.util.List;
 import java.util.UUID;
 
 @Service
@@ -30,6 +30,7 @@ public class StorageService {
     private String bucketName;
 
     private final AmazonS3Client amazonS3Client;
+    private final CustomRandom random;
 
     public StorageResponse.PresignedResult getPreSignedUrl(Long memberId, ImageDomain imageDomain) {
         String imagePath = imageDomain + "/" + memberId.toString() + "/" + UUID.randomUUID();
@@ -56,10 +57,11 @@ public boolean validateBannerUrl(String url) {
         return true;
     }
 
-    public String getDefaultBannerUrl(List<SpaceField> spaceFields){
+    public String getDefaultBannerUrl(){
         String expectedPrefix = "https://" + bucketName + ".kr.object.ncloudstorage.com";
 
-        return expectedPrefix + "/category/" + spaceFields.get(0).getValue() + ".png";
+        int index = random.nextInt(SpaceField.values().length);
+        return expectedPrefix + "/category/" + SpaceField.values()[index].getValue() + ".png";
     }
 
     private GeneratePresignedUrlRequest getGeneratePreSignedUrlRequest(String fileName) {

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public Long createSpace(Long memberId, SpaceRequest.CreateSpaceRequest createSpa`
`95`	`95`
`96`	`96`	`String bannerUrl = createSpaceRequest.bannerUrl();`
`97`	`97`	`if (!storageService.validateBannerUrl(bannerUrl)) {`
`98`		`- bannerUrl = storageService.getDefaultBannerUrl(space.getFieldList());`
	`98`	`+ bannerUrl = storageService.getDefaultBannerUrl();`
`99`	`99`	`}`
`100`	`100`	`space.updateBannerUrl(bannerUrl);`
`101`	`101`