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

feature → weekly #62

Merged
merged 101 commits into from
Nov 5, 2023
Merged

feature → weekly #62

merged 101 commits into from
Nov 5, 2023

Conversation

choboss00
Copy link
Contributor

No description provided.

choboss00 and others added 30 commits October 20, 2023 17:04
@choboss00
Merge pull request #15 from choboss00/feature/3-branch-mentoring
cb0a167 
Feature/3 branch mentoring
@sjmjys954646
fix : MentorPostStateConverter refactor
015f646 
State attributer null 삭제 및 리팩토링
@sjmjys954646
fix : mentorPostService 예외처리코드 수정
d215449
@sjmjys954646
feat : searchCategory
bd35a2a 
검색별 카테고리 설정 (진행중 enum형으로 다 고쳐야됨)
@sjmjys954646
Merge pull request #45 from Step3-kakao-tech-campus/weekly
80ecfea 
Weekly -> dev
@sjmjys954646
Merge pull request #46 from Step3-kakao-tech-campus/dev
eea24b4 
Dev->master
@sjmjys954646
feat : mentorPost:
c16258b
@sjmjys954646
feat : mentorPost length exception
b131d70 
멘토글 길이 제한 300자
@sjmjys954646
feat : findAllByInterestKeyword
d8fed85 
Interest태그로 검색기능 추가
@sjmjys954646
fix : mentorPostService string to enum
ff93ade 
category string형을 Enum형으로 변경
@sjmjys954646
feat : mentorPostCategory
35d01fd
@sjmjys954646
feat : initialize and usercategory video response dto restcontroller
4ac2ccb 
필요할 파일 생성및 restcontroller 작성
@sjmjys954646
feat : usercategoryVideoResponseDTO videoresponse
0b02c42
@choboss00
Merge pull request #49 from sjmjys954646/feature/3-branch-mentoring
cf6799f 
멘토링 글 필터링 추가
@choboss00
Merge pull request #16 from choboss00/feature/3-branch-mentoring
1f51297 
Feature/3 branch mentoring
@choboss00
feat : 멘티 기준 화면 게시글 갯수 보여주는 기능 추가
e8aaeac 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
fix : table 명 변경에 따른 테스트 코드 이름 수정
f931ddd 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
test : 멘티 기준 게시글 갯수 로직 테스트
342134a 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
feat : 멘토 : 신청 거부 기능 추가
e654ed4 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
test : 멘토 : 신청 거부 기능 테스트
248d971 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
fix : 멘토링 Accept requestDTO 수정
6535981 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
test : 수정 후 로직 테스트
2dfa3b7 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
feat : 멘티 신청 생성 로직 작성
be4cbf3 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
test : 멘티 신청 생성 로직 테스트 코드 작성 및 DisplayName 에너테이션 이름 수정
be37f21 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
fix : 멘토 : 멘티 신청 거부 post -> patch 변경
babfe21 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
test : patch 변경에 따른 테스트 코드 수정
67453b5 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
fix : is_deleted SQL문 수정
7233bac 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
feat : 멘티 : 신청 취소 기능 추가
dbd1dab 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
test : 멘티 : 신청 취소 기능 로직 테스트
c8653f9 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
fix : Request, Response DTO 이름 변경
df05ddf 
Signed-off-by: Jin_00 <[email protected]>
sjmjys954646 and others added 29 commits November 4, 2023 11:17
@sjmjys954646
feat : testcode update
ee726e0
@sjmjys954646
fix : interest list to interest
159b3cc
@sjmjys954646
feat : findUserCategory sevice
7c23c26 
서비스부분 테스트 해야됨
@sjmjys954646
Merge pull request #55 from cosmos-1885/feature/1-branch-account
4fe78cf 
User 및 JWT Token 업데이트
@choboss00
fix : deleteMapping 은 request 를 받지 않으니 Error 제거
5d0e93e 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
fix : 멘티의 state 가 나오지 않던 버그 수정
a21269a 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
fix : user 인증
6221e1d 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
feat : 인증 메소드 추가
7e3e69d 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
fix : 파라미터 이름 수정
d40d684 
Signed-off-by: Jin_00 <[email protected]>
@choboss00
test : mentorPost 테스트 코드 추가 작성
04555f2 
Signed-off-by: Jin_00 <[email protected]>
@comom87
Merge pull request #56 from sjmjys954646/feature/2-branch-watching
9b151ea 
Feature/2 branch watching
@sjmjys954646
feat : random 4 usercategory native query
84639e8
@sjmjys954646
Merge branch 'master' of https://github.com/Step3-kakao-tech-campus/T…
2d17601 
…eam18_BE into feature/2-branch-watching
@sjmjys954646
feat : video show all
953f6fe
@sjmjys954646
fix : videoResponse single
d750b8b
@choboss00
Merge branch 'feature/1-branch-account' into feature/1-branch-account
33f2ae1
@choboss00
Merge pull request #22 from Step3-kakao-tech-campus/feature/1-branch-…
f887cb4 
…account

Feature/1 branch account
@choboss00
Merge pull request #23 from Step3-kakao-tech-campus/feature/2-branch-…
5f92687 
…watching

Feature/2 branch watching
@choboss00
Merge pull request #59 from choboss00/feature/2-branch-watching
8ac0bc2 
feature1, 3 merge
@choboss00
fix : 파일 이름 수정 및 테스트 파일 삭제
39333c3 
Signed-off-by: Jin_00 <[email protected]>
@sjmjys954646
feat : category filtering
a8c3ffe
@sjmjys954646
Merge pull request #60 from choboss00/feature/2-branch-watching
4bf9ffb 
파일 이름 수정 및 테스트 파일 삭제
@sjmjys954646
merge
4ba5445
@sjmjys954646
Merge pull request #58 from sjmjys954646/feature/2-branch-watching
86f2291 
Feature/2 branch watching
@sjmjys954646
feat : video view add restcontroller
158803d 
view추가 restcontroller
@sjmjys954646
feat : service add view
1ad39f4
@sjmjys954646
feat : add request post
f4e6f5b
@sjmjys954646
feat : history add, view add
72e3755
@choboss00
Merge pull request #61 from sjmjys954646/feature/2-branch-watching
903fce6 
Feature/2 branch watching
@sjmjys954646 sjmjys954646 merged commit f1a8abb into weekly Nov 5, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@choboss00 @sjmjys954646 @comom87