From ae371403a43bb4c1264539c5416cc5c1ee93e0bb Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Thu, 1 Dec 2022 13:06:53 -0500
Subject: [PATCH 1/3] =?UTF-8?q?USVT-117=20=E4=BD=BF=E7=94=A8=20JOIN=20?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E7=9A=84=E6=96=B9=E5=BC=8F=E6=9D=A5=E5=AF=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9B=E8=A1=8C=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visatrack/api/data/repository/VisaCaseRepository.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/northtecom/visatrack/api/data/repository/VisaCaseRepository.java b/src/main/java/com/northtecom/visatrack/api/data/repository/VisaCaseRepository.java
index 9a9d009..d0c457e 100644
--- a/src/main/java/com/northtecom/visatrack/api/data/repository/VisaCaseRepository.java
+++ b/src/main/java/com/northtecom/visatrack/api/data/repository/VisaCaseRepository.java
@@ -77,8 +77,12 @@ public interface VisaCaseRepository extends PagingAndSortingRepository<VisaCase,
                                               @Param("endDate") LocalDate endDate);
 
 
-    @Query("select visaCase from VisaCase visaCase where visaCase.saveUserId in (select m.userId from " +
-            "MyFavouredVisaCase m where m.userId = :userId)")
+    //    @Query("select visaCase from VisaCase visaCase where visaCase.saveUserId in (select m.userId from " +
+//            "MyFavouredVisaCase m where m.userId = :userId)")
+    @Query(value = " SELECT visa_case.* " +
+            " FROM visa_case " +
+            " JOIN my_favoured_visa_case ON visa_case.id = my_favoured_visa_case.visa_case_id " +
+            " WHERE my_favoured_visa_case.user_id = :userId", nativeQuery = true)
     List<VisaCase> queryFavouredVisaCaseByUserId(@Param("userId") Long userId);
 
 

From ebdb481fdeb4152c2e62030ce2ade3f08d961b8d Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Thu, 1 Dec 2022 13:10:17 -0500
Subject: [PATCH 2/3] =?UTF-8?q?USVT-117=20=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visatrack/api/data/repository/VisaCaseRepository.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/northtecom/visatrack/api/data/repository/VisaCaseRepository.java b/src/main/java/com/northtecom/visatrack/api/data/repository/VisaCaseRepository.java
index d0c457e..8a293c5 100644
--- a/src/main/java/com/northtecom/visatrack/api/data/repository/VisaCaseRepository.java
+++ b/src/main/java/com/northtecom/visatrack/api/data/repository/VisaCaseRepository.java
@@ -12,9 +12,9 @@ import java.util.List;
 import java.util.Optional;
 
 /**
- * Created with IntelliJ IDEA.
+ * VisaCase data Repository form database
  *
- * @Author: XieYang
+ * @author XieYang, YuCheng
  * @Date: 2022/10/08/23:20
  * @Description:
  */

From 727a1cb77772d2dfd4dc9f38a4b730058429c696 Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Thu, 1 Dec 2022 13:13:56 -0500
Subject: [PATCH 3/3] =?UTF-8?q?USVT-117=20=E6=B7=BB=E5=8A=A0=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/impl/MyFavouredVisaCaseService.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/northtecom/visatrack/api/service/impl/MyFavouredVisaCaseService.java b/src/main/java/com/northtecom/visatrack/api/service/impl/MyFavouredVisaCaseService.java
index 77b5eff..317d8c0 100644
--- a/src/main/java/com/northtecom/visatrack/api/service/impl/MyFavouredVisaCaseService.java
+++ b/src/main/java/com/northtecom/visatrack/api/service/impl/MyFavouredVisaCaseService.java
@@ -11,9 +11,9 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * Created with IntelliJ IDEA.
+ * VisaCase Service
  *
- * @Author: XieYang
+ * @author XieYang, YuCheng
  * @Date: 2022/10/23/17:40
  * @Description:
  */
@@ -64,6 +64,12 @@ public class MyFavouredVisaCaseService {
         return myFavouredVisaCaseRepository.findAllByUserId(userId).stream().collect(Collectors.toList());
     }
 
+    /**
+     * Get follow cases by userId
+     *
+     * @param userId
+     * @return
+     */
     public List<VisaCase> queryFavouredVisaCases(Long userId) {
         log.info("Query user: {} favoured visa cases", userId);