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

Develop back merge #128

Merged
merged 239 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
239 commits
Select commit Hold shift + click to select a range
7f2feb3
feature: #9/Menu Entity 생성
BlueBerrySoda Mar 28, 2024
b30b689
Revert "feature: #9/Menu Entity 생성"
BlueBerrySoda Mar 28, 2024
97b51e5
feature: #9/create Menu Entity
BlueBerrySoda Mar 28, 2024
0ceb9aa
feature: #9/create Menu Repository
BlueBerrySoda Mar 28, 2024
e5c6b68
feature: #11/학식 메뉴 크롤링 기능 구현
BlueBerrySoda Mar 29, 2024
59e9527
fix: #11/가격 Long 변환 예외 버그 수정
BlueBerrySoda Mar 29, 2024
2b49b2e
fix: #11-메뉴 이름이 없을 시 예외처리
BlueBerrySoda Mar 31, 2024
6da5967
feature: #11-JSON 형식으로 학식 데이터 반환 구현
BlueBerrySoda Mar 31, 2024
1f4d455
chore: 오타 수정
BlueBerrySoda Apr 3, 2024
9c578ed
fix: comflict 해결
BlueBerrySoda Apr 4, 2024
dffa8c0
feat: #11-학식 정보 번역본 DB 저장
BlueBerrySoda Apr 4, 2024
da200a6
feat: #11-언어별 식당 리스트 반환 메서드 구현
BlueBerrySoda Apr 4, 2024
6c40950
feat: #11-자동 학식 크롤링 기능 구현
BlueBerrySoda Apr 4, 2024
8d0b8b0
feat: #11-언어별 학식 검색을 위한 메서드 수정
BlueBerrySoda Apr 4, 2024
ae8b965
feat: #11-API 호출을 위한 메서드 수정
BlueBerrySoda Apr 4, 2024
cbf62b6
feat: #36-발음평가 Controller, Service 구현
BlueBerrySoda Apr 5, 2024
181af62
feat: #22-RefreshToken 구현
mclub4 Apr 6, 2024
b0eb587
Merge branch 'feature/be/#9-menu-entity' of github.com:kookmin-sw/cap…
mclub4 Apr 6, 2024
bc884c8
Merge pull request #52 from kookmin-sw/feature/be/#9-menu-entity
mclub4 Apr 6, 2024
9add7f8
feat: #22-RefreshToken 재발급 요청
mclub4 Apr 6, 2024
e5ce4fc
refactor: #22-JwtProvider 구조 수정
mclub4 Apr 6, 2024
951bf8b
Merge pull request #53 from kookmin-sw/feature/be/#22-jwtToken
BlueBerrySoda Apr 6, 2024
775e2f9
feat: #36-발음 평가 API 사용 변경
BlueBerrySoda Apr 7, 2024
eee08a5
chore: 발음평가를 위한 의존성 파일 설치
BlueBerrySoda Apr 7, 2024
ba24b5b
feat: #36-단어 단위 발음 평가 기능 구현
BlueBerrySoda Apr 9, 2024
7f9d3d6
chore: conflict 해소
BlueBerrySoda Apr 9, 2024
8d35e25
refactor: Multi Staging Build로 변경
mclub4 Apr 9, 2024
5b172bb
refactor: #36-환경변수로 API Key 주입 설정
BlueBerrySoda Apr 10, 2024
e3b8f49
feat: #36-발음평가 정보 JSON 형식 반환 기능 구현
BlueBerrySoda Apr 11, 2024
e772454
feat: #14-공지사항 스케쥴링
mclub4 Apr 12, 2024
1e8ef7d
feat: #36-wav 파일을 통한 발음 평가 기능 구현
BlueBerrySoda Apr 12, 2024
8c8bf3d
Merge branch 'feature/be/#36-azure-speech' of github.com:kookmin-sw/c…
mclub4 Apr 12, 2024
3826a3d
Merge pull request #65 from kookmin-sw/feature/be/#36-azure-speech
mclub4 Apr 13, 2024
487b128
feat: #14-공지사항 크롤링 구현
mclub4 Apr 14, 2024
8c5cd87
feature: #14-공지사항 받아오기
mclub4 Apr 14, 2024
9bfa68c
feat: #74-Docker Compose 작성
mclub4 Apr 14, 2024
36cbfea
fix: nginx 수정
mclub4 Apr 14, 2024
d7cfa5f
Merge pull request #75 from kookmin-sw/feature/be/#74-https
BlueBerrySoda Apr 15, 2024
1e50d83
fix: 기존 브렌치 리베이스
mclub4 Apr 16, 2024
2841af6
feat: #80-API 매개변수 수정
BlueBerrySoda Apr 18, 2024
37706cc
refactor: #80-Menu 메서드 비동기화 및 JSON 객체 수정
BlueBerrySoda Apr 18, 2024
7c91fff
refactor: #80-Speech 메서드 비동기화
BlueBerrySoda Apr 18, 2024
9fcfb75
chore: 공백 수정
BlueBerrySoda Apr 18, 2024
442cb06
feat: #83-Cursor기반 Pagination
mclub4 Apr 18, 2024
05afa33
fix: Docker Compose 수정
mclub4 Apr 18, 2024
cb4fede
feat: #22-HMAC을 이용한 검증
mclub4 Apr 18, 2024
5014253
Merge pull request #86 from kookmin-sw/feature/be/#14-announcement
BlueBerrySoda Apr 19, 2024
09e3583
feat: #84-QnA 및 FAQ 기본 클래스 선언
BlueBerrySoda Apr 19, 2024
925fcfa
refactor: conflict 해결
BlueBerrySoda Apr 19, 2024
a84d073
tmp
mclub4 Apr 24, 2024
c941048
Merge branch 'refactor/be/#80-async-json-format' of github.com:kookmi…
mclub4 Apr 24, 2024
e4a6fde
Merge pull request #88 from kookmin-sw/refactor/be/#80-async-json-format
mclub4 Apr 24, 2024
d82b61e
feat: #84-QnA CRUD 기능 구현
BlueBerrySoda Apr 25, 2024
8b2ecf5
feat: #84-QnA 기능 기본 구조체 구현
BlueBerrySoda Apr 25, 2024
19d8fd5
feat: #84-페이지네이션 기본 구조체 구현
BlueBerrySoda Apr 25, 2024
253333f
Merge branch 'develop-back' of https://github.com/kookmin-sw/capstone…
BlueBerrySoda Apr 25, 2024
0415982
refactor: #95-Api 공통응답으로 리펙토링
mclub4 Apr 25, 2024
1f02507
feature: #96-TestContainer를 이용한 테스트 환경 구축
mclub4 Apr 25, 2024
b38cdbf
feat: #81-채팅 서버 틀 마련
mclub4 Apr 27, 2024
99a2aec
feat: #81-채팅 테스트 기반 마련
mclub4 Apr 27, 2024
e9fd037
Merge pull request #97 from kookmin-sw/refactor/be/#95-globalResponse
mclub4 Apr 27, 2024
f7bfbdb
feat:#81-rabbitmq 설정
mclub4 Apr 27, 2024
580f3d1
fix: Internal Server Error fix
mclub4 Apr 28, 2024
32bedb1
feat: #81-DB ENV 변경
mclub4 Apr 28, 2024
200bbe7
feat: #81-채팅 리스트 세부적인 내용 추가
mclub4 Apr 28, 2024
49d6e6e
feat: #81-채팅 보내기 기능
mclub4 Apr 28, 2024
dd868f9
fix: docker container화 오류
mclub4 Apr 28, 2024
3d2c0ee
feat: #81-채팅방 목록 업데이트 구현
mclub4 Apr 28, 2024
05b6d50
fix: connect 오류 수정
mclub4 Apr 28, 2024
3b31886
fix : docker 파일 수정
mclub4 Apr 28, 2024
3dcebd6
fix: dockerignore
mclub4 Apr 28, 2024
4e60bca
refactor: API 공통 응답으로 수정
mclub4 Apr 28, 2024
fc6b9a4
feat: #81-ruby forwarding을 위한 nginx 설정 변경
mclub4 Apr 28, 2024
ac47ef8
feat: #105-공지사항 검색 기능
mclub4 Apr 28, 2024
70220d0
feat: #105-소융대 공지사항 크롤링
mclub4 Apr 28, 2024
c3f461d
Merge pull request #104 from kookmin-sw/feature/be/#81-chatting
BlueBerrySoda Apr 28, 2024
9f92dc3
refactor-#80-메뉴 JSON 반환 형식 수정
BlueBerrySoda Apr 28, 2024
4a4dc54
feat: #47-AWS S3 환경설정
BlueBerrySoda Apr 28, 2024
9001c96
feat: (#47, #10)-AWS S3 예외처리 코드 작성
BlueBerrySoda Apr 28, 2024
1b7a7db
feat: #84-댓글 생성 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
2cfca19
feat: #84-댓글 목록 반환 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
4ea5eeb
feat: #84-댓글 수정 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
1d1b968
feat: #84-댓글 삭제 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
400b78f
feat: #84-댓글 추천 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
95dcc28
feat: #84-댓글 추천 취소 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
df3f11e
feat: (#84, #47)-질문글 작성 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
7cc8929
feat: (#84, #47)-질문글 읽기 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
968df89
feat: (#84, #47)-질문글 수정 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
b980bc8
feat: (#84, #47)-질문글 삭제 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
97440e7
feat: #84-질문글 목록 반환 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
f4a3e73
feat: (#84, #47)-FAQ글 생성 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
30e44ae
feat: (#84, #47)-FAQ글 읽기 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
ca99b6e
feat: (#84, #47)-FAQ글 수정 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
5794742
feat: (#84, #47)-FAQ글 삭제 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
1c5705f
feat: (#84, #47)-FAQ글 목록 반환 기능 Controller Endpoint 작성
BlueBerrySoda Apr 28, 2024
e8a2811
feat: #84-댓글 목록 반환 DTO 작성
BlueBerrySoda Apr 28, 2024
d02bff6
feat: #84-댓글 목록 반환 DTO 작성
BlueBerrySoda Apr 28, 2024
8f5f388
feat: #84-댓글 작성 요청 DTO 작성
BlueBerrySoda Apr 28, 2024
cbf2c78
feat: #84-댓글 수정 요청 DTO 작성
BlueBerrySoda Apr 28, 2024
13d9e93
feat: #84-댓글 반환 DTO 작성
BlueBerrySoda Apr 28, 2024
a7a0ca6
feat: #87-FAQ글 목록 요청 DTO 작성
BlueBerrySoda Apr 28, 2024
c6de111
feat: #87-FAQ글 목록 반환 DTO 작성
BlueBerrySoda Apr 28, 2024
223b181
feat: #87-FAQ글 작성 요청 DTO 작성
BlueBerrySoda Apr 28, 2024
037dca7
feat: #87-FAQ글 수정 요청 DTO 작성
BlueBerrySoda Apr 28, 2024
ca2a2da
feat: #87-FAQ글 반환 DTO 작성
BlueBerrySoda Apr 28, 2024
647dbfd
feat: #84-질문글 목록 요청 DTO 작성
BlueBerrySoda Apr 28, 2024
6a5ce9b
feat: #84-질문글 목록 반환 DTO 작성
BlueBerrySoda Apr 28, 2024
6b4d542
feat: #84-질문글 작성 요청 DTO 작성
BlueBerrySoda Apr 28, 2024
3ae6a7c
feat: #84-질문글 수정 요청 DTO 작성
BlueBerrySoda Apr 28, 2024
bfa8b37
feat: #84-질문글 반환 DTO 작성
BlueBerrySoda Apr 28, 2024
7b3eda1
feat: #84-댓글 Entity 수정
BlueBerrySoda Apr 28, 2024
5b06ae0
feat: #84-댓글 Entity 메서드 구현
BlueBerrySoda Apr 28, 2024
e7aa66e
feat: #84-FAQ글 Entity 수정
BlueBerrySoda Apr 28, 2024
7fccb3d
feat: #84-FAQ글 Entity 메서드 구현
BlueBerrySoda Apr 28, 2024
c85a6e7
feat: #84-질문글 Entity 수정
BlueBerrySoda Apr 28, 2024
99802ed
feat: #84-질문글 Entity 메서드 구현
BlueBerrySoda Apr 28, 2024
9413009
feat: #84-댓글 생성 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
5a26ae1
feat: #84-댓글 목록 반환 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
ff3f0b6
feat: #84-댓글 수정 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
aa0c399
feat: #84-댓글 삭제 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
ef1258b
feat: #84-댓글 추천 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
b8f773c
feat: #84-댓글 추천 취소 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
971d5c7
feat: #87-FAQ글 생성 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
3815011
feat: #87-FAQ글 읽기 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
c5bc8c1
feat: #87-FAQ글 수정 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
8f539f1
feat: #87-FAQ글 삭제 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
e49e76e
feat: #87-FAQ글 목록 반환 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
1bd352b
feat: #84-질문글 생성 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
9bf5c09
feat: #84-질문글 읽기 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
fb6ee65
feat: #84-질문글 수정 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
3414ae3
feat: #84-질문글 삭제 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
1194eb6
feat: #84-질문글 목록 반환 기능 Service 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
b14651f
feat: #84-댓글 Repository 구현
BlueBerrySoda Apr 28, 2024
3fb241f
feat: #84-댓글 목록을 위한 Repository 구현
BlueBerrySoda Apr 28, 2024
67ab94a
feat: #84-querydsl을 이용한 페이지네이션 및 필터링 구현
BlueBerrySoda Apr 28, 2024
76e6111
feat: #84-질문글 Repository 구현
BlueBerrySoda Apr 28, 2024
d3f2ef5
feat: #84-질문글 목록 반환을 위한 Repository 구현
BlueBerrySoda Apr 28, 2024
97165d5
feat: #84-querydsl을 이용한 페이지네이션 및 필터링 구현
BlueBerrySoda Apr 28, 2024
e73adf6
feat: #87-FAQ글 Repository 구현
BlueBerrySoda Apr 28, 2024
29c2a5a
feat: #87-FAQ글 목록 반환을 위한 Repository 구현
BlueBerrySoda Apr 28, 2024
7999d92
feat: #87-querydsl을 이용한 페이지네이션 및 필터링 구현
BlueBerrySoda Apr 28, 2024
bacf1e5
feat: (#84, #87, #47)-S3 이미지 업로드를 위한 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
ef7c479
feat: (#84, #87, #47)-S3 이미지 업로드를 위한 비즈니스 로직 구현
BlueBerrySoda Apr 28, 2024
afdb08a
feat: #84-질문글 S3 이미지 URL Repository 구현
BlueBerrySoda Apr 28, 2024
f965ef0
feat: #84-질문글 ID를 사용하는 S3 이미지 URL Repository 구현
BlueBerrySoda Apr 28, 2024
d236740
feat: #84-질문글 ID를 사용하는 querydsl 로직 구현
BlueBerrySoda Apr 28, 2024
d746645
feat: #87-FAQ글 S3 이미지 URL Repository 구현
BlueBerrySoda Apr 28, 2024
da33664
feat: #84-FAQ글 ID를 사용하는 S3 이미지 URL Repository 구현
BlueBerrySoda Apr 28, 2024
543c823
feat: #87-FAQ글 ID를 사용하는 querydsl 로직 구현
BlueBerrySoda Apr 28, 2024
410c51a
chore: S3 Gradle Update
BlueBerrySoda Apr 28, 2024
ca0ccb6
chore: S3 환경변수 선언
BlueBerrySoda Apr 28, 2024
044e041
Merge pull request #106 from kookmin-sw/feature/be/#105-announcementD…
BlueBerrySoda Apr 28, 2024
5e02afd
chore: S3 환경변수 선언
BlueBerrySoda Apr 28, 2024
ea3777e
merge: Conflick resolve
BlueBerrySoda Apr 28, 2024
01da994
refactor: #95-API 공통응답 통일
BlueBerrySoda Apr 28, 2024
dc80e47
chore: fix error
BlueBerrySoda Apr 28, 2024
8d18066
Update README.md
mclub4 Apr 29, 2024
a3e3662
fix: 채팅 polling 버그 수정
mclub4 Apr 29, 2024
2398480
fix: 소융대 공지 두번 크롤링 되던 문제 해결
mclub4 Apr 29, 2024
a78ef98
fix: 채팅 응답 형식 수정
mclub4 Apr 29, 2024
120d155
fix: redis 연결 오류 수정
mclub4 Apr 29, 2024
11fe8e3
fix : api 응답에 message 추가
mclub4 Apr 29, 2024
a80b7ae
fix: docker file 베이스 변경
mclub4 Apr 29, 2024
6021bd0
Merge branch 'feature/be/#84-qna-faq' of github.com:kookmin-sw/capsto…
mclub4 Apr 29, 2024
59a6450
feat: #115-GitAction 스크립트 작성
mclub4 Apr 29, 2024
f8edee8
fix: 경로 수정
mclub4 Apr 29, 2024
f5655ef
fix: 파일 수정
mclub4 Apr 29, 2024
0471a93
fix: git action context 경로 수
mclub4 Apr 29, 2024
ee0cda2
fix: Script에 Secret 이름 오류 수정
mclub4 Apr 29, 2024
794bf40
fix: 오타 수정
mclub4 Apr 29, 2024
670a4c1
Merge pull request #107 from kookmin-sw/feature/be/#84-qna-faq
mclub4 Apr 30, 2024
c246308
Merge branch 'develop-back' of github.com:kookmin-sw/capstone-2024-30…
mclub4 Apr 30, 2024
f649c67
fix: conflict 해결
mclub4 Apr 30, 2024
14ea92d
Merge branch 'develop-back' of github.com:kookmin-sw/capstone-2024-30…
mclub4 Apr 30, 2024
8f8ce77
fix: 잘되는지 해보는거에용 ㅎㅎ
mclub4 Apr 30, 2024
34238b3
fix: 최신버전이 문제인가요
mclub4 Apr 30, 2024
28ab279
Update deploy.yml
mclub4 Apr 30, 2024
64fded8
Update deploy.yml
mclub4 Apr 30, 2024
1b2366b
Update deploy.yml
mclub4 Apr 30, 2024
30e4f90
Update deploy.yml
mclub4 Apr 30, 2024
c806bec
Merge pull request #112 from kookmin-sw/feature/be/#105-announcementD…
BlueBerrySoda Apr 30, 2024
207a3e8
fix: 발음평가 오류 완전히 해결(DockerFile 수정)
mclub4 May 1, 2024
c175f40
refactor: #118-Swagger 작성
BlueBerrySoda May 1, 2024
6d30f93
refactor: #118-Swagger 작성 및 컨트롤러 관련 오류 해결
BlueBerrySoda May 1, 2024
3153905
refactor: #118-발음평가 JSON 양식 수정
BlueBerrySoda May 1, 2024
e0d3f7d
refactor: #118-Swagger 오류 수정
BlueBerrySoda May 1, 2024
9ba12ef
refactor: #118-발음평가 JSON 문장 순서기준 단어 정렬
BlueBerrySoda May 1, 2024
8403907
Merge branch 'refactor/be/#118-fix-controller' of github.com:kookmin-…
mclub4 May 1, 2024
9f49638
Merge pull request #121 from kookmin-sw/refactor/be/#118-fix-controller
mclub4 May 1, 2024
b167c67
feat: #115-CICD 결과 자동으로 Slack 전송
mclub4 May 1, 2024
3e13409
Merge branch 'feautre/be/#115-CICD' of github.com:kookmin-sw/capstone…
mclub4 May 1, 2024
477cdfe
fix: test용 Script변경
mclub4 May 1, 2024
90cd9e9
fix: test용 Script변경
mclub4 May 1, 2024
5a9ed13
fix: test용 Script변경
mclub4 May 1, 2024
20fd27c
fix: test용 Script변경 (Slack 통합 테스트 버전)
mclub4 May 1, 2024
3ba31b7
fix: secret이름 오류 수정
mclub4 May 1, 2024
46ab479
fix: 순서 수정
mclub4 May 1, 2024
f7b8db4
fix: 전반적인 흐름 수정
mclub4 May 1, 2024
849acf0
fix: build의 병렬적 처리
mclub4 May 1, 2024
02ec495
fix: actions 대상 브렌치 변경
mclub4 May 1, 2024
434595f
fix: gradle build시 test에 환경변수가 전달 안되던 오류ㅠ 해결
mclub4 May 2, 2024
e0b8b8b
fix: gradle 파일 수정
mclub4 May 2, 2024
d83e776
fix: nginx 수정
mclub4 May 2, 2024
d35347e
fix: dockercompose.yml 수정
mclub4 May 2, 2024
e4a18a5
fix: nginx에 volume 추가
mclub4 May 2, 2024
80cbf07
fix: certbot 오타 수정
mclub4 May 2, 2024
a591bb1
fix: docker network 구성
mclub4 May 2, 2024
259408c
Merge pull request #122 from kookmin-sw/feautre/be/#115-CICD
BlueBerrySoda May 2, 2024
b42717e
헬퍼매칭 Controller 생성
BlueBerrySoda May 2, 2024
c571e32
Merge branch 'develop-back' of https://github.com/kookmin-sw/capstone…
BlueBerrySoda May 2, 2024
6c364d9
feat: #118-Swagger 기능을 위한 답변 DTO 구현
BlueBerrySoda May 2, 2024
efe24e3
refactor: #118-Swagger 기능을 위한 리팩토링
BlueBerrySoda May 2, 2024
e99df3f
refactor: #118-발음평가 NaN 오류 보정
BlueBerrySoda May 2, 2024
edc4609
feat: #119-헬퍼 매칭글 생성 Controller 작성
BlueBerrySoda May 2, 2024
9365ba8
feat: #119-헬퍼 매칭글 읽기 Controller 작성
BlueBerrySoda May 2, 2024
69b72c2
feat: #119-헬퍼 매칭글 수정 Controller 작성
BlueBerrySoda May 2, 2024
35def14
feat: #119-헬퍼 매칭글 삭제 Controller 작성
BlueBerrySoda May 2, 2024
56e825c
feat: #119-헬퍼 매칭글 리스트 생성 Controller 작성
BlueBerrySoda May 2, 2024
2d0d2c3
feat: #119-헬퍼 매칭글 모집완료 Controller 작성
BlueBerrySoda May 2, 2024
549749f
feat: #119-헬퍼 매칭글 반환 DTO 구현
BlueBerrySoda May 2, 2024
f33d9c0
feat: #119-헬퍼 매칭글 리스트 요청 DTO 구현
BlueBerrySoda May 2, 2024
57d2157
feat: #119-헬퍼 매칭글 리스트 DTO 구현
BlueBerrySoda May 2, 2024
120a3b1
feat: #119-헬퍼 매칭글 생성 요청 DTO 구현
BlueBerrySoda May 2, 2024
eaf68bb
feat: #119-헬퍼 매칭글 수정 요청 DTO 구현
BlueBerrySoda May 2, 2024
0b1445b
feat: #119-헬퍼 매칭글 Entity 구현
BlueBerrySoda May 2, 2024
00f9038
feat: #119-헬퍼 매칭글 생성 Service 구현
BlueBerrySoda May 2, 2024
f8b9bc2
feat: #119-헬퍼 매칭글 읽기 Service 구현
BlueBerrySoda May 2, 2024
8f85d71
feat: #119-헬퍼 매칭글 수정 Service 구현
BlueBerrySoda May 2, 2024
64a1130
feat: #119-헬퍼 매칭글 삭제 Service 구현
BlueBerrySoda May 2, 2024
4b25bfa
feat: #119-헬퍼 매칭글 리스트 생성 Service 구현
BlueBerrySoda May 2, 2024
5d099e9
feat: #119-헬퍼 매칭글 모집완료 Service 구현
BlueBerrySoda May 2, 2024
9a52527
feat: #119-헬퍼 매칭글 Repository 구현
BlueBerrySoda May 2, 2024
03e833f
feat: #119-헬퍼 매칭글 리스트 생성 Repository 구현
BlueBerrySoda May 2, 2024
1c83124
feat: #119-헬퍼 매칭글 리스트 필터 및 페이지네이션 Repository 구현
BlueBerrySoda May 2, 2024
08eb5bf
refactor: #118-Swagger 기능을 위한 리팩토링
BlueBerrySoda May 2, 2024
7ad7cec
refactor: #119-페이지네이션을 위한 Q클래스 구현
BlueBerrySoda May 2, 2024
f63125c
Merge pull request #125 from kookmin-sw/feature/be/#119-helper-matching
mclub4 May 3, 2024
04c901b
fix: Update Dockerfile
mclub4 May 3, 2024
c5090a3
Merge branch 'main' into develop-back
BlueBerrySoda May 3, 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
205 changes: 205 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
name: Deploy Server

on:
push:
branches:
- develop-back
- main
permissions:
contents: read

jobs:
setup-env:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Create env file
run: |
echo DB_ENDPOINT=${{ secrets.DB_ENDPOINT }} >> .env
echo DB_NAME=${{ secrets.DB_NAME }} >> .env
echo MYSQL_USERNAME=${{ secrets.MYSQL_USERNAME }} >> .env
echo MYSQL_PASSWORD=${{ secrets.MYSQL_PASSWORD }} >> .env
echo JWT_SECRET=${{ secrets.JWT_SECRET }} >> .env
echo JWT_ACCESS_EXPIRATION_TIME=${{ secrets.JWT_ACCESS_EXPIRATION_TIME }} >> .env
echo JWT_REFRESH_EXPIRATION_TIME=${{ secrets.JWT_REFRESH_EXPIRATION_TIME }} >> .env
echo HMAC_SECRET=${{ secrets.HMAC_SECRET }} >> .env
echo HMAC_ALGORITHM=${{ secrets.HMAC_ALGORITHM }} >> .env
echo DeepL_API_KEY=${{ secrets.DeepL_API_KEY }} >> .env
echo TEST_KEY=${{ secrets.TEST_KEY }} >> .env
echo Azure_API_KEY=${{ secrets.Azure_API_KEY }} >> .env
echo REDIS_HOST=${{ secrets.REDIS_HOST }} >> .env
echo REDIS_PORT=${{ secrets.REDIS_PORT }} >> .env
echo S3_ACCESS_KEY=${{ secrets.S3_ACCESS_KEY }} >> .env
echo S3_SECRET_KEY=${{ secrets.S3_SECRET_KEY }} >> .env
echo S3_SECRET_KEY=${{ secrets.SECRET_KEY_BASE }} >> .env
echo S3_SECRET_KEY=${{ secrets.SERVER_NAME }} >> .env

- name: Copy .env to EC2
uses: appleboy/scp-action@master
with:
host: ${{ secrets.AWS_HOST }}
username: ubuntu
key: ${{ secrets.AWS_KEY }}
source: "/github/workspace/.env"
target: "/home/ubuntu/capstone"

- name: Copy docker-compose.yaml to EC2
uses: appleboy/scp-action@master
with:
host: ${{ secrets.AWS_HOST }}
username: ubuntu
key: ${{ secrets.AWS_KEY }}
source: "/github/workspace/back/docker-compose.yml"
target: "/home/ubuntu/capstone"

- name: action-slack
uses: 8398a7/action-slack@v3
with:
status: ${{ job.status }}
author_name: PetBuddy Github
fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
if: always()

build-spring:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push Spring
uses: docker/build-push-action@v5
with:
context: ./back
push: true
tags: ${{ secrets.DOCKER_REPO }}/spring:latest
cache-from: type=gha
cache-to: type=gha,mode=max

- name: action-slack
uses: 8398a7/action-slack@v3
with:
status: ${{ job.status }}
author_name: PetBuddy Github
fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
if: always()

build-nginx:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push Nginx
uses: docker/build-push-action@v5
with:
context: ./back/nginx
push: true
tags: ${{ secrets.DOCKER_REPO }}/nginx:latest
cache-from: type=gha
cache-to: type=gha,mode=max

- name: action-slack
uses: 8398a7/action-slack@v3
with:
status: ${{ job.status }}
author_name: PetBuddy Github
fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
if: always()

build-ruby:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push Ruby on Rails
uses: docker/build-push-action@v5
with:
context: ./back-chat
push: true
tags: ${{ secrets.DOCKER_REPO }}/ruby:latest
cache-from: type=gha
cache-to: type=gha,mode=max

- name: action-slack
uses: 8398a7/action-slack@v3
with:
status: ${{ job.status }}
author_name: PetBuddy Github
fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
if: always()

deploy:
runs-on : ubuntu-latest
needs: [build-spring, build-nginx, build-ruby]

steps:
- name: executing remote ssh commands using password
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.AWS_HOST }}
username: ubuntu
key: ${{ secrets.AWS_KEY }}
script: |
if [ "$(sudo docker ps -qa)" ]; then
sudo docker rm -f $(sudo docker ps -qa)
fi

sudo docker pull ${{ secrets.DOCKER_REPO }}/spring:latest
sudo docker pull ${{ secrets.DOCKER_REPO }}/nginx:latest
sudo docker pull ${{ secrets.DOCKER_REPO }}/ruby:latest

sudo docker compose -f capstone/docker-compose.yml up -d
sudo docker image prune -f

- name: action-slack
uses: 8398a7/action-slack@v3
with:
status: ${{ job.status }}
author_name: PetBuddy Github
fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
if: always()

38 changes: 38 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
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/
.env
4 changes: 4 additions & 0 deletions back-chat/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.idea
.gitignore
.env
env.bashrc
8 changes: 8 additions & 0 deletions back-chat/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# See https://git-scm.com/docs/gitattributes for more about git attribute files.

# Mark the database schema as having been generated.
db/schema.rb linguist-generated


# Mark any vendored files as having been vendored.
vendor/* linguist-vendored
30 changes: 30 additions & 0 deletions back-chat/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

# Ignore uploaded files in development.
/storage/*
!/storage/.keep
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

.env
env.bashrc
8 changes: 8 additions & 0 deletions back-chat/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading