Q&A 댓글 엔터티 헬퍼 및 알림 코드 추가

- InquiryComment 헬퍼 메서드 - 삭제/관리자 판정
- MessageCode - INQUIRY_COMMENT_CREATED_ADMIN 추가

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

.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"

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

@@ -75,4 +75,7 @@ public class Approval implements Serializable, com.eactive.eai.data.Data {
     @Column(length = 17, name = "end_date")
     @Convert(converter = LocalDateTimeToStringConverter17.class)
     private LocalDateTime approvalDate;
+    
+    @Column(name = "expect_end_date")
+    private String expectEndDate;  //예상완료일
 }

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

@@ -28,4 +28,8 @@ public interface ApprovalState extends Serializable {
     }
 
     String getDescription();
+
+    default String getCode() {
+        return toString();
+    }
 }

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

@@ -0,0 +1,50 @@
+package com.eactive.apim.portal.qna.entity;
+
+import com.eactive.apim.portal.common.entity.Auditable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PTL_INQUIRY_COMMENT")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(exclude = "inquiry")
+public class InquiryComment extends Auditable implements Serializable {
+
+    @Id
+    @Column(name = "id", length = 36, nullable = false)
+    @GenericGenerator(name = "uuid-gen", strategy = "uuid2")
+    @GeneratedValue(generator = "uuid-gen", strategy = GenerationType.IDENTITY)
+    private String id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "INQUIRY_ID", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    private Inquiry inquiry;
+
+    @Lob
+    @Column(name = "COMMENT_DETAIL")
+    private String commentDetail;
+
+    @Column(name = "DEL_YN", length = 1)
+    private String delYn = "N";
+
+    @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/template/entity/MessageCode.java

@@ -30,6 +30,15 @@ public enum MessageCode {
     APP_REGISTER_APPROVED("앱 등록 승인", "FM_APIM009", Channels.EMAIL),
     APP_REGISTER_REJECTED("앱 등록 거절", "FM_APIM010", Channels.EMAIL),
 
+    // Q&A 댓글 등록 (DJBank 커스텀)
+    INQUIRY_COMMENT_CREATED_ADMIN("Q&A 댓글 등록 알림", null, Channels.NONE),
+    
+    
+    // API상태 모니터링
+    API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.MESSENGER),
+    // 유량제어 토큰 획득 실패
+    INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.MESSENGER),
+
 
     // 미 사용, 미 분류
     @Deprecated
@@ -115,6 +124,7 @@ public enum MessageCode {
         NONE            (0b0000),
         EMAIL           (0b0001),
         KAKAO_ALIMTALK  (0b0010),
+        MESSENGER		(0b0100),
         ;
 
         @Getter

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

@@ -111,20 +111,17 @@ public class MessageSendService {
             logger.debug(emailRequest.toString());
         }
 
-        //메신저는 사용하지 않아서 주석 처리함.
-//        if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
-//            MessageRequest messengerRequest = new MessageRequest();
-//            messengerRequest.setMessageCode(MessageRequestEnums.MessageCode.valueOf(template.getMessageCode()));
-//            messengerRequest.setSubject(subject);
-//            String messengerTemplate = buildMessage(template.getMessengerTemplate(), messageParams);
-//            messengerRequest.setMessage(messengerTemplate);
-//            messengerRequest.setRequestDate(LocalDateTime.now());
-//            messengerRequest.setUsername(user.getUsername());
-//            messengerRequest.setMessengerId(user.getMessengerId());
-//            messengerRequest.setEaiInterfaceId();
-//            messengerRequest.setServiceId();
-//            messageRequestRepository.save(messengerRequest);
-//        }
+        if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
+            MessageRequest messengerRequest = new MessageRequest();
+            messengerRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode()));
+            messengerRequest.setSubject(subject);
+            String messengerTemplate = buildMessage(template.getMessengerTemplate(), messageParams);
+            messengerRequest.setMessage(messengerTemplate);
+            messengerRequest.setRequestDate(LocalDateTime.now());
+            messengerRequest.setUsername(user.getUsername());
+            messengerRequest.setMessengerId(user.getUserId());
+            messageRequestRepository.save(messengerRequest);
+        }
     }
 
     private void updateMessageParams(MessageRecipient user, Map<String, String> messageParams) {