Release/v3.0.2

.github/pull_request_template.md

@@ -1,23 +1,23 @@
-## PR 내용
+# 📌 PR 내용
 
 <br>
 
-## PR 세부사항
+## 🔍 PR 세부사항
 
 <br>
 
-## 관련 스크린샷
+## 📸 관련 스크린샷
 
 <br>
 
-## 주의사항
+## 📝 주의사항
 
 <br>
 
-## 체크 리스트
+## ✅ 체크리스트
 
 - [ ] 리뷰어 설정
 - [ ] Assignee 설정
 - [ ] Label 설정
-- [ ] 제목 양식 맞췄나요? (ex. #0 Feat: 기능 추가)
-- [ ] 변경 사항에 대한 테스트
+- [ ] 제목 양식 맞췄나요? (ex. [WTH-01] PR 템플릿 수정)
+- [ ] 변경 사항에 대한 테스트

Dockerfile-dev

@@ -1,5 +1,5 @@
-# open jdk 17 버전의 alpine 리눅스 환경을 구성
-FROM openjdk:17-alpine
+# eclipse-temurin 17 버전의 alpine 리눅스 환경을 구성
+FROM eclipse-temurin:17-jdk-alpine
 
 # build가 되는 시점에 JAR_FILE이라는 변수 명에 build/libs/*.jar 선언
 # build/libs - gradle로 빌드했을 때 jar 파일이 생성되는 경로

Dockerfile-prod

@@ -1,5 +1,5 @@
-# open jdk 17 버전의 alpine 리눅스 환경을 구성
-FROM openjdk:17-alpine
+# eclipse-temurin 17 버전의 alpine 리눅스 환경을 구성
+FROM eclipse-temurin:17-jdk-alpine
 
 # build가 되는 시점에 JAR_FILE이라는 변수 명에 build/libs/*.jar 선언
 # build/libs - gradle로 빌드했을 때 jar 파일이 생성되는 경로

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.3.1'
+	id 'org.springframework.boot' version '3.5.7'
 	id 'io.spring.dependency-management' version '1.1.5'
 }
 
@@ -52,10 +52,15 @@ dependencies {
 
 	// Test
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation "org.junit.jupiter:junit-jupiter:5.8.1"
+	testImplementation "org.testcontainers:testcontainers:2.0.1"
+	testImplementation "org.testcontainers:testcontainers-junit-jupiter:2.0.1"
+	testImplementation "org.testcontainers:testcontainers-mysql:2.0.1"
+	testImplementation 'org.springframework.boot:spring-boot-testcontainers'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
 	// Swagger
-	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.14'
 
 	// AWS Spring Cloud
 	implementation 'software.amazon.awssdk:s3:2.19.1'
@@ -66,6 +71,10 @@ dependencies {
 	// Spring Authorization Server
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-authorization-server'
 
+    // Prometheus
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
+
 }
 
 tasks.named('test') {

src/main/java/leets/weeth/domain/attendance/application/usecase/AttendanceUseCaseImpl.java

@@ -44,7 +44,7 @@ public void checkIn(Long userId, Integer code) throws AttendanceCodeMismatchExce
 
         LocalDateTime now = LocalDateTime.now();
         Attendance todayMeeting = user.getAttendances().stream()
-                .filter(attendance -> attendance.getMeeting().getStart().isBefore(now)
+                .filter(attendance -> attendance.getMeeting().getStart().minusMinutes(10).isBefore(now)
                         && attendance.getMeeting().getEnd().isAfter(now))
                 .findAny()
                 .orElseThrow(AttendanceNotFoundException::new);

src/main/java/leets/weeth/domain/board/application/dto/NoticeDTO.java

@@ -1,5 +1,6 @@
 package leets.weeth.domain.board.application.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import leets.weeth.domain.comment.application.dto.CommentDTO;
@@ -59,4 +60,11 @@ public record ResponseAll(
     ) {
     }
 
+    @Builder
+    public record SaveResponse(
+            @Schema(description = "공지사항 생성 응답", example = "1")
+            long id
+    ) {
+    }
+
 }

src/main/java/leets/weeth/domain/board/application/dto/PostDTO.java

@@ -1,9 +1,9 @@
 package leets.weeth.domain.board.application.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-import java.util.List;
 import leets.weeth.domain.board.domain.entity.enums.Category;
 import leets.weeth.domain.board.domain.entity.enums.Part;
 import leets.weeth.domain.comment.application.dto.CommentDTO;
@@ -13,19 +13,23 @@
 import leets.weeth.domain.user.domain.entity.enums.Role;
 import lombok.Builder;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 public class PostDTO {
 
     @Builder
     public record Save(
-            @NotNull String title,
-            @NotNull String content,
+            @NotBlank(message = "제목 입력은 필수입니다.") String title,
+            @NotBlank(message = "내용 입력은 필수입니다.") String content,
             @NotNull Category category,
             String studyName,
             int week,
             @NotNull Part part,
             @NotNull Integer cardinalNumber,
             @Valid List<@NotNull FileSaveRequest> files
-    ){}
+    ) {
+    }
 
     @Builder
     public record SaveEducation(
@@ -34,7 +38,15 @@ public record SaveEducation(
             @NotNull List<Part> parts,
             @NotNull Integer cardinalNumber,
             @Valid List<@NotNull FileSaveRequest> files
-    ){}
+    ) {
+    }
+
+    @Builder
+    public record SaveResponse(
+            @Schema(description = "게시글 생성시 응답", example = "1")
+            long id
+    ) {
+    }
 
     @Builder
     public record Update(
@@ -45,7 +57,8 @@ public record Update(
             Part part,
             Integer cardinalNumber,
             @Valid List<FileSaveRequest> files
-    ){}
+    ) {
+    }
 
     @Builder
     public record UpdateEducation(
@@ -54,7 +67,8 @@ public record UpdateEducation(
             List<Part> parts,
             Integer cardinalNumber,
             @Valid List<FileSaveRequest> files
-    ){}
+    ) {
+    }
 
     @Builder
     public record Response(
@@ -73,7 +87,8 @@ public record Response(
             Integer commentCount,
             List<CommentDTO.Response> comments,
             List<FileResponse> fileUrls
-    ){}
+    ) {
+    }
 
     @Builder
     public record ResponseAll(
@@ -90,7 +105,8 @@ public record ResponseAll(
             Integer commentCount,
             boolean hasFile,
             boolean isNew
-    ){}
+    ) {
+    }
 
     @Builder
     public record ResponseEducationAll(
@@ -105,9 +121,11 @@ public record ResponseEducationAll(
             Integer commentCount,
             boolean hasFile,
             boolean isNew
-    ){}
+    ) {
+    }
 
     public record ResponseStudyNames(
             List<String> studyNames
-    ) {}
+    ) {
+    }
 }

