Refactor: 이미지 정합성 개선

Refactor: 이미지 정합성 개선

Author: stoneTiger0912

src/main/java/project/flipnote/auth/model/UserRegisterRequest.java

@@ -25,16 +25,14 @@ public record UserRegisterRequest(
 	Boolean smsAgree,
 
 	@ValidPhone
-	String phone,
-
-	String profileImageUrl
+	String phone
 ) {
 
 	public String getNormalizedPhone() {
 		return PhoneUtil.normalize(phone);
 	}
 
 	public UserCreateCommand toCommand() {
-		return new UserCreateCommand(email, name, nickname, smsAgree, getNormalizedPhone(), profileImageUrl);
+		return new UserCreateCommand(email, name, nickname, smsAgree, getNormalizedPhone());
 	}
 }

src/main/java/project/flipnote/cardset/entity/CardSet.java

@@ -45,7 +45,6 @@ public class CardSet extends BaseEntity {
 
 	private String hashtag;
 
-	@Column(nullable = false)
 	private String imageUrl;
 
 	@Builder

src/main/java/project/flipnote/common/config/SchedulerConfig.java

@@ -2,8 +2,34 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 
+import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
+import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
+
+import lombok.RequiredArgsConstructor;
+import project.flipnote.image.service.ImageCleanService;
+
+@RequiredArgsConstructor
 @EnableScheduling
 @Configuration
 public class SchedulerConfig {
+
+	private final ImageCleanService imageCleanService;
+
+	//이미지 참조 제거
+	@Scheduled(cron = "0 0 23 * * *", zone = "Asia/Seoul")
+	// @Scheduled(cron = "0 * * * * *", zone = "Asia/Seoul")
+	@SchedulerLock(name = "image.cleanImageRef", lockAtMostFor = "PT2M")
+	public void cleanImageRef() {
+		imageCleanService.cleanImageRef();
+	}
+	
+	//이미지 제거
+	@Scheduled(cron = "0 30 23 * * 0", zone = "Asia/Seoul")
+	@SchedulerLock(name = "image.cleanImage", lockAtMostFor = "PT2M")
+	// @Scheduled(cron = "30 */2 * * * *", zone = "Asia/Seoul")
+	public void cleanImage() {
+		imageCleanService.cleanImage();
+	}
 }

src/main/java/project/flipnote/common/model/request/UserCreateCommand.java

@@ -5,8 +5,7 @@ public record UserCreateCommand(
 	String name,
 	String nickname,
 	Boolean smsAgree,
-	String phone,
-	String profileImageUrl
+	String phone
 ) {
 
 }

src/main/java/project/flipnote/group/controller/docs/GroupControllerDocs.java

@@ -59,7 +59,7 @@ ResponseEntity<GroupCreateResponse> create(
                   "applicationRequired": true,
                   "publicVisible": true,
                   "maxMember": 20,
-                  "image": "https://cdn.example.com/group/cover.jpg"
+                  "imageRefId": 1
                 }
                 """)
 			)
@@ -111,7 +111,7 @@ ResponseEntity<GroupPutResponse> changeGroup(
                   "applicationRequired": false,
                   "publicVisible": true,
                   "maxMember": 30,
-                  "image": "https://cdn.example.com/group/cover_v2.png"
+                  "imageRefId": 1
                 }
                 """)
 			)

src/main/java/project/flipnote/group/entity/Group.java

@@ -107,13 +107,13 @@ public void increaseMemberCount() {
 		memberCount++;
 	}
 
-	public void changeGroup(GroupPutRequest req) {
+	public void changeGroup(GroupPutRequest req, String url) {
 		this.name = req.name();
 		this.category = req.category();
 		this.description = req.description();
 		this.applicationRequired = req.applicationRequired();
 		this.publicVisible = req.publicVisible();
 		this.maxMember = req.maxMember();
-		this.imageUrl = req.image();
+		this.imageUrl = url;
 	}
 }

src/main/java/project/flipnote/group/model/GroupCreateRequest.java

@@ -28,7 +28,7 @@ public record GroupCreateRequest(
 	@Max(value = 100, message = "최대 인원 수는 100명을 초과할 수 없습니다.")
 	Integer maxMember,
 
-	@URL(message = "이미지 URL 형식이 올바르지 않습니다.")
-	String image
+	// @NotNull(message = "이미지 참조 id를 입력해주세요.")
+	Long imageRefId
 ) {
 }

src/main/java/project/flipnote/group/model/GroupDetailResponse.java

@@ -19,20 +19,23 @@ public record GroupDetailResponse(
 
 	Integer maxMember,
 
+	Long imageRefId,
+
 	String imageUrl,
 
 	LocalDateTime createdAt,
 
 	LocalDateTime modifiedAt
 ) {
-	public static GroupDetailResponse from(Group group) {
+	public static GroupDetailResponse from(Group group, Long imageRefId) {
 		return new GroupDetailResponse(
 			group.getName(),
 			group.getCategory(),
 			group.getDescription(),
 			group.getApplicationRequired(),
 			group.getPublicVisible(),
 			group.getMaxMember(),
+			imageRefId,
 			group.getImageUrl(),
 			group.getCreatedAt(),
 			group.getModifiedAt()

src/main/java/project/flipnote/group/model/GroupInfo.java

@@ -7,8 +7,9 @@ public record GroupInfo(
 	String name,
 	String description,
 	Category category,
-	String imageUrl) {
-	public static GroupInfo from(Long groupId, String name, String description, Category category, String imageUrl) {
-		return new GroupInfo(groupId, name, description, category, imageUrl);
+	String imageUrl,
+	Long imageRefId) {
+	public static GroupInfo from(Long groupId, String name, String description, Category category, String imageUrl, Long imageRefId) {
+		return new GroupInfo(groupId, name, description, category, imageUrl, imageRefId);
 	}
 }

src/main/java/project/flipnote/group/model/GroupPutRequest.java

@@ -32,7 +32,6 @@ public record GroupPutRequest(
 	@Max(value = 100, message = "최대 인원 수는 100명을 초과할 수 없습니다.")
 	Integer maxMember,
 
-	@URL(message = "이미지 URL 형식이 올바르지 않습니다.")
-	String image
+	Long imageRefId
 ) {
 }