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.

Sign up for GitHub

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

Jump to bottom

fix: admin token #231

Merged
merged 30 commits into from
Dec 3, 2023
Merged

fix: admin token #231

merged 30 commits into from
Dec 3, 2023

Commits on Nov 28, 2023

  1. feat: ํšŒ์›์˜ ๋žญํ‚น redis์— ์ถ”๊ฐ€ ๋ฐ ์‚ญ์ œ, ์—…๋ฐ์ดํŠธ ๊ธฐ๋Šฅ ์ถ”๊ฐ€

    @parksey
    parksey committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    f33cc2f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/team-moabam/moabam-BE inโ€ฆ 

    โ€ฆto feature/#163-ranking-system

# Conflicts:
#	src/main/java/com/moabam/api/application/member/MemberService.java
    @parksey
    parksey committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    55bc1c5 View commit details
    Browse the repository at this point in the history

  3. test: ํšŒ์› ์ •๋ณด ๋ณ€๊ฒฝ ๋ฐ ์‚ญ์ œ ์ถ”๊ฐ€์— ๋”ฐ๋ฅธ ๋žญํ‚น ์ฐธ์—ฌ, ์ œ์™ธ ํ…Œ์ŠคํŠธ ์ฝ”๋“œ ์ถ”๊ฐ€

    @parksey
    parksey committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    490b4a9 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. feat: ๋žญํ‚น์‹œ์Šคํ…œ API ์ถ”๊ฐ€ ๋ฐ ๋žญํ‚น ์กฐํšŒ ๊ธฐ๋Šฅ ์ถ”๊ฐ€

    @parksey
    parksey committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    51fe353 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/team-moabam/moabam-BE inโ€ฆ 

    โ€ฆto feature/#163-ranking-system

# Conflicts:
#	src/main/java/com/moabam/api/application/member/MemberService.java
#	src/main/java/com/moabam/api/infrastructure/redis/ZSetRedisRepository.java
    @parksey
    parksey committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    fbe427a View commit details
    Browse the repository at this point in the history

  3. feat: ๋žญํ‚น ์กฐํšŒ ํ…Œ์ŠคํŠธ ์ฝ”๋“œ ์ถ”๊ฐ€ ๋ฐ ๋žญํ‚น ์—…๋ฐ์ดํŠธ ๋กœ์ง ๊ฐ ์—…๋ฐ์ดํŠธ -> ์Šค์ผ€์ฅด๋Ÿฌ

    @parksey
    parksey committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    0ac854c View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Merge branch 'develop' of https://github.com/team-moabam/moabam-BE inโ€ฆ 

    โ€ฆto feature/#163-ranking-system

# Conflicts:
#	src/main/java/com/moabam/api/application/member/MemberService.java
#	src/main/java/com/moabam/api/application/notification/NotificationService.java
#	src/test/java/com/moabam/api/application/member/MemberServiceTest.java
    @parksey
    parksey committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    ff26e4d View commit details
    Browse the repository at this point in the history

  2. style: checkstyle ์—๋Ÿฌ fix

    @parksey
    parksey committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    f585949 View commit details
    Browse the repository at this point in the history

  3. refactor: ์‘๋‹ต ๊ฐ์ฒด๋ช… ๋ณ€๊ฒฝ TopRankingInfoResponse -> TopRankingInfo

    @parksey
    parksey committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    f5783bb View commit details
    Browse the repository at this point in the history

  4. fix: ๋žญํ‚น ์—…๋ฐ์ดํŠธ ์‹œ๊ฐ„ 15๋ถ„ ๋งค์ดˆ๋งˆ๋‹ค ๋™์ž‘ํ•˜๋Š” ๋ฐฉ์‹ -> 15๋ถ„์— ํ•œ ๋ฒˆ๋งŒ ์‹คํ–‰๋˜๋„๋ก ๋ณ€๊ฒฝ

    @parksey
    parksey committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    b0c12ca View commit details
    Browse the repository at this point in the history

  5. refactor: ๋žญํ‚น ์‘๋‹ต ๋ฐ˜ํ™˜ ๊ฐ์ฒด ๋ณ€์ˆ˜๋ฉด s ์ œ๊ฑฐ 

    Co-authored-by: Kim Heebin <[email protected]>
    @parksey @kmebin
    parksey and kmebin authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    286820b View commit details
    Browse the repository at this point in the history

  6. refactor: ToprankingResponses ์‘๋‹ต ๊ฐ์ฒด ๋ฐ˜ํ™˜๋ช… TopRankingResponse๋กœ ๋ณ€๊ฒฝ

    @parksey
    parksey committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    431c95b View commit details
    Browse the repository at this point in the history

  7. fix: ObjectMapper์—๋Ÿฌ ์ˆ˜์ •

    @parksey
    parksey committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    2b8f721 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' of https://github.com/team-moabam/moabam-BE inโ€ฆ 

    โ€ฆto feature/#163-ranking-system

