Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
454 commits
Select commit Hold shift + click to select a range
165c16d
[Fix] application-dev.yml에 카카오 소셜 로그인 설정값 추가
hcg0127 Jul 14, 2025
201f75e
[CI/CD] application-secret삭제 후 테스트(#41)
chanudevelop Jul 14, 2025
e59c0ce
Merge pull request #49 from PerFumeOnMe/ci-cd/#41-CI-CD-pipline
chanudevelop Jul 14, 2025
6da6fe4
[CI/CD] dev_deploy.yml에 프로필설정 추가(#41)
chanudevelop Jul 14, 2025
d466d9d
Merge pull request #50 from PerFumeOnMe/ci-cd/#41-CI-CD-pipline
chanudevelop Jul 14, 2025
0af03ff
[CI/CD] application-dev.yml 탭 수정(#41)
chanudevelop Jul 14, 2025
170d340
Merge pull request #51 from PerFumeOnMe/ci-cd/#41-CI-CD-pipline
chanudevelop Jul 14, 2025
ce16e4f
[Fix] pull develop merge conflict 해결
hcg0127 Jul 14, 2025
5e6c506
[Fix] application-dev.yml에 openai 설정값 추가
hcg0127 Jul 14, 2025
504b18f
[CI/CD] ci/cd test(#41)
chanudevelop Jul 14, 2025
9288048
Merge pull request #52 from PerFumeOnMe/ci-cd/#41-CI-CD-pipline
chanudevelop Jul 14, 2025
4c01e6b
Merge pull request #47 from PerFumeOnMe/feature/#25-kakao-social-login
hcg0127 Jul 14, 2025
a128816
[CI/CD] openai/kakao관련 시크릿키 추가(#41)
chanudevelop Jul 14, 2025
a39b139
Merge pull request #53 from PerFumeOnMe/ci-cd/#41-CI-CD-pipline
chanudevelop Jul 14, 2025
0d5af89
[CI/CD] application-dev.yml수정(#41)
chanudevelop Jul 14, 2025
8f23ba8
Merge pull request #54 from PerFumeOnMe/ci-cd/#41-CI-CD-pipline
chanudevelop Jul 14, 2025
bf43a3c
[CI/CD] env블록에 secret정의하고 변수명으로 참조(#41)
chanudevelop Jul 14, 2025
1bb30cd
Merge pull request #55 from PerFumeOnMe/ci-cd/#41-CI-CD-pipline
chanudevelop Jul 14, 2025
872247c
[CI/CD] 오류분석을위해 로그추가(#41)
chanudevelop Jul 14, 2025
20dc7aa
Merge pull request #56 from PerFumeOnMe/ci-cd/#41-CI-CD-pipline
chanudevelop Jul 14, 2025
10c3229
[CI/CD] ddl-auto수정(#41)
chanudevelop Jul 15, 2025
4da8539
Merge pull request #57 from PerFumeOnMe/ci-cd/#41-CI-CD-pipline
chanudevelop Jul 15, 2025
c8ac57c
[CI/CD] DB URL secret파일 수정 후 배포테스트(#41)
chanudevelop Jul 15, 2025
1690131
Merge pull request #58 from PerFumeOnMe/ci-cd/#41-CI-CD-pipline
chanudevelop Jul 15, 2025
e2e9c2a
[CI/CD] 연결테스트 완료 후 ddl-auto update수정(#41)
chanudevelop Jul 15, 2025
400210b
Merge pull request #59 from PerFumeOnMe/ci-cd/#41-CI-CD-pipline
chanudevelop Jul 15, 2025
4ea8052
[Feature] 요청 DTO 및 Validator 구현 (#48)
hcg0127 Jul 16, 2025
ef87acb
[Feature] 연관관계 편의 메서드 작성 (#48)
hcg0127 Jul 16, 2025
6e0de01
[Feature] ErrorStatus 추가 (#48)
hcg0127 Jul 16, 2025
2965b42
[Feature] 온보딩 API 구현 (#48)
hcg0127 Jul 16, 2025
77747a1
[Fix] 불필요한 Enum 삭제 (#48)
hcg0127 Jul 16, 2025
118d199
[Feature] 사용자 선호 향 수정 API 구현 (#48)
hcg0127 Jul 16, 2025
ec40371
[Fix] UserNoteConverter에서 user를 설정하지 않도록 수정
hcg0127 Jul 16, 2025
8fa30c6
[Fix] 불필요한 메서드 삭제
hcg0127 Jul 16, 2025
1656000
Merge pull request #61 from PerFumeOnMe/feature/#48-onboarding
hcg0127 Jul 16, 2025
e52117d
[Bug] GitHUb PR 동작 확인
hcg0127 Jul 16, 2025
e84aebf
Merge pull request #62 from PerFumeOnMe/feature/#48-onboarding
hcg0127 Jul 16, 2025
f6e6ecb
[Feature] 이미지키워드 에러코드 추가 (#27)
chanudevelop Jul 16, 2025
1597f5a
[Feature] 이미지키워드 Controller, Service 구조 생성 (#27)
chanudevelop Jul 16, 2025
c5f212f
[Feature] 이미지키워드 DTO 생성(#27)
chanudevelop Jul 16, 2025
8ea7a93
[Feature] 저장된 이미지키워드 결과 목록 조회 API구현(#27)
chanudevelop Jul 16, 2025
912627d
[Feature] 프로필 조회 응답 DTO 생성 (#60)
leewonhee-3054 Jul 17, 2025
99845b8
[Feature] 프로필 조회 및 즐겨찾기 목록 조회 API 구현(#60)
leewonhee-3054 Jul 17, 2025
204fbed
[Fix] DTO 반환 메서드 추가 및 중복 제거 메서드 생성(#60)
leewonhee-3054 Jul 17, 2025
1380c97
Merge pull request #64 from PerFumeOnMe/feature/#60-mypage-profileAnd…
leewonhee-3054 Jul 17, 2025
b8098a6
[Feature] 다이어리 수정 API 구현 (#65)
bulee5328 Jul 17, 2025
ba27266
Merge pull request #66 from PerFumeOnMe/feature/#65-update-diary-api
bulee5328 Jul 18, 2025
3a28da5
[Feature] 다이어리 삭제 API 구현 (#67)
bulee5328 Jul 18, 2025
1e1f682
Merge pull request #68 from PerFumeOnMe/feature/#67-delete-diary-api
bulee5328 Jul 18, 2025
ac78ef2
[Feature] 일별 다이어리 상세 조회 API 구현 (#69)
bulee5328 Jul 18, 2025
450a7c7
[Feature] 응답 DTO ãfragranceName 추가 (#69)
bulee5328 Jul 19, 2025
bbe040c
Merge pull request #70 from PerFumeOnMe/feature/#69-search-daily-diar…
bulee5328 Jul 19, 2025
b86b46c
[Feature] 월별 다이어리 조회 API 구현 (#71)
bulee5328 Jul 19, 2025
127a50c
Merge pull request #72 from PerFumeOnMe/feature/#71-search-monthly-di…
bulee5328 Jul 19, 2025
58cd6c3
[Feature] 이미지 키워드 결과 상세조회 API구현(#27)
chanudevelop Jul 20, 2025
824f9ae
[Feature] build.gradle s3 설정 추가(#74)
chanudevelop Jul 20, 2025
28add61
[Feature] application-dev s3관련 환경변수 추가(#74)
chanudevelop Jul 20, 2025
6948e4a
[Feature] 이미지 고유성을 위한 UUID추가(#74)
chanudevelop Jul 20, 2025
d4a5ef2
[Feature] Config, Manager 추가(#74)
chanudevelop Jul 20, 2025
fe24ea9
[Feature] presignedUrl 발급 기능 구현(#74)
chanudevelop Jul 20, 2025
dc11434
[Feature] Converter,에러코드 추가 및 http method 변경(#74)
chanudevelop Jul 20, 2025
f04a64f
Merge pull request #75 from PerFumeOnMe/feature/#74-s3-image
chanudevelop Jul 21, 2025
8b9ff39
[Feature] user 엔티티에 프로필 사진 변경 메서드 추가(#76)
leewonhee-3054 Jul 21, 2025
7e8f3e7
[Feature] 프로필 사진 변경 요청 DTO 생성(#76)
leewonhee-3054 Jul 21, 2025
53435ed
[Feature] 프로필 사진 변경 API 구현(#76)
leewonhee-3054 Jul 21, 2025
36c53bd
Merge pull request #77 from PerFumeOnMe/feature/#76-mypage-profile-ch…
hcg0127 Jul 21, 2025
9a40a60
[Feature] 일별 다이어리 상세 조회 API 구현 (#69)
bulee5328 Jul 18, 2025
54d01de
[Feature] 응답 DTO ãfragranceName 추가 (#69)
bulee5328 Jul 19, 2025
2e52f50
[Feature] 월별 다이어리 조회 API 구현 (#71)
bulee5328 Jul 19, 2025
4ee946e
[Feature] build.gradle s3 설정 추가(#74)
chanudevelop Jul 20, 2025
47e636e
[Feature] application-dev s3관련 환경변수 추가(#74)
chanudevelop Jul 20, 2025
194d729
[Feature] 이미지 고유성을 위한 UUID추가(#74)
chanudevelop Jul 20, 2025
5d33101
[Feature] Config, Manager 추가(#74)
chanudevelop Jul 20, 2025
f850f14
[Feature] presignedUrl 발급 기능 구현(#74)
chanudevelop Jul 20, 2025
1cb2c32
[Feature] Converter,에러코드 추가 및 http method 변경(#74)
chanudevelop Jul 20, 2025
bb1daa4
[Feature] 메인페이지 향수 추천(MD's Choice) API 구현 (#63)
hcg0127 Jul 21, 2025
5c04dbd
[Feature] user 엔티티에 프로필 사진 변경 메서드 추가(#76)
leewonhee-3054 Jul 21, 2025
56668f4
[Feature] 프로필 사진 변경 요청 DTO 생성(#76)
leewonhee-3054 Jul 21, 2025
6bc2077
[Feature] 프로필 사진 변경 API 구현(#76)
leewonhee-3054 Jul 21, 2025
dcd3f2b
[Fix] 메인페이지 향수 추천(MD's Choice) API 로직 수정 - JPQLQuery 사용 (#63)
hcg0127 Jul 21, 2025
ce96f4f
[Fix] 메인페이지 향수 추천(MD's Choice) API 로직 수정 - NativeQuery 사용 (#63)
hcg0127 Jul 21, 2025
b032f48
[Fix] 응답 DTO에 사용자 이름과 닉네임 추가 (#63)
hcg0127 Jul 21, 2025
39c4427
[Style] 주석 작성 (#63)
hcg0127 Jul 21, 2025
e4c4ffd
[Style] UserController URL 수정 (#63)
hcg0127 Jul 21, 2025
a9e2f3e
[Fix] UserController URL 수정 및 PUT에서 PATCH로 변경 (#63)
hcg0127 Jul 21, 2025
94e2e1a
[Fix] conflict 해결
hcg0127 Jul 21, 2025
029b799
Merge branch 'feature/#63-md-choice' of https://github.com/PerFumeOnM…
hcg0127 Jul 21, 2025
4567538
[Feature] 이미지키워드 ENUM타입 String->enum 변환 함수 추가 (#27)
chanudevelop Jul 21, 2025
9cef4d7
[Feature] 에러타입 추가, 이미지키워드 값 validator구현 (#27)
chanudevelop Jul 21, 2025
e8d8d98
[Feature] 이미지키워드 결과 DTO 생성 (#27)
chanudevelop Jul 21, 2025
2e07f83
[Feature] 이미지키워드 결과 생성 service (#27)
chanudevelop Jul 21, 2025
bb563c0
[Feature] 이미지키워드 향수추천/감성시나리오 결과를 위한 FastAPI호출 구현 (#27)
chanudevelop Jul 21, 2025
af14bb1
[Feature] 이미지키워드 미리보기 결과 redis 저장 위한 서비스 구현 (#27)
chanudevelop Jul 21, 2025
4f75c1f
[Feature] 이미지키워드 미리보기 결과 Controller구현(#27)
chanudevelop Jul 21, 2025
ab0055a
[Feature] 이미지키워드 관련 Util함수 생성(#27)
chanudevelop Jul 21, 2025
b305ab7
[Feature] 분위기 값 럭셔리한 -> 러블리한 변경(#27)
chanudevelop Jul 21, 2025
a5df556
[Feature] 이미지 키워드 저장 DTO 생성(#27)
chanudevelop Jul 21, 2025
4d91d32
[Feature] 이미지 키워드 저장 서비스,리포지토리 생성(#27)
chanudevelop Jul 21, 2025
3e6310e
[Feature] 이미지 키워드 저장 converter, controller 추가(#27)
chanudevelop Jul 21, 2025
0e65db8
Merge branch 'develop' into feature/#27-image-keyword-basic
chanudevelop Jul 21, 2025
41b08f2
Merge pull request #79 from PerFumeOnMe/feature/#27-image-keyword-basic
chanudevelop Jul 21, 2025
a36d62f
[Feature] PBTI 결과 조회 API 구현 (#73)
bulee5328 Jul 21, 2025
1648428
PBTI 응답 DTO 수정 (#73)
bulee5328 Jul 21, 2025
1ca784e
[Fix] 에러 핸들링 GeneralException 사용 (#73)
bulee5328 Jul 22, 2025
ee6d55a
Merge branch 'develop' into feature/#73-search-pbti-result-api
bulee5328 Jul 22, 2025
21a1eb5
Merge pull request #81 from PerFumeOnMe/feature/#73-search-pbti-resul…
bulee5328 Jul 22, 2025
3d9e89a
[Feature] s3 관련 application, deploy파일 수정(#80)
chanudevelop Jul 23, 2025
09438f1
[Feature] PBTI 결과 저장 API 구현 (#82)
bulee5328 Jul 23, 2025
8c8c3df
Merge pull request #83 from PerFumeOnMe/feature/#82-save-pbti-result-api
bulee5328 Jul 23, 2025
de85d1b
[Feature] 마이페이지 PBTI 목록 조회 API 구현 (#84)
bulee5328 Jul 23, 2025
12ac9a9
Merge pull request #85 from PerFumeOnMe/feature/#84-search-pbti-list-api
bulee5328 Jul 23, 2025
e9f6e8c
[Feature] 마이페이지 PBTI 결과 상세 조회 API 구현 (#86)
bulee5328 Jul 23, 2025
b9b92cd
Merge pull request #87 from PerFumeOnMe/feature/#86-search-pbti-resul…
bulee5328 Jul 23, 2025
b927830
Merge pull request #88 from PerFumeOnMe/feature/#80-s3-cicd
chanudevelop Jul 24, 2025
ba69094
[Feature] fastapi 미정으로 인한 예외처리 추가(#80)
chanudevelop Jul 24, 2025
30f5527
Merge pull request #89 from PerFumeOnMe/feature/#80-Fastapi-connect
chanudevelop Jul 24, 2025
53010f4
Merge branch 'develop' of https://github.com/PerFumeOnMe/Back-end int…
hcg0127 Jul 25, 2025
e144b02
[Fix] 결과 반환 개수 수정 (#63)
hcg0127 Jul 25, 2025
3b8493b
Merge pull request #78 from PerFumeOnMe/feature/#63-md-choice
hcg0127 Jul 25, 2025
8238ad6
[Feature] 향수공방 결과 목록 조히 DTO, Controller
chanudevelop Jul 25, 2025
aa53b33
[Feature] 향수공방 결과 목록 조회 서비스 구현, 사용자 예외처리 추가
chanudevelop Jul 25, 2025
66e6a91
[Feature] 이미지키워드 스웨거 문서 설명 수정
chanudevelop Jul 25, 2025
312df58
[feature] 향수공방 상세조회 DTO, Controller (#90)
chanudevelop Jul 26, 2025
9c6e380
[feature] 향수공방 상세조회 서비스 구현(#90)
chanudevelop Jul 26, 2025
12538aa
[feature] 향수공방 조회 에러코드 수정(#90)
chanudevelop Jul 26, 2025
56d6543
[Fix] @NotNull 추가 (#91)
hcg0127 Jul 26, 2025
2feac45
[Fix] Login Filter 경로 변경 및 주석 처리 (#91)
hcg0127 Jul 26, 2025
feea328
[Refactor] Swagger에서 테스트할 수 있도록 Login Controller 및 Service 구현 (#91)
hcg0127 Jul 26, 2025
6e7f672
[Fix] 토큰 재발급 API service 중복 코드 메서드로 추출 (#91)
hcg0127 Jul 26, 2025
629d978
Merge pull request #93 from PerFumeOnMe/feature/#90-workshop-retrieve
chanudevelop Jul 26, 2025
fdc7e4f
Merge branch 'develop' of https://github.com/PerFumeOnMe/Back-end int…
hcg0127 Jul 26, 2025
ed9a216
Merge pull request #95 from PerFumeOnMe/refactor/#91-login-controller
hcg0127 Jul 26, 2025
d19a8a4
[Fix] kakao loginId 저장 prefix 수정 (#91)
hcg0127 Jul 26, 2025
d27e806
Merge pull request #96 from PerFumeOnMe/refactor/#91-login-controller
hcg0127 Jul 26, 2025
0f4d90e
[Refactor] PBTI 조회, 상세조회 API 수정 (#92)
bulee5328 Jul 26, 2025
db5e1ae
Merge pull request #97 from PerFumeOnMe/refactor/#92-refactor-pbti-api
bulee5328 Jul 26, 2025
8f2c5b2
[Feature] PBTI 결과 이름 수정, 결과 삭제 API 구현 (#98)
bulee5328 Jul 26, 2025
6a96860
[Fix] 카카오 소셜 로그인 중복 코드 메서드로 수정 (#91)
hcg0127 Jul 26, 2025
ff9c0fe
Merge pull request #99 from PerFumeOnMe/feature/#98-about-pbti-result…
bulee5328 Jul 26, 2025
e861225
Merge pull request #100 from PerFumeOnMe/refactor/#91-login-controller
hcg0127 Jul 26, 2025
7bcdb1a
[feature] 향수공방 결과 생성 DTO, Controller 구현(#94)
chanudevelop Jul 27, 2025
9c85db1
[feature] 향수공방 결과 생성 서비스 구현(추천, openai 서비스 포함) 구현(#94)
chanudevelop Jul 27, 2025
a2be8c9
[feature] 향수공방 결과 생성을 위한 도메인 추가(#94)
chanudevelop Jul 27, 2025
2df6e47
[feature] 향수공방 결과 생성을 위한 Converter(#94)
chanudevelop Jul 27, 2025
9a57385
[feature] 향수공방 결과 생성을 위한 OpenAiService(#94)
chanudevelop Jul 27, 2025
94da41e
[feature] 향수공방 에러코드 추가(#94)
chanudevelop Jul 27, 2025
4886bff
[feature] 향수 추천 구현을 위한 레포지토리(#94)
chanudevelop Jul 27, 2025
bf75fd3
[feature] 향수공방 중복이름 에러코드 추가(#94)
chanudevelop Jul 27, 2025
fe5a7ea
[feature] 향수공방 결과 저장 DTO생성(#94)
chanudevelop Jul 27, 2025
f6c6829
[feature] 향수공방 결과 저장 DTO생성(#94)
chanudevelop Jul 27, 2025
28cc1a9
[feature] 향수공방 결과 저장 Controller작성, 스웨거 추가(#94)
chanudevelop Jul 27, 2025
526d758
[feature] 향수공방 결과 저장, 레디스에서 값 가져오기 서비스 구현(#94)
chanudevelop Jul 27, 2025
71e8589
[fix] 환경변수 임시값 추가(#94)
chanudevelop Jul 27, 2025
1a6060c
Merge pull request #101 from PerFumeOnMe/feature/#94-workshop-result-…
chanudevelop Jul 27, 2025
3879b90
[Fix] 임시로 토큰 만료 시간 삭제 (#91)
hcg0127 Jul 29, 2025
b317b07
[Fix] 액세스 토큰 만료 시간 2주로 변경 (#91)
hcg0127 Jul 29, 2025
9aa8112
Merge pull request #103 from PerFumeOnMe/refactor/#91-login-controller
hcg0127 Jul 29, 2025
7283a0c
temp
chanudevelop Jul 29, 2025
47a8a8f
Merge pull request #104 from PerFumeOnMe/feature/#94-workshop-result-…
chanudevelop Jul 29, 2025
7a7b2b5
[Refactor] redis (#94)
chanudevelop Jul 29, 2025
3186e4c
Merge pull request #106 from PerFumeOnMe/feature/#94-workshop-result-…
chanudevelop Jul 29, 2025
89f6b09
[fix] redis설정추가 (#107)
chanudevelop Jul 29, 2025
d2a5a9e
[fix] --add-host 옵션 추가로 호스트 네트워크 접근 허용 (#107)
chanudevelop Jul 29, 2025
1a845e1
Merge pull request #108 from PerFumeOnMe/fix/#107-ec2-redis
chanudevelop Jul 29, 2025
0e8b17e
[Fix] 데이터시트 관련 변경(#109)
leewonhee-3054 Jul 30, 2025
dc5feeb
datasheet commit
leewonhee-3054 Jul 30, 2025
30908b2
Merge pull request #110 from PerFumeOnMe/fix/#109-datasheet-change
leewonhee-3054 Jul 30, 2025
6a55682
update -> create
leewonhee-3054 Jul 30, 2025
de3233d
Merge pull request #112 from PerFumeOnMe/fix/#111---change
leewonhee-3054 Jul 30, 2025
483b060
[refactor] WorkshopController, ImageKeywordController Swagger 어노테이션 분…
chanudevelop Jul 30, 2025
195d447
[refactor] 이미지 키워드 성별, 성격 enum 텍스트 수정 (#105)
chanudevelop Jul 30, 2025
94bd05e
[refactor] 이미지 키워드 추천 향수에 imageurl추가 (#105)
chanudevelop Jul 30, 2025
5194442
[refactor] 이미지 키워드 컨트롤러 순서, 주석 수정 (#105)
chanudevelop Jul 30, 2025
c1cc67a
[refactor] 이미지 키워드 추천향수 이미지 반환하도록 서비스 수정 (#105)
chanudevelop Jul 30, 2025
517f07f
[refactor] 이미지 키워드 설정 프로퍼티 추가(#105)
chanudevelop Jul 30, 2025
a076c4c
[refactor] IMAGE_KEYWORD_CHARACTER_BASE_PATH 추가(#105)
chanudevelop Jul 30, 2025
8c6286b
[refactor] dev_deploy.yml IMAGE_KEYWORD_CHARACTER_BASE_PATH 추가(#105)
chanudevelop Jul 30, 2025
4e6ab6d
[refactor] 이미지 키워드 중복코드 유틸함수로 변환(#105)
chanudevelop Jul 30, 2025
1dd557d
[refactor] 이미지 키워드 서비스 감성 캐릭터 이미지 반영(#105)
chanudevelop Jul 30, 2025
d4b6f11
Merge pull request #113 from PerFumeOnMe/refactor/#105-imagekeyword-r…
chanudevelop Jul 30, 2025
941b895
[ci-cd] dev_deploy.yml 수정(#116)
chanudevelop Aug 1, 2025
45b238e
[ci-cd] application_dev.yml 수정(#116)
chanudevelop Aug 1, 2025
4a17e8d
Merge pull request #117 from PerFumeOnMe/ci-cd/#116-ec2-fastapi-connect
chanudevelop Aug 1, 2025
5c1b74d
[ci-cd] dev_deploy 수정- 도커네트워크 추가(#116)
chanudevelop Aug 1, 2025
ce2cdab
Merge pull request #118 from PerFumeOnMe/ci-cd/#116-ec2-fastapi-connect
chanudevelop Aug 1, 2025
4e910ac
[fix] network 중복 설정 수정(#116)
chanudevelop Aug 1, 2025
3a5c63d
Merge pull request #119 from PerFumeOnMe/ci-cd/#116-ec2-fastapi-connect
chanudevelop Aug 1, 2025
699edb1
[fix] fastapi url 수정, 엔드포인트까지 포함(#116)
chanudevelop Aug 1, 2025
4afff89
Merge pull request #120 from PerFumeOnMe/ci-cd/#116-ec2-fastapi-connect
chanudevelop Aug 1, 2025
7fe7746
[feature] 탑노트 검증 어노테이션, 로직 생성(#121)
chanudevelop Aug 2, 2025
79294ab
[feature] 미들노트 검증 어노테이션, 로직 생성(#121)
chanudevelop Aug 2, 2025
07b4508
[feature] 베이스노트 검증 어노테이션, 로직 생성(#121)
chanudevelop Aug 2, 2025
ce53136
[feature] 향수공방 결과생성 요청에 검증 어노테이션 추가(#121)
chanudevelop Aug 2, 2025
cc65c90
[refactor] 향수공방 반환값 성향(Tendecy) -> 성향(Tendency) , 기억되는 모습(rememberd)로…
chanudevelop Aug 2, 2025
d3152fc
[refactor] 기억되는 모습 출력되도록 프롬포트 수정(#121)
chanudevelop Aug 2, 2025
21d8685
[refactor] 향수공방 ERROR STATUS 수정(#121)
chanudevelop Aug 2, 2025
a8fa916
[refactor] 향수공방 상세조회 반환값 저장된 이름, 노트값, 노트양 추가(#121)
chanudevelop Aug 2, 2025
d32fe09
[refactor] 향수공방 스웨거 실패 응답값 오류 해결(#121)
chanudevelop Aug 2, 2025
f9f1afc
[refactor] 이미지키워드 상세조회 검증 로직 추가(#121)
chanudevelop Aug 2, 2025
69816d0
[Refactor] #121 - 향수공방 기능 리팩토링
chanudevelop Aug 2, 2025
4f2719c
[feature] 나만의 향수 Controller, DTO 구현(#123)
chanudevelop Aug 3, 2025
4888e7b
[feature] 나만의 향수 서비스구현(#123)
chanudevelop Aug 3, 2025
391dfd3
[Refactor] 유저검증 중복로직 함수로 대체 (#123)
chanudevelop Aug 3, 2025
0414e5c
[Feature] 메인페이지 나만의향수 조회 API 구현 (#123)
chanudevelop Aug 3, 2025
e964fb4
[Hotfix] application-dev 수정
chanudevelop Aug 7, 2025
77ae686
[Hotfix] application-dev 수정
chanudevelop Aug 7, 2025
0027e29
[Hotfix] application-dev파일 수정
chanudevelop Aug 7, 2025
4d67434
[Fix] OpenAI 관련 코드 삭제 (#98)
bulee5328 Aug 7, 2025
f177d19
[Fix] ì¶충돌 해결
bulee5328 Aug 7, 2025
bdc2190
[Fix] CORS 경로 수정 (#91)
hcg0127 Aug 8, 2025
6099844
[Fix] Security Filter에 로깅 추가 (#91)
hcg0127 Aug 8, 2025
5dece18
[Fix] Http Method 변경 (#91)
hcg0127 Aug 8, 2025
a561cbf
Merge pull request #128 from PerFumeOnMe/refactor/#91-login-controller
hcg0127 Aug 8, 2025
11f03ce
[Fix] 프롬프트 수정
leewonhee-3054 Aug 8, 2025
18f5be1
Merge branch 'develop' into feature/#40-chatbot
leewonhee-3054 Aug 8, 2025
c4f968e
[Fix] 소셜 로그인 redirect URI 수정 (#91)
hcg0127 Aug 8, 2025
9e84fed
Merge pull request #130 from PerFumeOnMe/feature/#40-chatbot
leewonhee-3054 Aug 8, 2025
61e3d99
Merge pull request #131 from PerFumeOnMe/refactor/#91-login-controller
hcg0127 Aug 8, 2025
c1b3d53
[Fix] #98 - PBTI 결과 조회 기능 수정
chanudevelop Aug 8, 2025
99ba2f2
[Style] 도메인 기준 파일 구조 변경 (#132)
bulee5328 Aug 12, 2025
ba3bc42
[Style] 도메인 기준 파일 구조 변경 (#132)
chanudevelop Aug 14, 2025
4badcd5
[Docs] Update README.md
hcg0127 Aug 14, 2025
c39f47c
[Refactor] 스웨거 문서 분리 (#135)
chanudevelop Aug 14, 2025
960d4b4
[Fix] CORS 허용 Origin에 배포 경로 추가
hcg0127 Aug 14, 2025
45fb1f0
Merge pull request #142 from PerFumeOnMe/hotfix/security
hcg0127 Aug 14, 2025
6144302
[Refactor] #135 - 스웨거 문서 분리
chanudevelop Aug 14, 2025
dd4082a
[feature] workflow, application파일수정(#141)
chanudevelop Aug 14, 2025
a02bce3
[Docs] Update README.md
chanudevelop Aug 14, 2025
d4870a4
[Feature] workflow, application파일수정(#141)
chanudevelop Aug 14, 2025
66f01af
[hotfix] 프리플라이트허횽
chanudevelop Aug 14, 2025
35f0fdc
[hotfix] 프리플라이트허용
chanudevelop Aug 14, 2025
07f1b0f
[hotfix] 프론트배포주소추가
chanudevelop Aug 14, 2025
4ee8854
[hotfix] 프론트배포주소추가
chanudevelop Aug 14, 2025
138a319
[Fix] 향수 검색 (향수 브랜드) 기능 추가 (#134)
leewonhee-3054 Aug 14, 2025
67ef3c7
[hotfix] 오류해결원인찾기
chanudevelop Aug 14, 2025
5d2ca65
ip주소로 접근 삭제
chanudevelop Aug 14, 2025
344c0eb
[Hotfix]프론트엔드 주소 정상적용
chanudevelop Aug 14, 2025
e304f10
[Hotfix] CORS 해결 후 정리
chanudevelop Aug 14, 2025
3a9b731
[Fix] 흐름 파악을 위해 메서드 위치 변경 (#134)
leewonhee-3054 Aug 14, 2025
253ff4c
Merge pull request #147 from PerFumeOnMe/fix/#134-fragrance-search
leewonhee-3054 Aug 14, 2025
59f2a5b
[Fix] Brand enum 타입 추가 (#115)
leewonhee-3054 Aug 15, 2025
c4639cc
Merge pull request #150 from PerFumeOnMe/fix/#115-datasheet-fix
leewonhee-3054 Aug 15, 2025
77376a0
[Docs] 챗봇 프롬프트 수정 (#149)
leewonhee-3054 Aug 15, 2025
f93ace9
Merge pull request #151 from PerFumeOnMe/docs/#149-prompt-change
leewonhee-3054 Aug 15, 2025
9c12e06
Update README.md
jodandan Aug 15, 2025
22fe807
Merge pull request #152 from PerFumeOnMe/jodandan-patch-1
chanudevelop Aug 15, 2025
bdb3e37
[Fix] 로그인 DTO 입력 예시 설정 (#153)
hcg0127 Aug 15, 2025
de0270c
[Docs] 컨트롤러 이름 표시 & 응답 DTO 변경 & 에러 추가 (#153)
hcg0127 Aug 15, 2025
5f2d224
[Fix] 일반/소셜 로그인 응답에 name 추가 (#153)
hcg0127 Aug 15, 2025
6f97ca0
Merge pull request #154 from PerFumeOnMe/fix/#153-login-response
hcg0127 Aug 16, 2025
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
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/gradlew text eol=lf
*.bat text eol=crlf
*.jar binary
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/issue-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Issue Template
about: 이슈 템플릿
title: ''
labels: "✨ Feat"
assignees: ''

---

## 📌 만들고자 하는 기능

(여기에 기능 설명을 작성하세요)

## ✅ 구현 내용

- [ ] (구체적인 구현 항목을 작성하세요)
- [ ] (구체적인 구현 항목을 작성하세요)
- [ ] (구체적인 구현 항목을 작성하세요)

## ⏰ 예상 기간

0월 00일 ~ 0월 00일
20 changes: 20 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
## 💡 관련 이슈

(관련있는 이슈 번호를 적어주세요.)

## 📢 작업 내용

- (작업한 내용 작성)
- (작업한 내용 작성)

## 🗨️ 리뷰 요구사항(선택)

- (리뷰 요구사항 작성)

## ✅ 체크리스트

- [ ] 코드가 정상적으로 컴파일되나요?
- [ ] 이슈 내용을 전부 구현했나요?
- [ ] 작업 기간 내에 개발을 완료했나요?
- [ ] 리뷰어를 선택했나요?
- [ ] 라벨을 지정했나요?
108 changes: 108 additions & 0 deletions .github/workflows/dev_deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
name: PerfumeonMe Dev CI/CD

on:
push:
branches: [ "develop" ]
jobs:
deploy:
runs-on: ubuntu-latest

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

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

- name: gradlew mod modify
run: chmod +x gradlew

# gradle 캐싱 (0) - 주석처리할수도있음
- name: Gradle Caching
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Spring Boot Build
run: ./gradlew clean build --exclude-task test

- name: Docker Image Build
run: docker build -t chanee29/perfumeonme .

- name: docker login
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: docker Hub Push
run: docker push chanee29/perfumeonme

- name: get GitHub IP
id: ip
uses: haythem/[email protected]

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_ACCESS_KEY_PASSWORD }}
aws-region: ap-northeast-1

- name: Add GitHub IP to AWS
run: |
aws ec2 authorize-security-group-ingress --group-id ${{ secrets.AWS_SG_ID }} --protocol tcp --port 22 --cidr ${{ steps.ip.outputs.ipv4 }}/32

- name: AWS EC2 Connection & Deploy Spring (bind to loopback)
uses: appleboy/[email protected]
with:
host: ${{ secrets.EC2_HOST }}
username: ubuntu
key: ${{ secrets.EC2_SSH_PRIVATE_KEY }}
port: ${{ secrets.EC2_SSH_PORT }}
timeout: 500s
script: |
set -e

sudo docker network create perfume-network || true

sudo docker stop perfumeonme || true
sudo docker rm perfumeonme || true
sudo docker rmi chanee29/perfumeonme || true
sudo docker pull chanee29/perfumeonme

echo "🚀 Starting new container with the following environment variables:"

sudo docker run -d --name perfumeonme \
--network perfume-network \
-p 127.0.0.1:8080:8080 \
-e SPRING_PROFILES_ACTIVE=dev \
-e DB_URL=${{ secrets.ENV_DB_URL }} \
-e DB_USERNAME=${{ secrets.ENV_DB_USERNAME }} \
-e DB_PASSWORD=${{ secrets.ENV_DB_PASSWORD }} \
-e SPRING_DATA_REDIS_HOST=${{ secrets.ENV_REDIS_HOST }} \
-e SPRING_DATA_REDIS_PORT=${{ secrets.ENV_REDIS_PORT }} \
-e JWT_SECRET=${{ secrets.ENV_JWT_SECRET }} \
-e OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }} \
-e KAKAO_REST_API_KEY=${{ secrets.KAKAO_REST_API_KEY }} \
-e KAKAO_CLIENT_SECRET=${{ secrets.KAKAO_CLIENT_SECRET }} \
-e AWS_S3_ACCESS_KEY_ID=${{ secrets.AWS_S3_ACCESS_KEY_ID }} \
-e AWS_S3_SECRET_ACCESS_KEY=${{ secrets.AWS_S3_SECRET_ACCESS_KEY }} \
-e AWS_S3_BUCKET_NAME=${{ secrets.AWS_S3_BUCKET_NAME }} \
-e EXTERNAL_FASTAPI_RECOMMEND_URL=${{ secrets.FASTAPI_RECOMMEND_URL }} \
-e EXTERNAL_FASTAPI_PBTI_URL=${{ secrets.FASTAPI_PBTI_URL }} \
-e IMAGE_KEYWORD_CHARACTER_BASE_PATH=${{ secrets.IMAGE_KEYWORD_CHARACTER_BASE_PATH }} \
chanee29/perfumeonme


- name: Remove GitHub IP FROM security group
run: |
aws ec2 revoke-security-group-ingress --group-id ${{ secrets.AWS_SG_ID }} --protocol tcp --port 22 --cidr ${{ steps.ip.outputs.ipv4 }}/32
41 changes: 41 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
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/

### application-local.yml ###
src/main/resources/application-local.yml
src/main/resources/application-secret.yml
1 change: 1 addition & 0 deletions .platform/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;
63 changes: 63 additions & 0 deletions .platform/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
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;
# 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';
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;
}
}
26 changes: 26 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# 1단계: Gradle을 이용한 빌드용 이미지
FROM gradle:8.4.0-jdk21 AS builder

# 작업 디렉토리 설정
WORKDIR /app

# 전체 프로젝트 복사
COPY . .

# 종속성 캐시 및 빌드
RUN gradle clean build -x test

# ------------------------------------------------------

# 2단계: 실제 애플리케이션 실행용 이미지
FROM eclipse-temurin:21-jdk

# JAR 복사 (빌드된 JAR 경로)
ARG JAR_FILE=build/libs/*.jar
COPY --from=builder /app/${JAR_FILE} app.jar

# 8080 포트 오픈
EXPOSE 8080

# 앱 실행 명령어
ENTRYPOINT ["java", "-jar", "app.jar"]
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: appstart
Loading
Loading