Merge pull request #18 from T2AM-COOK/feature/#16

Feature/#16
T2AM-COOK · Jan 10, 2025 · 07111a0 · 07111a0
2 parents 77efb6c + d161f56
commit 07111a0
Show file tree

Hide file tree

Showing 47 changed files with 156 additions and 223 deletions.
diff --git a/build.gradle b/build.gradle
@@ -49,12 +49,14 @@ dependencies {
 
     implementation 'org.jsoup:jsoup:1.17.2'
 
-    implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3:3.2.1'
+//    implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3:3.2.1'
 
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 }
 
 tasks.named('test') {

diff --git a/src/main/java/com/galendar/domain/auth/controller/AuthController.java b/src/main/java/com/galendar/domain/auth/controller/AuthController.java
@@ -5,20 +5,18 @@
 import com.galendar.domain.auth.dto.request.SignupRequest;
 import com.galendar.domain.auth.dto.response.JsonWebTokenResponse;
 import com.galendar.domain.auth.service.AuthService;
-import com.galendar.domain.auth.service.AuthServiceImpl;
-import com.galendar.domain.user.dto.User;
-import com.galendar.domain.user.entity.UserEntity;
-import com.galendar.domain.user.repository.UserRepository;
 import com.galendar.global.common.dto.response.ResponseData;
 import com.galendar.global.firebase.service.FcmTokenService;
+
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @Tag(name = "인증", description = "인증 관련 api입니다.")
 @RestController

diff --git a/src/main/java/com/galendar/domain/auth/service/AuthServiceImpl.java b/src/main/java/com/galendar/domain/auth/service/AuthServiceImpl.java
@@ -4,7 +4,6 @@
 import com.galendar.domain.auth.dto.request.RefreshTokenRequest;
 import com.galendar.domain.auth.dto.request.SignupRequest;
 import com.galendar.domain.auth.dto.response.JsonWebTokenResponse;
-import com.galendar.domain.email.entity.EmailEntity;
 import com.galendar.domain.email.exception.EmailNotVerifiedException;
 import com.galendar.domain.email.repository.EmailRepository;
 import com.galendar.domain.user.dto.User;

diff --git a/src/main/java/com/galendar/domain/bookmark/controller/BookmarkController.java b/src/main/java/com/galendar/domain/bookmark/controller/BookmarkController.java
@@ -10,12 +10,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 

diff --git a/src/main/java/com/galendar/domain/bookmark/entity/BookmarkEntity.java b/src/main/java/com/galendar/domain/bookmark/entity/BookmarkEntity.java
@@ -3,20 +3,8 @@
 import com.galendar.domain.contest.entity.ContestEntity;
 import com.galendar.domain.user.entity.UserEntity;
 import com.galendar.global.common.entity.BaseTimeEntity;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
-import jakarta.persistence.UniqueConstraint;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import jakarta.persistence.*;
+import lombok.*;
 
 @Entity
 @Table(name = "tb_bookmark", uniqueConstraints = {

diff --git a/src/main/java/com/galendar/domain/contest/dto/request/ContestRequest.java b/src/main/java/com/galendar/domain/contest/dto/request/ContestRequest.java
@@ -1,6 +1,5 @@
 package com.galendar.domain.contest.dto.request;
 
-import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 

diff --git a/src/main/java/com/galendar/domain/contest/entity/ContestEntity.java b/src/main/java/com/galendar/domain/contest/entity/ContestEntity.java
@@ -3,25 +3,9 @@
 import com.galendar.domain.contest.entity.enums.ContestCost;
 import com.galendar.domain.user.entity.UserEntity;
 import com.galendar.global.common.entity.BaseTimeEntity;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.LocalDate;
 import java.util.ArrayList;

diff --git a/src/main/java/com/galendar/domain/contest/entity/ContestRegionEntity.java b/src/main/java/com/galendar/domain/contest/entity/ContestRegionEntity.java
@@ -1,20 +1,8 @@
 package com.galendar.domain.contest.entity;
 
 import com.galendar.domain.region.entity.RegionEntity;
-import com.galendar.domain.target.entity.TargetEntity;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import jakarta.persistence.*;
+import lombok.*;
 
 @Entity
 @Table(name = "tb_contest_region")

diff --git a/src/main/java/com/galendar/domain/contest/entity/ContestTargetEntity.java b/src/main/java/com/galendar/domain/contest/entity/ContestTargetEntity.java
@@ -1,19 +1,8 @@
 package com.galendar.domain.contest.entity;
 
 import com.galendar.domain.target.entity.TargetEntity;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import jakarta.persistence.*;
+import lombok.*;
 
 @Entity
 @Table(name = "tb_contest_target")

diff --git a/src/main/java/com/galendar/domain/contest/mapper/ContestMapper.java b/src/main/java/com/galendar/domain/contest/mapper/ContestMapper.java
@@ -3,7 +3,6 @@
 import com.galendar.domain.contest.dto.request.RegisterContestRequest;
 import com.galendar.domain.contest.entity.ContestEntity;
 import com.galendar.domain.user.entity.UserEntity;
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
 @Component

diff --git a/src/main/java/com/galendar/domain/email/controller/EmailController.java b/src/main/java/com/galendar/domain/email/controller/EmailController.java
@@ -3,11 +3,9 @@
 import com.galendar.domain.email.dto.request.EmailSendRequest;
 import com.galendar.domain.email.dto.request.EmailVerifyRequest;
 import com.galendar.domain.email.service.EmailVerificationService;
-import com.galendar.domain.email.service.EmailVerificationServiceImpl;
 import com.galendar.global.common.dto.response.ResponseData;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;

diff --git a/src/main/java/com/galendar/domain/email/dto/request/EmailSendRequest.java b/src/main/java/com/galendar/domain/email/dto/request/EmailSendRequest.java
@@ -2,7 +2,8 @@
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
-import lombok.*;
+import lombok.Getter;
+import lombok.Setter;
 
 
 @Getter

diff --git a/src/main/java/com/galendar/domain/email/dto/request/EmailVerifyRequest.java b/src/main/java/com/galendar/domain/email/dto/request/EmailVerifyRequest.java
@@ -3,7 +3,9 @@
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor

diff --git a/src/main/java/com/galendar/domain/email/entity/EmailEntity.java b/src/main/java/com/galendar/domain/email/entity/EmailEntity.java
@@ -1,16 +1,7 @@
 package com.galendar.domain.email.entity;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import jakarta.persistence.*;
+import lombok.*;
 
 import java.time.LocalDateTime;
 

diff --git a/src/main/java/com/galendar/domain/email/exception/EmailNotVerifiedException.java b/src/main/java/com/galendar/domain/email/exception/EmailNotVerifiedException.java
@@ -1,6 +1,5 @@
 package com.galendar.domain.email.exception;
 
-import com.galendar.domain.user.exception.UserNotFoundException;
 import com.galendar.global.exception.CustomException;
 
 public class EmailNotVerifiedException extends CustomException {

diff --git a/src/main/java/com/galendar/domain/email/service/EmailServiceImpl.java b/src/main/java/com/galendar/domain/email/service/EmailServiceImpl.java
@@ -5,22 +5,19 @@
 import com.galendar.global.exception.CustomException;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.FileCopyUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
 
 @Service
 @RequiredArgsConstructor

diff --git a/src/main/java/com/galendar/domain/file/UploadController.java b/src/main/java/com/galendar/domain/file/UploadController.java
@@ -0,0 +1,42 @@
+package com.galendar.domain.file;
+
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.ObjectMetadata;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+@RestController
+@RequestMapping("/upload")
+@RequiredArgsConstructor
+public class UploadController {
+
+    private final AmazonS3Client amazonS3Client;
+
+    @Value("${BUCKET_NAME}")
+    private String bucket;
+
+    @PostMapping
+    public ResponseEntity<String> uploadFile(@RequestParam("file")MultipartFile file) {
+        try {
+            String fileName = file.getOriginalFilename();
+            String fileUrl = "https://" + bucket + "/test" + fileName;
+            ObjectMetadata metadata = new ObjectMetadata();
+            metadata.setContentType(file.getContentType());
+            metadata.setContentLength(file.getSize());
+            amazonS3Client.putObject(bucket, fileName, file.getInputStream(), metadata);
+            return ResponseEntity.ok(fileUrl);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        }
+    }
+}
diff --git a/src/main/java/com/galendar/domain/profile/controller/ProfileController.java b/src/main/java/com/galendar/domain/profile/controller/ProfileController.java
@@ -8,7 +8,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Stream;
 
 @Hidden
 @RestController

diff --git a/src/main/java/com/galendar/domain/region/controller/RegionController.java b/src/main/java/com/galendar/domain/region/controller/RegionController.java
@@ -10,11 +10,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 

diff --git a/src/main/java/com/galendar/domain/region/dto/RegionDTO.java b/src/main/java/com/galendar/domain/region/dto/RegionDTO.java
@@ -1,11 +1,6 @@
 package com.galendar.domain.region.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 @Builder
 @NoArgsConstructor

diff --git a/src/main/java/com/galendar/domain/region/entity/RegionEntity.java b/src/main/java/com/galendar/domain/region/entity/RegionEntity.java
@@ -1,17 +1,9 @@
 package com.galendar.domain.region.entity;
 
 import com.galendar.global.common.entity.BaseTimeEntity;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 @Entity
 @Table(name="tb_region")

diff --git a/src/main/java/com/galendar/domain/region/mapper/RegionMapper.java b/src/main/java/com/galendar/domain/region/mapper/RegionMapper.java
@@ -3,8 +3,6 @@
 import com.galendar.domain.region.dto.RegionDTO;
 import com.galendar.domain.region.dto.request.RegisterRegionRequest;
 import com.galendar.domain.region.entity.RegionEntity;
-import com.galendar.domain.target.dto.request.RegisterTargetRequest;
-import com.galendar.domain.target.entity.TargetEntity;
 import org.springframework.stereotype.Component;
 
 @Component

diff --git a/src/main/java/com/galendar/domain/region/service/RegionServiceImpl.java b/src/main/java/com/galendar/domain/region/service/RegionServiceImpl.java
@@ -2,10 +2,8 @@
 
 import com.galendar.domain.region.dto.RegionDTO;
 import com.galendar.domain.region.dto.request.RegisterRegionRequest;
-import com.galendar.domain.region.entity.RegionEntity;
 import com.galendar.domain.region.mapper.RegionMapper;
 import com.galendar.domain.region.repository.RegionRepository;
-
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

diff --git a/src/main/java/com/galendar/domain/target/controller/TargetController.java b/src/main/java/com/galendar/domain/target/controller/TargetController.java
@@ -1,6 +1,5 @@
 package com.galendar.domain.target.controller;
 
-import com.galendar.domain.region.dto.RegionDTO;
 import com.galendar.domain.target.dto.TargetDTO;
 import com.galendar.domain.target.dto.request.RegisterTargetRequest;
 import com.galendar.domain.target.service.TargetService;
@@ -10,14 +9,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;