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.

Sign up for GitHub

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

Jump to bottom

🔀 [Merge] Merge 8th to dev #1169

Merged
merged 24 commits into from
Feb 27, 2025
Merged

🔀 [Merge] Merge 8th to dev #1169

merged 24 commits into from
Feb 27, 2025

Conversation

taehyeon3
Copy link
Contributor

💡Issue 번호

taehyeon3 and others added 24 commits January 6, 2025 17:18
@taehyeon3
✨ [Feature] 개인 일정 상세조회 api #1060 (#1131)
3c96e8b 
Co-authored-by: taehyeon <[email protected]>
@wonies
✨ [Feature] 전체일정 조회하기 dto, controller, service 생성 및 test 완료 #1128 (#1132
e74db2c 
)

Co-authored-by: wonie <[email protected]>
@wonies
✨ [Feature] 전체일정 기간조회 api 생성 및 완료 #1062 (#1134)
11752a1 
Co-authored-by: wonie <[email protected]>
@seyeon22222
✨ [Feature] 관리자 페이지 일정 검색 API 추가 #1120 (#1133)
711ff6b
@seyeon22222
✨ [Feature] Admin 페이지 전체일정 조회 #1074 (#1135)
006e447
@taehyeon3
✨ [Feature] 개인일정 기간 조회 api #1061 (#1136)
361c210 
Co-authored-by: taehyeon <[email protected]>
@wonies
✨ [Feature] 전체일정 개인일정에 추가 api 작성 #1064 (#1138)
838fc46 
Co-authored-by: wonie <[email protected]>
@taehyeon3
✨ [Feature] 개인일정 커스터 마이징 추가 api (#1140)
44c2d03 
Co-authored-by: taehyeon <[email protected]>
@wonies
🛠️ [Refactoring] PublicScheduleDto에 누락된 status정보 추가 #1141 (#1142)
c5deb00 
Co-authored-by: wonie <[email protected]>
@taehyeon3
✨ [Feature] 개인일정 커스터 마이징 수정 api #1070 (#1143)
850983b 
Co-authored-by: taehyeon <[email protected]>
@taehyeon3
✨ [Feature] 개인일정 커스터 마이징 목록 조회 api #1071 (#1144)
2db6cdd 
Co-authored-by: taehyeon <[email protected]>
@taehyeon3
✨ [Feature] 개인일정 커스터 마이징 삭제 api #1073 (#1145)
2d10ed0 
Co-authored-by: taehyeon <[email protected]>
@taehyeon3
✨ [Feature] 개인일정 커스터 마이징 API DTO 검증 로직 추가 #1146 (#1147)
73f1c89 
Co-authored-by: taehyeon <[email protected]>
@taehyeon3
🔨 [Refactoring] calendar api 명세서 동기화 #1148 (#1150)
7524677 
Co-authored-by: taehyeon <[email protected]>
@wonies
🛠️ [Fix] 전체일정-개인일정 가져오기에서 누락된 sharedCount 추가부분 수정 (#1154)
b318476 
Co-authored-by: wonie <[email protected]>
@seyeon22222
🔨 [Refactoring] Admin 페이지 프론트 요청사항에 의한 변경사항 #1156 (#1157)
f58ae8f
@wonies @seyeon22222
✨ [Feature] 모니터링스레드 - 42api event받아오기 / 기간지난 이벤트 deactivate / slack봇 …
5b9e049 
…알람 기능 구현 #1152 (#1155)

Co-authored-by: wonie <[email protected]>
Co-authored-by: seyeon22222 <[email protected]>
@seyeon22222
✨ [Feature] 8기 README 1차 업데이트
dee8d6a
@wonies @seyeon22222
⚡️ [Feature] 42api 모니터링스레드에작업 #1151 (#1158)
aab4337 
Co-authored-by: wonie <[email protected]>
Co-authored-by: seyeon22222 <[email protected]>
@wonies @seyeon22222
✨ [Feature] 모니터링스레드 변경사항 및 완료 #1158 (#1160)
856e8c7 
Co-authored-by: wonie <[email protected]>
Co-authored-by: seyeon22222 <[email protected]>
@wonies
[Fix] publicSchedule에서 privateSchedule불러오지 못하게, api수정 #1163 (#1166)
48094c3 
Co-authored-by: wonie <[email protected]>
@taehyeon3 @seyeon22222 @wonies
🛠️ [REFACTOR] 개인 일정 기간 조회 응답 dto 수정 (#1167)
756e447 
Co-authored-by: seyeon22222 <[email protected]>
Co-authored-by: wonie <[email protected]>
Co-authored-by: taehyeon <[email protected]>
Co-authored-by: wonie <[email protected]>
Co-authored-by: seykim <[email protected]>
🛠️ [REFACTOR] checkstyle 수정
f5eb227
@taehyeon3
Merge branch 'dev' into 8th
c257689
@codecov Codecov
Copy link

codecov bot commented Feb 27, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.54%. Comparing base (f4fd23a) to head (c257689).
Report is 1 commits behind head on dev.

Additional details and impacted files 
@@             Coverage Diff              @@
##                dev    #1169      +/-   ##
============================================
- Coverage     77.60%   77.54%   -0.06%     
+ Complexity     1802     1799       -3     
============================================
  Files           598      598              
  Lines          8389     8391       +2     
  Branches        540      540              
============================================
- Hits           6510     6507       -3     
- Misses         1631     1638       +7     
+ Partials        248      246       -2
Flag Coverage Δ
integrationTest 73.11% <100.00%> (-0.08%) ⬇️
unitTest 29.46% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

seyeon22222
seyeon22222 approved these changes Feb 27, 2025
View reviewed changes
Copy link
Contributor

@seyeon22222 seyeon22222 left a comment

Choose a reason for hiding this comment

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

확인했습니다!

wonies
wonies approved these changes Feb 27, 2025
View reviewed changes
Copy link
Contributor

@wonies wonies left a comment

Choose a reason for hiding this comment

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

확인했습니다!

@taehyeon3 taehyeon3 merged commit 1cf85b0 into dev Feb 27, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@seyeon22222 seyeon22222 seyeon22222 approved these changes

@wonies wonies wonies approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

🔀 [Merge] Merge 8th to dev
3 participants
@taehyeon3 @seyeon22222 @wonies