Skip to content

Commit 84b6625

Browse files
authored
Dev > Main 브랜치 병합
1. 스킬태그 등록시 오류나는 버그를 수정하였습니다. 통합테스트 거친 뒤 Main 브랜치로 병합합니다.
2 parents 0b572bb + 162a5b3 commit 84b6625

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

src/main/java/hs/kr/backend/devpals/domain/tag/dto/SkillTagRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import io.swagger.v3.oas.annotations.media.Schema;
8+
import lombok.Setter;
89
import org.springframework.web.multipart.MultipartFile;
910

1011
@Getter
12+
@Setter
1113
@AllArgsConstructor
1214
@NoArgsConstructor
1315
public class SkillTagRequest {

src/main/java/hs/kr/backend/devpals/domain/tag/service/TagService.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import lombok.RequiredArgsConstructor;
1717
import org.springframework.http.ResponseEntity;
1818
import org.springframework.stereotype.Service;
19+
import org.springframework.web.multipart.MultipartFile;
1920

2021
import java.util.Collections;
2122
import java.util.List;
@@ -55,10 +56,21 @@ public void refreshSkillTags() {
5556
}
5657

5758
public ResponseEntity<ApiResponse<SkillTagEntity>> createSkillTag(SkillTagRequest request) {
58-
String ext = getSkillExtension(request.getImg().getOriginalFilename());
59+
MultipartFile img = request.getImg();
60+
61+
if (img == null || img.isEmpty()) {
62+
throw new CustomException(ErrorException.FILE_EMPTY); // 적절한 에러 코드 사용
63+
}
64+
65+
String originalFilename = img.getOriginalFilename();
66+
if (originalFilename == null || originalFilename.trim().isEmpty()) {
67+
throw new CustomException(ErrorException.FILE_NOT_SEARCH);
68+
}
69+
70+
String ext = getSkillExtension(originalFilename);
5971
String fileName = request.getName().trim().replaceAll("\\s+", "_") + "." + ext;
6072

61-
String imgUrl = awsS3Client.upload(request.getImg(), fileName);
73+
String imgUrl = awsS3Client.upload(img, fileName);
6274

6375
SkillTagEntity skillTag = new SkillTagEntity(request.getName(), imgUrl);
6476
SkillTagEntity saved = skillTagRepository.save(skillTag);
@@ -67,6 +79,7 @@ public ResponseEntity<ApiResponse<SkillTagEntity>> createSkillTag(SkillTagReques
6779
return ResponseEntity.ok(new ApiResponse<>(200, true, "스킬 태그 등록 성공", saved));
6880
}
6981

82+
7083
public ResponseEntity<ApiResponse<PositionTagEntity>> createPositionTag(PositionTagRequest request) {
7184
PositionTagEntity positionTag = new PositionTagEntity(request.getName());
7285
PositionTagEntity saved = positionTagRepository.save(positionTag);

0 commit comments

Comments
 (0)