Merge pull request #17 from Neighbors-dev/develop

[FEAT] 탈퇴하기 API 및 소식 모아보기 API 구현

Author: imscow11253

src/main/java/com/neighbors/tohero/application/baseResponse/BaseResponseMessage.java

@@ -25,6 +25,8 @@ public enum BaseResponseMessage {
     이메일_형식이_올바르지_못합니다("이메일 형식이 올바르지 못합니다"),
     유저가_성공적으로_인증되었습니다("유저가 성공적으로 인증되었습니다"),
     GUEST_유저_토큰이_정상적으로_생성되었습니다("GUEST 유저 토큰이 정상적으로 생성되었습니다"),
+    로그아웃이_성공적으로_실행되었습니다("로그아웃이 성공적으로 실행되었습니다"),
+    성공적으로_탈퇴했습니다("성공적으로 탈퇴했습니다"),
 
     //jwt error message
     JWT_토큰_오류입니다("JWT 토큰 오류입니다"),
@@ -43,7 +45,13 @@ public enum BaseResponseMessage {
 
     //letter
     편지가_성공적으로_생성_되었습니다("편지가 성공적으로 생성 되었습니다"),
-    편지_생성이_실패_했습니다("편지 생성이 실패했습니다");
+    편지_생성이_실패_했습니다("편지 생성이 실패했습니다"),
+    편지가_성공적으로_조회되었습니다("편지가 성공적으로 조회되었습니다"),
+    일치하는_편지가_없습니다("일치하는 편지가 없습니다"),
+
+    //news
+    뉴스_조회가_성공했습니다("뉴스 조회가 성공했습니다"),
+    뉴스_조회가_실패했습니다("뉴스 조회가 실패했습니다");
 
     private final String message;
 

src/main/java/com/neighbors/tohero/application/letter/dto/GetLetterDetailRequest.java

@@ -0,0 +1,9 @@
+package com.neighbors.tohero.application.letter.dto;
+
+import jakarta.validation.constraints.NotNull;
+
+public record GetLetterDetailRequest(
+        @NotNull
+        long letterId
+) {
+}

src/main/java/com/neighbors/tohero/application/letter/dto/GetLetterDetailResponse.java

@@ -0,0 +1,18 @@
+package com.neighbors.tohero.application.letter.dto;
+
+import com.neighbors.tohero.domain.domain.mainPage.model.Letter;
+
+public record GetLetterDetailResponse(
+        LetterInfo letterInfo
+) {
+    public record LetterInfo(
+        long letterId,
+        String content,
+        String from,
+        String to
+    ){}
+
+    public static GetLetterDetailResponse from(Letter letter) {
+        return new GetLetterDetailResponse(new LetterInfo(letter.getLetterId(), letter.getLetterContent(), letter.getWriter(), letter.getTargetName()));
+    }
+}

src/main/java/com/neighbors/tohero/application/letter/service/LetterService.java

@@ -5,12 +5,16 @@
 import com.neighbors.tohero.application.baseResponse.BaseResponseStatus;
 import com.neighbors.tohero.application.letter.dto.CreateLetterRequest;
 import com.neighbors.tohero.application.letter.dto.CreateLetterResponse;
+import com.neighbors.tohero.application.letter.dto.GetLetterDetailRequest;
+import com.neighbors.tohero.application.letter.dto.GetLetterDetailResponse;
 import com.neighbors.tohero.common.enums.Role;
 import com.neighbors.tohero.common.exception.address.AddressException;
 import com.neighbors.tohero.common.exception.letter.LetterException;
 import com.neighbors.tohero.common.jwt.JwtUserDetails;
 import com.neighbors.tohero.domain.domain.address.service.GetAddress;
 import com.neighbors.tohero.domain.domain.letter.service.CreateLetter;
+import com.neighbors.tohero.domain.domain.mainPage.model.Letter;
+import com.neighbors.tohero.domain.domain.mainPage.service.GetLetter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -22,6 +26,7 @@
 public class LetterService {
 
     private final CreateLetter createLetter;
+    private final GetLetter getLetter;
     private final GetAddress getAddress;
 
     public BaseResponse<CreateLetterResponse> createLetter(final JwtUserDetails jwtUserDetail, final CreateLetterRequest createLetterRequest) {
@@ -46,6 +51,16 @@ public BaseResponse<CreateLetterResponse> createLetter(final JwtUserDetails jwtU
         );
     }
 
+    public BaseResponse<GetLetterDetailResponse> getLetterDetail(GetLetterDetailRequest getLetterDetailRequest){
+        Letter matchedLetter = getLetter.getLetterById(getLetterDetailRequest.letterId());
+
+        return new BaseResponse<>(
+                BaseResponseStatus.OK,
+                BaseResponseMessage.편지가_성공적으로_조회되었습니다.getMessage(),
+                GetLetterDetailResponse.from(matchedLetter)
+        );
+    }
+
     private BaseResponse<CreateLetterResponse> createGuestLetter(final String nickname, final CreateLetterRequest createLetterRequest) {
         long createdLetterId = createLetter.createGuestLetter(
                 nickname,

src/main/java/com/neighbors/tohero/application/news/dto/GetPagedNewsResponse.java

@@ -0,0 +1,26 @@
+package com.neighbors.tohero.application.news.dto;
+
+import com.neighbors.tohero.domain.domain.news.model.News;
+
+import java.util.List;
+
+public record GetPagedNewsResponse(
+        List<NewsInfo> newsInfos
+) {
+    public record NewsInfo(
+            long newsId,
+            String title,
+            String content
+    ){
+        public static NewsInfo from(News news){
+            return new NewsInfo(news.getNewsId(), news.getTitle(), news.getContent());
+        }
+    }
+
+    public static GetPagedNewsResponse from(List<News> newsInfos) {
+        List<NewsInfo> newsInfoList = newsInfos.stream()
+                .map(NewsInfo::from)
+                .toList();
+        return new GetPagedNewsResponse(newsInfoList);
+    }
+}

src/main/java/com/neighbors/tohero/application/news/service/NewsService.java

@@ -0,0 +1,30 @@
+package com.neighbors.tohero.application.news.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.news.dto.GetPagedNewsResponse;
+import com.neighbors.tohero.domain.domain.news.model.News;
+import com.neighbors.tohero.domain.domain.news.service.GetNews;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class NewsService {
+
+    private final GetNews getNews;
+
+    public BaseResponse<GetPagedNewsResponse> getPagedNews(Pageable pageable){
+        List<News> news = getNews.getPagedNews(pageable);
+
+        return new BaseResponse<>(
+                BaseResponseStatus.OK,
+                BaseResponseMessage.뉴스_조회가_성공했습니다.getMessage(),
+                GetPagedNewsResponse.from(news)
+        );
+    }
+}

src/main/java/com/neighbors/tohero/application/user/service/UserService.java

@@ -11,7 +11,9 @@
 import com.neighbors.tohero.common.jwt.JwtUserDetails;
 import com.neighbors.tohero.domain.domain.user.model.User;
 import com.neighbors.tohero.domain.domain.user.service.CreateUser;
+import com.neighbors.tohero.domain.domain.user.service.DeleteUser;
 import com.neighbors.tohero.domain.domain.user.service.UpdateUser;
+import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +23,7 @@ public class UserService {
 
     private final UpdateUser updateUser;
     private final CreateUser createUser;
+    private final DeleteUser deleteUser;
     private final JwtProvider jwtProvider;
 
     public BaseResponse updateUserName(long userId, String nickname){
@@ -39,6 +42,26 @@ public BaseResponse<AuthenticateUserResponse> authenticateUser(AuthenticateUserR
         return returnGuestUserToken(authenticateUserRequest);
     }
 
+    public BaseResponse logout(HttpSession httpSession){
+        //todo : Redis record 삭제
+        httpSession.invalidate();
+        return new BaseResponse<>(
+                BaseResponseStatus.OK,
+                BaseResponseMessage.로그아웃이_성공적으로_실행되었습니다.getMessage()
+        );
+    }
+
+    public BaseResponse signout(JwtUserDetails jwtUserDetails, HttpSession httpSession){
+        httpSession.invalidate();
+
+        deleteUser.signout(jwtUserDetails.getUserId());
+
+        return new BaseResponse<>(
+                BaseResponseStatus.OK,
+                BaseResponseMessage.성공적으로_탈퇴했습니다.getMessage()
+        );
+    }
+
     private BaseResponse<AuthenticateUserResponse> returnLoginedUserToken(AuthenticateUserRequest authenticateUserRequest) {
         User createdUser = createUser.createUser(User.toEntity(authenticateUserRequest));
         AuthTokens authTokens = jwtProvider.createToken(JwtUserDetails.from(createdUser));

src/main/java/com/neighbors/tohero/common/config/SecurityConfig.java

@@ -46,7 +46,9 @@ public WebSecurityCustomizer webSecurityCustomizer() {
                 "/auth/refreshToken",
                 "/address",
                 "/notice/**",
-                "/mainPage/**"
+                "/mainPage/**",
+                "/letter/detail",
+                "/news"
         );
     }
 
@@ -64,7 +66,10 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
                 {
                     exception.authenticationEntryPoint(customJwtAuthenticationEntryPoint);
                     exception.accessDeniedHandler(customAccessDeniedHandler);
-                });
+                })
+                .authorizeHttpRequests(auth -> auth
+                        .anyRequest().authenticated()
+                );
 
         return http.build();
     }

src/main/java/com/neighbors/tohero/common/exception/address/AddressException.java

@@ -1,7 +1,9 @@
 package com.neighbors.tohero.common.exception.address;
 
 import com.neighbors.tohero.application.baseResponse.BaseResponseStatus;
+import lombok.Getter;
 
+@Getter
 public class AddressException extends RuntimeException{
     private final BaseResponseStatus status;
     private final String message;

src/main/java/com/neighbors/tohero/common/exception/letter/LetterException.java

@@ -1,7 +1,9 @@
 package com.neighbors.tohero.common.exception.letter;
 
 import com.neighbors.tohero.application.baseResponse.BaseResponseStatus;
+import lombok.Getter;
 
+@Getter
 public class LetterException extends RuntimeException {
 
     private final BaseResponseStatus status;