Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat] 테스트용 어드민 API 생성 4 #203

Merged
merged 38 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
85da83d
[Infra] CI/CD test (#42)
DrRivaski Aug 6, 2024
0cf0646
[Infra] CI CD test 3 (#45)
DrRivaski Aug 6, 2024
6ffeb39
config: jwt 속성을 yml에 설정
Jul 29, 2024
b97b441
rebase: 원본 develop 브랜치와 병합
Jul 30, 2024
bd38fb4
doc: jacoco 파일 생성
Aug 20, 2024
a91af23
feat: EventLockException 처리 메서드 구현
Aug 22, 2024
b60a15b
fix: url 변경
Aug 22, 2024
1d3d501
refactor: 변수명 변경
Aug 22, 2024
042e2f0
feat: 중복 응모에 대한 처리 구현
Aug 22, 2024
17c55fb
fix: 변수 바인딩 수정
Aug 22, 2024
7f36bfa
feat: post 요청에 대한 처리 구현
Aug 22, 2024
405d465
feat: swagger 파리미터 안보이도록 설정
Aug 22, 2024
bce51da
rebase: 원본 repo develop 브랜치와 rebase
Aug 22, 2024
c8f654a
feat: 정적 텍스트 상수 추가
Aug 22, 2024
fb4c4d8
chore: jacoco 삭제
Aug 22, 2024
7c2220b
fix: reverse 메서드 수행 코드 제거
Aug 22, 2024
d04e198
chore: import문 제거
Aug 22, 2024
b6eee21
fix: repository 메서드 변경
Aug 22, 2024
155eb96
fix: repository 메서드 변경
Aug 22, 2024
b34d9fd
test: 메서드 변경
Aug 22, 2024
a97f66a
feat: test용 이벤트 속성 요청 dto 구현
Aug 22, 2024
0ab2754
feat: test용 이벤트 속성 컨트롤러 메서드 구현
Aug 22, 2024
0021925
feat: test용 이벤트 속성 설정 메서드 구현
Aug 22, 2024
a55266b
feat: jsonformat 애노테이션 추가
Aug 22, 2024
4be5141
feat: jsonformat 속성 변경
Aug 22, 2024
17604b7
Merge branch 'develop' into feature/199
hyeokson Aug 22, 2024
22e027b
[Infra] CI/CD test (#42)
DrRivaski Aug 6, 2024
07582c2
[Infra] CI CD test 3 (#45)
DrRivaski Aug 6, 2024
3cc2fd7
config: jwt 속성을 yml에 설정
Jul 29, 2024
5ad38a7
rebase: 원본 develop 브랜치와 병합
Jul 30, 2024
2330ea1
doc: jacoco 파일 생성
Aug 20, 2024
6bc8e17
chore: jacoco 삭제
Aug 22, 2024
0374301
rebase: 원본 repo develop 브랜치와 rebase
Aug 22, 2024
c657734
feat: 테스트용 url에 대해 인가검사 하지 않도록 구현
Aug 22, 2024
1224eef
Merge remote-tracking branch 'origin/feature/199' into feature/199
Aug 22, 2024
402bdb1
feat: isFcfsClosed 변수 할당하도록 구현
Aug 22, 2024
ea38241
feat: isFcfsClosed 변수를 필드에 추가
Aug 22, 2024
0bd6ade
refactor: redis key 상수 변경
Aug 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
public class FcfsSettingTestRequestDto {

private int round;

@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
private LocalDateTime startTime;

@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
private LocalDateTime endTime;

private int winnerNum;

private boolean isFcfsClosed;
}
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ public void setFcfsSettingByAdmin(FcfsSettingTestRequestDto fcfsSettingTestReque
.build();

fcfsSettingList.set(fcfsSettingTestRequestDto.getRound()-1, fcfsSettingDto);

isFcfsClosed = fcfsSettingTestRequestDto.isFcfsClosed();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public enum RedisKeyPrefix {
FCFS_USERID_PREFIX("FCFS_WINNER_"),
FCFS_CODE_PREFIX("FCFS_CODE_"),
FCFS_CODE_USERID_PREFIX("FCFS_CODE_USERID_"),
FCFS_PARTICIPANT_COUNT_PREFIX("FCFS_PARTICIPANT_COUNT"),
FCFS_PARTICIPANT_COUNT_PREFIX("FCFS_PARTICIPANT_COUNT_"),

// 추첨
DRAW_WINNER_LIST_PREFIX("DRAW_WINNER_LIST_"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ public class JwtAuthorizationFilter extends OncePerRequestFilter {

// 인가검사를 하지 않는 url 설정
private final String[] whiteListUrls = {
"/admin/login", "/admin/signup"
"/admin/login", "/admin/signup",
"/admin/fcfs/test", "/admin/draw/test"
};

@Override
Expand Down
Loading