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

프로젝트 리뷰 #188

Open
wants to merge 424 commits into
base: review2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
424 commits
Select commit Hold shift + click to select a range
25b0007
#70 Feat: 좋아요 댓글 클릭 여부 확인 API 추가
jjjuhoon Feb 5, 2024
2ea08c5
#67 Chore: Elasticache Redis로 추가
MinYeongPark Feb 5, 2024
2902170
#72 Feat: 카테고리 테이블에 맞게 설정.(전체 글 정렬, 글쓰기)
jjjuhoon Feb 5, 2024
f95dd03
Merge pull request #73 from shared-solutions/feat#67
MinYeongPark Feb 5, 2024
0ab0ba2
#72 Feat: 카테고리 테이블에 맞게 설정.(전체 글 정렬, 글쓰기)
jjjuhoon Feb 5, 2024
aed52fc
#72 Feat: 카테고리 테이블에 맞게 설정.(완료)
jjjuhoon Feb 5, 2024
ad4ad3d
#72 Feat: 카테고리 테이블에 맞게 설정.(완료)
jjjuhoon Feb 5, 2024
87c975e
Merge branch 'develop' into feat#72
jjjuhoon Feb 5, 2024
0976786
Merge pull request #74 from shared-solutions/feat#72
jjjuhoon Feb 5, 2024
dc0f473
#67 Refactor: 로그인 토큰으로 변경해서 적용
MinYeongPark Feb 5, 2024
44911c3
#72 Feat: JWT토큰 로그인과 기능 연동
jjjuhoon Feb 5, 2024
eb212f6
Merge pull request #75 from shared-solutions/feat#72
jjjuhoon Feb 5, 2024
5b799f0
Merge branch 'develop' into feat#67
MinYeongPark Feb 5, 2024
c86ce16
#63 Feat : 저장한 게시물(내 카테고리) API 구현 (NPE 에러포함)
ls-rain Feb 5, 2024
de120f4
#77 Feat : 로그인 토큰으로 변경 적용
ls-rain Feb 5, 2024
f23d1f7
#23 Refactor: 댓글 좋아요 생성 시 추가 검증
MinYeongPark Feb 6, 2024
6d6826f
#23 Refactor: DeleteMapping인 것 수정
MinYeongPark Feb 6, 2024
e70999f
Merge pull request #76 from shared-solutions/feat#67
MinYeongPark Feb 6, 2024
b8b15ec
#80 Refactor: User 관련 기능 swagger 간단 설명 작성
MinYeongPark Feb 6, 2024
8a880b9
#77 Refactor: RequestHeader atk 추가
MinYeongPark Feb 6, 2024
cd3cbd6
#77 Refactor: RequestHeader atk 추가
MinYeongPark Feb 6, 2024
f81d67e
Merge pull request #78 from shared-solutions/feat#77
MinYeongPark Feb 6, 2024
4fed0e5
Merge pull request #81 from shared-solutions/feat#80
MinYeongPark Feb 6, 2024
e4a8158
#80 Refactor: User 관련 기능 swagger 간단 설명 작성
MinYeongPark Feb 6, 2024
a9f6155
Merge branch 'develop' into feat#80
MinYeongPark Feb 6, 2024
9bc2ef1
#80 Refactor: 나의 Q&A 질문/답변 조회 RequestHeader atk 추가
MinYeongPark Feb 6, 2024
412d298
#83 Feat: 글 글쓴이 확인, swagger 설명 추가
jjjuhoon Feb 6, 2024
a796798
Merge pull request #82 from shared-solutions/feat#80
MinYeongPark Feb 6, 2024
7bde243
#83 Feat: 투표 api 경로 재설정
jjjuhoon Feb 6, 2024
fb2926a
#83 Feat: 글 상세보기 후기의 투표결과 요구사항에 맞게 후보이름, 링크 추가
jjjuhoon Feb 6, 2024
28d6659
Merge pull request #84 from shared-solutions/feat#83
jjjuhoon Feb 6, 2024
aea3446
#83 Feat: api endpoint 변경, 포인트조회시 토큰 입력
jjjuhoon Feb 6, 2024
59fdca3
Merge branch 'develop' into feat#83
jjjuhoon Feb 6, 2024
d089696
Merge pull request #85 from shared-solutions/feat#83
jjjuhoon Feb 7, 2024
12e247f
#63 Feat : 기존내용 pull
ls-rain Feb 7, 2024
9ffdf87
Merge branch 'develop' into feat#23
MinYeongPark Feb 7, 2024
47524df
Merge pull request #79 from shared-solutions/feat#23
MinYeongPark Feb 7, 2024
274f5b5
#86 Refactor: 이미지 업로드 방식 수정, 기타 리팩토링(회원가입, 후기글 작성 시 내 투표 보기, 후보 등록)
MinYeongPark Feb 8, 2024
277f7e0
#86 Chore: 쓸데없는 코드 제거
MinYeongPark Feb 8, 2024
0a02c16
Merge pull request #87 from shared-solutions/feat#86
pswoo0323 Feb 8, 2024
05c4ec9
#86 Chore: 글 작성 시 파일 첨부 null인 경우 처리
MinYeongPark Feb 8, 2024
9cbabb4
Merge pull request #88 from shared-solutions/feat#86
MinYeongPark Feb 8, 2024
9e6b2d7
#63 Feat : 저장한 게시물(내 카테고리, 모든게시물) 중간저장 NPE 발생
ls-rain Feb 8, 2024
8b2ac8c
Merge remote-tracking branch 'origin/develop' into feat#63
ls-rain Feb 8, 2024
335e4fe
#63 Feat : 저장한 게시물(내 카테고리, 모든게시물) 중간저장 NPE 해결
ls-rain Feb 8, 2024
c586d52
#86 Chore: 게시글 상세 보기 사진 가져오는 방식 수정
MinYeongPark Feb 9, 2024
6395a27
Merge pull request #90 from shared-solutions/feat#86
jjjuhoon Feb 9, 2024
8c00cde
#29 Refactor: 댓글 조회 시 상태 추가
MinYeongPark Feb 9, 2024
37881c4
Merge pull request #91 from shared-solutions/feat#29
pswoo0323 Feb 9, 2024
e0abf65
Merge pull request #89 from shared-solutions/feat#63
pswoo0323 Feb 9, 2024
2d22ff7
#29 Refactor: Cors 설정(WebMvcConfigurer)
MinYeongPark Feb 9, 2024
46cce11
Merge pull request #92 from shared-solutions/feat#29
MinYeongPark Feb 9, 2024
3e66a90
#29 Refactor: Cors 설정 변경
MinYeongPark Feb 9, 2024
72ae319
Merge pull request #93 from shared-solutions/feat#29
pswoo0323 Feb 9, 2024
fa2d37c
#29 Refactor: Cors 설정 변경
MinYeongPark Feb 9, 2024
38a5805
#29 Refactor: Cors 설정 변경
MinYeongPark Feb 9, 2024
ce42802
Merge pull request #94 from shared-solutions/feat#29
pswoo0323 Feb 9, 2024
f917808
#95 Feat: 제약조건 설정, 자신이 쓴 글 상세보기시 1등 후보만 나오도록 설정, 투표 여부 추가
jjjuhoon Feb 9, 2024
6c879a9
#95 Feat: 제약조건 설정, 자신이 쓴 글 상세보기시 1등 후보만 나오도록 설정, 투표 여부 추가
jjjuhoon Feb 9, 2024
da7d240
Merge branch 'develop' of https://github.com/shared-solutions/BE into…
jjjuhoon Feb 9, 2024
717337c
#95 Feat: 일반투표 상세보기 오류 해결
jjjuhoon Feb 9, 2024
2f0f4ef
#95 Feat: 에러 핸들러 추가
jjjuhoon Feb 9, 2024
9423eaa
#95 Refactor: Timezone 서울 시간대로 설정
MinYeongPark Feb 9, 2024
694ffb6
토큰 유효시간 수정
pswoo0323 Feb 10, 2024
c527048
Merge branch 'develop' of https://github.com/shared-solutions/BE into…
pswoo0323 Feb 10, 2024
d12865e
Merge pull request #97 from shared-solutions/feat#71
pswoo0323 Feb 10, 2024
58c5e5a
#33 Refactor: 글 좋아요 중복 불가능하도록 설정
MinYeongPark Feb 10, 2024
36d89bf
#33 Refactor: 글 스크랩 중복 불가능하도록 설정
MinYeongPark Feb 10, 2024
7535bd9
#30 Refactor: 댓글 채택 포인트 관련 내용 추가 및 글/댓글 소속 일치 여부 확인 추가
MinYeongPark Feb 10, 2024
0ff5087
#29 Refactor: 댓글 조회 page 처리 제거
MinYeongPark Feb 10, 2024
0e74782
#29 Chore: 댓글 조회 swagger 설명 수정
MinYeongPark Feb 10, 2024
f729eef
#55 Chore: 홈 - 답변을 기다리는 고민들 조회 시 리뷰 글 제외
MinYeongPark Feb 10, 2024
df8dfd7
Merge pull request #96 from shared-solutions/feat#95
MinYeongPark Feb 10, 2024
be1dd85
Merge remote-tracking branch 'origin/develop' into feat#55
MinYeongPark Feb 10, 2024
c6f097b
Merge branch 'develop' into feat#33
MinYeongPark Feb 10, 2024
fa7ac2d
#55 Feat: 회원정보 수정(사용자 프로필 사진)
MinYeongPark Feb 11, 2024
22db039
Merge pull request #98 from shared-solutions/feat#33
MinYeongPark Feb 11, 2024
44f6e9e
Merge pull request #99 from shared-solutions/feat#30
MinYeongPark Feb 11, 2024
a7abf97
Merge pull request #100 from shared-solutions/feat#29
MinYeongPark Feb 11, 2024
8054a39
Merge pull request #101 from shared-solutions/feat#55
MinYeongPark Feb 11, 2024
e1572af
#102 Feat: 글보기에서 글쓴이 프로필 사진 반환, 내 투표보기시 마감된 투표만 반환
jjjuhoon Feb 11, 2024
3ccd60f
Merge pull request #103 from shared-solutions/feat#102
jjjuhoon Feb 11, 2024
051698f
#104 Feat : 회원정보 수정 페이지 API 구현
ls-rain Feb 11, 2024
48770fd
Merge pull request #105 from shared-solutions/feat#104
ls-rain Feb 11, 2024
8b36731
#106 Feat : 회원정보 수정(이름 변경, 이메일 변경) API 구현
ls-rain Feb 11, 2024
db28fd0
Merge pull request #107 from shared-solutions/feat#106
MinYeongPark Feb 12, 2024
78966da
#102 Feat: 글쓰기시 디폴트값 현재시간+1시간, 스웨거 설명 추가
jjjuhoon Feb 12, 2024
ffba68d
Merge pull request #109 from shared-solutions/feat#102
jjjuhoon Feb 12, 2024
fb7c6c1
#108 Refactor: 댓글 조회 시 좋아요/글 주인/내가 쓴 댓글 여부 추가 & 댓글 삭제 api url에서 like 제거
MinYeongPark Feb 12, 2024
0162899
Merge pull request #111 from shared-solutions/feat#108
pswoo0323 Feb 12, 2024
c5e41eb
#108 Refactor: 대댓글 목록 수정
MinYeongPark Feb 12, 2024
d39eeb8
Merge pull request #112 from shared-solutions/feat#108
pswoo0323 Feb 12, 2024
331300c
#113 Refactor: 유저 프로필 사진 이미 있는 경우 수정으로 변경
MinYeongPark Feb 12, 2024
3d8ca85
Merge pull request #114 from shared-solutions/feat#113
MinYeongPark Feb 12, 2024
6fb9ced
글 상세보기, 글 투표하기시 나노초 단위로 마감시간 확인, 글 상세보기시 PostVoteType return 추가
jjjuhoon Feb 12, 2024
1000ef3
Merge pull request #116 from shared-solutions/feat#115
MinYeongPark Feb 12, 2024
88e7232
카카오로그인
pswoo0323 Feb 13, 2024
1dc60cb
카카오 로그인.
pswoo0323 Feb 13, 2024
989d7ed
#118 글 상세보기, 고민글 전체보기시 게이지투표 한정 PollTitle 추가
jjjuhoon Feb 13, 2024
7315bed
Merge pull request #120 from shared-solutions/feat#118
pswoo0323 Feb 13, 2024
5275855
Merge pull request #119 from shared-solutions/feat#71
pswoo0323 Feb 13, 2024
fd2273f
#110 Feat : 회원정보 수정(번호 변경, 비밀번호 변경) API 구현
ls-rain Feb 13, 2024
38b8627
Merge pull request #122 from shared-solutions/feat#110
ls-rain Feb 13, 2024
55aa0a1
#123 Feat : 회원정보 수정(보안 메일 변경) API 구현, Inquiry테이블 생성, 문의하기 API 구현
ls-rain Feb 14, 2024
0b3fdea
Merge pull request #124 from shared-solutions/feat#123
pswoo0323 Feb 15, 2024
f91a7ff
#113 Refactor: 가장 핫한 고민투표 임시로 7일 이내로 수정
MinYeongPark Feb 15, 2024
6486a9e
Merge pull request #125 from shared-solutions/feat#113
pswoo0323 Feb 15, 2024
6da6129
#113 Refactor: 홈 고민글 리스트에서 후보 이미지, 게이지 값 추가
MinYeongPark Feb 15, 2024
8e538bf
Merge pull request #126 from shared-solutions/feat#113
MinYeongPark Feb 15, 2024
8e65ea7
비밀번호 재설정 인증API
pswoo0323 Feb 15, 2024
faa234a
비밀번호재설정API2
pswoo0323 Feb 15, 2024
bba65ac
Merge pull request #129 from shared-solutions/feat#128
pswoo0323 Feb 15, 2024
26e6483
파일 위치 수정
pswoo0323 Feb 15, 2024
be44f60
환경변수설정 추가
pswoo0323 Feb 15, 2024
fff0607
Merge pull request #131 from shared-solutions/feat#130
pswoo0323 Feb 15, 2024
ec28b99
#127 Feat : 저장한 게시물(내 카테고리) 상세보기 API 구현
ls-rain Feb 15, 2024
abe4093
REFACTOR(불필요한 파일 축소, 수정)
pswoo0323 Feb 16, 2024
2c1ec28
비밀번호 재설정 인증 재수정
pswoo0323 Feb 16, 2024
6c261e1
Merge pull request #132 from shared-solutions/feat#130
pswoo0323 Feb 16, 2024
fbd9474
#133 글 상세보기, 고민글 전체보기시 요구사항에 맞게 전체 수정
jjjuhoon Feb 16, 2024
a8129ed
Merge branch 'develop' of https://github.com/shared-solutions/BE into…
jjjuhoon Feb 16, 2024
d578477
#133 글 상세보기, 고민글 전체보기시 요구사항에 맞게 전체 수정
jjjuhoon Feb 16, 2024
6f4ca16
#133 고민글 전체보기시 요구사항에 맞게 전체 수정
jjjuhoon Feb 16, 2024
77365d1
Merge pull request #135 from shared-solutions/feat#133
jjjuhoon Feb 16, 2024
d94fae3
#127 Feat : 저장한 게시물(내 카테고리) 상세보기 API 구현
ls-rain Feb 16, 2024
cd6004c
Merge pull request #136 from shared-solutions/feat#127
pswoo0323 Feb 16, 2024
89d3c2c
#113 Feat: 알림 구독 / 댓글 작성 시 알림 생성 / 홈-안 읽은 알림 존재 여부 조회 / 알림 읽음 처리
MinYeongPark Feb 16, 2024
9a72bfa
Merge branch 'develop' into feat#113
MinYeongPark Feb 16, 2024
f727b48
Merge pull request #139 from shared-solutions/feat#113
MinYeongPark Feb 16, 2024
610bf84
#113 Refactor: 알림 타입 변경
MinYeongPark Feb 16, 2024
1b65feb
Merge pull request #140 from shared-solutions/feat#113
MinYeongPark Feb 16, 2024
3db5cc8
#113 Refactor: 홈 - 안 읽은 알림 존재 여부 조회 설명 수정
MinYeongPark Feb 16, 2024
d77d6c5
Merge pull request #141 from shared-solutions/feat#113
MinYeongPark Feb 16, 2024
50b7d88
#137 고민글 상세보기시 요구사항에 맞게 전체 수정
jjjuhoon Feb 16, 2024
e8c3c7a
#138 Feat : 설정(공지사항), 상세보기 API 구현, Notice 테이블 생성
ls-rain Feb 16, 2024
f4263c6
Merge pull request #142 from shared-solutions/feat#138
pswoo0323 Feb 16, 2024
4895cb3
#137 투표 횟수 제한(최대1번)
jjjuhoon Feb 16, 2024
5c6335c
Merge branch 'develop' of https://github.com/shared-solutions/BE into…
jjjuhoon Feb 16, 2024
fc94136
Merge pull request #144 from shared-solutions/feat#137
jjjuhoon Feb 16, 2024
dae3a88
#113 Refactor: 알림 리스트 조회에서 read도 반환
MinYeongPark Feb 16, 2024
c635c51
Merge pull request #145 from shared-solutions/feat#113
MinYeongPark Feb 16, 2024
aee200c
#147 Refactor: 글 상세보기 시 후보 아이디도 반환으로 수정
MinYeongPark Feb 17, 2024
5cad0b4
Merge pull request #148 from shared-solutions/feat#147
MinYeongPark Feb 17, 2024
b55149a
#143 Feat : 설정(이용약관), 설정(개인정보 처리방침) API 구현, Term 테이블 생성
ls-rain Feb 17, 2024
16eeeef
Merge pull request #149 from shared-solutions/feat#143
MinYeongPark Feb 17, 2024
bf87be4
#150 Refactor : 저장된 글, 공지사항 시간반환 수정
ls-rain Feb 17, 2024
cfb6528
Merge pull request #151 from shared-solutions/feat#150
ls-rain Feb 17, 2024
3905986
#147 Refactor: 댓글 상세보기 대댓글 관련 수정
MinYeongPark Feb 17, 2024
2da9677
Merge pull request #153 from shared-solutions/feat#147
MinYeongPark Feb 17, 2024
9789dcb
#146 Refactor: 홈 - 답변을 기다리는 고민들 / 홈 - 지금 가장 핫한 고민투표 리턴 값 수정
MinYeongPark Feb 17, 2024
22a06ec
Merge pull request #154 from shared-solutions/Feat#146
ls-rain Feb 17, 2024
319ab1e
#155 Refactor: 댓글 조회 시 채택 여부도 리턴
MinYeongPark Feb 17, 2024
61bb29b
Merge pull request #156 from shared-solutions/Feat#155
MinYeongPark Feb 17, 2024
5451835
#152 Refactor : 투표 마감 알림 생성, 이메일 전송 API 구현
ls-rain Feb 17, 2024
2776232
#155 Refactor: 투표/글 작성 시 포인트 amount 값 수정
MinYeongPark Feb 17, 2024
4a21c9b
Merge pull request #157 from shared-solutions/Feat#155
MinYeongPark Feb 17, 2024
985b9b0
#152 Refactor : 투표 마감 알림 생성, 이메일 전송 API 구현 + DEFAULT_TIMEOUT 임시수정
ls-rain Feb 17, 2024
64d4262
비밀번호 재설정 완료,accessToken유효시간 수정
pswoo0323 Feb 18, 2024
6b7ce6d
비밀번호재설정 converter수정
pswoo0323 Feb 18, 2024
472c6e1
Merge pull request #158 from shared-solutions/feat#134
pswoo0323 Feb 18, 2024
88130d2
#152 Refactor : 투표 마감 알림 생성, 이메일 전송 API 구현 + DEFAULT_TIMEOUT 임시수정, re…
ls-rain Feb 18, 2024
d30ebbc
#152 Refactor : 투표 마감 알림 생성, 이메일 전송 API 구현 + DEFAULT_TIMEOUT 임시수정, re…
ls-rain Feb 18, 2024
29934d5
Merge pull request #159 from shared-solutions/feat#152
ls-rain Feb 18, 2024
f6bf8dd
#155 Refactor: 일반/카드 투표 allCandidatePercent 리스트 리턴으로 수정
MinYeongPark Feb 18, 2024
1eaafa5
Merge pull request #160 from shared-solutions/Feat#155
MinYeongPark Feb 18, 2024
69f027c
#155 Refactor: 이미지 파일 업로드 방식 MultipartFile -> Base64로 수정
MinYeongPark Feb 18, 2024
f83e517
Merge pull request #161 from shared-solutions/Feat#155
MinYeongPark Feb 18, 2024
c0a7e22
#155 Refactor: 글 작성에서 MULTIPART_FORM_DATA_VALUE 제거
MinYeongPark Feb 18, 2024
af6f1bc
Merge pull request #162 from shared-solutions/Feat#155
MinYeongPark Feb 18, 2024
3976efd
#155 Refactor: 글 작성에서 MULTIPART_FORM_DATA_VALUE 추가
MinYeongPark Feb 19, 2024
6a89a4f
Merge pull request #163 from shared-solutions/Feat#155
MinYeongPark Feb 19, 2024
584bb0b
#164 Refactor : 마이페이지 response 수정 #164
ls-rain Feb 22, 2024
a4727ca
Merge pull request #165 from shared-solutions/feat#164
ls-rain Feb 22, 2024
d42e600
#164 Refactor : 마이페이지 response 수정 2차#164
ls-rain Feb 22, 2024
50a62b2
Merge pull request #166 from shared-solutions/feat#164
ls-rain Feb 22, 2024
bb6d07f
#155 Refactor: Nginx 설정 proxy_read_timeout 값 1시간으로 수정 (테스트)
MinYeongPark Feb 22, 2024
f967553
Merge pull request #167 from shared-solutions/Feat#155
MinYeongPark Feb 22, 2024
d6c0fcf
#155 Refactor: Nginx 설정 proxy_connet, send timeout 값 1시간으로 수정 (테스트)
MinYeongPark Feb 22, 2024
498fa44
Merge pull request #168 from shared-solutions/Feat#155
MinYeongPark Feb 22, 2024
3e07497
#155 Refactor: Nginx 설정 connection 추가
MinYeongPark Feb 22, 2024
9213894
Merge pull request #169 from shared-solutions/Feat#155
MinYeongPark Feb 22, 2024
9d82f1d
#155 Refactor: Nginx 설정 chunked_transfer_encoding off; 추가
MinYeongPark Feb 22, 2024
ecc0368
Merge pull request #170 from shared-solutions/Feat#155
MinYeongPark Feb 22, 2024
1a67709
#155 Refactor: nginx.conf 위치 변경
MinYeongPark Feb 22, 2024
15b5a32
Merge pull request #171 from shared-solutions/Feat#155
MinYeongPark Feb 22, 2024
fe28506
#155 Refactor: nginx 설정에서 timeout 설정만 남기고 제거 (테스트)
MinYeongPark Feb 22, 2024
d536819
Merge pull request #172 from shared-solutions/Feat#155
MinYeongPark Feb 22, 2024
9b37173
#155 Refactor: cors 설정에서 allowedOriginPatterns("*") 제거해보기 (테스트)
MinYeongPark Feb 23, 2024
a191e31
Merge pull request #173 from shared-solutions/Feat#155
MinYeongPark Feb 23, 2024
fa1e4e0
#155 Refactor: Nginx 설정 proxy timeout 설정 제거
MinYeongPark Feb 23, 2024
df6f799
Merge pull request #174 from shared-solutions/Feat#155
MinYeongPark Feb 23, 2024
f0cf057
#155 Refactor: cors 설정에서 allowedOriginPatterns("*") 다시 추가
MinYeongPark Feb 23, 2024
ea36319
Merge pull request #175 from shared-solutions/Feat#155
MinYeongPark Feb 23, 2024
060f010
#155 Refactor: cors 설정에서 .allowedOrigins("*") 제거 (테스트)
MinYeongPark Feb 24, 2024
17eee50
Merge pull request #176 from shared-solutions/Feat#155
MinYeongPark Feb 24, 2024
225d5f6
#155 Refactor: nginx.conf에서 cors 설정 제거 (테스트)
MinYeongPark Feb 24, 2024
a56e3eb
Merge pull request #177 from shared-solutions/Feat#155
MinYeongPark Feb 24, 2024
d42c3a1
#155 Refactor: nginx.conf에서 cors 설정 제거 (테스트)
MinYeongPark Feb 26, 2024
1b31a9b
#155 Refactor: nginx.conf cors 설정 추가, Access-Control-Allow-Credential…
MinYeongPark Feb 26, 2024
1781e85
Merge pull request #179 from shared-solutions/Feat#155
MinYeongPark Feb 26, 2024
6f8baf2
#155 Refactor: nginx.conf cors 설정 제거, CorsConfig에 .allowCredentials(t…
MinYeongPark Feb 26, 2024
ed8894d
Merge pull request #180 from shared-solutions/Feat#155
MinYeongPark Feb 26, 2024
b4cabd3
#155 Refactor: nginx.conf cors 설정 제거, CorsConfig에 .allowCredentials(t…
MinYeongPark Feb 26, 2024
c37c61e
Merge pull request #181 from shared-solutions/Feat#155
MinYeongPark Feb 26, 2024
d70de50
#155 Refactor: 코드 컨벤션 맞춤
MinYeongPark Feb 28, 2024
241fc25
Merge pull request #182 from shared-solutions/Feat#155
MinYeongPark Feb 28, 2024
49fad70
비밀번호 재설정 리턴값 수정
pswoo0323 Feb 28, 2024
2d6f49e
회원 탈퇴 수정
pswoo0323 Feb 28, 2024
8973542
코멘트 관련 수정
pswoo0323 Feb 28, 2024
a278bbc
Merge pull request #184 from shared-solutions/feat#183
pswoo0323 Feb 28, 2024
8add492
#178 createdAt null로 나오는 현상 수정
jjjuhoon Feb 29, 2024
4d7871f
#178 상세보기시 마감 안됐을때도 allCandidate 나오게 수정
jjjuhoon Feb 29, 2024
bd689ba
#178 후기글 전체보기시 원글 정보&ID, 글 상세보기시 후기글일 경우 id, voteType 출력
jjjuhoon Feb 29, 2024
a11159d
Merge pull request #185 from shared-solutions/feat#178
jjjuhoon Feb 29, 2024
6aece5b
#186 코드 간겨롸
jjjuhoon Feb 29, 2024
56d70f2
Merge branch 'develop' of https://github.com/shared-solutions/BE into…
jjjuhoon Feb 29, 2024
f656313
Merge pull request #187 from shared-solutions/feat#186
jjjuhoon Mar 2, 2024
04ede31
#189 전체 조회시 mypost, topVoteResult
jjjuhoon Mar 10, 2024
a174373
Merge pull request #190 from shared-solutions/feat#189
jjjuhoon Mar 10, 2024
eab9277
#191 전체, 상세 조회시 allCandidateResult 출력
jjjuhoon Mar 10, 2024
9e7c135
Merge branch 'develop' of https://github.com/shared-solutions/BE into…
jjjuhoon Mar 10, 2024
c640110
Merge pull request #192 from shared-solutions/feat#191
jjjuhoon Mar 10, 2024
c4977cf
#193 Refactor: 답변을 기다리는 고민들 로직 수정
MinYeongPark Mar 19, 2024
aefbbd9
#193 Refactor: 답변을 기다리는 고민들 - 투표 마감 안 된 글 필터링 부분 수정
MinYeongPark Mar 19, 2024
57767e9
Merge pull request #194 from shared-solutions/feat#193
MinYeongPark Mar 19, 2024
271b5db
Docs: README 수정
MinYeongPark Mar 19, 2024
ee96499
Docs: README 수정
MinYeongPark Mar 19, 2024
f00b3ac
Merge branch 'develop' into feat#195
MinYeongPark Jun 2, 2024
644a92d
Merge branch 'develop' into feat#196
ls-rain Jun 2, 2024
d2c252a
#195 Feat: 글 신고 추가
MinYeongPark Jun 2, 2024
35d5135
#195 Feat: 댓글 신고 추가
MinYeongPark Jun 2, 2024
23cc976
#196 Feat : 글 검색 API 구현
ls-rain Jun 2, 2024
cacae02
#196 Feat : 글 검색 API 구현 JPQL like문 수정
ls-rain Jun 2, 2024
c497511
Merge branch 'develop' into feat#196
ls-rain Jun 2, 2024
6276b3b
Merge pull request #197 from shared-solutions/feat#196
ls-rain Jun 2, 2024
94c0f47
#195 Refactor: 댓글 신고 수정
MinYeongPark Jun 2, 2024
72bb583
#195 Refactor: ResponseDTO 수정 중복된 신고인 경우에 대해 수정
MinYeongPark Jun 2, 2024
c6c771c
Merge branch 'develop' into feat#195
MinYeongPark Jun 2, 2024
618c1ad
#201 Feat : RedisRepositoryConfig 템플릿 재정의(Object형), Redis에 Queue로 데이터…
ls-rain Jun 3, 2024
601337b
Merge pull request #202 from shared-solutions/feat#195
MinYeongPark Jul 14, 2024
9e8633c
#195 Refactor: EB environment name 수정
MinYeongPark Jul 14, 2024
630643a
Merge pull request #204 from shared-solutions/feat#195
MinYeongPark Jul 14, 2024
3e6ae8d
Merge branch 'develop' into feat#201
ls-rain Aug 18, 2024
8673f76
Merge pull request #203 from shared-solutions/feat#201
ls-rain Aug 18, 2024
8fb9ae0
[docs/#206] 이슈, PR 템플릿 생성
ls-rain Sep 8, 2024
d05b1cd
Merge pull request #207 from shared-solutions/docs/#206
ls-rain Sep 8, 2024
4d7f60d
redis sortedset으로 리팩토링
kimdavid0521 Sep 8, 2024
17904f9
redis sortedset으로 리팩토링
kimdavid0521 Sep 8, 2024
c73571e
sortedset 리팩토링
kimdavid0521 Sep 8, 2024
77a2c29
Merge pull request #212 from shared-solutions/feat/#208
kimdavid0521 Sep 8, 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
Binary file added .DS_Store
Binary file not shown.
12 changes: 12 additions & 0 deletions .ebextensions-dev/00-makefiles.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
files:
"/sbin/appstart":
mode: "000755"
owner: webapp
group: webapp
content: |
#!/usr/bin/env bash
JAR_PATH=/var/app/current/application.jar

# run app
killalljava
java -Dfile.encoding=UTF-8 -jar $JAR_PATH
3 changes: 3 additions & 0 deletions .ebextensions-dev/01-set-timezone.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
commands:
set_time_zone:
command: ln -f -s /usr/share/zoneinfo/Asia/Seoul /etc/localtime
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/이슈-템플릿.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: 이슈 템플릿
about: 이슈 생성시 해당 템플릿을 사용해주세요
title: "[Feat/Refactor/Fix/Ci] + 제목"
labels: ''
assignees: ''

---

***
### 세부내용

***
### 체크 리스트
- [ ] 구현
- [ ] 기능 테스트
13 changes: 13 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## 개요

## 작업사항

## 변경로직

### 변경 전

### 변경 후

## 사용방법

## 기타
61 changes: 61 additions & 0 deletions .github/workflows/dev_deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Solution-friend Dev CI/CD

on:
pull_request:
types: [ closed ]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR이 기각되어도 해당 Action이 수행될 것 같네요.

workflow_dispatch: # (2).수동 실행도 가능하도록

jobs:
build:
runs-on: ubuntu-latest # (3).OS환경
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'develop'

steps:
- name: Checkout
uses: actions/checkout@v2 # (4).코드 check out

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: 11 # (5).자바 설치
distribution: 'adopt'

- name: Grant execute permission for gradlew
run: chmod +x ./gradlew
shell: bash # (6).권한 부여

- name: Build with Gradle
run: ./gradlew clean build -x test
shell: bash # (7).build시작

- name: Get current time
uses: 1466587594/get-current-time@v2
id: current-time
with:
format: YYYY-MM-DDTHH-mm-ss
utcOffset: "+09:00" # (8).build시점의 시간확보

- name: Show Current Time
run: echo "CurrentTime=$"
shell: bash # (9).확보한 시간 보여주기

- name: Generate deployment package
run: |
mkdir -p deploy
cp build/libs/*.jar deploy/application.jar
cp Procfile deploy/Procfile
cp -r .ebextensions-dev deploy/.ebextensions
cp -r .platform deploy/.platform
cd deploy && zip -r deploy.zip .

- name: Beanstalk Deploy
uses: einaregilsson/beanstalk-deploy@v20
with:
aws_access_key: ${{ secrets.AWS_ACTION_ACCESS_KEY_ID }}
aws_secret_key: ${{ secrets.AWS_ACTION_SECRET_ACCESS_KEY }}
application_name: solution-friend-dev
environment_name: Solution-friend-dev-env-1
version_label: github-action-${{ steps.current-time.outputs.formattedTime }}
region: ap-northeast-2
deployment_package: deploy/deploy.zip
wait_for_deployment: false
37 changes: 37 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
HELP.md
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/

### VS Code ###
.vscode/
1 change: 1 addition & 0 deletions .platform/nginx/conf.d/client_max_body_size.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
client_max_body_size 200M;
68 changes: 68 additions & 0 deletions .platform/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
user nginx;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;
worker_processes auto;
worker_rlimit_nofile 33282;

events {
use epoll;
worker_connections 1024;
multi_accept on;
}

http {
include /etc/nginx/mime.types;
default_type application/octet-stream;


log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';

include conf.d/*.conf;

map $http_upgrade $connection_upgrade {
default "upgrade";
}

upstream springboot {
server 127.0.0.1:8080;
keepalive 1024;
}

server {
listen 80 default_server;
listen [::]:80 default_server;

location / {
proxy_pass http://springboot;
proxy_connect_timeout 3600;
proxy_send_timeout 3600;
proxy_read_timeout 3600;
# CORS 관련 헤더 추가
# add_header 'Access-Control-Allow-Origin' '*';
# add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
# add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type';
# add_header 'Access-Control-Allow-Credential' 'true';

proxy_http_version 1.1;
proxy_set_header Connection $connection_upgrade;
proxy_set_header Upgrade $http_upgrade;

proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}

access_log /var/log/nginx/access.log main;

client_header_timeout 60;
client_body_timeout 60;
keepalive_timeout 60;
gzip off;
gzip_comp_level 4;

# Include the Elastic Beanstalk generated locations
include conf.d/elasticbeanstalk/healthd.conf;
}
}
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: appstart
62 changes: 61 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,61 @@
# BE
# 🗳️ 고민친구
<img src="https://github.com/shared-solutions/BE/assets/55652102/f809c74d-8080-403e-8322-2c55596fc9cd" width=700> <br/>

고민친구 백엔드 리포지토리

<br>

## 🧑‍🤝‍🧑 프로젝트 개요
투표 기반 의사결정 지원 웹 서비스

<img src="https://github.com/shared-solutions/BE/assets/55652102/67200bef-fa34-49cc-b6c6-3356ebf7f4b1" width=700> <br/>
<img src="https://github.com/shared-solutions/BE/assets/55652102/05231260-29aa-458d-9f7e-b1cc3b9636ff" width=700> <br/>



## 🔎 주요 기능
- 로그인 / 회원가입
- 고민 투표 & 고민 후기 글/댓글 관리
- 마이페이지 내 정보 관리
- 댓글 작성 및 투표 마감 실시간 알림

<br>

## 🔭 기술 스택
- Java, Springboot
- AWS EB, ElastiCache(Redis), RDS, VPC
- Spring Security
- SSE 실시간 알림

<br>

## 👨‍👩‍👧‍👦 팀원 소개
- PM 1명
- Design 1명
- Front-End(Web) 4명
- Back-End 4명

<br>

## 📖 커밋 규칙

#{이슈번호} {type}: [작업한 내용]

ex) #200 Feat: 사용자 뮤트 기능 추가


| 커밋 유형 | 의미 |
|-------|-----------|
| Feat | 새로운 기능 추가 |
| Fix | 버그 수정 |
| Docs | 문서 수정 |
| Style | 코드 formatting, 세미콜론 누락, 코드 자체의 변경이 없는 경우 |
| Refactor | 코드 리팩토링 |
| Test | 테스트 코드, 리팩토링 테스트 코드 추가 |
| Chore | 패키지 매니저 수정, 그 외 기타 수정 ex) .gitignore |
| Design | CSS 등 사용자 UI 디자인 변경 |
| Comment | 필요한 주석 추가 및 변경 |
| Rename | 파일 또는 폴더 명을 수정하거나 옮기는 작업만인 경우 |
| Remove | 파일을 삭제하는 작업만 수행한 경우 |
| !BREAKING CHANGE | 커다란 API 변경의 경우 |
| !HOTFIX | 급하게 치명적인 버그를 고쳐야 하는 경우 |
62 changes: 62 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.17'
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
}

group = 'friend'
version = '0.0.1-SNAPSHOT'

java {
sourceCompatibility = '11'
}

configurations {
compileOnly {
extendsFrom annotationProcessor
}
}

repositories {
mavenCentral()
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-web'
compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.mysql:mysql-connector-j'
annotationProcessor 'org.projectlombok:lombok'
implementation 'org.springframework.boot:spring-boot-starter-validation'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
implementation 'org.springdoc:springdoc-openapi-ui:1.6.15'
implementation 'io.springfox:springfox-swagger2:2.9.2'
implementation 'io.springfox:springfox-swagger-ui:2.9.2'

//user
implementation 'com.google.code.findbugs:jsr305:3.0.2'
//mail
implementation group: 'com.sun.mail', name: 'javax.mail', version: '1.6.2'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gradle 형식을 통일해 주세요.
com.sun.mail:javax.mail:1.6.2

또한, sun 의존성은 매우 옛날 의존성을 가능성이 높습니다. 확인이 필요합니다.

//jwt
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.4'
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.4'
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.4'
// redis
implementation 'org.springframework.boot:spring-boot-starter-data-redis'
//kakao
// implementation 'org.springframework.boot:spring-boot-starter-webflux'
// S3
implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
implementation platform('software.amazon.awssdk:bom:2.20.56')
implementation 'software.amazon.awssdk:s3'

}

tasks.named('test') {
useJUnitPlatform()
}

jar {
enabled = false
}
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 7 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading