feat: 노션 이미지 url 저장방식 변경 - #202

src/main/java/com/permitseoul/permitserver/domain/admin/timetable/base/api/service/AdminTimetableService.java

@@ -5,6 +5,8 @@
 import com.permitseoul.permitserver.domain.admin.timetable.base.api.dto.res.TimetableInfoResponse;
 import com.permitseoul.permitserver.domain.admin.timetable.base.core.components.AdminTimetableRetriever;
 import com.permitseoul.permitserver.domain.admin.timetable.base.core.components.AdminTimetableUpdater;
+import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.NotionPublicUrlNotFoundException;
+import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.NotionUrlMalformedException;
 import com.permitseoul.permitserver.domain.admin.util.exception.PermitListSizeNotMatchException;
 import com.permitseoul.permitserver.domain.eventtimetable.timetable.core.domain.Timetable;
 import com.permitseoul.permitserver.domain.eventtimetable.timetable.core.domain.entity.TimetableEntity;
@@ -83,6 +85,8 @@ public void saveInitialTimetableInfo(final long eventId,
             throw new AdminApiException(ErrorCode.NOT_FOUND_NOTION_DATABASE_SOURCE);
         } catch (final LocalDateTimeException e) {
             throw new AdminApiException(ErrorCode.BAD_REQUEST_DATE_TIME_ERROR);
+        } catch (final NotionPublicUrlNotFoundException | NotionUrlMalformedException e) {
+            throw new AdminApiException(ErrorCode.NOT_FOUND_NOTION_PUBLIC_ID);
         }
     }
 

src/main/java/com/permitseoul/permitserver/domain/admin/timetable/base/api/exception/AdminNotionException.java → src/main/java/com/permitseoul/permitserver/domain/admin/timetable/base/core/exception/AdminNotionException.java

@@ -1,4 +1,4 @@
-package com.permitseoul.permitserver.domain.admin.timetable.base.api.exception;
+package com.permitseoul.permitserver.domain.admin.timetable.base.core.exception;
 
 import com.permitseoul.permitserver.domain.admin.base.AdminBaseException;
 

src/main/java/com/permitseoul/permitserver/domain/admin/timetable/base/core/exception/NotionPublicUrlNotFoundException.java

@@ -0,0 +1,6 @@
+package com.permitseoul.permitserver.domain.admin.timetable.base.core.exception;
+
+import com.permitseoul.permitserver.domain.admin.base.AdminBaseException;
+
+public class NotionPublicUrlNotFoundException extends AdminBaseException {
+}

src/main/java/com/permitseoul/permitserver/domain/admin/timetable/base/core/exception/NotionUrlMalformedException.java

@@ -0,0 +1,6 @@
+package com.permitseoul.permitserver.domain.admin.timetable.base.core.exception;
+
+import com.permitseoul.permitserver.domain.admin.base.AdminBaseException;
+
+public class NotionUrlMalformedException extends AdminBaseException {
+}

src/main/java/com/permitseoul/permitserver/domain/admin/timetable/block/api/dto/NotionTimetableBlockUpdateWebhookRequest.java

@@ -1,6 +1,7 @@
 package com.permitseoul.permitserver.domain.admin.timetable.block.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
