Skip to content

Commit e653306

Browse files
authored
Merge pull request #202 from prgrms-aibe-devcourse/ci/env
fix: group 캘린더 조회 쿼리문제
2 parents a089f5b + b4e5596 commit e653306

3 files changed

Lines changed: 9 additions & 11 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI/CD Pipeline to EC2 with Blue/Green
22

33
on:
44
push:
5-
branches: [main, dev, ci/env]
5+
branches: [main, dev]
66

77
# ───────────────────────────────────────────────────────────────
88
concurrency:

monitoring/prometheus/alert.rules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ groups:
3232
# 3. 메모리 사용률 높음 알림
3333
- alert: HighMemoryUsage
3434
expr: |
35-
(node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes) / node_memory_MemTotal_bytes * 100 > 80
35+
(node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes) / node_memory_MemTotal_bytes * 100 > 85
3636
for: 2m
3737
labels:
3838
severity: warning
3939
annotations:
4040
summary: "인스턴스 {{ $labels.instance }} 의 메모리 사용률이 높습니다."
41-
description: "지난 2분간 사용 가능한 메모리가 20% 미만입니다. 현재 사용률: {{ printf \"%.2f\" $value }}%"
41+
description: "지난 2분간 사용 가능한 메모리가 15% 미만입니다. 현재 사용률: {{ printf \"%.2f\" $value }}%"
4242

4343
# 4. 디스크 공간 부족 알림
4444
- alert: DiskAlmostFull

src/main/java/store/lastdance/repository/group/GroupRepository.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,18 @@ public interface GroupRepository extends JpaRepository<Group, UUID> {
2020
/**
2121
* 특정 그룹에 특정 사용자가 멤버로 속해있는지 확인
2222
*/
23-
@Query(value = "SELECT CASE WHEN COUNT(gm.group_id) > 0 THEN true ELSE false END " +
24-
"FROM group_member gm " +
25-
"WHERE gm.group_id = :groupId AND gm.user_id = :userId",
26-
nativeQuery = true)
23+
@Query("SELECT CASE WHEN COUNT(gm) > 0 THEN true ELSE false END " +
24+
"FROM GroupMember gm " +
25+
"WHERE gm.group.groupId = :groupId AND gm.user.userId = :userId")
2726
boolean existsByGroupIdAndMemberId(@Param("groupId") UUID groupId,
2827
@Param("userId") UUID userId);
2928

3029
/**
3130
* 그룹 소유자인지 확인
3231
*/
33-
@Query(value = "SELECT CASE WHEN COUNT(g.group_id) > 0 THEN true ELSE false END " +
34-
"FROM \"group\" g " +
35-
"WHERE g.group_id = :groupId AND g.owner_id = :userId",
36-
nativeQuery = true)
32+
@Query("SELECT CASE WHEN COUNT(g) > 0 THEN true ELSE false END " +
33+
"FROM Group g " +
34+
"WHERE g.groupId = :groupId AND g.owner.userId = :userId")
3735
boolean existsByGroupIdAndOwnerId(@Param("groupId") UUID groupId,
3836
@Param("userId") UUID userId);
3937

0 commit comments

Comments
 (0)