From 1872e99606b410fac4b486725275a4f7ce05b777 Mon Sep 17 00:00:00 2001 From: OH-GITAEK Date: Mon, 4 Nov 2024 21:49:27 +0900 Subject: [PATCH] fix : fix UserAdmissionRepository findAllWithName method(#745) --- .../user/UserAdmissionRepository.java | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/src/main/java/net/causw/adapter/persistence/repository/user/UserAdmissionRepository.java b/src/main/java/net/causw/adapter/persistence/repository/user/UserAdmissionRepository.java index 3f78f6da9..8fafd8b85 100644 --- a/src/main/java/net/causw/adapter/persistence/repository/user/UserAdmissionRepository.java +++ b/src/main/java/net/causw/adapter/persistence/repository/user/UserAdmissionRepository.java @@ -1,28 +1,29 @@ -package net.causw.adapter.persistence.repository.user; - -import net.causw.adapter.persistence.user.UserAdmission; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.Optional; - -public interface UserAdmissionRepository extends JpaRepository { - Optional findByUser_Id(String userId); - - Boolean existsByUser_Id(String userId); - - @Query(value = "SELECT * " + - "FROM tb_user_admission AS ua " + - "LEFT JOIN tb_user AS u ON ua.user_id = u.id " + - "WHERE u.state = :user_state ORDER BY ua.created_at DESC", nativeQuery = true) - Page findAll(@Param("user_state") String userState, Pageable pageable); - - @Query(value = "SELECT ua.id AS id, ua.user_id,ua.image,ua.reject_reason,ua.description,ua.updated_at,ua.created_at, u.name, u.state " + - "FROM tb_user_admission AS ua " + - "LEFT JOIN tb_user AS u ON ua.user_id = u.id " + - "WHERE u.state = :user_state AND (:name IS NULL OR u.name LIKE %:name%) ORDER BY ua.created_at DESC", nativeQuery = true) - Page findAllWithName(@Param("user_state") String userState, @Param("name") String name, Pageable pageable); +package net.causw.adapter.persistence.repository.user; + +import net.causw.adapter.persistence.user.UserAdmission; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Optional; + +public interface UserAdmissionRepository extends JpaRepository { + Optional findByUser_Id(String userId); + + Boolean existsByUser_Id(String userId); + + @Query(value = "SELECT * " + + "FROM tb_user_admission AS ua " + + "LEFT JOIN tb_user AS u ON ua.user_id = u.id " + + "WHERE u.state = :user_state ORDER BY ua.created_at DESC", nativeQuery = true) + Page findAll(@Param("user_state") String userState, Pageable pageable); + + @Query(value = "SELECT ua.id AS id, ua.user_id,uai.uuid_file_id AS user_admission_attach_image ,ua.description,ua.updated_at,ua.created_at, u.name, u.state " + + "FROM tb_user_admission AS ua " + + "LEFT JOIN tb_user AS u ON ua.user_id = u.id " + + "LEFT JOIN tb_user_admission_attach_image_uuid_file AS uai ON ua.id = uai.user_admission_id " + + "WHERE u.state = :user_state AND (:name IS NULL OR u.name LIKE %:name%) ORDER BY ua.created_at DESC", nativeQuery = true) + Page findAllWithName(@Param("user_state") String userState, @Param("name") String name, Pageable pageable); } \ No newline at end of file