Merge pull request #46 from LeejuButU/refactor/repository

Spring Data Repository 적용

src/main/java/LeejuButU/BidCycle/domain/bidHistory/repository/BidHistoryRepository.java

@@ -1,45 +1,8 @@
 package LeejuButU.BidCycle.domain.bidHistory.repository;
 
 import LeejuButU.BidCycle.domain.bidHistory.domain.BidHistory;
-import jakarta.persistence.EntityManager;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
-import java.util.Optional;
+public interface BidHistoryRepository extends JpaRepository<BidHistory, Long> {
 
-@Repository
-@RequiredArgsConstructor
-public class BidHistoryRepository {
-    private final EntityManager entityManager;
-
-    public Long save(BidHistory bidHistory) {
-        entityManager.persist(bidHistory);
-        return bidHistory.getBidHistoryId();
-    }
-
-    public Optional<BidHistory> findById(Long bidHistoryId) {
-        BidHistory bidHistory = entityManager.find(BidHistory.class, bidHistoryId);
-        return Optional.ofNullable(bidHistory);
-    }
-
-    public List<BidHistory> findAll() {
-        return entityManager
-                .createQuery("select h from BidHistory h", BidHistory.class)
-                .getResultList();
-    }
-
-    public Long update(BidHistory bidHistory) {
-        entityManager.merge(bidHistory);
-        return bidHistory.getBidHistoryId();
-    }
-
-    public void delete(BidHistory bidHistory) {
-        entityManager.remove(bidHistory);
-    }
-
-    public void deleteById(Long bidHistoryId) {
-        BidHistory history = findById(bidHistoryId).orElseThrow(IllegalArgumentException::new);
-        entityManager.remove(history);
-    }
-}
+}

src/main/java/LeejuButU/BidCycle/domain/chat/message/repository/ChatMessageRepository.java

@@ -1,44 +1,7 @@
 package LeejuButU.BidCycle.domain.chat.message.repository;
 
 import LeejuButU.BidCycle.domain.chat.message.domain.ChatMessage;
-import jakarta.persistence.EntityManager;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
-import java.util.Optional;
-
-@Repository
-@RequiredArgsConstructor
-public class ChatMessageRepository {
-    private final EntityManager em;
-
-    public Long save(ChatMessage chatMessage) {
-        em.persist(chatMessage);
-        return chatMessage.getChatMessageId();
-    }
-
-    public Optional<ChatMessage> findById(Long chatMessageId) {
-        ChatMessage chatMessage = em.find(ChatMessage.class, chatMessageId);
-        return Optional.ofNullable(chatMessage);
-    }
-
-    public List<ChatMessage> findAll() {
-        return em.createQuery("select m from ChatMessage m", ChatMessage.class)
-                .getResultList();
-    }
-
-    public Long update(ChatMessage chatMessage) {
-        em.merge(chatMessage);
-        return chatMessage.getChatMessageId();
-    }
-
-    public void delete(ChatMessage chatMessage) {
-        em.remove(chatMessage);
-    }
-
-    public void deleteById(Long chatMessageId) {
-        ChatMessage chatMessage = findById(chatMessageId).orElseThrow(IllegalArgumentException::new);
-        em.remove(chatMessage);
-    }
-}
+interface ChatMessageRepository extends JpaRepository<ChatMessage, Long> {
+}

src/main/java/LeejuButU/BidCycle/domain/chat/room/repository/ChatRoomRepository.java

@@ -1,44 +1,6 @@
 package LeejuButU.BidCycle.domain.chat.room.repository;
 
 import LeejuButU.BidCycle.domain.chat.room.domain.ChatRoom;
-import jakarta.persistence.EntityManager;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
-import java.util.Optional;
-
-@Repository
-@RequiredArgsConstructor
-public class ChatRoomRepository {
-    private final EntityManager em;
-
-    public Long save(ChatRoom chatRoom) {
-        em.persist(chatRoom);
-        return chatRoom.getChatRoomId();
-    }
-
-    public Optional<ChatRoom> findById(Long chatRoomId) {
-        ChatRoom chatRoom = em.find(ChatRoom.class, chatRoomId);
-        return Optional.ofNullable(chatRoom);
-    }
-
-    public List<ChatRoom> findAll() {
-        return em.createQuery("select r from ChatRoom r", ChatRoom.class)
-                .getResultList();
-    }
-
-    public Long update(ChatRoom chatRoom) {
-        em.merge(chatRoom);
-        return chatRoom.getChatRoomId();
-    }
-
-    public void delete(ChatRoom chatRoom) {
-        em.remove(chatRoom);
-    }
-
-    public void deleteById(Long chatRoomId) {
-        ChatRoom chatRoom = findById(chatRoomId).orElseThrow(IllegalArgumentException::new);
-        em.remove(chatRoom);
-    }
-}
+interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {}

src/main/java/LeejuButU/BidCycle/domain/interestProduct/repository/InterestProductRepository.java

