Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 20723b1
Author: Curry4182 <[email protected]>
Date:   Wed Mar 20 14:39:36 2024 +0900

    CI: CI/CD 테스트를 위한 이벤트 추가

commit cf8908e
Merge: ebd0fa7 e072283
Author: ByeongGon Kang <[email protected]>
Date:   Tue Mar 19 16:54:46 2024 +0900

    Merge pull request #72 from uju-in/LIME-145-CICD-feat

    [LIME-145] ci/cd 수정

commit e072283
Author: Curry4182 <[email protected]>
Date:   Tue Mar 19 16:33:19 2024 +0900

    ci: 'lime-was-server' 라벨만 self hosted 되도록 수정

commit d629fd7
Author: Curry4182 <[email protected]>
Date:   Tue Mar 19 16:32:33 2024 +0900

    build: docker time zone 서울로 변경

commit ebd0fa7
Merge: 7c8138b 0e63c9d
Author: ByeongGon Kang <[email protected]>
Date:   Mon Mar 18 17:13:33 2024 +0900

    Merge pull request #69 from uju-in/LIME-136-feed-redis-async-event

    [LIME-136] 피드 랭킹 업데이트 이벤트로 비동기 처리 기능 추가

commit 7c8138b
Merge: 003cdcc 7d6de8c
Author: 박이슬 <[email protected]>
Date:   Wed Mar 13 09:24:48 2024 +0900

    Merge pull request #66 from uju-in/LIME-131-process-vote-redis-logic-asynchronously-with-event

commit 0e63c9d
Author: Curry4182 <[email protected]>
Date:   Tue Mar 12 14:01:23 2024 +0900

    feat: 피드 랭킹 업데이트를 이벤트로 처리 하도록 기능 추가

commit 003cdcc
Merge: 68a137a 76fbd0f
Author: JoJaeHyeon <[email protected]>
Date:   Tue Mar 12 13:50:03 2024 +0900

    Merge pull request #68 from uju-in/LIME-122-BE-

    [LIME-122] requestMatchers 콜백 경로 추가

commit 76fbd0f
Merge: 308ff1f 3a031c5
Author: JoJaeHyeon <[email protected]>
Date:   Tue Mar 12 13:47:02 2024 +0900

    Merge branch 'LIME-122-BE-' of https://github.com/uju-in/lime-backend into LIME-122-separate-kakaologin

commit 308ff1f
Author: JoJaeHyeon <[email protected]>
Date:   Tue Mar 12 13:46:40 2024 +0900

    bug : kakaoCallback 경로 추가

commit 68a137a
Merge: cafcfcc 3a031c5
Author: JoJaeHyeon <[email protected]>
Date:   Tue Mar 12 13:38:46 2024 +0900

    Merge pull request #67 from uju-in/LIME-122-BE-

    [LIME-122] 카카오 토큰요청 callback 경로 버그 수정

commit 3a031c5
Merge: 74c410b cafcfcc
Author: JoJaeHyeon <[email protected]>
Date:   Tue Mar 12 12:55:05 2024 +0900

    Merge branch 'main' into LIME-122-BE-

commit 74c410b
Author: JoJaeHyeon <[email protected]>
Date:   Tue Mar 12 12:54:02 2024 +0900

    bug : kakaoCallback 경로 추가

commit cafcfcc
Author: JoJaeHyeon <[email protected]>
Date:   Mon Mar 11 14:26:36 2024 +0900

    refactor : security auth/kakao 경로 추가

commit b1eae8d
Author: JoJaeHyeon <[email protected]>
Date:   Mon Mar 11 10:45:24 2024 +0900

    refactor : requestparam 경로 permit 설정 추가

commit 3b04f93
Author: JoJaeHyeon <[email protected]>
Date:   Sun Mar 10 21:04:29 2024 +0900

    fix : kakao callback 권한 허용 경로 변경

commit 7d6de8c
Author: Yiseul Park <[email protected]>
Date:   Sun Mar 10 16:35:21 2024 +0900

    test: 레디스 로직 분리로 인한 테스트 수정

commit 4242bc1
Author: Yiseul Park <[email protected]>
Date:   Sun Mar 10 16:33:34 2024 +0900

    fix: 카카오 로그인 방식 변경으로 인한 테스트 픽스쳐 수정

commit bbd55a9
Author: Yiseul Park <[email protected]>
Date:   Sat Mar 9 16:50:03 2024 +0900

    fix: 이벤트가 비동기 처리 안되는 문제 해결

commit abedcd2
Author: Yiseul Park <[email protected]>
Date:   Sat Mar 9 16:17:56 2024 +0900

    refactor: 인기도 증가/감소 메서드 통합, 메서드명 변경

commit 4382d69
Author: Yiseul Park <[email protected]>
Date:   Sat Mar 9 15:47:39 2024 +0900

    feat: 레디스 로직 이벤트 비동기 처리

commit 33f1d56
Merge: f2cb8ea 99f06cf
Author: 박이슬 <[email protected]>
Date:   Sun Mar 10 16:00:08 2024 +0900

    Merge pull request #60 from uju-in/LIME-119-add-vote-integration-test

    [LIME-119] 투표 통합 테스트 추가

commit f2cb8ea
Merge: cd68474 852f50e
Author: JoJaeHyeon <[email protected]>
Date:   Sat Mar 9 15:37:47 2024 +0900

    Merge pull request #63 from uju-in/LIME-122-BE-

    [LIME-122] 카카오 소셜 로그인 처리 방식 수정

commit 852f50e
Author: JoJaeHyeon <[email protected]>
Date:   Sat Mar 9 15:37:30 2024 +0900

    refactor : 레이어 역참조 문제 해결

commit 2f94280
Author: JoJaeHyeon <[email protected]>
Date:   Sat Mar 9 15:02:48 2024 +0900

    chore : 컨벤션 및 사용 문법 수정

commit 05d9cf0
Author: JoJaeHyeon <[email protected]>
Date:   Sat Mar 9 15:02:33 2024 +0900

    refactor : refreshToken전달방식 변경

commit cd68474
Merge: 87c3f44 06b0971
Author: ByeongGon Kang <[email protected]>
Date:   Sat Mar 9 12:53:50 2024 +0900

    Merge pull request #65 from uju-in/LIME-134-BE-review-min-content-count

    [LIME-134] 리뷰 내용 최소 글자 추가

