Merge pull request #198 from KW-MUJI/develop

fix: 이미지 업로드 문제 해결

Author: cjh-19

src/main/java/com/muji_backend/kw_muji/team/controller/TeamController.java

@@ -7,25 +7,22 @@
 import com.muji_backend.kw_muji.common.entity.enums.ProjectRole;
 import com.muji_backend.kw_muji.team.dto.request.RegisterRequestDTO;
 import com.muji_backend.kw_muji.team.dto.request.ResumeRequestDTO;
-import com.muji_backend.kw_muji.team.dto.response.ProjectListResponseDTO;
 import com.muji_backend.kw_muji.team.dto.response.ProjectDetailResponseDTO;
 import com.muji_backend.kw_muji.team.dto.response.ResumeListResponseDTO;
 import com.muji_backend.kw_muji.team.service.TeamService;
-import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -39,19 +36,20 @@ public class TeamController {
     @Value("${cloud.aws.s3.url}")
     private String bucketURL;
 
-    @PostMapping("/register")
-    public ResponseEntity<Map<String, Object>> writeProject(@AuthenticationPrincipal UserEntity userInfo,
-                                                            @Valid @RequestBody RegisterRequestDTO dto,
-                                                            @RequestParam(value = "image", required = false) MultipartFile[] file, BindingResult bindingResult) {
+    @PostMapping(value = "/register", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseEntity<Map<String, Object>> writeProject(
+            @AuthenticationPrincipal UserEntity userInfo,
+            @ModelAttribute RegisterRequestDTO dto, BindingResult bindingResult) {
         try {
             // 유효성 검사
             teamService.validation(bindingResult, "name");
             teamService.validation(bindingResult, "description");
 
             final ProjectEntity teamProject = new ProjectEntity();
 
-            if(file != null && file.length > 0 && !file[0].isEmpty())
-                teamProject.setImage(teamService.uploadProjectImage(file, dto.getName()));
+            if (dto.getImage() != null && dto.getImage().length > 0 && !dto.getImage()[0].isEmpty()) {
+                teamProject.setImage(teamService.uploadProjectImage(dto.getImage(), dto.getName()));
+            }
 
             teamProject.setName(dto.getName());
             teamProject.setDescription(dto.getDescription());
@@ -63,16 +61,16 @@ public ResponseEntity<Map<String, Object>> writeProject(@AuthenticationPrincipal
                     .users(userInfo)
                     .build();
 
-            if (teamProject.getParticipation() == null)
+            if (teamProject.getParticipation() == null) {
                 teamProject.setParticipation(new ArrayList<>());
-
+            }
             teamProject.getParticipation().add(participation);
 
             teamService.registerProject(teamProject);
 
-            return org.springframework.http.ResponseEntity.ok().body(Map.of("code", 200, "data", true));
+            return ResponseEntity.ok().body(Map.of("code", 200, "data", true));
         } catch (IllegalArgumentException | IOException e) {
-            return org.springframework.http.ResponseEntity.badRequest().body(Map.of("code", 400, "data", e.getMessage()));
+            return ResponseEntity.badRequest().body(Map.of("code", 400, "data", e.getMessage()));
         } catch (RuntimeException e) {
             return ResponseEntity.status(500).body(Map.of("code", 500, "data", "팀플 모집 글쓰기 오류. 잠시 후 다시 시도해주세요."));
         }

src/main/java/com/muji_backend/kw_muji/team/dto/request/RegisterRequestDTO.java

@@ -6,6 +6,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDate;
 
@@ -22,4 +23,6 @@ public class RegisterRequestDTO {
 
     @NotNull
     private LocalDate deadlineAt;
+
+    private MultipartFile[] image;
 }