@@ -11,6 +12,9 @@ public record NotionTimetableData(
             String id, // 노션 page id (== timetable row id)
             @JsonProperty("last_edited_time")
             String lastEditedTime,
+            @NotNull
+            @JsonProperty("public_url")
+            String publicUrl,
             NotionTimetableParent parent,
             NotionTimetableProperties properties
     ) {

src/main/java/com/permitseoul/permitserver/domain/admin/timetable/block/api/service/AdminNotionTimetableBlockService.java

@@ -1,8 +1,10 @@
 package com.permitseoul.permitserver.domain.admin.timetable.block.api.service;
 
 import com.permitseoul.permitserver.domain.admin.base.api.exception.AdminApiException;
-import com.permitseoul.permitserver.domain.admin.timetable.base.api.exception.AdminNotionException;
+import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.AdminNotionException;
 import com.permitseoul.permitserver.domain.admin.timetable.base.core.components.AdminTimetableRetriever;
+import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.NotionPublicUrlNotFoundException;
+import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.NotionUrlMalformedException;
 import com.permitseoul.permitserver.domain.admin.timetable.block.api.dto.NotionTimetableBlockUpdateWebhookRequest;
 import com.permitseoul.permitserver.domain.admin.timetable.block.core.component.AdminTimetableBlockSaver;
 import com.permitseoul.permitserver.domain.admin.timetable.block.core.strategy.domain.NotionTimetableBlockWebhookType;
@@ -50,6 +52,9 @@ public void updateNotionTimetableBlock(final NotionTimetableBlockUpdateWebhookRe
         } catch (IndexOutOfBoundsException | NullPointerException e) {
             log.error("웹훅 데이터에 필수 필드가 누락되었습니다. request={}", webhookRequest, e);
             throw new AdminNotionException();
+        } catch(NotionPublicUrlNotFoundException | NotionUrlMalformedException e) {
+            log.error("[Notion 자동화 웹훅 에러] publicUrl이 잘못되었습니다. request={}", webhookRequest, e);
+            throw new AdminNotionException();
         } catch (Exception e) {
             log.error("타임테이블 블럭 웹훅 처리 중 알 수 없는 예외 발생. request={}", webhookRequest, e);
             throw new AdminNotionException();

src/main/java/com/permitseoul/permitserver/domain/admin/timetable/block/core/strategy/impl/NotionTimetableBlockMediaUpdateStrategyImpl.java

@@ -1,16 +1,19 @@
 package com.permitseoul.permitserver.domain.admin.timetable.block.core.strategy.impl;
 
+import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.NotionUrlMalformedException;
 import com.permitseoul.permitserver.domain.admin.timetable.block.api.dto.NotionTimetableBlockUpdateWebhookRequest;
 import com.permitseoul.permitserver.domain.admin.timetable.block.core.strategy.domain.NotionTimetableBlockWebhookType;
 import com.permitseoul.permitserver.domain.admin.timetable.block.core.strategy.NotionTimetableBlockUpdateWebhookStrategy;
 import com.permitseoul.permitserver.domain.admin.timetable.blockmedia.core.component.AdminTimetableBlockMediaSaver;
 import com.permitseoul.permitserver.domain.admin.timetable.blockmedia.core.component.AdminTimetableBlockMediaRemover;
+import com.permitseoul.permitserver.domain.admin.util.NotionImageUrlUtil;
 import com.permitseoul.permitserver.domain.eventtimetable.block.core.component.AdminTimetableBlockRetriever;
 import com.permitseoul.permitserver.domain.eventtimetable.block.core.domain.TimetableBlock;
 import com.permitseoul.permitserver.domain.eventtimetable.blockmedia.domain.entity.TimetableBlockMediaEntity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,6 +33,17 @@ public NotionTimetableBlockWebhookType getType() {
     @Override
     public void updateNotionTimetableBlockByNotionWebhook(final NotionTimetableBlockUpdateWebhookRequest request) {
         final String rowId = request.data().id();
+        final String publicUrl = request.data().publicUrl();
+
+        final String host;
+        try {
+            host = new java.net.URL(publicUrl).getHost();
+        } catch (MalformedURLException e) {
+            throw new NotionUrlMalformedException();
+        }
+        if (host == null) {
+            throw new NotionUrlMalformedException();
+        }
 
         final TimetableBlock block = adminTimetableBlockRetriever.findTimetableBlockByNotionTimetableBlockRowId(rowId);
         final long timetableBlockId  = block.getTimetableBlockId();
@@ -42,16 +56,17 @@ public void updateNotionTimetableBlockByNotionWebhook(final NotionTimetableBlock
 
         int sequence = 0;
         final List<TimetableBlockMediaEntity> medias = new ArrayList<>();
-        for (NotionTimetableBlockUpdateWebhookRequest.NotionFileValue file : mediaProp.files()) {
-            String url = null;
-            if (file.file() != null && file.file().url() != null) {
-                url = file.file().url();
-            }
-            if (url == null || url.isBlank()) {
-                continue;
-            }
-
-            medias.add(TimetableBlockMediaEntity.create(timetableBlockId, sequence++, url));
+
+        for (NotionTimetableBlockUpdateWebhookRequest.NotionFileValue fileItem : mediaProp.files()) {
+            if (fileItem == null || fileItem.file() == null) continue;
+
+            final String original = fileItem.file().url();
+            if (original == null || original.isBlank()) continue;
+
+            final String proxyUrl = NotionImageUrlUtil.buildProxyUrl(host, rowId, original);
+            if (proxyUrl == null || proxyUrl.isBlank()) continue;
+
+            medias.add(TimetableBlockMediaEntity.create(timetableBlockId, sequence++, proxyUrl));
         }
         adminTimetableBlockMediaSaver.saveAllBlockMedia(medias);
     }

src/main/java/com/permitseoul/permitserver/domain/admin/timetable/category/api/service/AdminNotionTimetableCategoryService.java

@@ -1,7 +1,7 @@
 package com.permitseoul.permitserver.domain.admin.timetable.category.api.service;
 
 import com.permitseoul.permitserver.domain.admin.base.api.exception.AdminApiException;
-import com.permitseoul.permitserver.domain.admin.timetable.base.api.exception.AdminNotionException;
+import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.AdminNotionException;
 import com.permitseoul.permitserver.domain.admin.timetable.base.core.components.AdminTimetableRetriever;
 import com.permitseoul.permitserver.domain.admin.timetable.category.api.dto.NotionTimetableCategoryUpdateWebhookRequest;
 import com.permitseoul.permitserver.domain.admin.timetable.category.core.component.AdminTimetableCategorySaver;

src/main/java/com/permitseoul/permitserver/domain/admin/timetable/stage/api/service/AdminNotionTimetableStageService.java

@@ -1,7 +1,7 @@
 package com.permitseoul.permitserver.domain.admin.timetable.stage.api.service;
 
 import com.permitseoul.permitserver.domain.admin.base.api.exception.AdminApiException;
-import com.permitseoul.permitserver.domain.admin.timetable.base.api.exception.AdminNotionException;
+import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.AdminNotionException;
 import com.permitseoul.permitserver.domain.admin.timetable.base.core.components.AdminTimetableRetriever;
 import com.permitseoul.permitserver.domain.admin.timetable.stage.api.dto.NotionTimetableStageUpdateWebhookRequest;
 import com.permitseoul.permitserver.domain.admin.timetable.stage.core.component.AdminTimetableStageSaver;

src/main/java/com/permitseoul/permitserver/domain/admin/util/NotionImageUrlUtil.java

@@ -0,0 +1,42 @@
+package com.permitseoul.permitserver.domain.admin.util;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class NotionImageUrlUtil {
+
+    private static final String HTTPS = "https://";
+    private static final String IMAGE_PATH = "/image/";
+    private static final String QUERY_PREFIX = "?table=block&id=";
+    private static final String CACHE_SUFFIX = "&cache=v2";
+
+    public static String buildProxyUrl(final String publishedHost,
+                                       final String pageId,
+                                       final String originalUrl) {
+        if (publishedHost == null || publishedHost.isBlank()) return null;
+        if (pageId == null || pageId.isBlank()) return null;
+        if (originalUrl == null || originalUrl.isBlank()) return null;
+
+        // presigned query 제거하는 과정
+        final String baseUrl = originalUrl.split("\\?")[0];
+        return HTTPS + publishedHost
+                + IMAGE_PATH + encodeURIComponent(baseUrl)
+                + QUERY_PREFIX + pageId
+                + CACHE_SUFFIX;
+    }
+
+    private static String encodeURIComponent(final String s) {
+        String encoded = URLEncoder.encode(s, StandardCharsets.UTF_8);
+        return encoded.replace("+", "%20")
+                .replace("%21", "!")
+                .replace("%27", "'")
+                .replace("%28", "(")
+                .replace("%29", ")")
+                .replace("%2A", "*")
+                .replace("%7E", "~");
+    }
+}

src/main/java/com/permitseoul/permitserver/domain/admin/util/NotionResponseMapper.java

@@ -1,5 +1,8 @@
 package com.permitseoul.permitserver.domain.admin.util;
 
+import com.permitseoul.permitserver.domain.admin.base.AdminBaseException;
+import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.NotionPublicUrlNotFoundException;
+import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.NotionUrlMalformedException;
 import com.permitseoul.permitserver.domain.admin.util.exception.PermitListSizeNotMatchException;
 import com.permitseoul.permitserver.domain.eventtimetable.block.core.domain.TimetableBlock;
 import com.permitseoul.permitserver.domain.eventtimetable.block.core.domain.entity.TimetableBlockEntity;
@@ -8,11 +11,15 @@
 import com.permitseoul.permitserver.domain.eventtimetable.stage.core.domain.entity.TimetableStageEntity;
 import com.permitseoul.permitserver.global.exception.DateFormatException;
 import com.permitseoul.permitserver.global.exception.PermitIllegalStateException;
+import com.permitseoul.permitserver.global.exception.UrlSecureException;
 import com.permitseoul.permitserver.global.external.notion.dto.NotionCategoryDatasourceResponse;
 import com.permitseoul.permitserver.global.external.notion.dto.NotionStageDatasourceResponse;
 import com.permitseoul.permitserver.global.external.notion.dto.NotionTimetableDatasourceResponse;
 import com.permitseoul.permitserver.global.util.LocalDateTimeFormatterUtil;
+import org.jetbrains.annotations.NotNull;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -140,19 +147,51 @@ public static List<TimetableBlockMediaEntity> mapToTimetableBlockMediaEntities(f
 
         for (int i = 0; i < savedBlocks.size(); i++) {
             final TimetableBlock block = savedBlocks.get(i);
-            final List<NotionTimetableDatasourceResponse.FilesProperty.FileItem> files = notionTimetableDatasourceResponse.results().get(i).properties().media().files();
-            if (files == null) continue;
+            final NotionTimetableDatasourceResponse.NotionPage notionPage = notionTimetableDatasourceResponse.results().get(i);
+            final String pageId = notionPage.id();
+            final String host = getHost(notionPage);
+
+            final NotionTimetableDatasourceResponse.FilesProperty filesProperty = notionPage.properties().media();
+            if (filesProperty == null || filesProperty.files() == null) continue;
+            final List<NotionTimetableDatasourceResponse.FilesProperty.FileItem> files = filesProperty.files();
 
             for (int seq = 0; seq < files.size(); seq++) {
-                String mediaUrl = files.get(seq).file().url();
+                final NotionTimetableDatasourceResponse.FilesProperty.FileItem fileItem = files.get(seq);
+                if (fileItem == null || fileItem.file() == null) continue;
+
+                final String originalUrl = fileItem.file().url();
+                if (originalUrl == null || originalUrl.isBlank()) continue;
+
+                //노션에서 주는 url은 유효기간이 있어서 proxyUrl로 우회해서 조회하기
+                final String proxyUrl = NotionImageUrlUtil.buildProxyUrl(host, pageId, originalUrl);
+                if (proxyUrl == null) continue;
+
                 mediaEntities.add(TimetableBlockMediaEntity.create(
                         block.getTimetableBlockId(),
                         seq,
-                        mediaUrl
+                        proxyUrl
                 ));
             }
         }
 
         return mediaEntities;
     }
+
+    private static String getHost(NotionTimetableDatasourceResponse.NotionPage notionPage) {
+        final String publicUrl = notionPage.publicUrl();
+        if (publicUrl == null || publicUrl.isBlank()) {
+            throw new NotionPublicUrlNotFoundException();
+        }
+
+        final String host;
+        try {
+            host = new URL(publicUrl).getHost();
+        } catch (MalformedURLException e) {
+            throw new NotionUrlMalformedException();
+        }
+        if (host == null) {
+            throw new NotionUrlMalformedException();
+        }
+        return host;
+    }
 }

src/main/java/com/permitseoul/permitserver/domain/user/api/dto/UserInfoRequest.java

@@ -14,7 +14,6 @@ public record UserInfoRequest(
         Gender gender,
 
         @Email(message = "이메일 형식이 아닙니다.")
-        @NotBlank(message = "이메일은 공백이 될 수 없습니다.")
         String email
 ) {
 }

src/main/java/com/permitseoul/permitserver/domain/user/api/service/UserService.java

@@ -44,7 +44,9 @@ public void updateUserInfo(final long userId, final String name, final Gender ge
         final UserEntity userEntity;
         try {
             userEntity = userRetriever.findUserEntityById(userId);
-            userRetriever.validEmailDuplicated(email);
+            if (email != null) {
+                userRetriever.validEmailDuplicated(email);
+            }
             userEntity.updateUserInfo(name, gender, email);
         } catch (UserNotFoundException e) {
             throw new NotfoundUserException(ErrorCode.NOT_FOUND_USER);

src/main/java/com/permitseoul/permitserver/domain/user/core/domain/entity/UserEntity.java

@@ -68,7 +68,9 @@ public void updateUserInfo(final String name,
                                final String email) {
         this.name = name;
         this.gender = gender;
-        this.email = email;
+        if (email != null) {
+            this.email = email;
+        }
     }
 }
 

src/main/java/com/permitseoul/permitserver/global/external/notion/dto/NotionTimetableDatasourceResponse.java

@@ -10,7 +10,9 @@ public record NotionTimetableDatasourceResponse(
     public record NotionPage(
             String id,
             Parent parent,
-            NotionProperties properties
+            NotionProperties properties,
+            @JsonProperty("public_url")
+            String publicUrl
     ) {}
 
     public record Parent(

src/main/java/com/permitseoul/permitserver/global/response/code/ErrorCode.java

@@ -88,6 +88,7 @@ public enum ErrorCode implements ApiCode {
     NOT_FOUND_NOTION_DATABASE_SOURCE(HttpStatus.NOT_FOUND, 40427, "Notion 데이터베이스 소스를 찾을 수 없습니다."),
     NOT_FOUND_COUPON(HttpStatus.NOT_FOUND, 40428, "coupon을 찾을 수 없습니다."),
     NOT_FOUND_SITE_MAP_IMAGE(HttpStatus.NOT_FOUND, 40429, "sitemap image를 찾을 수 없습니다."),
+    NOT_FOUND_NOTION_PUBLIC_ID(HttpStatus.NOT_FOUND, 40430, "public url을 찾을 수 없습니다."),