Dev 브랜치 코드 Main 병합 #32
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package hs.kr.backend.devpals.domain.user.dto; | ||
|
|
||
| import hs.kr.backend.devpals.domain.user.entity.alarm.CommentAlarmEntity; | ||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| @Getter | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class CommentAlarmDto extends AlarmDto{ | ||
|
|
||
| private Boolean replier; | ||
| private Long reCommentUserId; | ||
|
|
||
| public CommentAlarmDto(CommentAlarmEntity entity) { | ||
| super(entity.getId(), entity.getRoutingId(), entity.getContent(), entity.isEnabled(), entity.getAlarmFilterIntValue(), entity.getCreatedAt()); | ||
| this.replier = entity.getReplier(); | ||
| this.reCommentUserId = getReCommentUserIdIfNotNull(entity); | ||
| } | ||
|
|
||
| //대댓글이 존재하면 유저id 반환 없으면 0 반환 | ||
| private Long getReCommentUserIdIfNotNull(CommentAlarmEntity entity) { | ||
| if(entity.getRecomment() != null && entity.getRecomment().getUser() != null) return entity.getRecomment().getUser().getId(); | ||
| else return 0L; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package hs.kr.backend.devpals.domain.user.entity.alarm; | ||
|
|
||
| import hs.kr.backend.devpals.domain.project.entity.ApplicantEntity; | ||
| import hs.kr.backend.devpals.domain.project.entity.CommentEntity; | ||
| import hs.kr.backend.devpals.domain.project.entity.ProjectEntity; | ||
| import hs.kr.backend.devpals.domain.user.entity.UserEntity; | ||
| import hs.kr.backend.devpals.global.common.enums.AlarmFilter; | ||
| import jakarta.persistence.*; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| import java.time.LocalDateTime; | ||
|
|
||
| @Entity | ||
| @Getter | ||
| @NoArgsConstructor | ||
| @Inheritance(strategy = InheritanceType.JOINED) | ||
| @DiscriminatorColumn(name = "ALARM_FILTER", | ||
| discriminatorType = DiscriminatorType.STRING) | ||
|
|
||
| @Table(name = "Alarm") | ||
| public abstract class AlarmEntity { | ||
| @Id | ||
| @GeneratedValue(strategy = GenerationType.IDENTITY) | ||
| private Long id; | ||
|
|
||
|
|
||
| @ManyToOne(fetch = FetchType.LAZY) | ||
| @JoinColumn(name = "receiver_id", nullable = false) | ||
| private UserEntity receiver; | ||
|
|
||
|
|
||
| @Column(length = 255) | ||
| private String content; | ||
|
|
||
| @Column(nullable = false, columnDefinition = "BOOLEAN DEFAULT FALSE") | ||
| private boolean enabled = false; | ||
|
|
||
| @Column | ||
| private Long routingId; //AlarmFilter마다 | ||
|
|
||
|
|
||
| // @Enumerated(EnumType.STRING) | ||
| // private AlarmFilter alarmFilter; | ||
|
|
||
| @Column(updatable = false) | ||
| private LocalDateTime createdAt = LocalDateTime.now(); | ||
|
|
||
| public AlarmEntity(UserEntity receiver, String content, Long routingId) { | ||
| this.receiver = receiver; | ||
| this.content = content; | ||
| this.routingId = routingId; | ||
| } | ||
|
|
||
| public abstract Integer getAlarmFilterIntValue(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package hs.kr.backend.devpals.domain.user.entity.alarm; | ||
|
|
||
| import hs.kr.backend.devpals.domain.project.entity.ApplicantEntity; | ||
| import hs.kr.backend.devpals.domain.project.entity.ProjectEntity; | ||
| import jakarta.persistence.*; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| import static hs.kr.backend.devpals.domain.user.entity.alarm.constants.AlarmFilterConstants.APPLIED_PROJECTS; | ||
| import static hs.kr.backend.devpals.domain.user.entity.alarm.constants.AlarmFilterConstants.APPLIED_PROJECT_INT_VALUE; | ||
|
|
||
| @Entity | ||
| @DiscriminatorValue(APPLIED_PROJECTS) | ||
| @NoArgsConstructor | ||
| @Table(name = "ApplicantAlarm") // 테이블 이름 지정 | ||
| public class ApplicantAlarmEntity extends AlarmEntity { | ||
| //"지원한 프로젝트" 알람 (지원 결과) | ||
| //공고 지원자가 지원한 프로젝트에 합격, 불합격 여부를 전달하는 알람 | ||
| @ManyToOne(fetch = FetchType.LAZY) | ||
| @JoinColumn(name = "project_id", nullable = false) | ||
| private ProjectEntity project; | ||
|
|
||
| @ManyToOne(fetch = FetchType.LAZY) | ||
| @JoinColumn(name = "applicant_id", nullable = false) | ||
| private ApplicantEntity applicant; | ||
|
|
||
| public ApplicantAlarmEntity(ApplicantEntity applicantEntity, String content, ProjectEntity project) { | ||
| super(applicantEntity.getUser(),content,project.getId()); | ||
| this.project = project; | ||
| this.applicant = applicantEntity; | ||
|
|
||
| } | ||
|
|
||
| public Integer getAlarmFilterIntValue() { | ||
| return APPLIED_PROJECT_INT_VALUE; | ||
| } | ||
|
Comment on lines
+33
to
+35
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chain필터 값 중복 확인 필요
🏁 Script executed: #!/bin/bash
# 필터 상수 파일의 내용을 확인합니다.
cat src/main/java/hs/kr/backend/devpals/domain/user/entity/alarm/constants/AlarmFilterConstants.javaLength of output: 597 다른 AlarmEntity 클래스들의 🏁 Script executed: #!/bin/bash
# 각 AlarmEntity 클래스의 getAlarmFilterIntValue 반환 값을 조사합니다.
rg -n "getAlarmFilterIntValue" -A2 src/main/java/hs/kr/backend/devpals/domain/user/entity/alarmLength of output: 1404 AlarmFilterConstants의 필터 값에 고유한 정수 할당 필요 현재 모든 필터 상수( 조치 사항:
엔티티 클래스의 |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| package hs.kr.backend.devpals.domain.user.entity.alarm; | ||
|
|
||
| import hs.kr.backend.devpals.domain.project.entity.CommentEntity; | ||
| import hs.kr.backend.devpals.domain.project.entity.ProjectEntity; | ||
| import hs.kr.backend.devpals.domain.project.entity.RecommentEntity; | ||
| import hs.kr.backend.devpals.domain.user.entity.UserEntity; | ||
| import jakarta.persistence.*; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| import static hs.kr.backend.devpals.domain.user.entity.alarm.constants.AlarmFilterConstants.*; | ||
|
|
||
| @Entity | ||
| @DiscriminatorValue(COMMENT_AND_REPLY) | ||
| @NoArgsConstructor | ||
| @Getter | ||
| @Table(name = "CommentAlarm") // 테이블 이름 지정 | ||
| public class CommentAlarmEntity extends AlarmEntity { | ||
| // 댓글 알람 -> 공고에 댓글을 달았을 시, 댓글에 답변을 달았을 시 전달되는 알람 | ||
|
|
||
| @ManyToOne(fetch = FetchType.LAZY) | ||
| @JoinColumn(name = "project_id", nullable = false) | ||
| private ProjectEntity project; | ||
|
|
||
| @ManyToOne(fetch = FetchType.LAZY) | ||
| @JoinColumn(name = "comment_id", nullable = false) | ||
| private CommentEntity comment; | ||
|
|
||
| @ManyToOne(fetch = FetchType.LAZY) | ||
| @JoinColumn(name = "recomment_id") | ||
| private RecommentEntity recomment; | ||
|
|
||
| @Column | ||
| private Boolean replier; | ||
|
|
||
| //공고에 댓글 달았을 시 공고 게시자에게 알람 전송 | ||
| public CommentAlarmEntity(CommentEntity comment, String content, ProjectEntity project, UserEntity projectAuthor) { | ||
| super(projectAuthor,content,project.getId()); | ||
| this.comment = comment; | ||
| this.project = project; | ||
| this.replier = false; | ||
| } | ||
|
|
||
| public CommentAlarmEntity(CommentEntity comment, String content, ProjectEntity project, RecommentEntity recomment,UserEntity receiver) { | ||
| super(receiver,content,project.getId()); | ||
| this.comment = comment; | ||
| this.project = project; | ||
| this.recomment = recomment; | ||
| this.replier = true; | ||
| } | ||
|
|
||
| public Integer getAlarmFilterIntValue() { | ||
| return COMMENT_AND_REPLY_INT_VALUE; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package hs.kr.backend.devpals.domain.user.entity.alarm; | ||
|
|
||
| import hs.kr.backend.devpals.domain.project.entity.ApplicantEntity; | ||
| import hs.kr.backend.devpals.domain.project.entity.ProjectEntity; | ||
| import hs.kr.backend.devpals.domain.user.entity.UserEntity; | ||
| import jakarta.persistence.*; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| import static hs.kr.backend.devpals.domain.user.entity.alarm.constants.AlarmFilterConstants.*; | ||
|
|
||
| @Entity | ||
| @DiscriminatorValue(APPLICANT_CHECK) | ||
| @NoArgsConstructor | ||
| @Table(name = "ProjectAlarm") // 테이블 이름 지정 | ||
| public class ProjectAlarmEntity extends AlarmEntity{ | ||
| //공고에 지원자가 지원할 시 공고생성자가 수신받는 알림 | ||
|
|
||
| @ManyToOne(fetch = FetchType.LAZY) | ||
| @JoinColumn(name = "project_id", nullable = false) | ||
| private ProjectEntity project; | ||
|
|
||
| @ManyToOne(fetch = FetchType.LAZY) | ||
| @JoinColumn(name = "applicant_id", nullable = false) | ||
| private ApplicantEntity applicant; | ||
|
|
||
|
|
||
| public ProjectAlarmEntity(ProjectEntity project, UserEntity author, String content,ApplicantEntity applicant) { | ||
| super(author,content, project.getId()); | ||
| this.project = project; | ||
| this.applicant = applicant; | ||
| } | ||
|
|
||
| public Integer getAlarmFilterIntValue() { | ||
| return APPLICANT_CHECK_INT_VALUE; | ||
| } | ||
|
Comment on lines
+33
to
+35
There was a problem hiding this comment. 필터 값 중복 확인 필요
#!/bin/bash
# AlarmEntity의 자식 클래스들이 반환하는 필터 값을 확인합니다.
echo "ApplicantAlarmEntity returns:"
grep -n "return.*INT_VALUE" src/main/java/hs/kr/backend/devpals/domain/user/entity/alarm/ApplicantAlarmEntity.java
echo -e "\nProjectAlarmEntity returns:"
grep -n "return.*INT_VALUE" src/main/java/hs/kr/backend/devpals/domain/user/entity/alarm/ProjectAlarmEntity.java
echo -e "\nCommentAlarmEntity returns:"
grep -n "return.*INT_VALUE" src/main/java/hs/kr/backend/devpals/domain/user/entity/alarm/CommentAlarmEntity.java
echo -e "\nAlarmFilterConstants defines:"
grep -n "INT_VALUE" src/main/java/hs/kr/backend/devpals/domain/user/entity/alarm/constants/AlarmFilterConstants.java |
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.