Merge pull request #10 from Neighbors-dev/develop

imscow11253 · web-flow · commit bd117cacdd5c · 2025-01-04T21:32:22.000+09:00
[FEAT] 메인 페이지 조회 API 구현
diff --git a/src/main/java/com/neighbors/tohero/application/baseResponse/BaseResponseMessage.java b/src/main/java/com/neighbors/tohero/application/baseResponse/BaseResponseMessage.java
@@ -21,7 +21,10 @@ public enum BaseResponseMessage {
     JWT_토큰_오류입니다("JWT 토큰 오류입니다"),
     지원하지_않는_토큰_입니다("지원하지 않는 토큰 입니다"),
     토큰이_올바르지_못한_형식입니다("토큰이 올바르지 못한 형식입니다"),
-    유효하지_않은_토큰_입니다("유효하지 않은 토큰입니다");
+    유효하지_않은_토큰_입니다("유효하지 않은 토큰입니다"),
+
+    //main page
+    메인페이지_조회가_정상적으로_실행되었습니다("메인페이지 조회가 정상적으로 실행되었습니다");
 
 
     private final String message;
diff --git a/src/main/java/com/neighbors/tohero/application/login/service/OAuthService.java b/src/main/java/com/neighbors/tohero/application/login/service/OAuthService.java
@@ -6,13 +6,12 @@
 import com.neighbors.tohero.application.baseResponse.BaseResponseMessage;
 import com.neighbors.tohero.application.baseResponse.BaseResponseStatus;
 import com.neighbors.tohero.common.enums.Role;
-import com.neighbors.tohero.common.exception.user.UserException;
 import com.neighbors.tohero.common.jwt.AuthTokens;
 import com.neighbors.tohero.common.jwt.JwtProvider;
 import com.neighbors.tohero.common.jwt.JwtUserDetails;
-import com.neighbors.tohero.domain.login.model.User;
-import com.neighbors.tohero.domain.login.service.CreateUser;
-import com.neighbors.tohero.domain.login.service.oauth.kakao.RequestKakaoInfo;
+import com.neighbors.tohero.domain.domain.login.model.User;
+import com.neighbors.tohero.domain.domain.login.service.CreateUser;
+import com.neighbors.tohero.domain.domain.login.service.oauth.kakao.RequestKakaoInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/com/neighbors/tohero/application/mainPage/dto/GetMainPageInfoResponse.java b/src/main/java/com/neighbors/tohero/application/mainPage/dto/GetMainPageInfoResponse.java
@@ -0,0 +1,30 @@
+package com.neighbors.tohero.application.mainPage.dto;
+
+import com.neighbors.tohero.domain.domain.mainPage.model.Letter;
+import com.neighbors.tohero.domain.domain.notice.model.Notice;
+
+import java.util.List;
+
+public record GetMainPageInfoResponse(
+        List<TopNotices> topNotices,
+        long writtenLetterNumber,
+        List<OpenedLetter> openedLetters
+) {
+    public record TopNotices(
+            String title
+    ){
+        public static TopNotices from(Notice notice){
+            return new TopNotices(notice.getNoticeTitle());
+        }
+    }
+
+    public record OpenedLetter(
+            String to,
+            String from,
+            String content
+    ){
+        public static OpenedLetter from(Letter letter){
+            return new OpenedLetter(letter.getTargetName(), letter.getFromUserName(), letter.getLetterContent());
+        }
+    }
+}
diff --git a/src/main/java/com/neighbors/tohero/application/mainPage/service/MainPageService.java b/src/main/java/com/neighbors/tohero/application/mainPage/service/MainPageService.java
@@ -0,0 +1,54 @@
+package com.neighbors.tohero.application.mainPage.service;
+
+import com.neighbors.tohero.application.baseResponse.BaseResponse;
+import com.neighbors.tohero.application.baseResponse.BaseResponseMessage;
+import com.neighbors.tohero.application.baseResponse.BaseResponseStatus;
+import com.neighbors.tohero.application.mainPage.dto.GetMainPageInfoResponse;
+import com.neighbors.tohero.domain.domain.mainPage.model.Letter;
+import com.neighbors.tohero.domain.domain.mainPage.service.GetLetter;
+import com.neighbors.tohero.domain.domain.notice.model.Notice;
+import com.neighbors.tohero.domain.domain.notice.service.GetNotice;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+@RequiredArgsConstructor
+public class MainPageService {
+
+    private final GetNotice getNotice;
+    private final GetLetter getLetter;
+
+    private static final int EXPOSED_NOTICE_NUMBER = 5;
+
+    public BaseResponse<GetMainPageInfoResponse> getMainPageInfo(Pageable pageable){
+        List<GetMainPageInfoResponse.TopNotices> topNotices = getTopNoticeFromDomain();
+        long writtenLetterNumber = getLetter.getTotalLetterNumber();
+        List<GetMainPageInfoResponse.OpenedLetter> openedLetters = getLetterFromDomain(pageable);
+
+        return new BaseResponse(
+                BaseResponseStatus.OK,
+                BaseResponseMessage.메인페이지_조회가_정상적으로_실행되었습니다.getMessage(),
+                new GetMainPageInfoResponse(topNotices, writtenLetterNumber, openedLetters)
+        );
+    }
+
+    private List<GetMainPageInfoResponse.TopNotices> getTopNoticeFromDomain(){
+        List<Notice> topNotices = getNotice.getTopNotices(EXPOSED_NOTICE_NUMBER);
+
+        return topNotices.stream()
+                .map(GetMainPageInfoResponse.TopNotices::from)
+                .toList();
+    }
+
+    private List<GetMainPageInfoResponse.OpenedLetter> getLetterFromDomain(Pageable pageable){
+        List<Letter> openedLetters = getLetter.getPageableLetter(pageable);
+
+        return openedLetters.stream()
+                .map(GetMainPageInfoResponse.OpenedLetter::from)
+                .toList();
+    }
+}
diff --git a/src/main/java/com/neighbors/tohero/application/notice/dto/GetNoticeResponse.java b/src/main/java/com/neighbors/tohero/application/notice/dto/GetNoticeResponse.java
@@ -1,6 +1,6 @@
 package com.neighbors.tohero.application.notice.dto;
 
-import com.neighbors.tohero.domain.notice.model.Notice;
+import com.neighbors.tohero.domain.domain.notice.model.Notice;
 
 import java.util.List;
 
diff --git a/src/main/java/com/neighbors/tohero/application/notice/service/NoticeService.java b/src/main/java/com/neighbors/tohero/application/notice/service/NoticeService.java
@@ -4,8 +4,8 @@
 import com.neighbors.tohero.application.baseResponse.BaseResponseMessage;
 import com.neighbors.tohero.application.baseResponse.BaseResponseStatus;
 import com.neighbors.tohero.application.notice.dto.GetNoticeResponse;
-import com.neighbors.tohero.domain.notice.model.Notice;
-import com.neighbors.tohero.domain.notice.service.GetNotice;
+import com.neighbors.tohero.domain.domain.notice.model.Notice;
+import com.neighbors.tohero.domain.domain.notice.service.GetNotice;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/neighbors/tohero/application/user/service/UserService.java b/src/main/java/com/neighbors/tohero/application/user/service/UserService.java
@@ -3,7 +3,7 @@
 import com.neighbors.tohero.application.baseResponse.BaseResponse;
 import com.neighbors.tohero.application.baseResponse.BaseResponseMessage;
 import com.neighbors.tohero.application.baseResponse.BaseResponseStatus;
-import com.neighbors.tohero.domain.user.service.UpdateUser;
+import com.neighbors.tohero.domain.domain.user.service.UpdateUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/neighbors/tohero/common/config/SecurityConfig.java b/src/main/java/com/neighbors/tohero/common/config/SecurityConfig.java
@@ -15,6 +15,11 @@
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+import java.util.List;
 
 @Configuration
 @RequiredArgsConstructor
@@ -35,6 +40,7 @@ public WebSecurityCustomizer webSecurityCustomizer() {
                 "/webjars/",
                 "/v3/api-docs/**",
                 "/oauth/kakao/callback",
+                "/oauth/kakao/callback2",
                 "/auth/refreshToken",
                 "/address"
         );
@@ -61,4 +67,19 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 
         return http.build();
     }
