260826_01_ENH: notihub 수정으로 인한 후속 조치

This commit is contained in:
2026-08-26 12:46:26 +09:00
parent be67eed7e4
commit a603f6ad6f
11 changed files with 173 additions and 51 deletions

View File

@@ -15,7 +15,7 @@ import {
useTemplateListQuery,
useTemplateQuery,
} from '@/query/message'
import { ChannelType, TemplateSms, type TemplateSummary } from '@kri/common/noti-hub'
import { ChannelType, TemplateSms } from '@kri/common/noti-hub'
import { sanitizeHtmlForPreview } from '@/components/kri-editor/utils/sanitizeHtml'
import { cn } from '@/lib/utils'
import { getNearestFutureDateTime } from '@/lib/datetime'
@@ -28,7 +28,8 @@ import { KriEditor } from '@/components/kri-editor'
import { normalizeQrCodeForEditor, QR_CODE_ALLOWED_HTML, renderQrCodePreviewHtml } from '@/components/message-template/qrcode'
import { applyLinkPreviewClass } from '@/components/kri-editor/utils/linkPreview'
import TemplateAttachmentList from '@/components/message-template/TemplateAttachmentList'
import type { TemplateEmailWithAttachments } from '@/types/message'
import type { TemplateEmailWithAttachments, TemplateSummaryWithPurpose } from '@/types/message'
import { TEMPLATE_PURPOSE } from '@/const/messageTemplateConst'
export type MessageSendMode = 'email' | 'sms'
@@ -79,7 +80,10 @@ const MessageSendDialog = ({
const enabled = resolvedOpen && !!selectedProject && prjctIdx > 0
const templateListQuery = useTemplateListQuery(chnnlTy, itrntPrjctCd, enabled)
const templateList: TemplateSummary[] = templateListQuery.data ?? []
// 대량 발송 및 bulk key 생성 경로에서는 휴대전화번호 인증 템플릿(tmplatPurpose === 1)을 선택할 수 없다.
const templateList: TemplateSummaryWithPurpose[] = (templateListQuery.data ?? []).filter(
(t) => t.tmplatPurpose !== TEMPLATE_PURPOSE.PHONE_VERIFICATION,
)
const templateDetailQuery = useTemplateQuery(templateIdx ?? 0, enabled && !!templateIdx)
const selectedTemplate = templateDetailQuery.data ?? null
const mainTemplateQuery = useMainTemplateIdxQuery(prjctIdx, chnnlTy, enabled)

View File

@@ -20,8 +20,9 @@ import { KriEditor } from '@/components/kri-editor'
import { getNearestFutureDateTime } from '@/lib/datetime'
import { escapeHtml, substituteVariables } from '@/lib/variableSubstitution'
import type { DialogId } from '@/store/jotai/dialog'
import type { MessageSendChannel, TemplateEmailWithAttachments } from '@/types/message'
import type { MessageSendChannel, PhoneVerificationSendData, TemplateEmailWithAttachments } from '@/types/message'
import TemplateAttachmentList from '@/components/message-template/TemplateAttachmentList'
import { TEMPLATE_PURPOSE } from '@/const/messageTemplateConst'
const titleMap: Record<MessageSendChannel, string> = {
email: '메일 발송',
@@ -74,6 +75,9 @@ const SingleMessageSendDialog = ({
const previewValues = variableValues ?? {}
const resolvedTitle = selectedTemplate ? substituteVariables(selectedTemplate.tmplatTitle ?? '', previewValues) : ''
// tmplatPurpose === 1(휴대전화번호 인증) 템플릿은 SMS/LMS 단건 즉시 발송만 허용한다.
const isPhoneVerificationTemplate = selectedTemplate?.tmplatPurpose === TEMPLATE_PURPOSE.PHONE_VERIFICATION
const sendSingleMutation = useSendSingleMessageMutation(channel, prjctIdx)
const mainTemplateAppliedRef = useRef(false)
@@ -86,6 +90,11 @@ const SingleMessageSendDialog = ({
mainTemplateAppliedRef.current = false
}, [resolvedOpen])
// 인증 템플릿 선택 시 예약 발송 옵션을 강제로 즉시 발송으로 되돌린다.
useEffect(() => {
if (isPhoneVerificationTemplate) setScheduleType('instant')
}, [isPhoneVerificationTemplate])
// 대표 템플릿이 있으면 최초 1회 자동 선택
useEffect(() => {
if (!enabled || mainTemplateAppliedRef.current || !mainTemplateQuery.isSuccess) return
@@ -126,7 +135,7 @@ const SingleMessageSendDialog = ({
setSubmitting(true)
try {
await sendSingleMutation.mutateAsync({
const res = await sendSingleMutation.mutateAsync({
tmplatIdx: templateIdx,
resve: scheduleType === 'reserve',
sendDt: scheduleType === 'reserve' ? new Date(reserveAt).toISOString() : undefined,
@@ -134,6 +143,17 @@ const SingleMessageSendDialog = ({
destHeaderIds: [destHeaderId],
})
// cmid는 발송 CMID이며 verificationId와는 다른 식별자이므로 혼용하지 않는다.
const cmid = res.cmid
if (isPhoneVerificationTemplate) {
// 휴대전화번호 인증 응답. verificationId/expireDt는 이후 인증 단계에서 사용할 값이나,
// 이 시스템에서는 인증번호 확인 절차를 사용하지 않으므로 현재는 별도로 활용하지 않는다.
const { verificationId, expireDt } = res.data as PhoneVerificationSendData
void verificationId
void expireDt
}
void cmid
alert('발송 요청이 완료되었습니다.')
onSent?.()
handleOpenChange(false)
@@ -177,26 +197,30 @@ const SingleMessageSendDialog = ({
/>
</div>
<div className="space-y-2">
<Label className="text-sm">발송 일시</Label>
<RadioGroup
value={scheduleType}
onValueChange={(v) => handleScheduleTypeChange(v as 'instant' | 'reserve')}
className="flex items-center gap-4"
>
<div className="flex items-center gap-2 cursor-pointer">
<RadioGroupItem value="instant" id="single-send-instant" />
<Label htmlFor="single-send-instant">즉시</Label>
</div>
<div className="flex items-center gap-2 cursor-pointer">
<RadioGroupItem value="reserve" id="single-send-reserve" />
<Label htmlFor="single-send-reserve">예약</Label>
</div>
</RadioGroup>
{scheduleType === 'reserve' && (
<KriDateTimePicker value={reserveAt} onChange={setReserveAt} placeholder="예약 일시 선택" />
)}
</div>
{isPhoneVerificationTemplate ? (
<p className="text-sm text-muted-foreground">휴대전화번호 인증 템플릿은 즉시 발송만 가능합니다.</p>
) : (
<div className="space-y-2">
<Label className="text-sm">발송 일시</Label>
<RadioGroup
value={scheduleType}
onValueChange={(v) => handleScheduleTypeChange(v as 'instant' | 'reserve')}
className="flex items-center gap-4"
>
<div className="flex items-center gap-2 cursor-pointer">
<RadioGroupItem value="instant" id="single-send-instant" />
<Label htmlFor="single-send-instant">즉시</Label>
</div>
<div className="flex items-center gap-2 cursor-pointer">
<RadioGroupItem value="reserve" id="single-send-reserve" />
<Label htmlFor="single-send-reserve">예약</Label>
</div>
</RadioGroup>
{scheduleType === 'reserve' && (
<KriDateTimePicker value={reserveAt} onChange={setReserveAt} placeholder="예약 일시 선택" />
)}
</div>
)}
</div>
<div className="space-y-2 rounded-md border p-4">