# Conflicts:
#	src/main/java/com/moabam/global/config/EmbeddedRedisConfig.java
    @parksey
    parksey committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    00c5705 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' of https://github.com/team-moabam/moabam-BE inโ€ฆ 

    โ€ฆto feature/#163-ranking-system
    @parksey
    parksey committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    6057cc7 View commit details
    Browse the repository at this point in the history

  10. fix: objectMapper ์‚ญ์ œ ์ถ”๊ฐ€

    @parksey
    parksey committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    3c995d4 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop' of https://github.com/team-moabam/moabam-BE inโ€ฆ 

    โ€ฆto feature/#209-admin-login
    @parksey
    parksey committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    96e402e View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. feat: ์–ด๋“œ๋ฏผ ์„œ๋น„์Šค ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ ์ถ”๊ฐ€

    @parksey
    parksey committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    89aef34 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/team-moabam/moabam-BE inโ€ฆ 

    โ€ฆto feature/#209-admin-login

# Conflicts:
#	src/main/resources/config
    @parksey
    parksey committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    735f5f1 View commit details
    Browse the repository at this point in the history

  3. refactor: ์–ด๋“œ๋ฏผ config ์—…๋ฐ์ดํŠธ

    @parksey
    parksey committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    4771e9e View commit details
    Browse the repository at this point in the history

  4. fix: test application.yml ์ˆ˜์ •

    @parksey
    parksey committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    16a7eab View commit details
    Browse the repository at this point in the history

  5. test: stub์—์„œ์˜ ํƒ€์ž… ์˜ค๋ฅ˜ ํ•ด๊ฒฐ

    @parksey
    parksey committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    fc0fcb0 View commit details
    Browse the repository at this point in the history

  6. style: ๋ณ€์ˆ˜๋ฉด ๋ณ€๊ฒฝ

    @parksey
    parksey committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    fd99886 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' of https://github.com/team-moabam/moabam-BE inโ€ฆ 

    โ€ฆto feature/#209-admin-login
    @parksey
    parksey committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    f58400f View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2023

  1. Merge branch 'develop' of https://github.com/team-moabam/moabam-BE inโ€ฆ 

    โ€ฆto fix/#224-admin-token-fix

# Conflicts:
#	src/main/resources/config
    @parksey
    parksey committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    4e40928 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2023

  1. feat: ์–ด๋“œ๋ฏผ๊ณผ ์ผ๋ฐ˜ ์œ ์ €๊ฐ„ ํ† ํฐ ์ƒ์„ฑ, ๊ฒ€์ฆ ๋ถ„๋ฆฌ ๋ฐ ๋กœ๊ทธ์ธ ๋ถ„๋ฆฌ

    @parksey
    parksey committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    df92c4f View commit details
    Browse the repository at this point in the history

  2. feat: ํšŒ์› ์ธ์ฆ์‹œ ๋ฑƒ์ง€ ์ƒ์„ฑ๊ธฐ๋Šฅ ์ถ”๊ฐ€

    @parksey
    parksey committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    ca1819d View commit details
    Browse the repository at this point in the history

  3. refactor: config ์ˆ˜์ •

    @parksey
    parksey committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    c627fe5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/team-moabam/moabam-BE inโ€ฆ 

    โ€ฆto fix/#224-admin-token-fix

# Conflicts:
#	src/main/java/com/moabam/api/application/room/RoomService.java
    @parksey
    parksey committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    d772928 View commit details
    Browse the repository at this point in the history

  5. refactor: ์ฝ”๋”ฉ ์Šคํƒ€์ผ ์žฌ์ ์šฉ

    @parksey
    parksey committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    4f51236 View commit details
    Browse the repository at this point in the history