fix(prisma,api): execute ddl statements individually to fix P2021 error and eliminate duplicate toast notifications across app and admin panel
Deploy Canina / deploy (push) Successful in 1m47s
Deploy Canina / deploy (push) Successful in 1m47s
This commit is contained in:
1 parent
13300236f3
commit
e1b035d6dd
5 files changed
+97
-68
No files matched your search
@@ -12,57 +12,61 @@ export class PrismaService
|
||||
}
|
||||
|
||||
private async ensureTablesExist() {
|
||||
try {
|
||||
await this.$executeRawUnsafe(`
|
||||
CREATE TABLE IF NOT EXISTS "tickets" (
|
||||
"id" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
"ticket_number" VARCHAR(50) NOT NULL UNIQUE,
|
||||
"user_id" UUID NOT NULL REFERENCES "users"("id") ON DELETE CASCADE,
|
||||
"pet_id" UUID REFERENCES "pets"("id") ON DELETE SET NULL,
|
||||
"subject" VARCHAR(255) NOT NULL,
|
||||
"category" VARCHAR(50) NOT NULL DEFAULT 'VET_CONSULTATION',
|
||||
"priority" VARCHAR(20) NOT NULL DEFAULT 'MEDIUM',
|
||||
"status" VARCHAR(30) NOT NULL DEFAULT 'OPEN',
|
||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
"updated_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
const ddlStatements = [
|
||||
// 1. Tickets Table
|
||||
`CREATE TABLE IF NOT EXISTS "tickets" (
|
||||
"id" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
"ticket_number" VARCHAR(50) NOT NULL UNIQUE,
|
||||
"user_id" UUID NOT NULL REFERENCES "users"("id") ON DELETE CASCADE,
|
||||
"pet_id" UUID REFERENCES "pets"("id") ON DELETE SET NULL,
|
||||
"subject" VARCHAR(255) NOT NULL,
|
||||
"category" VARCHAR(50) NOT NULL DEFAULT 'VET_CONSULTATION',
|
||||
"priority" VARCHAR(20) NOT NULL DEFAULT 'MEDIUM',
|
||||
"status" VARCHAR(30) NOT NULL DEFAULT 'OPEN',
|
||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
"updated_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||
)`,
|
||||
`CREATE INDEX IF NOT EXISTS "tickets_user_id_idx" ON "tickets"("user_id")`,
|
||||
`CREATE INDEX IF NOT EXISTS "tickets_status_idx" ON "tickets"("status")`,
|
||||
`CREATE INDEX IF NOT EXISTS "tickets_category_idx" ON "tickets"("category")`,
|
||||
`CREATE INDEX IF NOT EXISTS "tickets_created_at_idx" ON "tickets"("created_at")`,
|
||||
|
||||
CREATE INDEX IF NOT EXISTS "tickets_user_id_idx" ON "tickets"("user_id");
|
||||
CREATE INDEX IF NOT EXISTS "tickets_status_idx" ON "tickets"("status");
|
||||
CREATE INDEX IF NOT EXISTS "tickets_category_idx" ON "tickets"("category");
|
||||
CREATE INDEX IF NOT EXISTS "tickets_created_at_idx" ON "tickets"("created_at");
|
||||
// 2. Ticket Messages Table
|
||||
`CREATE TABLE IF NOT EXISTS "ticket_messages" (
|
||||
"id" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
"ticket_id" UUID NOT NULL REFERENCES "tickets"("id") ON DELETE CASCADE,
|
||||
"sender_id" UUID,
|
||||
"sender_role" VARCHAR(30) NOT NULL DEFAULT 'USER',
|
||||
"sender_name" VARCHAR(100) NOT NULL,
|
||||
"message" TEXT NOT NULL,
|
||||
"attachment" TEXT,
|
||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||
)`,
|
||||
`CREATE INDEX IF NOT EXISTS "ticket_messages_ticket_id_idx" ON "ticket_messages"("ticket_id")`,
|
||||
`CREATE INDEX IF NOT EXISTS "ticket_messages_created_at_idx" ON "ticket_messages"("created_at")`,
|
||||
|
||||
CREATE TABLE IF NOT EXISTS "ticket_messages" (
|
||||
"id" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
"ticket_id" UUID NOT NULL REFERENCES "tickets"("id") ON DELETE CASCADE,
|
||||
"sender_id" UUID,
|
||||
"sender_role" VARCHAR(30) NOT NULL DEFAULT 'USER',
|
||||
"sender_name" VARCHAR(100) NOT NULL,
|
||||
"message" TEXT NOT NULL,
|
||||
"attachment" TEXT,
|
||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
// 3. SMS Logs Table
|
||||
`CREATE TABLE IF NOT EXISTS "sms_logs" (
|
||||
"id" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
"phone" VARCHAR(20) NOT NULL,
|
||||
"pattern_id" INTEGER,
|
||||
"message" TEXT,
|
||||
"status" VARCHAR(50) NOT NULL,
|
||||
"bulk_id" VARCHAR(100),
|
||||
"meta" JSONB,
|
||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||
)`,
|
||||
`CREATE INDEX IF NOT EXISTS "sms_logs_phone_idx" ON "sms_logs"("phone")`,
|
||||
`CREATE INDEX IF NOT EXISTS "sms_logs_status_idx" ON "sms_logs"("status")`,
|
||||
`CREATE INDEX IF NOT EXISTS "sms_logs_created_at_idx" ON "sms_logs"("created_at")`
|
||||
];
|
||||
|
||||
CREATE INDEX IF NOT EXISTS "ticket_messages_ticket_id_idx" ON "ticket_messages"("ticket_id");
|
||||
CREATE INDEX IF NOT EXISTS "ticket_messages_created_at_idx" ON "ticket_messages"("created_at");
|
||||
|
||||
CREATE TABLE IF NOT EXISTS "sms_logs" (
|
||||
"id" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
"phone" VARCHAR(20) NOT NULL,
|
||||
"pattern_id" INTEGER,
|
||||
"message" TEXT,
|
||||
"status" VARCHAR(50) NOT NULL,
|
||||
"bulk_id" VARCHAR(100),
|
||||
"meta" JSONB,
|
||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS "sms_logs_phone_idx" ON "sms_logs"("phone");
|
||||
CREATE INDEX IF NOT EXISTS "sms_logs_status_idx" ON "sms_logs"("status");
|
||||
CREATE INDEX IF NOT EXISTS "sms_logs_created_at_idx" ON "sms_logs"("created_at");
|
||||
`);
|
||||
} catch (err) {
|
||||
console.warn('[PrismaService] Auto table check warning:', err);
|
||||
for (const sql of ddlStatements) {
|
||||
try {
|
||||
await this.$executeRawUnsafe(sql);
|
||||
} catch (err: any) {
|
||||
console.warn(`[PrismaService] DDL execution note for (${sql.substring(0, 40)}...):`, err?.message || err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -118,13 +118,23 @@ api.interceptors.response.use(
|
||||
}
|
||||
|
||||
if (status === 403) {
|
||||
toast.error('دسترسی شما به این بخش از پنل ادمین مجاز نمیباشد.');
|
||||
} else if (status !== 401) {
|
||||
toast.error('دسترسی شما به این بخش از پنل ادمین مجاز نمیباشد.', { id: 'admin-403' });
|
||||
(error as unknown as Record<string, boolean>)._toastShown = true;
|
||||
} else if (status !== 401 && !(originalRequest as unknown as Record<string, boolean>)?.hideErrorToast) {
|
||||
let fullMessage = farsiMessage;
|
||||
if (responseData?.details && Array.isArray(responseData.details) && responseData.details.length > 0) {
|
||||
toast.error(responseData.details[0]?.message || farsiMessage);
|
||||
} else {
|
||||
toast.error(farsiMessage);
|
||||
const detailStrings = responseData.details
|
||||
.map((d: unknown) => typeof d === 'string' ? d : ((d as Record<string, string>)?.message || (d as Record<string, string>)?.field))
|
||||
.filter(Boolean);
|
||||
if (detailStrings.length > 0) {
|
||||
const joinedDetails = detailStrings.join('، ');
|
||||
if (!farsiMessage.includes(joinedDetails)) {
|
||||
fullMessage = `${farsiMessage} (${joinedDetails})`;
|
||||
}
|
||||
}
|
||||
}
|
||||
toast.error(fullMessage, { id: fullMessage });
|
||||
(error as unknown as Record<string, boolean>)._toastShown = true;
|
||||
}
|
||||
|
||||
return Promise.reject(error);
|
||||
|
||||
@@ -183,11 +183,12 @@ export default function CheckoutPage() {
|
||||
} catch (err: unknown) {
|
||||
// Re-fetch profile to guarantee local state is always identical to PostgreSQL
|
||||
useUserStore.getState().fetchProfile().catch(() => {});
|
||||
const errorObj = err as { response?: { data?: { message?: string; details?: Array<{ message?: string }> } }; message?: string };
|
||||
const backendMessage = errorObj.response?.data?.message || errorObj.response?.data?.details?.[0]?.message || errorObj.message;
|
||||
// Only toast if message exists and is not a generic duplicate
|
||||
if (backendMessage && !backendMessage.includes("Request failed") && !backendMessage.includes("خطای غیرمنتظره")) {
|
||||
toast.error(`خطا در ثبت سفارش: ${backendMessage}`);
|
||||
if (!(err as Record<string, boolean>)?._toastShown) {
|
||||
const errorObj = err as { response?: { data?: { message?: string; details?: Array<{ message?: string }> } }; message?: string };
|
||||
const backendMessage = errorObj.response?.data?.message || errorObj.response?.data?.details?.[0]?.message || errorObj.message;
|
||||
if (backendMessage && !backendMessage.includes("Request failed")) {
|
||||
toast.error(`خطا در ثبت سفارش: ${backendMessage}`);
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
setLoading(false);
|
||||
|
||||
@@ -64,8 +64,10 @@ export default function UserDashboard() {
|
||||
setIsLoadingTickets(true);
|
||||
const data = await ticketService.getMyTickets();
|
||||
setTickets(data);
|
||||
} catch {
|
||||
toast.error("خطا در دریافت لیست تیکتها");
|
||||
} catch (err: unknown) {
|
||||
if (!(err as Record<string, boolean>)?._toastShown) {
|
||||
toast.error("خطا در دریافت لیست تیکتها");
|
||||
}
|
||||
} finally {
|
||||
setIsLoadingTickets(false);
|
||||
}
|
||||
@@ -99,8 +101,10 @@ export default function UserDashboard() {
|
||||
setNewTicketPetId("");
|
||||
fetchTickets();
|
||||
} catch (err: unknown) {
|
||||
const gErr = err as { response?: { data?: { message?: string } }; message?: string };
|
||||
toast.error(gErr.response?.data?.message || gErr.message || "خطا در ثبت تیکت");
|
||||
if (!(err as Record<string, boolean>)?._toastShown) {
|
||||
const gErr = err as { response?: { data?: { message?: string } }; message?: string };
|
||||
toast.error(gErr.response?.data?.message || gErr.message || "خطا در ثبت تیکت");
|
||||
}
|
||||
} finally {
|
||||
setIsSubmittingTicket(false);
|
||||
}
|
||||
@@ -119,8 +123,10 @@ export default function UserDashboard() {
|
||||
toast.success("پاسخ شما با موفقیت ارسال شد");
|
||||
fetchTickets();
|
||||
} catch (err: unknown) {
|
||||
const gErr = err as { response?: { data?: { message?: string } }; message?: string };
|
||||
toast.error(gErr.response?.data?.message || gErr.message || "خطا در ارسال پاسخ");
|
||||
if (!(err as Record<string, boolean>)?._toastShown) {
|
||||
const gErr = err as { response?: { data?: { message?: string } }; message?: string };
|
||||
toast.error(gErr.response?.data?.message || gErr.message || "خطا در ارسال پاسخ");
|
||||
}
|
||||
} finally {
|
||||
setIsSendingReply(false);
|
||||
}
|
||||
|
||||
@@ -87,12 +87,20 @@ api.interceptors.response.use(
|
||||
|
||||
// Show formatted Farsi toast if not explicitly suppressed and not 401/403/404
|
||||
if (!error.config?.hideErrorToast && status !== 401 && status !== 403 && status !== 404) {
|
||||
let fullMessage = farsiMessage;
|
||||
if (responseData?.details && Array.isArray(responseData.details) && responseData.details.length > 0) {
|
||||
const firstDetailMessage = responseData.details[0]?.message || farsiMessage;
|
||||
toast.error(firstDetailMessage);
|
||||
} else {
|
||||
toast.error(farsiMessage);
|
||||
const detailStrings = responseData.details
|
||||
.map((d: unknown) => typeof d === 'string' ? d : ((d as Record<string, string>)?.message || (d as Record<string, string>)?.field))
|
||||
.filter(Boolean);
|
||||
if (detailStrings.length > 0) {
|
||||
const joinedDetails = detailStrings.join('، ');
|
||||
if (!farsiMessage.includes(joinedDetails)) {
|
||||
fullMessage = `${farsiMessage} (${joinedDetails})`;
|
||||
}
|
||||
}
|
||||
}
|
||||
toast.error(fullMessage, { id: fullMessage });
|
||||
(error as unknown as Record<string, boolean>)._toastShown = true;
|
||||
}
|
||||
}
|
||||
return Promise.reject(error);
|
||||
|
||||
Reference in new issue
Block a user