Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
449 commits
Select commit Hold shift + click to select a range
08e4561
:fire: feat: 일기 분석에 best, worst 음식 반환 위한 기존 best, worst api 삭제 (#50)
synoti21 Nov 6, 2023
251c370
:recycle: refactor: 점수 계산 로직 간소화 (#50)
synoti21 Nov 6, 2023
a8e3b3c
:white_check_mark: test: 테스트 기대값 변경 (#50)
synoti21 Nov 6, 2023
79822da
:sparkles: feat: 랭킹 조회 성공 Response Code 추가 (#50)
synoti21 Nov 6, 2023
369d9d2
:sparkles: feat: 잔여 기능 (식습관 점수, best & worst, 그래프, 랭킹) api 구현 (#50)
synoti21 Nov 6, 2023
6948b09
:sparkles: feat: ResponseFavoriteFoodDto에서 누락된 User Id 속성 추가 (#50)
synoti21 Nov 6, 2023
139b0ac
:white_check_mark: test: FoodControllerTest 구현 (#50)
synoti21 Nov 6, 2023
7916ed6
:ambulance: Fix: 카카오로그인 응답 Dto 미스매칭 상황 수정 (#51)
win-luck Nov 6, 2023
291ee2c
:ambulance: Fix: KakaoAuthService Dto getter 표현 수정 (#51)
win-luck Nov 6, 2023
33aa1f4
:sparkles: feat: 음식 이름 중복 여부 로직 구현 (#50)
synoti21 Nov 6, 2023
13c8eee
:fire: feat: ResponseFavoriteFoodDto에서 필요없는 UserId 속성 제거 (#50)
synoti21 Nov 6, 2023
7ee2503
:recycle: refactor: 반올림 간소화 (#50)
synoti21 Nov 6, 2023
d7fe019
Merge pull request #53 from CAUSOLDOUTMEN/feat/50-food-analysis-score
win-luck Nov 6, 2023
2e47d59
Merge pull request #52 from CAUSOLDOUTMEN/feature/51-fix-kakao
synoti21 Nov 6, 2023
a5574b5
:construction_worker: chore: Update deployment to 2e47d59e6d21ee71e0f…
invalid-email-address Nov 6, 2023
7aa791f
:construction_worker: chore: Swagger 페이지로 healthcheck 진행
synoti21 Nov 6, 2023
b721ea7
chore: Update Diareat-CICD.yml
synoti21 Nov 6, 2023
d650e0e
:construction_worker: chore: Update deployment to b721ea7959009ebbf7f…
invalid-email-address Nov 6, 2023
bed6e1a
:construction_worker: chore: revision 기록 제한
synoti21 Nov 6, 2023
7d5f567
:recycle: Refactor: 카카오로그인 ResponseJwtDto 도입 (#58)
win-luck Nov 7, 2023
bb76bed
:recycle: Refactor: Jwt토큰 유효성에 대한 Exception 추가 (#58)
win-luck Nov 7, 2023
e3c61a5
:recycle: Refactor: 프로필사진 Nullable 속성 부여 (#58)
win-luck Nov 7, 2023
ce57fba
:recycle: Chore: FoodControllerTest 일부 주석 처리 (#58)
win-luck Nov 7, 2023
4c2e82f
:recycle: Refactor: 유저 없을 시 Exception이 아닌 id null을 반환하도록 수정 (#58)
win-luck Nov 7, 2023
57a6243
:recycle: Refactor: 토큰 유효성 검사 실패 시 단순 false만 반환하도록 수정 (#58)
win-luck Nov 7, 2023
4dffff3
:ambulance: Fix: API 테스트 원활함을 위해 일시적으로 모든 API 접근 허용 (#58)
win-luck Nov 7, 2023
a820efa
Merge pull request #59 from CAUSOLDOUTMEN/feature/refactor-58-kakaodto
win-luck Nov 7, 2023
649a54c
:construction_worker: chore: Update deployment to a820efaca3f80243e70…
invalid-email-address Nov 7, 2023
c91a645
:bug: fix: 누락된 기준 영양섭취량 추가 (#60)
synoti21 Nov 8, 2023
38bd92f
:white_check_mark: test: 기준 영양섭취량 추가로 인한 테스트 코드 수정 및 검증 완료 (#60)
synoti21 Nov 8, 2023
d8c27fa
:construction_worker: chore: 지나치게 느린 속도로 인해 CPU 리소스 할당량 증가 (#60)
synoti21 Nov 8, 2023
737e304
Merge pull request #61 from CAUSOLDOUTMEN/fix/60-nutrition-info
win-luck Nov 8, 2023
37b3df6
:construction_worker: chore: Update deployment to 737e304bc1eb704f47a…
invalid-email-address Nov 8, 2023
0d2561f
:ambulance: hotfix: date를 string type으로 변경 (#62)
synoti21 Nov 10, 2023
a32f694
:white_check_mark: test: yy,mm,dd 파라미터에서 LocalDate으로 형변환 되도록 테스트 수정 (…
synoti21 Nov 10, 2023
422cf50
Merge pull request #63 from CAUSOLDOUTMEN/fix/62-cache-fix
synoti21 Nov 10, 2023
5594dc2
:construction_worker: chore: Update deployment to 422cf50017748997149…
invalid-email-address Nov 10, 2023
270b53e
:memo: docs: Create LICENSE
synoti21 Nov 10, 2023
40a50c7
:construction_worker: chore: Update deployment to 270b53e10ff276e6f8c…
invalid-email-address Nov 10, 2023
958b246
:ambulance: hotfix: cache 수정 (#64)
synoti21 Nov 10, 2023
9a3040a
Merge pull request #65 from CAUSOLDOUTMEN/hotfix/64-hotfix-redis-addi…
synoti21 Nov 10, 2023
8fe48ad
:construction_worker: chore: Update deployment to 9a3040a6681c50ec4fd…
invalid-email-address Nov 10, 2023
20103b6
:ambulance: Fix: 오늘의영양 응답데이터 LocalDate 주석처리 (#66)
win-luck Nov 10, 2023
aeb1e83
Merge pull request #67 from CAUSOLDOUTMEN/feature/66-fix-hotfix
win-luck Nov 10, 2023
fae066b
:construction_worker: chore: Update deployment to aeb1e83de6e310a9f6b…
invalid-email-address Nov 10, 2023
c352d8d
:ambulance: Fix: Redis 포트번호 미정 문제 수정 (#66)
win-luck Nov 10, 2023
12bd425
Merge pull request #68 from CAUSOLDOUTMEN/feature/66-fix-hotfix
win-luck Nov 10, 2023
81f9a89
:construction_worker: chore: Update deployment to 12bd425321f01edbaa3…
invalid-email-address Nov 10, 2023
9dd02f5
:bulb: chore: 운용 단계에서 create->none으로 변경 (#69)
synoti21 Nov 10, 2023
a5d54cb
:construction_worker: chore: Update deployment to 9dd02f5e55ea71e6e20…
invalid-email-address Nov 10, 2023
7e16431
:ambulance: Fix: ResponseFoodDto Date/Time 타입 주석처리 (#66)
win-luck Nov 10, 2023
92b7a18
Merge pull request #71 from CAUSOLDOUTMEN/feature/66-fix-hotfix
synoti21 Nov 10, 2023
8822726
:construction_worker: chore: Update deployment to 92b7a1859203da8cb56…
invalid-email-address Nov 10, 2023
49903ce
:recycle: refactor: LocalDate 객체 대신 year, month, day로 LocalDate 객체 구현…
synoti21 Nov 11, 2023
b30f686
:recycle: refactor: Redis 캐시를 위한 getDate() 선언 (#72)
synoti21 Nov 11, 2023
e649bd2
:recycle: refactor: Food.createFood() 인자 변경으로 인한 favoriteFood 메소드 수정 …
synoti21 Nov 11, 2023
a15bb2a
:recycle: refactor: createFood() 인자 수정으로 인한 메소드 변경 (#72)
synoti21 Nov 11, 2023
182df52
:recycle: refactor: 인자 수정으로 인한 테스트 코드 수정 (#72)
synoti21 Nov 11, 2023
078f9b9
:sparkles: feat: 생성 날짜별 정렬 추가 (#72)
synoti21 Nov 11, 2023
6fc4776
:sparkles: feat: 생성 날짜별 내림차순 정렬 (#72)
synoti21 Nov 11, 2023
de863e1
:recycle: refactor: 정렬 추가에 따른 테스트 코드 수정 (#72)
synoti21 Nov 11, 2023
bb2f9ec
Merge pull request #73 from CAUSOLDOUTMEN/fix/72-hotfix-createfooddto
win-luck Nov 12, 2023
0c60013
:construction_worker: chore: Update deployment to bb2f9ec6aec08db291f…
invalid-email-address Nov 12, 2023
7a3f003
:bug: fix: 테이블의 칼럼 명과 직접 매핑 (#74)
synoti21 Nov 12, 2023
25d7bdd
:bug: fix: test의 Sort 수정 (#74)
synoti21 Nov 12, 2023
3159469
Merge pull request #75 from CAUSOLDOUTMEN/fix/74-addedtime
win-luck Nov 12, 2023
e8297a1
:construction_worker: chore: Update deployment to 3159469eaebe227e4a4…
invalid-email-address Nov 12, 2023
45cc8c7
:green_heart: fix: Update manifest.yaml
synoti21 Nov 12, 2023
da6f4b8
:green_heart: fix: Update manifest.yaml
synoti21 Nov 12, 2023
a05b19f
:ambulance: hotfix: sort by 인자 수정 (#76)
synoti21 Nov 12, 2023
743e9ff
Merge pull request #77 from CAUSOLDOUTMEN/hotfix/76-hotfix-sort
synoti21 Nov 12, 2023
3552758
:construction_worker: chore: Update deployment to 743e9ff780f964571c8…
invalid-email-address Nov 12, 2023
85b3db4
:ambulance: hotfix: key값의 date string으로 변환 (#78)
synoti21 Nov 12, 2023
4f9b7ef
Merge pull request #79 from CAUSOLDOUTMEN/hotfix/78-redis-cache
synoti21 Nov 12, 2023
ec17ee1
:construction_worker: chore: Update deployment to 4f9b7ef9368781248e0…
invalid-email-address Nov 12, 2023
4cf0324
:ambulance: hotfix: noargsconstructor 추가 (#80)
synoti21 Nov 12, 2023
2f8d067
Merge pull request #81 from CAUSOLDOUTMEN/hotfix/80-responsefooddto
synoti21 Nov 12, 2023
54083be
:construction_worker: chore: Update deployment to 2f8d06783872f88ce5c…
invalid-email-address Nov 12, 2023
70bf6a7
:ambulance: hotfix: responsefooddto의 필드명 변경 (#82)
synoti21 Nov 12, 2023
9b60352
Merge pull request #83 from CAUSOLDOUTMEN/fix/82-fix-responsefooddto
synoti21 Nov 12, 2023
889369d
:construction_worker: chore: Update deployment to 9b60352cf57b2fd7f8d…
invalid-email-address Nov 12, 2023
7a0b366
:ambulance: Fix: UserDto 캐싱 Key getter 누락 수정 (#84)
win-luck Nov 12, 2023
532344d
:ambulance: Fix: ResponseSimpleUserDto 더미 영양점수 삭제 (#84)
win-luck Nov 12, 2023
d95a931
:ambulance: Fix: FoodController 음식 수정/삭제 메서드 연월일 매개변수 추가 (#84)
win-luck Nov 12, 2023
e554b1c
:ambulance: Fix: 캐싱 동기화 적용 및 TimeStamp 필드명 MessageUtil에서 통합 관리 (#84)
win-luck Nov 12, 2023
9cc4ddb
:ambulance: Fix: 코드 변동에 따른 테스트코드 수정 및 불필요한 import 정리 (#84)
win-luck Nov 12, 2023
854766c
:ambulance: Chore: user 패키지 ResponseDto에 기본생성자 추가 및 불필요한 import 정리 (#84)
win-luck Nov 12, 2023
ad81bcb
Merge pull request #85 from CAUSOLDOUTMEN/feature/fix-84-cache
synoti21 Nov 13, 2023
19bbb3e
:construction_worker: chore: Update deployment to ad81bcb9a0f135bae7c…
invalid-email-address Nov 13, 2023
bb886f2
:sparkles: feat: 음식 생성될 때 연결 생성 (#86)
synoti21 Nov 13, 2023
8ae45ad
:white_check_mark: test: 변경된 메소드에 맞춰 테스트 수정 (#86)
synoti21 Nov 13, 2023
0b13c41
Merge pull request #87 from CAUSOLDOUTMEN/fix/86-create-favoritefood
synoti21 Nov 13, 2023
737ee7e
:construction_worker: chore: Update deployment to 0b13c413b198b7175cd…
invalid-email-address Nov 13, 2023
8719b09
:bug: fix: food와 favoritefood간 연동 (#88)
synoti21 Nov 13, 2023
7a347ad
Merge pull request #89 from CAUSOLDOUTMEN/fix/88-fix-food-favoritefood
synoti21 Nov 13, 2023
5d6066d
:construction_worker: chore: Update deployment to 7a347adc0416639f363…
invalid-email-address Nov 13, 2023
6930736
:poop: chore: cache 없애보기 (#90)
synoti21 Nov 13, 2023
64b4868
Merge pull request #91 from CAUSOLDOUTMEN/90-test-캐시-테스트
synoti21 Nov 13, 2023
0bbbf0a
:construction_worker: chore: Update deployment to 64b4868ce76f9e1f9f2…
invalid-email-address Nov 13, 2023
1c1d4e8
:ambulance: Fix: 캐싱 value 일부 수정 (#92)
win-luck Nov 13, 2023
a1f2a12
:ambulance: Fix: createFoodDto getDate 누락된 오류 수정 (#92)
win-luck Nov 13, 2023
d0534e6
Merge pull request #93 from CAUSOLDOUTMEN/feature/92-fix-redis
synoti21 Nov 13, 2023
31243ad
:construction_worker: chore: Update deployment to d0534e672666a28b7b1…
invalid-email-address Nov 13, 2023
fbe2a78
:ambulance: Fix: 오늘의영양 key 공백 끼어있는 상황 수정 (#94)
win-luck Nov 14, 2023
ac6989b
Merge pull request #95 from CAUSOLDOUTMEN/feature/94-fix-redis
win-luck Nov 14, 2023
f91ad5e
:construction_worker: chore: Update deployment to ac6989b0db5363009e0…
invalid-email-address Nov 14, 2023
30d3ed4
:sparkles: feat: 즐찾 음식으로 음식 생성 구현 (#96)
synoti21 Nov 14, 2023
7b33ec4
:sparkles: feat: 즐찾 음식으로부터 음식 생성 위한 dto 추가 (#96)
synoti21 Nov 14, 2023
e08d169
:sparkles: feat: 즐찾 음식으로부터 음식 생성 메소드 구현 (#96)
synoti21 Nov 14, 2023
6f11159
:white_check_mark: test: 음식 생성 메소드 구현 테스트 코드 작성 (#96)
synoti21 Nov 14, 2023
f655b43
:sparkles: feat: favoriteFood와 Food 연관관계 설정 (#96)
synoti21 Nov 15, 2023
d227a3c
Merge pull request #97 from CAUSOLDOUTMEN/feat/96-feat-favorite-food
win-luck Nov 15, 2023
0f021d8
:construction_worker: chore: Update deployment to d227a3cdaead41141fd…
invalid-email-address Nov 15, 2023
562720b
:ambulance: Fix: user 패키지 ResponseDto에 기본생성자 추가 (#98)
win-luck Nov 16, 2023
dd11c9b
Merge pull request #99 from CAUSOLDOUTMEN/feature/98-fix-user
win-luck Nov 16, 2023
c15b5e8
:ambulance: Fix: user 패키지 ResponseDto에 Serialize 어노테이션 추가 (#98)
win-luck Nov 16, 2023
fb29d76
Merge pull request #100 from CAUSOLDOUTMEN/feature/98-fix-user
win-luck Nov 16, 2023
231c431
:ambulance: Fix: Service 계층 캐싱 중단 (#98)
win-luck Nov 16, 2023
d00676e
Merge pull request #101 from CAUSOLDOUTMEN/feature/98-fix-user
win-luck Nov 16, 2023
2997000
:bug: fix: 현재 시간 의존성 삭제 (#102)
synoti21 Nov 16, 2023
999c70b
:recycle: refactor: api 파라미터 부분 yy, mm, dd 추가 (#102)
synoti21 Nov 16, 2023
da35321
:recycle: refactor: LocalDate.now() 삭제에 따른 인자 변경 (#102)
synoti21 Nov 16, 2023
4692468
:recycle: refactor: JPA에서 addedTime 기준으로 정렬 (#102)
synoti21 Nov 16, 2023
d269a24
:white_check_mark: test: 현재 시간 의존성 제거한 테스트 코드 작성 (#102)
synoti21 Nov 16, 2023
6d6e59d
:white_check_mark: test: parameter 변경에 따른 테스트 코드 수정 (#102)
synoti21 Nov 16, 2023
361426e
Merge pull request #103 from CAUSOLDOUTMEN/fix/102-client-localdate
win-luck Nov 16, 2023
4f2b729
:construction_worker: chore: Update deployment to 361426e78736b96f73e…
invalid-email-address Nov 16, 2023
94b4f66
:ambulance: Fix: 유저 검색 API GET -> POST로 수정 (#104)
win-luck Nov 17, 2023
3556c37
:ambulance: Fix: 관련 테스트코드 수정 (#104)
win-luck Nov 17, 2023
5d4bc1f
Merge pull request #105 from CAUSOLDOUTMEN/feature/104-fix-search
win-luck Nov 17, 2023
de42feb
:construction_worker: chore: Update deployment to 5d4bc1fbcef6067a069…
invalid-email-address Nov 17, 2023
470d8f3
:ambulance: Fix: 서비스 주요 시점 로그 추가 및 팔로우 관련 버그 수정 (#106)
win-luck Nov 17, 2023
02dc95e
:ambulance: Fix: 테스트코드 반영 (#106)
win-luck Nov 17, 2023
08b0c5d
Merge pull request #107 from CAUSOLDOUTMEN/feature/106-fix-follow
win-luck Nov 17, 2023
2d4f5ee
:construction_worker: chore: Update deployment to 08b0c5d465efaa640cc…
invalid-email-address Nov 17, 2023
5dd247e
:ambulance: hotfix: userid반환이 아닌 favorite food id로 제대로 반환하도록 수정 (#108)
synoti21 Nov 17, 2023
ccd0e49
Merge pull request #109 from CAUSOLDOUTMEN/hotfix/108-favoritefood-list
synoti21 Nov 17, 2023
480093c
:construction_worker: chore: Update deployment to ccd0e4986092a4844fd…
invalid-email-address Nov 17, 2023
f734f34
:bug: fix: timezone 설정 (#110)
synoti21 Nov 18, 2023
16026d3
Merge pull request #111 from CAUSOLDOUTMEN/fix/110-timezone
synoti21 Nov 18, 2023
f922ae6
:construction_worker: chore: Update deployment to 16026d3105a57527649…
invalid-email-address Nov 18, 2023
5a9cfcd
:bug: fix: JPA에게 날짜 정렬 위임 (#112)
synoti21 Nov 19, 2023
304587e
Merge pull request #113 from CAUSOLDOUTMEN/fix/112-month-graph
synoti21 Nov 19, 2023
2245509
:construction_worker: chore: Update deployment to 304587e9863fdfa1ee7…
invalid-email-address Nov 19, 2023
0401c60
:ambulance: Fix: 같은 음식 중복 즐겨찾기 예외처리 방식 수정 (#114)
win-luck Nov 21, 2023
b6d15a8
:ambulance: Fix: 음식과 즐겨찾는 음식 간 연관관계 개편 (#114)
win-luck Nov 21, 2023
505f122
:ambulance: Fix: user 패키지 RequestDto 범위 유효성검사 decimal에서 range로 수정 (#114)
win-luck Nov 21, 2023
b856dc5
:ambulance: Fix: Food 객체 Cascade 속성 누락 수정 (#114)
win-luck Nov 21, 2023
517110c
:ambulance: Fix: Food 즐겨찾기 등록 누락된 로직 수정 (#114)
win-luck Nov 21, 2023
0065cf5
:ambulance: Fix: 로직 확인용 FoodService에 Log 추가 (#114)
win-luck Nov 21, 2023
5482d25
Merge pull request #115 from CAUSOLDOUTMEN/feature/114-fix-favorite
win-luck Nov 21, 2023
1c63d40
:construction_worker: chore: Update deployment to 5482d25fb34653675ae…
invalid-email-address Nov 21, 2023
94a65a8
:construction_worker: chore: sonarqube workflow 도입 (#116)
synoti21 Nov 21, 2023
1029f4c
Merge pull request #117 from CAUSOLDOUTMEN/chore/116-sonarqube
synoti21 Nov 21, 2023
92b559b
:green_heart: chore: 오류로 인한 sonarqube 취소 (#116)
synoti21 Nov 21, 2023
912a77b
Merge pull request #118 from CAUSOLDOUTMEN/chore/116-sonarqube
synoti21 Nov 21, 2023
92dd0a8
:construction_worker: chore: Update deployment to 912a77b5fd39e14383f…
invalid-email-address Nov 21, 2023
385a696
:ambulance: Fix: 즐찾 해제 시 자식 음식객체 연쇄삭제 명시적으로 추가 (#114)
win-luck Nov 21, 2023
005c18e
:ambulance: Fix: 테스트코드 수정 (#114)
win-luck Nov 22, 2023
258b335
Merge pull request #119 from CAUSOLDOUTMEN/feature/114-fix-favorite
synoti21 Nov 22, 2023
a8418f8
:construction_worker: chore: Update deployment to 258b3356b60cc650b42…
invalid-email-address Nov 22, 2023
4e3c84e
:sparkles: feat: 일별 음식에서 해당 날짜 없으면 0 반환 및 한 주 단위로 묶어 데이터 반환 (#120)
synoti21 Nov 26, 2023
82ff9b0
:sparkles: 날짜까지 포함해서 영양소 주도록 설정 (#120)
synoti21 Nov 26, 2023
d3922c1
:white_check_mark: test: 로직 수정에 따른 테스트 코드 수정 및 통과 (#120)
synoti21 Nov 26, 2023
f1348c2
Merge pull request #121 from CAUSOLDOUTMEN/feat/120-date-food
win-luck Nov 26, 2023
c228262
:construction_worker: chore: Update deployment to f1348c2ff861b8c4e96…
invalid-email-address Nov 26, 2023
f0e3e86
:ambulance: Fix: jwt 관련 일부 수정 (#122)
win-luck Nov 28, 2023
85703c5
:ambulance: Fix: 기준섭취량 자동계산 여부 boolean에서 int로 수정 (#122)
win-luck Nov 28, 2023
ea677fb
:ambulance: Fix: 테스트코드 반영 (#122)
win-luck Nov 28, 2023
964c44b
Merge pull request #123 from CAUSOLDOUTMEN/feature/122-fix
win-luck Nov 28, 2023
543963f
:construction_worker: chore: Update deployment to 964c44b7503e182ead7…
invalid-email-address Nov 28, 2023
4617685
:ambulance: Fix: ResponseFoodDto에 생성시간 누락 반영 (#122)
win-luck Nov 28, 2023
984b343
Merge pull request #124 from CAUSOLDOUTMEN/feature/122-fix
synoti21 Nov 28, 2023
94a390c
:construction_worker: chore: Update deployment to 984b343272550a0ecf9…
invalid-email-address Nov 28, 2023
0ade9d9
:recycle: refactor: LocalTime 객체를 int 형으로 분해 (#125)
synoti21 Nov 28, 2023
2cd8eac
:bug: fix: 현재 날짜 포함해서 음식 정보 주도록 수정 (#125)
synoti21 Nov 28, 2023
2a9ae51
:white_check_mark: test: DTO 및 로직 수정에 따른 테스트 코드 수정 (#125)
synoti21 Nov 28, 2023
f13f6f1
:ambulance: Fix: 기준섭취량 자동계산 옵션 발동되지 않던 버그 수정 (#122)
win-luck Nov 28, 2023
cb5c758
Merge pull request #126 from CAUSOLDOUTMEN/fix/125-analysis-localtime
win-luck Nov 28, 2023
f3bf91c
:construction_worker: chore: Update deployment to cb5c758815c3b81ca43…
invalid-email-address Nov 28, 2023
20bc227
Merge pull request #127 from CAUSOLDOUTMEN/feature/122-fix
synoti21 Nov 28, 2023
459b9e5
:construction_worker: chore: Update deployment to 20bc227284745f59bb0…
invalid-email-address Nov 28, 2023
2bc36a1
:bug: fix: 현재 날짜까지 포함하도록 수정 (#125)
synoti21 Nov 28, 2023
d28a4b5
:white_check_mark: test: Stubbing 문제 해결 (#125)
synoti21 Nov 28, 2023
726434f
Merge pull request #128 from CAUSOLDOUTMEN/fix/125-analysis-localtime
win-luck Nov 28, 2023
c863a64
:construction_worker: chore: Update deployment to 726434fd50108244232…
invalid-email-address Nov 28, 2023
71ecda5
:sparkles: feat: 응답 Dto 에 배열이 비어있는 지 판별하는 속성 추가 (#129)
synoti21 Dec 2, 2023
08c6526
:bug: fix: 빈 배열일 경우 이를 알리도록 수정 (#129)
synoti21 Dec 2, 2023
6ceceb6
:white_check_mark: test: 로직 수정에 따른 테스트 코드 수정 (#129)
synoti21 Dec 2, 2023
3889aef
Merge pull request #130 from CAUSOLDOUTMEN/fix/129-food-is-empty
win-luck Dec 2, 2023
657081a
:construction_worker: chore: Update deployment to 3889aef0bb258ada901…
invalid-email-address Dec 2, 2023
539f8d8
:ambulance: Fix: JWT 토큰 인증 활성화 및 유효시간 12시간으로 확대 (#131)
win-luck Dec 4, 2023
1c5376b
Merge pull request #132 from CAUSOLDOUTMEN/feature/131-jwt
synoti21 Dec 4, 2023
1b57560
:construction_worker: chore: Update deployment to 1c5376b2b9d09d97908…
invalid-email-address Dec 4, 2023
7372ee4
:ambulance: Fix: 음식명 중복에 대한 예외처리 제거 (#133)
win-luck Dec 4, 2023
da7210e
Merge pull request #134 from CAUSOLDOUTMEN/feature/133-fix
synoti21 Dec 4, 2023
bb80687
:construction_worker: chore: Update deployment to da7210ef49b3a4562fa…
invalid-email-address Dec 4, 2023
768f7c1
Create README.md
synoti21 Dec 12, 2023
a2b472c
:construction_worker: chore: Update deployment to 768f7c1d45bda91b9b2…
invalid-email-address Dec 12, 2023
da7aacf
:art: Refactor: Jwt->PK 메서드 수정 및 UserController에 적용 (#137)
win-luck Jan 4, 2024
95352b1
:recycle: User 패키지 ResponseDto 빌더패턴 적용 (#137)
win-luck Jan 4, 2024
429cbf2
:art: Refactor: UserService 반환 Dto 빌더패턴 적용 (#137)
win-luck Jan 4, 2024
ef70bf7
:art: Refactor: 랭킹 관련 반환 Dto 생성메서드 임시 추가 (#137)
win-luck Jan 4, 2024
0853d84
:green_heart: chore: Update manifest.yaml
synoti21 Jan 4, 2024
d989f07
:art: Refactor: 테스트코드 jwt 인증 면제하도록 TestConfig 추가 (#137)
win-luck Jan 5, 2024
57b0832
:art: Refactor: UserControllerTest jwt 관련 리팩토링 (#137)
win-luck Jan 5, 2024
4f1c4fc
Merge pull request #139 from CAUSOLDOUTMEN/feature/refactor-137
synoti21 Jan 5, 2024
ac2d1ba
:construction_worker: chore: Update deployment to 4f1c4fc06bdbb7fe522…
invalid-email-address Jan 5, 2024
94a194d
:sparkles: feat: AuditingEntityListener을 통해 음식 생성 시간 자동 생성 (#140)
synoti21 Jan 6, 2024
254eec2
:recycle: refactor: Builder 패턴 적용 (#140)
synoti21 Jan 6, 2024
7855335
:recycle: refactor: responseSimpleFoodDto 삭제 및 기존 Dto로 통합 (#140)
synoti21 Jan 7, 2024
b2eb938
:bug: fix: Builder 패턴 중 누락된 요소 추가 (#140)
synoti21 Jan 7, 2024
bd55253
:bug: fix: WebMvcTest로 인해 JpaAuditingConfig 분리 (#140)
synoti21 Jan 7, 2024
ceaf9a1
:white_check_mark: fix: ResponseSimpleFoodDto 삭제로 인해 테스트 코드 변경 (#140)
synoti21 Jan 7, 2024
bf4b936
:white_check_mark: fix: 접근 못하는 private Field는 set() 대신 Reflect를 이용하여 …
synoti21 Jan 7, 2024
3050d5a
Merge pull request #141 from CAUSOLDOUTMEN/refactor/140-food-domain-r…
win-luck Jan 8, 2024
9dbd5e4
:construction_worker: chore: Update deployment to 3050d5a7c8f0bd28c5d…
invalid-email-address Jan 8, 2024
3d36d63
:art: Refactor: 즐찾음식 해제 시 파생된 음식들의 즐찾상태 쿼리로 해제하도록 개편 (#142)
win-luck Jan 16, 2024
b033659
:sparkles: Feat: User 객체에 가입일자 createdTime 속성 추가 (#142)
win-luck Jan 16, 2024
39e4697
:art: Refactor: BaseNutrition 불필요 메서드 제거 (#142)
win-luck Jan 16, 2024
4373f75
:art: Refactor: 유저 검색 기능 JPA N+1 문제 해결 (#142)
win-luck Jan 16, 2024
0a43a0d
:white_check_mark: Refactor: 즐찾음식 관계 단절 관련 일부 테스트코드 수정 (#142)
win-luck Jan 16, 2024
94530d3
Merge pull request #143 from CAUSOLDOUTMEN/feature/142-refactor
synoti21 Jan 16, 2024
ae777f4
:construction_worker: chore: Update deployment to 94530d3b8ca2bc6d046…
invalid-email-address Jan 16, 2024
a5e1381
:art: Refactor: FoodController userId jwtToken으로부터 간접적으로 추출 (#145)
win-luck Jan 22, 2024
b38aaf6
:white_check_mark: Refactor: FoodControllerTest 개편사항 반영 및 UserControl…
win-luck Jan 22, 2024
e22c47f
:wrench: Chore: SwaggerConfig jwt 보안사항 추가 (#145)
win-luck Jan 22, 2024
40a11b5
Merge pull request #146 from CAUSOLDOUTMEN/feature/145-refactor
synoti21 Jan 23, 2024
d4dd22b
:construction_worker: chore: Update deployment to 40a11b5203fc6758602…
invalid-email-address Jan 23, 2024
e01db15
:bug: fix: ddl 업데이트 (#147)
synoti21 Jan 24, 2024
a1bd5bd
Merge pull request #148 from CAUSOLDOUTMEN/Fix/147-ddl
synoti21 Jan 24, 2024
f4508ea
:construction_worker: chore: Update deployment to a1bd5bdccf7db95fc18…
invalid-email-address Jan 24, 2024
d27afbb
:sparkles: feat: AccessToken & RefreshToken 이분화 (#144)
synoti21 Jan 24, 2024
35e95b8
:sparkles: feat: refreshToken 재발급 로직 구현 (#144)
synoti21 Jan 24, 2024
ba06d10
Merge pull request #149 from CAUSOLDOUTMEN/feat/144-jwt-access-refres…
win-luck Jan 24, 2024
da1e49f
:ambulance: hotfix: 메소드 이름 변경에 의해 테스트 코드 수정 (#150)
synoti21 Jan 24, 2024
74743a8
Merge pull request #151 from CAUSOLDOUTMEN/fix/150-jwt-test-fix
win-luck Jan 24, 2024
5a887a6
:construction_worker: chore: Update deployment to 74743a8533623ac9f66…
invalid-email-address Jan 24, 2024
ad22c1c
:sparkles: Fix: ResponseJwtDto에 userId 추가 (#152)
win-luck Jan 25, 2024
1973341
Merge pull request #153 from CAUSOLDOUTMEN/feature/152-fix
win-luck Jan 25, 2024
b9494c4
:construction_worker: chore: Update deployment to 197334145e17a09a53f…
invalid-email-address Jan 25, 2024
8811977
:sparkles: Fix: Jwt 일부 코드 복구 및 RefreshToken 만료 관련 예외처리 반영 (#152)
win-luck Jan 25, 2024
1b57aee
Merge pull request #154 from CAUSOLDOUTMEN/feature/152-fix
win-luck Jan 25, 2024
5105118
:construction_worker: chore: Update deployment to 1b57aeeb0d7da1670e7…
invalid-email-address Jan 25, 2024
a2fa690
:sparkles: Fix: UserRepository entityGraph 관련 오류 수정 (#152)
win-luck Jan 25, 2024
03de22c
Merge pull request #155 from CAUSOLDOUTMEN/feature/152-fix
win-luck Jan 25, 2024
d39f966
:construction_worker: chore: Update deployment to 03de22cd160c39bd41c…
invalid-email-address Jan 25, 2024
eaa2aea
:sparkles: Fix: user객체 roles 지연로딩 삭제(#152)
win-luck Jan 25, 2024
19305c8
Merge pull request #156 from CAUSOLDOUTMEN/feature/152-fix
win-luck Jan 25, 2024
8d38984
:construction_worker: chore: Update deployment to 19305c8372817992f1a…
invalid-email-address Jan 25, 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
90 changes: 90 additions & 0 deletions .github/workflows/Diareat-CICD.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
name: Diareat CI/CD

on:
push:
branches: [ "master" ]
paths-ignore:
- 'k8s/**'

permissions:
contents: read

jobs:
CI:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'

- name: Build with Gradle
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
env:
DB_ENDPOINT: ${{ secrets.DB_ENDPOINT }}
DB_USERNAME: ${{ secrets.DB_USERNAME }}
DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
with:
arguments: build

- name: Docker login
uses: docker/[email protected]
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
logout: true

- name: Get version
id: image
run: |
VERSION=$(echo ${{ github.sha }} | cut -c1-8)
echo VERSION=$VERSION
echo "::set-output name=version::$VERSION"

- name: Build and push to DockerHub
run: |
docker build -t synoti21/${{ secrets.PROJECT_NAME }}:${{ steps.image.outputs.version }} .
docker push synoti21/${{ secrets.PROJECT_NAME }}:${{ steps.image.outputs.version }}


CD:
runs-on: ubuntu-latest
needs: CI
steps:
- name: Get version
id: image
run: |
VERSION=$(echo ${{ github.sha }} | cut -c1-8)
echo VERSION=$VERSION
echo "::set-output name=version::$VERSION"

- name: Setup Kustomize
uses: imranismail/[email protected]


- name: Checkout kustomize repository
uses: actions/checkout@v3
with:
repository: CAUSOLDOUTMEN/Diareat_backend
ref: master
token: ${{ secrets.ACCESS_TOKEN }}
path: Diareat_backend


- name: Update Kubernetes resources
run: |
cd Diareat_backend/k8s/
kustomize edit set image synoti21/${{ secrets.PROJECT_NAME }}=synoti21/${{ secrets.PROJECT_NAME }}:${{ steps.image.outputs.version }}
kustomize build .

- name: Commit and push the updated manifest
run: |
cd Diareat_backend
git config --global user.name 'github-actions'
git config --global user.email '[email protected]'
git commit -am ":construction_worker: chore: Update deployment to ${{ github.sha }}"
git push
33 changes: 33 additions & 0 deletions .github/workflows/diareat-Build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Diareat Build Test

on:
pull_request:
branches: [ "master" ]

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest

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

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'

- name: Build with Gradle
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
env:
DB_ENDPOINT: ${{ secrets.DB_ENDPOINT }}
DB_USERNAME: ${{ secrets.DB_USERNAME }}
DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
with:
arguments: build

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ out/
/.nb-gradle/

### VS Code ###
.vscode/
.vscode/
12 changes: 12 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM gradle:8.2.1-jdk11 AS build

COPY --chown=gradle:gradle . /home/gradle/src
WORKDIR /home/gradle/src
RUN gradle build --no-daemon -x test

FROM openjdk:11-jre-slim

EXPOSE 8080
COPY --from=build /home/gradle/src/build/libs/*.jar /app/app.jar

ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app/app.jar"]
201 changes: 201 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2023 CAUSOLDOUTMEN

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Loading