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

Feature/140 Conflict Resolve #152

Merged
merged 9 commits into from
Oct 1, 2023
Merged

Feature/140 Conflict Resolve #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
37f734e
:sparkles: 유저 차단하기 API
HyoBN Sep 27, 2023
caf7b8f
:art: 사용하지 않는 API 삭제
HyoBN Sep 27, 2023
3187ffe
:sparkles: 유저 차단 해지, 차단 목록 조회 API
HyoBN Sep 28, 2023
63fc9f2
Merge branch 'develop' of https://github.com/zipdabang/Server into fe…
HyoBN Sep 30, 2023
792ddd5
Conflict Resolve
HyoBN Oct 1, 2023
f8b0f8b
Conflict Resolve
HyoBN Oct 1, 2023
0d8368d
Conflict Resolve
HyoBN Oct 1, 2023
f919e4e
Merge branch 'develop' of https://github.com/zipdabang/Server into fe…
HyoBN Oct 1, 2023
bba4b77
Conflict Resolve
HyoBN Oct 1, 2023
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
3 changes: 0 additions & 3 deletions src/main/java/zipdabang/server/service/serviceImpl/MemberServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,8 @@ public class MemberServiceImpl implements MemberService {
private final DeregisterRepository deregisterRepository;
private final DeregisterReasonRepository deregisterReasonRepository;
private final BlockedMemberRepository blockedMemberRepository;
<<<<<<< HEAD
=======

private final FollowRepository followRepository;
>>>>>>> a5dc21e0132e8f3e84329ab4d71729bbff08fef8

@Value("${paging.size}")
private Integer pageSize;
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/zipdabang/server/web/controller/MemberRestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
import zipdabang.server.base.Code;
import zipdabang.server.base.ResponseDto;
import zipdabang.server.base.exception.handler.MemberException;
<<<<<<< HEAD
import zipdabang.server.base.exception.handler.RecipeException;
=======
>>>>>>> a5dc21e0132e8f3e84329ab4d71729bbff08fef8
import zipdabang.server.converter.MemberConverter;
import zipdabang.server.domain.Category;
import zipdabang.server.domain.member.Follow;
Expand Down Expand Up @@ -416,7 +413,7 @@ else if (page < 1)
Page<Member> blockedMembers = memberService.findBlockedMember(page, member);
return ResponseDto.of(MemberConverter.toPagingMemberListDto(blockedMembers));
}
}



@Operation(summary = "🎪팔로우하기 API", description = "팔로우하기 API 입니다.")
Expand Down
Loading