commit 87c3f44
Merge: 8122dad df88298
Author: ByeongGon Kang <[email protected]>
Date:   Fri Mar 8 15:38:46 2024 +0900

    Merge pull request #64 from uju-in/LIME-133--favorite-default-folder-to_end

    [LIME-133] default 폴더를 가장 뒤에 오도록 기능 추가

commit 188a92a
Author: JoJaeHyeon <[email protected]>
Date:   Fri Mar 8 15:25:39 2024 +0900

    refactor : join페이지로 리다이렉트, 해당 권한 승인 처리

commit f2332eb
Author: JoJaeHyeon <[email protected]>
Date:   Fri Mar 8 15:24:41 2024 +0900

    chore : 사용하지 않는 코드 정리

commit 68683b6
Author: JoJaeHyeon <[email protected]>
Date:   Fri Mar 8 13:52:13 2024 +0900

    refactor : 인가처리 단계에서 권한 확인 후 인증처리 전 프로필 업데이트 양식으로 리다이렉트 처리

commit 9dd6d04
Author: JoJaeHyeon <[email protected]>
Date:   Fri Mar 8 13:49:07 2024 +0900

    chore : 파일 이동

commit 06b0971
Author: Curry4182 <[email protected]>
Date:   Thu Mar 7 15:19:09 2024 +0900

    feat: 리뷰 내용 최소 글자 추가

commit df88298
Author: Curry4182 <[email protected]>
Date:   Thu Mar 7 14:48:47 2024 +0900

    feat: default 폴더를 가장 뒤에 오도록 기능 추가

commit 99f06cf
Author: Yiseul Park <[email protected]>
Date:   Thu Mar 7 14:21:33 2024 +0900

    test: 투표 키워드 검색 테스트 추가

commit 3c85c2d
Author: Yiseul Park <[email protected]>
Date:   Mon Mar 4 17:10:21 2024 +0900

    feat: 투표 제목에 대해서도 검색되는 요구사항 추가

commit eb9123e
Author: Yiseul Park <[email protected]>
Date:   Mon Mar 4 17:06:28 2024 +0900

    fix: 총 검색된 투표 수와 실제 검색되는 투표 수가 다른 버그 해결

commit 8838b43
Author: Yiseul Park <[email protected]>
Date:   Mon Mar 4 16:32:27 2024 +0900

    fix: 커서 파라미터가 Swagger에서 필수 입력값인 문제와 Json 형태로 입력받는 문제 해결

commit 79aa60c
Author: JoJaeHyeon <[email protected]>
Date:   Thu Mar 7 12:37:34 2024 +0900

    chore : 각종 handler, entrypoint 시도중

commit 9c935dd
Author: JoJaeHyeon <[email protected]>
Date:   Thu Mar 7 12:37:09 2024 +0900

    fix : gradle 소셜로그인 의존성 제거 및 프로퍼티 적용 의존성 추가

commit 5d9ba7d
Author: JoJaeHyeon <[email protected]>
Date:   Thu Mar 7 12:36:04 2024 +0900

    chore : 개행 수정

commit e145506
Author: JoJaeHyeon <[email protected]>
Date:   Thu Mar 7 12:35:53 2024 +0900

    refactor : property 추가로 인한 스캔 범위 수정

commit 71911d1
Author: JoJaeHyeon <[email protected]>
Date:   Thu Mar 7 12:35:37 2024 +0900

    refactor: 카카오 소셜로그인 방식 변경으로 인한 security 설정 변경

commit 098c363
Author: JoJaeHyeon <[email protected]>
Date:   Thu Mar 7 12:34:58 2024 +0900

    feat : 카카오 전용 토큰 요청 및 수신 dto 생성

commit 17d4d60
Author: JoJaeHyeon <[email protected]>
Date:   Thu Mar 7 12:34:30 2024 +0900

    refactor : 소셜 id long타입으로 변경

commit 285f2a4
Author: JoJaeHyeon <[email protected]>
Date:   Thu Mar 7 12:33:38 2024 +0900

    feat : 카카오 소셜로그인 code를 받아 처리하는 비즈니스 로직 구현

commit 8695497
Author: JoJaeHyeon <[email protected]>
Date:   Thu Mar 7 12:32:17 2024 +0900

    chore : 소셜로그인 사용 방식 변경으로 인한 oauth2의존성 제거

commit 8122dad
Merge: 9cf716c 5284a04
Author: 박이슬 <[email protected]>
Date:   Thu Mar 7 12:22:34 2024 +0900

    Merge pull request #62 from uju-in/NO-JIRA-fix-vote-ranking-ttl

commit 9cf716c
Merge: a0396eb 1fd859e
Author: 박이슬 <[email protected]>
Date:   Thu Mar 7 12:22:00 2024 +0900

    Merge pull request #61 from uju-in/NO-JIRA-fix-vote-keyword

commit 5284a04
Author: Yiseul Park <[email protected]>
Date:   Tue Mar 5 16:58:04 2024 +0900

    fix: 투표 랭킹에서 ttl 적용 안되는 문제 해결

commit 1fd859e
Author: Yiseul Park <[email protected]>
Date:   Mon Mar 4 17:10:21 2024 +0900

    feat: 투표 제목에 대해서도 검색되는 요구사항 추가

commit 9bc43bf
Author: Yiseul Park <[email protected]>
Date:   Mon Mar 4 17:06:28 2024 +0900

    fix: 총 검색된 투표 수와 실제 검색되는 투표 수가 다른 버그 해결

commit cdf77be
Author: Yiseul Park <[email protected]>
Date:   Mon Mar 4 16:32:27 2024 +0900

    fix: 커서 파라미터가 Swagger에서 필수 입력값인 문제와 Json 형태로 입력받는 문제 해결

commit a2a927c
Author: Yiseul Park <[email protected]>
Date:   Mon Mar 4 15:05:23 2024 +0900

    chore: H2 의존성 제거

    MySQL의 DATE_FORMAT 함수가 H2에 없어서 호환성 문제로 일단 제거, 해결 방법 시도 중