+
+    @Bean
+    public CorsFilter corsFilter() {
+        CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true); // 쿠키 포함 허용
+        config.setAllowedOrigins(List.of("http://localhost:5173")); // 허용할 도메인
+        config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS")); // 허용할 HTTP 메서드
+        config.setAllowedHeaders(List.of("*")); // 모든 헤더 허용
+        config.setExposedHeaders(List.of("Authorization")); // 노출할 헤더
+
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", config); // 모든 URL에 대해 설정 적용
+
+        return new CorsFilter(source);
+    }
 }
diff --git a/src/main/java/com/neighbors/tohero/common/jwt/JwtUserDetails.java b/src/main/java/com/neighbors/tohero/common/jwt/JwtUserDetails.java
@@ -1,7 +1,7 @@
 package com.neighbors.tohero.common.jwt;
 
 import com.neighbors.tohero.common.enums.Role;
-import com.neighbors.tohero.domain.login.model.User;
+import com.neighbors.tohero.domain.domain.login.model.User;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/neighbors/tohero/domain/domain/login/model/User.java b/src/main/java/com/neighbors/tohero/domain/domain/login/model/User.java
@@ -1,4 +1,4 @@
-package com.neighbors.tohero.domain.login.model;
+package com.neighbors.tohero.domain.domain.login.model;
 
 import com.neighbors.tohero.common.enums.Role;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/neighbors/tohero/domain/domain/login/service/CreateUser.java b/src/main/java/com/neighbors/tohero/domain/domain/login/service/CreateUser.java
