Skip to content

Commit 21ca63c

Browse files
J-pettoJ-petto
authored
�feat: logstash 테스트 겸 최종 전 병합 (#87)
2 parents 6786eec + cee991e commit 21ca63c

File tree

82 files changed

+3176
-294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+3176
-294
lines changed

‎build.gradle.kts

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ dependencies {
2929
implementation("org.springframework.boot:spring-boot-starter-web")
3030
implementation("org.springframework.boot:spring-boot-starter-validation")
3131
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
32-
implementation("org.springframework.boot:spring-boot-starter-data-elasticsearch")
3332
implementation("org.springframework.boot:spring-boot-starter-security")
3433
implementation("org.springframework.boot:spring-boot-starter-websocket:3.4.1")
3534
implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
@@ -71,16 +70,18 @@ dependencies {
7170
// implementation("cloud.solapi:java-sdk:4.1.1")
7271
implementation("net.nurigo:sdk:4.2.7")
7372

74-
73+
// Jackson
7574
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.18.2")
7675
implementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
7776
implementation("com.fasterxml.jackson.core:jackson-annotations:2.18.2")
7877

7978

8079
// 축제 데이터 가져오기 (페이지 스크롤링 기준 요청)
81-
8280
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0")
8381

82+
// elastic
83+
implementation("org.springframework.boot:spring-boot-starter-data-elasticsearch")
84+
implementation("com.github.f4b6a3:tsid-creator:5.2.6")
8485
}
8586

8687
tasks.withType<Test> {

‎src/main/generated/com/ll/hfback/domain/board/comment/entity/QBoardComment.java

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
package com.ll.hfback.domain.board.comment.entity;
2+
3+
import static com.querydsl.core.types.PathMetadataFactory.*;
4+
5+
import com.querydsl.core.types.dsl.*;
6+
7+
import com.querydsl.core.types.PathMetadata;
8+
import javax.annotation.processing.Generated;
9+
import com.querydsl.core.types.Path;
10+
import com.querydsl.core.types.dsl.PathInits;
11+
12+
13+
/**
14+
* QBoardComment is a Querydsl query type for BoardComment
15+
*/
16+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
17+
public class QBoardComment extends EntityPathBase<BoardComment> {
18+
19+
private static final long serialVersionUID = -521098453L;
20+
21+
private static final PathInits INITS = PathInits.DIRECT2;
22+
23+
public static final QBoardComment boardComment = new QBoardComment("boardComment");
24+
25+
public final com.ll.hfback.global.jpa.QBaseEntity _super = new com.ll.hfback.global.jpa.QBaseEntity(this);
26+
27+
public final com.ll.hfback.domain.member.member.entity.QMember author;
28+
29+
public final com.ll.hfback.domain.board.notice.entity.QBoard board;
30+
31+
public final StringPath content = createString("content");
32+
33+
//inherited
34+
public final DateTimePath<java.time.LocalDateTime> createDate = _super.createDate;
35+
36+
//inherited
37+
public final NumberPath<Long> id = _super.id;
38+
39+
public final DateTimePath<java.time.LocalDateTime> modifyDate = createDateTime("modifyDate", java.time.LocalDateTime.class);
40+
41+
public QBoardComment(String variable) {
42+
this(BoardComment.class, forVariable(variable), INITS);
43+
}
44+
45+
public QBoardComment(Path<? extends BoardComment> path) {
46+
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
47+
}
48+
49+
public QBoardComment(PathMetadata metadata) {
50+
this(metadata, PathInits.getFor(metadata, INITS));
51+
}
52+
53+
public QBoardComment(PathMetadata metadata, PathInits inits) {
54+
this(BoardComment.class, metadata, inits);
55+
}
56+
57+
public QBoardComment(Class<? extends BoardComment> type, PathMetadata metadata, PathInits inits) {
58+
super(type, metadata, inits);
59+
this.author = inits.isInitialized("author") ? new com.ll.hfback.domain.member.member.entity.QMember(forProperty("author"), inits.get("author")) : null;
60+
this.board = inits.isInitialized("board") ? new com.ll.hfback.domain.board.notice.entity.QBoard(forProperty("board"), inits.get("board")) : null;
61+
}
62+
63+
}
64+

‎src/main/generated/com/ll/hfback/domain/board/notice/entity/QBoard.java

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
package com.ll.hfback.domain.board.notice.entity;
2+
3+
import static com.querydsl.core.types.PathMetadataFactory.*;
4+
5+
import com.querydsl.core.types.dsl.*;
6+
7+
import com.querydsl.core.types.PathMetadata;
8+
import javax.annotation.processing.Generated;
9+
import com.querydsl.core.types.Path;
10+
import com.querydsl.core.types.dsl.PathInits;
11+
12+
13+
/**
14+
* QBoard is a Querydsl query type for Board
15+
*/
16+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
17+
public class QBoard extends EntityPathBase<Board> {
18+
19+
private static final long serialVersionUID = -1410075993L;
20+
21+
private static final PathInits INITS = PathInits.DIRECT2;
22+
23+
public static final QBoard board = new QBoard("board");
24+
25+
public final com.ll.hfback.global.jpa.QBaseEntity _super = new com.ll.hfback.global.jpa.QBaseEntity(this);
26+
27+
public final com.ll.hfback.domain.member.member.entity.QMember author;
28+
29+
public final ListPath<com.ll.hfback.domain.board.comment.entity.BoardComment, com.ll.hfback.domain.board.comment.entity.QBoardComment> boardComments = this.<com.ll.hfback.domain.board.comment.entity.BoardComment, com.ll.hfback.domain.board.comment.entity.QBoardComment>createList("boardComments", com.ll.hfback.domain.board.comment.entity.BoardComment.class, com.ll.hfback.domain.board.comment.entity.QBoardComment.class, PathInits.DIRECT2);
30+
31+
public final StringPath content = createString("content");
32+
33+
//inherited
34+
public final DateTimePath<java.time.LocalDateTime> createDate = _super.createDate;
35+
36+
//inherited
37+
public final NumberPath<Long> id = _super.id;
38+
39+
public final DateTimePath<java.time.LocalDateTime> modifyDate = createDateTime("modifyDate", java.time.LocalDateTime.class);
40+
41+
public final StringPath title = createString("title");
42+
43+
public QBoard(String variable) {
44+
this(Board.class, forVariable(variable), INITS);
45+
}
46+
47+
public QBoard(Path<? extends Board> path) {
48+
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
49+
}
50+
51+
public QBoard(PathMetadata metadata) {
52+
this(metadata, PathInits.getFor(metadata, INITS));
53+
}
54+
55+
public QBoard(PathMetadata metadata, PathInits inits) {
56+
this(Board.class, metadata, inits);
57+
}
58+
59+
public QBoard(Class<? extends Board> type, PathMetadata metadata, PathInits inits) {
60+
super(type, metadata, inits);
61+
this.author = inits.isInitialized("author") ? new com.ll.hfback.domain.member.member.entity.QMember(forProperty("author"), inits.get("author")) : null;
62+
}
63+
64+
}
65+

‎src/main/generated/com/ll/hfback/domain/group/chat/entity/QChatMessage.java

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public class QChatMessage extends EntityPathBase<ChatMessage> {
3636

3737
public final StringPath nickname = createString("nickname");
3838

39+
public final StringPath originalFileName = createString("originalFileName");
40+
3941
public QChatMessage(String variable) {
4042
this(ChatMessage.class, forVariable(variable), INITS);
4143
}

‎src/main/generated/com/ll/hfback/domain/group/chatRoom/entity/QChatRoom.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class QChatRoom extends EntityPathBase<ChatRoom> {
3232
//inherited
3333
public final NumberPath<Long> id = _super.id;
3434

35-
public final ListPath<String, StringPath> joinMemberIdList = this.<String, StringPath>createList("joinMemberIdList", String.class, StringPath.class, PathInits.DIRECT2);
35+
public final ListPath<java.util.List<String>, SimplePath<java.util.List<String>>> joinMemberIdNickNameList = this.<java.util.List<String>, SimplePath<java.util.List<String>>>createList("joinMemberIdNickNameList", java.util.List.class, SimplePath.class, PathInits.DIRECT2);
3636

3737
public final com.ll.hfback.domain.member.member.entity.QMember member;
3838

@@ -44,7 +44,7 @@ public class QChatRoom extends EntityPathBase<ChatRoom> {
4444

4545
public final StringPath roomTitle = createString("roomTitle");
4646

47-
public final ListPath<String, StringPath> waitingMemberIdList = this.<String, StringPath>createList("waitingMemberIdList", String.class, StringPath.class, PathInits.DIRECT2);
47+
public final ListPath<java.util.List<String>, SimplePath<java.util.List<String>>> waitingMemberIdNickNameList = this.<java.util.List<String>, SimplePath<java.util.List<String>>>createList("waitingMemberIdNickNameList", java.util.List.class, SimplePath.class, PathInits.DIRECT2);
4848

4949
public QChatRoom(String variable) {
5050
this(ChatRoom.class, forVariable(variable), INITS);

‎src/main/generated/com/ll/hfback/domain/member/alert/entity/QAlert.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,23 @@ public class QAlert extends EntityPathBase<Alert> {
2424

2525
public final com.ll.hfback.global.jpa.QBaseEntity _super = new com.ll.hfback.global.jpa.QBaseEntity(this);
2626

27-
public final StringPath category = createString("category");
27+
public final StringPath alertTypeCode = createString("alertTypeCode");
2828

2929
public final StringPath content = createString("content");
3030

3131
//inherited
3232
public final DateTimePath<java.time.LocalDateTime> createDate = _super.createDate;
3333

34+
public final EnumPath<Alert.AlertDomain> domain = createEnum("domain", Alert.AlertDomain.class);
35+
3436
//inherited
3537
public final NumberPath<Long> id = _super.id;
3638

3739
public final BooleanPath isRead = createBoolean("isRead");
3840

3941
public final com.ll.hfback.domain.member.member.entity.QMember member;
4042

41-
public final StringPath url = createString("url");
43+
public final StringPath navigationData = createString("navigationData");
4244

4345
public QAlert(String variable) {
4446
this(Alert.class, forVariable(variable), INITS);

‎src/main/generated/com/ll/hfback/domain/member/member/entity/QFriend.java

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
package com.ll.hfback.domain.member.member.entity;
2+
3+
import static com.querydsl.core.types.PathMetadataFactory.*;
4+
5+
import com.querydsl.core.types.dsl.*;
6+
7+
import com.querydsl.core.types.PathMetadata;
8+
import javax.annotation.processing.Generated;
9+
import com.querydsl.core.types.Path;
10+
import com.querydsl.core.types.dsl.PathInits;
11+
12+
13+
/**
14+
* QFriend is a Querydsl query type for Friend
15+
*/
16+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
17+
public class QFriend extends EntityPathBase<Friend> {
18+
19+
private static final long serialVersionUID = -370807929L;
20+
21+
private static final PathInits INITS = PathInits.DIRECT2;
22+
23+
public static final QFriend friend = new QFriend("friend");
24+
25+
public final com.ll.hfback.global.jpa.QBaseEntity _super = new com.ll.hfback.global.jpa.QBaseEntity(this);
26+
27+
//inherited
28+
public final DateTimePath<java.time.LocalDateTime> createDate = _super.createDate;
29+
30+
//inherited
31+
public final NumberPath<Long> id = _super.id;
32+
33+
public final QMember receiver;
34+
35+
public final QMember requester;
36+
37+
public final EnumPath<Friend.FriendStatus> status = createEnum("status", Friend.FriendStatus.class);
38+
39+
public QFriend(String variable) {
40+
this(Friend.class, forVariable(variable), INITS);
41+
}
42+
43+
public QFriend(Path<? extends Friend> path) {
44+
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
45+
}
46+
47+
public QFriend(PathMetadata metadata) {
48+
this(metadata, PathInits.getFor(metadata, INITS));
49+
}
50+
51+
public QFriend(PathMetadata metadata, PathInits inits) {
52+
this(Friend.class, metadata, inits);
53+
}
54+
55+
public QFriend(Class<? extends Friend> type, PathMetadata metadata, PathInits inits) {
56+
super(type, metadata, inits);
57+
this.receiver = inits.isInitialized("receiver") ? new QMember(forProperty("receiver"), inits.get("receiver")) : null;
58+
this.requester = inits.isInitialized("requester") ? new QMember(forProperty("requester"), inits.get("requester")) : null;
59+
}
60+
61+
}
62+

‎src/main/generated/com/ll/hfback/domain/member/member/entity/QMember.java

+6
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ public class QMember extends EntityPathBase<Member> {
3535

3636
public final StringPath email = createString("email");
3737

38+
public final NumberPath<Integer> friendCount = createNumber("friendCount", Integer.class);
39+
3840
public final EnumPath<Member.Gender> gender = createEnum("gender", Member.Gender.class);
3941

4042
//inherited
@@ -56,10 +58,14 @@ public class QMember extends EntityPathBase<Member> {
5658

5759
public final StringPath profilePath = createString("profilePath");
5860

61+
public final ListPath<Friend, QFriend> receivedFriendRequests = this.<Friend, QFriend>createList("receivedFriendRequests", Friend.class, QFriend.class, PathInits.DIRECT2);
62+
5963
public final ListPath<com.ll.hfback.domain.member.report.entity.Report, com.ll.hfback.domain.member.report.entity.QReport> reports = this.<com.ll.hfback.domain.member.report.entity.Report, com.ll.hfback.domain.member.report.entity.QReport>createList("reports", com.ll.hfback.domain.member.report.entity.Report.class, com.ll.hfback.domain.member.report.entity.QReport.class, PathInits.DIRECT2);
6064

6165
public final EnumPath<Member.MemberRole> role = createEnum("role", Member.MemberRole.class);
6266

67+
public final ListPath<Friend, QFriend> sentFriendRequests = this.<Friend, QFriend>createList("sentFriendRequests", Friend.class, QFriend.class, PathInits.DIRECT2);
68+
6369
public final com.ll.hfback.domain.member.auth.entity.QSocialAccount socialAccount;
6470

6571
public final EnumPath<Member.MemberState> state = createEnum("state", Member.MemberState.class);

‎src/main/java/com/ll/hfback/domain/board/comment/controller/ApiV1BoardCommentController.java

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
package com.ll.hfback.domain.board.comment.controller;
2+
3+
import com.ll.hfback.domain.board.comment.entity.BoardComment;
4+
import com.ll.hfback.domain.board.comment.service.BoardCommentService;
5+
import com.ll.hfback.domain.board.notice.entity.Board;
6+
import com.ll.hfback.domain.board.notice.service.BoardService;
7+
import com.ll.hfback.domain.member.member.entity.Member;
8+
import com.ll.hfback.domain.member.member.service.MemberService;
9+
import com.ll.hfback.global.rsData.RsData;
10+
import com.ll.hfback.global.webMvc.LoginUser;
11+
import lombok.Data;
12+
import lombok.RequiredArgsConstructor;
13+
import org.springframework.security.access.prepost.PreAuthorize;
14+
import org.springframework.web.bind.annotation.*;
15+
16+
import java.security.Principal;
17+
import java.sql.SQLOutput;
18+
19+
@RequiredArgsConstructor
20+
@RestController
21+
@RequestMapping("/api/v1/boardComment")
22+
public class ApiV1BoardCommentController {
23+
24+
private final BoardService boardService;
25+
private final BoardCommentService boardCommentService;
26+
private final MemberService memberService;
27+
28+
//댓글 생성 dto RequestBody는 키벨류라서 dto로 키벨류 맞춰줘야 json 중첩오류가 안남
29+
@Data
30+
public static class CreateBoardComment {
31+
String content;
32+
}
33+
34+
//댓글 생성
35+
@PreAuthorize("isAuthenticated")
36+
@PostMapping("/create/{boardId}")
37+
public RsData<BoardComment> create(@PathVariable("boardId") Long boardId, @RequestBody CreateBoardComment createBoardComment, @LoginUser Member member){
38+
Board board = this.boardService.view(boardId);
39+
BoardComment boardComment = this.boardCommentService.create(boardId, createBoardComment.getContent(), member);
40+
System.out.println(boardComment);
41+
return new RsData<>("200","댓글을 성공적으로 생성했습니다.", boardComment);
42+
43+
}
44+
//댓글 수정 dto
45+
@Data
46+
public static class ModifyBoardComment {
47+
String content;
48+
}
49+
50+
//댓글 수정
51+
@PreAuthorize("isAuthenticated()")
52+
@PatchMapping("/modify/{boardCommentId}")
53+
public RsData<BoardComment> modify(@PathVariable("boardCommentId")Long boardCommentId, @RequestBody ModifyBoardComment modifyBoardComment, Principal principal){
54+
BoardComment boardComment = this.boardCommentService.getComment(boardCommentId);
55+
Member member = this.memberService.findByEmail(principal.getName());
56+
BoardComment MdfBdComment = boardCommentService.modify(boardComment,modifyBoardComment.getContent(), member);
57+
return new RsData<>("200","댓글을 성공적으로 수정했습니다.",MdfBdComment);
58+
}
59+
60+
61+
//댓글 삭제
62+
@PreAuthorize("isAuthenticated()")
63+
@DeleteMapping("/delete/{boardCommentId}")
64+
public RsData<Void> deleteBoardComment(@PathVariable("boardCommentId")Long boardCommentId,Principal principal){
65+
BoardComment boardComment =this.boardCommentService.getComment(boardCommentId);
66+
Member member = this.memberService.findByEmail(principal.getName());
67+
this.boardCommentService.delete(boardComment, member);
68+
return new RsData<>("200","댓글을 성공적으로 삭제했습니다.");
69+
}
70+
}

0 commit comments

Comments
 (0)