commit 5d799aa
Author: Yiseul Park <[email protected]>
Date:   Mon Mar 4 15:03:38 2024 +0900

    test: 투표 목록 조회 테스트 추가

commit 321a036
Author: Yiseul Park <[email protected]>
Date:   Sat Mar 2 10:53:58 2024 +0900

    comment: 주석 위치 변경

commit 4a953fe
Author: Yiseul Park <[email protected]>
Date:   Sat Mar 2 10:52:49 2024 +0900

    test: 투표 상세 조회 테스트 추가

commit 59ae6cf
Author: Yiseul Park <[email protected]>
Date:   Fri Mar 1 15:42:16 2024 +0900

    test: 투표 상세 조회 테스트 추가

commit b42162a
Author: Yiseul Park <[email protected]>
Date:   Fri Mar 1 15:15:57 2024 +0900

    test: 투표 서비스 테스트 리팩토링

commit b65010a
Author: Yiseul Park <[email protected]>
Date:   Fri Mar 1 13:43:58 2024 +0900

    test: 투표 삭제 테스트 추가

commit ba3408a
Author: Yiseul Park <[email protected]>
Date:   Thu Feb 29 17:07:29 2024 +0900

    test: 투표 참여 취소 테스트 추가

commit b25972d
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 28 18:31:09 2024 +0900

    test: 투표 생성 테스트에 verify 추가

commit 72f5980
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 28 17:41:03 2024 +0900

    test: 테스트 설명을 사용자 관점의 기능 명세로 변경

commit 9ee1db3
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 28 17:34:08 2024 +0900

    test: 투표 참여 통합 테스트 코드 중복 제거

commit d3933ad
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 28 16:43:14 2024 +0900

    test: 투표 참여 통합 테스트 추가

commit 64caf29
Author: Yiseul Park <[email protected]>
Date:   Tue Feb 27 17:10:52 2024 +0900

    test: 투표 생성 통합 테스트 추가

commit 509c2d1
Author: Yiseul Park <[email protected]>
Date:   Tue Feb 27 23:39:06 2024 +0900

    chore: 테스트를 위한 h2 의존성 추가

commit a0396eb
Author: JoJaeHyeon <[email protected]>
Date:   Tue Feb 27 15:42:34 2024 +0900

    Update README.md

commit eb755e4
Merge: b93b9fc 8134701
Author: JoJaeHyeon <[email protected]>
Date:   Tue Feb 27 15:38:38 2024 +0900

    Merge pull request #37 from uju-in/HandmadeCloud-patch-1

    docs : README 초안 업데이트

commit b93b9fc
Merge: e695369 6afc787
Author: 박이슬 <[email protected]>
Date:   Sun Feb 25 21:51:02 2024 +0900

    Merge pull request #59 from uju-in/NO-JIRA-redis-security-config

    [NO-JIRA] 레디스 보안 설정 추가

commit 6afc787
Author: Yiseul Park <[email protected]>
Date:   Sun Feb 25 15:18:37 2024 +0900

    feat: 레디스 비밀번호 설정 추가

commit e695369
Merge: 78ac56b 24ed277
Author: ByeongGon Kang <[email protected]>
Date:   Fri Feb 23 16:43:40 2024 +0900

    Merge pull request #58 from uju-in/LIME-107-BE-favorite-feat

    [LIME-107] transactional이 readonly로 인해 폴더가 생성되지 않는 버그 수정

commit 24ed277
Author: Curry4182 <[email protected]>
Date:   Fri Feb 23 16:05:16 2024 +0900

    fix: readonly로 인해 폴더가 생성되지 않는 버그 수정

commit 78ac56b
Merge: 20dce43 3a5f4ba
Author: ByeongGon Kang <[email protected]>
Date:   Fri Feb 23 15:55:53 2024 +0900

    Merge pull request #56 from uju-in/NO-JIRA-item-search-feat

    [NO-JIRA] 아이템 검색 기능 변경

commit 3a5f4ba
Author: Curry4182 <[email protected]>
Date:   Fri Feb 23 15:54:32 2024 +0900

    feat: 여러개의 request param을 하나의 클래스로 받을 수 있도록 수정, 스웨거에서 request param이 request body로 보이는 부분 수정

commit 20dce43
Merge: 864a476 50df8bf
Author: JoJaeHyeon <[email protected]>
Date:   Fri Feb 23 15:06:19 2024 +0900

    Merge pull request #50 from uju-in/LIME-103-seprate-domain-entity

    [LIME-103] Bucket bulk-insert 리팩토링

commit 864a476
Merge: 926cb43 e998326
Author: ByeongGon Kang <[email protected]>
Date:   Fri Feb 23 14:35:39 2024 +0900

    Merge pull request #57 from uju-in/LIME-107-BE-favorite-feat

    [LIME-107] LIME-107-BE-favorite-feat 브랜치 main 반영 PR

commit e998326
Merge: 514f439 4e0ffc6
Author: ByeongGon Kang <[email protected]>
Date:   Fri Feb 23 14:27:20 2024 +0900

    Merge pull request #53 from uju-in/LIME-108-BE-favorite-create-item-feat

    [LIME-108] 찜 아이템 이동 기능 추가

commit 4e0ffc6
Author: Curry4182 <[email protected]>
Date:   Thu Feb 22 21:25:38 2024 +0900

    feat: 폴더를 생성할 때 기본 폴더이름으로 생성하면 예외가 발생하도록 수정

commit c8ae9c2
Author: Curry4182 <[email protected]>
Date:   Thu Feb 22 21:10:17 2024 +0900

    feat: 기본 폴더가 중복된 경우 예외가 발생하도록 기능 변경

commit e5b92cb
Author: Curry4182 <[email protected]>
Date:   Thu Feb 22 17:36:36 2024 +0900

    feat: 아이템 검색할 때 keyword를 입력하지 않아도 조회할 수 있도록 기능 추가

commit 926cb43
Merge: 8e90c28 a1ba691
Author: 박이슬 <[email protected]>
Date:   Wed Feb 21 14:23:13 2024 +0900

    Merge pull request #55 from uju-in/NO-JIRA-fix-vote-ranking

    [NO-JIRA] 투표 랭킹 순위가 같을 경우, 투표 마감 시각이 빠른 순으로 정렬되도록 수정

