Skip to content

Commit 0f3d6e7

Browse files
committed
feat: 내가 참여한 번개에서 내가 생성한 번개 제거
1 parent 4764b83 commit 0f3d6e7

2 files changed

Lines changed: 15 additions & 4 deletions

File tree

src/main/java/com/codeit/side/lightening/adapter/out/persistence/jpa/LighteningQueryBuilder.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,11 @@ public LighteningQueryBuilder addMyJoinedCondition(String email) {
8888
}
8989
return this;
9090
}
91+
92+
public LighteningQueryBuilder addNotHostCondition(String email) {
93+
if (email != null) {
94+
booleanBuilder.and(lighteningEntity.host.ne(email));
95+
}
96+
return this;
97+
}
9198
}

src/main/java/com/codeit/side/lightening/adapter/out/persistence/jpa/LighteningQueryEntityRepository.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,28 +52,30 @@ private OrderSpecifier<?> createOrder(String order) {
5252

5353
private BooleanBuilder createQueryBuilder(LighteningCondition lighteningCondition, String email) {
5454
return switch (lighteningCondition.getConditionType()) {
55-
case LIST -> listConditionBuilder(lighteningCondition);
56-
case MY_CREATED -> myCreatedConditionBuilder(lighteningCondition);
55+
case LIST -> listConditionBuilder(lighteningCondition, email);
56+
case MY_CREATED -> myCreatedConditionBuilder(lighteningCondition, email);
5757
case LIKE -> likeConditionBuilder(lighteningCondition, email);
5858
case MY_JOINED -> myJoinedConditionBuilder(lighteningCondition, email);
5959
};
6060
}
6161

62-
private BooleanBuilder listConditionBuilder(LighteningCondition lighteningCondition) {
62+
private BooleanBuilder listConditionBuilder(LighteningCondition lighteningCondition, String email) {
6363
return LighteningQueryBuilder.Builder()
6464
.addIsInactiveCondition(false)
6565
.addCategoryCondition(lighteningCondition.getCategory())
6666
.addCityCondition(lighteningCondition.getCity())
6767
.addTownCondition(lighteningCondition.getTown())
6868
.addTargetAtCondition(lighteningCondition.getTargetAt())
69+
.addNotHostCondition(email)
6970
.build();
7071
}
7172

72-
private BooleanBuilder myCreatedConditionBuilder(LighteningCondition lighteningCondition) {
73+
private BooleanBuilder myCreatedConditionBuilder(LighteningCondition lighteningCondition, String email) {
7374
return LighteningQueryBuilder.Builder()
7475
.addIsInactiveCondition(false)
7576
.addCategoryCondition(lighteningCondition.getCategory())
7677
.addMyCreatedCondition(lighteningCondition.getCreatedBy())
78+
.addNotHostCondition(email)
7779
.build();
7880
}
7981

@@ -85,6 +87,7 @@ private BooleanBuilder likeConditionBuilder(LighteningCondition lighteningCondit
8587
.addTownCondition(lighteningCondition.getTown())
8688
.addTargetAtCondition(lighteningCondition.getTargetAt())
8789
.addLikeCondition(email)
90+
.addNotHostCondition(email)
8891
.build();
8992
}
9093

@@ -93,6 +96,7 @@ private BooleanBuilder myJoinedConditionBuilder(LighteningCondition lighteningCo
9396
.addIsInactiveCondition(false)
9497
.addCategoryCondition(lighteningCondition.getCategory())
9598
.addMyJoinedCondition(email)
99+
.addNotHostCondition(email)
96100
.build();
97101
}
98102

0 commit comments

Comments
 (0)