Main page recieved feedback

build.gradle

@@ -35,8 +35,12 @@ dependencies {
 	// S3
 	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 
-	// h2 db 추가
-	implementation "com.h2database:h2"
+
+	//ModelMapper 라이브러리 추가
+	implementation 'org.modelmapper:modelmapper:2.4.2'
+
+	//파일 관련
+	implementation 'org.apache.pdfbox:pdfbox:2.0.24'
 }
 
 tasks.named('test') {

src/main/java/Remoa/BE/Member/Controller/FollowController.java

@@ -4,18 +4,13 @@
 import Remoa.BE.Member.Service.FollowService;
 import Remoa.BE.Member.Service.MemberService;
 import Remoa.BE.exception.CustomMessage;
-import Remoa.BE.exception.response.ErrorResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -27,7 +22,6 @@
 @RestController
 @Slf4j
 @RequiredArgsConstructor
-@CrossOrigin(origins = "*")
 public class FollowController {
 
     private final FollowService followService;

src/main/java/Remoa/BE/Member/Controller/KakaoController.java

@@ -5,21 +5,21 @@
 import Remoa.BE.Member.Dto.Res.ResSignupDto;
 import Remoa.BE.Member.Service.KakaoService;
 import Remoa.BE.Member.Service.MemberService;
+import Remoa.BE.Member.Service.ProfileService;
 import Remoa.BE.exception.CustomMessage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Random;
 
 import static Remoa.BE.exception.CustomBody.*;
 import static Remoa.BE.utill.MemberInfo.*;
@@ -28,12 +28,13 @@
 @RestController
 @Slf4j
 @RequiredArgsConstructor
-@CrossOrigin(origins = "*") // 프론트에서 추가 요청
 public class KakaoController {
 
+
+
     private final KakaoService ks;
     private final MemberService memberService;
-    private final HttpSession httpSession;
+    private final ProfileService profileService;
 
     /**
      * 카카오 로그인을 통해 code를 query string으로 받아오면, 코드를 통해 토큰, 토큰을 통해 사용자 정보를 얻어와 db에 해당 사용자가 존재하는지 여부를
@@ -62,41 +63,41 @@ public ResponseEntity<Object> getCI(@RequestParam String code, HttpServletReques
         if (member.isPresent()) {
             securityLoginWithoutLoginForm(member.get(), request);
             //if문에 걸리지 않았다면 이미 회원가입이 진행돼 db에 kakaoId가 있는 유저이므로 kakaoMember가 존재하므로 LoginController처럼 로그인 처리 하면 됩니다.
-            return successResponse(CustomMessage.OK, userInfo);
+            return successResponse(CustomMessage.OK, member.get().getNickname());
 
         } else {
             //kakaoId가 db에 없으므로 kakaoMember가 null이므로 회원가입하지 않은 회원. 따라서 회원가입이 필요하므로 회원가입하는 uri로 redirect 시켜주어야 함.
             return successResponse(CustomMessage.OK_SIGNUP, userInfo);
         }
     }
 
-    /**
-     * 카카오 로그인을 우회해 테스트 하기 위한 용도로 추가됨.
-     * @param kakaoId
-     * @return ResponseEntity
-     */
-    @PostMapping("/login/kakao/test")
-    public ResponseEntity<Object> testLogin(@RequestBody Integer kakaoId, HttpServletRequest request) {
-        log.warn("kakaoId = {}", kakaoId);
-        Optional<Member> findMember = memberService.findByKakaoId(Long.valueOf(kakaoId));
-        if (findMember.isPresent()) {
-            Member member = findMember.get();
-            securityLoginWithoutLoginForm(member, request);
-            return successResponse(CustomMessage.OK, member);
-        }
-        return failResponse(CustomMessage.VALIDATED, "User Not Exist");
-    }
-
     /**
      * front-end에서 회원가입에 필요한 정보를 넘겨주면 KakaoSignupForm으로 받아 회원가입을 진행시켜줌
      */
     @PostMapping("/signup/kakao")
-    public ResponseEntity<Object> signupKakaoMember(@RequestBody @Validated ReqSignupDto form, HttpServletRequest request) {
+    public ResponseEntity<Object> signupKakaoMember(@RequestBody @Validated ReqSignupDto form, HttpServletRequest request) throws IOException {
 
         Member member = new Member();
+
+        member.setNickname(form.getNickname());
+
+        //닉네임 사용 가능하면 그대로 진행, 불가능하면 임의 닉네임 "유저-{randomInt}로 지정.
+        Boolean nicknameDuplicate = memberService.isNicknameDuplicate(form.getNickname());
+        while (nicknameDuplicate) { //특수문자는 닉네임에 사용할 수 없으나 임의로 지정하는 닉네임에는 사용 가능하게 해서 또 다른 중복 문제 없게끔.
+            Random random = new Random();
+            String randomNumber = Integer.toString((random.nextInt(900_000) + 100_000)); // 100_000 ~ 999_999
+            nicknameDuplicate = memberService.isNicknameDuplicate("유저-" + randomNumber);
+            member.setNickname("유저-" + randomNumber);
+        }
+
+        form.setProfileImage(profileService.editProfileImg(form.getNickname(), form.getProfileImage()));
+
+        //카카오에서 받은 프로필 사진 url 링크를 토대로 s3에 저장
+        if (memberService.findByKakaoId(form.getKakaoId()).isPresent()) {
+            return failResponse(CustomMessage.VALIDATED, "kakaoId가 이미 가입되어 있습니다.");
+        }
         member.setKakaoId(form.getKakaoId());
         member.setEmail(form.getEmail());
-        member.setNickname(form.getNickname());
         member.setProfileImage(form.getProfileImage());
         member.setTermConsent(form.getTermConsent());
 
@@ -114,39 +115,22 @@ public ResponseEntity<Object> signupKakaoMember(@RequestBody @Validated ReqSignu
         return successResponse(CustomMessage.OK,result);
     }
 
-    /**
-     *자동 로그인 추후에
-     */
-/*
-    @GetMapping("/login")
-    public ResponseEntity<Object> autoLogin(){
-       Long kaKaoId = getKaKaoId();
-       Optional<Member> member = memberService.findByKakaoId(kaKaoId);
-       if(member.isPresent()){
-           return successResponse(CustomMessage.OK,member);
-       }
-       else{
-           return errorResponse(CustomMessage.UNAUTHORIZED);
-       }
-
-    }
-*/
-
     /**
      * 로그아웃 기능
      세션무효화, jsession쿠키를 제거,
      */
-    @PostMapping("/user/logout")
-    public ResponseEntity<Object> logout(HttpServletResponse response){
+    @PostMapping ("/user/logout")
+    public ResponseEntity<Object> logout(HttpServletRequest request){
+        if(authorized(request)) {
+
+            SecurityContextHolder.clearContext();
+            request.getSession().invalidate();
 
-        SecurityContextHolder.clearContext(); // 현재 SecurityContext를 제거합니다.
-        httpSession.invalidate(); // HttpSession을 무효화합니다.
+            return new ResponseEntity<>(HttpStatus.OK);
+
+        }
 
-        Cookie myCookie = new Cookie("JSESSIONID", null);
-        myCookie.setMaxAge(0); // 쿠키의 expiration 타임을 0으로 하여 없앤다.
-        myCookie.setPath("/"); // 모든 경로에서 삭제 됬음을 알린다.
-        response.addCookie(myCookie);
-        return successResponse(CustomMessage.OK,myCookie);
+        return errorResponse(CustomMessage.UNAUTHORIZED);
     }
 
 

src/main/java/Remoa/BE/Member/Controller/ProfileController.java

@@ -1,74 +1,148 @@
 package Remoa.BE.Member.Controller;
 
+import Remoa.BE.Member.Domain.AwsS3;
 import Remoa.BE.Member.Domain.Member;
 import Remoa.BE.Member.Dto.Req.EditProfileForm;
+import Remoa.BE.Member.Dto.Res.ResUserInfoDto;
+//import Remoa.BE.Member.Service.ImageService;
+import Remoa.BE.Member.Service.AwsS3Service;
 import Remoa.BE.Member.Service.MemberService;
 import Remoa.BE.Member.Service.ProfileService;
 import Remoa.BE.exception.CustomMessage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+
 
 import static Remoa.BE.exception.CustomBody.*;
+import static Remoa.BE.utill.MemberInfo.authorized;
+import static Remoa.BE.utill.MemberInfo.getMemberId;
 
 @Slf4j
 @RestController
 @RequiredArgsConstructor
-@CrossOrigin(origins = "*")
 public class ProfileController {
 
     private final ProfileService profileService;
-
     private final MemberService memberService;
+    private final AwsS3Service awsS3Service;
 
     // 프로필 수정 범위 : 닉네임(중복확인), 핸드폰번호, 대학교, 한줄소개
     @GetMapping("/user")
-    public ResponseEntity<Object> userHome(HttpServletRequest request) {
-
-        HttpSession session = request.getSession();
-        // 현재 로그인한 사용자의 세션 가져오기
-        Member loginMember = (Member) session.getAttribute("loginMember");
-
-        // 세션이 없으면 로그인 페이지로 이동
-        if (loginMember == null) {
-            return failResponse(CustomMessage.VALIDATED, "redirect:/login/kakao");
+    public ResponseEntity<Object> userInfo(HttpServletRequest request) {
+
+        if(authorized(request)) {
+            Long memberId = getMemberId();
+            // 로그인된 사용자의 정보를 db에서 다시 불러와 띄워줌.
+            Member member = memberService.findOne(memberId);
+            ResUserInfoDto resUserInfoDto = ResUserInfoDto.builder()
+                    .email(member.getEmail())
+                    .nickname(member.getNickname())
+                    .phoneNumber(member.getPhoneNumber())
+                    .university(member.getUniversity())
+                    .oneLineIntroduction(member.getOneLineIntroduction())
+                    .build();
+            return successResponse(CustomMessage.OK, resUserInfoDto);
         }
 
-        // 로그인된 사용자의 정보를 db에서 다시 불러와 띄워줌.
-        Member member = memberService.findOne(loginMember.getMemberId());
-        return successResponse(CustomMessage.OK, member);
+        return errorResponse(CustomMessage.UNAUTHORIZED);
+
     }
 
-    // RESTful API에서 PUT 매핑은 수정할 리소스를 명확하게 지정해야 하는데 이 경우에는 URL에 리소스 ID를 명시하는 것이 일반적이다.
-    // 그런데 우리는 수정할 사용자의 정보를 모두 입력받아 수정하는 형태이기 때문에
-    // URL에 리소스 ID를 명시할 필요가 없어서 PUT대신 POST 매핑을 사용하였습니다.
-    @PostMapping("/user")
+    @PutMapping("/user")
     public ResponseEntity<Object> editProfile(@RequestBody EditProfileForm form, HttpServletRequest request) {
-        HttpSession session = request.getSession();
-        Member loginMember = (Member) session.getAttribute("loginMember");
 
-        if (loginMember == null) {
-            // 로그인되어 있지 않은 경우 로그인 페이지로 이동
-            return failResponse(CustomMessage.VALIDATED, "로그인하지 않은 회원입니다. <redirect:/login/kakao> 로 redirect");
+        if(authorized(request)){
+            Long memberId = getMemberId();
+
+            Member myMember = memberService.findOne(memberId);
+            log.info(myMember.getNickname());
+            if(memberService.isNicknameDuplicate(myMember.getNickname())) {
+
+                // 사용자의 입력 정보를 DTO에 담아 서비스로 전달
+                profileService.editProfile(memberId, form);
+                ResUserInfoDto resUserInfoDto = ResUserInfoDto.builder()
+                        .email(myMember.getEmail())
+                        .nickname(myMember.getNickname())
+                        .phoneNumber(myMember.getPhoneNumber())
+                        .university(myMember.getUniversity())
+                        .oneLineIntroduction(myMember.getOneLineIntroduction())
+                        .build();
+
+                return successResponse(CustomMessage.OK, resUserInfoDto);
+            }
+
+            return errorResponse(CustomMessage.BAD_DUPLICATE);
+
         }
 
-        if (memberService.isNicknameDuplicate(form.getNickname())) {
-            return failResponse(CustomMessage.VALIDATED, "닉네임이 중복됩니다.");
+        // 수정이 완료되면 프로필 페이지로 이동
+        return errorResponse(CustomMessage.UNAUTHORIZED);
+    }
+
+
+    // 프로필 사진 불러오기
+    @GetMapping("/user/img")
+    public ResponseEntity<Object> showImage(HttpServletRequest request) {
+        if(authorized(request)) {
+            Long memberId = getMemberId();
+            Member myMember = memberService.findOne(memberId);
+            return successResponse(CustomMessage.OK, myMember.getProfileImage());
         }
+        return errorResponse(CustomMessage.UNAUTHORIZED);
+    }
 
-        // 사용자의 입력 정보를 DTO에 담아 서비스로 전달
-        EditProfileForm profileInfo = new EditProfileForm(
-                form.getNickname(), form.getPhoneNumber(), form.getUniversity(), form.getOneLineIntroduction());
-        profileService.editProfile(loginMember.getMemberId(), profileInfo);
+    // 프로필 사진 업로드
+    @PutMapping("/user/img")
+    public ResponseEntity<Object> upload(@RequestPart("file") MultipartFile multipartFile, HttpServletRequest request) throws IOException {
 
-        // 수정이 완료되면 프로필 페이지로 이동
-        return successResponse(CustomMessage.OK, "redirect:/user");
+        if(authorized(request)) {
+
+            Long memberId = getMemberId();
+            Member myMember = memberService.findOne(memberId);;
+
+            String editProfileImg = awsS3Service.editProfileImg(myMember.getProfileImage(), multipartFile);
+            myMember.setProfileImage(editProfileImg);
+            memberService.join(myMember);
+            return new ResponseEntity<>(HttpStatus.OK);
+        }
+        return errorResponse(CustomMessage.UNAUTHORIZED);
+    }
+
+    // 프로필 사진 삭제
+    @DeleteMapping("/user/img")
+    public ResponseEntity<Object> remove(HttpServletRequest request) throws MalformedURLException {
+        if(authorized(request)) {
+
+            Long memberId = getMemberId();
+            Member myMember = memberService.findOne(memberId);
+            if(myMember.getProfileImage() == null){
+                return errorResponse(CustomMessage.BAD_PROFILE_IMG);
+            }
+
+            awsS3Service.removeProfileUrl(myMember.getProfileImage());
+            myMember.setProfileImage(null);
+            memberService.join(myMember);
+            return new ResponseEntity<>(HttpStatus.OK);
+        }
+        return errorResponse(CustomMessage.UNAUTHORIZED);
     }
 
+
+
+
     /**
      * 프론트에서 닉네임 중복 검사를 할 때 사용할 메서드
      * @param nickname

src/main/java/Remoa/BE/Member/Controller/WithdrewController.java

@@ -15,7 +15,6 @@
 @RestController
 @Slf4j
 @RequiredArgsConstructor
-@CrossOrigin(origins = "*")
 public class WithdrewController {
 
     private final WithdrewService withdrewService;