SportsEcho V0.1.4 배포

.github/workflows/CD.yml

@@ -45,26 +45,32 @@ jobs:
           key: ${{ secrets.EC2_KEY }}
 
           script: |
-            sudo docker kill ${{ secrets.PROJECT_NAME }}
-            sudo docker rm -f ${{ secrets.PROJECT_NAME }}
+#           실행중인 서버 다운
+            sudo docker-compose down
+
+#           백엔드 도커 이미지 삭제
             sudo docker rmi ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.PROJECT_NAME }}
-            sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.PROJECT_NAME }}
-
-            sudo docker run \
-            -e ADMIN_SECRET_KEY=${{ secrets.ADMIN_SECRET_KEY }} \
-            -e AWS_ACCESS_KEY=${{ secrets.AWS_ACCESS_KEY }} \
-            -e AWS_SECRET_KEY=${{ secrets.AWS_SECRET_KEY }} \
-            -e BASEBALL_API_KEY=${{ secrets.BASEBALL_API_KEY }} \
-            -e BASKETBALL_API_KEY=${{ secrets.BASKETBALL_API_KEY }} \
-            -e FOOTBALL_API_KEY=${{ secrets.FOOTBALL_API_KEY }} \
-            -e GOOGLE_API_KEY=${{ secrets.GOOGLE_API_KEY }} \
-            -e GOOGLE_API_SECRET=${{ secrets.GOOGLE_API_SECRET }} \
-            -e JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }} \
-            -e KAKAO_API_KEY=${{ secrets.KAKAO_API_KEY }} \
-            -e NAVER_API_KEY=${{ secrets.NAVER_API_KEY }} \
-            -e NAVER_API_SECRET=${{ secrets.NAVER_API_SECRET }} \
-            -e RDS_USERNAME=${{ secrets.RDS_USERNAME }} \
-            -e RDS_PASSWORD=${{ secrets.RDS_PASSWORD }} \
-            -p ${{ secrets.PORT }}:${{ secrets.PORT }} \
-            --name ${{ secrets.PROJECT_NAME }} \
-            -d ${{ secrets.DOCKERHUB_USERNAME}}/${{ secrets.PROJECT_NAME }}
+
+#           백엔드 환경변수 파일 삭제 및 생성
+            sudo rm .env_b
+            sudo touch .env_b
+
+#           백엔드 환경변수 파일 작성
+            echo ADMIN_SECRET_KEY=${{ secrets.ADMIN_SECRET_KEY }} >> .env_b
+            echo AWS_ACCESS_KEY=${{ secrets.AWS_ACCESS_KEY }} >> .env_b
+            echo AWS_SECRET_KEY=${{ secrets.AWS_SECRET_KEY }} >> .env_b
+            echo BASEBALL_API_KEY=${{ secrets.BASEBALL_API_KEY }} >> .env_b
+            echo BASKETBALL_API_KEY=${{ secrets.BASKETBALL_API_KEY }} >> .env_b
+            echo FOOTBALL_API_KEY=${{ secrets.FOOTBALL_API_KEY }} >> .env_b
+            echo GOOGLE_API_KEY=${{ secrets.GOOGLE_API_KEY }} >> .env_b
+            echo GOOGLE_API_SECRET=${{ secrets.GOOGLE_API_SECRET }} >> .env_b
+            echo JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }} >> .env_b
+            echo KAKAO_API_KEY=${{ secrets.KAKAO_API_KEY }} >> .env_b
+            echo NAVER_API_KEY=${{ secrets.NAVER_API_KEY }} >> .env_b
+            echo NAVER_API_SECRET=${{ secrets.NAVER_API_SECRET }} >> .env_b
+            echo RDS_USERNAME=${{ secrets.RDS_USERNAME }} >> .env_b
+            echo RDS_PASSWORD=${{ secrets.RDS_PASSWORD }} >> .env_b
+            echo ${{ secrets.PORT }}:${{ secrets.PORT }} >> .env_b
+
+#           백엔드 도커 이미지 pull 및 도커 컴포즈 실행
+            sudo docker-compose up -d

