Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP #867

Merged
merged 2 commits into from
Feb 14, 2024
Merged

WIP #867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef619ec
WIP
Paul2021-R Feb 14, 2024
8ba2d75
WIP
Paul2021-R Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/peer/backend/controller/board/BoardController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ public void createComment(@RequestBody @Valid PostCommentRequest request, Authen
BoardType.NORMAL);

Long writer = post.getUser().getId();

this.notificationCreationService.makeNotificationForUser(
if (post.getUser().isActivated())
this.notificationCreationService.makeNotificationForUser(
null,
user.getNickname() + " 님께서 댓글을 다셨습니다 : " + request.getContent(),
"",
Expand All @@ -94,7 +94,7 @@ public void createComment(@RequestBody @Valid PostCommentRequest request, Authen
null,
writer,
null
);
);
}

@PutMapping("/post/comment/{commentId}")
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/peer/backend/repository/team/TeamUserRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ public interface TeamUserRepository extends JpaRepository<TeamUser, Long> {
@Query("select t from TeamUser t where t.teamId IN :ids")
List<TeamUser> findByIdIn(@Param("ids") List<Long> ids);

@Query("SELECT m.userId FROM TeamUser m WHERE m.teamId IN :teamId")
@Query("SELECT m.userId FROM TeamUser m WHERE m.teamId IN :teamId AND m.user.activated = true")
List<Long> findAllUserIdsIn(@Param("teamId") List<Long> teamId);

@Query("SELECT m.userId FROM TeamUser m WHERE m.teamId = :teamId")
@Query("SELECT m.userId FROM TeamUser m WHERE m.teamId = :teamId AND m.user.activated = true")
List<Long> findUserIdsIn(@Param("teamId") Long teamId);
}
6 changes: 3 additions & 3 deletions src/main/java/peer/backend/service/board/recruit/RecruitService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ public void changeRecruitFavorite(Authentication auth, Long recruitId,
newFavorite.setType(type);
recruitFavoriteRepository.save(newFavorite);
});

this.notificationCreationService.makeNotificationForUser(
if (rawTarget.get().getWriter().isActivated())
this.notificationCreationService.makeNotificationForUser(
null,
user.getNickname() + "님께서 당신의 글에 좋아요를 눌렀습니다",
"/recruit/" + recruitId,
Expand All @@ -133,7 +133,7 @@ public void changeRecruitFavorite(Authentication auth, Long recruitId,
null,
rawTarget.get().getWriterId(),
rawTarget.get().getThumbnailUrl()
);
);
}

public List<RecruitInterviewDto> getInterviewList(Long recruit_id) {
Expand Down
Loading