From 8230ebc96fbff2c6c17094f9c5c19f41f388d2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=AC=B8=EC=A4=80=ED=98=B8?= Date: Sat, 28 Oct 2023 17:38:02 +0900 Subject: [PATCH 01/12] backup --- .../7.2/executionHistory/executionHistory.bin | Bin 1489065 -> 1489065 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/7.2/fileHashes/fileHashes.bin | Bin 28597 -> 28797 bytes .gradle/7.2/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../7.2/fileHashes/resourceHashesCache.bin | Bin 123119 -> 124751 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes README.md | 40 ++---------------- .../example/just/Mapper/MemberMapperImpl.java | 2 +- .../example/just/Mapper/PostMapperImpl.java | 38 ++++++++--------- .../just/Controller/PostController.java | 16 ++++--- .../java/com/example/just/Dto/MemberDto.java | 4 -- .../com/example/just/Dto/NotificationDto.java | 1 - .../java/com/example/just/Dto/PostDto.java | 8 ---- .../com/example/just/Impl/MySliceImpl.java | 2 + .../com/example/just/Mapper/PostMapper.java | 4 +- .../com/example/just/Service/PostService.java | 32 ++++++++------ .../example/just/Service/ResponseGetPost.java | 3 ++ 17 files changed, 56 insertions(+), 94 deletions(-) diff --git a/.gradle/7.2/executionHistory/executionHistory.bin b/.gradle/7.2/executionHistory/executionHistory.bin index 16b66f5b621caff1f7c261af803451a2c7c6e2a4..bd6e4964f9472c19c62fec0426509887f3a01904 100644 GIT binary patch delta 2439 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 diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock index 396fd643e32e9def388a1648d73e7e7021da3faa..6a9d7c2a4ea31922bb9e198977f687f424f3486f 100644 GIT binary patch literal 17 VcmZQ>SH3p8Kj^qN0~oOX0su1K1oHp@ literal 17 VcmZQ>SH3p8Kj^qN0~oMh1^_a+1k3;c diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin index 9d7830c7b272fc3b0cff5971ef3ca2764c69d30e..579257a57933f1eacb80167ce527017e2590b3ab 100644 GIT binary patch delta 1789 zcmZvc3ou+~6vthb1lhfJyQ{1OSG*#uM?(w}v8q#9_1ImHWwA&)(TGPcKI+iD)F~>LAh5i!)9( zHi`fE|cn!=5W?4q<;%}5fZH^ zI-j6-M_73)rS@Yb*=APfj@@3{?nT*YJ7Ss%S`##UzhUyVnF8^Iuetw>&2}&QI3ThG zP$7H8w5mwLoq#%-n59h^z_bW|VcGx>IlIc^Kq?~cZ%~bG7H|iXDXhrVOcb6D5*1>u zfye`B@4_Z1ct>DuU7|_la^~#2eB8!+6%@NC3GX@FQlR+X!(&9GKRCp(HZl-on1bLe zreM%vx&-r>hCmeW#WAEDgvfX#U50W@OVEw!B+Me>_JJS)`Gvz9h`6Irf+-L>Fgd{_ zBEAoB6Ilh<1CAi#AB2KLwp4x?D%GM9GE@S%orqdn2xHh&2s@NWJr040_(713h};BO zjxF>kg-i)sFsx*1;YR?GWJ~*~2Ob3TN~;3f=euvd-@1VMMy}(zsE0d|0*B7;{K8Du z7e|(zN3X|iRUjY!Tgb<<2y&8Kn6n}Ea5;(H2E~CNFnPmuC8jvgq>3w<)fg1Ul&Q~)nNxSe?a18J$uK|9ykc6uFDv{b zeox9Nv}H5Ho4L#b43C!-hr6$MdX9#E)#>x3tnIk*uUOH<3XCkuwkw>OBvPqmtv+F6 zcI=UUXP9@N97zO+SPAh<5}ZyerdJ9sv`u+DGd}35kj_4({TQeBR^HU0xI{WktKA?( z?aL_&Zu}gsrZI&xG?ixizgolM7yr__GP)L!sBN`Q>F*NE>>Y+rGtfZ}!%vuAhs_N3 z%ckNWBNLs>C;+B7=+9)Pm73D7W_EEHnufL$tVs(GP9XogV40Q9q-)mZW&OyZqdG3q zmjagb1Mab#9cM!N*z*7R*-b!F4m%dSc{rQHhTsi?4%0BqV{!vgF4~#`%5!b$%vP)7 zm|mlgy@dNku?v1tsH+ri7{?cSa?de;CLW2}z!`*sSOKKxv7alC2PJvTcu1%((Yi^U z;r-HKZw#zYWp%YQD$f@lAx=*j8frL{jmdZ%QTSiQl>C`UOpXejZ5jnHDm`4#u6E(0 z;2ztqNM^<({?UcKrnS*xsQ;`m>zk`Btb}eG#Yw!jOBlt|oXgUOmY>ufKkBe3i1_w8 NO2Q+Mg6GO8{sxHXGP?i( delta 1535 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 UwyC$vew!*+XLx=X_|~QW16~0zJ^%m! delta 459 zcmXAjPe_w-9LD$j_HJ`Ux>(RF)yv+)N`=^BWe&q|=#qrBBz6dfn}?7|h(YE26YUfm zF{)qdCwh>eppz)y;@criH$v)Q9wJo84h;$d(@RN*(bDJi@WAstpO4FqUyF{})B3^u z-TDi;(%7j9%dWa#QCwdXviZmswHL6fyfXTJ}aA)O>P9 zkl`P+(epE_Rw@MFgKo8YKr`o(!tPC4aNwItb-?2)PZyRFO?~d&8#G*2e>-5RKqvfa zv=d!*v(A^n{r+cr7z1lcgpsMc|N4+W;|=X~+yS*7hDpZxzHunZylE7&I6o|V-fq#= zg(b*faa)E;KFXG=6sdPE8$J4<+o`y+V5P}VQIPmtb?a*r8s#>sjK#0*n*DgtVu^oO z@ic;JCXELwHiCqzjG&8}%7?r0m_t688jl80qw&;Pv}pXZ6)qdQ+c8+nlb4VcG8Rto zR1XyR;uYi|yxVi8XCFs;kr#N%Uy^`R{Z7HpZ3Ac!eCIm)HB}kH3!c9L-O8Ic5e3I? rV+VXKjcFmX_q+nf@P+z diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 4efe3eddfa80c87537a3060692e26cd4f0038581..e13dd8d30638f60aa453a04af0e6f7a69bb68573 100644 GIT binary patch literal 17 VcmZSXT9GqzmgxO@1~3rn1pqc?1m^$% literal 17 VcmZSXT9GqzmgxO@1~3q^2LLu01epK; diff --git a/README.md b/README.md index f68015bb..43d9e761 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,5 @@ +# JUST - 익명 고민 상담 -# Just Mobile App - -

-주변 사람에게는 말 못할 고민을 털어 놓을 수 있는 공간, Just
- - - - - - - - - - - - -## [](https://github.com/inje-megabrain/JUST-FE#%EA%B0%9C%EB%B0%9C-%EC%A7%84%ED%96%89%EC%A4%91%EC%9D%B8-%ED%94%84%EB%A1%9C%EC%A0%9D%ED%8A%B8%EC%9E%85%EB%8B%88%EB%8B%A4) - - - - - -### 아키텍쳐 설계 -스크린샷 2023-04-09 오후 4 00 25 - - - -## 주요 기능 - -- 기본적인 글쓰기, 좋아요, 무한스크롤 기능 구현 -- 피드백을 위한 신고기능 - - - -### 기능 동작 영상 -[![](https://github.com/inje-megabrain/JUST-FE/raw/main/readme_images/ui.gif)](https://github.com/inje-megabrain/JUST-FE/blob/main/readme_images/ui.gif) +## 프로젝트 목적 +이 앱은 주변 사람들에게 털어놓기 어려운 걱정을 익명으로 공유하여 해소할 수 있는 플랫폼입니다. 이를 통해 당신은 누구에게도 말하지 못했던 걱정과 고민을 안전하게 나눌 수 있습니다. 앱 내에서 다른 사용자들과 대화를 나누고 충고를 구할 수 있으며, 이를 통해 당신은 더 나은 방향으로 나아갈 수 있게 됩니다. 이 앱은 당신의 고민을 더 이상 혼자 짊어지지 않도록 도와줄 것입니다. \ No newline at end of file diff --git a/src/main/generated/com/example/just/Mapper/MemberMapperImpl.java b/src/main/generated/com/example/just/Mapper/MemberMapperImpl.java index 4ebf5c5a..2bde19ec 100644 --- a/src/main/generated/com/example/just/Mapper/MemberMapperImpl.java +++ b/src/main/generated/com/example/just/Mapper/MemberMapperImpl.java @@ -10,7 +10,7 @@ @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-10-28T15:14:51+0900", + date = "2023-10-28T16:47:57+0900", comments = "version: 1.5.3.Final, compiler: IncrementalProcessingEnvironment from gradle-language-java-7.2.jar, environment: Java 11.0.11 (AdoptOpenJDK)" ) @Component diff --git a/src/main/generated/com/example/just/Mapper/PostMapperImpl.java b/src/main/generated/com/example/just/Mapper/PostMapperImpl.java index 3f06f612..7445ea04 100644 --- a/src/main/generated/com/example/just/Mapper/PostMapperImpl.java +++ b/src/main/generated/com/example/just/Mapper/PostMapperImpl.java @@ -3,7 +3,7 @@ import com.example.just.Dao.Comment; import com.example.just.Dao.Member; import com.example.just.Dao.Post; -import com.example.just.Dto.PostDto; +import com.example.just.Dto.PutPostDto; import java.util.ArrayList; import java.util.List; import javax.annotation.processing.Generated; @@ -11,14 +11,14 @@ @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-10-28T15:14:51+0900", + date = "2023-10-28T16:47:57+0900", comments = "version: 1.5.3.Final, compiler: IncrementalProcessingEnvironment from gradle-language-java-7.2.jar, environment: Java 11.0.11 (AdoptOpenJDK)" ) @Component public class PostMapperImpl implements PostMapper { @Override - public Post toEntity(PostDto dto) { + public Post toEntity(PutPostDto dto) { if ( dto == null ) { return null; } @@ -30,7 +30,6 @@ public Post toEntity(PostDto dto) { post.setPost_tag( dto.getPost_tag() ); post.setPost_picture( dto.getPost_picture() ); post.setPost_create_time( dto.getPost_create_time() ); - post.setPost_like( dto.getPost_like() ); post.setSecret( dto.getSecret() ); post.setEmoticon( dto.getEmoticon() ); post.setPost_category( dto.getPost_category() ); @@ -43,39 +42,36 @@ public Post toEntity(PostDto dto) { if ( list1 != null ) { post.setComments( new ArrayList( list1 ) ); } - post.setBlamedCount( dto.getBlamedCount() ); return post; } @Override - public PostDto toDto(Post entity) { + public PutPostDto toDto(Post entity) { if ( entity == null ) { return null; } - PostDto postDto = new PostDto(); + PutPostDto putPostDto = new PutPostDto(); - postDto.setPost_id( entity.getPost_id() ); - postDto.setPost_content( entity.getPost_content() ); - postDto.setPost_tag( entity.getPost_tag() ); - postDto.setPost_like( entity.getPost_like() ); - postDto.setPost_picture( entity.getPost_picture() ); - postDto.setPost_create_time( entity.getPost_create_time() ); - postDto.setSecret( entity.getSecret() ); - postDto.setEmoticon( entity.getEmoticon() ); - postDto.setPost_category( entity.getPost_category() ); + putPostDto.setPost_id( entity.getPost_id() ); + putPostDto.setPost_content( entity.getPost_content() ); + putPostDto.setPost_tag( entity.getPost_tag() ); + putPostDto.setPost_picture( entity.getPost_picture() ); + putPostDto.setPost_create_time( entity.getPost_create_time() ); + putPostDto.setSecret( entity.getSecret() ); + putPostDto.setEmoticon( entity.getEmoticon() ); + putPostDto.setPost_category( entity.getPost_category() ); List list = entity.getLikedMembers(); if ( list != null ) { - postDto.setLikedMembers( new ArrayList( list ) ); + putPostDto.setLikedMembers( new ArrayList( list ) ); } - postDto.setMember( entity.getMember() ); + putPostDto.setMember( entity.getMember() ); List list1 = entity.getComments(); if ( list1 != null ) { - postDto.setComments( new ArrayList( list1 ) ); + putPostDto.setComments( new ArrayList( list1 ) ); } - postDto.setBlamedCount( entity.getBlamedCount() ); - return postDto; + return putPostDto; } } diff --git a/src/main/java/com/example/just/Controller/PostController.java b/src/main/java/com/example/just/Controller/PostController.java index af842927..b2d07c32 100644 --- a/src/main/java/com/example/just/Controller/PostController.java +++ b/src/main/java/com/example/just/Controller/PostController.java @@ -1,7 +1,8 @@ package com.example.just.Controller; -import com.example.just.Dto.PostDto; +import com.example.just.Dto.PostPostDto; +import com.example.just.Dto.PutPostDto; import com.example.just.Service.PostService; import com.example.just.Service.ResponseGetPost; import com.example.just.Service.ResponsePost; @@ -37,6 +38,7 @@ public ResponseGetPost getPosts(@RequestParam Long request_page, Long member_id = Long.valueOf(jwtProvider.getIdFromToken(token)); //토큰 String cursor = req.getHeader("viewed"); + return postService.searchByCursor(cursor, request_page, member_id); } @@ -55,11 +57,11 @@ public ResponseEntity> getMyPosts( */ - @Operation(summary = "게시글 작성 api", description = "post_content, post_tag는 null값이 발생하면" + - " 안됨\n" + "다른 건 null이와도 예외처리 완료\n 자기가 쓴 글이면 true") + @Operation(summary = "게시글 작성 api", description = "RequestBody에 null값이 있으면 안됨" + + "\n 공개글이면 true 아니라면 false") @PostMapping("/post/post") public ResponsePost write(HttpServletRequest request, - @RequestBody PostDto postDto) { + @RequestBody PostPostDto postDto) { String token = jwtProvider.getAccessToken(request); System.out.println(token + "ㅋㅋ"); Long member_id = Long.valueOf(jwtProvider.getIdFromToken(token)); //토큰 @@ -75,12 +77,12 @@ public ResponsePost deletePost(@RequestParam Long post_id) { @Operation(summary = "게시글 수정 api", description = "JSON넘길 때 null이 하나도 있으면 안됨 꼭 다채워서 넘기기") @PutMapping("/put/post") - public ResponsePost putPost(@RequestParam Long post_id, HttpServletRequest request, - @RequestBody PostDto postDto) { + public ResponsePost putPost(HttpServletRequest request, + @RequestBody PutPostDto postDto) { String token = jwtProvider.getAccessToken(request); Long member_id = Long.valueOf(jwtProvider.getIdFromToken(token)); //토큰 - return postService.putPost(post_id, member_id, postDto); + return postService.putPost(member_id, postDto); } @Operation(summary = "게시글 좋아요 api", description = "\n 자기가 좋아요 한 글이면 true") diff --git a/src/main/java/com/example/just/Dto/MemberDto.java b/src/main/java/com/example/just/Dto/MemberDto.java index 4a2d257b..dabcd9df 100644 --- a/src/main/java/com/example/just/Dto/MemberDto.java +++ b/src/main/java/com/example/just/Dto/MemberDto.java @@ -1,19 +1,15 @@ package com.example.just.Dto; import com.example.just.Dao.Post; import com.example.just.Dao.Role; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; import lombok.Setter; import java.sql.Timestamp; import java.util.ArrayList; -import java.util.Date; import java.util.List; import lombok.*; -import org.hibernate.annotations.CreationTimestamp; -import javax.persistence.*; //로그인 할 때 사용할 Dto @Builder diff --git a/src/main/java/com/example/just/Dto/NotificationDto.java b/src/main/java/com/example/just/Dto/NotificationDto.java index d9754d26..f618c49d 100644 --- a/src/main/java/com/example/just/Dto/NotificationDto.java +++ b/src/main/java/com/example/just/Dto/NotificationDto.java @@ -2,7 +2,6 @@ import com.example.just.Dao.Member; import com.example.just.Dao.Notification; -import com.example.just.Dao.Post; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/just/Dto/PostDto.java b/src/main/java/com/example/just/Dto/PostDto.java index 9daff333..a453aee5 100644 --- a/src/main/java/com/example/just/Dto/PostDto.java +++ b/src/main/java/com/example/just/Dto/PostDto.java @@ -2,21 +2,13 @@ import com.example.just.Dao.Comment; import com.example.just.Dao.Member; -import com.example.just.Dao.Notification; -import com.example.just.Dao.Post; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.persistence.Column; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; import java.sql.Timestamp; -import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Date; import java.util.List; @Getter diff --git a/src/main/java/com/example/just/Impl/MySliceImpl.java b/src/main/java/com/example/just/Impl/MySliceImpl.java index 4e5d240c..66b140bd 100644 --- a/src/main/java/com/example/just/Impl/MySliceImpl.java +++ b/src/main/java/com/example/just/Impl/MySliceImpl.java @@ -1,10 +1,12 @@ package com.example.just.Impl; +import lombok.Getter; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.SliceImpl; import java.util.List; +@Getter public class MySliceImpl extends SliceImpl { private String nextCursor; diff --git a/src/main/java/com/example/just/Mapper/PostMapper.java b/src/main/java/com/example/just/Mapper/PostMapper.java index 529ae33e..c99da499 100644 --- a/src/main/java/com/example/just/Mapper/PostMapper.java +++ b/src/main/java/com/example/just/Mapper/PostMapper.java @@ -1,9 +1,9 @@ package com.example.just.Mapper; import com.example.just.Dao.Post; -import com.example.just.Dto.PostDto; +import com.example.just.Dto.PutPostDto; import org.mapstruct.Mapper; @Mapper(componentModel = "spring") -public interface PostMapper extends EntityMapper{ +public interface PostMapper extends EntityMapper{ } diff --git a/src/main/java/com/example/just/Service/PostService.java b/src/main/java/com/example/just/Service/PostService.java index b2d8ea23..c39df1e1 100644 --- a/src/main/java/com/example/just/Service/PostService.java +++ b/src/main/java/com/example/just/Service/PostService.java @@ -1,8 +1,10 @@ package com.example.just.Service; + import com.example.just.Dao.Member; import com.example.just.Dao.Post; import com.example.just.Dao.QPost; -import com.example.just.Dto.PostDto; +import com.example.just.Dto.PostPostDto; +import com.example.just.Dto.PutPostDto; import com.example.just.Impl.MySliceImpl; import com.example.just.Mapper.PostMapper; import com.example.just.Repository.MemberRepository; @@ -21,7 +23,6 @@ import java.util.stream.Collectors; - @Service public class PostService { @@ -46,7 +47,7 @@ public PostService(EntityManager em, JPAQueryFactory query) { } - public ResponsePost write(Long member_id, PostDto postDto) { //글 작성 + public ResponsePost write(Long member_id, PostPostDto postDto) { //글 작성 Optional optionalMember = memberRepository.findById(member_id); if (!optionalMember.isPresent()) { //아이디 없을시 예외처리 @@ -67,7 +68,6 @@ public ResponsePost write(Long member_id, PostDto postDto) { //글 작성 } - //글 삭제 @Transactional public ResponsePost deletePost(Long post_id) { @@ -76,7 +76,6 @@ public ResponsePost deletePost(Long post_id) { throw new NoSuchElementException("post_id의 값이 DB에 존재하지 않습니다:" + post_id); } Post post = optionalPost.get(); - post.setMember(null); try { postRepository.delete(post); } catch (Exception e) { @@ -86,8 +85,13 @@ public ResponsePost deletePost(Long post_id) { return responsePost; } +<<<<<<< HEAD //글 수정 - public ResponsePost putPost(Long post_id, Long member_id, PostDto postDto) { +======= +>>>>>>> parent of 3c9dc9f (Refector: Post API) + public ResponsePost putPost(Long member_id, PutPostDto postDto) { + Long post_id = postDto.getPost_id(); + System.out.println(post_id); Optional optionalPost = postRepository.findById(post_id); if (!optionalPost.isPresent()) { //아이디 없을시 예외처리 throw new NoSuchElementException("post_id의 값이 DB에 존재하지 않습니다:" + post_id); @@ -96,10 +100,13 @@ public ResponsePost putPost(Long post_id, Long member_id, PostDto postDto) { if (!optionalMember.isPresent()) { //아이디 없을시 예외처리 throw new NoSuchElementException("DB에 존재하지 않는 ID : " + member_id); } + postDto.setPost_create_time(new Timestamp(System.currentTimeMillis())); + Member member = optionalMember.get(); //존재한다면 객체 생성 postDto.setMember(member); Post post = postMapper.toEntity(postDto); + post.setPost_like(optionalPost.get().getPost_like()); postRepository.save(post); ResponsePost responsePost = new ResponsePost(post, true); return responsePost; @@ -107,7 +114,6 @@ public ResponsePost putPost(Long post_id, Long member_id, PostDto postDto) { public ResponseGetPost searchByCursor(String cursor, Long limit, Long member_id) { //글 조 - QPost post = QPost.post; Set viewedPostIds = new HashSet<>(); @@ -116,7 +122,7 @@ public ResponseGetPost searchByCursor(String cursor, Long limit, Long member_id) String[] viewedPostIdsArray = cursor.split(","); viewedPostIds = new HashSet<>(); for (String viewedPostId : viewedPostIdsArray) { - viewedPostIds.add(Long.parseLong(viewedPostId)); + viewedPostIds.add(Long.parseLong(viewedPostId.trim())); } } @@ -128,7 +134,6 @@ public ResponseGetPost searchByCursor(String cursor, Long limit, Long member_id) .orderBy(Expressions.numberTemplate(Double.class, "function('rand')").asc()) .limit(limit + 1) .fetch(); - // 가져온 글들의 ID를 저장합니다. Set resultPostIds = results.stream().map(Post::getPost_id).collect(Collectors.toSet()); viewedPostIds.addAll(resultPostIds); @@ -146,9 +151,13 @@ public ResponseGetPost searchByCursor(String cursor, Long limit, Long member_id) } // Slice 객체를 생성해서 반환합니다. - ResponseGetPost responseGetPost = new ResponseGetPost(new MySliceImpl<>(results, PageRequest.of(0, Math.toIntExact(limit)), hasNext, nextCursor), false); + ResponseGetPost responseGetPost = new ResponseGetPost( + new MySliceImpl<>(results, PageRequest.of(0, Math.toIntExact(limit)), hasNext, nextCursor), false); return responseGetPost; +<<<<<<< HEAD +======= +>>>>>>> parent of 3c9dc9f (Refector: Post API) } /* public Slice searchByMyPost(Long limit, Long member_id) { @@ -182,12 +191,9 @@ public Slice searchByMyPost(Long limit, Long member_id) { */ - - @Transactional public ResponsePost postLikes(Long post_id, Long member_id) { //글 좋아요 - Optional optionalPost = postRepository.findById(post_id); if (!optionalPost.isPresent()) { //아이디 없을시 예외처리 throw new NoSuchElementException("post_id의 값이 DB에 존재하지 않습니다:" + post_id); diff --git a/src/main/java/com/example/just/Service/ResponseGetPost.java b/src/main/java/com/example/just/Service/ResponseGetPost.java index 75c755e5..6003c900 100644 --- a/src/main/java/com/example/just/Service/ResponseGetPost.java +++ b/src/main/java/com/example/just/Service/ResponseGetPost.java @@ -2,7 +2,10 @@ import com.example.just.Dao.Post; import com.example.just.Impl.MySliceImpl; +import lombok.Getter; +import org.springframework.web.bind.annotation.GetMapping; +@Getter public class ResponseGetPost { private MySliceImpl mySlice; private boolean value; From 8f550604b9ebe9c6cf239c6b8af91e8e31547fd2 Mon Sep 17 00:00:00 2001 From: sleeg00 Date: Sat, 28 Oct 2023 17:16:52 +0900 Subject: [PATCH 02/12] Revert "Refector: Post API" This reverts commit 736dd18c668ccd2953fc58fe28408de682b128ce. --- .../dependencies-accessors.lock | Bin 17 -> 39 bytes .../7.2/executionHistory/executionHistory.bin | Bin 1489065 -> 1489065 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 39 bytes .gradle/7.2/fileHashes/fileHashes.bin | Bin 28797 -> 28797 bytes .gradle/7.2/fileHashes/fileHashes.lock | Bin 17 -> 39 bytes .../7.2/fileHashes/resourceHashesCache.bin | Bin 124751 -> 124615 bytes .../buildOutputCleanup.lock | Bin 17 -> 39 bytes .gradle/checksums/checksums.lock | Bin 17 -> 39 bytes .../example/just/Mapper/MemberMapperImpl.java | 2 +- .../example/just/Mapper/PostMapperImpl.java | 2 +- .../just/Controller/PostController.java | 1 + .../java/com/example/just/Dto/MemberDto.java | 4 ++++ .../com/example/just/Dto/NotificationDto.java | 1 + .../java/com/example/just/Dto/PostDto.java | 8 ++++++++ .../com/example/just/Mapper/PostMapper.java | 2 ++ .../com/example/just/Service/PostService.java | 1 + 16 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock index c659bc55d15a9dc18da375e430fda5da51390dcc..5684cc45b6461432c8ddc67ab7c20e0353cdcf35 100644 GIT binary patch literal 39 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 Nj@WG86l?z|`G1?F#MJ-* diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock index 6a9d7c2a4ea31922bb9e198977f687f424f3486f..af9764304389a7e7c07ad761985f86c0ddfc5f49 100644 GIT binary patch literal 39 rcmZQ>SH3p8Kj^qN0~oM>XJ%lyv}5_QDIzZ3R@DrwCgzsr<_rt~?>`F7 literal 17 VcmZQ>SH3p8Kj^qN0~oOX0su1K1oHp@ diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin index 579257a57933f1eacb80167ce527017e2590b3ab..ba3d2e4f73157da6085093ab229ba081afe475be 100644 GIT binary patch delta 1089 zcmZY7dq`7J90%}S@62*!t{J7JT?x{RZQzLL{eTKHt!Zj=>fFQvPe)NIvt85F$5?0`_L!ER%OC^;{p!KfD{R}^lM&M)xucp_$| z(fb1AlFmNV@pvbCx$EIcvx<^iKvuebmgK%9*N$jr>S&-D?24r;{A&E@#OFn=-xst_ z3oldGCGgou?s@1=XO-Qd_{P1AscR|jgOPh3`?wF$Ne&O-1L?6LGK0)RGPfSPxV2~} zho@kObXGx=$#i?MjC7vCHqtSKHttQlB7IviHjCch!6MSP8)aE~mE@~olV>gTB&=o) zu4d70t-urBCkG+xSYKx==8(Q>6qBCQXkr=!0sW*n27*biGAMq^wS-3WCToytieTTu zP-vo@798Vt;Wp`2VT5TAE<+zdc#ql4Yr;h#F<$<910WZX-17XN-D5TwZzAJ zGu0m(+dn@paPUnw1U-@mj_bz_a~zv!9GsNo(;_y9ijG1$cQ*Ftutj@T%Ka0}Fs5km zIEPI%D1cAYXQ&&KbIC5GaC=e7y@rllmOIoV=LQ!eHbYanF-dp$&9lVv9?S6ZhNMDy zJ_=FpGiEmPpJTH2wMV_|fXRRPYjs%p>D0M@GginMp*#Q2Xp-uz{=JTYr$3%G4cddD`F_{`5LeFOEb%z&H!}5KAmk_G$TB1h%t}aNNok z=qbcq((OjT%FeiV0jxF_`^E#LcOh=@IL7|Nc3#PL=oeZxuwNGBzze42{RCA}J`LP& zFD)8Siixfe7&lQ#E%tH8qmw%UA4t~;M3&G{^RcUhDt$qF2~?7+N?yJ49?I5ekYCCU gp{okpN@)~3+DciDqXJ_$TgOQ*+EdoTrn8&w4;;~f3;+NC delta 1095 zcmZA0Ye-XJ7zc1q%`WP;GbVY7N)uY9HoKU3shkz0r8T#-HE)w7YvvLuAu*|_K1f9T zyMkpFVOgQJq#!6n>_U=MW>l0Kr9`DfMy0IvKF{fs2hM(H@B94U_nc>Eo_@*GFSYcg zg&j)_8Tol2BDm$d>q^z-(f}VHsdo3uJ5zo5m^8!fP1C9-uju^i)@2@*_@ZG$lN8pP z*!`mJ?c)COm{*IY$MpwuPLwIR*;YtSJ@%OcC!5r-aMElPdhn3_ia+c)qO!!eMuj|5 z{Q<}LyC2$FU;M~&i1{|;Sd9KA?Gk0}z%@lXg&%nN!>D(=ZI&}r7F+hcODMA9`|ynKNWb%HG!DAnKHddAa#jw zl3EYWv47Fc<7*+=s2^j>TGAP`uhS#bCf3reN3o4EUYsUn6&|xjjI&O}Y@zWfC}5Lu zd<#T5UEh^M_Ttlg?kjwfq?0 zTE2RhzmSF+pe^8wOE49Lx+4lJB+=pJIP0KJcjF1W3Lb}e%VjGZMbx|=fVHBNedqpF zbVDU3`p~$I3fy?jK7xNqA?tOvuec%8MBJsdIbSNmyvn_C71qs0Z4-?t?i=hreW-Q2im z0jmJ}$EI~rcjoPcsCjmLv*aN~X8t9|_;q*YT!L!U-E4SNP?F#Ch<@1PqvxS2Uv9R% z*UZY;IbE@uQMFm?$#$(LjB}YBjDgaUKr9Ht0*b-@C0`DEzOK|fs{jB1 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index e13dd8d30638f60aa453a04af0e6f7a69bb68573..50b65c4962a89343439de8b1a6525bfe3dd818ba 100644 GIT binary patch literal 39 rcmZSXT9GqzmgxO@1~3q6XJ%lywBtATmzs#<>W3LvP0TIL%^4T~0gns> literal 17 VcmZSXT9GqzmgxO@1~3rn1pqc?1m^$% diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock index beb32b6cb4011a1453dca1a554fa376d9ea1abfb..abb596067331f688d64c76da60aa7f0dc43e5c08 100644 GIT binary patch literal 39 rcmZRM=KS+oU`6 Date: Sat, 28 Oct 2023 17:17:28 +0900 Subject: [PATCH 03/12] Revert "Revert "Refector: Post API"" This reverts commit 5a2132ca4a2ae33f305c9b6c5d6771dd66adee7b. --- .../dependencies-accessors.lock | Bin 39 -> 17 bytes .../7.2/executionHistory/executionHistory.bin | Bin 1489065 -> 1489065 bytes .../executionHistory/executionHistory.lock | Bin 39 -> 17 bytes .gradle/7.2/fileHashes/fileHashes.bin | Bin 28797 -> 28797 bytes .gradle/7.2/fileHashes/fileHashes.lock | Bin 39 -> 17 bytes .../7.2/fileHashes/resourceHashesCache.bin | Bin 124615 -> 124751 bytes .../buildOutputCleanup.lock | Bin 39 -> 17 bytes .gradle/checksums/checksums.lock | Bin 39 -> 17 bytes .../example/just/Mapper/MemberMapperImpl.java | 2 +- .../example/just/Mapper/PostMapperImpl.java | 2 +- .../just/Controller/PostController.java | 1 - .../java/com/example/just/Dto/MemberDto.java | 4 ---- .../com/example/just/Dto/NotificationDto.java | 1 - .../java/com/example/just/Dto/PostDto.java | 8 -------- .../com/example/just/Mapper/PostMapper.java | 2 -- .../com/example/just/Service/PostService.java | 1 - 16 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock index 5684cc45b6461432c8ddc67ab7c20e0353cdcf35..c659bc55d15a9dc18da375e430fda5da51390dcc 100644 GIT binary patch literal 17 TcmZSnXl`G5^`fRV0~7!NGROn& literal 39 pcmZSnXl`G5^`fRV0~9bbFkIU4CE*!^uB`4vmxLKU_#kX?h&Pm%+Hv1**OwesjN=*H1i%yrQ)GdAQ zec#0GX2LT^!yDt7H|G3AC%87uCtIT%cG7p^SM3>X(G2YM-nAz#q~ubOI?=YMIzh%C z>4w%KUhj&$t)#7c|1iDi>ABM!xK=-X&g>g()Uvj?y4~E4f1pG^0%=;op@#gjjTKYM zTJ8F}Ryi(QhK@^3-4P#+yqxvv$SG&zhhv?)F{$4cH$QTTfo+$>Lh>)51>d%_Sd!;fvCZ>g<=m)>-F?c?HtL_Y9L0f0MnX51BTsP$Azo2D z8($^C;4(P@dj}y;&_QVvrSp^ugOHb`R`4~OV zh*$7_c(s}d5Oo;n8!l8cuAqxBz7c|)!3gypCf?v$1tA9&askzpR;bV-aEa0m6>`_9zq7x4#vkO2AP1LVK!J@k}=^a-vE|T06)Wu}W7>k-WI^n%)G8m3(_{A7> z0S5@;D{68nJv4k!O-_17Ngj&afbkfiuu$X*vZ!BbD2jvyLh#l9pcgny#i3B-2Pf!> z*lQdv0+Td4eg%pV)y@pMDU6Z3pOL54d}0my9MAYH?y8TMj+W4}4qBR@(*y&oQz;8NxLE3HOR zD#pVptPgAy!lhGWlYg4YGzB$)r^%C_7Z&;yW z7T`Sc8C255Wg6rl@4ekJt~-&D?K#?&C++)cewE`&retjx|eOQ)HuW!PR9Nw8FF_eRfamgmLlY>fGHj$p3%^F;)AGfJgFW0vQl>SB} z7nR8v*q7zz*{{y|vwtX;NR3}AOkIxkCBMv%J{XvBu#re_Z8D@iux=;_(IuI6w3qgS z(v;La+f#PpdPej;PXCk`=DHaiv5|a_LA!bX= Nj@WG86l?z|`G1?F#MJ-* delta 1581 zcmXAo4NO!=5XXJT?r|LGKE6d!2(1WG4i6#)l=FZCIT2K}rWy^UhzdoyYB{5+737Hu zRYcJ>@?oJdmL{}VwGYALLrg7T3x3xqpjcEu!9$2eKGNC8C6oN_KQp^CJM${c8!F5j zG6hbM2^Inpupk#K1%+TGCY~Pczch}xzqhVW0%I=KRq#a)y zG7=M~Nk6OiV%ZvQ+(I0?kFJ}=)aj(vLEQKlhsi~w7xA;^XY^E(>>|$OZ2ewQd1vWC zS{5&}r&Vnh4&svlavt%9SyinK*X-6M^yc4k>R47y3xdd5eq(QYI{(OcbZ7ng8ja1H zEDB}X(}ri*mbwQME1ExqgL(Dt$nE#LLN&v4{uw!R@a{%>F_?t%^Ey20Hs$+o8GP7x zwV*vckv24;EhnqCBAWjWM=6iK%&rjCJ(e7$7j5NE^zRU2hYOfUZH95YJojJbr)9}9 zZ+Y<)wXunml-`g0?OpzKRol?5@*}v=Nfg@mCPx7fO7QiP0B~@)#9_ z5|wfQvP5-}D_2Bsw_``z8A_a$*T5~Rf4AjIC>LkxN@r_`9l8dUQniMBf~vCNrbG>i zM&{?BRcgpbmcu}z`ZDEGWFF{Q2gnl|;*b7d6tI+htY`re)nXuB9ma*of9zuaXh9g~ zg?<92txJgqy4eY2hG>-659FdHo@fM`p%Gd#4^1*k(-I$)!@NaWxb}(E>U}zxDsw{u zJLr{`Xym_59X~gM^Hh#KWmmP>b7dzR65Q#xVKA8IOrvlA!=C5`AT@=-qcpMffiSqK zpOJGo@kYZ>fOO%+3yCbw5Kf}8@Qfulj$##JNC(47Ag0oZstFT-TSf?y!`RYj-S4bO=!xHZw$9Cufn^8d|S%9(*z>Ml6i3%Ob0WwEI3*%WpbE05^ z$CwryMONV3tVF7vfM%N5Fx#VupS)(OZd1C@R^rG?RFW=s5|$W@y?fA-I1)u>Aq z)SNC`h;K;g{3I-C`_xI3SdUEXr2b_jK+)UFqI2}L${_PZrEG$$qM-nhEnsFey!8d9 zRYa2oiaKfQaxLf&(VP=~I*EBj3;PDtkJnOnqs*DQ>j|%zkQTPum##F*RPst`{#32! z+-M%SQ4Tx!oSwKiCw=Lb;N>;E&i2)rU;FMP4cwLz+i05}o~NIEEE7OmFG&@ivb31S z5B?eB;?V4R$^e)CPBaS-d)!Wcx%Sj0`H9>WLG0=7+qt9bt z)oU4L#z0XGjDCrM4?$#fFNOp;Sf=S!-*-Rs-)Tx1iaMoF&d!9w-B*y=``327vyD8w zezfLw&WxSqaUnOsBdW(7Sc$LC$1TZkv)X4X9?y8t+zOJhHYu+E-oEVXG0Ir+G@l02 zT~pMaar5SNi@xhXrFA#rL3)>8*za=B(J+5)@$l+Gs{xRz^6Wwa7lx%8i>!T`)2SH3p8Kj^qN0~oOX0su1K1oHp@ literal 39 rcmZQ>SH3p8Kj^qN0~oM>XJ%lyv}5_QDIzZ3R@DrwCgzsr<_rt~?>`F7 diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin index ba3d2e4f73157da6085093ab229ba081afe475be..579257a57933f1eacb80167ce527017e2590b3ab 100644 GIT binary patch delta 1095 zcmZA0Ye-XJ7zc1q%`WP;GbVY7N)uY9HoKU3shkz0r8T#-HE)w7YvvLuAu*|_K1f9T zyMkpFVOgQJq#!6n>_U=MW>l0Kr9`DfMy0IvKF{fs2hM(H@B94U_nc>Eo_@*GFSYcg zg&j)_8Tol2BDm$d>q^z-(f}VHsdo3uJ5zo5m^8!fP1C9-uju^i)@2@*_@ZG$lN8pP z*!`mJ?c)COm{*IY$MpwuPLwIR*;YtSJ@%OcC!5r-aMElPdhn3_ia+c)qO!!eMuj|5 z{Q<}LyC2$FU;M~&i1{|;Sd9KA?Gk0}z%@lXg&%nN!>D(=ZI&}r7F+hcODMA9`|ynKNWb%HG!DAnKHddAa#jw zl3EYWv47Fc<7*+=s2^j>TGAP`uhS#bCf3reN3o4EUYsUn6&|xjjI&O}Y@zWfC}5Lu zd<#T5UEh^M_Ttlg?kjwfq?0 zTE2RhzmSF+pe^8wOE49Lx+4lJB+=pJIP0KJcjF1W3Lb}e%VjGZMbx|=fVHBNedqpF zbVDU3`p~$I3fy?jK7xNqA?fFQvPe)NIvt85F$5?0`_L!ER%OC^;{p!KfD{R}^lM&M)xucp_$| z(fb1AlFmNV@pvbCx$EIcvx<^iKvuebmgK%9*N$jr>S&-D?24r;{A&E@#OFn=-xst_ z3oldGCGgou?s@1=XO-Qd_{P1AscR|jgOPh3`?wF$Ne&O-1L?6LGK0)RGPfSPxV2~} zho@kObXGx=$#i?MjC7vCHqtSKHttQlB7IviHjCch!6MSP8)aE~mE@~olV>gTB&=o) zu4d70t-urBCkG+xSYKx==8(Q>6qBCQXkr=!0sW*n27*biGAMq^wS-3WCToytieTTu zP-vo@798Vt;Wp`2VT5TAE<+zdc#ql4Yr;h#F<$<910WZX-17XN-D5TwZzAJ zGu0m(+dn@paPUnw1U-@mj_bz_a~zv!9GsNo(;_y9ijG1$cQ*Ftutj@T%Ka0}Fs5km zIEPI%D1cAYXQ&&KbIC5GaC=e7y@rllmOIoV=LQ!eHbYanF-dp$&9lVv9?S6ZhNMDy zJ_=FpGiEmPpJTH2wMV_|fXRRPYjs%p>D0M@GginMp*#Q2Xp-uz{=JTYr$3%G4cddD`F_{`5LeFOEb%z&H!}5KAmk_G$TB1h%t}aNNok z=qbcq((OjT%FeiV0jxF_`^E#LcOh=@IL7|Nc3#PL=oeZxuwNGBzze42{RCA}J`LP& zFD)8Siixfe7&lQ#E%tH8qmw%UA4t~;M3&G{^RcUhDt$qF2~?7+N?yJ49?I5ekYCCU gp{okpN@)~3+DciDqXJ_$TgOQ*+EdoTrn8&w4;;~f3;+NC diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock index 88a72feeaa0558096967e61445c7f3e02a3dc476..4f355e06ff61e162c6c3367db2a414eb3a9473a6 100644 GIT binary patch literal 17 VcmZRMJ9voc$)1Ye3}9gA0suWQ1$+Pi literal 39 rcmZRMJ9voc$)1Ye3}9f}!OXyLX~%v|&4c-G^&A*jP0TIL%^4T~51b4C diff --git a/.gradle/7.2/fileHashes/resourceHashesCache.bin b/.gradle/7.2/fileHashes/resourceHashesCache.bin index 408946e2729cbdeacc59b88f29a13a3d8c047700..a3ca2176d64008557ec47e4d712eabf7ee3fc9ee 100644 GIT binary patch delta 255 zcmX?pmi_!W_6;TyjPo{|O1u=|KQqZ{^U|{u7(jsWIrnB!-N%BA4>t?i=hreW-Q2im z0jmJ}$EI~rcjoPcsCjmLv*aN~X8t9|_;q*YT!L!U-E4SNP?F#Ch<@1PqvxS2Uv9R% z*UZY;IbE@uQMFm?$#$(LjB}YBjDgaUKr9Ht0*b-@C0`DEzOK|fs{jB1 delta 80 zcmV-W0I&bg&IiZM2e3340iClo80i$VHZ9r_1<3#b6Em0EMgbwS9zSAz0iv^kyr2cM mIl>tOvuec%8MBJsdIbSNmyvn_C71qs0Z4-?W3LvP0TIL%^4T~0gns> diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock index abb596067331f688d64c76da60aa7f0dc43e5c08..beb32b6cb4011a1453dca1a554fa376d9ea1abfb 100644 GIT binary patch literal 17 VcmZRM=KS+oU`6 Date: Sat, 28 Oct 2023 17:17:48 +0900 Subject: [PATCH 04/12] Revert "Revert "Revert "Refector: Post API""" This reverts commit c8f2320601c2afbf8a7d244366fb1e1c1104b423. --- .../dependencies-accessors.lock | Bin 17 -> 39 bytes .../7.2/executionHistory/executionHistory.bin | Bin 1489065 -> 1489065 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 39 bytes .gradle/7.2/fileHashes/fileHashes.bin | Bin 28797 -> 28797 bytes .gradle/7.2/fileHashes/fileHashes.lock | Bin 17 -> 39 bytes .../7.2/fileHashes/resourceHashesCache.bin | Bin 124751 -> 124615 bytes .../buildOutputCleanup.lock | Bin 17 -> 39 bytes .gradle/checksums/checksums.lock | Bin 17 -> 39 bytes .../example/just/Mapper/MemberMapperImpl.java | 2 +- .../example/just/Mapper/PostMapperImpl.java | 2 +- .../just/Controller/PostController.java | 1 + .../java/com/example/just/Dto/MemberDto.java | 4 ++++ .../com/example/just/Dto/NotificationDto.java | 1 + .../java/com/example/just/Dto/PostDto.java | 8 ++++++++ .../com/example/just/Mapper/PostMapper.java | 2 ++ .../com/example/just/Service/PostService.java | 1 + 16 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock index c659bc55d15a9dc18da375e430fda5da51390dcc..5684cc45b6461432c8ddc67ab7c20e0353cdcf35 100644 GIT binary patch literal 39 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 Nj@WG86l?z|`G1?F#MJ-* diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock index 6a9d7c2a4ea31922bb9e198977f687f424f3486f..af9764304389a7e7c07ad761985f86c0ddfc5f49 100644 GIT binary patch literal 39 rcmZQ>SH3p8Kj^qN0~oM>XJ%lyv}5_QDIzZ3R@DrwCgzsr<_rt~?>`F7 literal 17 VcmZQ>SH3p8Kj^qN0~oOX0su1K1oHp@ diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin index 579257a57933f1eacb80167ce527017e2590b3ab..ba3d2e4f73157da6085093ab229ba081afe475be 100644 GIT binary patch delta 1089 zcmZY7dq`7J90%}S@62*!t{J7JT?x{RZQzLL{eTKHt!Zj=>fFQvPe)NIvt85F$5?0`_L!ER%OC^;{p!KfD{R}^lM&M)xucp_$| z(fb1AlFmNV@pvbCx$EIcvx<^iKvuebmgK%9*N$jr>S&-D?24r;{A&E@#OFn=-xst_ z3oldGCGgou?s@1=XO-Qd_{P1AscR|jgOPh3`?wF$Ne&O-1L?6LGK0)RGPfSPxV2~} zho@kObXGx=$#i?MjC7vCHqtSKHttQlB7IviHjCch!6MSP8)aE~mE@~olV>gTB&=o) zu4d70t-urBCkG+xSYKx==8(Q>6qBCQXkr=!0sW*n27*biGAMq^wS-3WCToytieTTu zP-vo@798Vt;Wp`2VT5TAE<+zdc#ql4Yr;h#F<$<910WZX-17XN-D5TwZzAJ zGu0m(+dn@paPUnw1U-@mj_bz_a~zv!9GsNo(;_y9ijG1$cQ*Ftutj@T%Ka0}Fs5km zIEPI%D1cAYXQ&&KbIC5GaC=e7y@rllmOIoV=LQ!eHbYanF-dp$&9lVv9?S6ZhNMDy zJ_=FpGiEmPpJTH2wMV_|fXRRPYjs%p>D0M@GginMp*#Q2Xp-uz{=JTYr$3%G4cddD`F_{`5LeFOEb%z&H!}5KAmk_G$TB1h%t}aNNok z=qbcq((OjT%FeiV0jxF_`^E#LcOh=@IL7|Nc3#PL=oeZxuwNGBzze42{RCA}J`LP& zFD)8Siixfe7&lQ#E%tH8qmw%UA4t~;M3&G{^RcUhDt$qF2~?7+N?yJ49?I5ekYCCU gp{okpN@)~3+DciDqXJ_$TgOQ*+EdoTrn8&w4;;~f3;+NC delta 1095 zcmZA0Ye-XJ7zc1q%`WP;GbVY7N)uY9HoKU3shkz0r8T#-HE)w7YvvLuAu*|_K1f9T zyMkpFVOgQJq#!6n>_U=MW>l0Kr9`DfMy0IvKF{fs2hM(H@B94U_nc>Eo_@*GFSYcg zg&j)_8Tol2BDm$d>q^z-(f}VHsdo3uJ5zo5m^8!fP1C9-uju^i)@2@*_@ZG$lN8pP z*!`mJ?c)COm{*IY$MpwuPLwIR*;YtSJ@%OcC!5r-aMElPdhn3_ia+c)qO!!eMuj|5 z{Q<}LyC2$FU;M~&i1{|;Sd9KA?Gk0}z%@lXg&%nN!>D(=ZI&}r7F+hcODMA9`|ynKNWb%HG!DAnKHddAa#jw zl3EYWv47Fc<7*+=s2^j>TGAP`uhS#bCf3reN3o4EUYsUn6&|xjjI&O}Y@zWfC}5Lu zd<#T5UEh^M_Ttlg?kjwfq?0 zTE2RhzmSF+pe^8wOE49Lx+4lJB+=pJIP0KJcjF1W3Lb}e%VjGZMbx|=fVHBNedqpF zbVDU3`p~$I3fy?jK7xNqA?tOvuec%8MBJsdIbSNmyvn_C71qs0Z4-?t?i=hreW-Q2im z0jmJ}$EI~rcjoPcsCjmLv*aN~X8t9|_;q*YT!L!U-E4SNP?F#Ch<@1PqvxS2Uv9R% z*UZY;IbE@uQMFm?$#$(LjB}YBjDgaUKr9Ht0*b-@C0`DEzOK|fs{jB1 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index e13dd8d30638f60aa453a04af0e6f7a69bb68573..50b65c4962a89343439de8b1a6525bfe3dd818ba 100644 GIT binary patch literal 39 rcmZSXT9GqzmgxO@1~3q6XJ%lywBtATmzs#<>W3LvP0TIL%^4T~0gns> literal 17 VcmZSXT9GqzmgxO@1~3rn1pqc?1m^$% diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock index beb32b6cb4011a1453dca1a554fa376d9ea1abfb..abb596067331f688d64c76da60aa7f0dc43e5c08 100644 GIT binary patch literal 39 rcmZRM=KS+oU`6 Date: Sat, 28 Oct 2023 17:18:10 +0900 Subject: [PATCH 05/12] Revert "Revert "Revert "Revert "Refector: Post API"""" This reverts commit 10ae9db281566d6381dc957ab59ada07338eb25d. --- .../dependencies-accessors.lock | Bin 39 -> 17 bytes .../7.2/executionHistory/executionHistory.bin | Bin 1489065 -> 1489065 bytes .../executionHistory/executionHistory.lock | Bin 39 -> 17 bytes .gradle/7.2/fileHashes/fileHashes.bin | Bin 28797 -> 28797 bytes .gradle/7.2/fileHashes/fileHashes.lock | Bin 39 -> 17 bytes .../7.2/fileHashes/resourceHashesCache.bin | Bin 124615 -> 124751 bytes .../buildOutputCleanup.lock | Bin 39 -> 17 bytes .gradle/checksums/checksums.lock | Bin 39 -> 17 bytes .../example/just/Mapper/MemberMapperImpl.java | 2 +- .../example/just/Mapper/PostMapperImpl.java | 2 +- .../just/Controller/PostController.java | 1 - .../java/com/example/just/Dto/MemberDto.java | 4 ---- .../com/example/just/Dto/NotificationDto.java | 1 - .../java/com/example/just/Dto/PostDto.java | 8 -------- .../com/example/just/Mapper/PostMapper.java | 2 -- .../com/example/just/Service/PostService.java | 1 - 16 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock index 5684cc45b6461432c8ddc67ab7c20e0353cdcf35..c659bc55d15a9dc18da375e430fda5da51390dcc 100644 GIT binary patch literal 17 TcmZSnXl`G5^`fRV0~7!NGROn& literal 39 pcmZSnXl`G5^`fRV0~9bbFkIU4CE*!^uB`4vmxLKU_#kX?h&Pm%+Hv1**OwesjN=*H1i%yrQ)GdAQ zec#0GX2LT^!yDt7H|G3AC%87uCtIT%cG7p^SM3>X(G2YM-nAz#q~ubOI?=YMIzh%C z>4w%KUhj&$t)#7c|1iDi>ABM!xK=-X&g>g()Uvj?y4~E4f1pG^0%=;op@#gjjTKYM zTJ8F}Ryi(QhK@^3-4P#+yqxvv$SG&zhhv?)F{$4cH$QTTfo+$>Lh>)51>d%_Sd!;fvCZ>g<=m)>-F?c?HtL_Y9L0f0MnX51BTsP$Azo2D z8($^C;4(P@dj}y;&_QVvrSp^ugOHb`R`4~OV zh*$7_c(s}d5Oo;n8!l8cuAqxBz7c|)!3gypCf?v$1tA9&askzpR;bV-aEa0m6>`_9zq7x4#vkO2AP1LVK!J@k}=^a-vE|T06)Wu}W7>k-WI^n%)G8m3(_{A7> z0S5@;D{68nJv4k!O-_17Ngj&afbkfiuu$X*vZ!BbD2jvyLh#l9pcgny#i3B-2Pf!> z*lQdv0+Td4eg%pV)y@pMDU6Z3pOL54d}0my9MAYH?y8TMj+W4}4qBR@(*y&oQz;8NxLE3HOR zD#pVptPgAy!lhGWlYg4YGzB$)r^%C_7Z&;yW z7T`Sc8C255Wg6rl@4ekJt~-&D?K#?&C++)cewE`&retjx|eOQ)HuW!PR9Nw8FF_eRfamgmLlY>fGHj$p3%^F;)AGfJgFW0vQl>SB} z7nR8v*q7zz*{{y|vwtX;NR3}AOkIxkCBMv%J{XvBu#re_Z8D@iux=;_(IuI6w3qgS z(v;La+f#PpdPej;PXCk`=DHaiv5|a_LA!bX= Nj@WG86l?z|`G1?F#MJ-* delta 1581 zcmXAo4NO!=5XXJT?r|LGKE6d!2(1WG4i6#)l=FZCIT2K}rWy^UhzdoyYB{5+737Hu zRYcJ>@?oJdmL{}VwGYALLrg7T3x3xqpjcEu!9$2eKGNC8C6oN_KQp^CJM${c8!F5j zG6hbM2^Inpupk#K1%+TGCY~Pczch}xzqhVW0%I=KRq#a)y zG7=M~Nk6OiV%ZvQ+(I0?kFJ}=)aj(vLEQKlhsi~w7xA;^XY^E(>>|$OZ2ewQd1vWC zS{5&}r&Vnh4&svlavt%9SyinK*X-6M^yc4k>R47y3xdd5eq(QYI{(OcbZ7ng8ja1H zEDB}X(}ri*mbwQME1ExqgL(Dt$nE#LLN&v4{uw!R@a{%>F_?t%^Ey20Hs$+o8GP7x zwV*vckv24;EhnqCBAWjWM=6iK%&rjCJ(e7$7j5NE^zRU2hYOfUZH95YJojJbr)9}9 zZ+Y<)wXunml-`g0?OpzKRol?5@*}v=Nfg@mCPx7fO7QiP0B~@)#9_ z5|wfQvP5-}D_2Bsw_``z8A_a$*T5~Rf4AjIC>LkxN@r_`9l8dUQniMBf~vCNrbG>i zM&{?BRcgpbmcu}z`ZDEGWFF{Q2gnl|;*b7d6tI+htY`re)nXuB9ma*of9zuaXh9g~ zg?<92txJgqy4eY2hG>-659FdHo@fM`p%Gd#4^1*k(-I$)!@NaWxb}(E>U}zxDsw{u zJLr{`Xym_59X~gM^Hh#KWmmP>b7dzR65Q#xVKA8IOrvlA!=C5`AT@=-qcpMffiSqK zpOJGo@kYZ>fOO%+3yCbw5Kf}8@Qfulj$##JNC(47Ag0oZstFT-TSf?y!`RYj-S4bO=!xHZw$9Cufn^8d|S%9(*z>Ml6i3%Ob0WwEI3*%WpbE05^ z$CwryMONV3tVF7vfM%N5Fx#VupS)(OZd1C@R^rG?RFW=s5|$W@y?fA-I1)u>Aq z)SNC`h;K;g{3I-C`_xI3SdUEXr2b_jK+)UFqI2}L${_PZrEG$$qM-nhEnsFey!8d9 zRYa2oiaKfQaxLf&(VP=~I*EBj3;PDtkJnOnqs*DQ>j|%zkQTPum##F*RPst`{#32! z+-M%SQ4Tx!oSwKiCw=Lb;N>;E&i2)rU;FMP4cwLz+i05}o~NIEEE7OmFG&@ivb31S z5B?eB;?V4R$^e)CPBaS-d)!Wcx%Sj0`H9>WLG0=7+qt9bt z)oU4L#z0XGjDCrM4?$#fFNOp;Sf=S!-*-Rs-)Tx1iaMoF&d!9w-B*y=``327vyD8w zezfLw&WxSqaUnOsBdW(7Sc$LC$1TZkv)X4X9?y8t+zOJhHYu+E-oEVXG0Ir+G@l02 zT~pMaar5SNi@xhXrFA#rL3)>8*za=B(J+5)@$l+Gs{xRz^6Wwa7lx%8i>!T`)2SH3p8Kj^qN0~oOX0su1K1oHp@ literal 39 rcmZQ>SH3p8Kj^qN0~oM>XJ%lyv}5_QDIzZ3R@DrwCgzsr<_rt~?>`F7 diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin index ba3d2e4f73157da6085093ab229ba081afe475be..579257a57933f1eacb80167ce527017e2590b3ab 100644 GIT binary patch delta 1095 zcmZA0Ye-XJ7zc1q%`WP;GbVY7N)uY9HoKU3shkz0r8T#-HE)w7YvvLuAu*|_K1f9T zyMkpFVOgQJq#!6n>_U=MW>l0Kr9`DfMy0IvKF{fs2hM(H@B94U_nc>Eo_@*GFSYcg zg&j)_8Tol2BDm$d>q^z-(f}VHsdo3uJ5zo5m^8!fP1C9-uju^i)@2@*_@ZG$lN8pP z*!`mJ?c)COm{*IY$MpwuPLwIR*;YtSJ@%OcC!5r-aMElPdhn3_ia+c)qO!!eMuj|5 z{Q<}LyC2$FU;M~&i1{|;Sd9KA?Gk0}z%@lXg&%nN!>D(=ZI&}r7F+hcODMA9`|ynKNWb%HG!DAnKHddAa#jw zl3EYWv47Fc<7*+=s2^j>TGAP`uhS#bCf3reN3o4EUYsUn6&|xjjI&O}Y@zWfC}5Lu zd<#T5UEh^M_Ttlg?kjwfq?0 zTE2RhzmSF+pe^8wOE49Lx+4lJB+=pJIP0KJcjF1W3Lb}e%VjGZMbx|=fVHBNedqpF zbVDU3`p~$I3fy?jK7xNqA?fFQvPe)NIvt85F$5?0`_L!ER%OC^;{p!KfD{R}^lM&M)xucp_$| z(fb1AlFmNV@pvbCx$EIcvx<^iKvuebmgK%9*N$jr>S&-D?24r;{A&E@#OFn=-xst_ z3oldGCGgou?s@1=XO-Qd_{P1AscR|jgOPh3`?wF$Ne&O-1L?6LGK0)RGPfSPxV2~} zho@kObXGx=$#i?MjC7vCHqtSKHttQlB7IviHjCch!6MSP8)aE~mE@~olV>gTB&=o) zu4d70t-urBCkG+xSYKx==8(Q>6qBCQXkr=!0sW*n27*biGAMq^wS-3WCToytieTTu zP-vo@798Vt;Wp`2VT5TAE<+zdc#ql4Yr;h#F<$<910WZX-17XN-D5TwZzAJ zGu0m(+dn@paPUnw1U-@mj_bz_a~zv!9GsNo(;_y9ijG1$cQ*Ftutj@T%Ka0}Fs5km zIEPI%D1cAYXQ&&KbIC5GaC=e7y@rllmOIoV=LQ!eHbYanF-dp$&9lVv9?S6ZhNMDy zJ_=FpGiEmPpJTH2wMV_|fXRRPYjs%p>D0M@GginMp*#Q2Xp-uz{=JTYr$3%G4cddD`F_{`5LeFOEb%z&H!}5KAmk_G$TB1h%t}aNNok z=qbcq((OjT%FeiV0jxF_`^E#LcOh=@IL7|Nc3#PL=oeZxuwNGBzze42{RCA}J`LP& zFD)8Siixfe7&lQ#E%tH8qmw%UA4t~;M3&G{^RcUhDt$qF2~?7+N?yJ49?I5ekYCCU gp{okpN@)~3+DciDqXJ_$TgOQ*+EdoTrn8&w4;;~f3;+NC diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock index 88a72feeaa0558096967e61445c7f3e02a3dc476..4f355e06ff61e162c6c3367db2a414eb3a9473a6 100644 GIT binary patch literal 17 VcmZRMJ9voc$)1Ye3}9gA0suWQ1$+Pi literal 39 rcmZRMJ9voc$)1Ye3}9f}!OXyLX~%v|&4c-G^&A*jP0TIL%^4T~51b4C diff --git a/.gradle/7.2/fileHashes/resourceHashesCache.bin b/.gradle/7.2/fileHashes/resourceHashesCache.bin index 408946e2729cbdeacc59b88f29a13a3d8c047700..a3ca2176d64008557ec47e4d712eabf7ee3fc9ee 100644 GIT binary patch delta 255 zcmX?pmi_!W_6;TyjPo{|O1u=|KQqZ{^U|{u7(jsWIrnB!-N%BA4>t?i=hreW-Q2im z0jmJ}$EI~rcjoPcsCjmLv*aN~X8t9|_;q*YT!L!U-E4SNP?F#Ch<@1PqvxS2Uv9R% z*UZY;IbE@uQMFm?$#$(LjB}YBjDgaUKr9Ht0*b-@C0`DEzOK|fs{jB1 delta 80 zcmV-W0I&bg&IiZM2e3340iClo80i$VHZ9r_1<3#b6Em0EMgbwS9zSAz0iv^kyr2cM mIl>tOvuec%8MBJsdIbSNmyvn_C71qs0Z4-?W3LvP0TIL%^4T~0gns> diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock index abb596067331f688d64c76da60aa7f0dc43e5c08..beb32b6cb4011a1453dca1a554fa376d9ea1abfb 100644 GIT binary patch literal 17 VcmZRM=KS+oU`6 Date: Sat, 28 Oct 2023 17:23:51 +0900 Subject: [PATCH 06/12] Revert "Refector: Post API" This reverts commit 612337bb0a0e991474866605450d3fb02818b8a2. --- src/main/java/com/example/just/Impl/MySliceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/example/just/Impl/MySliceImpl.java b/src/main/java/com/example/just/Impl/MySliceImpl.java index 66b140bd..4e5d240c 100644 --- a/src/main/java/com/example/just/Impl/MySliceImpl.java +++ b/src/main/java/com/example/just/Impl/MySliceImpl.java @@ -1,12 +1,10 @@ package com.example.just.Impl; -import lombok.Getter; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.SliceImpl; import java.util.List; -@Getter public class MySliceImpl extends SliceImpl { private String nextCursor; From c8a5285ce8186e49cac3b72cd43435abfcbaaebd Mon Sep 17 00:00:00 2001 From: sleeg00 Date: Sat, 28 Oct 2023 17:24:06 +0900 Subject: [PATCH 07/12] Revert "Server Test" This reverts commit 1ec6817c6c8572162eca0bc12817521e35bc06f7. --- appspec.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appspec.yml b/appspec.yml index 9882a4f0..f64f09c2 100644 --- a/appspec.yml +++ b/appspec.yml @@ -3,21 +3,21 @@ os: linux files: - source: / - destination: /home/ubuntu/app + destination: /home/ec2-user/app overwrite: yes permissions: - object: / pattern: "**" - owner: ubuntu - group: ubuntu + owner: ec2-user + group: ec2-user hooks: AfterInstall: - location: scripts/stop.sh timeout: 60 - runas: ubuntu + runas: ec2-user ApplicationStart: - location: scripts/start.sh timeout: 60 - runas: ubuntu \ No newline at end of file + runas: ec2-user From 81843a1c69655ec24fa80c91c959d33f6041c86b Mon Sep 17 00:00:00 2001 From: sleeg00 Date: Sat, 28 Oct 2023 18:04:46 +0900 Subject: [PATCH 08/12] Refector: Post API --- .../com/example/just/Dto/PostPostDto.java | 49 +++++++++++++++++ .../java/com/example/just/Dto/PutPostDto.java | 54 +++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 src/main/java/com/example/just/Dto/PostPostDto.java create mode 100644 src/main/java/com/example/just/Dto/PutPostDto.java diff --git a/src/main/java/com/example/just/Dto/PostPostDto.java b/src/main/java/com/example/just/Dto/PostPostDto.java new file mode 100644 index 00000000..a4d00c81 --- /dev/null +++ b/src/main/java/com/example/just/Dto/PostPostDto.java @@ -0,0 +1,49 @@ +package com.example.just.Dto; + +import com.example.just.Dao.Comment; +import com.example.just.Dao.Member; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor + +public class PostPostDto { + private String post_content; //글 내용 + + private String post_tag; //글 태그 + + private Long post_picture; + + @JsonIgnore + private Timestamp post_create_time; //글 생성 시간 + + private boolean secret; //글 공개 여부 + + + private String emoticon; //글 이모티콘 + + + private String post_category; //글 카테고리 + + @JsonIgnore + private List likedMembers = new ArrayList<>(); + + @JsonIgnore // Swagger에 postDto만 넘기려고 + private Member member; //글을쓴 Member_id + + @JsonIgnore + private List comments; + + + public boolean getSecret() { + return this.secret; + } +} diff --git a/src/main/java/com/example/just/Dto/PutPostDto.java b/src/main/java/com/example/just/Dto/PutPostDto.java new file mode 100644 index 00000000..3f138cce --- /dev/null +++ b/src/main/java/com/example/just/Dto/PutPostDto.java @@ -0,0 +1,54 @@ +package com.example.just.Dto; + +import com.example.just.Dao.Comment; +import com.example.just.Dao.Member; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.List; + +/* +// + */ +@Getter +@Setter +@NoArgsConstructor + +public class PutPostDto { + private Long post_id; + + private String post_content; //글 내용 + + private String post_tag; //글 태그 + + private Long post_picture; + + @JsonIgnore + private Timestamp post_create_time; //글 생성 시간 + + private boolean secret; //글 공개 여부 + + + private String emoticon; //글 이모티콘 + + + private String post_category; //글 카테고리 + + @JsonIgnore + private List likedMembers = new ArrayList<>(); + + @JsonIgnore // Swagger에 postDto만 넘기려고 + private Member member; //글을쓴 Member_id + + @JsonIgnore + private List comments; + + + public boolean getSecret() { + return this.secret; + } +} From 90073b54c10d0429c5cd00f3702890dcb3304f93 Mon Sep 17 00:00:00 2001 From: sleeg00 Date: Sat, 28 Oct 2023 18:09:56 +0900 Subject: [PATCH 09/12] Refector: Post API --- .../dependencies-accessors.lock | Bin 17 -> 39 bytes .../7.2/executionHistory/executionHistory.bin | Bin 1489065 -> 1489065 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 39 bytes .gradle/7.2/fileHashes/fileHashes.bin | Bin 28797 -> 28797 bytes .gradle/7.2/fileHashes/fileHashes.lock | Bin 17 -> 39 bytes .../7.2/fileHashes/resourceHashesCache.bin | Bin 124751 -> 125193 bytes .../buildOutputCleanup.lock | Bin 17 -> 39 bytes .gradle/checksums/checksums.lock | Bin 17 -> 39 bytes .../example/just/Mapper/MemberMapperImpl.java | 2 +- .../example/just/Mapper/PostMapperImpl.java | 2 +- .../com/example/just/Service/PostService.java | 6 ------ 11 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock index c659bc55d15a9dc18da375e430fda5da51390dcc..b85d45d076801629e1587aefd5c5445ebd1730fa 100644 GIT binary patch literal 39 pcmZSnXl`G5^`fRV0~9bbFx*^{nc_R+`~;5Q46GLB#+D`w3;^H{3YGu> literal 17 TcmZSnXl`G5^`fRV0~7!NGROn& diff --git a/.gradle/7.2/executionHistory/executionHistory.bin b/.gradle/7.2/executionHistory/executionHistory.bin index bd6e4964f9472c19c62fec0426509887f3a01904..98a438f83bebe662ffdaf370e3781ef6614c9be8 100644 GIT binary patch delta 1472 zcmaiyYfw{16vvaBdwB%tUL+6!K_1eINHDwL8P1$ih)FbIvY zB7$8Nc|??=Lme#0rP^RnoT+FDVi7Q4M0_B`F<`6|#CB7@`K3GaoB7}WIp?0;vwLA8 z{=!7OxRBnAo!sZ*?~|ICvCG#xNtog-6!|9a6C?^nsY%``3ADN8LtWj6*6KEFXIF1*4et)5h#zvib*;{rxk53J8ysX8nY|U z`UGtE2P~+pW}3m9j$oRU2RP=-%;WguwYNelOCuyOt;dWF8x{gU*$og96H(#fDi+Wy;Jt3b8a@gHZ05UxT4c6Z(kmf- zo$&%_9|XL;r8#>3PrMA)nhz;%(dluIPd_vyUG`wm$lF#H7pr=vpTq~yUfH;|1knmZ z6GZe=P<|MjPr)GY0<+$u+5Pg!p4XpFkMDIqrpU={?L*a2H$~X6o=z5Z%(r;2su`}! zF28rYyA6e)Vl{9G6m~ewiPD?1bM#rZH(fF>10S;cNL24ol zEXLm&JO>_FikBmgispf4%w+t(@u@dKr%a3uogx5f@)C`n;Tr18NNb8M{Ic}R_h;S>ez^W*)xaU)cVgWKZt-@QtmhgXTxGIooEu$69f66Wp2 w64>hPdH2Jy&x2d~eX|SH&ujFCYvNuh?u-Tq5@Cs$hpzO0D&8P>H976GidK{E;2P^?tI4IHi&aOg#tLJN;bCkr zD5C|s>p5d27eex z*B99Z%<~FPR%&eA|4eCAq6=+cb9sFtKzrX&5ln3WbRfY!U0w~kvIt%Tb(L6^1wv0= z1NIoP#*xsV>)q4@bT<$Rc|G`;5jXJ(Eh3g%I-)6yp|^M3$u*wWn#;80Z*Z>)cAR5{>n%b{EI9iJHer+b$x8dq9o&|*$rSe$}5gminzNeo&HpOL6N|8hqP=jh1R%CO~A18 zrWhOd!*#YTpt_x-R} zs)pv*LE-`ZvX-m^vE+1Y{W{V5`0n8#`K<)e9fK^L?a^yn8t?wCpW=Ny-5OU_u9c(G zNT>x}A9HKaTq*ntm|3+}3TJ?8tjdwXIiQzSwNmH`jI8RF!UgupA-*08rHgD ziB0J*#?`tkgHy5t>$Dyoy+NmIyx#m$9Z%k^C}Ah^-X1@0Qu8#G;Mgc{Bd6+(4?iDU z4^FDz_$o*3^uddi?EyzGW6Lebs9X3{JzMlVxZuX~zxQCPK-IEb>glX1exNSpm*tKUB`y&AI$ncF5i eSH)IxyTBL)F*JscvBL;3_LvEbF>2zySH3p8Kj^qN0~l~HGcz#UTw-M3worGW>jVZ?3v**j69xtV)m#b8 literal 17 VcmZQ>SH3p8Kj^qN0~oOX0su1K1oHp@ diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin index 579257a57933f1eacb80167ce527017e2590b3ab..ec797b5782f1b73c6ee7c0beb575b9d5964ddff8 100644 GIT binary patch delta 1630 zcmaJ>4NOy46sEkAAt5dvmYBcM!VKh9P5`tIc|vSc@T?|eDue&0Fw zid$!{_TA0$4+25P0x0Uv^Tz{iT^z)AK#%3=s9vk#x7qN#iv9B?| zXyyy^e1YkEMIS$2PUv0V=ODH?vqPR`@XKK=Es{;319uu3`puSCbVn0i4N>Mc5iPkK z@$7c*yRd^2K)PfduE``3vB(S{kqO`5NuS?1`!p-oZoR2q{?g2nPo8dv5E%(U=>nW5 zIvtS=putEFXE@(A&i9b>MMy}Zk!yIs{x4|@ikD1krp~Q-?W?zeQ|gF-2|$<>0rv~ zD`lsWTX55GwO)_lrHqvxCublrJ=i$Zf)NE17^%TO6YW#Ob`F(flA*3Dzxkmb^QUjN z|8VT9)Xy*AR2tNnfIp!vlV;m&gv2Z)VFZPhgkxFgJO-%a{6idC=1`o141Kq7O?{g? z=H*XEri|_7yOP)>j;45&WTO~(g#xHj!5Ok*K6PCVtDb6VNZM@;{KEIH#y9Y%d^g_RekyyA4Ia-syV}1^$iP3;UE`U+3C(S;% zrxg>&bCj?_=dl#XS*wI2*mmp0N0>O``V=yD)%A^REx0`#9wvS6sO5R@*-OlwW;#rF zOd-aa#Q!qX@!wX=w|-cgRmVRY(MpLiLx&iCm8%)yVS$tS!(*x5NpF2JzRg}ed8ZLk zx|Uc9@27aE)}#5&gDZM8RA%NmVsBa=1Q^KB{?z7Os^XyzNlN4W`dZ=uQfN@2q`qTV zfp+e}3bZp9DbP;pe-xbmDg+r(4SGm2;yZ3N8rWG^!-#R^x)3IW3=ofz(Pc4xzacMnjJP delta 1614 zcmZ`(4NOy46y{M12to@TvpfVk93YOiFm)y{HVP!Pv=my9pYcXuws-S zMO+RBCdiKr+o1wYmx*DUZn|t5oI$Ka8xclib1)|XwgD;KeeYHhNp_R>&X;@6_nmX^ zJ@=X?3G*Z|_^z0F)LcEY6&_}j%HIZv?B#QFC+3!7ma<1)^RTfYD5tj#Js9Q42zH`h z5c*!BKK3P6^3~s;R)&53lT$^9yXiDy)Fv)=_97=5%sLno`_l=$!7L_uf65vIoXVC1 zci4aKH$VNUI~5-Ah9lr`Mh%G4I1ndsx7L&^;WKL$b-Zr?Br;x8nCD+hHQTs@^J-mX zZ_#E%K34knkOL;$z6=)0^ISo3d|JX6G7xI0YUEp>aeeLzLR6LKV1C`ZP0Dwn*6M3j zI|%cc95^6#N9?wceyEjVoqyo6RA5)qbEF1l(G*1?!CQs}b&x&>%!5UIPO{ zc#j`jkr!f+5E{>+Bg`O)$FXLpLDv^XDQ zd7-^W{l4%1eK8f=8@^1ar?*cFdlIpP78J!K98RRyBd~!sYMwr~Th<62SSaM`peln< z1`;4?n&;8NqmxlDC9tuVjs7zzvkA;VOi8nqq>9)t&64uMJ{u& ztdMcLS{Ej?o;Mda6BE;e8mBJobhU#lCCQav*TrfC&zg>?9sFO-Tb#Ete}yKcj2k)W zsrlrA>G*sOjuA3axZKt*Jrud&G=jh3A{Iy#I`yY4Z}%pOooWH2Dj6M z43V1{h;*T|h_zxpg;w}p$^m)$OUNgK_tJqOVhdq4o#f_TOcnex^w}BPQ>>;6*3Xx* zBD>JQf9GR@`*`%)N@08TQU2n+W9*pD9sg|W=94n;yG|9 z6QyB~!IMlOBhn%VuPn;OK|F0!pqjSHpwAMjBP|J-%Pd58!xjD@YFDtjjHldQ5L4@R zDYFP?w?~#5oA#jJ21dldnc(2Nkze(NJgwB`*-ls)oixG5sS>)y9N#$SW=qQIlyTPL z7$v->#4(&V=@{ZcI%u+S!}`JbY}~MZ=nXY26T$R&1`TDH`El%B( zLdjIH0cUYEB85Okct;oF3u*h1w%z|rE)DPKStq;Y_%j=7jN2n1JO?E`O}apFjtWiP ztd57#9Mr3!J|iu_$VF(&`@6{M=q9-QL6CmXF-%CFy}^3Za%ChSGf0 z8|+7*rL6((=c}01Bi9V-0uoXSJW#P`4eA0t!-b;ia7hde=u#R&>L9fUOY5MX zLg*z3gyAA2g*ab;Z?TYpuD?N197LdONpNUCl~oS|`=8e_MIoBTQD3(!SvBnilUkOt zclM+ovsuoE*0zrduAWCbf|`w|y^G7R6Ck_cxStib#6597-kc}#o#Tjq=*LItN??X- H0LAzZ4+Tmj diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock index 4f355e06ff61e162c6c3367db2a414eb3a9473a6..a20f8d490b382533e906942c5bd63daed2d142eb 100644 GIT binary patch literal 39 scmZRMJ9voc$)1Ye3}9e)jhTVr=8|JCr)Y~hF1gLXYGH0{X~Mt&03Oy1r18Ur2ABtDnIpu>N6=@ENyEFNo;# zpPT=h3UM;23vPC_x36Vfxw&!ALOy=Kt#Tb-r)5IbY~3t*x{;ILmh&{fbhs&0aPsDf zS1MWg=ROrHwWI^%*yz3`pIfWmCc<`c6c$) z-R`8%c!E*j@VlwI&R0#J1U2*eb|yo{L{@$#|1Fhg{~U(uU%WlajImmt@#IED56;j2pM#O=Ps>;&)Fpn|A5G6jZqxTLJfUkyM1mB<3v{eCB3ba zU2G>q4L!PDwTQ8hg@5zxGpqlIi$F!=xA&GYM)L9}_m+t-Sa1kxY~f_XmkQheHZyXw zF|ORGn87|B=m@^;-zPFgggO`l6-ffIAP5UgWlc-nCmixYX`x9OLy6`Rpr9P83c2!q zk3!~r;hO$wuWZeV^JgX}b_v(J>owQ^Zq{e7yS?M@vY^M9x)_;1yvYxnyi|J8Zmx5+ zqM$fMGk2k-TzxlBc*N_)N1f+R^lZkWqRw6~EAh1GYuV(*dWvTP5Go{K&fi;qF5!S; ziR%41Pc^e5D&!|0%oDCxJ@s^F@)5mrx7zL>65zB$XoKlemp_zRqcz3fXx{>zO+GcU zm@1^Et(2VLW8ulNM!`d1WxpS$iZY89MTfh8S1x2tNJ@ON=qEx2+;N-VyqK>n*U+gb j`S7}-=t7O@i6V@`!Vxd}KQ3ANrPSw@zw-2&1du)enpW(g delta 182 zcmV;n07?Ie(g)AZ2e3340iLrp7;qP}y)R$}vo$sf2?i$N009dbmx4zDIkQebGJOH1 zvw^&!4zoJTcnP!0)Nlo}Qrb`iv%21@1p$edfqMZZm%e)eFqa;D0WY(O00TY@DF6Tf literal 17 VcmZSXT9GqzmgxO@1~3rn1pqc?1m^$% diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock index beb32b6cb4011a1453dca1a554fa376d9ea1abfb..5a3a46862f615016a0d35d9b65f57e704513c442 100644 GIT binary patch literal 39 rcmZRM=KS+oU`6>>>>>> parent of 3c9dc9f (Refector: Post API) public ResponsePost putPost(Long member_id, PutPostDto postDto) { Long post_id = postDto.getPost_id(); System.out.println(post_id); @@ -154,10 +151,7 @@ public ResponseGetPost searchByCursor(String cursor, Long limit, Long member_id) ResponseGetPost responseGetPost = new ResponseGetPost( new MySliceImpl<>(results, PageRequest.of(0, Math.toIntExact(limit)), hasNext, nextCursor), false); return responseGetPost; -<<<<<<< HEAD -======= ->>>>>>> parent of 3c9dc9f (Refector: Post API) } /* public Slice searchByMyPost(Long limit, Long member_id) { From da2f7053b0a77f8c6ee14253bb3165f0f1d9d4d3 Mon Sep 17 00:00:00 2001 From: sleeg00 Date: Sat, 28 Oct 2023 18:29:02 +0900 Subject: [PATCH 10/12] Refector: Post API --- appspec.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appspec.yml b/appspec.yml index f64f09c2..9882a4f0 100644 --- a/appspec.yml +++ b/appspec.yml @@ -3,21 +3,21 @@ os: linux files: - source: / - destination: /home/ec2-user/app + destination: /home/ubuntu/app overwrite: yes permissions: - object: / pattern: "**" - owner: ec2-user - group: ec2-user + owner: ubuntu + group: ubuntu hooks: AfterInstall: - location: scripts/stop.sh timeout: 60 - runas: ec2-user + runas: ubuntu ApplicationStart: - location: scripts/start.sh timeout: 60 - runas: ec2-user + runas: ubuntu \ No newline at end of file From 24bf7024713db7c9b77e5da625d1dd9d614c5d47 Mon Sep 17 00:00:00 2001 From: sleeg00 Date: Sat, 28 Oct 2023 18:35:08 +0900 Subject: [PATCH 11/12] Refector: Kakao API --- src/main/java/com/example/just/Service/KakaoService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/just/Service/KakaoService.java b/src/main/java/com/example/just/Service/KakaoService.java index a7a12bd1..4fa97b12 100644 --- a/src/main/java/com/example/just/Service/KakaoService.java +++ b/src/main/java/com/example/just/Service/KakaoService.java @@ -160,7 +160,7 @@ public String getToken(String code) throws IOException{ StringBuilder sb = new StringBuilder(); sb.append("grant_type=authorization_code"); sb.append("&client_id=55ec14b78e17e978a4a3b64971060784"); - sb.append("&redirect_uri=http://43.201.174.163:8080/api/kakao/access_token"); + sb.append("&redirect_uri=http://52.78.80.150:9000/api/kakao/access_token"); sb.append("&code=" + code); bw.write(sb.toString()); From 65928145dcff5a9c714316f8fff0b3f45bbe9116 Mon Sep 17 00:00:00 2001 From: sleeg00 Date: Sat, 28 Oct 2023 18:49:43 +0900 Subject: [PATCH 12/12] Refector: Comment API --- .../dependencies-accessors.lock | Bin 39 -> 39 bytes .../7.2/executionHistory/executionHistory.bin | Bin 1489065 -> 1489065 bytes .../executionHistory/executionHistory.lock | Bin 39 -> 39 bytes .gradle/7.2/fileHashes/fileHashes.bin | Bin 28797 -> 28797 bytes .gradle/7.2/fileHashes/fileHashes.lock | Bin 39 -> 39 bytes .../7.2/fileHashes/resourceHashesCache.bin | Bin 125193 -> 125567 bytes .../buildOutputCleanup.lock | Bin 39 -> 39 bytes .gradle/checksums/checksums.lock | Bin 39 -> 39 bytes .../example/just/Mapper/MemberMapperImpl.java | 2 +- .../example/just/Mapper/PostMapperImpl.java | 2 +- .../just/Controller/CommentController.java | 10 +++++++++- .../java/com/example/just/Dto/CommentDto.java | 14 -------------- .../example/just/Service/CommentService.java | 5 ++++- 13 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock index b85d45d076801629e1587aefd5c5445ebd1730fa..d592123327be846aa768a97f15f66172728a9e71 100644 GIT binary patch delta 22 dcmY#apCBd}|1$95mgDZ646GLB#+D`w3;q diff --git a/.gradle/7.2/executionHistory/executionHistory.bin b/.gradle/7.2/executionHistory/executionHistory.bin index 98a438f83bebe662ffdaf370e3781ef6614c9be8..26068a694f4dce7e9a174ec9c3c9f9a92f7fdb5c 100644 GIT binary patch delta 1211 zcmZ9JdoY|=7{>SeeCy8n*8N(GBz13GRw~UJw{@#aRMNDmp+sCZtQFZ!7zv9EK^eB3 zwHXqb*(j=2gb`5^iEKkFE{O<5lGVv%8dT59e>pS1nRA|V-uJxEJk5&Z&5Gms zMOZg3$+0;dFG%5MoJvd=CS(fvg2ZHxoGezx$!yP5+J~h}-ORyFaZ(=lM9$a!>bbjf zr$sx|Y^0v&;`u5hLm^Hp&(o{><9egOcI0Fmd=rVqh$n;uoXp4djX$oMTbH#_u5!4Y zk2?@g(E&P&aBE^lxjQVv9f?`xE>DC96UwLXcM8$t%Zrsgd`kRBQFg|N@>$h&Tz{ko;c{65Qq@eLa0VxLR^rEz#7wYE%W zV`OO8&DMUdQ%q4ZYsta)?Ryx-RyD8A(xDEzf*>_gZYyA=T*^8ccmGox+z9i8Ri6VX z=^-omt0FhTcdboS>hO5h6=FrWJ{(w}Ga%CoXu!%1x);flmD$RUS(X;QYU*5Y>q>{6 zUVu$%IUc1V+oQ*p_Gnq1?e<@X1A|18xFeZ>mH*HKsb3C)T8s|=MoB^bTe=xMaR?+5 zQ$@E?9EZSRGs)|)RO?qIEesEVeBkbZ(8qfluO;LoM28yAMM=X+OT zX+;6?8CV@`EX7SI=nYzNvw*T&;9nbtjz;EysbFVw_QtZZ&kvedqj(^WN#**2S&Xz= z_cBt?nn?SZwRmH&N~D0i_jDF@#UEJUgbWP}f8zibVo_;G!2x!}HKk@52%Lx&<*ea> zzzR2ke$lRSURb$h*G|AWW|RB1T^qyJuqYU$n>0#tCWVjm-F%)tda)j$`F;7WpXnoz zDa4H-GX#+8le-1I&M;DlyTGInFc$N=Kv+LrQQhgj;7B__NcvQ0!vQGKC6AQdQx5s-92SBk&wE}gC_ zQ0B5}fO@TsOi@~q;jzOnr$%|U-#8CxF;xjX yFTmrCUn>3^^ck1h7wF{3jrK;8y%&{}^c0VV0|bd+AoLLW2m^#6H5zU-$Ne8OMh2o-KaYnWnk~98j9CDqr#wPc*stQ-9sULkEwCi!r7W4@xNj6rS zK0C8;FlHv+9T)Dwj0V`@{wY?Br9sFBSO3liafhFj7(8Y}K=rW(n28g(U}qVMm3(g}YHz%?bYBs~n{#yUmhm*(QgfKoSX&8J5iCQW1N{DbfD=}J zYI#g&$7pN&cS}iO7@AgT#99AJdqI3JZNTw)zz1hUqaRXCVW&fS@J@YAMAfv@q5Nb%kBfe_ zLUm%`DcksHbJ0%c{PR>j4Aiq%MwdMk`v#2v7{0wjRhPK3vo$F{X>jW=W98(+I8}X7 zz5H8Zb918hC$BEAmPvB#byUpQd$eW!Jm}{7hTur1EtqL?HRx$U(ir4iq6oZsc($#j zI-wpOcW+DHXt-<1Z`q#SHMpa5$Sjavt?QGD>Uwo=Q|0_l3>q&Mddka!@8?aq$5Ca@ zoyfSlTCZ!{?tORjrlgxxy>w#!_};=db${#<23sjAc2iZc)@^w3W0CquO47oIb6G24 zV@~dYcXO2Z5@U4=7aatt68)~Ckx1~$*6z`OLu&nl<^@ZueZMT%#Uctv5mQ!D>?rmW L2cnC0oXq|g?rPTG diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock index 3b90b28a7b7886ae55ad5d360d63c1273e29c522..9befa99e0e1ab2ad3decf6400a18cc80064d21cb 100644 GIT binary patch literal 39 rcmZQ>SH3p8Kj^qN0~m1dFf%aRTq0I>AxE0y`5p#V3v**j69xtV*~bbf literal 39 rcmZQ>SH3p8Kj^qN0~l~HGcz#UTw-M3worGW>jVZ?3v**j69xtV)m#b8 diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin index ec797b5782f1b73c6ee7c0beb575b9d5964ddff8..a31c66776fbcd2e55bdb78f42303dd6acc0af5cf 100644 GIT binary patch delta 729 zcmezSfbs7G#tojH3N6xGJa3qvUU#l5&~0t`jFk)wjNPRxlPnp)fN8?yOwVrSxp^xl z%lb%d7W8ssRp3puS+nI&mDQFP*+L%H%`?C{Ry2!3bg-#yF8AkQ47#)A^P0zh#l-d) z&D;3M_k9dl)!H}PAgVaG0%<*CAfXAwiXbfTq}Tn}s{gJB&b%}1m~(vDBCw7{-<5!p zK%km6`D#EnH_#;zzMTGK#%$rub%EN93NGEd`F|=2@^Tg)kSzWG`yRv(C8iLSth}2~ z21zq9uPhbc{5<3-GxPe!rIXJ`=rgZxN}0?Usn5N>5oi|(FwU5K&|7%2U!(|7E^~5f z6lWj47nZiT|t`0G~- z_<|lA>u!`;Kb>nKSXJk5Xs~l!1u9Z!URic$^6EH!Abof8T`+xbGJm`jcFilx?n4~K zadop`!en-!uOlWePX|Sn`sADG!00Huzd1jHn++H*=Qr2pMKc1E=JLt6^Ao{I)V{zD E05v`Kg#Z8m delta 729 zcmezSfbs7G#tojH3S}?ta;6=7BHFaWW9PAZMjIFy7`sbbf@2uKfF)&ere`;ETi2S& zvOZFq1-;x@6=KBPa(m2wJV{rNa4q5!tAOf=g6Los*<9|=!x*&g2JhlyMq50(OZ7Wg zn(zIBs)~oG;&cSkdd5IP6NnW-SYZE*B0b3!ehjN78*^x?`s71(BmgCWKs9Ib)qrm9 zjzy*rzMTGK#%$rub%EN93SKtMGX0a!gy(JRT(TtY=~1vwM?NlyO3qW8PXx7XtMu~f6A&u|Y@k+r-aIqv3S&^+&b5B^itl&>^mM+g71{M3 zswxnoivKH+M)UL%TcK#9{4z#_ zv0imW#?$jkir(x^={!uY<^#hH7-5}j??PQ-j%i1f>AA``D;D<$%x0OOydpv$sv{Pn zgR2@-$L+Y<%kE6p_SEy<^6$*RZm$^jdon7ncw&3mD ze&#}ms(FzRb2%;p6{$0KZU~*cIu01v8^R{v1=A6e`QxQHgLq)%D-fEi2%5VO6k?B6!4v63@$<4gh#w?75n-|*OuVGxXxpB`8 zP67Ts84H$~^fp2@YHtoawvmm0-i*5@wJM@e!TiZT&phNmsizygMt&L8Fzd}1&rT9! z(lDI9u!b>oGt*OhFUEP>o%9(m3i3XsnFl(f zr@Do$57c>gD~&aHdf;3}Vg7|2e~s*O@?+cU)~5$$pPOu$DqR0O^jA&pe*tsp-Tx+8 z?!1p_R8PfD-lTOkjjMk2vNYU%401f08+(|2|G)c|rRvk2apcnbMedj?{H)7%I)!}S z;$Xnn74D>8j8HLob~dM}a;a%XXK`r!Idvr_F-9|lEG(Q%mUi6ktMPMuv$nBI>&iVt GkO}~x^UKo! delta 165 zcmV;W09yb5)CY;u2e3340id%r7!en2x0w?L0L3{xumz8`0d6!mw0T{CyqKkpU7{j1@hA diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 81189feba0df1236c53802013c63c9462e122817..8166cb29f5b7ccb1f0bcd0b2b0d33667a38b38dc 100644 GIT binary patch literal 39 rcmZSXT9GqzmgxO@1~3rX$jrcSa|vriq|BPwKyC(B3v**j69xtV00TY@DF6Tf diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock index 5a3a46862f615016a0d35d9b65f57e704513c442..033655f1427844e3d9ca67a2c02fcc9cfa321bdd 100644 GIT binary patch delta 22 dcmY#apCBe^vsd%P%u_`n46GLB#+D`w3; createComment(@PathVariable Long postId, @RequestBody CommentDto commentDto, - @RequestParam Long member_id) { + HttpServletRequest req) { + + String token = jwtProvider.getAccessToken(req); + Long member_id = Long.valueOf(jwtProvider.getIdFromToken(token)); //토큰 Comment comment = commentService.createComment(postId, member_id, commentDto); return ResponseEntity.ok(comment); } diff --git a/src/main/java/com/example/just/Dto/CommentDto.java b/src/main/java/com/example/just/Dto/CommentDto.java index a29ae56e..e2b1ec7a 100644 --- a/src/main/java/com/example/just/Dto/CommentDto.java +++ b/src/main/java/com/example/just/Dto/CommentDto.java @@ -16,29 +16,15 @@ @Getter @Setter public class CommentDto { - private Long comment_id; //댓글 아이디 private String comment_content; //댓글 내용 - private LocalDateTime comment_create_time; //댓글 작성 시간 - - private Long comment_like; //추천수 - - private Long comment_dislike; //비추천수 - - private Long member_id; - private Long parentCommentId; public CommentDto() { } public CommentDto(Comment comment) { - this.comment_id = comment_id; this.comment_content = comment_content; - this.comment_create_time = comment_create_time; - this.comment_like = comment_like; - this.comment_dislike = comment_dislike; - this.member_id=member_id; this.parentCommentId = comment.getParent() == null ? null : comment.getParent().getComment_id(); } } diff --git a/src/main/java/com/example/just/Service/CommentService.java b/src/main/java/com/example/just/Service/CommentService.java index 04377269..c6dd306f 100644 --- a/src/main/java/com/example/just/Service/CommentService.java +++ b/src/main/java/com/example/just/Service/CommentService.java @@ -29,7 +29,7 @@ public class CommentService { public Comment createComment(Long postId, Long member_id, CommentDto commentDto) { // 부모 댓글이 있는 경우, 해당 부모 댓글을 가져옴 Comment parentComment = null; - if (commentDto.getParentCommentId() != null) { + if (commentDto.getParentCommentId() != null && commentDto.getParentCommentId()!=0) { parentComment = commentRepository.findById(commentDto.getParentCommentId()) .orElseThrow(() -> new RuntimeException("부모 댓글이 존재하지 않습니다.")); } @@ -45,12 +45,15 @@ public Comment createComment(Long postId, Long member_id, CommentDto commentDto) comment.setPost(post); comment.setMember(member); comment.setParent(parentComment); + comment.setComment_like(0L); + comment.setComment_dislike(0L); comment.setComment_create_time(LocalDateTime.now()); comment.setBlamedCount(0); // 부모 댓글이 있을 경우, 자식 댓글로 추가 if (parentComment != null) { parentComment.getChildren().add(comment); + } return commentRepository.save(comment);