[Merge] 'main'-> jsoi

MeongPanNyaengPan-MPNP · Jul 26, 2022 · ed2f257 · ed2f257
2 parents 20f4605 + 322ad39
commit ed2f257
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/deploy.sh b/deploy.sh
@@ -17,4 +17,4 @@ else
 fi
 
 echo "> $JAR_PATH 배포" #3
-nohup java -jar $JAR_PATH > /dev/null 2> /dev/null < /dev/null &
+nohup java -jar $JAR_PATH &
diff --git a/src/main/java/com/mpnp/baechelin/common/QueryDslSearch.java b/src/main/java/com/mpnp/baechelin/common/QueryDslSearch.java
@@ -17,7 +17,7 @@ public static BooleanExpression matchAddress(String sido, String sigungu) {
         }
         return Expressions.numberTemplate(
                 Integer.class,
-                "function('match', {0}, {1}, {2})", store.address, store.address, sido + " " + sigungu).gt(0);
+                "function('match', {0}, {1}, {2})", store.address, store.address, sido + " +" + sigungu).gt(0);
     }
 
     public static BooleanExpression matchKeyword(String keyword) {

diff --git a/src/main/java/com/mpnp/baechelin/login/oauth/service/CustomOAuth2UserService.java b/src/main/java/com/mpnp/baechelin/login/oauth/service/CustomOAuth2UserService.java
@@ -19,11 +19,14 @@
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
 
+import javax.transaction.Transactional;
+
 /* naver의 oauth2 인증을 통해서 불러온 유저 정보를 처리하기 위한 custom 클래스
  * 소셜 api에서 가져온 유저의 정보를 db에 저장하기 위해 구현
  */
 @Slf4j
 @Service
+@Transactional
 @RequiredArgsConstructor
 public class CustomOAuth2UserService extends DefaultOAuth2UserService {
 

diff --git a/src/main/java/com/mpnp/baechelin/store/repository/StoreQueryRepository.java b/src/main/java/com/mpnp/baechelin/store/repository/StoreQueryRepository.java
@@ -2,14 +2,12 @@
 
 import com.mpnp.baechelin.common.QueryDslSearch;
 import com.mpnp.baechelin.common.QuerydslLocation;
-import com.mpnp.baechelin.store.domain.QStore;
 import com.mpnp.baechelin.store.domain.Store;
-import com.mpnp.baechelin.store.dto.StoreCardResponseDto;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.Tuple;
-import com.querydsl.core.types.OrderSpecifier;
-import com.querydsl.core.types.Path;
-import com.querydsl.core.types.dsl.*;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -21,8 +19,6 @@
 import javax.transaction.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;