Merge branch 'master' of https://git.eactive.synology.me:8090/eapim/djbank/elink-portal-common.git

src/main/java/com/eactive/apim/portal/approval/entity/Approver.java

@@ -5,9 +5,10 @@ import com.eactive.eai.data.converter.LocalDateTimeToStringConverter17;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -25,12 +26,12 @@ public class Approver implements Serializable, com.eactive.eai.data.Data {
 
     @ManyToOne
     @MapsId("approval")
-    @JoinColumn(name = "APPROVAL_ID", nullable = false)
+    @JoinColumn(name = "APPROVAL_ID", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     private Approval approval;
 
-    @NotNull
     @ManyToOne
-    @JoinColumn(name = "USER_ID", nullable = false)
+    @JoinColumn(name = "USER_ID", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @NotFound(action = NotFoundAction.IGNORE)
     private UserInfo user;
 
     @Enumerated(value = STRING)

src/main/java/com/eactive/apim/portal/approval/statemachine/ProcessingState.java

@@ -45,7 +45,7 @@ public class ProcessingState implements ApprovalState {
             boolean statusChanged = false;
             // Update current approver status and track if it changed
             for (Approver approver : approval.getApprovers()) {
-                if (approver.getUser().getId().equals(approverId) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
+                if (approver.getUser() != null && approverId.equals(approver.getUser().getId()) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
                     approver.setApproverStatus(ApproverStatus.APPROVED);
                     approver.setApprovedDate(LocalDateTime.now());
                     statusChanged = true;
@@ -76,7 +76,7 @@ public class ProcessingState implements ApprovalState {
         String approverId = (String) options.getOrDefault(ApprovalConstants.APPROVER, "");
         if (isAuthorizedApprover(approval, approverId, options)) {
             approval.getApprovers().forEach(approver -> {
-                if(approver.getUser().getId().equals(approverId)) {
+                if(approver.getUser() != null && approverId.equals(approver.getUser().getId())) {
                     approver.setApproverStatus(ApproverStatus.DENIED);
                     approver.setApprovedDate(LocalDateTime.now());
                     String message = (String) options.getOrDefault("message", "");

src/main/java/com/eactive/apim/portal/approval/statemachine/RequestedState.java

@@ -48,7 +48,7 @@ public class RequestedState implements ApprovalState {
 
             // Update current approver status and track if it changed
             for (Approver approver : approval.getApprovers()) {
-                if (approver.getUser().getId().equals(approverId) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
+                if (approver.getUser() != null && approverId.equals(approver.getUser().getId()) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
                     approver.setApproverStatus(ApproverStatus.APPROVED);
                     approver.setApprovedDate(LocalDateTime.now());
                     statusChanged = true;
@@ -78,7 +78,7 @@ public class RequestedState implements ApprovalState {
         String approverId = (String) options.getOrDefault(ApprovalConstants.APPROVER, "");
         if (isAuthorizedApprover(approval, approverId, options)) {
             approval.getApprovers().forEach(approver -> {
-                if (approver.getUser().getId().equals(approverId)) {
+                if (approver.getUser() != null && approverId.equals(approver.getUser().getId())) {
                     approver.setApproverStatus(ApproverStatus.DENIED);
                     approver.setApprovedDate(LocalDateTime.now());
                     String message = (String) options.getOrDefault("message", "");
@@ -97,7 +97,7 @@ public class RequestedState implements ApprovalState {
         String approverId = (String) options.getOrDefault(ApprovalConstants.APPROVER, "");
         if (isAuthorizedApprover(approval, approverId, options)) {
             approval.getApprovers().forEach(approver -> {
-                if (approver.getUser().getId().equals(approverId)) {
+                if (approver.getUser() != null && approverId.equals(approver.getUser().getId())) {
                     approver.setApproverStatus(ApproverStatus.CANCELED);
                     approver.setApprovedDate(LocalDateTime.now());
                 }

src/main/java/com/eactive/apim/portal/file/service/FileSystemBinaryStorage.java

@@ -3,6 +3,7 @@ package com.eactive.apim.portal.file.service;
 import static com.eactive.apim.portal.file.service.StorageType.FILESYSTEM;
 
 import com.eactive.apim.portal.portalproperty.service.PortalPropertyService;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;

src/main/java/com/eactive/apim/portal/qna/entity/Inquiry.java

@@ -79,7 +79,8 @@ public class Inquiry extends Auditable {
      * 응답자
      */
     @ManyToOne
-    @JoinColumn(name = "RESPONDER_ID")
+    @JoinColumn(name = "RESPONDER_ID", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @NotFound(action = NotFoundAction.IGNORE)
     private UserInfo responder;
 
     @Column(name = "ATTACH_FILE")

src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java

@@ -35,4 +35,16 @@ public class InquiryComment extends Auditable implements Serializable {
 
     @Column(name = "ADMIN_YN", length = 1)
     private String adminYn = "N";
+
+    public void markDeleted() {
+        this.delYn = "Y";
+    }
+
+    public boolean isDeleted() {
+        return "Y".equals(this.delYn);
+    }
+
+    public boolean isAdmin() {
+        return "Y".equals(this.adminYn);
+    }
 }

src/main/java/com/eactive/apim/portal/qna/event/InquiryCommentCreatedEvent.java

@@ -0,0 +1,56 @@
+package com.eactive.apim.portal.qna.event;
+
+import com.eactive.apim.portal.template.entity.MessageCode;
+import com.eactive.apim.portal.template.service.MessageEventHandler;
+import com.eactive.apim.portal.template.service.MessageRecipient;
+import com.eactive.apim.portal.template.service.MessageSendEvent;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class InquiryCommentCreatedEvent implements MessageEventHandler {
+
+    public static final MessageCode KEY = MessageCode.INQUIRY_COMMENT_CREATED;
+
+    @Override
+    public MessageCode getKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean allowAdditionalRecipients() {
+        return true;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "Q&A 댓글 등록 알림";
+    }
+
+    @Override
+    public String getDescription() {
+        return "<div>사용 가능 변수: </div><br/>"
+                + "<div> - userName: 수신자 이름 </div><br/>"
+                + "<div> - userId: 수신자 ID </div><br/>"
+                + "<div> - inquiryId: 문의 ID </div><br/>"
+                + "<div> - inquirySubject: 문의 제목 </div><br/>"
+                + "<div> - commentContent: 댓글 본문 </div><br/>"
+                + "<div> - writerName: 작성자 이름 </div><br/>";
+    }
+
+    @Override
+    public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map<String, Object> params) {
+        Map<String, String> requestParams = new HashMap<>();
+        requestParams.put("inquiryId", toStr(params.get("inquiryId")));
+        requestParams.put("inquirySubject", toStr(params.get("inquirySubject")));
+        requestParams.put("commentContent", toStr(params.get("commentContent")));
+        requestParams.put("writerName", toStr(params.get("writerName")));
+        return new MessageSendEvent(source, KEY, recipient, requestParams);
+    }
+
+    private String toStr(Object value) {
+        return value == null ? "" : value.toString();
+    }
+}

src/main/java/com/eactive/apim/portal/qna/event/InquiryCreatedEvent.java

@@ -23,11 +23,21 @@ public class InquiryCreatedEvent implements MessageEventHandler {
     @Override
     public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map<String, Object> params) {
         Map<String, String> requestParams = new HashMap<>();
-        requestParams.put("inquiryId", (String) params.get("inquiryId"));
-        requestParams.put("subject", (String) params.get("subject"));
+        String subject = toStr(params.get("inquirySubject"));
+        if (subject.isEmpty()) {
+            subject = toStr(params.get("subject"));
+        }
+        requestParams.put("inquiryId", toStr(params.get("inquiryId")));
+        requestParams.put("inquirySubject", subject);
+        requestParams.put("subject", subject);
+        requestParams.put("writerName", toStr(params.get("writerName")));
         return new MessageSendEvent(source, KEY, recipient, requestParams);
     }
 
+    private String toStr(Object value) {
+        return value == null ? "" : value.toString();
+    }
+
     @Override
     public MessageCode getKey() {
         return KEY;
@@ -44,7 +54,9 @@ public class InquiryCreatedEvent implements MessageEventHandler {
                 + "<div> - userName: 수신자 이름 </div><br/>"
                 + "<div> - userId: 수신자 ID (이메일) </div><br/>"
                 + "<div> - inquiryId: 질문 ID </div><br/>"
-                + "<div> - subject: 제목 </div><br/>";
+                + "<div> - inquirySubject: 질문 제목 </div><br/>"
+                + "<div> - subject: 질문 제목 (별칭) </div><br/>"
+                + "<div> - writerName: 작성자 이름 </div><br/>";
     }
 }
 

src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java

@@ -28,6 +28,10 @@ public enum MessageCode {
     // 관리자 영역
     APP_REGISTER_APPROVED("앱 등록 승인", "FM_APIM009", Channels.EMAIL),
     APP_REGISTER_REJECTED("앱 등록 거절", "FM_APIM010", Channels.EMAIL),
+
+    // Q&A 등록/댓글 등록 알림 (DJBank 커스텀 — portal-admin 수신)
+    INQUIRY_CREATED("Q&A 등록 알림", null, Channels.NONE),
+    INQUIRY_COMMENT_CREATED("Q&A 댓글 등록 알림", null, Channels.NONE),
     
     // 제주은행
     API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.SWING),
@@ -81,9 +85,6 @@ public enum MessageCode {
     @Deprecated // 정확한 용도 모름
     USER_REGISTRATION_REQUEST_USER("사용자 등록 요청 완료", null, Channels.NONE),
 
-    @Deprecated // 정확한 용도 모름
-    INQUIRY_CREATED("QnA 질문 등록", null, Channels.NONE),
-
     @Deprecated
     INQUIRY_RESPONSE("QnA 답변 작성", null, Channels.NONE)
     ;

src/main/java/com/eactive/apim/portal/template/service/MessageRecipient.java

@@ -1,11 +1,8 @@
 package com.eactive.apim.portal.template.service;
 
 import com.eactive.apim.portal.portaluser.entity.PortalUser;
-import kjb.safedb.KjbNotRnnoJpaAttributeConverter;
 import lombok.*;
 
-import javax.persistence.Convert;
-
 @Data
 @ToString
 @EqualsAndHashCode