@@ -1,8 +1,7 @@
-package com.neighbors.tohero.domain.login.service;
+package com.neighbors.tohero.domain.domain.login.service;
 
 import com.neighbors.tohero.common.annotaion.DomainService;
-import com.neighbors.tohero.common.exception.user.UserException;
-import com.neighbors.tohero.domain.login.model.User;
+import com.neighbors.tohero.domain.domain.login.model.User;
 import com.neighbors.tohero.domain.query.UserRepository;
 import lombok.RequiredArgsConstructor;
 
diff --git a/src/main/java/com/neighbors/tohero/domain/domain/login/service/oauth/kakao/RequestKakaoInfo.java b/src/main/java/com/neighbors/tohero/domain/domain/login/service/oauth/kakao/RequestKakaoInfo.java
@@ -1,4 +1,4 @@
-package com.neighbors.tohero.domain.login.service.oauth.kakao;
+package com.neighbors.tohero.domain.domain.login.service.oauth.kakao;
 
 import com.neighbors.tohero.application.login.dto.kakao.KakaoInfoResponse;
 import com.neighbors.tohero.application.login.dto.kakao.KakaoTokens;
diff --git a/src/main/java/com/neighbors/tohero/domain/domain/mainPage/model/Letter.java b/src/main/java/com/neighbors/tohero/domain/domain/mainPage/model/Letter.java
@@ -0,0 +1,25 @@
+package com.neighbors.tohero.domain.domain.mainPage.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class Letter {
+    private long letterId;
+    private String letterContent;
+    private boolean isOpened;
+    private String fromUserName;
+    private String targetName;
+
+    public String getTargetName(){
+        if(targetName == null) {
+            return "익명의";
+        }
+        return targetName;
+    }
+
+    public static Letter of(long letterId, String letterContent, boolean isOpened, String fromUserName, String targetName) {
+        return new Letter(letterId, letterContent, isOpened, fromUserName, targetName);
+    }
+}
diff --git a/src/main/java/com/neighbors/tohero/domain/domain/mainPage/service/GetLetter.java b/src/main/java/com/neighbors/tohero/domain/domain/mainPage/service/GetLetter.java
@@ -0,0 +1,24 @@
+package com.neighbors.tohero.domain.domain.mainPage.service;
+
+import com.neighbors.tohero.common.annotaion.DomainService;
+import com.neighbors.tohero.domain.domain.mainPage.model.Letter;
+import com.neighbors.tohero.domain.query.LetterRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+@DomainService
+@RequiredArgsConstructor
+public class GetLetter {
+
+    private final LetterRepository letterRepository;
+
+    public long getTotalLetterNumber(){
+        return letterRepository.getTotalLetterNumber();
+    }
+
+    public List<Letter> getPageableLetter(Pageable pageable){
+        return letterRepository.getPageableLetter(pageable);
+    }
+}
diff --git a/src/main/java/com/neighbors/tohero/domain/domain/notice/model/Notice.java b/src/main/java/com/neighbors/tohero/domain/domain/notice/model/Notice.java
@@ -1,4 +1,4 @@
-package com.neighbors.tohero.domain.notice.model;
+package com.neighbors.tohero.domain.domain.notice.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/com/neighbors/tohero/domain/domain/notice/service/GetNotice.java b/src/main/java/com/neighbors/tohero/domain/domain/notice/service/GetNotice.java
@@ -1,7 +1,7 @@
-package com.neighbors.tohero.domain.notice.service;
+package com.neighbors.tohero.domain.domain.notice.service;
 
 import com.neighbors.tohero.common.annotaion.DomainService;
