Merge pull request #164 from teamterning/staging

[🎉 deploy] 터닝 운영서버 배포
teamterning · Oct 21, 2024 · a0c0d1f · a0c0d1f
2 parents b1684ef + d564fc9
commit a0c0d1f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/...rg/terning/terningserver/repository/internship_announcement/InternshipRepositoryImpl.java b/...rg/terning/terningserver/repository/internship_announcement/InternshipRepositoryImpl.java
@@ -63,10 +63,11 @@ public List<InternshipAnnouncement> getMostScrappedInternship() {
 
     @Override
     public Page<InternshipAnnouncement> searchInternshipAnnouncement(String keyword, String sortBy, Pageable pageable) {
+        keyword = keyword.toLowerCase();
 
         List<InternshipAnnouncement> internshipAnnouncements = jpaQueryFactory
                 .selectFrom(internshipAnnouncement)
-                .where(contentLike(keyword))
+                .where(contentLike(keyword, isPureEnglish(keyword)))
                 .orderBy(sortAnnouncementsByDeadline().asc(), createOrderSpecifier(sortBy))
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
@@ -75,14 +76,24 @@ public Page<InternshipAnnouncement> searchInternshipAnnouncement(String keyword,
         JPAQuery<Long> count = jpaQueryFactory
                 .select(internshipAnnouncement.count())
                 .from(internshipAnnouncement)
-                .where(contentLike(keyword));
+                .where(contentLike(keyword, isPureEnglish(keyword)));
 
 
         return PageableExecutionUtils.getPage(internshipAnnouncements, pageable, count::fetchOne);
     }
 
-    private BooleanExpression contentLike(String keyword) {
-        return internshipAnnouncement.title.contains(keyword);
+    private boolean isPureEnglish(String summonerName) {
+        //공백은 무시
+        return summonerName.replaceAll("\\s", "").matches("^[a-zA-Z]+$");
+    }
+
+    private BooleanExpression contentLike(String keyword, boolean isPureEnglish) {
+        if(isPureEnglish) {
+            return Expressions.stringTemplate("LOWER({0})", internshipAnnouncement.title).contains(keyword);
+        } else {
+            keyword = keyword.replaceAll("\\s", "");
+            return Expressions.stringTemplate("REPLACE(LOWER({0}), ' ', '')", internshipAnnouncement.title).contains(keyword);
+        }
     }
 
     //정렬 조건(5가지, 채용 마감 이른 순, 짧은 근무 기간 순, 긴 근무 기간 순,

diff --git a/src/main/java/org/terning/terningserver/service/WebhookService.java b/src/main/java/org/terning/terningserver/service/WebhookService.java
@@ -28,6 +28,12 @@ public class WebhookService {
     // 알림을 보내는 메서드
     public void sendDiscordNotification(User user) {
 
+        // discord.webhook.url 값이 비어있으면 웹훅을 실행하지 않음
+        if (discordWebhookUrl == null || discordWebhookUrl.isEmpty()) {
+            // 스테이징 환경에서는 웹훅을 비활성화
+            return;
+        }
+
         // REST 요청을 처리하기 위한 RestTemplate 객체 생성
         RestTemplate restTemplate = new RestTemplate();