release 0.0.2

build.gradle

@@ -23,14 +23,19 @@ repositories {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-//	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-//	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-mail:3.0.5'
+	implementation 'com.sun.mail:jakarta.mail:2.0.1' // 버전을 2.0.1로 변경
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 
+
 	// LOMBOK
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
+	testCompileOnly 'org.projectlombok:lombok'
+	testAnnotationProcessor 'org.projectlombok:lombok'
 
 	// SPRING BOOT DEVTOOLS
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
@@ -46,19 +51,28 @@ dependencies {
 	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
 	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
+
+	// JWT Support
+	implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
+	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+	// JSON 처리를 위해 jackson 연동 모듈 추가
+
 	// AWS S3
 	implementation 'com.amazonaws:aws-java-sdk-s3'
 	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 
 	// JSON
 	implementation 'org.json:json:20231013'
 
+	// thumbnailator
+	implementation 'net.coobird:thumbnailator:0.4.14'
+
+
 	// TEST IMPLEMENTATION ========================
 	// TEST DATABASE H2
 	testImplementation 'com.h2database:h2'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
-
 	// TEST JUNIT
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 //	testImplementation 'org.springframework.security:spring-security-test'

src/main/java/com/ssg/starroad/board/DTO/BoardContentDTO.java

@@ -0,0 +1,18 @@
+package com.ssg.starroad.board.DTO;
+
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class BoardContentDTO {
+    private Long id;
+    private LocalDateTime createdAt;
+    private LocalDateTime modifiedAt;
+    private String imagePath;
+    private Long boardId;
+}

src/main/java/com/ssg/starroad/board/DTO/BoardDTO.java

@@ -0,0 +1,21 @@
+package com.ssg.starroad.board.DTO;
+
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class BoardDTO {
+    private Long id;
+    private LocalDateTime createdAt;
+    private LocalDateTime modifiedAt;
+    private Long managerId;
+    private String category;
+    private String content;
+    private String title;
+    private Long userId;
+}

src/main/java/com/ssg/starroad/board/controller/BoardController.java

@@ -1,13 +1,29 @@
 package com.ssg.starroad.board.controller;
 
+import com.ssg.starroad.board.DTO.BoardDTO;
 import com.ssg.starroad.board.service.BoardService;
+import com.ssg.starroad.coupon.DTO.CouponDTO;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/board")
 public class BoardController {
     private final BoardService boardService;
+
+
+    @GetMapping("/list")
+    public ResponseEntity<List<BoardDTO>> getBoardList() {
+        List<BoardDTO> boardDTOS = boardService.getEventBoards();
+        if (boardDTOS.isEmpty()) {
+            return ResponseEntity.noContent().build();  // 내용이 없을 경우 No Content (204) 반환
+        }
+        return ResponseEntity.ok(boardDTOS);  // 내용이 있을 경우 OK (200)와 함께 데이터 반환
+    }
 }

src/main/java/com/ssg/starroad/board/controller/BoardImageController.java

@@ -1,13 +1,29 @@
 package com.ssg.starroad.board.controller;
 
+import com.ssg.starroad.board.DTO.BoardContentDTO;
+import com.ssg.starroad.board.DTO.BoardDTO;
 import com.ssg.starroad.board.service.BoardImageService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/board-image")
 public class BoardImageController {
     private final BoardImageService boardImageService;
+
+    @GetMapping("/content/{boardId}")
+    public ResponseEntity<BoardContentDTO> getBoardContent(@PathVariable Long boardId) {
+        BoardContentDTO boardContent = boardImageService.getEventContent(boardId);
+        if (boardContent==null) {
+            return ResponseEntity.noContent().build();  // 내용이 없을 경우 No Content (204) 반환
+        }
+        return ResponseEntity.ok(boardContent);  // 내용이 있을 경우 OK (200)와 함께 데이터 반환
+    }
 }

src/main/java/com/ssg/starroad/board/repository/BoardImageRepository.java

@@ -4,4 +4,6 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface BoardImageRepository extends JpaRepository<BoardImage, Long> {
+
+    public BoardImage findByBoardId(Long boardId);
 }

src/main/java/com/ssg/starroad/board/repository/BoardRepository.java

@@ -1,7 +1,12 @@
 package com.ssg.starroad.board.repository;
 
 import com.ssg.starroad.board.entity.Board;
+import com.ssg.starroad.board.enums.BoardCategory;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface BoardRepository extends JpaRepository<Board, Long> {
+
+    public List<Board> findByCategory(BoardCategory category);
 }

src/main/java/com/ssg/starroad/board/service/BoardImageService.java

@@ -1,4 +1,8 @@
 package com.ssg.starroad.board.service;
 
+import com.ssg.starroad.board.DTO.BoardContentDTO;
+
 public interface BoardImageService {
+
+    public BoardContentDTO getEventContent (Long boardid);
 }

src/main/java/com/ssg/starroad/board/service/BoardService.java

@@ -1,4 +1,10 @@
 package com.ssg.starroad.board.service;
 
+import com.ssg.starroad.board.DTO.BoardDTO;
+
+import java.util.List;
+
 public interface BoardService {
+
+    public List<BoardDTO> getEventBoards();
 }

src/main/java/com/ssg/starroad/board/service/impl/BoardImageServiceImpl.java

@@ -1,10 +1,19 @@
 package com.ssg.starroad.board.service.impl;
 
+import com.ssg.starroad.board.DTO.BoardContentDTO;
+import com.ssg.starroad.board.repository.BoardImageRepository;
 import com.ssg.starroad.board.service.BoardImageService;
 import lombok.RequiredArgsConstructor;
+import org.modelmapper.ModelMapper;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class BoardImageServiceImpl implements BoardImageService {
+    private final BoardImageRepository boardImageRepository;
+    private final ModelMapper modelMapper;
+    @Override
+    public BoardContentDTO getEventContent(Long boardid) {
+        return modelMapper.map(boardImageRepository.findByBoardId(boardid), BoardContentDTO.class);
+    }
 }

src/main/java/com/ssg/starroad/board/service/impl/BoardServiceImpl.java

@@ -1,10 +1,25 @@
 package com.ssg.starroad.board.service.impl;
 
+import com.ssg.starroad.board.DTO.BoardDTO;
+import com.ssg.starroad.board.enums.BoardCategory;
+import com.ssg.starroad.board.repository.BoardRepository;
 import com.ssg.starroad.board.service.BoardService;
 import lombok.RequiredArgsConstructor;
+import org.modelmapper.ModelMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor
 public class BoardServiceImpl implements BoardService {
+
+    private final BoardRepository boardRepository;
+    private final ModelMapper modelMapper;
+
+    @Override
+    public List<BoardDTO> getEventBoards() {
+        return boardRepository.findByCategory(BoardCategory.EVENT).stream().map(board ->
+                modelMapper.map(board,BoardDTO.class)).toList();
+    }
 }

src/main/java/com/ssg/starroad/common/service/S3Uploader.java

@@ -5,10 +5,16 @@
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import net.coobird.thumbnailator.Thumbnails;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -43,17 +49,30 @@ public String upload(MultipartFile multipartFile, String dirName) {
         String encodedFileName = null;
         encodedFileName = Base64.getUrlEncoder().encodeToString(fileName.getBytes(StandardCharsets.UTF_8));
 
+
         // S3에 저장될 파일명 구성
         String s3FileName = dirName + "/" + UUID.randomUUID() + "_" + encodedFileName + "." + extension;
 
         ObjectMetadata objectMetadata = new ObjectMetadata();
+        // 파일을 byte로 변환
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         try {
-            objectMetadata.setContentLength(multipartFile.getInputStream().available());
+            // Thumbnailator를 사용하여 이미지 리사이징
+            Thumbnails.of(multipartFile.getInputStream())
+                    .size(800, 800)
+                    .outputFormat(extension)
+                    .toOutputStream(outputStream);
+
+            byte[] resizedImageBytes = outputStream.toByteArray();
+            ByteArrayInputStream inputStream = new ByteArrayInputStream(resizedImageBytes);
+
+
+            objectMetadata.setContentLength(resizedImageBytes.length);
             objectMetadata.setContentType(multipartFile.getContentType());
             // 권한 공개
             objectMetadata.setHeader("x-amz-acl", "public-read");
 
-            amazonS3.putObject(bucket, s3FileName, multipartFile.getInputStream(), objectMetadata);
+            amazonS3.putObject(bucket, s3FileName, inputStream, objectMetadata);
         } catch (IOException e) {
             log.error("S3 upload fail : " + fileName, e);
             return String.format("S3 upload fail: %s", multipartFile.getOriginalFilename());
@@ -72,27 +91,57 @@ public String upload(MultipartFile multipartFile, String dirName) {
     public List<String> upload(MultipartFile[] multipartFile, String dirName) {
         List<String> urlList = new ArrayList<>();
         for (MultipartFile file : multipartFile) {
-            // 파일명과 확장자 분리
+            // Separate file name and extension
             String originalFileName = file.getOriginalFilename();
             int lastIndex = originalFileName.lastIndexOf('.');
             String fileName = originalFileName.substring(0, lastIndex);
             String extension = originalFileName.substring(lastIndex + 1);
 
-            // 파일명 URL 인코딩
-            String encodedFileName = null;
-            encodedFileName = Base64.getUrlEncoder().encodeToString(fileName.getBytes(StandardCharsets.UTF_8));
+            // URL encode the file name
+            String encodedFileName = Base64.getUrlEncoder().encodeToString(fileName.getBytes(StandardCharsets.UTF_8));
 
-            // S3에 저장될 파일명 구성
+            // Construct the file name to be stored in S3
             String s3FileName = dirName + "/" + UUID.randomUUID() + "_" + encodedFileName + "." + extension;
 
             ObjectMetadata objectMetadata = new ObjectMetadata();
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
             try {
-                objectMetadata.setContentLength(file.getInputStream().available());
-                objectMetadata.setContentType(file.getContentType());
-                // 권한 공개
-                objectMetadata.setHeader("x-amz-acl", "public-read");
-
-                amazonS3.putObject(bucket, s3FileName, file.getInputStream(), objectMetadata);
+                if (file.getContentType().contains("image")) {
+                    // Resize the image using Thumbnailator
+                    Thumbnails.of(file.getInputStream())
+                            .size(800, 800)
+                            .outputFormat(extension)
+                            .toOutputStream(outputStream);
+
+                    byte[] resizedImageBytes = outputStream.toByteArray();
+                    ByteArrayInputStream inputStream = new ByteArrayInputStream(resizedImageBytes);
+
+                    objectMetadata.setContentLength(resizedImageBytes.length);
+                    objectMetadata.setContentType("image/jpeg");
+                    // Set public-read permission
+                    objectMetadata.setHeader("x-amz-acl", "public-read");
+
+                    amazonS3.putObject(bucket, s3FileName, inputStream, objectMetadata);
+                } else {
+                    // Convert non-image file to a basic image (JPEG) and resize
+                    BufferedImage bufferedImage = new BufferedImage(800, 800, BufferedImage.TYPE_INT_RGB);
+                    Graphics2D g2d = bufferedImage.createGraphics();
+                    g2d.setColor(Color.WHITE); // Set background to white
+                    g2d.fillRect(0, 0, 800, 800);
+                    g2d.setColor(Color.BLACK); // Set text color to black
+                    g2d.drawString("Converted to Image", 50, 400);
+                    g2d.dispose();
+
+                    ImageIO.write(bufferedImage, "jpg", outputStream);
+                    byte[] imageBytes = outputStream.toByteArray();
+                    ByteArrayInputStream inputStream = new ByteArrayInputStream(imageBytes);
+
+                    objectMetadata.setContentLength(imageBytes.length);
+                    objectMetadata.setContentType("image/jpeg");
+                    objectMetadata.setHeader("x-amz-acl", "public-read");
+
+                    amazonS3.putObject(bucket, s3FileName, inputStream, objectMetadata);
+                }
             } catch (IOException e) {
                 log.error("S3 upload fail : " + file.getOriginalFilename(), e);
                 urlList.add(String.format("S3 upload fail: %s", file.getOriginalFilename()));