-import com.neighbors.tohero.domain.notice.model.Notice;
+import com.neighbors.tohero.domain.domain.notice.model.Notice;
 import com.neighbors.tohero.domain.query.NoticeRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -17,4 +17,8 @@ public class GetNotice {
     public List<Notice> getPagedNotice(Pageable pageable) {
         return noticeRepository.getPagedNotice(pageable);
     }
+
+    public List<Notice> getTopNotices(int exposeNoticeNumber){
+        return noticeRepository.getTopNotices(exposeNoticeNumber);
+    }
 }
diff --git a/src/main/java/com/neighbors/tohero/domain/domain/user/service/UpdateUser.java b/src/main/java/com/neighbors/tohero/domain/domain/user/service/UpdateUser.java
@@ -1,4 +1,4 @@
-package com.neighbors.tohero.domain.user.service;
+package com.neighbors.tohero.domain.domain.user.service;
 
 import com.neighbors.tohero.common.annotaion.DomainService;
 import com.neighbors.tohero.domain.query.UserRepository;
diff --git a/src/main/java/com/neighbors/tohero/domain/query/LetterRepository.java b/src/main/java/com/neighbors/tohero/domain/query/LetterRepository.java
@@ -0,0 +1,12 @@
+package com.neighbors.tohero.domain.query;
+
+import com.neighbors.tohero.domain.domain.mainPage.model.Letter;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+public interface LetterRepository {
+    long getTotalLetterNumber();
+    List<Letter> getPageableLetter(Pageable pageable);
+}
diff --git a/src/main/java/com/neighbors/tohero/domain/query/NoticeRepository.java b/src/main/java/com/neighbors/tohero/domain/query/NoticeRepository.java
@@ -1,10 +1,11 @@
 package com.neighbors.tohero.domain.query;
 
-import com.neighbors.tohero.domain.notice.model.Notice;
+import com.neighbors.tohero.domain.domain.notice.model.Notice;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
 public interface NoticeRepository {
     List<Notice> getPagedNotice(Pageable pageable);
+    List<Notice> getTopNotices(int exposeNoticeNumber);
 }
diff --git a/src/main/java/com/neighbors/tohero/domain/query/UserRepository.java b/src/main/java/com/neighbors/tohero/domain/query/UserRepository.java
@@ -1,6 +1,6 @@
 package com.neighbors.tohero.domain.query;
 
