Skip to content

Commit 7ae2ae4

Browse files
committed
Merge branch 'develop' of https://github.com/woowacourse-teams/2025-Turip into loadtest
2 parents 58970d7 + 6341036 commit 7ae2ae4

65 files changed

Lines changed: 1674 additions & 194 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/backend-dev-admin-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ jobs:
145145
KAKAO_API_KEY=${{ secrets.KAKAO_API_KEY }}
146146
GOOGLE_API_KEY=${{ secrets.GOOGLE_API_KEY }}
147147
YOUTUBE_API_KEY=${{ secrets.YOUTUBE_API_KEY }}
148+
KOREA_TOURISM_API_KEY=${{ secrets.KOREA_TOURISM_API_KEY }}
148149
INVITATION_JWT_SECRET_KEY=${{ secrets.INVITATION_JWT_SECRET_KEY }}
149150
EOF
150151

.github/workflows/backend-dev-app-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ jobs:
145145
KAKAO_API_KEY=${{ secrets.KAKAO_API_KEY }}
146146
GOOGLE_API_KEY=${{ secrets.GOOGLE_API_KEY }}
147147
YOUTUBE_API_KEY=${{ secrets.YOUTUBE_API_KEY }}
148+
KOREA_TOURISM_API_KEY=${{ secrets.KOREA_TOURISM_API_KEY }}
148149
INVITATION_JWT_SECRET_KEY=${{ secrets.INVITATION_JWT_SECRET_KEY }}
149150
EOF
150151

.github/workflows/backend-prod-admin-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ jobs:
139139
KAKAO_API_KEY=${{ secrets.KAKAO_API_KEY }}
140140
GOOGLE_API_KEY=${{ secrets.GOOGLE_API_KEY }}
141141
YOUTUBE_API_KEY=${{ secrets.YOUTUBE_API_KEY }}
142+
KOREA_TOURISM_API_KEY=${{ secrets.KOREA_TOURISM_API_KEY }}
142143
INVITATION_JWT_SECRET_KEY=${{ secrets.INVITATION_JWT_SECRET_KEY }}
143144
EOF
144145

.github/workflows/backend-prod-app-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ jobs:
139139
KAKAO_API_KEY=${{ secrets.KAKAO_API_KEY }}
140140
GOOGLE_API_KEY=${{ secrets.GOOGLE_API_KEY }}
141141
YOUTUBE_API_KEY=${{ secrets.YOUTUBE_API_KEY }}
142+
KOREA_TOURISM_API_KEY=${{ secrets.KOREA_TOURISM_API_KEY }}
142143
INVITATION_JWT_SECRET_KEY=${{ secrets.INVITATION_JWT_SECRET_KEY }}
143144
EOF
144145

backend/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,5 @@ AI
5252

5353
Firebase
5454
**/firebase-service-account*.json
55+
56+
.ua

backend/turip-admin/src/main/resources/application.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ youtube:
5353
key: ${YOUTUBE_API_KEY}
5454
url: https://www.googleapis.com/youtube/v3/videos
5555

56+
korea-tourism:
57+
api:
58+
key: ${KOREA_TOURISM_API_KEY}
59+
url: https://apis.data.go.kr/B551011/TarRlteTarService1/areaBasedList1
60+
5661
apple:
5762
client-id: ${APPLE_CLIENT_ID}
5863

backend/turip-admin/src/test/java/turip/controller/AdminContentApiTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import turip.util.fixture.ContentPendingFixture;
2525
import turip.util.helper.TestDataHelper;
2626

27-
@ActiveProfiles("test")
27+
@ActiveProfiles({"test", "h2"})
2828
@SpringBootTest(
2929
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
3030
classes = turip.TuripAdminApplication.class

backend/turip-admin/src/test/java/turip/controller/AdminPendingContentApiTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import turip.util.fixture.ContentPendingFixture;
2828
import turip.util.helper.TestDataHelper;
2929

30-
@ActiveProfiles("test-mysql")
30+
@ActiveProfiles({"test", "test-mysql"})
3131
@SpringBootTest(
3232
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
3333
classes = turip.TuripAdminApplication.class
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# H2 데이터베이스 전용 설정
2+
3+
spring:
4+
h2:
5+
console:
6+
enabled: true
7+
8+
datasource:
9+
url: jdbc:h2:mem:database
10+
driver-class-name: org.h2.Driver
11+
12+
sql:
13+
init:
14+
mode: never
15+
16+
jpa:
17+
show-sql: true
18+
database-platform: org.hibernate.dialect.H2Dialect
19+
properties:
20+
hibernate:
21+
format_sql: true
Lines changed: 3 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,13 @@
1+
# MySQL 데이터베이스 전용 설정
2+
13
spring:
24
sql:
35
init:
46
mode: always
57
schema-locations: classpath:init-test-db.sql
6-
data-locations: [ ]
78
continue-on-error: false
9+
810
jpa:
9-
defer-datasource-initialization: true
10-
hibernate:
11-
ddl-auto: create-drop
1211
properties:
1312
hibernate:
1413
dialect: org.hibernate.dialect.MySQLDialect
15-
16-
# 테스트 환경에서 Flyway 비활성화
17-
flyway:
18-
enabled: false
19-
20-
# JWT 설정 (테스트용)
21-
jwt:
22-
secret-key: turip-test-jwt-secret-key-for-testing-purposes-only-32bytes
23-
access-token-expiration-ms: 3600000 # 1시간
24-
refresh-token-expiration-ms: 604800000 # 7일
25-
26-
# Google OAuth 설정 (테스트용)
27-
google:
28-
client-id: test-google-client-id.apps.googleusercontent.com
29-
ios-client-id: test-google-ios-client-id.apps.googleusercontent.com
30-
api:
31-
key: test-google-api-key
32-
url: https://test.google.com
33-
34-
kakao:
35-
api:
36-
key: test-kakao-api-key
37-
url: https://test.kakao.com
38-
39-
youtube:
40-
api:
41-
key: test-youtube-api-key
42-
url: https://test.youtube.com
43-
44-
apple:
45-
client-id: com.teamturip.test
46-
47-
# CSV Import 설정
48-
csv:
49-
import:
50-
password: test_password_123
51-
52-
# Region Category 기타 이미지 설정 (테스트용 더미 값)
53-
region:
54-
category:
55-
domestic:
56-
etc:
57-
image-url: https://test.example.com/domestic-etc.jpg
58-
overseas:
59-
etc:
60-
image-url: https://test.example.com/overseas-etc.jpg
61-
62-
invitation:
63-
jwt:
64-
secret-key: turip-test-invitation-jwt-secret-key-for-testing-purposes
65-
token-expiration: 1h
66-
67-
# SSE 설정 (테스트용 - 빠른 하트비트)
68-
sse:
69-
heartbeat:
70-
interval: 2 # 2초

0 commit comments

Comments
 (0)