src/main/java/leets/weeth/domain/board/application/mapper/NoticeMapper.java

@@ -37,4 +37,6 @@ public interface NoticeMapper {
     })
     NoticeDTO.Response toNoticeDto(Notice notice, List<FileResponse> fileUrls, List<CommentDTO.Response> comments);
 
+    NoticeDTO.SaveResponse  toSaveResponse(Notice notice);
+
 }

src/main/java/leets/weeth/domain/board/application/mapper/PostMapper.java

@@ -34,6 +34,8 @@ public interface PostMapper {
     @Mapping(target = "category", constant = "Education")
     Post fromEducationDto(PostDTO.SaveEducation dto, User user);
 
+    PostDTO.SaveResponse toSaveResponse(Post post);
+
     @Mappings({
             @Mapping(target = "name", source = "post.user.name"),
             @Mapping(target = "position", source = "post.user.position"),

src/main/java/leets/weeth/domain/board/application/usecase/NoticeUsecase.java

@@ -6,14 +6,13 @@
 
 
 public interface NoticeUsecase {
-
-    void save(NoticeDTO.Save dto, Long userId);
+    NoticeDTO.SaveResponse save(NoticeDTO.Save dto, Long userId);
 
     NoticeDTO.Response findNotice(Long noticeId);
 
     Slice<NoticeDTO.ResponseAll> findNotices(int pageNumber, int pageSize);
 
-    void update(Long noticeId, NoticeDTO.Update dto, Long userId) throws UserNotMatchException;
+    NoticeDTO.SaveResponse update(Long noticeId, NoticeDTO.Update dto, Long userId) throws UserNotMatchException;
 
     void delete(Long noticeId, Long userId) throws UserNotMatchException;
 

src/main/java/leets/weeth/domain/board/application/usecase/NoticeUsecaseImpl.java

@@ -1,9 +1,5 @@
 package leets.weeth.domain.board.application.usecase;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import leets.weeth.domain.board.application.dto.NoticeDTO;
 import leets.weeth.domain.board.application.exception.NoSearchResultException;
 import leets.weeth.domain.board.application.exception.PageNotFoundException;
@@ -33,6 +29,11 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @Service
 @RequiredArgsConstructor
 public class NoticeUsecaseImpl implements NoticeUsecase {
@@ -54,14 +55,16 @@ public class NoticeUsecaseImpl implements NoticeUsecase {
 
     @Override
     @Transactional
-    public void save(NoticeDTO.Save request, Long userId) {
+    public NoticeDTO.SaveResponse save(NoticeDTO.Save request, Long userId) {
         User user = userGetService.find(userId);
 
         Notice notice = mapper.fromNoticeDto(request, user);
-        noticeSaveService.save(notice);
+        Notice savedNotice = noticeSaveService.save(notice);
 
         List<File> files = fileMapper.toFileList(request.files(), notice);
         fileSaveService.save(files);
+
+        return mapper.toSaveResponse(savedNotice);
     }
 
     @Override
@@ -103,7 +106,7 @@ public Slice<NoticeDTO.ResponseAll> searchNotice(String keyword, int pageNumber,
 
     @Override
     @Transactional
-    public void update(Long noticeId, NoticeDTO.Update dto, Long userId) {
+    public NoticeDTO.SaveResponse update(Long noticeId, NoticeDTO.Update dto, Long userId) {
         Notice notice = validateOwner(noticeId, userId);
 
         List<File> fileList = getFiles(noticeId);
@@ -113,6 +116,8 @@ public void update(Long noticeId, NoticeDTO.Update dto, Long userId) {
         fileSaveService.save(files);
 
         noticeUpdateService.update(notice, dto);
+
+        return mapper.toSaveResponse(notice);
     }
 
     @Override