commit 8e90c28
Merge: 7df2add 2deac09
Author: ByeongGon Kang <[email protected]>
Date:   Wed Feb 21 13:33:41 2024 +0900

    Merge pull request #54 from uju-in/LIME-111--review-bug-fix

    [LIME-111] 리뷰 관련 버그 수정

commit a1ba691
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 21 00:09:02 2024 +0900

    fix: 투표 랭킹 순위가 같을 경우 투표 마감 시각이 빠른 순으로 정렬되도록 수정

commit 7df2add
Merge: 9c7f9d9 a65dae2
Author: ByeongGon Kang <[email protected]>
Date:   Tue Feb 20 20:42:45 2024 +0900

    Merge pull request #51 from uju-in/NO-JIRA-api-module-dependencies-change

    [NO-JIRA] 의존성 위치 변경

commit 9c7f9d9
Merge: 6031d47 514f439
Author: ByeongGon Kang <[email protected]>
Date:   Tue Feb 20 20:42:03 2024 +0900

    Merge pull request #52 from uju-in/LIME-107-BE-favorite-feat

    [LIME-107] 찜 목록 조회 기능 추가

commit 2deac09
Author: Curry4182 <[email protected]>
Date:   Tue Feb 20 20:13:44 2024 +0900

    fix: null 리스트가 들어올 경우 NPE가 발생하는 버그 수정

commit 4327bf1
Author: Curry4182 <[email protected]>
Date:   Tue Feb 20 16:21:24 2024 +0900

    fix: transactional 없어서 삭제 안 되는 버그 수정

commit 6031d47
Merge: 31d6513 4155b93
Author: 박이슬 <[email protected]>
Date:   Mon Feb 19 23:23:18 2024 +0900

    Merge pull request #49 from uju-in/LIME-91-show-closed-and-ongoing-votes-together

    [LIME-91] 투표 목록 조회 요구사항 변경 - 투표 상태 조건, 정렬 조건 수정

commit 609df36
Author: Curry4182 <[email protected]>
Date:   Mon Feb 19 20:59:20 2024 +0900

    feat: 아이템을 담을 때 folder id가 없으면 default 폴더에 아이템 생성

commit 514f439
Author: Curry4182 <[email protected]>
Date:   Mon Feb 19 19:25:58 2024 +0900

    feat: favoritetype에 맞는 favorite 반환 기능 추가

commit a65dae2
Author: Curry4182 <[email protected]>
Date:   Mon Feb 19 16:49:39 2024 +0900

    build: 모듈의 성격에 맞게 의존성 위치 변경

commit 50df8bf
Author: JoJaeHyeon <[email protected]>
Date:   Wed Feb 14 23:47:33 2024 +0900

    refactor : 쿼리 수정

commit 1d90468
Author: JoJaeHyeon <[email protected]>
Date:   Wed Feb 14 23:40:23 2024 +0900

    chore : import문 수정

commit bd4dca9
Author: JoJaeHyeon <[email protected]>
Date:   Wed Feb 14 23:40:15 2024 +0900

    refactor : bucket batch insert를 위한 jdbcTemplate 적용

commit 4155b93
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 14 21:03:24 2024 +0900

    test: 깨진 투표 테스트 수정

commit def05d4
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 14 20:21:08 2024 +0900

    feat: 투표 정렬 조건 추가, 종료된 투표/진행 중인 투표 함께 보여주기

commit 31d6513
Merge: 619b2cd b7a3faa
Author: 박이슬 <[email protected]>
Date:   Wed Feb 14 15:28:02 2024 +0900

    Merge pull request #48 from uju-in/NO-JIRA-add-hobby-to-voteDetatil

    [NO-JIRA] 투표 상세 조회 결과에 취미 추가

commit b7a3faa
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 14 15:24:58 2024 +0900

    feat: 투표 상세 조회 결과에 취미 추가

commit 619b2cd
Merge: dc3bdef 3a8a9eb
Author: ByeongGon Kang <[email protected]>
Date:   Wed Feb 14 00:25:35 2024 +0900

    Merge pull request #47 from uju-in/LIME-100-BE-reveiw-api-path-refactor

    [LIME-100] 리뷰 api 경로 수정

commit dc3bdef
Merge: 1b80e9d 4f8a211
Author: ByeongGon Kang <[email protected]>
Date:   Wed Feb 14 00:25:25 2024 +0900

    Merge pull request #46 from uju-in/LIME-97--favorite-item-refactor

    [LIME-97] favorite item 리팩토링

commit 3a8a9eb
Author: Curry4182 <[email protected]>
Date:   Wed Feb 14 00:12:35 2024 +0900

    refactor: 리뷰 목록 조회 itemId 관련 수정

commit c65c1c4
Author: Curry4182 <[email protected]>
Date:   Tue Feb 13 21:14:48 2024 +0900

    refactor: 리뷰 api 경로 수정

commit 4f8a211
Author: Curry4182 <[email protected]>
Date:   Tue Feb 13 16:12:58 2024 +0900

    refactor: 컨트롤러에서 사용되는 메서드와 변수명 favoriteItem, folder로 변경

commit 1b80e9d
Merge: 68770ca f136918
Author: ByeongGon Kang <[email protected]>
Date:   Tue Feb 13 15:35:02 2024 +0900

    Merge pull request #45 from uju-in/LIME-96--favorite-get-list-feat

    [LIME-96] 폴더에 포함되어 있는 아이템 개수 반환 기능 추가

commit 2053ef7
Author: Curry4182 <[email protected]>
Date:   Tue Feb 13 15:33:21 2024 +0900

    refactor: api 경로에 단수 명사를 복수로 변경

commit 68770ca
Merge: 763dfb0 9dc56d4
Author: 박이슬 <[email protected]>
Date:   Tue Feb 13 15:11:24 2024 +0900

    Merge pull request #42 from uju-in/LIME-87-apply-changed-vote-requirements

    [LIME-87] 투표 변경된 요구사항 적용 1 - 투표 상세, 투표 랭킹 관련

commit 9dc56d4
Author: Yiseul Park <[email protected]>
Date:   Tue Feb 13 14:51:27 2024 +0900

    rename: VoteRedis -> VoteRankingInfo 클래스명 변경

