Skip to content

Commit 2a4a10e

Browse files
authored
YEL-178 [deploy] v1.22
YEL-178 [deploy] v1.22
2 parents 5b13f4f + 7707bba commit 2a4a10e

File tree

7 files changed

+18
-11
lines changed

7 files changed

+18
-11
lines changed

build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ dependencies {
5252
implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2'
5353
implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2'
5454

55-
// p6spy
56-
implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.5.7'
5755

5856
// Http
5957
implementation 'org.springframework.boot:spring-boot-starter-webflux'

src/main/java/com/yello/server/domain/authorization/dto/response/OnBoardingFriend.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static OnBoardingFriend of(User user) {
1919
.id(user.getId())
2020
.name(user.getName())
2121
.profileImage(user.getProfileImage())
22-
.groupName(user.getGroup().toString())
22+
.groupName(user.toGroupString())
2323
.build();
2424
}
2525
}

src/main/java/com/yello/server/domain/authorization/service/AuthManagerImpl.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ public ServiceTokenVO setNewAccessToken(String refreshToken) {
6767

6868
@Override
6969
public void validateSignupRequest(SignUpRequest signUpRequest) {
70+
// 회원가입 로그 (이슈 해결 후 제거)
71+
System.out.println("회원가입 : " + signUpRequest.toString());
72+
7073
userRepository.findByUuidNotFiltered(signUpRequest.uuid())
7174
.ifPresent(action -> {
7275
throw new UserConflictException(UUID_CONFLICT_USER_EXCEPTION);

src/main/java/com/yello/server/domain/authorization/service/TokenJwtProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.yello.server.domain.authorization.service;
22

33
import static io.jsonwebtoken.SignatureAlgorithm.HS256;
4-
import static java.time.Duration.ofDays;
5-
import static java.time.Duration.ofHours;
4+
import static java.time.Duration.ofMinutes;
5+
import static java.time.Duration.ofSeconds;
66

77
import com.yello.server.domain.authorization.dto.ServiceTokenVO;
88
import io.jsonwebtoken.Claims;
@@ -23,8 +23,8 @@ public class TokenJwtProvider implements TokenProvider {
2323
public static final String ACCESS_TOKEN = "accessToken";
2424
public static final String REFRESH_TOKEN = "refreshToken";
2525

26-
private static final Long ACCESS_TOKEN_VALID_TIME = ofHours(4).toMillis();
27-
private static final Long REFRESH_TOKEN_VALID_TIME = ofDays(14).toMillis();
26+
private static final Long ACCESS_TOKEN_VALID_TIME = ofSeconds(30).toMillis();
27+
private static final Long REFRESH_TOKEN_VALID_TIME = ofMinutes(1).toMillis();
2828

2929
public String secretKey;
3030

src/main/java/com/yello/server/domain/purchase/entity/Purchase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ public static Purchase of(User user, ProductType productType, Gateway gateway,
9090
public static int setPrice(String productType) {
9191
switch (productType) {
9292
case "YELLO_PLUS":
93-
return ConstantUtil.YELLO_PLUS;
93+
return ConstantUtil.SALE_YELLO_PLUS;
9494
case "ONE_TICKET":
95-
return ConstantUtil.ONE_TICKET;
95+
return ConstantUtil.SALE_ONE_TICKET;
9696
case "TWO_TICKET":
97-
return ConstantUtil.TWO_TICKET;
97+
return ConstantUtil.SALE_TWO_TICKET;
9898
case "FIVE_TICKET":
99-
return ConstantUtil.FIVE_TICKET;
99+
return ConstantUtil.SALE_FIVE_TICKET;
100100
default:
101101
return 0;
102102
}

src/main/java/com/yello/server/domain/vote/dto/response/VoteFriendVO.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public record VoteFriendVO(
1010
Long id,
1111
String receiverName,
1212
String senderGender,
13+
String receiverProfileImage,
1314
VoteContentVO vote,
1415
Boolean isHintUsed,
1516
String createdAt
@@ -20,6 +21,7 @@ public static VoteFriendVO of(Vote vote) {
2021
.id(vote.getId())
2122
.receiverName(vote.getReceiver().getName())
2223
.senderGender(vote.getSender().getGender().name())
24+
.receiverProfileImage(vote.getReceiver().getProfileImage())
2325
.vote(VoteContentVO.of(vote))
2426
.isHintUsed(vote.getIsAnswerRevealed())
2527
.createdAt(toFormattedString(vote.getCreatedAt()))

src/main/java/com/yello/server/global/common/util/ConstantUtil.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ public class ConstantUtil {
3434
public static final int TWO_TICKET = 2800;
3535
public static final int FIVE_TICKET = 5900;
3636
public static final int YELLO_PLUS = 3900;
37+
public static final int SALE_ONE_TICKET = 990;
38+
public static final int SALE_TWO_TICKET = 1900;
39+
public static final int SALE_FIVE_TICKET = 3900;
40+
public static final int SALE_YELLO_PLUS = 2900;
3741
public static final int RECOMMEND_POINT = 100;
3842
public static final String GOOGLE_PURCHASE_SUBSCRIPTION_ACTIVE = "SUBSCRIPTION_STATE_ACTIVE";
3943
public static final String GOOGLE_PURCHASE_SUBSCRIPTION_CANCELED =

0 commit comments

Comments
 (0)