Merge branch 'dev' into feature/2

build.gradle

@@ -34,7 +34,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
     // s3 설정 관련
-//    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 }
 
 tasks.named('test') {

src/main/java/com/cloneweek/hanghaebnb/common/config/WebSecurityConfig.java

@@ -31,15 +31,17 @@ public PasswordEncoder passwordEncoder() {
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         // CSRF 설정
         http.csrf().disable();
+
         http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+
         http.httpBasic().disable()
                 .authorizeRequests()
                 .antMatchers("/api/users/**").permitAll()
                 .antMatchers(HttpMethod.GET, "/**").permitAll()
+
                 .anyRequest().authenticated()
                 .and()
-                .addFilterBefore(new JwtAuthFilter(jwtUtil),
-                        UsernamePasswordAuthenticationFilter.class);
+                .addFilterBefore(new JwtAuthFilter(jwtUtil),UsernamePasswordAuthenticationFilter.class);
         http.cors();
 
         return http.build();

src/main/java/com/cloneweek/hanghaebnb/common/exception/ErrorResponse.java

@@ -6,7 +6,8 @@
 
 @Getter
 @Builder
-public class ErrorResponse {
+public class
+ErrorResponse {
 
     private final int statusCode;
     private final String message;

src/main/java/com/cloneweek/hanghaebnb/common/exception/StatusMsgCode.java

@@ -30,6 +30,9 @@ public enum StatusMsgCode {
 //
 //    /* 409 CONFLICT : Resource의 현재 상태와 충돌, 보통 중복된 데이터 존재 */
     DUPLICATE_RESOURCE(HttpStatus.CONFLICT, "데이터가 이미 존재합니다."),
+    ALREADY_CLICKED_LIKE(HttpStatus.CONFLICT, "이미 좋아요를 눌렀습니다"),
+    ALREADY_CANCEL_LIKE(HttpStatus.CONFLICT, "이미 좋아요 취소를 눌렀습니다"),
+
 //
 //    /* 500 INTERNAL_SERVER_ERROR */
 //    INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버가 없습니다.");
@@ -40,7 +43,10 @@ public enum StatusMsgCode {
     LIKE(HttpStatus.OK, "좋아요 성공"),
     CANCEL_LIKE(HttpStatus.OK, "좋아요 취소"),
     DELETE_POST(HttpStatus.OK, "게시글을 삭제하였습니다"),
-    DELETE_COMMENT(HttpStatus.OK, "댓글을 삭제하였습니다");
+    DONE_POST(HttpStatus.OK, "숙소 등록 완료"),
+    DELETE_COMMENT(HttpStatus.OK, "댓글을 삭제하였습니다"),
+    NICKNAME(HttpStatus.OK, "사용 가능한 닉네임입니다."),
+    EMAIL(HttpStatus.OK, "사용 가능한 이메일입니다.");
 
 
     private final HttpStatus httpStatus;

src/main/java/com/cloneweek/hanghaebnb/common/s3/AmazonS3Config.java

@@ -0,0 +1,32 @@
+package com.cloneweek.hanghaebnb.common.s3;
+
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AmazonS3Config {
+
+    @Value("${cloud.aws.credentials.accessKey}")                        //S3 accessKey
+    private String accessKey;
+
+    @Value("${cloud.aws.credentials.secretKey}")                        //S3 secretKey
+    private String secretKey;
+
+    @Value("${cloud.aws.region.static}")                                //S3 region
+    private String region;
+
+    @Bean
+    public AmazonS3Client amazonS3Client() {
+        BasicAWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey);
+
+        return (AmazonS3Client) AmazonS3ClientBuilder.standard()
+                .withRegion(region)
+                .withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
+                .build();
+    }
+}

src/main/java/com/cloneweek/hanghaebnb/common/s3/AmazonS3Controller.java

@@ -0,0 +1,30 @@
+package com.cloneweek.hanghaebnb.common.s3;
+
+import com.cloneweek.hanghaebnb.common.security.UserDetailsImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api")
+public class AmazonS3Controller {
+
+    private final AmazonS3Service s3Service;
+
+    // @PostMapping(value = "/upload", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
+    // public String uploadImage(@RequestPart List<MultipartFile> imagelist,
+    //                           @AuthenticationPrincipal UserDetailsImpl userDetails) throws IOException{
+    //    s3Service.upload(imagelist,"static",userDetails.getUser());
+    //    return "success";
+    // }
+}

src/main/java/com/cloneweek/hanghaebnb/common/s3/AmazonS3Service.java

@@ -0,0 +1,99 @@
+package com.cloneweek.hanghaebnb.common.s3;
+
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.CannedAccessControlList;
+import com.amazonaws.services.s3.model.DeleteObjectRequest;
+import com.amazonaws.services.s3.model.PutObjectRequest;
+import com.cloneweek.hanghaebnb.entity.ImageFile;
+import com.cloneweek.hanghaebnb.entity.Room;
+import com.cloneweek.hanghaebnb.entity.User;
+import com.cloneweek.hanghaebnb.repository.ImageFileRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+@Service
+public class AmazonS3Service {
+
+
+    private final AmazonS3Client amazonS3Client;
+    private final ImageFileRepository imageFileRepository;
+
+    @Value("${cloud.aws.s3.bucket}")                                                        //bucket 이름
+    public String bucket;
+
+
+        public void upload(List<MultipartFile> multipartFilelist, String dirName, Room room, User user) throws IOException {
+
+            for (MultipartFile multipartFile : multipartFilelist){
+                if (multipartFile != null){
+                    File uploadFile = convert(multipartFile).orElseThrow(() -> new IllegalArgumentException("파일 전환 실패"));
+                    ImageFile imageFile = new ImageFile(upload(uploadFile, dirName), user,room); //url, user, room 정보 저장
+                    imageFileRepository.save(imageFile);
+                }
+            }
+    }
+
+    // S3로 파일 업로드하기
+    private String upload(File uploadFile, String dirName) {
+        String fileName = dirName + "/" + UUID.randomUUID(); // S3에 저장된 파일 이름
+        String uploadImageUrl = putS3(uploadFile, fileName); // s3로 업로드
+        removeNewFile(uploadFile);
+        return uploadImageUrl;
+    }
+
+    // S3로 업로드
+    private String putS3(File uploadFile, String fileName) {
+        amazonS3Client.putObject(new PutObjectRequest(bucket, fileName, uploadFile).withCannedAcl(CannedAccessControlList.PublicRead));
+        return amazonS3Client.getUrl(bucket, fileName).toString();
+    }
+
+
+    // 로컬에 저장된 이미지 지우기
+    private void removeNewFile(File targetFile) {
+        if (targetFile.delete()) {
+            log.info("File delete success");
+            return;
+        }
+        log.info("File delete fail");
+    }
+
+    private Optional<File> convert(MultipartFile multipartFile) throws IOException {
+//        File convertFile = new File(System.getProperty("user.dir") + "/" + multipartFile.getOriginalFilename()); //이전코드 12.23 11:37
+        File convertFile = new File(multipartFile.getOriginalFilename());
+        // 바로 위에서 지정한 경로에 File이 생성됨 (경로가 잘못되었다면 생성 불가능)
+        if (convertFile.createNewFile()) {
+            try (FileOutputStream fos = new FileOutputStream(convertFile)) { // FileOutputStream 데이터를 파일에 바이트 스트림으로 저장하기 위함
+                fos.write(multipartFile.getBytes());
+            }
+            return Optional.of(convertFile);
+        }
+
+        return Optional.empty();
+    }
+
+    // find image from s3
+    public String getThumbnailPath(String path) {
+        return amazonS3Client.getUrl(bucket, path).toString();
+    }
+
+    //remove s3 object
+    public void deleteFile(String fileName){
+        DeleteObjectRequest request = new DeleteObjectRequest(bucket, fileName);
+        amazonS3Client.deleteObject(request);
+    }
+
+}

src/main/java/com/cloneweek/hanghaebnb/controller/RoomController.java

@@ -9,10 +9,13 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 @RestController
@@ -21,23 +24,48 @@
 public class RoomController {
     private final RoomService roomService;
 
-    @PostMapping("/rooms")
-    public ResponseEntity<RoomResponseDto> createRoom(@RequestBody RoomRequestDto requestDto, @AuthenticationPrincipal UserDetailsImpl userDetails) {
-        return ResponseEntity.ok(roomService.createRoom(requestDto, userDetails.getUser()));
+    //숙소 등록
+    @PostMapping(value = "/rooms",consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
+    public ResponseEntity<ResponseMsgDto> createRoom(@RequestPart(value = "data") RoomRequestDto requestDto,
+                                                      @RequestPart(value = "file")  List<MultipartFile> multipartFilelist,
+                                                      @AuthenticationPrincipal UserDetailsImpl userDetails) throws IOException {
+        return ResponseEntity.ok(roomService.createRoom(requestDto, userDetails.getUser(),multipartFilelist));
     }
 
+    //숙소 전체 조회
     @GetMapping("/rooms")
-    public ResponseEntity<Page<Room>> getRooms(Pageable pageable) { // size /api/rooms?page=0&size=3
-        return ResponseEntity.ok(roomService.getRooms(pageable));
+    public ResponseEntity<Page<Room>> getRooms(@AuthenticationPrincipal UserDetailsImpl userDetails, Pageable pageable) { // size /api/rooms?page=0&size=3
+        return ResponseEntity.ok(roomService.getRooms(pageable, userDetails.getUser()));
     }
 
+    //숙수 정보 수정
+    @CrossOrigin
     @PatchMapping("/rooms/{roomId}")
-    public ResponseEntity<RoomResponseDto> updateRoom(@PathVariable Long roomId, @RequestBody RoomRequestDto requestDto, @AuthenticationPrincipal UserDetailsImpl userDetails) {
-        return ResponseEntity.ok(roomService.update(roomId, requestDto, userDetails.getUser()));
+    public ResponseEntity<RoomResponseDto> updateRoom(@PathVariable Long roomId,
+                                                      @RequestPart(value = "data") RoomRequestDto requestDto,
+                                                      @RequestPart(value = "file")  List<MultipartFile> multipartFilelist,
+                                                      @AuthenticationPrincipal UserDetailsImpl userDetails) throws IOException {
+        return ResponseEntity.ok(roomService.update(roomId, requestDto, userDetails.getUser(),multipartFilelist));
     }
 
-    @DeleteMapping("rooms/{roomId}")
+    //숙소 삭제
+    @DeleteMapping("/rooms/{roomId}")
     public ResponseEntity<ResponseMsgDto> deleteRoom(@PathVariable Long roomId, @AuthenticationPrincipal UserDetailsImpl userDetails) {
         return ResponseEntity.ok(roomService.delete(roomId, userDetails.getUser()));
     }
+    // 숙소 좋아요
+    @PostMapping("/rooms/{roomId}/like")
+    public ResponseEntity<ResponseMsgDto> saveLike(
+            @PathVariable Long roomId,
+            @AuthenticationPrincipal UserDetailsImpl userDetails) {
+        return ResponseEntity.ok().body(roomService.saveLike(roomId, userDetails.getUser()));
+    }
+
+    // 게시글 좋아요 취소
+    @DeleteMapping("/rooms/{roomId}/like")
+    public ResponseEntity<ResponseMsgDto> cancelLike(
+            @PathVariable Long roomId,
+            @AuthenticationPrincipal UserDetailsImpl userDetails) {
+        return ResponseEntity.ok().body(roomService.cancelLike(roomId, userDetails.getUser()));
+    }
 }

src/main/java/com/cloneweek/hanghaebnb/controller/UserController.java

@@ -1,17 +1,16 @@
 package com.cloneweek.hanghaebnb.controller;
 
+import com.cloneweek.hanghaebnb.common.exception.StatusMsgCode;
 import com.cloneweek.hanghaebnb.dto.LoginRequestDto;
 import com.cloneweek.hanghaebnb.dto.ResponseMsgDto;
 import com.cloneweek.hanghaebnb.dto.SignupRequestDto;
 import com.cloneweek.hanghaebnb.service.UserService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
@@ -26,28 +25,28 @@ public class UserController {
     @PostMapping("/signup")
     public ResponseEntity<ResponseMsgDto> signup(@RequestBody @Valid SignupRequestDto dto) {
         userService.signup(dto);
-        return ResponseEntity.ok(new ResponseMsgDto(HttpStatus.OK.value(), "회원가입 성공!"));
+        return ResponseEntity.ok(new ResponseMsgDto(StatusMsgCode.SIGN_UP));
     }
 
     // 로그인
     @PostMapping("/login")
     public ResponseEntity<ResponseMsgDto> login(@RequestBody LoginRequestDto dto, HttpServletResponse response) {
         userService.login(dto, response);
-        return ResponseEntity.ok(new ResponseMsgDto(HttpStatus.OK.value(), "로그인 성공!"));
+        return ResponseEntity.ok(new ResponseMsgDto(StatusMsgCode.LOG_IN));
     }
 
     // 이메일 중복 확인
     @PostMapping("/email-check")
     public ResponseEntity<ResponseMsgDto> idCheck(@RequestBody @Valid SignupRequestDto dto) {
         userService.emailCheck(dto);
-        return ResponseEntity.ok(new ResponseMsgDto(HttpStatus.OK.value(), "사용 가능한 이메일입니다."));
+        return ResponseEntity.ok(new ResponseMsgDto(StatusMsgCode.EMAIL));
     }
 
     // 닉네임 중복 확인
     @PostMapping("/nick-check")
     public ResponseEntity<ResponseMsgDto> nickCheck(@RequestBody SignupRequestDto dto) {
         userService.nickCheck(dto);
-        return ResponseEntity.ok(new ResponseMsgDto(HttpStatus.OK.value(), "사용 가능한 닉네임입니다."));
+        return ResponseEntity.ok(new ResponseMsgDto(StatusMsgCode.NICKNAME));
     }
 
 }

src/main/java/com/cloneweek/hanghaebnb/dto/ResponseMsgDto.java

@@ -1,7 +1,9 @@
 package com.cloneweek.hanghaebnb.dto;
 
+import com.cloneweek.hanghaebnb.common.exception.StatusMsgCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.springframework.http.HttpStatus;
 
 @Getter
 @NoArgsConstructor
@@ -10,11 +12,14 @@ public class ResponseMsgDto {
     private int statusCode;
     private String message;
 
-    public ResponseMsgDto(int statusCode) {
-        this.statusCode = statusCode;
-    }
     public ResponseMsgDto(int statusCode, String message) {
         this.statusCode = statusCode;
         this.message = message;
     }
+
+    public ResponseMsgDto(StatusMsgCode statusMsgCode){
+        this.statusCode = statusMsgCode.getHttpStatus().value();
+        this.message = statusMsgCode.getDetail();
+
+    }
 }