Skip to content

Commit 3d349ed

Browse files
authored
Merge pull request #596 from woowacourse-teams/feature/#595
[fix] μ–΄λ“œλ―Ό νŽ˜μ΄μ§€ μˆ˜μ •
2 parents 9ae5138 + 329fed8 commit 3d349ed

5 files changed

Lines changed: 15 additions & 3 deletions

File tree

β€Žbackend/turip-admin/src/main/java/turip/controller/AdminContentController.javaβ€Ž

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package turip.controller;
22

33
import lombok.RequiredArgsConstructor;
4+
import lombok.extern.slf4j.Slf4j;
45
import org.springframework.http.HttpStatus;
56
import org.springframework.http.ResponseEntity;
67
import org.springframework.web.bind.annotation.PostMapping;
78
import org.springframework.web.bind.annotation.RequestBody;
89
import org.springframework.web.bind.annotation.RequestMapping;
910
import org.springframework.web.bind.annotation.RestController;
11+
import turip.account.domain.Member;
12+
import turip.auth.resolver.AuthMember;
1013
import turip.controller.dto.request.AdminContentSaveRequest;
1114
import turip.service.AdminContentService;
1215

16+
@Slf4j
1317
@RestController
1418
@RequestMapping("/api/v1/admin/contents")
1519
@RequiredArgsConstructor
@@ -18,8 +22,9 @@ public class AdminContentController {
1822
private final AdminContentService adminContentService;
1923

2024
@PostMapping
21-
public ResponseEntity<Long> save(@RequestBody AdminContentSaveRequest request) {
25+
public ResponseEntity<Long> save(@AuthMember Member member, @RequestBody AdminContentSaveRequest request) {
2226
Long contentId = adminContentService.save(request);
27+
log.info("[μ½˜ν…μΈ  μˆ˜μ§‘] nickname: {}", member.getAccount().getNickname());
2328
return ResponseEntity.status(HttpStatus.CREATED)
2429
.body(contentId);
2530
}

β€Žbackend/turip-admin/src/main/resources/application-prod.ymlβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ spring:
1212
format_sql: false
1313
show-sql: false
1414
jwt:
15-
access-token-expiration-ms: 1800000 # 30λΆ„
15+
access-token-expiration-ms: 10800000 # 3μ‹œκ°„

β€Žbackend/turip-admin/src/main/resources/application.ymlβ€Ž

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

48+
invitation:
49+
jwt:
50+
secret-key: ${INVITATION_JWT_SECRET_KEY}
51+
token-expiration: 7d # 604800000 # 7일
52+
4853
management:
4954
endpoints:
5055
web:

β€Žbackend/turip-app/src/main/java/turip/infrastructure/client/GooglePlaceSearchClient.javaβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public PlaceSearchResponse search(String query) {
2828
.uri(uriBuilder -> uriBuilder
2929
.queryParam("query", query)
3030
.queryParam("key", googleApiKey)
31+
.queryParam("language", "ko")
3132
.build())
3233
.retrieve()
3334
.body(GooglePlaceSearchResponse.class);

β€Žbackend/turip-app/src/test/java/turip/infrastructure/client/GooglePlaceSearchClientTest.javaβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ void search() {
6060
""";
6161
String query = "testquery";
6262

63-
this.mockRestServiceServer.expect(requestTo(googleApiUrl + "?query=" + query + "&key=" + googleApiKey))
63+
this.mockRestServiceServer.expect(
64+
requestTo(googleApiUrl + "?query=" + query + "&key=" + googleApiKey + "&language=ko"))
6465
.andRespond(withSuccess(mockResponse, MediaType.APPLICATION_JSON));
6566

6667
// when

0 commit comments

Comments
Β (0)