[�SKRB-159] feat, test: Club 생성 관련 dto 구체화 (#14)

Space-Club · Oct 26, 2023 · 4e72fca · 4e72fca
2 parents a7e0db2 + 70098d8
commit 4e72fca
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 5 deletions.
diff --git a/src/main/java/com/spaceclub/club/controller/ClubController.java b/src/main/java/com/spaceclub/club/controller/ClubController.java
@@ -24,7 +24,11 @@ public class ClubController {
 
     @PostMapping("/clubs")
     public ResponseEntity<String> createClub(@RequestBody CreateClubRequest request) {
-        return ResponseEntity.created(URI.create("api/v1/clubs/1")).build();
+        Club newClub = request.toEntity();
+        Club createdClub = service.createClub(newClub);
+        Long id = createdClub.getId();
+
+        return ResponseEntity.created(URI.create("api/v1/clubs/" + id)).build();
     }
 
     @GetMapping("/clubs/{clubId}")

diff --git a/src/main/java/com/spaceclub/club/controller/dto/CreateClubRequest.java b/src/main/java/com/spaceclub/club/controller/dto/CreateClubRequest.java
@@ -1,5 +1,21 @@
 package com.spaceclub.club.controller.dto;
 
-public record CreateClubRequest(String requiredInfo) {
+import com.spaceclub.club.domain.Club;
+
+public record CreateClubRequest(
+        String name,
+        String info,
+        String owner,
+        String image
+) {
+
+    public Club toEntity() {
+        return Club.builder()
+                .name(name)
+                .info(info)
+                .owner(owner)
+                .image(image)
+                .build();
+    }
 
 }
diff --git a/src/main/java/com/spaceclub/club/domain/Club.java b/src/main/java/com/spaceclub/club/domain/Club.java
@@ -8,6 +8,7 @@
 import jakarta.persistence.Lob;
 import lombok.AccessLevel;
 import lombok.Builder;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.util.Assert;
 
@@ -17,6 +18,7 @@ public class Club extends BaseTimeEntity {
 
     @Id
     @Column(name = "club_id")
+    @Getter
     @GeneratedValue
     private Long id;
 
@@ -39,7 +41,7 @@ private boolean validateNameLength(String name) {
     public Club(String name, String image, String info, String owner) {
         Assert.notNull(name, "이름에 null 값이 올 수 없습니다");
         Assert.hasText(name, "이름이 빈 값일 수 없습니다");
-        Assert.isTrue(validateNameLength(name), "이름의 길이는 12자를 넘을 수 없습니다");
+        Assert.isTrue(validateNameLength(name), "이름의 길이는 12글자를 넘을 수 없습니다");
         Assert.isTrue(name.equals(name.trim()), "이름의 맨앞과 맨뒤에는 공백이 추가될 수 없습니다");
 
         this.name = name;

diff --git a/src/main/java/com/spaceclub/club/service/ClubService.java b/src/main/java/com/spaceclub/club/service/ClubService.java
@@ -1,5 +1,6 @@
 package com.spaceclub.club.service;
 
+import com.spaceclub.club.domain.Club;
 import com.spaceclub.club.repository.ClubRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -10,4 +11,8 @@ public class ClubService {
 
     private final ClubRepository repository;
 
+    public Club createClub(Club club) {
+        return repository.save(club);
+    }
+
 }
diff --git a/src/test/java/com/spaceclub/club/controller/ClubControllerTest.java b/src/test/java/com/spaceclub/club/controller/ClubControllerTest.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.spaceclub.club.controller.dto.CreateClubRequest;
+import com.spaceclub.club.domain.Club;
 import com.spaceclub.club.service.ClubService;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -15,6 +16,8 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.given;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
@@ -46,7 +49,17 @@ class ClubControllerTest {
     @WithMockUser
     void createClubTest() throws Exception {
         // given
-        CreateClubRequest request = new CreateClubRequest("requiredInfo");
+        given(clubService.createClub(any(Club.class))).willReturn(
+                Club.builder()
+                        .name("연사모")
+                        .info("연어를 사랑하는 모임")
+                        .owner("연어대장")
+                        .image("연어.png")
+                        .build());
+        CreateClubRequest request = new CreateClubRequest("연사모",
+                "연어를 사랑하는 모임",
+                "연어대장",
+                "연어.png");
 
         // when
         ResultActions result = this.mockMvc.perform(post("/api/v1/clubs")
@@ -61,7 +74,10 @@ void createClubTest() throws Exception {
                         preprocessRequest(prettyPrint()),
                         preprocessResponse(prettyPrint()),
                         requestFields(
-                                fieldWithPath("requiredInfo").type(JsonFieldType.STRING).description("클럽 생성시 필요한 임시 정보")
+                                fieldWithPath("name").type(JsonFieldType.STRING).description("클럽 이름"),
+                                fieldWithPath("info").type(JsonFieldType.STRING).description("클럽 소개"),
+                                fieldWithPath("owner").type(JsonFieldType.STRING).description("클럽 생성자"),
+                                fieldWithPath("image").type(JsonFieldType.STRING).description("클럽 썸네일 이미지")
                         )));
     }