Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
566e857
Settings: 시큐리티와 스웨거 설정
Feb 14, 2025
024bb53
Feat: 로그인기능 추가
Feb 19, 2025
558a7ba
Feat: 로그인기능 추가
Feb 19, 2025
4bacbde
Merge pull request #8 from spark-team5/feature/issue-6
qhdudedi Feb 19, 2025
67a66fe
Update auto-branch.yml
10Hyuna Feb 11, 2025
fe0f736
Update auto-branch.yml
10Hyuna Feb 11, 2025
657223b
Update and rename auto-branch.yml to create-branch.yml
10Hyuna Feb 11, 2025
b1d8990
Create delete-branch.yml
10Hyuna Feb 11, 2025
da5b037
Create close-issue.yml
10Hyuna Feb 11, 2025
76c54ce
Update create-branch.yml
10Hyuna Feb 11, 2025
77a3bc4
Update delete-branch.yml
10Hyuna Feb 11, 2025
1f7548a
Create test-issue-template.yml
10Hyuna Feb 11, 2025
f75b409
Update create-branch.yml
10Hyuna Feb 11, 2025
81f365f
Update create-branch.yml
10Hyuna Feb 11, 2025
8301c8e
Update create-branch.yml
10Hyuna Feb 11, 2025
10f236f
Update create-branch.yml
10Hyuna Feb 11, 2025
1a6deb3
Update create-branch.yml
10Hyuna Feb 11, 2025
c2463fa
Update create-branch.yml
10Hyuna Feb 11, 2025
49573c4
Update create-branch.yml
10Hyuna Feb 11, 2025
90c2b74
Update create-branch.yml
10Hyuna Feb 11, 2025
8b4cf59
Settings: 시큐리티와 스웨거 설정
Feb 20, 2025
fc75f17
Settings: 시큐리티와 스웨거 설정
Feb 14, 2025
231e0f7
Feat: 로그인 구현 완료
Feb 20, 2025
c262d98
Feat: 로그인 구현 완료
Feb 20, 2025
f338068
Feat: 로그인 구현 완료
Feb 20, 2025
4772f66
Feat: 로그인 구현 완료
Feb 20, 2025
f221ec2
Merge branch 'dev' into feature/issue-9
heodongun Feb 20, 2025
9d6226d
Dependency/Plugin: API 호출을 위한 의존성 추가
qhdudedi Feb 21, 2025
8bec7f6
Settings: API 관련 환경변수 설정
qhdudedi Feb 21, 2025
b00a264
Feat: 얼굴 인식 API 구현
qhdudedi Feb 21, 2025
cf735ab
Feat: 얼굴 인식 API Swagger 문서 추가
qhdudedi Feb 21, 2025
b3fdef5
FIX : 민감한 정보들 환경변수로 나누었습니다.
Feb 23, 2025
0356894
Merge branch 'feature/issue-9' of https://github.com/spark-team5/serv…
Feb 23, 2025
92af929
FIX : 민감한 정보들 환경변수로 나누었습니다.
Feb 23, 2025
4e68d68
Merge pull request #12 from spark-team5/feature/issue-9
10Hyuna Feb 24, 2025
c473a68
Fix: Conflict 해결 in bulid.gradle
10Hyuna Feb 24, 2025
40d597b
Fix: Conflict 해결 in application.yml
10Hyuna Feb 24, 2025
e958a4a
Fix: Merge Conflicting file
10Hyuna Feb 24, 2025
03b3cca
Fix: dependencies 계층 구조 수정
10Hyuna Feb 24, 2025
b619e27
fix: merge conflict in build.gradle
10Hyuna Feb 24, 2025
6518edc
Merge pull request #13 from spark-team5/feature/issue-11
10Hyuna Feb 24, 2025
94e18ec
Revert "[Feature] 일기 생성 API"
10Hyuna Feb 24, 2025
f9b2671
Merge pull request #17 from spark-team5/revert-14-feature/issue-10
10Hyuna Feb 24, 2025
2ad544d
FIX : 민감한 정보들 환경변수로 나누었습니다.
heodongun Feb 24, 2025
cf86ff3
FIX : spring에다가 security가 안들어갔음
Feb 24, 2025
dd725e9
Fix: 환경변수 버그 수정
qhdudedi Feb 24, 2025
9f40e21
chore: Add temporary commit to trigger PR
10Hyuna Feb 25, 2025
5e06106
Merge pull request #19 from spark-team5/feature/issue-10
10Hyuna Feb 25, 2025
a3873b5
Merge branch 'feature/issue-10' into dev
10Hyuna Feb 25, 2025
5c08cb8
Fix: Manually merge feature/issue-10 into dev
10Hyuna Feb 25, 2025
dc0d9c1
Merge branch 'dev' of https://github.com/spark-team5/server into dev
10Hyuna Feb 25, 2025
26d3280
Feat: 1차 Merge
10Hyuna Feb 25, 2025
ab461cb
Feat : error commit
Feb 25, 2025
63ef269
Settings: application.yml, bulid.gradle 기존 상태로 수정
10Hyuna Feb 25, 2025
03e7a83
Fㅑㅌ : 실행이 안되요
Feb 25, 2025
6a2aa13
Fix : 실행이 안되요
Feb 25, 2025
70e0b7c
Fix : 실행이 안되요
Feb 25, 2025
7045e3b
Fix : yml 에러
Feb 25, 2025
be1d417
Fix : yml 에러
Feb 25, 2025
e4dc9a0
Fix : yml 에러
Feb 25, 2025
2d0e268
Merge pull request #21 from spark-team5/feature/issue-18
10Hyuna Feb 25, 2025
b851b11
fix: UserEntity 기반 검증 코드 수정
10Hyuna Feb 25, 2025
682dfbc
Merge branch 'dev' of https://github.com/spark-team5/server into dev
10Hyuna Feb 25, 2025
723b8d5
Fix : 이상한 코드 제거
Feb 25, 2025
a6b0ce6
Merge pull request #24 from spark-team5/refactor/issue-23
qhdudedi Feb 25, 2025
f29fe5e
Feat: 날짜별 일기 조회 API Request DTO
10Hyuna Feb 26, 2025
6ac3e54
Feat: 날짜별 일기 조회 API Response DTO
10Hyuna Feb 26, 2025
b669665
Feat: 날짜별 일기 조회 Controller 구축
10Hyuna Feb 26, 2025
67ea19d
Refactor: 날짜별 일기 조회 DTO 필드 중 Date 자료형 LocalDateTime으로 수정
10Hyuna Feb 26, 2025
4a24cfd
Settings: dotenv Config
10Hyuna Feb 26, 2025
c9f5f98
Feat: 일기 조회 API Service 로직 구현
10Hyuna Feb 26, 2025
5f1d37a
Refactor: 날짜별 일기 조회 api 엔드포인트 변경
10Hyuna Feb 26, 2025
462cb78
Feat: 월별 일기 조회 API controller 구축
10Hyuna Feb 26, 2025
f6a2235
Settings: Remove .env from Git tracking
10Hyuna Feb 26, 2025
a775946
Feat: 월별 일기 조회 Service 플로우 구축
10Hyuna Feb 26, 2025
d6529a3
Feat: 월별 일기 조회 Response Form 구현
10Hyuna Feb 26, 2025
7e908b2
Feat: String으로 전달받은 년도와 월을 LocalDateTime 자료형으로 Convert
10Hyuna Feb 26, 2025
b3c1538
Feat: 유저 식별자와 날짜 정보를 기반으로 매칭되는 일기 추출하는 Respository 함수 작성
10Hyuna Feb 26, 2025
464294e
Feat: 다이어리 아이디와 외래키로 매핑되어 있는 하루 요약 이미지 조회하는 Repository 함수 작성
10Hyuna Feb 26, 2025
ccd12d8
Feat: 월별 일기 조회 API Service 로직 구현
10Hyuna Feb 26, 2025
9826965
Refactor: API 예외 처리 서비스 로직 단에서 처리 및 간소화
10Hyuna Feb 26, 2025
b8a3c63
Refactor: API 예외 처리 서비스 로직 단에서 처리 및 간소화
10Hyuna Feb 26, 2025
7abb9fc
Merge pull request #25 from spark-team5/feature/issue-16
10Hyuna Feb 26, 2025
8807986
Fix: Merge conflict 해결 in build.gradle
10Hyuna Feb 26, 2025
f1f943c
Fix: Merge conflict 해결 in DiaryController
10Hyuna Feb 26, 2025
eba68bf
Fix: Merge conflict 해결 in DiaryRepository
10Hyuna Feb 26, 2025
0af3cc2
Fix: Merge conflict 해결 in DiaryService
10Hyuna Feb 26, 2025
a2d810b
Fix: Merge Conflict 해결 in DTO
10Hyuna Feb 26, 2025
ed7350c
Merge branch 'dev' into feature/issue-26
10Hyuna Feb 26, 2025
98ff3c3
Merge pull request #27 from spark-team5/feature/issue-26
10Hyuna Feb 26, 2025
8a3b4c0
Styles: 코드 정렬, 포맷팅
10Hyuna Feb 26, 2025
a0e1391
Feat: 얼굴 영역 좌표 dto 생성
qhdudedi Feb 26, 2025
8ba6864
Fix: 표정 분석 위한 response 수정
qhdudedi Feb 26, 2025
62ffc96
Fix: 수정된 response 맞게 로직 수정
qhdudedi Feb 26, 2025
06f9be4
Feat: EmotionType 생성
qhdudedi Feb 26, 2025
d1951ac
Settings: FastAPI URL 환경변수 설정
qhdudedi Feb 26, 2025
6ee7570
Feat: 감정 분석 req/res DTO 생성
qhdudedi Feb 26, 2025
e1205d1
Feat: 감정 분석(요청) 기능 구현
qhdudedi Feb 26, 2025
2bab740
Refactor: 얼굴 인식 API 리팩토링
qhdudedi Feb 26, 2025
c05ed16
Feat: 감정 분석 API 구현
qhdudedi Feb 26, 2025
e385e21
Merge pull request #28 from spark-team5/feature/issue-22
qhdudedi Feb 26, 2025
84c8ea8
FEAUTE : 설정 관련 끝
Feb 27, 2025
6ee84ae
Fix: JWT 생성 및 검증 로직 Id 값 추가
qhdudedi Feb 27, 2025
751e2e5
Feat: 죽순이 엔티티 생성
qhdudedi Feb 27, 2025
caa1394
Feat: 죽순이 여부 조회 로직 구현
qhdudedi Feb 27, 2025
f195608
Refactor: 미사용 메서드 삭제
qhdudedi Feb 27, 2025
28ec363
Feat: 죽순이 분양 로직 구현
qhdudedi Feb 27, 2025
a1ecaf3
Merge pull request #32 from spark-team5/feature/issue-29
qhdudedi Feb 27, 2025
f8899d2
feature : 설정 관련 끝
Feb 27, 2025
863e114
Merge pull request #33 from spark-team5/feature/issue-30
qhdudedi Feb 27, 2025
73f80ab
feature : 죄송합니다...
Feb 27, 2025
50ae8a5
feature : 쿠키가 다른 도메인으로 잘가지않는 문제를 해결했습니다
Feb 27, 2025
cd78675
Merge pull request #35 from spark-team5/feature/issue-34
qhdudedi Feb 28, 2025
86c031e
Feat: 포트 번호 설정
qhdudedi Feb 28, 2025
fc03b8c
fix: cors 설정 변경
qhdudedi Feb 28, 2025
9afb08d
fix: cors 버그 수정
qhdudedi Feb 28, 2025
5d5f8aa
fix: cors 버그 수정
qhdudedi Feb 28, 2025
aebdc66
fix: cors 버그 수정
qhdudedi Feb 28, 2025
0296775
Fix: cors 버그 수정
qhdudedi Feb 28, 2025
f95e937
feature : 쿠키가 다른 도메인으로 잘가지않는 문제를 해결했습니다
Feb 28, 2025
67539ed
feature : 쿠키가 다른 도메인으로 잘가지않는 문제를 해결했습니다
Feb 28, 2025
c477484
feature : 서드파티 쿠키로 인식되는거 개선
Feb 28, 2025
7ca9771
feature : 서드파티 쿠키로 인식되는거 개선
Feb 28, 2025
2d560c1
feature : 서드파티 쿠키로 인식되는거 개선
Feb 28, 2025
b382ef3
feature : 토큰의 갱신시간
Feb 28, 2025
60ac91a
feature : 다른 도메인으로 쿠키 주기
Feb 28, 2025
0195308
feature : 다른 도메인으로 쿠키 주기
Feb 28, 2025
c546c37
feature : 다른 도메인으로 쿠키 주기
Feb 28, 2025
912dff7
feature : 다른 도메인으로 쿠키 주기
Feb 28, 2025
5fae574
feature : 다른 도메인으로 쿠키 주기
Feb 28, 2025
b4c046a
feature : 다른 도메인으로 쿠키 주기
Feb 28, 2025
372deb2
Fix: image base64 인코딩 후 반환
10Hyuna Feb 28, 2025
17093be
Fix: image base64 인코딩 후 반환
10Hyuna Feb 28, 2025
27c8ce5
Merge branch 'dev' into feature/issue-26
10Hyuna Feb 28, 2025
72476a7
Merge pull request #36 from spark-team5/feature/issue-26
10Hyuna Feb 28, 2025
a059853
feature : 쿠키 cors에 추가
Feb 28, 2025
df33612
Fix: yml 수정
qhdudedi Feb 28, 2025
7a680dc
Fix: 얼굴 영역 부분 버그 수정
qhdudedi Feb 28, 2025
0bef05e
Resolve merge conflict
qhdudedi Mar 10, 2025
4f7df9e
Docs: gitignore 수정
qhdudedi Mar 10, 2025
b8093f2
Refactor: Resolve merge conflict
qhdudedi Mar 10, 2025
2f3d622
remove: .DS_Store files
qhdudedi Mar 10, 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
22 changes: 0 additions & 22 deletions .github/ISSUE_TEMPLATE/test-issue-template.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .github/workflows/auto-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Create Issue Branch
on:
issues:
types: [ assigned ]
issue_comment:
types: [ created ]
pull_request:
types: [ closed ]