src/main/java/com/sportsecho/common/aop/TimeTraceAop.java

@@ -24,7 +24,7 @@ public void memberProduct() {
     public void purchase() {
     }
 
-    @Around("user()")
+    @Around("user() || memberProduct() || purchase()")
     public Object execute(ProceedingJoinPoint joinPoint) throws Throwable {
         long start = System.currentTimeMillis();
 

src/main/java/com/sportsecho/memberProduct/entity/MemberProduct.java

@@ -9,6 +9,9 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedAttributeNode;
+import jakarta.persistence.NamedEntityGraph;
+import jakarta.persistence.NamedSubgraph;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -19,6 +22,13 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@NamedEntityGraph(
+    name = "graph.MemberProduct",
+    attributeNodes = {
+        @NamedAttributeNode(value = "product", subgraph = "productGraph")
+    }, subgraphs = {
+    @NamedSubgraph(name = "productGraph", attributeNodes = @NamedAttributeNode("productImageList"))
+})
 public class MemberProduct {
 
     @Id

src/main/java/com/sportsecho/memberProduct/repository/MemberProductRepository.java

@@ -3,14 +3,20 @@
 import com.sportsecho.memberProduct.entity.MemberProduct;
 import java.util.List;
 import java.util.Optional;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface MemberProductRepository extends JpaRepository<MemberProduct, Long> {
 
     Optional<MemberProduct> findByProductIdAndMemberId(Long productId, Long memberId);
 
+    @EntityGraph(value = "graph.MemberProduct", type = EntityGraph.EntityGraphType.FETCH)
+    List<MemberProduct> findByMemberId(Long memberId);
 
-    List<MemberProduct> findByMemberId(Long id);
-
-    void deleteAllByMemberId(Long memberId);
+    @Modifying
+    @Query("DELETE FROM MemberProduct mp WHERE mp.member.id = :memberId")
+    void deleteByMemberId(@Param("memberId") Long memberId);
 }

src/main/java/com/sportsecho/memberProduct/service/MemberProductServiceImplV1.java

@@ -71,7 +71,7 @@ public void deleteCart(Long cartId, Member member) {
     @Override
     @Transactional
     public void deleteAllCart(Member member) {
-        memberProductRepository.deleteAllByMemberId(member.getId());
+        memberProductRepository.deleteByMemberId(member.getId());
     }
 
     private Product findProduct(Long productId) {

src/main/java/com/sportsecho/purchase/entity/Purchase.java

@@ -11,6 +11,9 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedAttributeNode;
+import jakarta.persistence.NamedEntityGraph;
+import jakarta.persistence.NamedSubgraph;
 import jakarta.persistence.OneToMany;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,6 +28,14 @@
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
+@NamedEntityGraph(name = "graph.Purchase",
+    attributeNodes = {
+        @NamedAttributeNode(value = "purchaseProductList", subgraph = "purchaseProductListGraph")
+    },
+    subgraphs = {
+        @NamedSubgraph(name = "purchaseProductListGraph", attributeNodes = {
+            @NamedAttributeNode(value = "product")})
+    })
 public class Purchase extends TimeStamp {
 
     @Id

src/main/java/com/sportsecho/purchase/repository/PurchaseRepository.java

@@ -1,13 +1,20 @@
 package com.sportsecho.purchase.repository;
 
 import com.sportsecho.purchase.entity.Purchase;
-import io.lettuce.core.dynamic.annotation.Param;
 import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface PurchaseRepository extends JpaRepository<Purchase, Long> {
 
+    @EntityGraph(value = "graph.Purchase", type = EntityGraph.EntityGraphType.FETCH)
     @Query("SELECT p FROM Purchase p WHERE p.member.id = :memberId ORDER BY p.createdAt DESC")
     List<Purchase> findByMemberId(@Param("memberId") Long memberId);
+
+    @EntityGraph(value = "graph.Purchase", type = EntityGraph.EntityGraphType.FETCH)
+    @Query("SELECT p FROM Purchase p WHERE p.id = :purchaseId")
+    Optional<Purchase> findByIdWithProducts(Long purchaseId);
 }

src/main/java/com/sportsecho/purchase/service/PurchaseServiceImplV1.java

@@ -44,7 +44,7 @@ public PurchaseResponseDto purchase(PurchaseRequestDto requestDto, Member member
         }
 
         // 재고 확인 후 차감
-        updateStock(memberProductList);
+        decreaseStock(memberProductList);
 
         // 구매 인스턴스 생성
         Purchase purchase = PurchaseMapper.INSTANCE.fromPurchaseRequestDto(requestDto, member);
@@ -59,7 +59,7 @@ public PurchaseResponseDto purchase(PurchaseRequestDto requestDto, Member member
         purchaseRepository.save(purchase);
 
         // 장바구니 비우기
-        memberProductRepository.deleteAllByMemberId(member.getId());
+        memberProductRepository.deleteByMemberId(member.getId());
 
         return PurchaseMapper.INSTANCE.toResponseDto(purchase);
     }
@@ -82,11 +82,11 @@ public List<PurchaseResponseDto> getPurchaseList(Member member) {
     @Transactional
     public void cancelPurchase(Long purchaseId, Member member) {
 
-        Purchase purchase = purchaseRepository.findById(purchaseId).orElseThrow(
-            () -> new GlobalException(PurchaseErrorCode.NOT_FOUND_PURCHASE)
+        Purchase purchase = purchaseRepository.findByIdWithProducts(purchaseId).orElseThrow(() ->
+            new GlobalException(PurchaseErrorCode.NOT_FOUND_PURCHASE)
         );
         checkMember(purchase, member);
-        updateStock(purchase);
+        increaseStock(purchase);
 
         purchaseProductRepository.deleteByPurchaseId(purchaseId);
         purchaseRepository.deleteById(purchaseId);
@@ -117,17 +117,7 @@ private List<PurchaseProduct> createPList(List<MemberProduct> memberProductList,
         return pList;
     }
 
-    private void updateStock(Purchase purchase) {
-        List<PurchaseProduct> purchaseProductList = purchase.getPurchaseProductList();
-
-        for (PurchaseProduct purchaseProduct : purchaseProductList) {
-            Product product = purchaseProduct.getProduct();
-            product.increaseQuantity(purchaseProduct.getProductsQuantity());
-            productRepository.save(product);
-        }
-    }
-
-    private void updateStock(List<MemberProduct> memberProductList) {
+    private void decreaseStock(List<MemberProduct> memberProductList) {
 
         for (MemberProduct memberProduct : memberProductList) {
             Product product = memberProduct.getProduct();
@@ -136,11 +126,19 @@ private void updateStock(List<MemberProduct> memberProductList) {
                 throw new GlobalException(PurchaseErrorCode.OUT_OF_STOCK);
             } else {
                 product.decreaseQuantity(memberProduct.getProductsQuantity());
-                productRepository.save(product);
             }
         }
     }
 
+    private void increaseStock(Purchase purchase) {
+        List<PurchaseProduct> purchaseProductList = purchase.getPurchaseProductList();
+
+        for (PurchaseProduct purchaseProduct : purchaseProductList) {
+            Product product = purchaseProduct.getProduct();
+            product.increaseQuantity(purchaseProduct.getProductsQuantity());
+        }
+    }
+
     private void checkMember(Purchase purchase, Member member) {
         if (!purchase.getMember().getId().equals(member.getId())) {
             throw new GlobalException(PurchaseErrorCode.ACCESS_DENIED);