diff --git a/src/app/api/message-template/[[...slug]]/route.ts b/src/app/api/message-template/[[...slug]]/route.ts index 34b90d9..b964ee7 100644 --- a/src/app/api/message-template/[[...slug]]/route.ts +++ b/src/app/api/message-template/[[...slug]]/route.ts @@ -2,6 +2,7 @@ import {RouteContext} from "@/types/common"; import {createContactApi} from "@/lib/http-server"; import {errorToResponse} from "@kri/common/http"; +import type { KkoSenderProfile } from "@/types/message"; import type { KkoTemplateDetail, KkoTemplateListResponse, Template, TemplateSummary } from "@kri/common/noti-hub"; // 외부 알림톡 템플릿 목록·상세 조회. JSON 본문을 contact-back에 그대로 전달한다. @@ -35,6 +36,11 @@ export const GET = async (req: NextRequest, context: RouteContext) => { const [action] = slug; const contactApi = await createContactApi(); + if (slug.length === 2 && action === "kko" && slug[1] === "profiles") { + const result = await contactApi.get(`/message-template/kko/profiles`); + return NextResponse.json(result, { status: 200 }); + } + if(slug.length === 2 && slug[1] === "attachment"){ const fileName = searchParams.get("fileName"); if (!fileName) { diff --git a/src/components/message-template/KkoMessageTemplate.tsx b/src/components/message-template/KkoMessageTemplate.tsx index b8f8608..8efa5c9 100644 --- a/src/components/message-template/KkoMessageTemplate.tsx +++ b/src/components/message-template/KkoMessageTemplate.tsx @@ -8,7 +8,6 @@ import { TemplatePurpose, type KkoTemplateDetail, type KkoTemplateSummary, - type TemplateKko, } from "@kri/common/noti-hub"; import { isBlank, type DataVerification } from "@kri/common"; import { RefreshCw } from "lucide-react"; @@ -26,6 +25,7 @@ import { useDeleteTemplateMutation, useKkoTemplateDetailQuery, useKkoTemplateListQuery, + useKkoSenderProfilesQuery, useMainTemplateIdxQuery, useSaveTemplateMutation, useTemplateListQuery, @@ -40,7 +40,7 @@ import { } from "@/const/messageTemplateConst"; import { formatKoreanPhoneNumber } from "@/utils/phone"; import {ProjectMainTemplateUpdateRequest, ProjectSurvey} from "@/types/project"; -import type { TemplateSummaryWithPurpose, TemplateWithPurpose } from "@/types/message"; +import type { KkoSenderProfile, KkoTemplateWithProfile, TemplateSummaryWithPurpose, TemplateWithPurpose } from "@/types/message"; import {MessageVariableList} from "@/components/message-template/MessageVariableList"; import {listHeader} from "@/types/list"; import {useListHeaderQuery} from "@/query/list"; @@ -52,6 +52,7 @@ type KkoTemplateDraft = { tmplatNm: string; sendTel: string; kkoTmplatCd: string; + senderKey: string; }; const EMPTY_DRAFT: KkoTemplateDraft = { @@ -59,6 +60,7 @@ const EMPTY_DRAFT: KkoTemplateDraft = { tmplatNm: "", sendTel: "", kkoTmplatCd: "", + senderKey: "", }; const CHNNL_TY = ChannelType.KKO; @@ -67,7 +69,7 @@ const KEYWORD_DEBOUNCE_MS = 400; const isValidKeyword = (keyword: string) => keyword === "" || (keyword.length >= KKO_TEMPLATE_KEYWORD_MIN_LENGTH && keyword.length <= KKO_TEMPLATE_KEYWORD_MAX_LENGTH); -const isKkoTemplate = (template: TemplateWithPurpose | undefined | null): template is TemplateKko & { tmplatPurpose: TemplatePurpose } => +const isKkoTemplate = (template: TemplateWithPurpose | undefined | null): template is KkoTemplateWithProfile & { tmplatPurpose: TemplatePurpose } => template?.tmplatTy === MessageType.KKO; // 저장 불가 안내. 공용 isKkoTemplateSavable 기준으로 판단하고, 해당하면 저장 요청을 보내지 않는다. @@ -105,13 +107,17 @@ const KkoMessageTemplate = () => { const [mainDesired, setMainDesired] = useState(false); const mainTemplateAppliedRef = useRef(false); + const templateDetailAppliedRef = useRef(null); + const selectionRevisionRef = useRef(0); + const [checkingTemplate, setCheckingTemplate] = useState(false); // Queries const templateListQuery = useTemplateListQuery(CHNNL_TY, itrntPrjctCd, enabled); const mainTemplateQuery = useMainTemplateIdxQuery(prjctIdx, CHNNL_TY, enabled); const templateDetailQuery = useTemplateQuery(selectedTemplateIdx ?? 0, enabled && !!selectedTemplateIdx); - const kkoListQuery = useKkoTemplateListQuery(searchKeyword, enabled); - const kkoDetailQuery = useKkoTemplateDetailQuery(selectedCode, enabled); + const profilesQuery = useKkoSenderProfilesQuery(enabled); + const kkoListQuery = useKkoTemplateListQuery(draft.senderKey, searchKeyword, enabled); + const kkoDetailQuery = useKkoTemplateDetailQuery(draft.senderKey, selectedCode, enabled); const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled) const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled) @@ -132,7 +138,11 @@ const KkoMessageTemplate = () => { const updateMainTemplateMutation = useUpdateMainTemplateMutation(prjctIdx, CHNNL_TY); const deleteTemplateMutation = useDeleteTemplateMutation(CHNNL_TY, itrntPrjctCd, prjctIdx); + const isSaving = checkingTemplate || saveTemplateMutation.isPending; + const resetToNew = () => { + selectionRevisionRef.current += 1; + templateDetailAppliedRef.current = null; setSelectedTemplateIdx(null); setDraft(EMPTY_DRAFT); setSavedPreview(null); @@ -167,16 +177,21 @@ const KkoMessageTemplate = () => { useEffect(() => { const d = templateDetailQuery.data; if (!isKkoTemplate(d) || !selectedTemplateIdx || d.tmplatIdx !== selectedTemplateIdx) return; + if (templateDetailAppliedRef.current === selectedTemplateIdx) return; + templateDetailAppliedRef.current = selectedTemplateIdx; + const senderKey = typeof d.senderKey === "string" ? d.senderKey.trim() : ""; setDraft({ tmplatIdx: d.tmplatIdx, tmplatNm: d.tmplatNm ?? "", sendTel: d.sendTel ?? "", - kkoTmplatCd: d.kkoTmplatCd ?? "", + kkoTmplatCd: senderKey ? d.kkoTmplatCd ?? "" : "", + senderKey, }); - setSavedPreview({ body: d.tmplatBody ?? "", title: d.tmplatTitle ?? "" }); - setSelectedCode(""); + selectionRevisionRef.current += 1; + setSavedPreview(senderKey ? { body: d.tmplatBody ?? "", title: d.tmplatTitle ?? "" } : null); + setSelectedCode(senderKey ? d.kkoTmplatCd ?? "" : ""); setSelectedSummary( - d.kkoTmplatCd + senderKey && d.kkoTmplatCd ? { templateCode: d.kkoTmplatCd, templateName: d.tmplatNm ?? "", serviceStatus: null, createdAt: null, modifiedAt: null } : null, ); @@ -194,6 +209,12 @@ const KkoMessageTemplate = () => { } const idx = Number(value); if (!Number.isFinite(idx)) return; + selectionRevisionRef.current += 1; + templateDetailAppliedRef.current = null; + setDraft(EMPTY_DRAFT); + setSelectedCode(""); + setSelectedSummary(null); + setSavedPreview(null); setSelectedTemplateIdx(idx); }; @@ -217,8 +238,21 @@ const KkoMessageTemplate = () => { await updateMainTemplateMutation.mutateAsync(req); }; + const handleSelectProfile = (senderKey: string) => { + if (senderKey === draft.senderKey) return; + selectionRevisionRef.current += 1; + setDraft((prev) => ({ ...prev, senderKey, kkoTmplatCd: "", tmplatNm: "" })); + setSelectedCode(""); + setSelectedSummary(null); + setSavedPreview(null); + setKeywordInput(""); + setSearchKeyword(""); + }; + const handleSelectExternal = (item: KkoTemplateSummary | null) => { - if (!item) return; + if (!item || !draft.senderKey) return; + selectionRevisionRef.current += 1; + setSavedPreview(null); setSelectedSummary(item); setSelectedCode(item.templateCode); // 템플릿 명은 선택한 알림톡 템플릿 명을 그대로 쓴다. @@ -230,6 +264,8 @@ const KkoMessageTemplate = () => { const fail = (fieldName: string, errMessage: string): DataVerification => ({ success: false, fieldName, errMessage }); if (isBlank(itrntPrjctCd)) return fail("itrntPrjctCd", "인트라넷 프로젝트 코드가 없습니다."); + if (isBlank(d.senderKey)) return fail("senderKey", "발신 프로필을 선택해 주세요."); + if (!profilesQuery.data?.some((profile) => profile.senderKey === d.senderKey)) return fail("senderKey", "사용 가능한 발신 프로필을 다시 선택해 주세요."); if (!d.kkoTmplatCd) return fail("kkoTmplatCd", "알림톡 템플릿을 선택해 주세요."); if (!KKO_TEMPLATE_CODE_REGEX.test(d.kkoTmplatCd)) return fail("kkoTmplatCd", "알림톡 템플릿 코드 형식이 올바르지 않습니다."); if (isBlank(d.tmplatNm)) return fail("tmplatNm", "알림톡 템플릿 명이 없습니다."); @@ -240,6 +276,8 @@ const KkoMessageTemplate = () => { }; const submitTemplate = async (method: "put" | "patch") => { + if (isSaving) return; + const revision = selectionRevisionRef.current; const v = validateDraft(draft); if (!v.success) { alert(v.errMessage); @@ -247,9 +285,11 @@ const KkoMessageTemplate = () => { } // 저장 직전에 외부 상세를 다시 조회해 저장 가능 여부를 확인한다. - // 화면에서 고른 뒤 상태가 바뀌었을 수 있고, 저장된 템플릿을 수정할 때는 상세를 아직 조회하지 않았기 때문이다. + // 화면에서 고른 뒤 상태가 바뀌었을 수 있으므로 최신 상태를 확인한다. + setCheckingTemplate(true); try { - const latestDetail = await fetchKkoTemplateDetail(draft.kkoTmplatCd); + const latestDetail = await fetchKkoTemplateDetail(draft.senderKey, draft.kkoTmplatCd); + if (revision !== selectionRevisionRef.current) return; const warning = getUnsavableWarning(latestDetail); if (warning) { alert(warning); @@ -259,10 +299,12 @@ const KkoMessageTemplate = () => { // 조회 오류는 공통 HTTP 오류 처리로 안내된다. 입력값은 유지한다. console.log(e); return; + } finally { + setCheckingTemplate(false); } - // 본문·제목·senderKey·첨부는 보내지 않는다. 서버가 저장 시 외부 상세를 재조회해 채운다. - const template: TemplateKko & { tmplatPurpose: TemplatePurpose } = { + // 본문·제목·첨부는 서버가 선택한 프로필의 외부 상세를 재조회해 채운다. + const template: KkoTemplateWithProfile & { tmplatPurpose: TemplatePurpose } = { ...(method === "patch" ? { tmplatIdx: draft.tmplatIdx } : {}), itrntPrjctCd, tmplatTy: MessageType.KKO, @@ -271,11 +313,12 @@ const KkoMessageTemplate = () => { sendNm: KKO_SENDER_NAME, sendTel: draft.sendTel, kkoTmplatCd: draft.kkoTmplatCd, + senderKey: draft.senderKey, }; try { const res = await saveTemplateMutation.mutateAsync({ method, template }); - if (!isKkoTemplate(res)) return; + if (!isKkoTemplate(res) || revision !== selectionRevisionRef.current) return; // 저장 응답의 본문·제목·코드를 최종 화면 값으로 쓴다. setDraft({ @@ -283,10 +326,11 @@ const KkoMessageTemplate = () => { tmplatNm: res.tmplatNm ?? draft.tmplatNm, sendTel: res.sendTel ?? draft.sendTel, kkoTmplatCd: res.kkoTmplatCd ?? draft.kkoTmplatCd, + senderKey: res.senderKey ?? draft.senderKey, }); setSavedPreview({ body: res.tmplatBody ?? "", title: res.tmplatTitle ?? "" }); setSelectedTemplateIdx(res.tmplatIdx ?? null); - setSelectedCode(""); + setSelectedCode(res.kkoTmplatCd ?? draft.kkoTmplatCd); if (mainDesired && selectedProject?.prjctIdx && res.tmplatIdx) { await updateMainTemplateMutation.mutateAsync({ @@ -328,7 +372,7 @@ const KkoMessageTemplate = () => { 알림톡 템플릿 관리