commit 7e16153
Author: Curry4182 <[email protected]>
Date:   Tue Feb 13 14:37:11 2024 +0900

    refactor: api 경로 수정

commit 2b85005
Author: Curry4182 <[email protected]>
Date:   Tue Feb 13 03:11:08 2024 +0900

    remove: 사용하지 않는 favorite 관련 클래스 삭제

commit a847b3c
Author: Curry4182 <[email protected]>
Date:   Tue Feb 13 02:50:14 2024 +0900

    refactor: 도메인 이름을 favoriteItem에서 favorite으로 변경

commit 9aec33b
Author: Curry4182 <[email protected]>
Date:   Tue Feb 13 02:21:46 2024 +0900

    refactor: API 변수명을 favoriteItem, folder를 구분해서 변경

commit 3e42007
Author: Curry4182 <[email protected]>
Date:   Tue Feb 13 01:53:07 2024 +0900

    refactor: favorite item 도메인과 item 도메인 기능 분리

commit f136918
Author: Curry4182 <[email protected]>
Date:   Tue Feb 13 00:58:30 2024 +0900

    feat: 폴더에 포함되어 있는 아이템 개수 반환 기능 추가

commit 763dfb0
Merge: 03567f3 efb9281
Author: ByeongGon Kang <[email protected]>
Date:   Sun Feb 11 03:33:08 2024 +0900

    Merge pull request #44 from uju-in/LIME-95-BE-favorite-move-feat

    [LIME-95] 찜 폴더 이동 기능 추가

commit 03567f3
Merge: e2ae6b6 addf7a4
Author: ByeongGon Kang <[email protected]>
Date:   Sun Feb 11 03:32:43 2024 +0900

    Merge pull request #43 from uju-in/LIME-94--loki-log-back

    [LIME-94] Loki 서버 전송을 위한 로그백 설정

commit 318dbb9
Author: Yiseul Park <[email protected]>
Date:   Sat Feb 10 15:29:19 2024 +0900

    feat: 투표 랭킹을 취미별로 조회

commit efb9281
Author: Curry4182 <[email protected]>
Date:   Thu Feb 8 19:09:20 2024 +0900

    feat: 찜 폴더 이동 기능 추가

commit addf7a4
Author: Curry4182 <[email protected]>
Date:   Thu Feb 8 18:12:44 2024 +0900

    feat: 기존 코드에 있던 의존성 추가

commit e2ae6b6
Merge: 5008e6b f7c22c0
Author: JoJaeHyeon <[email protected]>
Date:   Thu Feb 8 17:32:48 2024 +0900

    Merge pull request #31 from uju-in/NO-JIRA-SSE-refactoring

    [NO-JIRA] SSE 리팩토링

commit f7c22c0
Merge: de8d13a 5008e6b
Author: JoJaeHyeon <[email protected]>
Date:   Thu Feb 8 17:32:40 2024 +0900

    Merge branch 'main' into NO-JIRA-SSE-refactoring

commit de8d13a
Author: JoJaeHyeon <[email protected]>
Date:   Thu Feb 8 17:31:26 2024 +0900

    refactor : 요청 시간 수정

commit 7407fc1
Author: Curry4182 <[email protected]>
Date:   Thu Feb 8 17:12:49 2024 +0900

    feat: 로키서버에 로그 전송 기능 추가

commit 5008e6b
Merge: 637b08c 707c87c
Author: ByeongGon Kang <[email protected]>
Date:   Thu Feb 8 14:37:05 2024 +0900

    Merge pull request #41 from uju-in/LIME-93--review-remove-bug-fix

    [LIME-93]리뷰 이미지와 리뷰 좋아요가 있는 경우 삭제 안되는 버그 수정

commit 8c97b98
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 7 21:31:10 2024 +0900

    test: 변경된 코드에 맞게 테스트 수정

commit 98e9bad
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 7 20:55:24 2024 +0900

    remove: 사용하지 않는 메서드 삭제

commit 056caf7
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 7 20:39:21 2024 +0900

    bug: 투표 재참여 시 투표 랭킹 인기순 올라가는 버그 수정

commit 40ba884
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 7 19:51:34 2024 +0900

    feat: 투표 종료와 삭제 시 랭킹에서 제거, 투표 참여 취소 시 랭킹에서 인기순 1 감소

commit c4490e0
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 7 19:17:15 2024 +0900

    feat: 투표 랭킹이 없는 경우 예외 처리

commit 707c87c
Merge: 5468014 637b08c
Author: ByeongGon Kang <[email protected]>
Date:   Wed Feb 7 19:06:58 2024 +0900

    Merge branch 'main' into LIME-93--review-remove-bug-fix

commit 637b08c
Merge: 8b51cc5 52571b1
Author: ByeongGon Kang <[email protected]>
Date:   Wed Feb 7 19:02:48 2024 +0900

    Merge pull request #38 from uju-in/LIME-85-BE-review-update-image-feat

    [LIME-85] 리뷰 이미지 수정 기능 추가

commit 52571b1
Author: Curry4182 <[email protected]>
Date:   Wed Feb 7 19:00:53 2024 +0900

    refactor: 내부적으로 변경되지 않는 인자에 final 키워드 추가

commit c0bc5f3
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 7 18:57:46 2024 +0900

    feat: 투표 랭킹 요구사항 변경

    1. 랭킹 10위 -> 6위까지만 보여주기
    2. 투표 id, 현재 참여자 수, 아이템 1~2번 이미지만 반환하기

commit 3e4d88b
Author: Curry4182 <[email protected]>
Date:   Wed Feb 7 18:53:44 2024 +0900

    refactor: 메서드 이름에 맞게 기능 변경

commit b287efb
Author: Curry4182 <[email protected]>
Date:   Wed Feb 7 18:27:35 2024 +0900

    remove: 사용되지 않는 log기능 삭제

commit 5468014
Author: Curry4182 <[email protected]>
Date:   Wed Feb 7 18:16:20 2024 +0900

    fix: 리뷰 이미지와 리뷰 좋아요가 있는 경우 삭제 안되는 버그 수정

