fix: card list 전체 반환

2023-Attention-Hackerthon · Nov 25, 2023 · 8e28081 · 8e28081
1 parent ab8f761
commit 8e28081
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 0 deletions.
diff --git a/src/main/java/com/hackathon/hackathon/domain/card/entity/Card.java b/src/main/java/com/hackathon/hackathon/domain/card/entity/Card.java
@@ -2,6 +2,7 @@
 
 import com.hackathon.hackathon.domain.card.enums.CardStatus;
 import com.hackathon.hackathon.domain.card.enums.Gender;
+import com.hackathon.hackathon.domain.user.entity.User;
 import com.hackathon.hackathon.domain.wallet.entity.Wallet;
 import com.hackathon.hackathon.global.entity.BaseTimeEntity;
 import jakarta.persistence.Entity;
@@ -54,6 +55,9 @@ public class Card extends BaseTimeEntity {
     private String githubId;
     private String colorCode;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    private User user;
+
     @Enumerated(EnumType.STRING)
     @NotNull
     private CardStatus cardStatus;

diff --git a/src/main/java/com/hackathon/hackathon/domain/card/repository/CardRepository.java b/src/main/java/com/hackathon/hackathon/domain/card/repository/CardRepository.java
@@ -4,6 +4,9 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Optional;
+
 @Repository
 public interface CardRepository extends JpaRepository<Card, Long> {
 }
diff --git a/src/main/java/com/hackathon/hackathon/domain/wallet/controller/WalletController.java b/src/main/java/com/hackathon/hackathon/domain/wallet/controller/WalletController.java
@@ -56,6 +56,14 @@ public SuccessResponse<Object> getCardUrls(@RequestParam Long walletId){
         return walletService.getAllCardLinks(walletId);
     }
 
+    @Operation(description = "내가 만든 카드들 다 보기")
+    @GetMapping("/cards")
+    public SuccessResponse<Object> getCards(){
+        User user = authentiatedUserUtils.getCurrentUser();
+        return walletService.getAllCard(user);
+    }
+
+
 //    @Operation(description = "지갑에 여러 이미지 url 올리기")
 //    @PostMapping("/{walletId}")
 //    public List<String> uploadCard(@RequestParam Long walletId) {

diff --git a/src/main/java/com/hackathon/hackathon/domain/wallet/service/WalletService.java b/src/main/java/com/hackathon/hackathon/domain/wallet/service/WalletService.java
@@ -1,5 +1,8 @@
 package com.hackathon.hackathon.domain.wallet.service;
 
+import com.hackathon.hackathon.domain.card.dto.response.CardCreateResponseDto;
+import com.hackathon.hackathon.domain.card.entity.Card;
+import com.hackathon.hackathon.domain.card.repository.CardRepository;
 import com.hackathon.hackathon.domain.user.entity.User;
 import com.hackathon.hackathon.domain.user.repositroy.UserRepository;
 import com.hackathon.hackathon.domain.wallet.dto.request.WalletRequestDTO;
@@ -28,6 +31,7 @@
 public class WalletService {
 
     private final WalletRepository walletRepository;
+    private final CardRepository cardRepository;
     // 지갑 만들기
     @Transactional
     public SuccessResponse<Object> createWallet(User user, WalletRequestDTO walletRequestDTO) {
@@ -115,4 +119,26 @@ public SuccessResponse<Object> getAllCardLinks(Long walletId) {
         return SuccessResponse.onSuccess(200,wallets);
     }
 
+    public SuccessResponse<Object> getAllCard(User user) {
+        List<Card> cards = cardRepository.findAll();
+        List<CardCreateResponseDto> cardDTOs = cards.stream()
+                .map(saveCard -> CardCreateResponseDto.builder().
+                        id(saveCard.getId()).
+                        nickname(saveCard.getNickname()).
+                        contact(saveCard.getContact()).
+                        gender(saveCard.getGender()).
+                        instagramId(saveCard.getInstagramId()).
+                        blogUrl(saveCard.getBlogUrl()).
+                        youtubeUrl(saveCard.getYoutubeUrl()).
+                        githubId(saveCard.getGithubId()).
+                        cardName(saveCard.getCardName()).
+                        introduce(saveCard.getIntroduce()).
+                        age(saveCard.getAge()).
+                        adjective(saveCard.getAdjective()).
+                        mbti(saveCard.getMbti()).
+                        colorCode(saveCard.getColorCode()).
+                        build())
+                .collect(Collectors.toList());
+        return SuccessResponse.onSuccess(200, cardDTOs);
+    }
 }