Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Rinjae
|
33f17af194 | ||
|
Rinjae
|
b85d439794 | ||
|
Rinjae
|
35efc46545 | ||
|
Rinjae
|
a2a379ec4f | ||
|
Rinjae
|
2c15334ff2 | ||
|
Rinjae
|
6ccfa31b90 |
@@ -75,7 +75,4 @@ 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; //예상완료일
|
||||
}
|
||||
|
||||
@@ -28,8 +28,4 @@ public interface ApprovalState extends Serializable {
|
||||
}
|
||||
|
||||
String getDescription();
|
||||
|
||||
default String getCode() {
|
||||
return toString();
|
||||
}
|
||||
}
|
||||
|
||||
-71
@@ -1,71 +0,0 @@
|
||||
package com.eactive.apim.portal.djb.apistatus.incident.entity;
|
||||
|
||||
import com.eactive.apim.portal.common.entity.Auditable;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.ToString;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.EnumType;
|
||||
import javax.persistence.Enumerated;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.SequenceGenerator;
|
||||
import javax.persistence.Table;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Entity
|
||||
@Table(name = "DJB_APISTATUS_INCIDENT")
|
||||
@Data
|
||||
@ToString(callSuper = true)
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class DjbApistatusIncident extends Auditable {
|
||||
|
||||
@Id
|
||||
@SequenceGenerator(name = "seqDjbApistatusIncident",
|
||||
sequenceName = "SEQ_DJB_APISTATUS_INCIDENT", allocationSize = 1)
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "seqDjbApistatusIncident")
|
||||
@Column(name = "INCIDENT_ID", nullable = false)
|
||||
private Long incidentId;
|
||||
|
||||
@Enumerated(EnumType.STRING)
|
||||
@Column(name = "KIND", length = 20, nullable = false)
|
||||
private IncidentKind kind;
|
||||
|
||||
@Enumerated(EnumType.STRING)
|
||||
@Column(name = "STATE", length = 30)
|
||||
private IncidentState state;
|
||||
|
||||
@Enumerated(EnumType.STRING)
|
||||
@Column(name = "PREVIOUS_STATE", length = 30)
|
||||
private IncidentState previousState;
|
||||
|
||||
@Column(name = "TITLE", length = 500, nullable = false)
|
||||
private String title;
|
||||
|
||||
@Column(name = "SUMMARY", length = 2000)
|
||||
private String summary;
|
||||
|
||||
@Column(name = "STARTED_AT")
|
||||
private LocalDateTime startedAt;
|
||||
|
||||
@Column(name = "END_AT")
|
||||
private LocalDateTime endAt;
|
||||
|
||||
@Column(name = "DETECTED_BY", length = 30, nullable = false)
|
||||
private String detectedBy = "MANUAL";
|
||||
|
||||
@Column(name = "INTERFACE_ID", length = 200)
|
||||
private String interfaceId;
|
||||
|
||||
@Column(name = "NOTICE_ID", length = 36)
|
||||
private String noticeId;
|
||||
|
||||
@Column(name = "DRAFT_YN", length = 1, nullable = false)
|
||||
private String draftYn = "N";
|
||||
|
||||
@Column(name = "FIX_YN", length = 1, nullable = false)
|
||||
private String fixYn = "N";
|
||||
}
|
||||
-38
@@ -1,38 +0,0 @@
|
||||
package com.eactive.apim.portal.djb.apistatus.incident.entity;
|
||||
|
||||
import com.eactive.apim.portal.common.entity.Auditable;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.ToString;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.IdClass;
|
||||
import javax.persistence.Table;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Entity
|
||||
@Table(name = "DJB_APISTATUS_INCIDENT_API")
|
||||
@IdClass(DjbApistatusIncidentApiId.class)
|
||||
@Data
|
||||
@ToString(callSuper = true)
|
||||
@EqualsAndHashCode(callSuper = true, onlyExplicitlyIncluded = true)
|
||||
public class DjbApistatusIncidentApi extends Auditable {
|
||||
|
||||
@Id
|
||||
@EqualsAndHashCode.Include
|
||||
@Column(name = "INCIDENT_ID", nullable = false)
|
||||
private Long incidentId;
|
||||
|
||||
@Id
|
||||
@EqualsAndHashCode.Include
|
||||
@Column(name = "API_ID", length = 30, nullable = false)
|
||||
private String apiId;
|
||||
|
||||
@Column(name = "API_NAME", length = 200)
|
||||
private String apiName;
|
||||
|
||||
@Column(name = "RECOVERED_AT")
|
||||
private LocalDateTime recoveredAt;
|
||||
}
|
||||
-18
@@ -1,18 +0,0 @@
|
||||
package com.eactive.apim.portal.djb.apistatus.incident.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class DjbApistatusIncidentApiId implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long incidentId;
|
||||
private String apiId;
|
||||
}
|
||||
-51
@@ -1,51 +0,0 @@
|
||||
package com.eactive.apim.portal.djb.apistatus.incident.entity;
|
||||
|
||||
import com.eactive.apim.portal.common.entity.Auditable;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.ToString;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.EnumType;
|
||||
import javax.persistence.Enumerated;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.SequenceGenerator;
|
||||
import javax.persistence.Table;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Entity
|
||||
@Table(name = "DJB_APISTATUS_INCIDENT_TIMELINE")
|
||||
@Data
|
||||
@ToString(callSuper = true)
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class DjbApistatusIncidentTimeline extends Auditable {
|
||||
|
||||
@Id
|
||||
@SequenceGenerator(name = "seqDjbApistatusIncidentTimeline",
|
||||
sequenceName = "SEQ_DJB_APISTATUS_INCIDENT_TIMELINE", allocationSize = 1)
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "seqDjbApistatusIncidentTimeline")
|
||||
@Column(name = "TIMELINE_ID", nullable = false)
|
||||
private Long timelineId;
|
||||
|
||||
@Column(name = "INCIDENT_ID", nullable = false)
|
||||
private Long incidentId;
|
||||
|
||||
@Column(name = "EVENT_AT", nullable = false)
|
||||
private LocalDateTime eventAt;
|
||||
|
||||
@Enumerated(EnumType.STRING)
|
||||
@Column(name = "STATE_AFTER", length = 30)
|
||||
private IncidentState stateAfter;
|
||||
|
||||
@Column(name = "BODY", length = 4000, nullable = false)
|
||||
private String body;
|
||||
|
||||
@Column(name = "AUTHOR_TYPE", length = 20, nullable = false)
|
||||
private String authorType = "OPERATOR";
|
||||
|
||||
@Column(name = "VISIBLE_YN", length = 1, nullable = false)
|
||||
private String visibleYn = "Y";
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
package com.eactive.apim.portal.djb.apistatus.incident.entity;
|
||||
|
||||
public enum IncidentKind {
|
||||
INCIDENT,
|
||||
MAINTENANCE
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.eactive.apim.portal.djb.apistatus.incident.entity;
|
||||
|
||||
public enum IncidentState {
|
||||
INVESTIGATING,
|
||||
IDENTIFIED,
|
||||
MONITORING,
|
||||
RESOLVED,
|
||||
CANCELED
|
||||
}
|
||||
-19
@@ -1,19 +0,0 @@
|
||||
package com.eactive.apim.portal.djb.apistatus.incident.repository;
|
||||
|
||||
import com.eactive.apim.portal.djb.apistatus.incident.entity.DjbApistatusIncidentApi;
|
||||
import com.eactive.apim.portal.djb.apistatus.incident.entity.DjbApistatusIncidentApiId;
|
||||
import com.eactive.eai.rms.data.EMSDataSource;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Repository
|
||||
@EMSDataSource
|
||||
public interface DjbApistatusIncidentApiRepository
|
||||
extends JpaRepository<DjbApistatusIncidentApi, DjbApistatusIncidentApiId> {
|
||||
|
||||
List<DjbApistatusIncidentApi> findByIncidentIdOrderByApiId(Long incidentId);
|
||||
|
||||
void deleteByIncidentId(Long incidentId);
|
||||
}
|
||||
-17
@@ -1,17 +0,0 @@
|
||||
package com.eactive.apim.portal.djb.apistatus.incident.repository;
|
||||
|
||||
import com.eactive.apim.portal.djb.apistatus.incident.entity.DjbApistatusIncident;
|
||||
import com.eactive.eai.rms.data.EMSDataSource;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@Repository
|
||||
@EMSDataSource
|
||||
public interface DjbApistatusIncidentRepository
|
||||
extends JpaRepository<DjbApistatusIncident, Long>, JpaSpecificationExecutor<DjbApistatusIncident> {
|
||||
|
||||
Optional<DjbApistatusIncident> findByNoticeId(String noticeId);
|
||||
}
|
||||
-18
@@ -1,18 +0,0 @@
|
||||
package com.eactive.apim.portal.djb.apistatus.incident.repository;
|
||||
|
||||
import com.eactive.apim.portal.djb.apistatus.incident.entity.DjbApistatusIncidentTimeline;
|
||||
import com.eactive.eai.rms.data.EMSDataSource;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Repository
|
||||
@EMSDataSource
|
||||
public interface DjbApistatusIncidentTimelineRepository
|
||||
extends JpaRepository<DjbApistatusIncidentTimeline, Long> {
|
||||
|
||||
List<DjbApistatusIncidentTimeline> findByIncidentIdOrderByEventAtAsc(Long incidentId);
|
||||
|
||||
void deleteByIncidentId(Long incidentId);
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
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();
|
||||
}
|
||||
}
|
||||
@@ -23,21 +23,11 @@ public class InquiryCreatedEvent implements MessageEventHandler {
|
||||
@Override
|
||||
public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map<String, Object> params) {
|
||||
Map<String, String> requestParams = new HashMap<>();
|
||||
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")));
|
||||
requestParams.put("inquiryId", (String) params.get("inquiryId"));
|
||||
requestParams.put("subject", (String) params.get("subject"));
|
||||
return new MessageSendEvent(source, KEY, recipient, requestParams);
|
||||
}
|
||||
|
||||
private String toStr(Object value) {
|
||||
return value == null ? "" : value.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public MessageCode getKey() {
|
||||
return KEY;
|
||||
@@ -54,9 +44,7 @@ public class InquiryCreatedEvent implements MessageEventHandler {
|
||||
+ "<div> - userName: 수신자 이름 </div><br/>"
|
||||
+ "<div> - userId: 수신자 ID (이메일) </div><br/>"
|
||||
+ "<div> - inquiryId: 질문 ID </div><br/>"
|
||||
+ "<div> - inquirySubject: 질문 제목 </div><br/>"
|
||||
+ "<div> - subject: 질문 제목 (별칭) </div><br/>"
|
||||
+ "<div> - writerName: 작성자 이름 </div><br/>";
|
||||
+ "<div> - subject: 제목 </div><br/>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -30,16 +30,6 @@ 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상태 모니터링
|
||||
API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.MESSENGER),
|
||||
// 유량제어 토큰 획득 실패
|
||||
INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.MESSENGER),
|
||||
|
||||
|
||||
// 미 사용, 미 분류
|
||||
@Deprecated
|
||||
@@ -88,6 +78,9 @@ 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)
|
||||
;
|
||||
@@ -122,7 +115,6 @@ public enum MessageCode {
|
||||
NONE (0b0000),
|
||||
EMAIL (0b0001),
|
||||
KAKAO_ALIMTALK (0b0010),
|
||||
MESSENGER (0b0100),
|
||||
;
|
||||
|
||||
@Getter
|
||||
|
||||
@@ -111,17 +111,20 @@ public class MessageSendService {
|
||||
logger.debug(emailRequest.toString());
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
//메신저는 사용하지 않아서 주석 처리함.
|
||||
// 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);
|
||||
// }
|
||||
}
|
||||
|
||||
private void updateMessageParams(MessageRecipient user, Map<String, String> messageParams) {
|
||||
|
||||
Reference in New Issue
Block a user