diff --git a/.gitea/workflows/eapim-portal-ci.yml b/.gitea/workflows/eapim-portal-ci.yml new file mode 100644 index 0000000..4d9cf7e --- /dev/null +++ b/.gitea/workflows/eapim-portal-ci.yml @@ -0,0 +1,130 @@ +name: eapim-portal CI (from elink-portal-common) + +on: + push: + branches: + - master + - feats/ci-test + +jobs: + build: + runs-on: [self-hosted, linux, eapim-portal] + env: + JAVA_HOME: /apps/opts/jdk8 + JAVA_HOME_TOMCAT: /apps/opts/jdk17 + CATALINA_BASE: /prod/eapim/devportal + CATALINA_HOME: /prod/eapim/apache-tomcat-9.0.116 + CATALINA_PID: /prod/eapim/devportal/temp/catalina.pid + DEPLOY_HTTP_PORT: "39130" + defaults: + run: + working-directory: eapim-portal + + steps: + - name: Checkout elink-portal-common (trigger SHA) + uses: actions/checkout@v4 + with: + path: elink-portal-common + + - name: Checkout eapim-portal (master) + working-directory: ${{ github.workspace }} + run: | + rm -rf eapim-portal + git clone --depth=1 --branch master \ + http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/eapim-portal.git \ + eapim-portal + + - name: Checkout elink-online-core-jpa (master) + working-directory: ${{ github.workspace }} + run: | + mkdir -p eapim-online + rm -rf eapim-online/elink-online-core-jpa + git clone --depth=1 --branch master \ + http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/elink-online-core-jpa.git \ + eapim-online/elink-online-core-jpa + + - name: Verify toolchain + run: | + java -version + gradle --version + + - name: Gradle build (no tests) + run: gradle clean build -x test --no-daemon + + - name: Upload WAR artifacts + uses: actions/upload-artifact@v3 + with: + name: eapim-portal-wars-${{ github.sha }} + path: | + eapim-portal/build/libs/eapim-portal.war + eapim-portal/build/libs/eapim-portal-boot.war + if-no-files-found: error + + - name: Stop tomcat (pre-clean) + working-directory: ${{ github.workspace }} + run: | + if [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null; then + JAVA_HOME=$JAVA_HOME_TOMCAT "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true + for i in $(seq 1 30); do + [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null || break + sleep 1 + done + fi + rm -f "$CATALINA_PID" + + - name: Deploy war as ROOT + working-directory: ${{ github.workspace }} + run: | + DEPLOY_DIR="$CATALINA_BASE/webapps" + rm -rf "$DEPLOY_DIR/ROOT" "$DEPLOY_DIR/ROOT.war" + cp eapim-portal/build/libs/eapim-portal.war "$DEPLOY_DIR/ROOT.war" + ls -la "$DEPLOY_DIR" + + - name: Start tomcat and health check (timeout 90s) + working-directory: ${{ github.workspace }} + run: | + LOG="$CATALINA_BASE/logs/catalina.$(date +%Y-%m-%d).log" + BEFORE=0 + [ -f "$LOG" ] && BEFORE=$(stat -c %s "$LOG") + + mkdir -p "$(dirname $CATALINA_PID)" + JAVA_HOME=$JAVA_HOME_TOMCAT "$CATALINA_HOME/bin/startup.sh" + + DEADLINE=$(($(date +%s) + 90)) + STATUS=000 + while [ $(date +%s) -lt $DEADLINE ]; do + STATUS=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 http://localhost:$DEPLOY_HTTP_PORT/ 2>/dev/null || echo "000") + if [ "$STATUS" = "200" ]; then + echo "HTTP 200 received from /" + break + fi + if [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | grep -qE "Application listener .* Exception|SEVERE.*startup.Catalina"; then + echo "::error::Startup error detected in log" + tail -c +$((BEFORE+1)) "$LOG" | tail -80 + exit 1 + fi + sleep 2 + done + + if [ "$STATUS" != "200" ]; then + echo "::error::Health check failed within 90s (last HTTP status: $STATUS)" + [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | tail -100 + exit 1 + fi + + echo "--- key boot log lines ---" + tail -c +$((BEFORE+1)) "$LOG" | grep -E "Server startup|Deployment of web" | head -10 || true + + - name: Stop tomcat (post-clean) + if: always() + working-directory: ${{ github.workspace }} + run: | + if [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null; then + JAVA_HOME=$JAVA_HOME_TOMCAT "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true + for i in $(seq 1 30); do + [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null || break + sleep 1 + done + [ -f "$CATALINA_PID" ] && kill -9 "$(cat $CATALINA_PID)" 2>/dev/null || true + fi + rm -f "$CATALINA_PID" diff --git a/build.gradle b/build.gradle index 6df5fe6..a91f172 100644 --- a/build.gradle +++ b/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" diff --git a/src/main/java/com/eactive/apim/portal/approval/entity/Approver.java b/src/main/java/com/eactive/apim/portal/approval/entity/Approver.java index 312acd3..6033e06 100644 --- a/src/main/java/com/eactive/apim/portal/approval/entity/Approver.java +++ b/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) diff --git a/src/main/java/com/eactive/apim/portal/approval/statemachine/ProcessingState.java b/src/main/java/com/eactive/apim/portal/approval/statemachine/ProcessingState.java index 22a4d0b..cc08b9e 100644 --- a/src/main/java/com/eactive/apim/portal/approval/statemachine/ProcessingState.java +++ b/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", ""); diff --git a/src/main/java/com/eactive/apim/portal/approval/statemachine/RequestedState.java b/src/main/java/com/eactive/apim/portal/approval/statemachine/RequestedState.java index 5dfd604..e43f273 100644 --- a/src/main/java/com/eactive/apim/portal/approval/statemachine/RequestedState.java +++ b/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()); } diff --git a/src/main/java/com/eactive/apim/portal/file/service/FileSystemBinaryStorage.java b/src/main/java/com/eactive/apim/portal/file/service/FileSystemBinaryStorage.java index 26b9817..c5f50a5 100644 --- a/src/main/java/com/eactive/apim/portal/file/service/FileSystemBinaryStorage.java +++ b/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; diff --git a/src/main/java/com/eactive/apim/portal/qna/entity/Inquiry.java b/src/main/java/com/eactive/apim/portal/qna/entity/Inquiry.java index e2265b5..df5dfbd 100644 --- a/src/main/java/com/eactive/apim/portal/qna/entity/Inquiry.java +++ b/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") diff --git a/src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java b/src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java index c76efe3..d66f4a5 100644 --- a/src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java +++ b/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); + } } diff --git a/src/main/java/com/eactive/apim/portal/qna/event/InquiryCommentCreatedEvent.java b/src/main/java/com/eactive/apim/portal/qna/event/InquiryCommentCreatedEvent.java new file mode 100644 index 0000000..27f404d --- /dev/null +++ b/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 "
사용 가능 변수:

" + + "
- userName: 수신자 이름

" + + "
- userId: 수신자 ID

" + + "
- inquiryId: 문의 ID

" + + "
- inquirySubject: 문의 제목

" + + "
- commentContent: 댓글 본문

" + + "
- writerName: 작성자 이름

"; + } + + @Override + public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map params) { + Map 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(); + } +} diff --git a/src/main/java/com/eactive/apim/portal/qna/event/InquiryCreatedEvent.java b/src/main/java/com/eactive/apim/portal/qna/event/InquiryCreatedEvent.java index 24b370a..908e225 100644 --- a/src/main/java/com/eactive/apim/portal/qna/event/InquiryCreatedEvent.java +++ b/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 params) { Map 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 { + "
- userName: 수신자 이름

" + "
- userId: 수신자 ID (이메일)

" + "
- inquiryId: 질문 ID

" - + "
- subject: 제목

"; + + "
- inquirySubject: 질문 제목

" + + "
- subject: 질문 제목 (별칭)

" + + "
- writerName: 작성자 이름

"; } } diff --git a/src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java b/src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java index 7d8b91d..95a5656 100644 --- a/src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java +++ b/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) ; diff --git a/src/main/java/com/eactive/apim/portal/template/service/MessageRecipient.java b/src/main/java/com/eactive/apim/portal/template/service/MessageRecipient.java index 8d1d2b0..0d7fa74 100644 --- a/src/main/java/com/eactive/apim/portal/template/service/MessageRecipient.java +++ b/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