-import com.neighbors.tohero.domain.login.model.User;
+import com.neighbors.tohero.domain.domain.login.model.User;
 
 public interface UserRepository {
     User createUser(User user);
diff --git a/src/main/java/com/neighbors/tohero/infrastructure/entity/LetterEntity.java b/src/main/java/com/neighbors/tohero/infrastructure/entity/LetterEntity.java
@@ -2,9 +2,11 @@
 
 import com.neighbors.tohero.infrastructure.entity.base.BaseEntity;
 import jakarta.persistence.*;
+import lombok.Getter;
 
 @Entity
 @Table(name = "`Letter`")
+@Getter
 public class LetterEntity extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -17,9 +19,6 @@ public class LetterEntity extends BaseEntity {
     @Column(name = "is_opened", nullable = false)
     private boolean isOpened;
 
-    @Column(name = "from_user_name", nullable = false)
-    private String fromUserName;
-
     @Column(name = "target_name", nullable = true)
     private String targetName;
 
@@ -31,5 +30,6 @@ public class LetterEntity extends BaseEntity {
     @JoinColumn(name = "user_id", nullable = true)
     private UserEntity user;
 
-
+    @Column(name = "is_public")
+    private Boolean isPublic;
 }
diff --git a/src/main/java/com/neighbors/tohero/infrastructure/mapper/LetterMapper.java b/src/main/java/com/neighbors/tohero/infrastructure/mapper/LetterMapper.java
@@ -0,0 +1,18 @@
+package com.neighbors.tohero.infrastructure.mapper;
+
+import com.neighbors.tohero.domain.domain.mainPage.model.Letter;
+import com.neighbors.tohero.infrastructure.entity.LetterEntity;
+import org.springframework.stereotype.Component;
+
+@Component
+public class LetterMapper {
+    public Letter toDomain(LetterEntity letterEntity) {
+        return Letter.of(
+                letterEntity.getLetterId(),
+                letterEntity.getLetterContent(),
+                letterEntity.isOpened(),
+                letterEntity.getUser().getNickName(),
+                letterEntity.getTargetName()
+        );
+    }
+}
diff --git a/src/main/java/com/neighbors/tohero/infrastructure/mapper/NoticeMapper.java b/src/main/java/com/neighbors/tohero/infrastructure/mapper/NoticeMapper.java
@@ -1,6 +1,6 @@
 package com.neighbors.tohero.infrastructure.mapper;
 
-import com.neighbors.tohero.domain.notice.model.Notice;
+import com.neighbors.tohero.domain.domain.notice.model.Notice;
 import com.neighbors.tohero.infrastructure.entity.NoticeEntity;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/com/neighbors/tohero/infrastructure/mapper/UserMapper.java b/src/main/java/com/neighbors/tohero/infrastructure/mapper/UserMapper.java
@@ -1,6 +1,6 @@
 package com.neighbors.tohero.infrastructure.mapper;
 
-import com.neighbors.tohero.domain.login.model.User;
+import com.neighbors.tohero.domain.domain.login.model.User;
 import com.neighbors.tohero.infrastructure.entity.UserEntity;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/com/neighbors/tohero/infrastructure/query/impl/LetterRepositoryImpl.java b/src/main/java/com/neighbors/tohero/infrastructure/query/impl/LetterRepositoryImpl.java
diff --git a/src/main/java/com/neighbors/tohero/infrastructure/query/impl/NoticeRepositoryImpl.java b/src/main/java/com/neighbors/tohero/infrastructure/query/impl/NoticeRepositoryImpl.java
diff --git a/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserRepositoryImpl.java b/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserRepositoryImpl.java
diff --git a/src/main/java/com/neighbors/tohero/infrastructure/repository/LetterEntityRepository.java b/src/main/java/com/neighbors/tohero/infrastructure/repository/LetterEntityRepository.java
diff --git a/src/main/java/com/neighbors/tohero/infrastructure/repository/NoticeEntityRepository.java b/src/main/java/com/neighbors/tohero/infrastructure/repository/NoticeEntityRepository.java
diff --git a/src/main/java/com/neighbors/tohero/presentation/controller/MainPageController.java b/src/main/java/com/neighbors/tohero/presentation/controller/MainPageController.java
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.neighbors.tohero.domain.login.model;`
	`1`	`+package com.neighbors.tohero.domain.domain.login.model;`
`2`	`2`
`3`	`3`	`import com.neighbors.tohero.common.enums.Role;`
`4`	`4`	`import lombok.AllArgsConstructor;`