jobs:
create_issue_branch_job:
runs-on: ubuntu-latest
steps:
- name: Create Issue Branch
uses: robvanderleek/create-issue-branch@main
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
14 changes: 0 additions & 14 deletions .github/workflows/close-issue.yml

This file was deleted.

68 changes: 0 additions & 68 deletions .github/workflows/create-branch.yml

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/delete-branch.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,8 @@ out/

### VS Code ###
.vscode/

.env

### Mac ###
.DS_store
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
- **Comment:** 필요한 주석 추가 및 변경
- **Dependency/Plugin:** Add a dependency/plugin
- **Docs:** 문서 수정
- **Rename:** 파일 혹은 폴더명을 수정하거나 옮기는 작업만인 경우
- **Rename:** 파일 혹은 폴더명을 수정하거나 옮기는 작업만인 경우# Temporary commit for PR
21 changes: 20 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,31 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
implementation 'io.jsonwebtoken:jjwt-impl:0.12.3'
implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3'

developmentOnly 'org.springframework.boot:spring-boot-devtools'
compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.mysql:mysql-connector-j'

compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'

testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

// okhttp
implementation 'com.squareup.okhttp3:okhttp:4.12.0'

// mapper (ModelMapper)
implementation 'org.modelmapper:modelmapper:3.0.0'

// dotenv (환경변수 관리)
implementation 'io.github.cdimascio:java-dotenv:5.2.2'
}

tasks.named('test') {
Expand Down
Loading