commit 4a90bbf
Author: Yiseul Park <[email protected]>
Date:   Wed Feb 7 16:46:18 2024 +0900

    feat: 투표 상세 조회에 투표 최대 참여 인원 수, 마감 시각 추가하기

commit 8b51cc5
Merge: 2aa5ad4 200408e
Author: JoJaeHyeon <[email protected]>
Date:   Tue Feb 6 14:56:59 2024 +0900

    Merge pull request #40 from uju-in/no-jira-grafana-install

    [NO-JIRA] 그라파나 설정 추가

commit 200408e
Author: JoJaeHyeon <[email protected]>
Date:   Tue Feb 6 14:55:25 2024 +0900

    feat : grafana 모니터링 툴 적용

commit 2aa5ad4
Merge: 49b16ad 816e545
Author: ByeongGon Kang <[email protected]>
Date:   Tue Feb 6 14:02:44 2024 +0900

    Merge pull request #39 from uju-in/LIME-86-BE-review-like-bug-fix

    [LIME-86] 리뷰 좋아요를 저장할 때 멤버 아이디가 저장 되도록 버그 수정

commit 816e545
Author: Curry4182 <[email protected]>
Date:   Tue Feb 6 04:46:25 2024 +0900

    fix: 리뷰 좋아요를 저장할 때 멤버 아이디가 저장 되도록 버그 수정

commit 6ec34ee
Author: Curry4182 <[email protected]>
Date:   Tue Feb 6 04:06:31 2024 +0900

    feat: 기존 리뷰 이미지 삭제 기능 추가, 기존 리뷰에 리뷰 이미지 생성 기능 추가

commit 42ec12a
Author: Curry4182 <[email protected]>
Date:   Tue Feb 6 04:04:07 2024 +0900

    feat: 버킷의 url 주소로 버킷의 오브젝트를 삭제할 수 있도록 기능 추가

commit d8d48ff
Author: Curry4182 <[email protected]>
Date:   Tue Feb 6 04:02:09 2024 +0900

    fix: 리뷰 생성하는 경우 reviewId로 저장되도록 수정

commit 49b16ad
Merge: 9eeafac 0a057b6
Author: 박이슬 <[email protected]>
Date:   Sun Feb 4 21:40:53 2024 +0900

    Merge pull request #33 from uju-in/LIME-76-change-vote-creation-requirements

commit 0a057b6
Merge: 12255a2 9eeafac
Author: 박이슬 <[email protected]>
Date:   Sun Feb 4 17:13:48 2024 +0900

    Merge branch 'main' into LIME-76-change-vote-creation-requirements

commit 9eeafac
Merge: 3ec577c 12d3687
Author: ByeongGon Kang <[email protected]>
Date:   Fri Feb 2 15:57:48 2024 +0900

    Merge pull request #36 from uju-in/LIME-79-BE-item-review-isLike-feat

    [NO-JIRA] 로그인한 사용자 정보를 담는 모델 클래스 추가

commit 12d3687
Author: Curry4182 <[email protected]>
Date:   Fri Feb 2 15:00:15 2024 +0900

    feat: 로그인한 사용자 정보를 담는 모델 클래스 추가

commit 12255a2
Author: Yiseul Park <[email protected]>
Date:   Wed Jan 31 16:03:18 2024 +0900

    feat: 투표 아이템 검증 추가

commit 8f06e68
Author: Yiseul Park <[email protected]>
Date:   Wed Jan 31 14:39:33 2024 +0900

    feat: 투표 인원 수 최대 1000명 제한

commit 19c830b
Merge: 6a87517 5374dfb
Author: JoJaeHyeon <[email protected]>
Date:   Tue Jan 30 00:12:58 2024 +0900

    Merge branch 'main' into NO-JIRA-SSE-refactoring

commit 6a87517
Author: JoJaeHyeon <[email protected]>
Date:   Tue Jan 30 00:11:01 2024 +0900

    chore : 네이밍 정리 및 map을 인스턴스 변수로 이동, 클래스 네임 변경

commit f105e76
Author: JoJaeHyeon <[email protected]>
Date:   Mon Jan 29 23:09:28 2024 +0900

    refactor : 서비스 레이어에 옵저버 디자인 패턴 적용

commit 6a5287b
Author: JoJaeHyeon <[email protected]>
Date:   Mon Jan 29 23:06:31 2024 +0900

    refactor : transactionalEventListener 적용 및 비동기 처리

commit 344389c
Author: JoJaeHyeon <[email protected]>
Date:   Mon Jan 29 23:06:15 2024 +0900

    refactor : sseEmitter 객체 반환

commit 9ff4cd0
Author: JoJaeHyeon <[email protected]>
Date:   Mon Jan 29 23:06:03 2024 +0900

    refactor : 알림 기능에 옵저버 디자인 패턴 적용

commit 3be97f0
Author: JoJaeHyeon <[email protected]>
Date:   Mon Jan 29 15:24:28 2024 +0900

    chore : sse-observer pattern 개발중

commit a640aa7
Author: JoJaeHyeon <[email protected]>
Date:   Sat Jan 27 00:24:07 2024 +0900

    refactor : 알림 서비스 비동기 처리

commit 6442597
Author: JoJaeHyeon <[email protected]>
Date:   Sat Jan 27 00:23:38 2024 +0900

    chore : 로직 중요도에 따라 코드 순서 변경

commit 6e1b61d
Author: Yiseul Park <[email protected]>
Date:   Fri Jan 26 17:53:00 2024 +0900

    refactor: 포인트 지급 AOP -> 이벤트 처리로 변경

commit 4d8a5d4
Author: Yiseul Park <[email protected]>
Date:   Fri Jan 26 17:08:57 2024 +0900

    chore: 트랜잭션 의존성 추가

commit 161e9d7
Author: Curry4182 <[email protected]>
Date:   Fri Jan 26 06:09:21 2024 +0900

    fix: sse에 heartbeat 추가, 다중 접속할 수 있도록 자료구조 변경
  • Loading branch information
@HandmadeCloud
HandmadeCloud committed Mar 20, 2024
1 parent 87e58d8 commit 4becd98
Show file tree
Hide file tree
Showing 53 changed files with 1,130 additions and 559 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/CICD.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Java CICD with Gradle

