Skip to content
This repository was archived by the owner on Oct 20, 2024. It is now read-only.

Commit 3ad8529

Browse files
committed
fix: 빌드 오류 수정
1 parent 33b7a6b commit 3ad8529

File tree

7 files changed

+58
-0
lines changed

7 files changed

+58
-0
lines changed

src/main/java/com/finfellows/domain/bookmark/application/EduContentBookmarkServiceImpl.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@
22

33
import com.finfellows.domain.bookmark.domain.EduContentBookmark;
44
import com.finfellows.domain.bookmark.domain.repository.EduContentBookmarkRepository;
5+
import com.finfellows.domain.bookmark.dto.EduContentBookmarkRes;
56
import com.finfellows.domain.educontent.domain.EduContent;
67
import com.finfellows.domain.educontent.domain.repository.EduContentRepository;
78
import com.finfellows.domain.user.domain.User;
89
import com.finfellows.domain.user.domain.repository.UserRepository;
910
import com.finfellows.global.config.security.token.UserPrincipal;
1011
import com.finfellows.global.payload.Message;
12+
import com.finfellows.global.payload.ResponseCustom;
1113
import lombok.RequiredArgsConstructor;
1214
import org.springframework.http.ResponseEntity;
1315
import org.springframework.stereotype.Service;
1416
import org.springframework.transaction.annotation.Transactional;
1517

18+
import java.util.List;
1619
import java.util.Optional;
1720

1821
@Service
@@ -69,5 +72,17 @@ public Message delete(UserPrincipal userPrincipal, Long id) {
6972
.build();
7073
}
7174

75+
public ResponseCustom<List<EduContentBookmarkRes>> findBookmarks(UserPrincipal userPrincipal) {
76+
Optional<User> optionalUser = userRepository.findByEmail(userPrincipal.getEmail());
77+
78+
User user = optionalUser.get();
79+
80+
List<EduContentBookmark> bookmarks = eduContentBookmarkRepository.findAllByUser(user);
7281

82+
83+
List<EduContentBookmarkRes> eduContentBookmarkResList = EduContentBookmarkRes.toDto(bookmarks);
84+
85+
86+
return ResponseCustom.OK(eduContentBookmarkResList);
87+
}
7388
}

src/main/java/com/finfellows/domain/bookmark/application/FinancialProductBookmarkServiceImpl.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
package com.finfellows.domain.bookmark.application;
22

3+
import com.finfellows.domain.bookmark.domain.EduContentBookmark;
34
import com.finfellows.domain.bookmark.domain.FinancialProductBookmark;
5+
import com.finfellows.domain.bookmark.domain.repository.EduContentBookmarkRepository;
46
import com.finfellows.domain.bookmark.domain.repository.FinancialProductBookmarkRepository;
7+
import com.finfellows.domain.bookmark.dto.EduContentBookmarkRes;
58
import com.finfellows.domain.product.domain.FinancialProduct;
69
import com.finfellows.domain.product.domain.repository.FinancialProductRepository;
710
import com.finfellows.domain.user.domain.User;
811
import com.finfellows.domain.user.domain.repository.UserRepository;
912
import com.finfellows.global.config.security.token.UserPrincipal;
1013
import com.finfellows.global.payload.Message;
14+
import com.finfellows.global.payload.ResponseCustom;
1115
import lombok.RequiredArgsConstructor;
1216
import org.springframework.http.ResponseEntity;
1317
import org.springframework.stereotype.Service;
1418
import org.springframework.transaction.annotation.Transactional;
1519

20+
import java.util.List;
1621
import java.util.Optional;
1722

1823
@Service
@@ -21,6 +26,7 @@ public class FinancialProductBookmarkServiceImpl implements BookmarkService{
2126
private final FinancialProductBookmarkRepository financialProductBookmarkRepository;
2227
private final UserRepository userRepository;
2328
private final FinancialProductRepository financialProductRepository;
29+
private final EduContentBookmarkRepository eduContentBookmarkRepository;
2430

2531
@Transactional
2632
@Override
@@ -63,5 +69,18 @@ public Message delete(UserPrincipal userPrincipal, Long id) {
6369
.build();
6470
}
6571

72+
public ResponseCustom<List<EduContentBookmarkRes>> findBookmarks(UserPrincipal userPrincipal) {
73+
Optional<User> optionalUser = userRepository.findByEmail(userPrincipal.getEmail());
74+
75+
User user = optionalUser.get();
76+
77+
List<EduContentBookmark> bookmarks = eduContentBookmarkRepository.findAllByUser(user);
78+
79+
80+
List<EduContentBookmarkRes> eduContentBookmarkResList = EduContentBookmarkRes.toDto(bookmarks);
81+
82+
83+
return ResponseCustom.OK(eduContentBookmarkResList);
84+
}
6685

6786
}

