Skip to content

Commit 647558c

Browse files
authored
Merge pull request #221 from dnd-side-project/dev
fix(ChatRepository): Filter 조건에 SK 제거 @gzhan0226
2 parents 434dd29 + 3c1b459 commit 647558c

File tree

3 files changed

+5
-21
lines changed

3 files changed

+5
-21
lines changed

.github/workflows/deploy-chat-server.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ jobs:
3333
run: |
3434
set -e
3535
NOW=$(date '+%Y-%m-%d %H:%M:%S')
36-
37-
payload=$(printf '{"content":"```\\n[배포 시작]\\n\\n[일시]\\n%s\\n\\n[배포 결과]\\n진행 중\\n\\n[안내]\\n약 10분 정도 서버가 다운됩니다.\\n```"}' "$NOW")
38-
36+
payload=$(printf '{"content":"```\\n[배포 시작]\\nChat-Server\\n[일시]\\n%s\\n\\n[배포 결과]\\n진행 중\\n\\n[안내]\\n약 10분 정도 서버가 다운됩니다.\\n```"}' "$NOW")
3937
curl -sS -X POST \
4038
-H "Content-Type: application/json" \
4139
--data-binary "$payload" \
@@ -54,7 +52,6 @@ jobs:
5452
run: |
5553
mkdir -p ./chat-server/src/main/resources
5654
echo "${{ secrets.APPLICATION_YML_CHAT }}" > ./chat-server/src/main/resources/application.yml
57-
5855
- name: Gradle 실행 권한 부여
5956
run: chmod +x ./gradlew
6057

@@ -77,7 +74,6 @@ jobs:
7774
cd chat-server
7875
docker build -t ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }} .
7976
docker push ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
80-
8177
- name: ECS 태스크 정의 렌더링
8278
id: render-task-def
8379
uses: aws-actions/amazon-ecs-render-task-definition@v1
@@ -103,9 +99,7 @@ jobs:
10399
run: |
104100
set -e
105101
NOW=$(date '+%Y-%m-%d %H:%M:%S')
106-
107-
payload=$(printf '{"content":"```\\n[배포 완료]\\n\\n[일시]\\n%s\\n\\n[배포 결과]\\n성공\\n\\n[안내]\\n서버가 정상적으로 올라왔습니다.\\n```"}' "$NOW")
108-
102+
payload=$(printf '{"content":"```\\n[배포 완료]\\n\\n[일시]\\n%s\\n\\n[배포 결과]\\n성공\\n\\n[안내]\\n서버가 정상적으로 배포되었습니다.\\n```"}' "$NOW")
109103
curl -sS -X POST \
110104
-H "Content-Type: application/json" \
111105
--data-binary "$payload" \
@@ -120,9 +114,7 @@ jobs:
120114
run: |
121115
set -e
122116
NOW=$(date '+%Y-%m-%d %H:%M:%S')
123-
124117
payload=$(printf '{"content":"```\\n[배포 실패]\\n\\n[일시]\\n%s\\n\\n[배포 결과]\\n실패\\n\\n[안내]\\n서버 상태를 확인해주세요.\\n```"}' "$NOW")
125-
126118
curl -sS -X POST \
127119
-H "Content-Type: application/json" \
128120
--data-binary "$payload" \

.github/workflows/deploy-main-server.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ jobs:
3333
run: |
3434
set -e
3535
NOW=$(date '+%Y-%m-%d %H:%M:%S')
36-
37-
payload=$(printf '{"content":"```\\n[배포 시작]\\n\\n[일시]\\n%s\\n\\n[배포 결과]\\n진행 중\\n\\n[안내]\\n약 10분 정도 서버가 다운됩니다.\\n```"}' "$NOW")
38-
36+
payload=$(printf '{"content":"```\\n[배포 시작]\\nMain-Server\\n[일시]\\n%s\\n\\n[배포 결과]\\n진행 중\\n\\n[안내]\\n약 10분 정도 서버가 다운됩니다.\\n```"}' "$NOW")
3937
curl -sS -X POST \
4038
-H "Content-Type: application/json" \
4139
--data-binary "$payload" \
@@ -54,7 +52,6 @@ jobs:
5452
run: |
5553
mkdir -p ./main-server/src/main/resources
5654
echo "${{ secrets.APPLICATION_YML_MAIN }}" > ./main-server/src/main/resources/application.yml
57-
5855
- name: Gradle 실행 권한 부여
5956
run: chmod +x ./gradlew
6057

@@ -77,7 +74,6 @@ jobs:
7774
cd main-server
7875
docker build -t ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }} .
7976
docker push ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
80-
8177
- name: ECS 태스크 정의 렌더링
8278
id: render-task-def
8379
uses: aws-actions/amazon-ecs-render-task-definition@v1
@@ -103,9 +99,7 @@ jobs:
10399
run: |
104100
set -e
105101
NOW=$(date '+%Y-%m-%d %H:%M:%S')
106-
107102
payload=$(printf '{"content":"```\\n[배포 완료]\\n\\n[일시]\\n%s\\n\\n[배포 결과]\\n성공\\n\\n[안내]\\n서버가 정상적으로 배포되었습니다.\\n```"}' "$NOW")
108-
109103
curl -sS -X POST \
110104
-H "Content-Type: application/json" \
111105
--data-binary "$payload" \
@@ -120,9 +114,7 @@ jobs:
120114
run: |
121115
set -e
122116
NOW=$(date '+%Y-%m-%d %H:%M:%S')
123-
124117
payload=$(printf '{"content":"```\\n[배포 실패]\\n\\n[일시]\\n%s\\n\\n[배포 결과]\\n실패\\n\\n[안내]\\n서버 상태를 확인해주세요.\\n```"}' "$NOW")
125-
126118
curl -sS -X POST \
127119
-H "Content-Type: application/json" \
128120
--data-binary "$payload" \

chat-server/src/main/java/com/example/demo/entity/repository/ChatRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ public ChatSlice queryRecentSlice(String roomId, String beforeCursorBase64, int
8282
DynamoDbTable<Chat> t = table();
8383

8484
Expression filter = Expression.builder()
85-
.expression("sentAt <> :meta")
86-
.putExpressionValue(":meta", AttributeValue.builder().s("META").build())
85+
.expression("attribute_not_exists(itemType) OR itemType <> :t")
86+
.putExpressionValue(":t", AttributeValue.builder().s("META").build())
8787
.build();
8888

8989
QueryEnhancedRequest.Builder qb = QueryEnhancedRequest.builder()

0 commit comments

Comments
 (0)