on:
push:
branches:
- feature/CICD-test
pull_request:
branches:
- main
Expand Down Expand Up @@ -54,12 +57,12 @@ jobs:
run-docker-image-on-server:
if: github.event.pull_request.merged
needs: build-docker-image
runs-on: self-hosted
runs-on: [ self-hosted, lime-was-server ]

steps:
- name: docker pull
run: sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/lime-image

- name: docker stop container
run: sudo docker stop $(sudo docker ps -q) 2>/dev/null || true

Expand All @@ -68,3 +71,4 @@ jobs:

- name: delete old docker image
run: sudo docker system prune -f

3 changes: 3 additions & 0 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ FROM openjdk:17
# JAR_FILE 변수에 jar 파일명을 저장
ARG JAR_FILE=lime-api/build/libs/*.jar

# 환경변수로 시간대 설정
ENV TZ=Asia/Seoul

# jar 파일 복사
COPY ${JAR_FILE} app.jar

Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@

## 4. 📝 문서화 링크 (테크 스팩, 트러블 슈팅, 개인 내용 정리)

| <img src="https://avatars.githubusercontent.com/u/29273437?v=4" width="450" height="150"> | <img src ="https://avatars.githubusercontent.com/u/98391539?v=4" width="450" height="150"> | <img src ="https://avatars.githubusercontent.com/u/77893164?v=4" width="450" height="150"> | <img src ="https://avatars.githubusercontent.com/u/58348662?v=4" width="450" height="150"> | <img src ="https://avatars.githubusercontent.com/u/114549939?v=4" width="450" height="150"> | <img src ="https://github.com/HandmadeCloud/HandmadeCloud/assets/77893164/5415f199-8926-44b7-9e13-598a33f3b3a9" width="450" height="150"> |
|:----------------------------------------------------------------:|:-----------------------------------------------------------------:|:-----------------------------------------------------------------:|:-----------------------------------------------------------------:|:------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------:|
| [BE 강병곤](https://github.com/Curry4182) | [BE 박이슬](https://github.com/Yiseull) | [BE 조재현 (팀장)](https://github.com/HandmadeCloud) | [FE 진예림](https://github.com/yeeeerim) | [FE 박하민](https://github.com/mintmin0320) | Design 김시은 |

## 5. ⚒️ 기술 스택

Expand Down
4 changes: 2 additions & 2 deletions lime-api/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-cache'
implementation "com.github.ben-manes.caffeine:caffeine:3.1.8"

// oauth2
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
// configuration processor
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
}

jar {
Expand Down
4 changes: 3 additions & 1 deletion lime-api/src/main/java/com/programmers/lime/LimeApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;

@EnableAsync
@SpringBootApplication
@EnableScheduling
@ConfigurationPropertiesScan("com.programmers.lime.global.config.security.jwt")
@ConfigurationPropertiesScan({"com.programmers.lime.global.config.security.jwt", "com.programmers.lime.domains.auth"})
public class LimeApplication {

public static void main(String[] args) {
Expand Down
30 changes: 0 additions & 30 deletions lime-api/src/main/java/com/programmers/lime/domains/auth/CustomOauth2User.java
View file

This file was deleted.

55 changes: 55 additions & 0 deletions lime-api/src/main/java/com/programmers/lime/domains/auth/api/AuthController.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package com.programmers.lime.domains.auth.api;

import static com.programmers.lime.domains.member.api.MemberController.*;
import static org.springframework.http.HttpHeaders.*;

import org.springframework.http.ResponseCookie;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.programmers.lime.domains.auth.api.dto.MemberLoginResponse;
import com.programmers.lime.domains.auth.application.OAuthUserService;
import com.programmers.lime.domains.auth.application.dto.MemberLoginServiceResponse;

import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor
@RestController
public class AuthController {

private final OAuthUserService oauthUserService;

@GetMapping("/auth/kakao/callback")
public ResponseEntity<MemberLoginResponse> loginKakao(
@RequestParam final String code,
HttpServletResponse response
) {
MemberLoginServiceResponse loginServiceResponse = oauthUserService.login(code);
sendRefreshToken(response, loginServiceResponse);

return ResponseEntity.ok(MemberLoginResponse.from(loginServiceResponse));
}

@GetMapping("/join")
public ResponseEntity<String> join(){
return ResponseEntity.ok("join");
}

private void sendRefreshToken(
final HttpServletResponse response,
final MemberLoginServiceResponse loginResponse
) {
final ResponseCookie cookie = ResponseCookie.from("refresh-token", loginResponse.refreshToken())
.maxAge(COOKIE_AGE_SECONDS)
.secure(true)
.httpOnly(true)
.sameSite("None")
.path("/")
.build();

response.addHeader(SET_COOKIE, String.valueOf(cookie));
}
}
47 changes: 47 additions & 0 deletions lime-api/src/main/java/com/programmers/lime/domains/auth/api/dto/KakaoMemberResponse.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.programmers.lime.domains.auth.api.dto;

import static com.programmers.lime.domains.member.domain.vo.SocialType.*;

import java.util.UUID;

import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import com.programmers.lime.domains.member.domain.Member;
import com.programmers.lime.domains.member.domain.vo.Role;
import com.programmers.lime.domains.member.domain.vo.SocialInfo;

@JsonNaming(value = PropertyNamingStrategies.SnakeCaseStrategy.class)
public record KakaoMemberResponse(
Long id, //카카오 소셜 id

KakaoAccount kakaoAccount

) {
@JsonNaming(value = PropertyNamingStrategies.SnakeCaseStrategy.class)
public record KakaoAccount(
String email,
Profile profile
) {
@JsonNaming(value = PropertyNamingStrategies.SnakeCaseStrategy.class)
public record Profile(
String profileImageUrl
) {
}
}

public Member toEntity(){
SocialInfo socialInfo = SocialInfo.builder()
.socialId(this.id)
.email(this.kakaoAccount.email)
.profileImage(this.kakaoAccount.profile.profileImageUrl)
.role(Role.GUEST)
.socialType(KAKAO)
.build();

long timestamp = System.currentTimeMillis();
String randomString = String.valueOf(UUID.randomUUID()).replace("-", "").substring(0, 8);
String randomNickname = timestamp + randomString;

return new Member(socialInfo, randomNickname);
}
}
12 changes: 12 additions & 0 deletions lime-api/src/main/java/com/programmers/lime/domains/auth/api/dto/KakaoOAuthLoginInfo.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.programmers.lime.domains.auth.api.dto;

import org.springframework.boot.context.properties.ConfigurationProperties;

@ConfigurationProperties(prefix = "oauth.kakao.login")
public record KakaoOAuthLoginInfo(
String grantType,
String clientId,
String clientSecret,
String redirectUri
) {
}
13 changes: 13 additions & 0 deletions lime-api/src/main/java/com/programmers/lime/domains/auth/api/dto/MemberLoginResponse.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.programmers.lime.domains.auth.api.dto;

import com.programmers.lime.domains.auth.application.dto.MemberLoginServiceResponse;

public record MemberLoginResponse(
Long memberId,
String nickname,
String accessToken
) {
public static MemberLoginResponse from(final MemberLoginServiceResponse response) {
return new MemberLoginResponse(response.memberId(), response.nickname(), response.accessToken());
}
}
14 changes: 14 additions & 0 deletions ...api/src/main/java/com/programmers/lime/domains/auth/api/dto/OAuthAccessTokenResponse.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.programmers.lime.domains.auth.api.dto;

import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;

@JsonNaming(value = PropertyNamingStrategies.SnakeCaseStrategy.class)
public record OAuthAccessTokenResponse(
String tokenType,
String accessToken,
Integer expiresIn,
String refreshToken,
Integer refreshTokenExpiresIn
) {
}
71 changes: 71 additions & 0 deletions lime-api/src/main/java/com/programmers/lime/domains/auth/application/KakaoOAuthClient.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package com.programmers.lime.domains.auth.application;

import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;

import com.programmers.lime.domains.auth.api.dto.KakaoMemberResponse;
import com.programmers.lime.domains.auth.api.dto.KakaoOAuthLoginInfo;
import com.programmers.lime.domains.auth.api.dto.OAuthAccessTokenResponse;

import lombok.RequiredArgsConstructor;

@Component
@RequiredArgsConstructor
public class KakaoOAuthClient {

private static final RestTemplate restTemplate = new RestTemplate();
private final KakaoOAuthLoginInfo kakaoOAuthLoginInfo;

public String getAccessToken(final String code) {
MultiValueMap<String, String> loginInfoRequest = makeKakaoLoginInfo(code);
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);

HttpEntity<MultiValueMap<String, String>> httpEntity = new HttpEntity<>(loginInfoRequest, headers);

OAuthAccessTokenResponse response = restTemplate.postForEntity(
"https://kauth.kakao.com/oauth/token",
httpEntity,
OAuthAccessTokenResponse.class
).getBody();

return response.accessToken();
}

private MultiValueMap<String, String> makeKakaoLoginInfo(final String code) {
MultiValueMap<String, String> loginInfoRequest = new LinkedMultiValueMap<>();

loginInfoRequest.add("grant_type", kakaoOAuthLoginInfo.grantType());
loginInfoRequest.add("client_id", kakaoOAuthLoginInfo.clientId());
loginInfoRequest.add("client_secret", kakaoOAuthLoginInfo.clientSecret());
loginInfoRequest.add("redirect_uri", kakaoOAuthLoginInfo.redirectUri());
loginInfoRequest.add("code", code);

return loginInfoRequest;
}

public KakaoMemberResponse getMemberInfo(final String accessToken) {
HttpHeaders headers = new HttpHeaders();
headers.setBearerAuth(accessToken);
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);

HttpEntity<Void> request = new HttpEntity<>(headers);

KakaoMemberResponse response = restTemplate.exchange(
"https://kapi.kakao.com/v2/user/me",
HttpMethod.GET,
request,
KakaoMemberResponse.class
).getBody();

return response;
}


}
45 changes: 45 additions & 0 deletions lime-api/src/main/java/com/programmers/lime/domains/auth/application/OAuthUserService.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package com.programmers.lime.domains.auth.application;

import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.programmers.lime.domains.auth.api.dto.KakaoMemberResponse;
import com.programmers.lime.domains.auth.application.dto.MemberLoginServiceResponse;
import com.programmers.lime.domains.member.domain.Member;
import com.programmers.lime.domains.member.domain.vo.SocialType;
import com.programmers.lime.domains.member.implementation.MemberAppender;
import com.programmers.lime.domains.member.implementation.MemberReader;
import com.programmers.lime.global.config.security.jwt.JwtService;

import lombok.RequiredArgsConstructor;

@Service
@RequiredArgsConstructor
public class OAuthUserService {

private final KakaoOAuthClient kakaoOAuthClient;
private final MemberAppender memberAppender;
private final MemberReader memberReader;
private final JwtService jwtService;

@Transactional
public MemberLoginServiceResponse login(final String code) {
String kakaoAccessToken = kakaoOAuthClient.getAccessToken(code);
KakaoMemberResponse response = kakaoOAuthClient.getMemberInfo(kakaoAccessToken);

Member foundMember = memberReader.readBySocialIdAndSocialType(
response.id(),
SocialType.KAKAO
).orElseGet(() -> saveMember(response));

String accessToken = jwtService.generateAccessToken(String.valueOf(foundMember.getId()));
String refreshToken = jwtService.generateRefreshToken();

return MemberLoginServiceResponse.from(foundMember, accessToken, refreshToken);
}

private Member saveMember(final KakaoMemberResponse response) {
return memberAppender.append(response.toEntity());
}

}
23 changes: 23 additions & 0 deletions ...in/java/com/programmers/lime/domains/auth/application/dto/MemberLoginServiceResponse.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.programmers.lime.domains.auth.application.dto;

import com.programmers.lime.domains.member.domain.Member;

public record MemberLoginServiceResponse(
Long memberId,
String nickname,
String accessToken,
String refreshToken
) {
public static MemberLoginServiceResponse from(
final Member member,
final String accessToken,
final String refreshToken
) {
return new MemberLoginServiceResponse(
member.getId(),
member.getNickname(),
accessToken,
refreshToken
);
}
}
Loading

0 comments on commit 4becd98

Please sign in to comment.