src/main/java/com/finfellows/domain/bookmark/application/PolicyInfoBookmarkServiceImpl.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@
22

33
import com.finfellows.domain.bookmark.domain.PolicyInfoBookmark;
44
import com.finfellows.domain.bookmark.domain.repository.PolicyInfoBookmarkRepository;
5+
import com.finfellows.domain.bookmark.dto.PolicyInfoBookmarkRes;
56
import com.finfellows.domain.policyinfo.domain.PolicyInfo;
67
import com.finfellows.domain.policyinfo.domain.repository.PolicyInfoRepository;
78
import com.finfellows.domain.user.domain.User;
89
import com.finfellows.domain.user.domain.repository.UserRepository;
910
import com.finfellows.global.config.security.token.UserPrincipal;
1011
import com.finfellows.global.payload.Message;
12+
import com.finfellows.global.payload.ResponseCustom;
1113
import lombok.RequiredArgsConstructor;
1214
import org.springframework.http.ResponseEntity;
1315
import org.springframework.stereotype.Service;
1416
import org.springframework.transaction.annotation.Transactional;
1517

18+
import java.util.List;
1619
import java.util.Optional;
1720

1821
@Service
@@ -63,5 +66,15 @@ public Message delete(UserPrincipal userPrincipal, Long id) {
6366
.build();
6467
}
6568

69+
public ResponseCustom<?> findBookmarks(UserPrincipal userPrincipal) {
70+
Optional<User> optionalUser = userRepository.findByEmail(userPrincipal.getEmail());
71+
72+
User user = optionalUser.get();
6673

74+
List<PolicyInfoBookmark> bookmarks = policyInfoBookmarkRepository.findAllByUser(user);
75+
76+
List<PolicyInfoBookmarkRes> policyInfoBookmarkResList = PolicyInfoBookmarkRes.toDto(bookmarks);
77+
78+
return ResponseCustom.OK(policyInfoBookmarkResList);
79+
}
6780
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
package com.finfellows.domain.bookmark.domain.repository;
22

33
import com.finfellows.domain.bookmark.domain.EduContentBookmark;
4+
import com.finfellows.domain.bookmark.domain.FinancialProductBookmark;
45
import com.finfellows.domain.educontent.domain.EduContent;
56
import com.finfellows.domain.user.domain.User;
67
import org.springframework.data.jpa.repository.JpaRepository;
78

9+
import java.util.List;
810
import java.util.Optional;
911

1012
public interface EduContentBookmarkRepository extends JpaRepository<EduContentBookmark, Long> {
1113
Optional<EduContentBookmark> findByUserAndEduContent(User user, EduContent eduContent);
14+
15+
List<EduContentBookmark> findAllByUser(User user);
1216
}

src/main/java/com/finfellows/domain/bookmark/domain/repository/FinancialProductBookmarkRepository.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
import com.finfellows.domain.user.domain.User;
88
import org.springframework.data.jpa.repository.JpaRepository;
99

10+
import java.util.List;
1011
import java.util.Optional;
1112

1213
public interface FinancialProductBookmarkRepository extends JpaRepository<FinancialProductBookmark, Long> {
1314
Optional<FinancialProductBookmark> findByUserAndFinancialProduct(User user, FinancialProduct financialProduct);
15+
16+
List<FinancialProductBookmark> findAllByUser(User user);
1417
}

src/main/java/com/finfellows/domain/bookmark/domain/repository/PolicyInfoBookmarkRepository.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
import com.finfellows.domain.user.domain.User;
88
import org.springframework.data.jpa.repository.JpaRepository;
99

10+
import java.util.List;
1011
import java.util.Optional;
1112

1213
public interface PolicyInfoBookmarkRepository extends JpaRepository<PolicyInfoBookmark, Long> {
1314
Optional<PolicyInfoBookmark> findByUserAndPolicyInfo(User user, PolicyInfo policyInfo);
15+
16+
List<PolicyInfoBookmark> findAllByUser(User user);
1417
}

src/main/java/com/finfellows/domain/product/domain/repository/FinancialProductRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
import org.springframework.data.jpa.repository.JpaRepository;
55

66
public interface FinancialProductRepository extends JpaRepository<FinancialProduct, Long> {
7+
78
}

0 commit comments

Comments
 (0)