- K8sUtil 파일 삭제

- 승인관리 완전삭제 기능 추가
- DJBank로 명칭 업데이트

build.gradle

@@ -87,6 +87,9 @@ dependencies {
     api "com.querydsl:querydsl-apt:${queryDslVersion}"
     api "org.mapstruct:mapstruct:1.5.5.Final", "org.projectlombok:lombok:1.18.28"
 
+    // JDK 11+ 에서 javax.annotation.* 가 제거되어 (JEP 320) 명시 의존성 필요
+    api 'javax.annotation:javax.annotation-api:1.3.2'
+
     // project > properties > Java Compiler > Annoation Processing
     annotationProcessor "org.projectlombok:lombok:1.18.28", "org.projectlombok:lombok-mapstruct-binding:0.2.0", "org.mapstruct:mapstruct-processor:1.5.5.Final", "com.querydsl:querydsl-apt:${queryDslVersion}:jpa", "jakarta.persistence:jakarta.persistence-api:2.2.3", "jakarta.annotation:jakarta.annotation-api:1.3.5"
 

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/portalNotice/entity/PortalNotice.java

@@ -1,12 +1,27 @@
 package com.eactive.apim.portal.portalNotice.entity;
 
-import com.eactive.apim.portal.common.entity.Auditable;
+import javax.persistence.Column;
-import lombok.Data;
+import javax.persistence.Entity;
-import lombok.EqualsAndHashCode;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.JoinColumnOrFormula;
+import org.hibernate.annotations.JoinColumnsOrFormulas;
+import org.hibernate.annotations.JoinFormula;
 
-import javax.persistence.*;
+import com.eactive.apim.portal.common.entity.Auditable;
+import com.eactive.apim.portal.monitoringcode.entity.MonitoringCode;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = true)
@@ -47,5 +62,15 @@ public class PortalNotice extends Auditable {
     @Column(name = "inquirer_name", length = 50, nullable = false)
     @Comment("작성자이름")
     private String inquirerName;
+    
+    @Column(name = "fix_yn", length = 1, nullable = false)
+    @Comment("상단고정여부")
+    private String fixYn;    
+
+    @Column(name = "notice_type", length = 1, nullable = false)
+    @Comment("게시유형")
+    private String noticeType;
+    
+    
 
 }

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/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