[feat] 단어 정보 & 감정 표현 관련 api 구현

.gitignore

@@ -37,3 +37,5 @@ out/
 .vscode/
 
 application.yml
+comma_firebase_key.json
+

build.gradle

@@ -26,6 +26,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
+
     // lombok
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
@@ -41,7 +42,6 @@ dependencies {
     implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2'
     implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2'
 
-
     //oauth2
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
@@ -55,7 +55,19 @@ dependencies {
     //implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
     // aws
-    //implementation 'io.awspring.cloud:spring-cloud-starter-aws:2.4.1'
+    implementation 'io.awspring.cloud:spring-cloud-starter-aws:2.4.1'
+
+    //jsoup
+    implementation 'org.jsoup:jsoup:1.15.3'
+
+    //chatgpt
+    implementation 'io.github.flashvayne:chatgpt-spring-boot-starter:1.0.4'
+
+    //firebase
+    implementation 'com.google.firebase:firebase-admin:9.2.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+
+    implementation 'com.google.cloud:google-cloud-vertex-ai:1.2.0'
 }
 
 tasks.named('test') {

src/main/java/com/example/comma/domain/card/controller/CardController.java

@@ -1,34 +1,77 @@
 package com.example.comma.domain.card.controller;
 
+import com.example.comma.domain.card.dto.request.CardInfoRequest;
 import com.example.comma.domain.card.dto.response.*;
 import com.example.comma.domain.card.service.CardService;
+import com.example.comma.domain.external.service.GeminiService;
+import com.example.comma.domain.external.service.ImageCrawlerService;
 import com.example.comma.global.common.SuccessResponse;
 import com.example.comma.global.config.auth.UserId;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
+import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 
 @RequiredArgsConstructor
 @RequestMapping("/api/card")
 @RestController
 public class CardController {
     private final CardService cardService;
+    private final GeminiService geminiService;
+    private final ImageCrawlerService imageCrawlerService;
 
-    @GetMapping("/{name}")
-    public ResponseEntity<SuccessResponse<?>> getWord(@PathVariable(name = "name") String name) {
-        CardImageResponseDto CardImage = cardService.getCardImage(name);
-        return SuccessResponse.ok(CardImage);
+
+    //단어 리스트 검색
+    @GetMapping("/search-word")
+    public ResponseEntity<SuccessResponse<?>> getSearchList(@RequestParam(name = "searchWord") String searchWord) throws IOException {
+        List<String> searchResults = imageCrawlerService.crawlSearchList(searchWord);
+        List<DescriptionResponseDto> descriptionResponse = geminiService.generateDescriptionList(searchResults);
+        return SuccessResponse.ok(descriptionResponse);
     }
 
+    //단어 상세 정보 조회
+    @GetMapping("/search-details")
+    public ResponseEntity<SuccessResponse<?>> generateResponse(@RequestParam(name = "searchWord") String searchWord) throws IOException {
+
+       //수형, 단어 이미지 생성
+        List<String> signImageUrls = imageCrawlerService.crawlImageUrls(searchWord);
+        byte[] mergeImages = imageCrawlerService.mergeImages(signImageUrls);
+        String signImageUrl = imageCrawlerService.uploadFile(mergeImages, searchWord + ".jpg");
+        String generatedImageUrl = imageCrawlerService.generateImage(searchWord);;
+
+        //cardId 생성
+        cardService.registerCard(searchWord, signImageUrl);
+        Long cardId = cardService.getCardId(searchWord);
+
+        //단어 사전 정의 생성
+        List<DescriptionResponseDto> descriptionResponse = geminiService.generateDescriptionList(Collections.singletonList(searchWord));
+
+        //수형 동작 설명
+        String generatesignLanguageDescription= geminiService.generateSignDescription(searchWord);
+
+        WordDatailsResponseDto wordDatailsResponse = new WordDatailsResponseDto(cardId, searchWord, descriptionResponse.get(0).description(),descriptionResponse.get(0).partsOfSeech(), generatedImageUrl, signImageUrl,generatesignLanguageDescription );
+
+        return SuccessResponse.ok(wordDatailsResponse);
+    }
+
+
+    //UserCard 단어 카드 저장
     @PostMapping("/{cardId}")
-    public ResponseEntity<SuccessResponse<?>> createCard(@UserId Long userId, @PathVariable(name = "cardId") Long cardId) {
-        cardService.createCard(userId, cardId);
+    public ResponseEntity<SuccessResponse<?>> saveCard(@UserId Long userId, @PathVariable(name = "cardId") Long cardId, @RequestBody CardInfoRequest cardInfoRequest) {
+        cardService.saveCard(userId, cardId, cardInfoRequest);
         return SuccessResponse.created(null);
     }
 
+    //UserCard 개별 정보 조회
+    @GetMapping("/my-card/{userCardId}")
+    public ResponseEntity<SuccessResponse<?>> getMyCard(@PathVariable(name = "userCardId") Long userCardId) {
+       MyCardResponseDto myCard = cardService.getMyCard(userCardId);
+        return SuccessResponse.ok(myCard);
+    }
+
     @GetMapping("/lastest")
     public ResponseEntity<SuccessResponse<?>> getLastestCard(@UserId Long userId) {
         List<CardResponseDto> CardImage = cardService.getLatestCard(userId);

src/main/java/com/example/comma/domain/card/dto/request/CardInfoRequest.java

@@ -0,0 +1,7 @@
+package com.example.comma.domain.card.dto.request;
+
+public record CardInfoRequest(
+        String cardImageUrl,
+        String signLanguageDescription
+) {
+}

src/main/java/com/example/comma/domain/card/dto/response/DescriptionResponseDto.java

@@ -0,0 +1,8 @@
+package com.example.comma.domain.card.dto.response;
+
+public record DescriptionResponseDto(
+        String word,
+        String description,
+        String partsOfSeech
+) {
+}

src/main/java/com/example/comma/domain/card/dto/response/MyCardResponseDto.java

@@ -0,0 +1,9 @@
+package com.example.comma.domain.card.dto.response;
+
+public record MyCardResponseDto(
+        String name,
+        String cardImageUrl,
+        String signImageUrl,
+        String signLanguageDescription
+) {
+}

src/main/java/com/example/comma/domain/card/dto/response/SearchCardResponseDto.java

@@ -0,0 +1,7 @@
+package com.example.comma.domain.card.dto.response;
+
+public record SearchCardResponseDto(
+        String generatedImageUrl,
+        String signImageUrl
+) {
+}

src/main/java/com/example/comma/domain/card/dto/response/WordDatailsResponseDto.java

@@ -0,0 +1,13 @@
+package com.example.comma.domain.card.dto.response;
+
+public record WordDatailsResponseDto(
+        Long cardId,
+        String word,
+        String description,
+        String partsOfSeech,
+        String cardImageUrl,
+        String signImageUrl,
+        String signLanguageDescription
+
+) {
+}

src/main/java/com/example/comma/domain/card/entity/Card.java

@@ -20,12 +20,14 @@ public class Card {
 
     private String name;
 
-    private String CardImageUrl;
-
-    private String SignImageUrl;
-
+    private String signImageUrl;
 
     @OneToMany(mappedBy = "card")
     private List<UserCard> userCardList;
 
+    public Card(String name, String signImageUrl) {
+        this.name = name;
+        this.signImageUrl = signImageUrl;
+    }
+
 }

src/main/java/com/example/comma/domain/card/entity/UserCard.java

@@ -29,11 +29,16 @@ public class UserCard extends BaseTimeEntity {
 
     private Boolean cardRegistration;
 
-    public UserCard(User user, Card card, Boolean quizParticipation, Boolean cardRegistration) {
+    private String cardImageUrl;
+    private String signLanguageDescription;
+
+    public UserCard(User user, Card card, Boolean quizParticipation, Boolean cardRegistration, String cardImageUrl, String signLanguageDescription) {
         this.user = user;
         this.card = card;
         this.quizParticipation = quizParticipation;
         this.cardRegistration = cardRegistration;
+        this.cardImageUrl = cardImageUrl;
+        this.signLanguageDescription = signLanguageDescription;
     }
 
     public void setQuizParticipation(Boolean quizParticipation) {

src/main/java/com/example/comma/domain/card/service/CardService.java

@@ -1,13 +1,15 @@
 package com.example.comma.domain.card.service;
 
-import com.example.comma.domain.card.dto.response.CardImageResponseDto;
+import com.example.comma.domain.card.dto.request.CardInfoRequest;
 import com.example.comma.domain.card.dto.response.CardResponseDto;
 import com.example.comma.domain.card.dto.response.CorrectCardResponseDto;
+import com.example.comma.domain.card.dto.response.MyCardResponseDto;
 import com.example.comma.domain.card.dto.response.WrongCardResponseDto;
 import com.example.comma.domain.card.entity.Card;
 import com.example.comma.domain.card.entity.UserCard;
 import com.example.comma.domain.card.repository.CardRepository;
 import com.example.comma.domain.card.repository.UserCardRepository;
+import com.example.comma.domain.external.service.ImageCrawlerService;
 import com.example.comma.domain.user.entity.User;
 import com.example.comma.domain.user.repository.UserRepository;
 import com.example.comma.global.error.ErrorCode;
@@ -20,6 +22,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.Random;
 import java.util.stream.Collectors;
 
@@ -32,17 +35,25 @@ public class CardService {
     private final CardRepository cardRepository;
     private final UserRepository userRepository;
     private final UserCardRepository userCardRepository;
+    private final ImageCrawlerService imageCrawlerService;
 
-    public CardImageResponseDto getCardImage(String name) {
-        System.out.println("name = " + name);
+    public Long getCardId(String name) {
         Card card = cardRepository.findByName(name)
                 .orElseThrow(() -> new EntityNotFoundException(ErrorCode.CARD_NOT_FOUND));
-        return new CardImageResponseDto(card.getId(), card.getCardImageUrl(), card.getSignImageUrl());
+        return card.getId();
     }
 
+    public void registerCard(String name, String signImageUrl) {
+        Optional<Card> existingCardOptional = cardRepository.findByName(name);
+        if (existingCardOptional.isPresent()) {
+            return;
+        }
+        Card newCard = new Card(name, signImageUrl);
+        cardRepository.save(newCard);
+    }
 
-    public void createCard(Long userId, Long cardId) {
 
+    public void saveCard(Long userId, Long cardId, CardInfoRequest cardInfoRequest) {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new EntityNotFoundException(ErrorCode.USER_NOT_FOUND));
 
@@ -53,11 +64,12 @@ public void createCard(Long userId, Long cardId) {
             throw new ConflictException(ErrorCode.USER_CARD_ALREADY_EXISTS);
         }
 
-        UserCard userCard = new UserCard(user, card, false, true);
+        UserCard userCard = new UserCard(user, card, false, true, cardInfoRequest.cardImageUrl(), cardInfoRequest.signLanguageDescription());
 
         userCardRepository.save(userCard);
     }
 
+
     @Transactional
     @Scheduled(cron = "0 0 0 * * ?")
     public void resetCardRegistration() {
@@ -82,7 +94,7 @@ private List<CardResponseDto> convertToCardResponseDtos(List<UserCard> userCards
         return userCards.stream()
                 .map(userCard -> {
                     Card card = userCard.getCard();
-                    return new CardResponseDto(userCard.getId(), card.getName(), card.getCardImageUrl(), card.getSignImageUrl());
+                    return new CardResponseDto(userCard.getId(), card.getName(), userCard.getCardImageUrl(), card.getSignImageUrl());
                 })
                 .collect(Collectors.toList());
     }
@@ -102,13 +114,12 @@ public CardResponseDto getCardDetail(Long userCardId) {
                 .orElseThrow(() -> new EntityNotFoundException(ErrorCode.USER_CARD_NOT_FOUND));
 
         Card card = userCard.getCard();
-        return new CardResponseDto(card.getId(), card.getName(), card.getCardImageUrl(), card.getSignImageUrl());
+        return new CardResponseDto(card.getId(), card.getName(), userCard.getCardImageUrl(), card.getSignImageUrl());
     }
 
     public WrongCardResponseDto getRandomQuizCard(Long userCardId) {
         UserCard userCard = userCardRepository.findById(userCardId)
                 .orElseThrow(() -> new EntityNotFoundException(ErrorCode.USER_CARD_NOT_FOUND));
-
         List<UserCard> remainUserCards = userCardRepository.findUserCardByUserIdAndCardIdNot(userCard.getUser().getId(), userCardId);
 
         if (remainUserCards.size() <= 1) {
@@ -125,7 +136,7 @@ public WrongCardResponseDto getRandomQuizCard(Long userCardId) {
 
         randomCard = randomUserCard.getCard();
 
-        return new WrongCardResponseDto(randomCard.getName(), randomCard.getCardImageUrl(), randomCard.getSignImageUrl());
+        return new WrongCardResponseDto(randomCard.getName(), randomUserCard.getCardImageUrl(), randomCard.getSignImageUrl());
     }
 
 
@@ -134,7 +145,7 @@ public CorrectCardResponseDto getQuizCard(Long userCardId) {
                 .orElseThrow(() -> new EntityNotFoundException(ErrorCode.USER_CARD_NOT_FOUND));
 
         Card card = userCard.getCard();
-        return new CorrectCardResponseDto(card.getName(), card.getCardImageUrl(), card.getSignImageUrl());
+        return new CorrectCardResponseDto(card.getName(), userCard.getCardImageUrl(), card.getSignImageUrl());
     }
 
     @Transactional
@@ -149,4 +160,12 @@ public List<CardResponseDto> getTop5Cards(Long userId) {
         List<UserCard> userCards = userCardRepository.findTop5ByUserIdOrderByCreateDateDesc(userId);
         return convertToCardResponseDtos(userCards);
     }
+
+    public MyCardResponseDto getMyCard(Long userCardId) {
+        UserCard userCard = userCardRepository.findById(userCardId)
+                .orElseThrow(() -> new EntityNotFoundException(ErrorCode.USER_CARD_NOT_FOUND));
+
+        Card card = userCard.getCard();
+        return new MyCardResponseDto(card.getName(), userCard.getCardImageUrl(),card.getSignImageUrl(), userCard.getSignLanguageDescription());
+    }
 }