[Weekly/10]: Reservation/unit test

src/main/java/org/ktc2/cokaen/wouldyouin/Image/api/ImageController.java

@@ -7,9 +7,13 @@
 import lombok.RequiredArgsConstructor;
 import org.ktc2.cokaen.wouldyouin.Image.api.dto.ImageResponse;
 import org.ktc2.cokaen.wouldyouin.Image.application.ImageServiceFactory;
+import org.ktc2.cokaen.wouldyouin.Image.application.ImageStorage;
 import org.ktc2.cokaen.wouldyouin._common.api.ApiResponse;
 import org.ktc2.cokaen.wouldyouin._common.api.ApiResponseBody;
 import org.ktc2.cokaen.wouldyouin._common.exception.FailToReadImageException;
+import org.ktc2.cokaen.wouldyouin.auth.Authorize;
+import org.ktc2.cokaen.wouldyouin.auth.MemberIdentifier;
+import org.ktc2.cokaen.wouldyouin.member.persist.MemberType;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -29,8 +33,10 @@ public class ImageController {
 
     private final ImageServiceFactory imageServiceFactory;
 
+    // Todo: authorize
     @PostMapping("/images")
-    public ResponseEntity<ApiResponseBody<List<ImageResponse>>> uploadImages(@RequestParam List<MultipartFile> images,
+    public ResponseEntity<ApiResponseBody<List<ImageResponse>>> uploadImages(
+        @RequestParam List<MultipartFile> images,
         @RequestParam(value = "type") ImageDomain imageDomain) {
         return ApiResponse.ok(imageServiceFactory.getImageServiceByImageType(imageDomain).saveAndCreateImages(images));
     }
@@ -44,9 +50,11 @@ public ResponseEntity<byte[]> getImage(@PathVariable String path) {
         }
     }
 
-    // Authorize 로직
+    // Todo: authorize
     @DeleteMapping("/images/{id}")
-    public ResponseEntity<ApiResponseBody<Void>> deleteImage(@PathVariable Long id, @RequestParam ImageDomain imageDomain) {
+    public ResponseEntity<ApiResponseBody<Void>> deleteImage(
+        @PathVariable Long id,
+        @RequestParam(value = "type") ImageDomain imageDomain) {
         imageServiceFactory.getImageServiceByImageType(imageDomain).deleteAndDelete(id);
         return ApiResponse.noContent();
     }

src/main/java/org/ktc2/cokaen/wouldyouin/Image/api/dto/ImageResponse.java

@@ -14,10 +14,11 @@ public class ImageResponse {
     private LocalDateTime createdDate;
     private Long size;
 
-    public static ImageResponse from(Image image) {
+    public static ImageResponse from(Image image, String domainName) {
+        System.out.println("도메인" + domainName);
         return ImageResponse.builder()
             .id(image.getId())
-            .url(image.getUrl())
+            .url(domainName + image.getUrl())
             .size(image.getSize())
             .createdDate(image.getCreatedDate())
             .build();

src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/AdvertisementImageService.java

@@ -18,12 +18,10 @@
 @RequiredArgsConstructor
 public class AdvertisementImageService extends ImageService<AdvertisementImage> {
 
-    @Value("${image.upload.ad.sub-path}")
-    private String subPath;
-
     private final ImageStorage imageStorage;
-
     private final AdvertisementImageRepository adImageRepository;
+    @Value("${image.upload.ad.sub-path}")
+    private String subPath;
 
     @Override
     protected ImageRepository<AdvertisementImage> getImageRepository() {

src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/EventImageService.java

@@ -1,18 +1,13 @@
 package org.ktc2.cokaen.wouldyouin.Image.application;
 
-import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.ktc2.cokaen.wouldyouin.Image.api.ImageDomain;
 import org.ktc2.cokaen.wouldyouin.Image.api.dto.ImageRequest;
-import org.ktc2.cokaen.wouldyouin.Image.persist.CurationImage;
 import org.ktc2.cokaen.wouldyouin.Image.persist.EventImage;
 import org.ktc2.cokaen.wouldyouin.Image.persist.EventImageRepository;
 import org.ktc2.cokaen.wouldyouin.Image.persist.ImageRepository;
-import org.ktc2.cokaen.wouldyouin._common.exception.EntityNotFoundException;
 import org.ktc2.cokaen.wouldyouin._common.exception.EntityParamIsNullException;
-import org.ktc2.cokaen.wouldyouin.advertisement.persist.Advertisement;
-import org.ktc2.cokaen.wouldyouin.curation.persist.CurationCard;
 import org.ktc2.cokaen.wouldyouin.event.persist.Event;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/ImageService.java

@@ -9,6 +9,7 @@
 import org.ktc2.cokaen.wouldyouin.Image.persist.ImageRepository;
 import org.ktc2.cokaen.wouldyouin._common.exception.EntityNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -20,6 +21,9 @@ public abstract class ImageService<T extends Image> {
     @Autowired
     protected ImageStorage imageStorage;
 
+    @Value("${spring.wouldyouin-domain-name}")
+    private String domainName;
+
     protected abstract ImageRepository<T> getImageRepository();
 
     protected abstract ImageDomain getImageDomain();
@@ -34,7 +38,7 @@ public T getById(Long id) {
     }
 
     protected ImageResponse create(ImageRequest imageRequest) {
-        return ImageResponse.from(getImageRepository().save(toEntity(imageRequest)));
+        return ImageResponse.from(getImageRepository().save(toEntity(imageRequest)), domainName);
     }
 
     protected void delete(Long id) {

src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/ImageStorage.java

@@ -4,11 +4,16 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
-import org.ktc2.cokaen.wouldyouin.Image.api.ImageDomain;
+import org.ktc2.cokaen.wouldyouin._common.exception.FailedToDeleteImageException;
+import org.ktc2.cokaen.wouldyouin._common.exception.FailedToUploadImageException;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClient;
 import org.springframework.web.multipart.MultipartFile;
 
 @Component
@@ -18,13 +23,38 @@ public class ImageStorage {
     private String commonPath;
 
     public String save(MultipartFile image, String subPath) {
-        String fileName = generateUuidName() + "." + getExtension(image);
-        Path path = Paths.get(commonPath, subPath, fileName);
+        String fileName = "";
         try {
+            fileName = generateUuidName() + "." + getExtension(image);
+            Path path = Paths.get(commonPath, subPath, fileName);
             Files.createDirectories(path.getParent());
             Files.write(path, image.getBytes());
         } catch (IOException ex) {
-            throw new RuntimeException("failed to upload image.");
+            throw new FailedToUploadImageException();
+        }
+        return subPath + "/" + fileName;
+    }
+
+    // Todo: payment랑 이부분 restclient 유틸로 빼기
+    public String save(String imageUrl, String subPath) {
+        RestClient client = RestClient.builder().build();
+        String fileName = "";
+        try {
+            ResponseEntity<byte[]> response = client.get()
+                .uri(imageUrl)
+                .retrieve()
+                .toEntity(byte[].class);
+
+            if (Optional.ofNullable(response).isPresent() && response.getStatusCode().is2xxSuccessful()) {
+                byte[] imageBytes = response.getBody();
+
+                fileName = generateUuidName() + "." + getExtension(imageUrl);
+                Path path = Paths.get(commonPath, subPath, fileName);
+                Files.createDirectories(path.getParent());
+                Files.write(path, response.getBody());
+            }
+        } catch (IOException ex) {
+            throw new FailedToUploadImageException();
         }
         return subPath + "/" + fileName;
     }
@@ -33,14 +63,19 @@ public void delete(String imagePath) {
         try {
             Files.deleteIfExists(Paths.get(imagePath));
         } catch (IOException ex) {
-            throw new RuntimeException("failed to delete image.");
+            throw new FailedToDeleteImageException();
         }
     }
 
     protected static String getExtension(MultipartFile image) {
         return Objects.requireNonNull(image.getContentType()).split("/")[1];
     }
 
+    protected static String getExtension(String imageUrl) {
+        String[] splitted = imageUrl.split("\\.");
+        return splitted[splitted.length - 1];
+    }
+
     private static String generateUuidName() {
         return UUID.randomUUID().toString().replace("-", "");
     }

src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/MemberImageService.java

@@ -61,35 +61,9 @@ public void setBaseMember(MemberImage image, BaseMember member) {
     }
 
     // TODO: imageUrl을 MemberImage로 변환하는 로직 추가 필요
+    // Todo: extension과 size 불러오기
     public MemberImage convert(String imageUrl) {
-
-        RestClient client = RestClient.builder().build();
-
-        try {
-            ResponseEntity<byte[]> response = client.get()
-                .uri(imageUrl)
-                .retrieve()
-                .toEntity(byte[].class);
-
-            // 요청 성공 시 이미지 저장
-            if (response != null && response.getStatusCode() == HttpStatus.OK) {
-                byte[] imageBytes = response.getBody();
-
-                if (imageBytes != null) {
-                    // 파일 이름과 경로 설정
-                    Path path = Paths.get("src/main/resources/static", subPath, "testFilename");
-                    Files.createDirectories(path.getParent());
-                    Files.write(path, response.getBody());
-                }
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException("failed to get image.");
-        }
-
-        return MemberImage.builder()
-            .url("http://example.com/images/MockMemberImageUrl")
-            .size(10L)
-            .extension(".jpeg")
-            .build();
+        var request = ImageRequest.of(imageStorage.save(imageUrl, subPath), 123123L, "jpg");
+        return memberImageRepository.save(toEntity(request));
     }
 }

src/main/java/org/ktc2/cokaen/wouldyouin/_common/config/ParamDefaults.java

@@ -5,10 +5,7 @@ public class ParamDefaults {
     public static final String PAGE = "0";
     public static final String PAGE_SIZE = "10";
     public static final String LAST_ID = Long.MAX_VALUE + "";
-    public static final String START_LATITUDE = "-90.0";
-    public static final String END_LATITUDE = "90.0";
-    public static final String START_LONGITUDE = "-180.0";
-    public static final String END_LONGITUDE = "180.0";
+    public static final String TITLE = "";
     public static final String AREA = "전체";
     public static final String CATEGORY = "전체";
 }

src/main/java/org/ktc2/cokaen/wouldyouin/_common/error/ErrorCode.java

@@ -20,7 +20,13 @@ public enum ErrorCode {
 
     UNAUTHORIZED(HttpStatus.UNAUTHORIZED.value(), "-20400", "Unauthorized, %s."),
 
-    ENTITY_PARAM_IS_NULL(HttpStatus.BAD_REQUEST.value(), "-20400", "%s is null");
+    ENTITY_PARAM_IS_NULL(HttpStatus.BAD_REQUEST.value(), "-20400", "%s is null"),
+
+    FAIL_TO_UPLOAD_IMAGE(HttpStatus.CONFLICT.value(), "-20400", "Fail to upload image"),
+
+    FAIL_TO_DELETE_IMAGE(HttpStatus.CONFLICT.value(), "-20400", "Fail to delete image"),
+
+    CURRENT_LOCATION_EMPTY(HttpStatus.BAD_REQUEST.value(), "-20400", "현재 위치 정보를 찾을 수 없습니다.");
 
     private final Integer status;
     private final String code;

src/main/java/org/ktc2/cokaen/wouldyouin/_common/exception/CurrentLocationEmptyException.java

@@ -0,0 +1,10 @@
+package org.ktc2.cokaen.wouldyouin._common.exception;
+
+import org.ktc2.cokaen.wouldyouin._common.error.ErrorCode;
+
+public class CurrentLocationEmptyException extends BusinessException {
+
+    public CurrentLocationEmptyException() {
+        super(ErrorCode.CURRENT_LOCATION_EMPTY, "현재 위치 정보를 찾을 수 없습니다.");
+    }
+}

src/main/java/org/ktc2/cokaen/wouldyouin/_common/exception/FailedToDeleteImageException.java

@@ -0,0 +1,10 @@
+package org.ktc2.cokaen.wouldyouin._common.exception;
+
+import org.ktc2.cokaen.wouldyouin._common.error.ErrorCode;
+
+public class FailedToDeleteImageException extends BusinessException {
+
+    public FailedToDeleteImageException() {
+        super(ErrorCode.FAIL_TO_DELETE_IMAGE, ErrorCode.FAIL_TO_DELETE_IMAGE.getMessage());
+    }
+}

src/main/java/org/ktc2/cokaen/wouldyouin/_common/exception/FailedToUploadImageException.java

@@ -0,0 +1,10 @@
+package org.ktc2.cokaen.wouldyouin._common.exception;
+
+import org.ktc2.cokaen.wouldyouin._common.error.ErrorCode;
+
+public class FailedToUploadImageException extends BusinessException {
+
+    public FailedToUploadImageException() {
+        super(ErrorCode.FAIL_TO_UPLOAD_IMAGE, ErrorCode.FAIL_TO_UPLOAD_IMAGE.getMessage());
+    }
+}

src/main/java/org/ktc2/cokaen/wouldyouin/event/api/EventController.java

@@ -41,14 +41,15 @@ public class EventController {
     public ResponseEntity<ApiResponseBody<EventSliceResponse>> getEventsByFilterOrderByDistanceAsc(
         @ModelAttribute LocationFilter locationFilter,
         @ModelAttribute Location currentLocation,
+        @RequestParam(defaultValue = ParamDefaults.TITLE) String title,
         @RequestParam(defaultValue = ParamDefaults.CATEGORY) Category category,
         @RequestParam(defaultValue = ParamDefaults.AREA) Area area,
         @RequestParam(defaultValue = ParamDefaults.PAGE) Integer page,
         @RequestParam(defaultValue = ParamDefaults.PAGE_SIZE) Integer size,
         @RequestParam(defaultValue = ParamDefaults.LAST_ID) Long lastId
     ) {
         return ApiResponse.ok(eventService.getAllByFilterOrderByDistanceAsc(
-            locationFilter, currentLocation, category, area, PageRequest.of(page, size), lastId));
+            locationFilter, currentLocation, title, category, area, PageRequest.of(page, size), lastId));
     }
 
     @GetMapping("/hosts/{hostId}")
@@ -62,8 +63,6 @@ public ResponseEntity<ApiResponseBody<EventSliceResponse>> getEventsByHostId(
             hostId, PageRequest.of(page, size), lastId));
     }
 
-    // Todo: 이름으로 검색
-
     @GetMapping("/{eventId}")
     public ResponseEntity<ApiResponseBody<EventResponse>> getEventByEventId(
         @PathVariable("eventId") Long eventId) {

src/main/java/org/ktc2/cokaen/wouldyouin/event/application/EventService.java

@@ -3,6 +3,7 @@
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.ktc2.cokaen.wouldyouin.Image.application.EventImageService;
+import org.ktc2.cokaen.wouldyouin._common.exception.CurrentLocationEmptyException;
 import org.ktc2.cokaen.wouldyouin._common.exception.EntityNotFoundException;
 import org.ktc2.cokaen.wouldyouin._common.exception.UnauthorizedException;
 import org.ktc2.cokaen.wouldyouin._common.vo.Area;
@@ -30,12 +31,19 @@ public class EventService {
     private final EventImageService eventImageService;
 
     @Transactional(readOnly = true)
-    public EventSliceResponse getAllByFilterOrderByDistanceAsc(LocationFilter location, Location currentLocation,
+    public EventSliceResponse getAllByFilterOrderByDistanceAsc(LocationFilter location, Location currentLocation, String title,
         Category category, Area area, Pageable pageable, Long lastId) {
+        validateCurrentLocation(currentLocation);
         return getEventSliceResponse(
             eventRepository.findAllByFilterOrderByDistance(location.getStartLatitude(), location.getStartLongitude(),
                 location.getEndLatitude(), location.getEndLongitude(), currentLocation.getLatitude(), currentLocation.getLongitude(),
-                category, area, pageable), lastId);
+                title, category, area, pageable), lastId);
+    }
+
+    private void validateCurrentLocation(Location currentLocation) {
+        if (currentLocation.getLatitude() == null || currentLocation.getLongitude() == null) {
+            throw new CurrentLocationEmptyException();
+        }
     }
 
     @Transactional(readOnly = true)

src/main/java/org/ktc2/cokaen/wouldyouin/event/persist/EventRepository.java

@@ -20,11 +20,12 @@ public interface EventRepository extends JpaRepository<Event, Long> {
     @Query("SELECT E FROM Event E JOIN FETCH E.host "
         + "WHERE (E.location.latitude between :startLatitude AND :endLatitude) "
         + "AND (E.location.longitude between :startLongitude AND :endLongitude) "
+        + "AND (E.title LIKE %:title%) "
         + "AND (:category = '전체' OR E.category = :category) "
         + "AND (:area = '전체' OR E.area = :area) "
         + "ORDER BY (:currentLatitude - E.location.latitude) * (:currentLatitude - E.location.latitude) + "
         + "(:currentLongitude - E.location.longitude) * (:currentLongitude - E.location.longitude) ASC")
     Slice<Event> findAllByFilterOrderByDistance(
         Double startLatitude, Double startLongitude, Double endLatitude, Double endLongitude,
-        Double currentLatitude, Double currentLongitude, Category category, Area area, Pageable pageable);
+        Double currentLatitude, Double currentLongitude, String title, Category category, Area area, Pageable pageable);
 }

src/main/java/org/ktc2/cokaen/wouldyouin/reservation/api/ReservationController.java

@@ -33,11 +33,11 @@ public class ReservationController {
 
     @GetMapping
     public ResponseEntity<ApiResponseBody<ReservationSliceResponse>> getReservationsByMemberId(
-        @Authorize({MemberType.normal, MemberType.curator}) Long memberId,
+        @Authorize({MemberType.normal, MemberType.curator}) MemberIdentifier member,
         @RequestParam(defaultValue = ParamDefaults.PAGE) Integer page,
         @RequestParam(defaultValue = ParamDefaults.PAGE_SIZE) Integer size,
         @RequestParam(defaultValue =  ParamDefaults.LAST_ID) Long lastId) {
-        return ApiResponse.ok(reservationService.getAllByMemberId(memberId, PageRequest.of(page, size), lastId));
+        return ApiResponse.ok(reservationService.getAllByMemberId(member.id(), PageRequest.of(page, size), lastId));
     }
 
     @GetMapping("/events/{eventId}")