From 06df779282991e35023a79e48685fd70c34b8348 Mon Sep 17 00:00:00 2001 From: eeddiinn Date: Wed, 10 Jan 2024 02:23:02 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=E2=9C=A8=20[FEAT]=20=EB=A7=88=EC=9D=B4?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A0=88=ED=81=90=EB=B6=81=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20API=20=EA=B5=AC=ED=98=84=20#11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/MemberController.java | 9 ++++++ .../response/MypageBookListResponseDto.java | 32 +++++++++++++++++++ .../dto/response/MypageBookResponseDto.java | 18 +++++++++++ .../member/repository/MemberRepository.java | 3 +- .../domain/member/service/MemberService.java | 27 +++++++++++++++- .../global/common/model/BaseTimeEntity.java | 2 ++ .../global/exception/enums/SuccessType.java | 1 + 7 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookListResponseDto.java create mode 100644 src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookResponseDto.java diff --git a/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java b/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java index 79a8279..76494ab 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java @@ -6,6 +6,7 @@ import org.sopt.lequuServer.domain.member.dto.request.SocialLoginRequestDto; import org.sopt.lequuServer.domain.member.dto.response.MemberLoginResponseDto; import org.sopt.lequuServer.domain.member.dto.response.MemberNicknameResponseDto; +import org.sopt.lequuServer.domain.member.dto.response.MypageBookResponseDto; import org.sopt.lequuServer.domain.member.service.MemberService; import org.sopt.lequuServer.global.auth.fegin.kakao.KakaoLoginService; import org.sopt.lequuServer.global.auth.jwt.JwtProvider; @@ -17,6 +18,7 @@ import java.security.Principal; +import static org.sopt.lequuServer.global.exception.enums.SuccessType.GET_MYPAGE_BOOK_SUCCESS; import static org.sopt.lequuServer.global.exception.enums.SuccessType.SET_MEMBER_NICKNAME_SUCCESS; @RestController @@ -66,4 +68,11 @@ public ApiResponse setMemberNickname(Principal princi return ApiResponse.success(SET_MEMBER_NICKNAME_SUCCESS, memberService.setMemberNickname(JwtProvider.getUserFromPrincial(principal), request)); } + + @GetMapping("/mypage/book") + @ResponseStatus(HttpStatus.OK) + public ApiResponse getMypageBook(Principal principal) { + return ApiResponse.success(GET_MYPAGE_BOOK_SUCCESS, memberService.getMypageBook(JwtProvider.getUserFromPrincial(principal))); + } + } \ No newline at end of file diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookListResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookListResponseDto.java new file mode 100644 index 0000000..b7cc90e --- /dev/null +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookListResponseDto.java @@ -0,0 +1,32 @@ +package org.sopt.lequuServer.domain.member.dto.response; + +import org.sopt.lequuServer.domain.book.model.Book; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +public record MypageBookListResponseDto( + + Long bookId, + String bookUuid, + String title, + String bookDate, + int bookBackgroundColor, + + int noteNum +) { + public static MypageBookListResponseDto of(Book book) { + LocalDateTime createdAt = book.getCreatedAt(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); + String bookDate = createdAt.format(formatter); + + return new MypageBookListResponseDto( + book.getId(), + book.getUuid(), + book.getTitle(), + bookDate, + book.getBackgroundColor(), + book.getNotes().size() + ); + } +} \ No newline at end of file diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookResponseDto.java new file mode 100644 index 0000000..2e1f633 --- /dev/null +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookResponseDto.java @@ -0,0 +1,18 @@ +package org.sopt.lequuServer.domain.member.dto.response; + +import org.sopt.lequuServer.domain.book.model.Book; + +import java.util.List; + +public record MypageBookResponseDto( + String memberNickname, + List mypageBookList +) { + public static MypageBookResponseDto of(String nickName, List books) { + List mypageBookList = books.stream() + .map(MypageBookListResponseDto::of) + .toList(); + + return new MypageBookResponseDto(nickName, mypageBookList); + } +} diff --git a/src/main/java/org/sopt/lequuServer/domain/member/repository/MemberRepository.java b/src/main/java/org/sopt/lequuServer/domain/member/repository/MemberRepository.java index 2dcda7e..559770c 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/repository/MemberRepository.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/repository/MemberRepository.java @@ -1,12 +1,13 @@ package org.sopt.lequuServer.domain.member.repository; -import java.util.Optional; import org.sopt.lequuServer.domain.member.model.Member; import org.sopt.lequuServer.domain.member.model.SocialPlatform; import org.sopt.lequuServer.global.exception.enums.ErrorType; import org.sopt.lequuServer.global.exception.model.CustomException; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; + public interface MemberRepository extends JpaRepository { boolean existsBySocialPlatformAndSocialId(SocialPlatform socialPlatform, String socialId); diff --git a/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java b/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java index 6f745e8..c9ebfea 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java @@ -1,13 +1,17 @@ package org.sopt.lequuServer.domain.member.service; import lombok.RequiredArgsConstructor; +import org.sopt.lequuServer.domain.book.model.Book; +import org.sopt.lequuServer.domain.book.repository.BookRepository; import org.sopt.lequuServer.domain.member.dto.request.MemberNicknameRequestDto; import org.sopt.lequuServer.domain.member.dto.request.SocialLoginRequestDto; import org.sopt.lequuServer.domain.member.dto.response.MemberLoginResponseDto; import org.sopt.lequuServer.domain.member.dto.response.MemberNicknameResponseDto; +import org.sopt.lequuServer.domain.member.dto.response.MypageBookResponseDto; import org.sopt.lequuServer.domain.member.model.Member; import org.sopt.lequuServer.domain.member.model.SocialPlatform; import org.sopt.lequuServer.domain.member.repository.MemberRepository; +import org.sopt.lequuServer.domain.note.repository.NoteRepository; import org.sopt.lequuServer.global.auth.fegin.kakao.KakaoLoginService; import org.sopt.lequuServer.global.auth.jwt.JwtProvider; import org.sopt.lequuServer.global.auth.jwt.TokenDto; @@ -16,6 +20,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + import static org.sopt.lequuServer.global.exception.enums.ErrorType.*; @Service @@ -28,6 +34,10 @@ public class MemberService { private final JwtProvider jwtProvider; private final KakaoLoginService kakaoLoginService; + private final NoteRepository noteRepository; + private final BookRepository bookRepository; + + @Transactional public MemberLoginResponseDto login(String socialAccessToken, SocialLoginRequestDto request) { @@ -110,4 +120,19 @@ public MemberNicknameResponseDto setMemberNickname(Long memberId, MemberNickname return MemberNicknameResponseDto.of(memberId); } -} \ No newline at end of file + + public MypageBookResponseDto getMypageBook(Long memberId) { + + // 회원 id 찾기 + Member member = memberRepository.findByIdOrThrow(memberId); + + // 회원 id로 memberNickname 조회 + String nickname = member.getNickname(); + + // 회원이 소유한 Book 리스트 가져오기 + List books = member.getBooks(); + + return MypageBookResponseDto.of(nickname, books); + } +} + diff --git a/src/main/java/org/sopt/lequuServer/global/common/model/BaseTimeEntity.java b/src/main/java/org/sopt/lequuServer/global/common/model/BaseTimeEntity.java index c3338e1..3e9076d 100644 --- a/src/main/java/org/sopt/lequuServer/global/common/model/BaseTimeEntity.java +++ b/src/main/java/org/sopt/lequuServer/global/common/model/BaseTimeEntity.java @@ -2,6 +2,7 @@ import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; +import lombok.Getter; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -9,6 +10,7 @@ import java.time.LocalDateTime; @MappedSuperclass +@Getter @EntityListeners(AuditingEntityListener.class) public abstract class BaseTimeEntity { diff --git a/src/main/java/org/sopt/lequuServer/global/exception/enums/SuccessType.java b/src/main/java/org/sopt/lequuServer/global/exception/enums/SuccessType.java index 58cc282..501363b 100644 --- a/src/main/java/org/sopt/lequuServer/global/exception/enums/SuccessType.java +++ b/src/main/java/org/sopt/lequuServer/global/exception/enums/SuccessType.java @@ -24,6 +24,7 @@ public enum SuccessType { STICKER_PACK_LIST_SUCCESS(HttpStatus.OK, "스티커팩 목록 조회에 성공했습니다."), GET_SPLASH_SUCCESS(HttpStatus.OK, "스플래시 조회에 성공했습니다."), GET_HOME_SUCCESS(HttpStatus.OK, "홈 화면 조회에 성공했습니다."), + GET_MYPAGE_BOOK_SUCCESS(HttpStatus.OK, "마이페이지의 유저 닉네임과 내 레큐북 조회에 성공했습니다."), /** * 201 CREATED From 6823b665c4ccaeca24296388683856b517d05f81 Mon Sep 17 00:00:00 2001 From: eeddiinn Date: Wed, 10 Jan 2024 05:08:26 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=E2=9C=A8=20[FEAT]=20=EB=A7=88=EC=9D=B4?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A0=88=ED=81=90=EB=85=B8?= =?UTF-8?q?=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20API=20=EA=B5=AC=ED=98=84=20&?= =?UTF-8?q?=20Note=20background=20=EC=88=98=EC=A0=95=20#11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/sopt/lequuServer/InitDb.java | 6 ++-- .../member/controller/MemberController.java | 9 ++++-- .../response/MypageNoteListResponseDto.java | 28 +++++++++++++++++++ .../dto/response/MypageNoteResponseDto.java | 27 ++++++++++++++++++ .../domain/member/service/MemberService.java | 21 +++++++++----- .../note/dto/request/NoteCreateDto.java | 7 +++-- .../domain/note/facade/NoteFacade.java | 6 ++-- .../lequuServer/domain/note/model/Note.java | 13 +++++---- .../global/exception/enums/SuccessType.java | 1 + 9 files changed, 97 insertions(+), 21 deletions(-) create mode 100644 src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java create mode 100644 src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java diff --git a/src/main/java/org/sopt/lequuServer/InitDb.java b/src/main/java/org/sopt/lequuServer/InitDb.java index d01ce21..beda61e 100644 --- a/src/main/java/org/sopt/lequuServer/InitDb.java +++ b/src/main/java/org/sopt/lequuServer/InitDb.java @@ -80,7 +80,8 @@ public void dbInit() { for (int i = 0; i < 3; i++) { Note note = Note.builder() .content("레큐노트 내용입니다 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라") - .background("https://lequu-server-bucket.s3.ap-northeast-2.amazonaws.com/notes/background_image/676c2ca3-f868-423f-8000-a0bcb67dc797.jpg") + .backgroundImage("https://lequu-server-bucket.s3.ap-northeast-2.amazonaws.com/notes/background_image/676c2ca3-f868-423f-8000-a0bcb67dc797.jpg") + .backgroundColor(0) .textColor(i) .member(member1) .book(book1) @@ -90,7 +91,8 @@ public void dbInit() { for (int i = 0; i < 3; i++) { Note note = Note.builder() .content("레큐노트 내용입니다 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라") - .background(String.valueOf(i)) + .backgroundImage("https://lequu-server-bucket.s3.ap-northeast-2.amazonaws.com/notes/background_image/676c2ca3-f868-423f-8000-a0bcb67dc797.jpg") + .backgroundColor(1) .textColor(i) .member(member1) .book(book1) diff --git a/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java b/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java index 76494ab..de9d471 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java @@ -7,6 +7,7 @@ import org.sopt.lequuServer.domain.member.dto.response.MemberLoginResponseDto; import org.sopt.lequuServer.domain.member.dto.response.MemberNicknameResponseDto; import org.sopt.lequuServer.domain.member.dto.response.MypageBookResponseDto; +import org.sopt.lequuServer.domain.member.dto.response.MypageNoteResponseDto; import org.sopt.lequuServer.domain.member.service.MemberService; import org.sopt.lequuServer.global.auth.fegin.kakao.KakaoLoginService; import org.sopt.lequuServer.global.auth.jwt.JwtProvider; @@ -18,8 +19,7 @@ import java.security.Principal; -import static org.sopt.lequuServer.global.exception.enums.SuccessType.GET_MYPAGE_BOOK_SUCCESS; -import static org.sopt.lequuServer.global.exception.enums.SuccessType.SET_MEMBER_NICKNAME_SUCCESS; +import static org.sopt.lequuServer.global.exception.enums.SuccessType.*; @RestController @RequestMapping("/api") @@ -75,4 +75,9 @@ public ApiResponse getMypageBook(Principal principal) { return ApiResponse.success(GET_MYPAGE_BOOK_SUCCESS, memberService.getMypageBook(JwtProvider.getUserFromPrincial(principal))); } + @GetMapping("/mypage/note") + @ResponseStatus(HttpStatus.OK) + public ApiResponse getMypageNote(Principal principal) { + return ApiResponse.success(GET_MYPAGE_NOTE_SUCCESS, memberService.getMypageNote(JwtProvider.getUserFromPrincial(principal))); + } } \ No newline at end of file diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java new file mode 100644 index 0000000..038a8a9 --- /dev/null +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java @@ -0,0 +1,28 @@ +package org.sopt.lequuServer.domain.member.dto.response; + +import org.sopt.lequuServer.domain.note.model.Note; + +import java.time.LocalDateTime; + +public record MypageNoteListResponseDto( + String bookUuid, + String title, + Long noteId, + String content, + LocalDateTime noteDate, + int noteBackgroundColor, + String noteBackgroundImage +) { + public static MypageNoteListResponseDto of(Note note) { + + return new MypageNoteListResponseDto( + note.getBook().getUuid(), + note.getBook().getTitle(), + note.getId(), + note.getContent(), + note.getCreatedAt(), + note.getBackgroundColor(), + note.getBackgroundImage() + ); + } +} diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java new file mode 100644 index 0000000..aa1d387 --- /dev/null +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java @@ -0,0 +1,27 @@ +package org.sopt.lequuServer.domain.member.dto.response; + +import org.sopt.lequuServer.domain.note.model.Note; + +import java.util.List; +import java.util.stream.Collectors; + +public record MypageNoteResponseDto( + + List mypageNoteList +) { + public static MypageNoteResponseDto of(List notes) { + List mypageNoteList = notes.stream() + .map(note -> new MypageNoteListResponseDto( + note.getBook().getUuid(), + note.getBook().getTitle(), + note.getId(), + note.getContent(), + note.getCreatedAt(), + note.getBackgroundColor(), + note.getBackgroundImage() + )) + .collect(Collectors.toList()); + + return new MypageNoteResponseDto(mypageNoteList); + } +} diff --git a/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java b/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java index c9ebfea..d7671f9 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java @@ -2,16 +2,16 @@ import lombok.RequiredArgsConstructor; import org.sopt.lequuServer.domain.book.model.Book; -import org.sopt.lequuServer.domain.book.repository.BookRepository; import org.sopt.lequuServer.domain.member.dto.request.MemberNicknameRequestDto; import org.sopt.lequuServer.domain.member.dto.request.SocialLoginRequestDto; import org.sopt.lequuServer.domain.member.dto.response.MemberLoginResponseDto; import org.sopt.lequuServer.domain.member.dto.response.MemberNicknameResponseDto; import org.sopt.lequuServer.domain.member.dto.response.MypageBookResponseDto; +import org.sopt.lequuServer.domain.member.dto.response.MypageNoteResponseDto; import org.sopt.lequuServer.domain.member.model.Member; import org.sopt.lequuServer.domain.member.model.SocialPlatform; import org.sopt.lequuServer.domain.member.repository.MemberRepository; -import org.sopt.lequuServer.domain.note.repository.NoteRepository; +import org.sopt.lequuServer.domain.note.model.Note; import org.sopt.lequuServer.global.auth.fegin.kakao.KakaoLoginService; import org.sopt.lequuServer.global.auth.jwt.JwtProvider; import org.sopt.lequuServer.global.auth.jwt.TokenDto; @@ -34,10 +34,6 @@ public class MemberService { private final JwtProvider jwtProvider; private final KakaoLoginService kakaoLoginService; - private final NoteRepository noteRepository; - private final BookRepository bookRepository; - - @Transactional public MemberLoginResponseDto login(String socialAccessToken, SocialLoginRequestDto request) { @@ -131,8 +127,19 @@ public MypageBookResponseDto getMypageBook(Long memberId) { // 회원이 소유한 Book 리스트 가져오기 List books = member.getBooks(); - + return MypageBookResponseDto.of(nickname, books); } + + public MypageNoteResponseDto getMypageNote(Long memberId) { + + // 회원 id 찾기 + Member member = memberRepository.findByIdOrThrow(memberId); + + // 회원이 소유한 Note 리스트 가져오기 + List notes = member.getNotes(); + + return MypageNoteResponseDto.of(notes); + } } diff --git a/src/main/java/org/sopt/lequuServer/domain/note/dto/request/NoteCreateDto.java b/src/main/java/org/sopt/lequuServer/domain/note/dto/request/NoteCreateDto.java index 903f6fb..6632ff4 100644 --- a/src/main/java/org/sopt/lequuServer/domain/note/dto/request/NoteCreateDto.java +++ b/src/main/java/org/sopt/lequuServer/domain/note/dto/request/NoteCreateDto.java @@ -4,7 +4,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -public record NoteCreateDto( +public record NoteCreateDto( @Schema(example = "1") Long bookId, //TODO DB상에서 관리하려면 그냥 Auditing으로 하는게 좋을지도? @@ -18,6 +18,9 @@ public record NoteCreateDto( @Schema(example = "0") int textColor, @Schema(example = "0") - String background + int backgroundColor, + + @Schema(example = "~.jpg") + String backgroundImages ) { } diff --git a/src/main/java/org/sopt/lequuServer/domain/note/facade/NoteFacade.java b/src/main/java/org/sopt/lequuServer/domain/note/facade/NoteFacade.java index 49d437c..8ed0e8a 100644 --- a/src/main/java/org/sopt/lequuServer/domain/note/facade/NoteFacade.java +++ b/src/main/java/org/sopt/lequuServer/domain/note/facade/NoteFacade.java @@ -29,11 +29,11 @@ public NoteResponseDto createNote(Long userId, NoteCreateDto noteCreateDto) { Member member = memberRepository.findByIdOrThrow(userId); Book book = bookRepository.findByIdOrThrow(noteCreateDto.bookId()); - String background = noteCreateDto.background(); + String background = noteCreateDto.backgroundImages(); if (background.endsWith(".jpg")) { - background = s3Service.getURL(NOTE_BACKGROUND_IMAGE_FOLDER_NAME.getValue() + noteCreateDto.background()); + background = s3Service.getURL(NOTE_BACKGROUND_IMAGE_FOLDER_NAME.getValue() + noteCreateDto.backgroundImages()); } - return noteService.saveNote(Note.of(noteCreateDto.content(), background, noteCreateDto.textColor(), member, book), member, book); + return noteService.saveNote(Note.of(noteCreateDto.content(), noteCreateDto.backgroundColor(), noteCreateDto.backgroundImages(), noteCreateDto.textColor(), member, book), member, book); } } diff --git a/src/main/java/org/sopt/lequuServer/domain/note/model/Note.java b/src/main/java/org/sopt/lequuServer/domain/note/model/Note.java index 7b0a18f..397e1e3 100644 --- a/src/main/java/org/sopt/lequuServer/domain/note/model/Note.java +++ b/src/main/java/org/sopt/lequuServer/domain/note/model/Note.java @@ -20,8 +20,10 @@ public class Note extends BaseTimeEntity { @Column(nullable = false) private String content; + private int backgroundColor; + @Column(nullable = false) - private String background; + private String backgroundImage; private int textColor; @@ -34,15 +36,16 @@ public class Note extends BaseTimeEntity { private Book book; @Builder - public Note(String content, String background, int textColor, Member member, Book book) { + public Note(String content, int backgroundColor, String backgroundImage, int textColor, Member member, Book book) { this.content = content; - this.background = background; + this.backgroundColor = backgroundColor; + this.backgroundImage = backgroundImage; this.textColor = textColor; this.member = member; this.book = book; } - public static Note of(String content, String background, int textColor, Member member, Book book) { - return new Note(content, background, textColor, member, book); + public static Note of(String content, int backgroundColor, String backgroundImage, int textColor, Member member, Book book) { + return new Note(content, backgroundColor, backgroundImage, textColor, member, book); } } \ No newline at end of file diff --git a/src/main/java/org/sopt/lequuServer/global/exception/enums/SuccessType.java b/src/main/java/org/sopt/lequuServer/global/exception/enums/SuccessType.java index 501363b..d6fa18d 100644 --- a/src/main/java/org/sopt/lequuServer/global/exception/enums/SuccessType.java +++ b/src/main/java/org/sopt/lequuServer/global/exception/enums/SuccessType.java @@ -25,6 +25,7 @@ public enum SuccessType { GET_SPLASH_SUCCESS(HttpStatus.OK, "스플래시 조회에 성공했습니다."), GET_HOME_SUCCESS(HttpStatus.OK, "홈 화면 조회에 성공했습니다."), GET_MYPAGE_BOOK_SUCCESS(HttpStatus.OK, "마이페이지의 유저 닉네임과 내 레큐북 조회에 성공했습니다."), + GET_MYPAGE_NOTE_SUCCESS(HttpStatus.OK, "마이페이지 내 레큐노트 조회에 성공했습니다."), /** * 201 CREATED From bcb2896d9c2a360a194e923dd3841d4aa18241f5 Mon Sep 17 00:00:00 2001 From: eeddiinn Date: Wed, 10 Jan 2024 16:01:20 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20[FIX]=20=EB=A0=88?= =?UTF-8?q?=ED=81=90=EB=85=B8=ED=8A=B8=20=EC=83=9D=EC=84=B1=20=EC=9D=BC?= =?UTF-8?q?=EC=8B=9C=20=EB=82=A0=EC=A7=9C=20=ED=98=95=EC=8B=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20#11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/MypageNoteListResponseDto.java | 7 ++++-- .../dto/response/MypageNoteResponseDto.java | 25 +++++++++++-------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java index 038a8a9..f3e844e 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java @@ -3,24 +3,27 @@ import org.sopt.lequuServer.domain.note.model.Note; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; public record MypageNoteListResponseDto( String bookUuid, String title, Long noteId, String content, - LocalDateTime noteDate, + String noteDate, int noteBackgroundColor, String noteBackgroundImage ) { public static MypageNoteListResponseDto of(Note note) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); + String noteDate = note.getCreatedAt().format(formatter); return new MypageNoteListResponseDto( note.getBook().getUuid(), note.getBook().getTitle(), note.getId(), note.getContent(), - note.getCreatedAt(), + noteDate, note.getBackgroundColor(), note.getBackgroundImage() ); diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java index aa1d387..595f9ed 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java @@ -2,6 +2,7 @@ import org.sopt.lequuServer.domain.note.model.Note; +import java.time.format.DateTimeFormatter; import java.util.List; import java.util.stream.Collectors; @@ -11,17 +12,21 @@ public record MypageNoteResponseDto( ) { public static MypageNoteResponseDto of(List notes) { List mypageNoteList = notes.stream() - .map(note -> new MypageNoteListResponseDto( - note.getBook().getUuid(), - note.getBook().getTitle(), - note.getId(), - note.getContent(), - note.getCreatedAt(), - note.getBackgroundColor(), - note.getBackgroundImage() - )) + .map(note -> { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); + String noteDate = note.getCreatedAt().format(formatter); + return new MypageNoteListResponseDto( + note.getBook().getUuid(), + note.getBook().getTitle(), + note.getId(), + note.getContent(), + noteDate, + note.getBackgroundColor(), + note.getBackgroundImage() + ); + }) .collect(Collectors.toList()); return new MypageNoteResponseDto(mypageNoteList); } -} +} \ No newline at end of file From 2af8b4a7072f403ee115a8a8fe962ae5d0099b96 Mon Sep 17 00:00:00 2001 From: eeddiinn Date: Wed, 10 Jan 2024 16:27:50 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20[FIX]=20=EB=A0=88?= =?UTF-8?q?=ED=81=90=EB=B6=81=20=EC=83=9D=EC=84=B1=20=EC=9D=BC=EC=8B=9C=20?= =?UTF-8?q?=EB=82=A0=EC=A7=9C=20=ED=98=95=EC=8B=9D=20=EA=B0=84=EA=B2=B0?= =?UTF-8?q?=ED=95=98=EA=B2=8C=20=EC=88=98=EC=A0=95=20#11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/dto/response/MypageBookListResponseDto.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookListResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookListResponseDto.java index b7cc90e..08f622f 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookListResponseDto.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookListResponseDto.java @@ -16,9 +16,8 @@ public record MypageBookListResponseDto( int noteNum ) { public static MypageBookListResponseDto of(Book book) { - LocalDateTime createdAt = book.getCreatedAt(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); - String bookDate = createdAt.format(formatter); + String bookDate = book.getCreatedAt().format(formatter); return new MypageBookListResponseDto( book.getId(), From 4ceebcbd928c952970b55c87e3d3241f4e5d6217 Mon Sep 17 00:00:00 2001 From: eeddiinn Date: Wed, 10 Jan 2024 18:07:09 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=F0=9F=90=9B=20[FIX]=20background=20?= =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20=EC=88=98=EC=A0=95=20#11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/sopt/lequuServer/InitDb.java | 6 ++---- .../response/MypageNoteListResponseDto.java | 21 ++++++++++--------- .../dto/response/MypageNoteResponseDto.java | 15 +------------ .../note/dto/request/NoteCreateDto.java | 9 +++----- .../domain/note/facade/NoteFacade.java | 6 +++--- .../lequuServer/domain/note/model/Note.java | 13 +++++------- 6 files changed, 25 insertions(+), 45 deletions(-) diff --git a/src/main/java/org/sopt/lequuServer/InitDb.java b/src/main/java/org/sopt/lequuServer/InitDb.java index beda61e..d01ce21 100644 --- a/src/main/java/org/sopt/lequuServer/InitDb.java +++ b/src/main/java/org/sopt/lequuServer/InitDb.java @@ -80,8 +80,7 @@ public void dbInit() { for (int i = 0; i < 3; i++) { Note note = Note.builder() .content("레큐노트 내용입니다 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라") - .backgroundImage("https://lequu-server-bucket.s3.ap-northeast-2.amazonaws.com/notes/background_image/676c2ca3-f868-423f-8000-a0bcb67dc797.jpg") - .backgroundColor(0) + .background("https://lequu-server-bucket.s3.ap-northeast-2.amazonaws.com/notes/background_image/676c2ca3-f868-423f-8000-a0bcb67dc797.jpg") .textColor(i) .member(member1) .book(book1) @@ -91,8 +90,7 @@ public void dbInit() { for (int i = 0; i < 3; i++) { Note note = Note.builder() .content("레큐노트 내용입니다 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라 블라블라블라") - .backgroundImage("https://lequu-server-bucket.s3.ap-northeast-2.amazonaws.com/notes/background_image/676c2ca3-f868-423f-8000-a0bcb67dc797.jpg") - .backgroundColor(1) + .background(String.valueOf(i)) .textColor(i) .member(member1) .book(book1) diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java index f3e844e..a08e4fc 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java @@ -2,7 +2,6 @@ import org.sopt.lequuServer.domain.note.model.Note; -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; public record MypageNoteListResponseDto( @@ -11,6 +10,7 @@ public record MypageNoteListResponseDto( Long noteId, String content, String noteDate, + int noteBackgroundColor, String noteBackgroundImage ) { @@ -18,14 +18,15 @@ public static MypageNoteListResponseDto of(Note note) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); String noteDate = note.getCreatedAt().format(formatter); - return new MypageNoteListResponseDto( - note.getBook().getUuid(), - note.getBook().getTitle(), - note.getId(), - note.getContent(), - noteDate, - note.getBackgroundColor(), - note.getBackgroundImage() - ); + String background = note.getBackground(); + if (background.endsWith(".jpg")) { + return new MypageNoteListResponseDto(note.getBook().getUuid(), note.getBook().getTitle(), + note.getId(), note.getContent(), + noteDate, -1, background); + } else { + return new MypageNoteListResponseDto(note.getBook().getUuid(), note.getBook().getTitle(), + note.getId(), note.getContent(), + noteDate, Integer.parseInt(background), ""); + } } } diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java index 595f9ed..c2a67ba 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java @@ -2,7 +2,6 @@ import org.sopt.lequuServer.domain.note.model.Note; -import java.time.format.DateTimeFormatter; import java.util.List; import java.util.stream.Collectors; @@ -12,19 +11,7 @@ public record MypageNoteResponseDto( ) { public static MypageNoteResponseDto of(List notes) { List mypageNoteList = notes.stream() - .map(note -> { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); - String noteDate = note.getCreatedAt().format(formatter); - return new MypageNoteListResponseDto( - note.getBook().getUuid(), - note.getBook().getTitle(), - note.getId(), - note.getContent(), - noteDate, - note.getBackgroundColor(), - note.getBackgroundImage() - ); - }) + .map(MypageNoteListResponseDto::of) .collect(Collectors.toList()); return new MypageNoteResponseDto(mypageNoteList); diff --git a/src/main/java/org/sopt/lequuServer/domain/note/dto/request/NoteCreateDto.java b/src/main/java/org/sopt/lequuServer/domain/note/dto/request/NoteCreateDto.java index 6632ff4..cc135e0 100644 --- a/src/main/java/org/sopt/lequuServer/domain/note/dto/request/NoteCreateDto.java +++ b/src/main/java/org/sopt/lequuServer/domain/note/dto/request/NoteCreateDto.java @@ -4,7 +4,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -public record NoteCreateDto( +public record NoteCreateDto( @Schema(example = "1") Long bookId, //TODO DB상에서 관리하려면 그냥 Auditing으로 하는게 좋을지도? @@ -17,10 +17,7 @@ public record NoteCreateDto( String content, @Schema(example = "0") int textColor, - @Schema(example = "0") - int backgroundColor, - - @Schema(example = "~.jpg") - String backgroundImages + @Schema(example = "0 or ~.jpg") + String background ) { } diff --git a/src/main/java/org/sopt/lequuServer/domain/note/facade/NoteFacade.java b/src/main/java/org/sopt/lequuServer/domain/note/facade/NoteFacade.java index 8ed0e8a..89c8387 100644 --- a/src/main/java/org/sopt/lequuServer/domain/note/facade/NoteFacade.java +++ b/src/main/java/org/sopt/lequuServer/domain/note/facade/NoteFacade.java @@ -29,11 +29,11 @@ public NoteResponseDto createNote(Long userId, NoteCreateDto noteCreateDto) { Member member = memberRepository.findByIdOrThrow(userId); Book book = bookRepository.findByIdOrThrow(noteCreateDto.bookId()); - String background = noteCreateDto.backgroundImages(); + String background = noteCreateDto.background(); if (background.endsWith(".jpg")) { - background = s3Service.getURL(NOTE_BACKGROUND_IMAGE_FOLDER_NAME.getValue() + noteCreateDto.backgroundImages()); + background = s3Service.getURL(NOTE_BACKGROUND_IMAGE_FOLDER_NAME.getValue() + noteCreateDto.background()); } - return noteService.saveNote(Note.of(noteCreateDto.content(), noteCreateDto.backgroundColor(), noteCreateDto.backgroundImages(), noteCreateDto.textColor(), member, book), member, book); + return noteService.saveNote(Note.of(noteCreateDto.content(), noteCreateDto.background(), noteCreateDto.textColor(), member, book), member, book); } } diff --git a/src/main/java/org/sopt/lequuServer/domain/note/model/Note.java b/src/main/java/org/sopt/lequuServer/domain/note/model/Note.java index 397e1e3..7b0a18f 100644 --- a/src/main/java/org/sopt/lequuServer/domain/note/model/Note.java +++ b/src/main/java/org/sopt/lequuServer/domain/note/model/Note.java @@ -20,10 +20,8 @@ public class Note extends BaseTimeEntity { @Column(nullable = false) private String content; - private int backgroundColor; - @Column(nullable = false) - private String backgroundImage; + private String background; private int textColor; @@ -36,16 +34,15 @@ public class Note extends BaseTimeEntity { private Book book; @Builder - public Note(String content, int backgroundColor, String backgroundImage, int textColor, Member member, Book book) { + public Note(String content, String background, int textColor, Member member, Book book) { this.content = content; - this.backgroundColor = backgroundColor; - this.backgroundImage = backgroundImage; + this.background = background; this.textColor = textColor; this.member = member; this.book = book; } - public static Note of(String content, int backgroundColor, String backgroundImage, int textColor, Member member, Book book) { - return new Note(content, backgroundColor, backgroundImage, textColor, member, book); + public static Note of(String content, String background, int textColor, Member member, Book book) { + return new Note(content, background, textColor, member, book); } } \ No newline at end of file From 2319b2e27707bfd28e45987bbaba9c50cb78aed1 Mon Sep 17 00:00:00 2001 From: eeddiinn Date: Thu, 11 Jan 2024 00:45:44 +0900 Subject: [PATCH 06/10] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20[REFACTOR]=20Dto?= =?UTF-8?q?=20=ED=95=98=EB=82=98=EB=A1=9C=20=EC=88=98=EC=A0=95=20#11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/MemberController.java | 3 +- .../dto/response/MypageNoteResponseDto.java | 32 +++++++++++++------ .../domain/member/service/MemberService.java | 7 ++-- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java b/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java index de9d471..3fab663 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import java.security.Principal; +import java.util.List; import static org.sopt.lequuServer.global.exception.enums.SuccessType.*; @@ -77,7 +78,7 @@ public ApiResponse getMypageBook(Principal principal) { @GetMapping("/mypage/note") @ResponseStatus(HttpStatus.OK) - public ApiResponse getMypageNote(Principal principal) { + public ApiResponse> getMypageNote(Principal principal) { return ApiResponse.success(GET_MYPAGE_NOTE_SUCCESS, memberService.getMypageNote(JwtProvider.getUserFromPrincial(principal))); } } \ No newline at end of file diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java index c2a67ba..b4233d8 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java @@ -2,18 +2,32 @@ import org.sopt.lequuServer.domain.note.model.Note; -import java.util.List; -import java.util.stream.Collectors; +import java.time.format.DateTimeFormatter; public record MypageNoteResponseDto( + String bookUuid, - List mypageNoteList + String title, + + Long noteId, + String content, + + String noteDate, + + int noteBackgroundColor, + String noteBackgroundImage ) { - public static MypageNoteResponseDto of(List notes) { - List mypageNoteList = notes.stream() - .map(MypageNoteListResponseDto::of) - .collect(Collectors.toList()); + public static MypageNoteResponseDto of(Note note) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); + String noteDate = note.getCreatedAt().format(formatter); - return new MypageNoteResponseDto(mypageNoteList); + String background = note.getBackground(); + if (background.endsWith(".jpg")) { + return new MypageNoteResponseDto(note.getBook().getUuid(), note.getBook().getTitle(), + note.getId(), note.getContent(), noteDate, -1, background); + } else { + return new MypageNoteResponseDto(note.getBook().getUuid(), note.getBook().getTitle(), + note.getId(), note.getContent(), noteDate, Integer.parseInt(background), ""); + } } -} \ No newline at end of file +} diff --git a/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java b/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java index d7671f9..23c075f 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/service/MemberService.java @@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.stream.Collectors; import static org.sopt.lequuServer.global.exception.enums.ErrorType.*; @@ -131,7 +132,7 @@ public MypageBookResponseDto getMypageBook(Long memberId) { return MypageBookResponseDto.of(nickname, books); } - public MypageNoteResponseDto getMypageNote(Long memberId) { + public List getMypageNote(Long memberId) { // 회원 id 찾기 Member member = memberRepository.findByIdOrThrow(memberId); @@ -139,7 +140,9 @@ public MypageNoteResponseDto getMypageNote(Long memberId) { // 회원이 소유한 Note 리스트 가져오기 List notes = member.getNotes(); - return MypageNoteResponseDto.of(notes); + return notes.stream() + .map(MypageNoteResponseDto::of) + .collect(Collectors.toList()); } } From 301ff1e34a1a3664250a2dc14706a119e1a8d1df Mon Sep 17 00:00:00 2001 From: eeddiinn Date: Thu, 11 Jan 2024 00:49:17 +0900 Subject: [PATCH 07/10] =?UTF-8?q?=20=F0=9F=90=9B=20[FIX]=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=82=AD=EC=A0=9C=20#11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/MypageNoteListResponseDto.java | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java deleted file mode 100644 index a08e4fc..0000000 --- a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteListResponseDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.sopt.lequuServer.domain.member.dto.response; - -import org.sopt.lequuServer.domain.note.model.Note; - -import java.time.format.DateTimeFormatter; - -public record MypageNoteListResponseDto( - String bookUuid, - String title, - Long noteId, - String content, - String noteDate, - - int noteBackgroundColor, - String noteBackgroundImage -) { - public static MypageNoteListResponseDto of(Note note) { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); - String noteDate = note.getCreatedAt().format(formatter); - - String background = note.getBackground(); - if (background.endsWith(".jpg")) { - return new MypageNoteListResponseDto(note.getBook().getUuid(), note.getBook().getTitle(), - note.getId(), note.getContent(), - noteDate, -1, background); - } else { - return new MypageNoteListResponseDto(note.getBook().getUuid(), note.getBook().getTitle(), - note.getId(), note.getContent(), - noteDate, Integer.parseInt(background), ""); - } - } -} From 914741075f0680ed87cb041ba8765878f38fb471 Mon Sep 17 00:00:00 2001 From: eeddiinn Date: Thu, 11 Jan 2024 01:10:39 +0900 Subject: [PATCH 08/10] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20=20[FIX]=20if=20?= =?UTF-8?q?=EB=AC=B8=20=EC=88=98=EC=A0=95=20#11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/dto/response/MypageNoteResponseDto.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java index b4233d8..41a6df7 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java @@ -25,9 +25,9 @@ public static MypageNoteResponseDto of(Note note) { if (background.endsWith(".jpg")) { return new MypageNoteResponseDto(note.getBook().getUuid(), note.getBook().getTitle(), note.getId(), note.getContent(), noteDate, -1, background); - } else { - return new MypageNoteResponseDto(note.getBook().getUuid(), note.getBook().getTitle(), - note.getId(), note.getContent(), noteDate, Integer.parseInt(background), ""); } + return new MypageNoteResponseDto(note.getBook().getUuid(), note.getBook().getTitle(), + note.getId(), note.getContent(), noteDate, Integer.parseInt(background), ""); + } } From 40527c2d24af6514e7cde133606fc48f72af9e60 Mon Sep 17 00:00:00 2001 From: ddongseop Date: Thu, 11 Jan 2024 01:14:44 +0900 Subject: [PATCH 09/10] =?UTF-8?q?:rocket:=20[DEPLOY]=20CI=20=EC=9E=AC?= =?UTF-8?q?=EC=8B=9C=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/dto/response/MypageNoteResponseDto.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java index 41a6df7..ee9ff16 100644 --- a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java +++ b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java @@ -28,6 +28,5 @@ public static MypageNoteResponseDto of(Note note) { } return new MypageNoteResponseDto(note.getBook().getUuid(), note.getBook().getTitle(), note.getId(), note.getContent(), noteDate, Integer.parseInt(background), ""); - } } From 649d5ae2da8d54b3c9dc5e10fbf7a957462f8246 Mon Sep 17 00:00:00 2001 From: ddongseop Date: Thu, 11 Jan 2024 02:09:23 +0900 Subject: [PATCH 10/10] =?UTF-8?q?:twisted=5Frightwards=5Farrows:=20[MERGE]?= =?UTF-8?q?=20merge=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/lequuServer/global/common/model/BaseTimeEntity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/sopt/lequuServer/global/common/model/BaseTimeEntity.java b/src/main/java/org/sopt/lequuServer/global/common/model/BaseTimeEntity.java index 24d9baa..4728ef9 100644 --- a/src/main/java/org/sopt/lequuServer/global/common/model/BaseTimeEntity.java +++ b/src/main/java/org/sopt/lequuServer/global/common/model/BaseTimeEntity.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; @MappedSuperclass -@Getter @EntityListeners(AuditingEntityListener.class) @Getter public abstract class BaseTimeEntity {