- ⚠️ 알림톡 템플릿에 대한 수정 및 등록은 비즈 뿌리오에서 가능하며 여기서는 템플릿 프로젝트에 등록만 가능합니다. + ⚠️ 알림톡 템플릿에 대한 수정 및 등록은 비즈 뿌리오에서 가능하며 여기서는 템플릿을 프로젝트에 등록만 가능합니다.

@@ -347,6 +391,7 @@ const KkoMessageTemplate = () => { {
- + + + items={profilesQuery.data ?? []} + value={draft.senderKey} + onChange={handleSelectProfile} + placeholder="발신 프로필을 선택해 주세요" + heightClassName="h-9" + widthClassName="w-full" + getLabel={(item) => item.uuid} + getValue={(item) => item.senderKey} + disabled={!enabled || isSaving || profilesQuery.isFetching || templateDetailQuery.isFetching} + preventDeselect + /> +

+ {profilesQuery.isFetching + ? "발신 프로필을 조회하는 중입니다." + : profilesQuery.isError + ? "발신 프로필을 불러오지 못했습니다." + : !profilesQuery.data?.length + ? "선택할 발신 프로필이 없습니다." + : draft.senderKey && !profilesQuery.data.some((profile) => profile.senderKey === draft.senderKey) + ? "저장된 발신 프로필을 사용할 수 없습니다. 프로필을 다시 선택해 주세요." + : "발신 프로필을 선택한 뒤 알림톡 템플릿을 선택해 주세요."} +

+ {profilesQuery.isError && ( + + )} +
+ +
+ + key={draft.senderKey} items={externalList} + disabled={!draft.senderKey || isSaving || templateDetailQuery.isFetching} value={draft.kkoTmplatCd} onChange={() => {}} onItemChange={handleSelectExternal} @@ -399,6 +478,7 @@ const KkoMessageTemplate = () => { id="kkoSendTel" placeholder="발신 번호를 입력하세요" value={formatKoreanPhoneNumber(draft.sendTel)} + disabled={isSaving} onChange={(e) => setDraft((prev) => ({ ...prev, sendTel: e.target.value.replace(/\D/g, "") }))} />

@@ -461,19 +541,19 @@ const KkoMessageTemplate = () => { variant="destructive" onClick={() => void handleDelete()} className="w-32 h-10" - disabled={deleteTemplateMutation.isPending || saveTemplateMutation.isPending} + disabled={deleteTemplateMutation.isPending || isSaving} > 삭제 )} - {draft.tmplatIdx && ( diff --git a/src/query/key/keys.ts b/src/query/key/keys.ts index 64c16a8..6f43e80 100644 --- a/src/query/key/keys.ts +++ b/src/query/key/keys.ts @@ -77,8 +77,9 @@ export const qk = { templateAttachments: (tmplatIdx: number) => ["message-template", "attachment", tmplatIdx] as const, templateAttachment: (tmplatIdx: number, fileName: string) => ["message-template", "attachment", tmplatIdx, fileName] as const, - kkoTemplateList: (keyword: string) => ["message-template", "kko", "list", keyword] as const, - kkoTemplateDetail: (templateCode: string) => ["message-template", "kko", "detail", templateCode] as const, + kkoSenderProfiles: ["message-template", "kko", "profiles"] as const, + kkoTemplateList: (senderKey: string, keyword: string) => ["message-template", "kko", "list", senderKey, keyword] as const, + kkoTemplateDetail: (senderKey: string, templateCode: string) => ["message-template", "kko", "detail", senderKey, templateCode] as const, bulkSendList: (sendTy: number, reqstSvc: string, prjctCd: string) => ["message-report", "bulk-list", sendTy, reqstSvc, prjctCd] as const, diff --git a/src/query/message.ts b/src/query/message.ts index 675e773..050512a 100644 --- a/src/query/message.ts +++ b/src/query/message.ts @@ -18,6 +18,7 @@ import type { FileResponse, PageRequest, PageResponse } from "@kri/common"; import { apiError, HttpError } from "@kri/common/http"; import type { ProjectMainTemplateUpdateRequest } from "@/types/project"; import type { + KkoSenderProfile, MessageSendChannel, MessageSendSingleRequest, SendCancelRequest, @@ -204,16 +205,31 @@ export function useUploadTemplateBodyImageMutation(itrntPrjctCd: string) { }); } -/** - * 외부 알림톡 템플릿 목록 (POST /message-template/kko/list) - * keyword가 빈 값이면 기본 목록(ACT 상태 첫 페이지 최대 10개)을 조회한다. - */ -export function useKkoTemplateListQuery(keyword: string, enabled: boolean) { +/** 외부 알림톡 발신 프로필 조회 */ +export function useKkoSenderProfilesQuery(enabled: boolean) { return useQuery({ - queryKey: qk.kkoTemplateList(keyword), + queryKey: qk.kkoSenderProfiles, + queryFn: async () => { + const profiles: unknown = await nextApi.get("/message-template/kko/profiles"); + if (!Array.isArray(profiles) || !profiles.every((profile) => + profile && typeof profile.senderKey === "string" && profile.senderKey.trim() && + typeof profile.name === "string" && typeof profile.uuid === "string" && profile.uuid.trim(), + )) throw new Error("발신 프로필 응답 형식이 올바르지 않습니다."); + return profiles as KkoSenderProfile[]; + }, + enabled, + retry: false, + meta: { ignoreGlobalLoading: true }, + }); +} + +/** keyword가 빈 값이면 선택한 프로필의 기본 목록을 조회한다. */ +export function useKkoTemplateListQuery(senderKey: string, keyword: string, enabled: boolean) { + return useQuery({ + queryKey: qk.kkoTemplateList(senderKey, keyword), queryFn: async () => { const res = await nextApi - .post(`/message-template/kko/list`, keyword ? { keyword } : {}, { + .post(`/message-template/kko/list`, { senderKey, ...(keyword ? { keyword } : {}) }, { skipResponseErrorHandler: true, }) .catch((error: unknown) => { @@ -223,7 +239,7 @@ export function useKkoTemplateListQuery(keyword: string, enabled: boolean) { // 외부 응답이므로 list가 배열이 아닌 경우를 빈 목록으로 다룬다. return Array.isArray(res?.list) ? res.list : []; }, - enabled, + enabled: enabled && !!senderKey, staleTime: 0, retry: false, meta: { ignoreGlobalLoading: true }, @@ -233,14 +249,14 @@ export function useKkoTemplateListQuery(keyword: string, enabled: boolean) { /** * 외부 알림톡 템플릿 상세 (POST /message-template/kko/detail) */ -export const fetchKkoTemplateDetail = (templateCode: string) => - nextApi.post(`/message-template/kko/detail`, { templateCode }); +export const fetchKkoTemplateDetail = (senderKey: string, templateCode: string) => + nextApi.post(`/message-template/kko/detail`, { senderKey, templateCode }); -export function useKkoTemplateDetailQuery(templateCode: string, enabled: boolean) { +export function useKkoTemplateDetailQuery(senderKey: string, templateCode: string, enabled: boolean) { return useQuery({ - queryKey: qk.kkoTemplateDetail(templateCode), - queryFn: () => fetchKkoTemplateDetail(templateCode), - enabled: enabled && !!templateCode, + queryKey: qk.kkoTemplateDetail(senderKey, templateCode), + queryFn: () => fetchKkoTemplateDetail(senderKey, templateCode), + enabled: enabled && !!senderKey && !!templateCode, staleTime: 0, retry: false, meta: { ignoreGlobalLoading: true }, diff --git a/src/types/message.ts b/src/types/message.ts index 93f29a7..1b02f29 100644 --- a/src/types/message.ts +++ b/src/types/message.ts @@ -3,13 +3,22 @@ import type { SendCancelBulkRequest, SendCancelSingleRequest, Template, + TemplateKko, TemplatePurpose, TemplateSummary, } from '@kri/common/noti-hub'; import type { ListFilter } from './list'; +export type KkoSenderProfile = { + senderKey: string; + name: string; + uuid: string; +}; + +export type KkoTemplateWithProfile = TemplateKko & { senderKey?: string }; + // 서버 조회 응답은 모든 채널의 템플릿에 tmplatPurpose를 내려준다. 화면 상태에서는 필수로 다룬다. -export type TemplateWithPurpose = Template & { +export type TemplateWithPurpose = (Exclude | KkoTemplateWithProfile) & { tmplatPurpose: TemplatePurpose; };