@@ -3,5 +3,6 @@
 import LeejuButU.BidCycle.domain.interestProduct.domain.InterestProduct;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public abstract class InterestProductRepository implements JpaRepository<InterestProduct, Long> {
+public interface InterestProductRepository extends JpaRepository<InterestProduct, Long> {
+
 }

src/main/java/LeejuButU/BidCycle/domain/member/repository/MemberRepository.java

@@ -1,57 +1,13 @@
 package LeejuButU.BidCycle.domain.member.repository;
+// findByNickname
 
 import LeejuButU.BidCycle.domain.member.domain.Member;
-import jakarta.persistence.EntityManager;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
 import java.util.Optional;
 
-@Repository
-@RequiredArgsConstructor
-public class MemberRepository {
-
-    private final EntityManager em;
-
-    // CREATE
-    public Long save(Member member) {
-        em.persist(member);
-        return member.getMemberId();
-    }
-
-    // READ
-    public Optional<Member> findById(Long memberId) {
-        Member member = em.find(Member.class, memberId);
-        return Optional.ofNullable(member);
-    }
-
-    public Optional<Member> findByNickname(String nickname) {
-        String jpql = "SELECT m FROM Member m WHERE m.nickname = :nickname";
-        Member member = em.createQuery(jpql, Member.class)
-                .setParameter("nickname", nickname)
-                .getSingleResult();
-        return Optional.ofNullable(member);
-    }
-
-    public List<Member> findAll() {
-        String jpql = "SELECT m FROM Member m";
-        return em.createQuery(jpql, Member.class)
-                .getResultList();
-    }
-
-    // UPDATE
-    public void update(Member member){
-        em.merge(member);
-    }
-
-    // DELETE
-    public void delete(Member member){
-        em.remove(member);
-    }
-
-    public void deleteById(Long memberId){
-        Member member = findById(memberId).orElseThrow(IllegalArgumentException::new);
-        em.remove(member);
-    }
-}
+public interface MemberRepository extends JpaRepository<Member, Long> {
+    // 이제 find by Nickname 을 만들겡
+    // 여러가지 방식이 있긴한데, 그냥 간단하게 메서드 이름으로 만들어볼겡
+    Optional<Member> findByNickname(String nickname); // 왜 이럴깡 흠
+}

src/main/java/LeejuButU/BidCycle/domain/photo/repository/PhotoRepository.java

@@ -3,5 +3,5 @@
 import LeejuButU.BidCycle.domain.photo.domain.Photo;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public abstract class PhotoRepository implements JpaRepository<Photo, Long> {
+public interface PhotoRepository extends JpaRepository<Photo, Long> {
 }

src/main/java/LeejuButU/BidCycle/domain/product/repository/ProductRepository.java

@@ -1,40 +1,6 @@
 package LeejuButU.BidCycle.domain.product.repository;
 
 import LeejuButU.BidCycle.domain.product.domain.Product;
-import jakarta.persistence.EntityManager;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
-import java.util.Optional;
-
-@Repository
-@RequiredArgsConstructor
-public class ProductRepository {
-
-    private final EntityManager em;
-
-    public Long save(Product product){
-        em.persist(product);
-        return product.getProductId();
-    }
-
-    public Optional<Product> findById(Long productId){
-        Product product = em.find(Product.class, productId);
-        return Optional.ofNullable(product);
-    }
-
-    public List<Product> findAll(){
-        return em.createQuery("select m from Product m", Product.class)
-                .getResultList();
-    }
-
-    public void delete(Product product){
-        em.remove(product);
-    }
-
-    public void deleteById(Long productId){
-        Product product = findById(productId).orElseThrow(IllegalArgumentException::new);
-        em.remove(product);
-    }
-}
+public interface ProductRepository extends JpaRepository<Product, Long> { }

src/main/java/LeejuButU/BidCycle/domain/qna/repository/QnaRepository.java

@@ -3,6 +3,4 @@
 import LeejuButU.BidCycle.domain.qna.domain.Qna;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public abstract class QnaRepository implements JpaRepository<Qna, Long> {
-
-}
+public interface QnaRepository extends JpaRepository<Qna, Long> { }

src/test/java/LeejuButU/BidCycle/bidHistory/repository/BidHistoryRepositoryTest.java

@@ -13,7 +13,7 @@
 @Transactional
 class BidHistoryRepositoryTest {
     @Autowired
-    private BidHistoryRepository repository;
+    private BidHistoryRepository repository; // 빈으로 등록이 왜 안돼징
 
     @Test
     @DisplayName("없는 ID를 조회하면 오류가 발생한다.")

src/test/java/LeejuButU/BidCycle/member/repository/MemberRepositoryTest.java

@@ -41,13 +41,13 @@ public void test_save(){
     public void test_findById(){
         //given
         Member member = generateMember("alice99");
-        Long memberId = repository.save(member);
+        repository.save(member);
 
         //when
         Member result = repository.findById(member.getMemberId()).orElseThrow();
 
         //then
-        assertThat(result.getMemberId()).isEqualTo(memberId);
+        assertThat(result.getMemberId()).isEqualTo(member.getMemberId());
     }
 
     @Test
@@ -86,13 +86,12 @@ public void test_update(){
         //given
         Member member = generateMember("alice99");
         repository.save(member);
+
+        //when
         member.updatePassword("0000");
         member.updateNickname("Bob");
         member.updateTown("부산");
 
-        //when
-        repository.update(member);
-
         //then
         Member result = repository.findById(member.getMemberId()).orElseThrow();
         assertThat(result).usingRecursiveComparison().isEqualTo(member);