Merge pull request #13 from dochmai382/dev

포트폴리오 등록 로직 수정 및 미사용 코드 삭제

Author: aibeban

src/main/java/org/sunday/projectpop/controller/portfolio/PortfolioController.java

@@ -8,6 +8,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -33,7 +34,10 @@ public class PortfolioController {
 
     // 포트폴리오 목록 조회
     @GetMapping
-    public String getMyPortfolios(Model model) {
+    public String getMyPortfolios(Model model
+//                                  @RequestParam String userId
+    ) {
+
         String userId = "dummy1"; // TODO: Authentication에서 userId 받기
         List<PortfolioSimple> portfolios = portfolioService.getMyPortfolios(userId);
         model.addAttribute("portfolios", portfolios);

src/main/java/org/sunday/projectpop/controller/portfolio/PortfolioRestController.java

@@ -5,6 +5,7 @@
 import jakarta.validation.constraints.Size;
 import org.springframework.web.multipart.MultipartFile;
 import org.sunday.projectpop.model.enums.PortfolioType;
+import org.sunday.projectpop.validator.FileValidation;
 
 import java.util.List;
 
@@ -22,6 +23,8 @@ public record PortfolioRequest(
         String description,
 
         List<String> urls,
+
+//        @FileValidation(message = "첨부된 파일에 문제가 있습니다.")
         List<MultipartFile> files,
 
         // 수정용 필요

src/main/java/org/sunday/projectpop/model/dto/PortfolioRequest.java

@@ -3,5 +3,5 @@
 // FIXME: 수정. 직업이 아닌 종목으로
 public enum PortfolioType {
     DEVELOP,
-    ART,
+//    ART,
 }

src/main/java/org/sunday/projectpop/model/enums/PortfolioType.java

@@ -8,7 +8,9 @@
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Component
 public class LLMClient {
@@ -26,11 +28,31 @@ private WebClient createWebClient() {
                 .build();
     }
 
+    // 토큰 수 확인
+    public Mono<Integer> countTokens(String text) {
+        Map<String, Object> requestBody = new HashMap<>();
+        Map<String, Object> content = new HashMap<>();
+        content.put("parts", new Object[]{Map.of("text", text)});
+        requestBody.put("contents", new Object[]{content});
+
+        return createWebClient()
+                .post()
+                .uri(":countTokens?key=%s", apiKey)
+                .bodyValue(requestBody)
+                .retrieve()
+                .bodyToMono(Map.class)
+                .map(response -> (Integer) ((Map<?, ?>) response.get("usage")).get("totalTokens"))
+                .onErrorResume(e -> {
+                    System.err.println("토큰 수 계산 중 오류 발생: " + e.getMessage());
+                    return Mono.error(e);
+                });
+    }
+
     // LLM 피드백 요청
     public Mono<String> feedback(String content, String type) {
         return createWebClient()
                 .post()
-                .uri("?key=%s".formatted(apiKey))
+                .uri(":generateContent?key=%s".formatted(apiKey))
                 .bodyValue(buildFeedbackPrompt(content, type))
                 .retrieve()
                 .bodyToMono(GeminiResponse.class)
@@ -114,7 +136,7 @@ private GeminiRequest buildFeedbackPrompt(String content, String type) {
     public Mono<String> summarize(String content, String type) {
         return createWebClient()
                 .post()
-                .uri("?key=%s".formatted(apiKey))
+                .uri(":generateContent?key=%s".formatted(apiKey))
                 .bodyValue(buildSummaryPrompt(content, type))
                 .retrieve()
                 .bodyToMono(GeminiResponse.class)

src/main/java/org/sunday/projectpop/service/llm/LLMClient.java

@@ -0,0 +1,75 @@
+package org.sunday.projectpop.validator;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.List;
+
+// 커스텀 어노테이션
+@Constraint(validatedBy = FileValidation.FileValidator.class)
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FileValidation {
+
+    String message() default "유효하지 않은 파일 형식 또는 크기입니다.";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+    // Inner validator class
+    class FileValidator implements ConstraintValidator<FileValidation, List<MultipartFile>> {
+        // 허용 파일 Type (MIME types)
+        private static final List<String> ALLOWED_MIME_TYPES = List.of(
+                "application/pdf",
+                "text/markdown",
+                "text/csv",
+                "text/plain",
+                "application/msword", // .doc
+                "application/vnd.openxmlformats-officedocument.wordprocessingml.document", // .docx
+                "application/vnd.ms-excel", // .xls
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", // .xlsx
+                "application/vnd.ms-powerpoint", // .ppt
+                "application/vnd.openxmlformats-officedocument.presentationml.presentation" // .pptx
+        );
+        // MAX 파일 사이즈 (50MB)
+        private static final long MAX_FILE_SIZE = 50 * 1024 * 1024; // 50MB
+
+        @Override
+        public boolean isValid(List<MultipartFile> files, ConstraintValidatorContext context) {
+            // 빈 파일 체크
+            if (files == null || files.isEmpty()) {
+                return true;
+            }
+
+            for (MultipartFile file : files) {
+                if (file.isEmpty()) continue;
+
+                // 파일 크기 체크
+                if (file.getSize() > MAX_FILE_SIZE) {
+                    context.disableDefaultConstraintViolation();
+                    context.buildConstraintViolationWithTemplate("파일 크기는 50MB를 초과할 수 없습니다: " + file.getOriginalFilename())
+                            .addConstraintViolation();
+                    return false;
+                }
+
+                // 파일 형식 체크
+                String contentType = file.getContentType();
+                if (contentType == null || !ALLOWED_MIME_TYPES.contains(contentType)) {
+                    context.disableDefaultConstraintViolation();
+                    context.buildConstraintViolationWithTemplate("지원되지 않는 파일 형식입니다: " + file.getOriginalFilename())
+                            .addConstraintViolation();
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+}