Merge pull request #91 from Team-INSERT/refactor/#90

DocsServiceTest 테스트코드 리팩토링

src/main/java/com/project/bumawiki/domain/docs/implementation/DocsCreator.java

@@ -19,14 +19,15 @@ public class DocsCreator {
 
 	public void create(Docs docs, User user, String contents) {
 		docsRepository.save(docs);
-		versionDocsRepository.save(
+		VersionDocs versionDocs = versionDocsRepository.save(
 			new VersionDocs(
 				0,
 				docs,
 				contents,
 				user
 			)
 		);
+		docsUpdater.updateModifiedAt(docs, versionDocs.getCreatedAt());
 	}
 
 	public void createVersionDocs(Docs docs, User user, String contents) {

src/main/java/com/project/bumawiki/domain/user/domain/User.java

@@ -17,6 +17,7 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
+import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
@@ -31,27 +32,23 @@
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class User {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
 	@OneToMany(
 		mappedBy = "user",
 		fetch = FetchType.LAZY,
 		cascade = CascadeType.ALL,
 		orphanRemoval = true)
 	@Builder.Default
 	private final List<ThumbsUp> thumbsUps = new ArrayList<>();
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Long id;
-
+	@Email
 	@Size(max = 32)
 	@Column(unique = true, length = 32)
 	private String email;
 
-	@Size(max = 16)
-	@NotNull
-	@Column(length = 16)
-	private String name;
-
 	@Column(length = 8)
 	private Integer enroll;
 
@@ -62,6 +59,10 @@ public class User {
 	@Column(length = 16)
 	@Enumerated(EnumType.STRING)
 	private Authority authority;
+	@NotNull
+	@Size(max = 16)
+	@Column(length = 16)
+	private String name;
 
 	public List<ThumbsUpResponseDto> getList() {
 		return this.thumbsUps

src/main/java/com/project/bumawiki/global/config/s3/S3Bucket.java

@@ -10,4 +10,7 @@
 public class S3Bucket {
 	@Value("${aws.s3.bucket}")
 	private String s3Bucket;
+
+	@Value("${aws.s3.read-url}")
+	private String readUrl;
 }

src/main/java/com/project/bumawiki/global/config/s3/S3Config.java

@@ -6,7 +6,6 @@
 
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.regions.Regions;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 
@@ -19,13 +18,25 @@ class S3Config {
 	@Value("${aws.s3.secret-key}")
 	private String secretKey;
 
+	@Value("${aws.s3.region}")
+	private String region;
+
+	@Value("${aws.s3.end-point-url}")
+	private String endPointUrl;
+
 	@Bean
 	AmazonS3 amazonS3Client() {
 		return AmazonS3ClientBuilder.standard()
 			.withCredentials(
 				new AWSStaticCredentialsProvider(new BasicAWSCredentials(accessKey, secretKey))
 			)
-			.withRegion(Regions.AP_NORTHEAST_2)
+			// .withRegion(Regions.AP_NORTHEAST_2)
+			.withEndpointConfiguration(
+				new AmazonS3ClientBuilder.EndpointConfiguration(
+					endPointUrl,
+					region
+				)
+			)
 			.build();
 	}
 }

src/main/java/com/project/bumawiki/global/s3/service/implement/ImageCreator.java → src/main/java/com/project/bumawiki/global/s3/implement/ImageCreator.java

@@ -1,4 +1,4 @@
-package com.project.bumawiki.global.s3.service.implement;
+package com.project.bumawiki.global.s3.implement;
 
 import java.io.IOException;
 import java.util.UUID;
@@ -36,7 +36,7 @@ public String create(MultipartFile multipartFile) {
 			throw new S3SaveException();
 		}
 
-		return amazonS3.getUrl(s3Bucket.getS3Bucket(), fileName).toString();
+		return s3Bucket.getReadUrl() + fileName;
 	}
 
 	private String createFileName(MultipartFile multipartFile) {

src/main/java/com/project/bumawiki/global/s3/service/CommandImageService.java

@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.project.bumawiki.global.s3.service.implement.ImageCreator;
+import com.project.bumawiki.global.s3.implement.ImageCreator;
 
 import lombok.RequiredArgsConstructor;
 

src/main/resources/application-dev.yml

@@ -57,6 +57,9 @@ aws:
     bucket: ${S3_BUCKET}
     access-key: ${S3_ACCESSKEY}
     secret-key: ${S3_SECRET}
+    region: ${S3_REGION}
+    end-point-url: ${S3_ENDPOINT_URL}
+    read-url: ${S3_READ_URL}
 
 server:
   port: 8080

src/main/resources/application-local.yml

@@ -54,6 +54,9 @@ bsm:
 aws:
   s3:
     bucket: ${S3_BUCKET}
+    region: ${S3_REGION}
+    end-point-url: ${S3_ENDPOINT_URL}
+    read-url: ${S3_READ_URL}
     access-key: ${S3_ACCESSKEY}
     secret-key: ${S3_SECRET}
 

src/main/resources/application-prod.yml

@@ -59,6 +59,9 @@ aws:
     bucket: ${S3_BUCKET}
     access-key: ${S3_ACCESSKEY}
     secret-key: ${S3_SECRET}
+    region: ${S3_REGION}
+    end-point-url: ${S3_ENDPOINT_URL}
+    read-url: ${S3_READ_URL}
 
 image:
   path: ${SAVING_URL}