From 3dc69c0ccc688915036f531301bab0edc6ed5da1 Mon Sep 17 00:00:00 2001
From: JuyeonLee <104489022+Juye0nLee@users.noreply.github.com>
Date: Sun, 24 Nov 2024 03:11:21 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=EC=8B=A0=EC=B2=AD=20=EC=84=B8?=
 =?UTF-8?q?=EB=B6=80=20=EC=A1=B0=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=20(#42)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🐛 신청 목록 반환 시 신청 기본키 반환 (#35)

* 🐛 신청 api 응답으로 applyId 반환 (#38)

* 🐛 신청 목록 반환 시 신청 기본키 반환 (#35) (#36)

* ✨ 신청 API applyId 반환

* 🐛 신청 조회 로직 수정  (#41)

* 🐛 신청 목록 반환 시 신청 기본키 반환 (#35) (#36)

* 🐛 신청 api 응답으로 applyId 반환 (#39)

* 🐛 신청 목록 반환 시 신청 기본키 반환 (#35)

* 🐛 신청 api 응답으로 applyId 반환 (#38)

* 🐛 신청 목록 반환 시 신청 기본키 반환 (#35) (#36)

* ✨ 신청 API applyId 반환

* 🐛 신청 세부 조회 오류 수정

* 🚀 Cd 파이프라인 수정
---
 .github/workflows/CICD.yml                             | 10 +++-------
 .../ivory/repository/AbsenceCertificateRepository.java |  2 +-
 .../ivory/repository/MedicalCertificateRepository.java |  2 +-
 .../java/com/ivory/ivory/service/ApplyService.java     |  4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
index e966948..320bef0 100644
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -51,19 +51,15 @@ jobs:
     steps:
       # 1. 기존의 컨테이너를 중지시킵니다
       - name: Stop existing containers
-        run: sudo docker stop $(sudo docker ps -q) 2>/dev/null || true
+        run: sudo docker stop ${{ secrets.DOCKERHUB_USERNAME }}/ivory-backend
   
       # 2. 기존의 컨테이너를 제거합니다
       - name: Remove existing containers
-        run: sudo docker rm $(sudo docker ps -a -q) 2>/dev/null || true
+        run: sudo docker rm ${{ secrets.DOCKERHUB_USERNAME }}/ivory-backend
   
       # 3. 기존의 이미지를 제거합니다
       - name: Remove existing images
-        run: sudo docker rmi $(sudo docker images -q) 2>/dev/null || true
-  
-      # 4. 사용하지 않는 볼륨을 제거합니다
-      - name: Remove unused volumes
-        run: sudo docker volume prune -f
+        run: sudo docker rmi ${{ secrets.DOCKERHUB_USERNAME }}/ivory-backend
 
       # 5. Git 최신 상태로 업데이트 (git pull)
       - name: Pull latest changes
diff --git a/src/main/java/com/ivory/ivory/repository/AbsenceCertificateRepository.java b/src/main/java/com/ivory/ivory/repository/AbsenceCertificateRepository.java
index e537213..650dddb 100644
--- a/src/main/java/com/ivory/ivory/repository/AbsenceCertificateRepository.java
+++ b/src/main/java/com/ivory/ivory/repository/AbsenceCertificateRepository.java
@@ -11,5 +11,5 @@
 @Repository
 public interface AbsenceCertificateRepository extends JpaRepository<AbsenceCertificate, Long> {
     Page<AbsenceCertificate> findAllByChildId(Long childId, Pageable pageable);
-    Optional<AbsenceCertificate> findByChild_Id(Long childId);
+    Optional<AbsenceCertificate> findById(Long childId);
 }
diff --git a/src/main/java/com/ivory/ivory/repository/MedicalCertificateRepository.java b/src/main/java/com/ivory/ivory/repository/MedicalCertificateRepository.java
index 71ef826..df5cd51 100644
--- a/src/main/java/com/ivory/ivory/repository/MedicalCertificateRepository.java
+++ b/src/main/java/com/ivory/ivory/repository/MedicalCertificateRepository.java
@@ -11,5 +11,5 @@
 @Repository
 public interface MedicalCertificateRepository extends JpaRepository<MedicalCertificate, Long> {
     Page<MedicalCertificate> findAllByChildId(Long childId, Pageable pageable);
-    Optional <MedicalCertificate> findByChild_Id(Long childId);
+    Optional<MedicalCertificate> findById(Long id);
 }
diff --git a/src/main/java/com/ivory/ivory/service/ApplyService.java b/src/main/java/com/ivory/ivory/service/ApplyService.java
index de0c512..6e2e2ce 100644
--- a/src/main/java/com/ivory/ivory/service/ApplyService.java
+++ b/src/main/java/com/ivory/ivory/service/ApplyService.java
@@ -166,8 +166,8 @@ public CustomApiResponse<?> getApplyDetail(Long applyId, Long currentMemberId) {
         }
 
         Optional<Child> child = childRepository.findById(apply.get().getChild().getId());
-        Optional<MedicalCertificate> medicalCertificate = medicalCertificateRepository.findByChild_Id(child.get().getId());
-        Optional<AbsenceCertificate> absenceCertificate = absenceCertificateRepository.findByChild_Id(child.get().getId());
+        Optional<MedicalCertificate> medicalCertificate = medicalCertificateRepository.findById(apply.get().getMedicalCertificate().getId());
+        Optional<AbsenceCertificate> absenceCertificate = absenceCertificateRepository.findById(apply.get().getAbsenceCertificate().getId());
 
         //신청 날짜
         String applyDate = getApplyDate(apply.get().getCreateAt());