Feature/140 Conflict Resolve

src/main/java/zipdabang/server/service/serviceImpl/MemberServiceImpl.java

@@ -75,8 +75,11 @@ 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;

src/main/java/zipdabang/server/web/controller/MemberRestController.java

@@ -24,6 +24,10 @@
 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;
@@ -315,8 +319,8 @@ public ResponseDto<MemberResponseDto.TempLoginDto> tempLogin() {
     @Parameters({
             @Parameter(name = "member", hidden = true),
     })
-    @PostMapping(value = "/members/inquiries",consumes ={ MediaType.MULTIPART_FORM_DATA_VALUE } )
-    public ResponseDto<MemberResponseDto.MemberInqueryResultDto> createInquery(@CheckTempMember @AuthMember Member member, @ModelAttribute @Valid MemberRequestDto.InqueryDto request){
+    @PostMapping(value = "/members/inquiries", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
+    public ResponseDto<MemberResponseDto.MemberInqueryResultDto> createInquery(@CheckTempMember @AuthMember Member member, @ModelAttribute @Valid MemberRequestDto.InqueryDto request) {
         Inquery inquery = memberService.createInquery(member, request);
         return ResponseDto.of(MemberConverter.toMemberInqueryResultDto(inquery));
     }
@@ -333,11 +337,12 @@ public ResponseDto<MemberResponseDto.MemberInqueryResultDto> createInquery(@Chec
             @ApiResponse(responseCode = "4055", description = "BAD_REQEUST , 페이지 번호가 초과함", content = @Content(schema = @Schema(implementation = ResponseDto.class))),
 
     })
-    public ResponseDto<MemberResponseDto.InqueryListDto> showInquery(@CheckTempMember @AuthMember Member member, @RequestParam(name = "page",required = true) @CheckPage Integer page){
+    public ResponseDto<MemberResponseDto.InqueryListDto> showInquery(@CheckTempMember @AuthMember Member member, @RequestParam(name = "page", required = true) @CheckPage Integer page) {
         Page<Inquery> inqueryPage = memberService.findInquery(member, page);
         return ResponseDto.of(MemberConverter.toInqueryListDto(inqueryPage));
     }
-    @Operation(summary = "[figma 더보기 - 회원 탈퇴] 회원 탈퇴 API ✔️🔑", description = "회원 탈퇴 API입니다.<br> 테스트를 위해 임시로 해당 유저의 상세주소를 \"TEST\" 로 설정하면(상세정보 수정 API - zipCode) 탈퇴 불가능한 경우로 처리되도록 해놨습니다.<br> deregisterTypes 종류 <br>"+
+
+    @Operation(summary = "[figma 더보기 - 회원 탈퇴] 회원 탈퇴 API ✔️🔑", description = "회원 탈퇴 API입니다.<br> 테스트를 위해 임시로 해당 유저의 상세주소를 \"TEST\" 로 설정하면(상세정보 수정 API - zipCode) 탈퇴 불가능한 경우로 처리되도록 해놨습니다.<br> deregisterTypes 종류 <br>" +
             "- NOTHING_TO_BUY(\"사고싶은 물건이 없어요.\"),<br>" +
             "- DISINTERESTED(\"앱을 이용하지 않아요.\"),<br>" +
             "- UNCOMFORTABLE(\"앱 이용이 불편해요.\"),<br>" +
@@ -411,6 +416,7 @@ else if (page < 1)
         Page<Member> blockedMembers = memberService.findBlockedMember(page, member);
         return ResponseDto.of(MemberConverter.toPagingMemberListDto(blockedMembers));
     }
+}
 
 
     @Operation(summary = "🎪팔로우하기 API", description = "팔로우하기 API 입니다.")
@@ -457,4 +463,4 @@ public ResponseDto<MemberResponseDto.FollowerListDto> getFollowerMember(@CheckPa
         Page<Follow> follower = memberService.findFollower(member, page);
         return ResponseDto.of(MemberConverter.toFollowerListDto(follower, member));
     }
-}
+}

src/main/resources/application.yml

@@ -14,11 +14,9 @@ spring:
 ##  # local redis
 #  redis:
 #    host: localhost
-  redis:
-    briefing-redis.bjyb5r.ng.0001.apne1.cache.amazonaws.com
 
-#  redis:
-#    host: zipdabang-redis.osattk.ng.0001.apn2.cache.amazonaws.com
+  redis:
+    host: zipdabang-redis.osattk.ng.0001.apn2.cache.amazonaws.com
   batch:
     jdbc:
       initialize-schema: always