Merge pull request #184 from Review-zip/dev

[Dev] main merge

src/main/java/com/example/ReviewZIP/domain/follow/FollowsRepository.java

@@ -1,25 +1,15 @@
 package com.example.ReviewZIP.domain.follow;
 
 import com.example.ReviewZIP.domain.user.Users;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
 
 
 @Repository
 public interface FollowsRepository extends JpaRepository<Follows, Long> {
-    List<Follows> findAllBySender(Users sender);
-    List<Follows> findAllByReceiver(Users user);
-
     Follows getBySenderAndReceiver(Users sender, Users receiver);
 
-    Integer countBySenderId(Long userId);
-
-    Integer countByReceiverId(Long userid);
-
     boolean existsBySenderAndReceiver(Users sender, Users receiver);
 
 }

src/main/java/com/example/ReviewZIP/domain/image/ImageConverter.java

@@ -1,15 +1,21 @@
 package com.example.ReviewZIP.domain.image;
 
-import com.example.ReviewZIP.domain.image.dto.response.UploadImageResponseDto;
+import com.example.ReviewZIP.domain.image.dto.response.ImageResponseDto;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Component
 public class ImageConverter {
-    public static UploadImageResponseDto toUploadImageDto(List<Images> imagesList) {
-        List<Long> imageIds = imagesList.stream().map(Images::getId).collect(Collectors.toList());
-        return new UploadImageResponseDto(imageIds);
+
+    public static ImageResponseDto.ImageDto toImageDto(Images image){
+        return ImageResponseDto.ImageDto.builder()
+                .imageId(image.getId())
+                .imageUrl(image.getUrl())
+                .build();
+    }
+    public static List<ImageResponseDto.ImageDto> toUploadImageDto(List<Images> imagesList) {
+        return imagesList.stream().map(ImageConverter::toImageDto).collect(Collectors.toList());
     }
 }

src/main/java/com/example/ReviewZIP/domain/image/ImagesController.java

@@ -1,10 +1,8 @@
 package com.example.ReviewZIP.domain.image;
 
-import com.example.ReviewZIP.domain.image.dto.response.UploadImageResponseDto;
+import com.example.ReviewZIP.domain.image.dto.response.ImageResponseDto;
 import com.example.ReviewZIP.global.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
@@ -26,9 +24,9 @@ public class ImagesController {
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "SEARCH203",description = "OK, 성공"),
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "IMAGE402", description = "이미지 업로드 실패",content = @Content(schema = @Schema(implementation = ApiResponse.class))),
     })
-    public ApiResponse<UploadImageResponseDto> uploadImage(@PathVariable(name="userId") Long userId, @RequestParam("fileList") List<MultipartFile> fileList){
+    public ApiResponse<List<ImageResponseDto.ImageDto>> uploadImage(@PathVariable(name="userId") Long userId, @RequestParam("fileList") List<MultipartFile> fileList){
         List<Images> imageList = imageService.uploadImage(fileList, userId);
-        UploadImageResponseDto imageResponseDto = ImageConverter.toUploadImageDto(imageList);
-        return ApiResponse.onSuccess(imageResponseDto);
+        List<ImageResponseDto.ImageDto> imageDtoList = ImageConverter.toUploadImageDto(imageList);
+        return ApiResponse.onSuccess(imageDtoList);
     }
 }

src/main/java/com/example/ReviewZIP/domain/image/dto/response/ImageResponseDto.java

@@ -0,0 +1,18 @@
+package com.example.ReviewZIP.domain.image.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+public class ImageResponseDto {
+
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Getter
+    public static class ImageDto{
+        private Long imageId;
+        private String imageUrl;
+    }
+}