diff --git a/.gitignore 2 b/.gitignore 2 new file mode 100644 index 00000000..7fbad343 --- /dev/null +++ b/.gitignore 2 @@ -0,0 +1,48 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +.idea/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### application.yml ### +src/main/resources/application-dev.yml +src/test/resources/application-dev.yml +src/test/resources/application.yml + +### MAC ### +**/.DS_Store + +src/main/resources/firebase-service-account.json diff --git a/.gitmodules 2 b/.gitmodules 2 new file mode 100644 index 00000000..87866daf --- /dev/null +++ b/.gitmodules 2 @@ -0,0 +1,3 @@ +[submodule "config"] + path = config + url = https://github.com/cozy-mate/submodule.git diff --git a/Dockerfile 2 b/Dockerfile 2 new file mode 100644 index 00000000..a01cbf70 --- /dev/null +++ b/Dockerfile 2 @@ -0,0 +1,6 @@ +FROM openjdk:17-oracle + +ARG JAR_FILE=build/libs/*.jar +COPY ${JAR_FILE} app.jar + +ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=${SPRING_PROFILE}", "/app.jar"] \ No newline at end of file diff --git a/README 2.md b/README 2.md new file mode 100644 index 00000000..063b983a --- /dev/null +++ b/README 2.md @@ -0,0 +1 @@ +# cozymate-Server diff --git a/build 2.gradle b/build 2.gradle new file mode 100644 index 00000000..e9a72e6d --- /dev/null +++ b/build 2.gradle @@ -0,0 +1,82 @@ + +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.1' + id 'io.spring.dependency-management' version '1.1.5' +} + +group = 'com.cozymate' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + implementation 'com.github.mwiede:jsch:0.2.16' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + + //swagger 설정 + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + + //jwt + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + implementation 'io.jsonwebtoken:jjwt-impl:0.11.5' + implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5' + + // oauth2 + implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' + implementation 'org.springframework.security:spring-security-oauth2-jose' + + + //DB의 JSON 타입을 Domain에서 사용하기 위함 + implementation 'io.hypersistence:hypersistence-utils-hibernate-62:3.7.0' + + //spring security + implementation 'org.springframework.boot:spring-boot-starter-security' + + //aws - S3 + implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE' + // TODO: 07.25. [무빗] 위 패키지는 18년이 마지막 업데이트된 레거시, 추후 아래 패키지로 변경 예정 + // implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3Z:3.1.1' + + //queryDsl + implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' + annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + // Firebase Admin SDK + implementation 'com.google.firebase:firebase-admin:9.2.0' + +} + +tasks.named('test') { + useJUnitPlatform() +} + +processResources.dependsOn('copyGitSubmodule') +tasks.register('copyGitSubmodule', Copy) { + from './config' + include '*.yml' + include 'firebase-service-account.json' + into 'src/main/resources' +} \ No newline at end of file diff --git a/gradlew 2 b/gradlew 2 new file mode 100755 index 00000000..b740cf13 --- /dev/null +++ b/gradlew 2 @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew 2.bat b/gradlew 2.bat new file mode 100644 index 00000000..25da30db --- /dev/null +++ b/gradlew 2.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings 2.gradle b/settings 2.gradle new file mode 100644 index 00000000..3dc120f8 --- /dev/null +++ b/settings 2.gradle @@ -0,0 +1 @@ +rootProject.name = 'cozymate_server' diff --git a/src/main/java/com/cozymate/cozymate_server/domain/memberstat/controller/MemberStatController.java b/src/main/java/com/cozymate/cozymate_server/domain/memberstat/controller/MemberStatController.java index 94d32940..e7d351bd 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/memberstat/controller/MemberStatController.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/memberstat/controller/MemberStatController.java @@ -15,6 +15,7 @@ import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.http.ResponseEntity; @@ -37,6 +38,7 @@ public class MemberStatController { private final MemberStatCommandService memberStatCommandService; private final MemberStatQueryService memberStatQueryService; + @Operation( summary = "[포비] 사용자 상세정보 등록", description = "사용자의 토큰을 넣어 사용하고, body로 사용자 상세정보를 넣어 사용합니다.\n\n" @@ -93,11 +95,9 @@ public ResponseEntity> modifyMemberStat( public ResponseEntity> getMemberStat( @AuthenticationPrincipal MemberDetails memberDetails ) { - MemberStatQueryResponseDTO memberStatQueryResponseDTO = MemberStatConverter.toDto( - memberStatQueryService.getMemberStat(memberDetails.getMember())); return ResponseEntity.ok( ApiResponse.onSuccess( - memberStatQueryResponseDTO + memberStatQueryService.getMemberStat(memberDetails.getMember()) )); } @@ -113,11 +113,9 @@ public ResponseEntity> getMemberStat( public ResponseEntity> getMemberStat( @PathVariable Long memberId ) { - MemberStatQueryResponseDTO memberStatQueryResponseDTO = MemberStatConverter.toDto( - memberStatQueryService.getMemberStatWithId(memberId)); return ResponseEntity.ok( ApiResponse.onSuccess( - memberStatQueryResponseDTO + memberStatQueryService.getMemberStatWithId(memberId) )); } diff --git a/src/main/java/com/cozymate/cozymate_server/domain/memberstat/converter/MemberStatConverter.java b/src/main/java/com/cozymate/cozymate_server/domain/memberstat/converter/MemberStatConverter.java index 902ad2ee..d829518b 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/memberstat/converter/MemberStatConverter.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/memberstat/converter/MemberStatConverter.java @@ -8,6 +8,9 @@ import com.cozymate.cozymate_server.domain.university.University; import com.cozymate.cozymate_server.global.utils.TimeUtil; import java.sql.Time; +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import org.springframework.transaction.annotation.Transactional; public class MemberStatConverter { @@ -48,10 +51,13 @@ public static MemberStat toEntity( return builder.build(); } - public static MemberStatQueryResponseDTO toDto(MemberStat memberStat){ + + + public static MemberStatQueryResponseDTO toDto(MemberStat memberStat, Integer birthYear){ return MemberStatQueryResponseDTO.builder() .universityId(memberStat.getUniversity().getId()) .admissionYear(memberStat.getAdmissionYear()) + .birthYear(birthYear) .major(memberStat.getMajor()) .numOfRoommate(memberStat.getNumOfRoommate()) .acceptance(memberStat.getAcceptance()) diff --git a/src/main/java/com/cozymate/cozymate_server/domain/memberstat/dto/MemberStatResponseDTO.java b/src/main/java/com/cozymate/cozymate_server/domain/memberstat/dto/MemberStatResponseDTO.java index 5af297fc..a8e8e947 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/memberstat/dto/MemberStatResponseDTO.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/memberstat/dto/MemberStatResponseDTO.java @@ -21,6 +21,7 @@ public static class MemberStatQueryResponseDTO { private Long universityId; private Integer admissionYear; + private Integer birthYear; private String major; private Integer numOfRoommate; private String acceptance; diff --git a/src/main/java/com/cozymate/cozymate_server/domain/memberstat/service/MemberStatQueryService.java b/src/main/java/com/cozymate/cozymate_server/domain/memberstat/service/MemberStatQueryService.java index f4e578ea..3a172506 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/memberstat/service/MemberStatQueryService.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/memberstat/service/MemberStatQueryService.java @@ -31,24 +31,38 @@ public class MemberStatQueryService { private final MemberStatRepository memberStatRepository; private final MemberRepository memberRepository; + private MemberStatConverter memberStatConverter; - public MemberStat getMemberStat(Member member) { - return memberStatRepository.findByMemberId(member.getId()) + + public MemberStatQueryResponseDTO getMemberStat(Member member) { + + Integer birthYear = member.getBirthDay().getYear(); + + MemberStat memberStat = memberStatRepository.findByMemberId(member.getId()) .orElseThrow( () -> new GeneralException(ErrorStatus._MEMBERSTAT_NOT_EXISTS) ); + + return MemberStatConverter.toDto( + memberStat,birthYear + ); } - public MemberStat getMemberStatWithId(Long memberId) { + public MemberStatQueryResponseDTO getMemberStatWithId(Long memberId) { - if(!memberRepository.existsById(memberId)){ - throw new GeneralException(ErrorStatus._MEMBER_NOT_FOUND); - } + Member member = memberRepository.findById(memberId). orElseThrow( + () -> new GeneralException(ErrorStatus._MEMBER_NOT_FOUND) + ); - return memberStatRepository.findByMemberId(memberId) - .orElseThrow( - () -> new GeneralException(ErrorStatus._MEMBERSTAT_NOT_EXISTS) - ); + MemberStat memberStat = memberStatRepository.findByMemberId(memberId).orElseThrow( + () -> new GeneralException(ErrorStatus._MEMBERSTAT_NOT_EXISTS) + ); + + Integer birthYear = member.getBirthDay().getYear(); + + return MemberStatConverter.toDto( + memberStat,birthYear + ); } public PageResponseDto> getMemberStatList(Member member, @@ -73,8 +87,8 @@ public PageResponseDto> getMemberStatList(Member member, .map(memberStat -> { MemberStatEqualityResponseDTO equalityResponse = MemberUtil.toEqualityResponse( criteriaMemberStat, memberStat); - MemberStatQueryResponseDTO queryResponse = MemberStatConverter.toDto( - memberStat); + MemberStatQueryResponseDTO queryResponse = memberStatConverter.toDto( + memberStat, memberStat.getMember().getBirthDay().getYear()); return MemberStatEqualityDetailResponseDTO.builder() .info(equalityResponse) .detail(queryResponse) diff --git a/src/main/java/com/cozymate/cozymate_server/domain/post/converter/PostConverter.java b/src/main/java/com/cozymate/cozymate_server/domain/post/converter/PostConverter.java index e23c73d3..463ad36c 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/post/converter/PostConverter.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/post/converter/PostConverter.java @@ -23,26 +23,29 @@ public static Post toEntity(PostCreateDTO postCreateDTO, Feed feed, Mate writer) .build(); } - public static PostDetailDTO toDto(Post post, List postImage, - List postComment) { + public static PostDetailDTO toDetailDto(Post post, List postImage, + List postComment, Integer commentCount) { return PostDetailDTO.builder() .id(post.getId()) + .writerId(post.getWriter().getId()) .title(post.getTitle()) .content(post.getContent()) .nickname(post.getWriter().getMember().getNickname()) .persona(post.getWriter().getMember().getPersona()) .createdAt(post.getCreatedAt()) + .commentCount(commentCount) .imageList( postImage.stream().map(PostImage::getContent).map(ImageUtil::generateUrl).toList()) .commentList(postComment.stream().map(PostCommentConverter::toDto).toList()) .build(); } - public static PostSummaryDTO toDto(Post post, + public static PostSummaryDTO toSummaryDto(Post post, List postImages, Integer commentCount){ return PostSummaryDTO.builder() .id(post.getId()) + .writerId(post.getWriter().getId()) .title(post.getTitle()) .content(post.getContent()) .nickname(post.getWriter().getMember().getNickname()) diff --git a/src/main/java/com/cozymate/cozymate_server/domain/post/dto/PostDetailDTO.java b/src/main/java/com/cozymate/cozymate_server/domain/post/dto/PostDetailDTO.java index dcb0f308..b42e5c33 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/post/dto/PostDetailDTO.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/post/dto/PostDetailDTO.java @@ -15,10 +15,12 @@ public class PostDetailDTO { private Long id; + private Long writerId; private String title; private String content; private LocalDateTime createdAt; private String nickname; + private int commentCount; private int persona; private List imageList; private List commentList; diff --git a/src/main/java/com/cozymate/cozymate_server/domain/post/dto/PostSummaryDTO.java b/src/main/java/com/cozymate/cozymate_server/domain/post/dto/PostSummaryDTO.java index 5257a08b..0495e32c 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/post/dto/PostSummaryDTO.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/post/dto/PostSummaryDTO.java @@ -15,6 +15,7 @@ public class PostSummaryDTO { private Long id; + private Long writerId; private String title; private String content; private String nickname; diff --git a/src/main/java/com/cozymate/cozymate_server/domain/post/repository/PostRepository.java b/src/main/java/com/cozymate/cozymate_server/domain/post/repository/PostRepository.java index 4a32017a..595c2ee7 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/post/repository/PostRepository.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/post/repository/PostRepository.java @@ -12,5 +12,5 @@ public interface PostRepository extends JpaRepository { void deleteByFeedId(Long feedId); - Page findByFeedId(Long feedId, Pageable pageable); + Page findByFeedIdOrderByCreatedAtDesc(Long feedId, Pageable pageable); } diff --git a/src/main/java/com/cozymate/cozymate_server/domain/post/service/PostQueryService.java b/src/main/java/com/cozymate/cozymate_server/domain/post/service/PostQueryService.java index edf49e83..cf766195 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/post/service/PostQueryService.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/post/service/PostQueryService.java @@ -47,16 +47,17 @@ public PostDetailDTO getPost(Member member, Long roomId, Long postId) { } List imageList = postImageRepository.findByPostId(postId); - List postComments = postCommentRepository.findByPostId(postId); + List postComments = postCommentRepository.findByPostIdOrderByCreatedAtDesc(postId); // Local 변수 reassign 하기 싫어서 삼항 연산자 사용 - return PostConverter.toDto( + return PostConverter.toDetailDto( post, imageList.isEmpty() ? new ArrayList<>() : imageList, postComments.isEmpty() - ? new ArrayList<>() : postComments); + ? new ArrayList<>() : postComments, + postCommentRepository.countByPostId(post.getId())); } @@ -67,10 +68,10 @@ public List getPosts(Member member, Long roomId, Pageable pageab } Feed feed = feedRepository.findByRoomId(roomId); - Page postList = postRepository.findByFeedId(feed.getId(),pageable); + Page postList = postRepository.findByFeedIdOrderByCreatedAtDesc(feed.getId(),pageable); return postList.stream().map( - post->PostConverter.toDto( + post->PostConverter.toSummaryDto( post, postImageRepository.findByPostId(post.getId()).isEmpty() ? new ArrayList<>() : postImageRepository.findByPostId(post.getId()), diff --git a/src/main/java/com/cozymate/cozymate_server/domain/postcomment/PostCommentRepository.java b/src/main/java/com/cozymate/cozymate_server/domain/postcomment/PostCommentRepository.java index 5cd8b802..286ca4a6 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/postcomment/PostCommentRepository.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/postcomment/PostCommentRepository.java @@ -8,7 +8,7 @@ public interface PostCommentRepository extends JpaRepository Integer countByPostId(Long postId); - List findByPostId(Long postId); + List findByPostIdOrderByCreatedAtDesc(Long postId); void deleteAllByPostId(Long postId); } diff --git a/src/main/java/com/cozymate/cozymate_server/domain/postcomment/converter/PostCommentConverter.java b/src/main/java/com/cozymate/cozymate_server/domain/postcomment/converter/PostCommentConverter.java index 46750067..6d1c9cfe 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/postcomment/converter/PostCommentConverter.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/postcomment/converter/PostCommentConverter.java @@ -11,9 +11,11 @@ public class PostCommentConverter { public static PostCommentViewDTO toDto(PostComment postComment){ return PostCommentViewDTO.builder() .id(postComment.getId()) + .writerId(postComment.getCommenter().getId()) .nickname(postComment.getCommenter().getMember().getNickname()) .persona(postComment.getCommenter().getMember().getPersona()) .content(postComment.getContent()) + .createdAt(postComment.getCreatedAt()) .build(); } diff --git a/src/main/java/com/cozymate/cozymate_server/domain/postcomment/dto/PostCommentViewDTO.java b/src/main/java/com/cozymate/cozymate_server/domain/postcomment/dto/PostCommentViewDTO.java index d50f8313..fbbb4c3d 100644 --- a/src/main/java/com/cozymate/cozymate_server/domain/postcomment/dto/PostCommentViewDTO.java +++ b/src/main/java/com/cozymate/cozymate_server/domain/postcomment/dto/PostCommentViewDTO.java @@ -1,6 +1,7 @@ package com.cozymate.cozymate_server.domain.postcomment.dto; import com.cozymate.cozymate_server.domain.mate.Mate; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -13,8 +14,10 @@ public class PostCommentViewDTO { private Long id; + private Long writerId; private String nickname; private int persona; private String content; + private LocalDateTime createdAt; }