Compare commits
15
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f2f638f38 | ||
|
|
dda1caf3e0 | ||
|
|
73bc79b4bb | ||
|
|
9520426a66 | ||
|
|
b077423ab2 | ||
|
|
94867fbd5a | ||
|
|
6a37f2f4c7 | ||
|
|
b54338f91f | ||
|
|
c7b95b4d2b | ||
|
|
8e4388c325 | ||
|
|
305995cbe2 | ||
|
|
468170349d | ||
|
|
52446592e7 | ||
|
|
7bca0ef335 | ||
|
|
80717680a1 |
No files matched your search
@@ -14,8 +14,6 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
BRANCH: ${{ github.ref_name }}
|
BRANCH: ${{ github.ref_name }}
|
||||||
SUPPORT_CHAT_KEY: ${{ secrets.SUPPORT_CHAT_KEY }}
|
SUPPORT_CHAT_KEY: ${{ secrets.SUPPORT_CHAT_KEY }}
|
||||||
DEPLOY_SHA: ${{ github.sha }}
|
|
||||||
GITHUB_ACTIONS: 'true'
|
|
||||||
run: |
|
run: |
|
||||||
# 1. رفع مشکل DNS و غیرفعال کردن پروکسی برای دامنه محلی
|
# 1. رفع مشکل DNS و غیرفعال کردن پروکسی برای دامنه محلی
|
||||||
echo "87.248.133.138 git.parsaaghayi.ir" >> /etc/hosts
|
echo "87.248.133.138 git.parsaaghayi.ir" >> /etc/hosts
|
||||||
@@ -27,10 +25,7 @@ jobs:
|
|||||||
|
|
||||||
# 2. دانلود و اجرای اسکریپت deploy.sh بر اساس برنچ جاری
|
# 2. دانلود و اجرای اسکریپت deploy.sh بر اساس برنچ جاری
|
||||||
mkdir -p scripts
|
mkdir -p scripts
|
||||||
wget --no-proxy -qO scripts/deploy.sh https://git.parsaaghayi.ir/parsa/canina/raw/commit/${DEPLOY_SHA}/scripts/deploy.sh
|
wget --no-proxy -qO scripts/deploy.sh https://git.parsaaghayi.ir/parsa/canina/raw/branch/${BRANCH}/scripts/deploy.sh
|
||||||
if [ "$BRANCH" = develop ]; then
|
|
||||||
wget --no-proxy -qO scripts/release-corporate-stage.sh https://git.parsaaghayi.ir/parsa/canina/raw/commit/${DEPLOY_SHA}/scripts/release-corporate-stage.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
chmod +x scripts/deploy.sh
|
chmod +x scripts/deploy.sh
|
||||||
cd scripts
|
cd scripts
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
import { PrismaClient } from '@prisma/client';
|
|
||||||
|
|
||||||
const prisma = new PrismaClient();
|
|
||||||
|
|
||||||
async function cleanFaqs() {
|
|
||||||
console.log('--- Cleaning Misplaced Content Tasks from FAQs ---');
|
|
||||||
const countBefore = await prisma.fAQ.count();
|
|
||||||
console.log(`Total FAQs before cleanup: ${countBefore}`);
|
|
||||||
|
|
||||||
const deleteResult = await prisma.fAQ.deleteMany({
|
|
||||||
where: {
|
|
||||||
OR: [
|
|
||||||
{ question: { contains: 'راهنمای' } },
|
|
||||||
{ question: { contains: 'اینفوگرافیک' } },
|
|
||||||
{ question: { contains: 'نگارش' } },
|
|
||||||
{ question: { contains: 'تدوین' } },
|
|
||||||
{ question: { contains: 'تولید' } },
|
|
||||||
{ question: { contains: 'مقاله' } },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log(`Successfully deleted ${deleteResult.count} misplaced content tasks.`);
|
|
||||||
const countAfter = await prisma.fAQ.count();
|
|
||||||
console.log(`Total real customer FAQs remaining: ${countAfter}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanFaqs()
|
|
||||||
.catch((err) => {
|
|
||||||
console.error('Clean FAQs error:', err);
|
|
||||||
process.exit(1);
|
|
||||||
})
|
|
||||||
.finally(async () => {
|
|
||||||
await prisma.$disconnect();
|
|
||||||
});
|
|
||||||
-117
@@ -1,117 +0,0 @@
|
|||||||
-- CreateTable
|
|
||||||
CREATE TABLE "advisor_contacts" (
|
|
||||||
"id" UUID NOT NULL DEFAULT gen_random_uuid(),
|
|
||||||
"name" VARCHAR(150) NOT NULL,
|
|
||||||
"phone" VARCHAR(20) NOT NULL,
|
|
||||||
"title" VARCHAR(100),
|
|
||||||
"is_default" BOOLEAN NOT NULL DEFAULT false,
|
|
||||||
"is_active" BOOLEAN NOT NULL DEFAULT true,
|
|
||||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updated_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
|
|
||||||
CONSTRAINT "advisor_contacts_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "product_advisors" (
|
|
||||||
"id" UUID NOT NULL DEFAULT gen_random_uuid(),
|
|
||||||
"product_id" UUID NOT NULL,
|
|
||||||
"advisor_id" UUID NOT NULL,
|
|
||||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
|
|
||||||
CONSTRAINT "product_advisors_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "leads" (
|
|
||||||
"id" UUID NOT NULL DEFAULT gen_random_uuid(),
|
|
||||||
"first_name" VARCHAR(100) NOT NULL,
|
|
||||||
"last_name" VARCHAR(100) NOT NULL,
|
|
||||||
"phone" VARCHAR(20) NOT NULL,
|
|
||||||
"product_id" UUID,
|
|
||||||
"advisor_id" UUID,
|
|
||||||
"status" VARCHAR(30) NOT NULL DEFAULT 'PENDING',
|
|
||||||
"notes" TEXT,
|
|
||||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updated_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
|
|
||||||
CONSTRAINT "leads_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "notification_queues" (
|
|
||||||
"id" UUID NOT NULL DEFAULT gen_random_uuid(),
|
|
||||||
"channel" VARCHAR(20) NOT NULL,
|
|
||||||
"recipient" VARCHAR(150) NOT NULL,
|
|
||||||
"event" VARCHAR(50) NOT NULL,
|
|
||||||
"subject" VARCHAR(255),
|
|
||||||
"content" TEXT NOT NULL,
|
|
||||||
"payload" JSONB,
|
|
||||||
"status" VARCHAR(30) NOT NULL DEFAULT 'QUEUED',
|
|
||||||
"attempts" INTEGER NOT NULL DEFAULT 0,
|
|
||||||
"max_attempts" INTEGER NOT NULL DEFAULT 3,
|
|
||||||
"last_error" TEXT,
|
|
||||||
"idempotency_key" VARCHAR(100),
|
|
||||||
"sent_at" TIMESTAMPTZ,
|
|
||||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updated_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
|
|
||||||
CONSTRAINT "notification_queues_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "notification_templates" (
|
|
||||||
"id" UUID NOT NULL DEFAULT gen_random_uuid(),
|
|
||||||
"channel" VARCHAR(20) NOT NULL,
|
|
||||||
"event" VARCHAR(50) NOT NULL,
|
|
||||||
"name" VARCHAR(150) NOT NULL,
|
|
||||||
"subject" VARCHAR(255),
|
|
||||||
"body" TEXT NOT NULL,
|
|
||||||
"pattern_code" VARCHAR(50),
|
|
||||||
"variables" TEXT[] DEFAULT ARRAY[]::TEXT[],
|
|
||||||
"recipient_type" VARCHAR(30) NOT NULL DEFAULT 'customer',
|
|
||||||
"custom_recipient" VARCHAR(150),
|
|
||||||
"is_active" BOOLEAN NOT NULL DEFAULT true,
|
|
||||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updated_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
|
|
||||||
CONSTRAINT "notification_templates_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "advisor_contacts_phone_key" ON "advisor_contacts"("phone");
|
|
||||||
CREATE INDEX "advisor_contacts_phone_idx" ON "advisor_contacts"("phone");
|
|
||||||
CREATE INDEX "advisor_contacts_is_default_idx" ON "advisor_contacts"("is_default");
|
|
||||||
CREATE INDEX "advisor_contacts_is_active_idx" ON "advisor_contacts"("is_active");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "product_advisors_product_id_advisor_id_key" ON "product_advisors"("product_id", "advisor_id");
|
|
||||||
CREATE INDEX "product_advisors_product_id_idx" ON "product_advisors"("product_id");
|
|
||||||
CREATE INDEX "product_advisors_advisor_id_idx" ON "product_advisors"("advisor_id");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "leads_phone_idx" ON "leads"("phone");
|
|
||||||
CREATE INDEX "leads_status_idx" ON "leads"("status");
|
|
||||||
CREATE INDEX "leads_created_at_idx" ON "leads"("created_at");
|
|
||||||
CREATE INDEX "leads_advisor_id_idx" ON "leads"("advisor_id");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "notification_queues_idempotency_key_key" ON "notification_queues"("idempotency_key");
|
|
||||||
CREATE INDEX "notification_queues_status_idx" ON "notification_queues"("status");
|
|
||||||
CREATE INDEX "notification_queues_channel_idx" ON "notification_queues"("channel");
|
|
||||||
CREATE INDEX "notification_queues_event_idx" ON "notification_queues"("event");
|
|
||||||
CREATE INDEX "notification_queues_created_at_idx" ON "notification_queues"("created_at");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "notification_templates_channel_event_key" ON "notification_templates"("channel", "event");
|
|
||||||
CREATE INDEX "notification_templates_channel_idx" ON "notification_templates"("channel");
|
|
||||||
CREATE INDEX "notification_templates_event_idx" ON "notification_templates"("event");
|
|
||||||
CREATE INDEX "notification_templates_is_active_idx" ON "notification_templates"("is_active");
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "product_advisors" ADD CONSTRAINT "product_advisors_product_id_fkey" FOREIGN KEY ("product_id") REFERENCES "products"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
ALTER TABLE "product_advisors" ADD CONSTRAINT "product_advisors_advisor_id_fkey" FOREIGN KEY ("advisor_id") REFERENCES "advisor_contacts"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "leads" ADD CONSTRAINT "leads_product_id_fkey" FOREIGN KEY ("product_id") REFERENCES "products"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
|
||||||
ALTER TABLE "leads" ADD CONSTRAINT "leads_advisor_id_fkey" FOREIGN KEY ("advisor_id") REFERENCES "advisor_contacts"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
|
||||||
-72
@@ -1,72 +0,0 @@
|
|||||||
-- CreateTable approval_requests
|
|
||||||
CREATE TABLE IF NOT EXISTS public.approval_requests (
|
|
||||||
"id" UUID NOT NULL DEFAULT gen_random_uuid(),
|
|
||||||
"department" VARCHAR(50) NOT NULL,
|
|
||||||
"category" VARCHAR(50) NOT NULL,
|
|
||||||
"title" VARCHAR(255) NOT NULL,
|
|
||||||
"payload" JSONB NOT NULL,
|
|
||||||
"test_context" JSONB,
|
|
||||||
"status" VARCHAR(30) NOT NULL DEFAULT 'PENDING',
|
|
||||||
"ceo_notes" TEXT,
|
|
||||||
"executed_at" TIMESTAMPTZ(6),
|
|
||||||
"created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updated_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
|
|
||||||
CONSTRAINT "approval_requests_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable audit_logs
|
|
||||||
CREATE TABLE IF NOT EXISTS public.audit_logs (
|
|
||||||
"id" UUID NOT NULL DEFAULT gen_random_uuid(),
|
|
||||||
"entity" VARCHAR(50) NOT NULL,
|
|
||||||
"entity_id" VARCHAR(100),
|
|
||||||
"action" VARCHAR(50) NOT NULL,
|
|
||||||
"department" VARCHAR(50),
|
|
||||||
"actor" VARCHAR(100) NOT NULL DEFAULT 'SYSTEM',
|
|
||||||
"summary" VARCHAR(255) NOT NULL,
|
|
||||||
"old_values" JSONB,
|
|
||||||
"new_values" JSONB,
|
|
||||||
"metadata" JSONB,
|
|
||||||
"created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
|
|
||||||
CONSTRAINT "audit_logs_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable department_tasks
|
|
||||||
CREATE TABLE IF NOT EXISTS public.department_tasks (
|
|
||||||
"id" UUID NOT NULL DEFAULT gen_random_uuid(),
|
|
||||||
"code" VARCHAR(50) NOT NULL,
|
|
||||||
"department" VARCHAR(50) NOT NULL,
|
|
||||||
"title" VARCHAR(255) NOT NULL,
|
|
||||||
"description" TEXT,
|
|
||||||
"status" VARCHAR(30) NOT NULL DEFAULT 'BACKLOG',
|
|
||||||
"priority" VARCHAR(20) NOT NULL DEFAULT 'MEDIUM',
|
|
||||||
"assignee" VARCHAR(100),
|
|
||||||
"acceptance_criteria" JSONB,
|
|
||||||
"execution_logs" JSONB,
|
|
||||||
"deliverable_url" VARCHAR(255),
|
|
||||||
"approval_id" UUID,
|
|
||||||
"started_at" TIMESTAMPTZ(6),
|
|
||||||
"completed_at" TIMESTAMPTZ(6),
|
|
||||||
"created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updated_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
|
|
||||||
CONSTRAINT "department_tasks_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX IF NOT EXISTS "department_tasks_code_key" ON public.department_tasks("code");
|
|
||||||
CREATE INDEX IF NOT EXISTS "approval_requests_department_idx" ON public.approval_requests("department");
|
|
||||||
CREATE INDEX IF NOT EXISTS "approval_requests_category_idx" ON public.approval_requests("category");
|
|
||||||
CREATE INDEX IF NOT EXISTS "approval_requests_status_idx" ON public.approval_requests("status");
|
|
||||||
CREATE INDEX IF NOT EXISTS "approval_requests_created_at_idx" ON public.approval_requests("created_at");
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS "audit_logs_entity_idx" ON public.audit_logs("entity");
|
|
||||||
CREATE INDEX IF NOT EXISTS "audit_logs_action_idx" ON public.audit_logs("action");
|
|
||||||
CREATE INDEX IF NOT EXISTS "audit_logs_department_idx" ON public.audit_logs("department");
|
|
||||||
CREATE INDEX IF NOT EXISTS "audit_logs_created_at_idx" ON public.audit_logs("created_at");
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS "department_tasks_department_idx" ON public.department_tasks("department");
|
|
||||||
CREATE INDEX IF NOT EXISTS "department_tasks_status_idx" ON public.department_tasks("status");
|
|
||||||
CREATE INDEX IF NOT EXISTS "department_tasks_priority_idx" ON public.department_tasks("priority");
|
|
||||||
CREATE INDEX IF NOT EXISTS "department_tasks_created_at_idx" ON public.department_tasks("created_at");
|
|
||||||
@@ -178,7 +178,7 @@ model Blog {
|
|||||||
slug String @unique @db.VarChar(200)
|
slug String @unique @db.VarChar(200)
|
||||||
content String @db.Text
|
content String @db.Text
|
||||||
excerpt String? @db.Text
|
excerpt String? @db.Text
|
||||||
authorId String @map("author_id") @db.Uuid
|
authorId String? @map("author_id") @db.Uuid
|
||||||
categoryId String? @map("category_id") @db.Uuid
|
categoryId String? @map("category_id") @db.Uuid
|
||||||
imageUrl String? @map("image_url") @db.Text
|
imageUrl String? @map("image_url") @db.Text
|
||||||
imageAlt String? @map("image_alt") @db.VarChar(255)
|
imageAlt String? @map("image_alt") @db.VarChar(255)
|
||||||
@@ -209,7 +209,7 @@ model Blog {
|
|||||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz()
|
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz()
|
||||||
updatedAt DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz()
|
updatedAt DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz()
|
||||||
|
|
||||||
author User @relation(fields: [authorId], references: [id])
|
author User? @relation(fields: [authorId], references: [id])
|
||||||
category BlogCategory? @relation(fields: [categoryId], references: [id], onDelete: SetNull)
|
category BlogCategory? @relation(fields: [categoryId], references: [id], onDelete: SetNull)
|
||||||
tags BlogTag[]
|
tags BlogTag[]
|
||||||
comments BlogComment[]
|
comments BlogComment[]
|
||||||
@@ -286,8 +286,6 @@ model Product {
|
|||||||
reviews ProductReview[]
|
reviews ProductReview[]
|
||||||
competitorPriceLogs CompetitorPriceLog[]
|
competitorPriceLogs CompetitorPriceLog[]
|
||||||
priceSuggestions PriceSuggestion[]
|
priceSuggestions PriceSuggestion[]
|
||||||
productAdvisors ProductAdvisor[]
|
|
||||||
leads Lead[]
|
|
||||||
|
|
||||||
@@index([categorySlug])
|
@@index([categorySlug])
|
||||||
@@index([suitableFor])
|
@@index([suitableFor])
|
||||||
@@ -1090,320 +1088,3 @@ model DepartmentTask {
|
|||||||
@@index([createdAt])
|
@@index([createdAt])
|
||||||
@@map("department_tasks")
|
@@map("department_tasks")
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------
|
|
||||||
// 8. AdvisorContact (مشاوران تخصصی و پاسخگویی)
|
|
||||||
// ------------------------------------------------------------------------------
|
|
||||||
model AdvisorContact {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
name String @db.VarChar(150)
|
|
||||||
phone String @unique @db.VarChar(20)
|
|
||||||
title String? @db.VarChar(100)
|
|
||||||
isDefault Boolean @default(false) @map("is_default")
|
|
||||||
isActive Boolean @default(true) @map("is_active")
|
|
||||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz()
|
|
||||||
updatedAt DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz()
|
|
||||||
|
|
||||||
productAdvisors ProductAdvisor[]
|
|
||||||
leads Lead[]
|
|
||||||
|
|
||||||
@@index([phone])
|
|
||||||
@@index([isDefault])
|
|
||||||
@@index([isActive])
|
|
||||||
@@map("advisor_contacts")
|
|
||||||
}
|
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------
|
|
||||||
// 9. ProductAdvisor (اتصال مشاور به محصول)
|
|
||||||
// ------------------------------------------------------------------------------
|
|
||||||
model ProductAdvisor {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
productId String @map("product_id") @db.Uuid
|
|
||||||
advisorId String @map("advisor_id") @db.Uuid
|
|
||||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz()
|
|
||||||
|
|
||||||
product Product @relation(fields: [productId], references: [id], onDelete: Cascade)
|
|
||||||
advisor AdvisorContact @relation(fields: [advisorId], references: [id], onDelete: Cascade)
|
|
||||||
|
|
||||||
@@unique([productId, advisorId])
|
|
||||||
@@index([productId])
|
|
||||||
@@index([advisorId])
|
|
||||||
@@map("product_advisors")
|
|
||||||
}
|
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------
|
|
||||||
// 10. Lead (درخواستهای تماس و مشاوره کاربران)
|
|
||||||
// ------------------------------------------------------------------------------
|
|
||||||
model Lead {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
firstName String @map("first_name") @db.VarChar(100)
|
|
||||||
lastName String @map("last_name") @db.VarChar(100)
|
|
||||||
phone String @db.VarChar(20)
|
|
||||||
productId String? @map("product_id") @db.Uuid
|
|
||||||
advisorId String? @map("advisor_id") @db.Uuid
|
|
||||||
status String @default("PENDING") @db.VarChar(30) // PENDING, CONTACTED, CANCELLED
|
|
||||||
notes String? @db.Text
|
|
||||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz()
|
|
||||||
updatedAt DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz()
|
|
||||||
|
|
||||||
product Product? @relation(fields: [productId], references: [id], onDelete: SetNull)
|
|
||||||
advisor AdvisorContact? @relation(fields: [advisorId], references: [id], onDelete: SetNull)
|
|
||||||
|
|
||||||
@@index([phone])
|
|
||||||
@@index([status])
|
|
||||||
@@index([createdAt])
|
|
||||||
@@index([advisorId])
|
|
||||||
@@map("leads")
|
|
||||||
}
|
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------
|
|
||||||
// 11. NotificationQueue (صف ناهمگام نوتیفیکیشنها با قابلیت Retry و Idempotency)
|
|
||||||
// ------------------------------------------------------------------------------
|
|
||||||
model NotificationQueue {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
channel String @db.VarChar(20) // SMS, EMAIL
|
|
||||||
recipient String @db.VarChar(150)
|
|
||||||
event String @db.VarChar(50)
|
|
||||||
subject String? @db.VarChar(255)
|
|
||||||
content String @db.Text
|
|
||||||
payload Json? @db.JsonB
|
|
||||||
status String @default("QUEUED") @db.VarChar(30) // QUEUED, PROCESSING, SENT, FAILED
|
|
||||||
attempts Int @default(0)
|
|
||||||
maxAttempts Int @default(3) @map("max_attempts")
|
|
||||||
lastError String? @map("last_error") @db.Text
|
|
||||||
idempotencyKey String? @unique @map("idempotency_key") @db.VarChar(100)
|
|
||||||
sentAt DateTime? @map("sent_at") @db.Timestamptz()
|
|
||||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz()
|
|
||||||
updatedAt DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz()
|
|
||||||
|
|
||||||
@@index([status])
|
|
||||||
@@index([channel])
|
|
||||||
@@index([event])
|
|
||||||
@@index([createdAt])
|
|
||||||
@@map("notification_queues")
|
|
||||||
}
|
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------
|
|
||||||
// 12. NotificationTemplate (قالبهای رویدادها برای ایمیل و پیامک)
|
|
||||||
// ------------------------------------------------------------------------------
|
|
||||||
model NotificationTemplate {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
channel String @db.VarChar(20) // SMS, EMAIL
|
|
||||||
event String @db.VarChar(50) // ORDER_CREATED, PAYMENT_SUCCESS, NEW_LEAD, etc.
|
|
||||||
name String @db.VarChar(150)
|
|
||||||
subject String? @db.VarChar(255)
|
|
||||||
body String @db.Text
|
|
||||||
patternCode String? @map("pattern_code") @db.VarChar(50)
|
|
||||||
variables String[] @default([])
|
|
||||||
recipientType String @default("customer") @map("recipient_type") @db.VarChar(30)
|
|
||||||
customRecipient String? @map("custom_recipient") @db.VarChar(150)
|
|
||||||
isActive Boolean @default(true) @map("is_active")
|
|
||||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz()
|
|
||||||
updatedAt DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz()
|
|
||||||
|
|
||||||
@@unique([channel, event])
|
|
||||||
@@index([channel])
|
|
||||||
@@index([event])
|
|
||||||
@@index([isActive])
|
|
||||||
@@map("notification_templates")
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
enum CorporateTaskStatus {
|
|
||||||
TODO
|
|
||||||
IN_PROGRESS
|
|
||||||
TEST
|
|
||||||
DONE
|
|
||||||
BLOCKED
|
|
||||||
REJECTED
|
|
||||||
CANCELLED
|
|
||||||
}
|
|
||||||
|
|
||||||
enum CorporatePriority {
|
|
||||||
CEO_EXPEDITE
|
|
||||||
CRITICAL
|
|
||||||
HIGH
|
|
||||||
MEDIUM
|
|
||||||
LOW
|
|
||||||
}
|
|
||||||
|
|
||||||
model CorporateTask {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
taskCode String @unique
|
|
||||||
title String
|
|
||||||
normalizedTitle String
|
|
||||||
normalizedCode String
|
|
||||||
description String
|
|
||||||
department String
|
|
||||||
priority CorporatePriority @default(CEO_EXPEDITE)
|
|
||||||
status CorporateTaskStatus @default(TODO)
|
|
||||||
actionType String @default("CEO_DIRECTIVE")
|
|
||||||
dueCycle String?
|
|
||||||
parentId String? @db.Uuid
|
|
||||||
parent CorporateTask? @relation("TaskChildren", fields: [parentId], references: [id])
|
|
||||||
children CorporateTask[] @relation("TaskChildren")
|
|
||||||
goalId String? @db.Uuid
|
|
||||||
goal CorporateGoal? @relation(fields: [goalId], references: [id])
|
|
||||||
assignedAgent String?
|
|
||||||
claimToken String? @db.Uuid
|
|
||||||
leasedUntil DateTime? @db.Timestamptz()
|
|
||||||
executionCount Int @default(0)
|
|
||||||
qaCount Int @default(0)
|
|
||||||
rejectionCount Int @default(0)
|
|
||||||
createdBy String
|
|
||||||
createdAt DateTime @default(now()) @db.Timestamptz()
|
|
||||||
updatedAt DateTime @updatedAt @db.Timestamptz()
|
|
||||||
logs CorporateEvent[]
|
|
||||||
evidence CorporateEvidence[]
|
|
||||||
reviews CorporateReview[]
|
|
||||||
effects CorporateEffect[]
|
|
||||||
@@index([status, priority, updatedAt])
|
|
||||||
@@index([parentId])
|
|
||||||
@@index([goalId])
|
|
||||||
@@map("corporate_tasks")
|
|
||||||
}
|
|
||||||
|
|
||||||
model CorporateEvent {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
taskId String @db.Uuid
|
|
||||||
task CorporateTask @relation(fields: [taskId], references: [id])
|
|
||||||
speaker String
|
|
||||||
speakerName String
|
|
||||||
step String
|
|
||||||
content String
|
|
||||||
payload Json?
|
|
||||||
timestamp DateTime @default(now()) @db.Timestamptz()
|
|
||||||
@@index([taskId, timestamp])
|
|
||||||
@@map("corporate_events")
|
|
||||||
}
|
|
||||||
|
|
||||||
model CorporateEvidence {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
taskId String @db.Uuid
|
|
||||||
task CorporateTask @relation(fields: [taskId], references: [id])
|
|
||||||
claimToken String @db.Uuid
|
|
||||||
executor String
|
|
||||||
artifactUri String
|
|
||||||
sha256 String
|
|
||||||
summary String
|
|
||||||
tool String
|
|
||||||
result String
|
|
||||||
createdAt DateTime @default(now()) @db.Timestamptz()
|
|
||||||
reviews CorporateReview[]
|
|
||||||
@@index([taskId])
|
|
||||||
@@map("corporate_evidence")
|
|
||||||
}
|
|
||||||
|
|
||||||
model CorporateReview {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
taskId String @db.Uuid
|
|
||||||
task CorporateTask @relation(fields: [taskId], references: [id])
|
|
||||||
evidenceId String @db.Uuid
|
|
||||||
evidence CorporateEvidence @relation(fields: [evidenceId], references: [id])
|
|
||||||
reviewer String
|
|
||||||
passed Boolean
|
|
||||||
findings String
|
|
||||||
verification Json
|
|
||||||
createdAt DateTime @default(now()) @db.Timestamptz()
|
|
||||||
@@index([taskId])
|
|
||||||
@@map("corporate_reviews")
|
|
||||||
}
|
|
||||||
|
|
||||||
model CorporateResearch {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
title String
|
|
||||||
category String
|
|
||||||
source String
|
|
||||||
opportunity String
|
|
||||||
impact String
|
|
||||||
recommendedAction String
|
|
||||||
status String @default("DISCOVERED")
|
|
||||||
cadence String
|
|
||||||
provenance Json
|
|
||||||
createdBy String
|
|
||||||
createdAt DateTime @default(now()) @db.Timestamptz()
|
|
||||||
sources CorporateSource[]
|
|
||||||
roadmaps CorporateRoadmap[]
|
|
||||||
@@map("corporate_research")
|
|
||||||
}
|
|
||||||
|
|
||||||
model CorporateSource {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
researchId String @db.Uuid
|
|
||||||
research CorporateResearch @relation(fields: [researchId], references: [id])
|
|
||||||
url String
|
|
||||||
title String
|
|
||||||
excerpt String
|
|
||||||
retrievedAt DateTime @db.Timestamptz()
|
|
||||||
sha256 String
|
|
||||||
@@index([researchId])
|
|
||||||
@@map("corporate_sources")
|
|
||||||
}
|
|
||||||
|
|
||||||
model CorporateRoadmap {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
researchId String @db.Uuid
|
|
||||||
research CorporateResearch @relation(fields: [researchId], references: [id])
|
|
||||||
cycleName String
|
|
||||||
month String
|
|
||||||
seasonalTheme String
|
|
||||||
strategicGoals String[]
|
|
||||||
plannedArticlesCount Int
|
|
||||||
plannedRefreshesCount Int
|
|
||||||
plannedCatalogEnrichments Int
|
|
||||||
isActive Boolean @default(false)
|
|
||||||
createdBy String
|
|
||||||
createdAt DateTime @default(now()) @db.Timestamptz()
|
|
||||||
goals CorporateGoal[]
|
|
||||||
@@index([month])
|
|
||||||
@@map("corporate_roadmaps")
|
|
||||||
}
|
|
||||||
|
|
||||||
model CorporateGoal {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
roadmapId String @db.Uuid
|
|
||||||
roadmap CorporateRoadmap @relation(fields: [roadmapId], references: [id])
|
|
||||||
title String
|
|
||||||
department String
|
|
||||||
acceptanceCriteria String
|
|
||||||
metric String
|
|
||||||
target Float?
|
|
||||||
createdAt DateTime @default(now()) @db.Timestamptz()
|
|
||||||
tasks CorporateTask[]
|
|
||||||
@@index([roadmapId])
|
|
||||||
@@map("corporate_goals")
|
|
||||||
}
|
|
||||||
|
|
||||||
model CorporateEffect {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
taskId String @db.Uuid
|
|
||||||
task CorporateTask @relation(fields: [taskId], references: [id])
|
|
||||||
metric String
|
|
||||||
availability String
|
|
||||||
baseline Float?
|
|
||||||
observed Float?
|
|
||||||
source String
|
|
||||||
observedAt DateTime @db.Timestamptz()
|
|
||||||
recordedBy String
|
|
||||||
createdAt DateTime @default(now()) @db.Timestamptz()
|
|
||||||
@@index([taskId])
|
|
||||||
@@map("corporate_effects")
|
|
||||||
}
|
|
||||||
|
|
||||||
model CorporateReport {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
day String @unique
|
|
||||||
summary String
|
|
||||||
snapshot Json
|
|
||||||
createdBy String
|
|
||||||
createdAt DateTime @default(now()) @db.Timestamptz()
|
|
||||||
@@map("corporate_reports")
|
|
||||||
}
|
|
||||||
|
|
||||||
model CorporateOperation {
|
|
||||||
key String @id
|
|
||||||
payloadHash String
|
|
||||||
response Json
|
|
||||||
createdAt DateTime @default(now()) @db.Timestamptz()
|
|
||||||
@@map("corporate_operations")
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
import { PrismaClient } from '@prisma/client';
|
|
||||||
|
|
||||||
const prisma = new PrismaClient();
|
|
||||||
|
|
||||||
const defaultFaqs = [
|
|
||||||
{
|
|
||||||
order: 1,
|
|
||||||
question: 'آیا برای خرید مکملهای تخصصی کنینا به نسخه دامپزشک نیاز است؟',
|
|
||||||
answer: 'خیر، مکملهای غذایی و درمانی کنینا بدون نسخه قابل سفارش هستند. با این وجود جهت تعیین دقیقترین دوز مصرفی متناسب با سن، وزن و شرایط بالینی پت دلبندتان، میتوانید از خدمات مشاوره تخصصی و رایگان دامپزشکان کنینا استفاده نمایید.',
|
|
||||||
isActive: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
order: 2,
|
|
||||||
question: 'چگونه میتوانم از اصالت مکملهای آلمانی کنینا اطمینان حاصل کنم؟',
|
|
||||||
answer: 'تمامی محصولات کنینا در ایران به صورت ۱۰۰٪ اورجینال و با هولوگرام اصالت، بارکد رسمی کارخانه Canina pharma GmbH آلمان و بچنامبر معتبر عرضه میگردند و اصالت آنها تضمین بالینی و قانونی دارد.',
|
|
||||||
isActive: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
order: 3,
|
|
||||||
question: 'ارسال سفارشها به چه صورت است و چقدر زمان میبرد؟',
|
|
||||||
answer: 'سفارشهای تهران از طریق پیک اختصاصی و اکسپرس در همان روز یا روز بعد و سفارشهای سراسر کشور از طریق پست پیشتاز و تیپاکس ظرف ۲ الی ۴ روز کاری با بستهبندی ایمن و استاندارد تحویل داده میشوند.',
|
|
||||||
isActive: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
order: 4,
|
|
||||||
question: 'شرایط ارسال رایگان سفارشها چیست؟',
|
|
||||||
answer: 'سفارشهای بالای ۲,۰۰۰,۰۰۰ تومان در سراسر کشور مشمول ارسال کاملاً رایگان کنینا خواهند شد.',
|
|
||||||
isActive: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
order: 5,
|
|
||||||
question: 'آیا امکان دریافت مشاوره قبل از خرید مکمل مفاصل یا کلسیم وجود دارد؟',
|
|
||||||
answer: 'بله، شما میتوانید از طریق کلید شناور «درخواست مشاوره تلفنی» در سایت یا شماره تماس پشتیبانی با کارشناسان و کادر دامپزشکی ما گفتگوی مستقیم و رایگان داشته باشید.',
|
|
||||||
isActive: true,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
async function seedRealFaqs() {
|
|
||||||
console.log('--- Seeding Real Customer FAQs ---');
|
|
||||||
for (const item of defaultFaqs) {
|
|
||||||
await prisma.fAQ.create({
|
|
||||||
data: item,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
const count = await prisma.fAQ.count();
|
|
||||||
console.log(`Successfully seeded real customer FAQs. Total count: ${count}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
seedRealFaqs()
|
|
||||||
.catch((err) => {
|
|
||||||
console.error('Seed error:', err);
|
|
||||||
process.exit(1);
|
|
||||||
})
|
|
||||||
.finally(async () => {
|
|
||||||
await prisma.$disconnect();
|
|
||||||
});
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
import { PrismaClient } from '@prisma/client';
|
|
||||||
|
|
||||||
const prisma = new PrismaClient();
|
|
||||||
|
|
||||||
async function main() {
|
|
||||||
console.log('--- Inspecting and Cleaning FAQs ---');
|
|
||||||
|
|
||||||
const totalBefore = await prisma.fAQ.count();
|
|
||||||
console.log(`Total FAQs before: ${totalBefore}`);
|
|
||||||
|
|
||||||
const activeCount = await prisma.fAQ.count({ where: { isActive: true } });
|
|
||||||
const inactiveCount = await prisma.fAQ.count({ where: { isActive: false } });
|
|
||||||
console.log(`Active FAQs: ${activeCount}, Inactive FAQs: ${inactiveCount}`);
|
|
||||||
|
|
||||||
// Fetch sample of active and inactive
|
|
||||||
const sampleActive = await prisma.fAQ.findMany({
|
|
||||||
where: { isActive: true },
|
|
||||||
select: { id: true, question: true, order: true },
|
|
||||||
take: 5,
|
|
||||||
});
|
|
||||||
console.log('Sample Active FAQs:', JSON.stringify(sampleActive, null, 2));
|
|
||||||
|
|
||||||
// Find tasks that contain content development phrases
|
|
||||||
const tasksToDelete = await prisma.fAQ.findMany({
|
|
||||||
where: {
|
|
||||||
OR: [
|
|
||||||
{ question: { contains: 'راهنمای' } },
|
|
||||||
{ question: { contains: 'اینفوگرافیک' } },
|
|
||||||
{ question: { contains: 'نگارش' } },
|
|
||||||
{ question: { contains: 'تدوین' } },
|
|
||||||
{ question: { contains: 'تولید' } },
|
|
||||||
{ question: { contains: 'مقاله' } },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
select: { id: true, question: true, isActive: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log(`Found ${tasksToDelete.length} content tasks inside FAQs table.`);
|
|
||||||
|
|
||||||
if (tasksToDelete.length > 0) {
|
|
||||||
const ids = tasksToDelete.map(t => t.id);
|
|
||||||
const deleteResult = await prisma.fAQ.deleteMany({
|
|
||||||
where: { id: { in: ids } },
|
|
||||||
});
|
|
||||||
console.log(`Successfully deleted ${deleteResult.count} misplaced content tasks from faqs.`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const totalAfter = await prisma.fAQ.count();
|
|
||||||
console.log(`Total FAQs remaining: ${totalAfter}`);
|
|
||||||
|
|
||||||
const remaining = await prisma.fAQ.findMany({
|
|
||||||
select: { id: true, question: true, isActive: true, order: true },
|
|
||||||
take: 10,
|
|
||||||
});
|
|
||||||
console.log('Remaining FAQs:', JSON.stringify(remaining, null, 2));
|
|
||||||
}
|
|
||||||
|
|
||||||
main()
|
|
||||||
.catch(e => {
|
|
||||||
console.error(e);
|
|
||||||
process.exit(1);
|
|
||||||
})
|
|
||||||
.finally(async () => {
|
|
||||||
await prisma.$disconnect();
|
|
||||||
});
|
|
||||||
@@ -57,7 +57,7 @@ export class AdminController {
|
|||||||
@ApiQuery({ name: "search", required: false, description: "جستجو" })
|
@ApiQuery({ name: "search", required: false, description: "جستجو" })
|
||||||
async getUsers(@Query() query: AdminQueryDto) {
|
async getUsers(@Query() query: AdminQueryDto) {
|
||||||
const result = await this.adminService.getUsers(query);
|
const result = await this.adminService.getUsers(query);
|
||||||
return { success: true, ...result };
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("users")
|
@Post("users")
|
||||||
@@ -145,7 +145,7 @@ export class AdminController {
|
|||||||
@ApiQuery({ name: "search", required: false, description: "جستجو" })
|
@ApiQuery({ name: "search", required: false, description: "جستجو" })
|
||||||
async getProducts(@Query() query: AdminQueryDto) {
|
async getProducts(@Query() query: AdminQueryDto) {
|
||||||
const result = await this.adminService.getProducts(query);
|
const result = await this.adminService.getProducts(query);
|
||||||
return { success: true, ...result };
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("products")
|
@Post("products")
|
||||||
@@ -206,7 +206,7 @@ export class AdminController {
|
|||||||
@ApiQuery({ name: "status", required: false, description: "فیلتر وضعیت" })
|
@ApiQuery({ name: "status", required: false, description: "فیلتر وضعیت" })
|
||||||
async getOrders(@Query() query: AdminQueryDto) {
|
async getOrders(@Query() query: AdminQueryDto) {
|
||||||
const result = await this.adminService.getOrders(query);
|
const result = await this.adminService.getOrders(query);
|
||||||
return { success: true, ...result };
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get("orders/:id")
|
@Get("orders/:id")
|
||||||
@@ -354,4 +354,34 @@ export class AdminController {
|
|||||||
await this.settingsService.updateBulkUiTexts(body);
|
await this.settingsService.updateBulkUiTexts(body);
|
||||||
return { success: true, data: body };
|
return { success: true, data: body };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Get("symptoms")
|
||||||
|
@ApiOperation({ summary: "لیست کامل علائم درمانی با صفحهبندی، جستجو و متادیتا" })
|
||||||
|
async getSymptoms(@Query() query: { page?: number; limit?: number; search?: string }) {
|
||||||
|
const res = await this.adminService.getSymptoms(query);
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post("symptoms")
|
||||||
|
@ApiOperation({ summary: "افزودن علامت درمانی جدید" })
|
||||||
|
async createSymptom(@Body() body: { name: string; slug?: string; description?: string; metaTitle?: string; metaDescription?: string; keywords?: string }) {
|
||||||
|
const res = await this.adminService.createSymptom(body);
|
||||||
|
return { success: true, data: res };
|
||||||
|
}
|
||||||
|
|
||||||
|
@Put("symptoms/:id")
|
||||||
|
@ApiOperation({ summary: "ویرایش کامل علامت درمانی و متادیتاهای سئو" })
|
||||||
|
async updateSymptom(@Param("id") id: string, @Body() body: any) {
|
||||||
|
const res = await this.adminService.updateSymptom(id, body);
|
||||||
|
return { success: true, data: res };
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete("symptoms/:id")
|
||||||
|
@ApiOperation({ summary: "حذف علامت درمانی" })
|
||||||
|
async deleteSymptom(@Param("id") id: string) {
|
||||||
|
const res = await this.adminService.deleteSymptom(id);
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
import { Module } from "@nestjs/common";
|
import { Module } from "@nestjs/common";
|
||||||
import { CorporateController } from "./hermes/corporate.controller";
|
|
||||||
import { CorporateService } from "./hermes/corporate.service";
|
|
||||||
import { AdminController } from "./admin.controller";
|
import { AdminController } from "./admin.controller";
|
||||||
import { AdminService } from "./admin.service";
|
import { AdminService } from "./admin.service";
|
||||||
import { ReportsController } from "./reports.controller";
|
import { ReportsController } from "./reports.controller";
|
||||||
@@ -35,7 +33,6 @@ import { SupportChatAnalyticsService } from "./support-chat-analytics.service";
|
|||||||
@Module({
|
@Module({
|
||||||
imports: [PrismaModule, RedisModule, SettingsModule],
|
imports: [PrismaModule, RedisModule, SettingsModule],
|
||||||
controllers: [
|
controllers: [
|
||||||
CorporateController,
|
|
||||||
AdminController,
|
AdminController,
|
||||||
ReportsController,
|
ReportsController,
|
||||||
MediaController,
|
MediaController,
|
||||||
@@ -55,7 +52,6 @@ import { SupportChatAnalyticsService } from "./support-chat-analytics.service";
|
|||||||
SupportChatAnalyticsController,
|
SupportChatAnalyticsController,
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
CorporateService,
|
|
||||||
AdminService,
|
AdminService,
|
||||||
ReportsService,
|
ReportsService,
|
||||||
MediaService,
|
MediaService,
|
||||||
|
|||||||
@@ -1869,4 +1869,164 @@ export class AdminService {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async getSymptoms(params?: { page?: number; limit?: number; search?: string }) {
|
||||||
|
const page = Math.max(1, Number(params?.page) || 1);
|
||||||
|
const limit = Math.max(1, Number(params?.limit) || 20);
|
||||||
|
const offset = (page - 1) * limit;
|
||||||
|
const search = params?.search?.trim() || '';
|
||||||
|
|
||||||
|
let items: any[] = [];
|
||||||
|
let total = 0;
|
||||||
|
|
||||||
|
if (search) {
|
||||||
|
const searchPattern = `%${search}%`;
|
||||||
|
const [listResult, countResult] = await Promise.all([
|
||||||
|
this.prisma.$queryRaw<any[]>`
|
||||||
|
SELECT
|
||||||
|
s.id,
|
||||||
|
s.name,
|
||||||
|
s.slug,
|
||||||
|
s.description,
|
||||||
|
s.meta_title as "metaTitle",
|
||||||
|
s.meta_description as "metaDescription",
|
||||||
|
s.keywords,
|
||||||
|
s.icon,
|
||||||
|
s.created_at as "createdAt",
|
||||||
|
COALESCE(COUNT(ps.product_id), 0)::int as "productsCount"
|
||||||
|
FROM symptoms s
|
||||||
|
LEFT JOIN product_symptoms ps ON ps.symptom = s.name
|
||||||
|
WHERE s.name ILIKE ${searchPattern} OR s.slug ILIKE ${searchPattern}
|
||||||
|
GROUP BY s.id, s.name, s.slug, s.description, s.meta_title, s.meta_description, s.keywords, s.icon, s.created_at
|
||||||
|
ORDER BY s.name ASC
|
||||||
|
LIMIT ${limit} OFFSET ${offset};
|
||||||
|
`,
|
||||||
|
this.prisma.$queryRaw<any[]>`
|
||||||
|
SELECT COUNT(*)::int as total
|
||||||
|
FROM symptoms s
|
||||||
|
WHERE s.name ILIKE ${searchPattern} OR s.slug ILIKE ${searchPattern};
|
||||||
|
`,
|
||||||
|
]);
|
||||||
|
items = listResult;
|
||||||
|
total = countResult[0]?.total || 0;
|
||||||
|
} else {
|
||||||
|
const [listResult, countResult] = await Promise.all([
|
||||||
|
this.prisma.$queryRaw<any[]>`
|
||||||
|
SELECT
|
||||||
|
s.id,
|
||||||
|
s.name,
|
||||||
|
s.slug,
|
||||||
|
s.description,
|
||||||
|
s.meta_title as "metaTitle",
|
||||||
|
s.meta_description as "metaDescription",
|
||||||
|
s.keywords,
|
||||||
|
s.icon,
|
||||||
|
s.created_at as "createdAt",
|
||||||
|
COALESCE(COUNT(ps.product_id), 0)::int as "productsCount"
|
||||||
|
FROM symptoms s
|
||||||
|
LEFT JOIN product_symptoms ps ON ps.symptom = s.name
|
||||||
|
GROUP BY s.id, s.name, s.slug, s.description, s.meta_title, s.meta_description, s.keywords, s.icon, s.created_at
|
||||||
|
ORDER BY s.name ASC
|
||||||
|
LIMIT ${limit} OFFSET ${offset};
|
||||||
|
`,
|
||||||
|
this.prisma.$queryRaw<any[]>`
|
||||||
|
SELECT COUNT(*)::int as total
|
||||||
|
FROM symptoms s;
|
||||||
|
`,
|
||||||
|
]);
|
||||||
|
items = listResult;
|
||||||
|
total = countResult[0]?.total || 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const lastPage = Math.ceil(total / limit) || 1;
|
||||||
|
|
||||||
|
return {
|
||||||
|
data: items,
|
||||||
|
meta: {
|
||||||
|
page,
|
||||||
|
limit,
|
||||||
|
total,
|
||||||
|
lastPage,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async createSymptom(dto: { name: string; slug?: string; description?: string; metaTitle?: string; metaDescription?: string; keywords?: string }) {
|
||||||
|
if (!dto.name?.trim()) throw new BadRequestException('نام علامت الزامی است');
|
||||||
|
const name = dto.name.trim();
|
||||||
|
const slug = dto.slug?.trim() || name.replace(/\s+/g, '-').toLowerCase();
|
||||||
|
|
||||||
|
return await this.prisma.$queryRawUnsafe(`
|
||||||
|
INSERT INTO symptoms (name, slug, description, meta_title, meta_description, keywords)
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6)
|
||||||
|
RETURNING id, name, slug, description, meta_title as "metaTitle", meta_description as "metaDescription", keywords;
|
||||||
|
`, name, slug, dto.description || '', dto.metaTitle || '', dto.metaDescription || '', dto.keywords || '');
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateSymptom(id: string, dto: { name?: string; slug?: string; description?: string; metaTitle?: string; metaDescription?: string; keywords?: string }) {
|
||||||
|
// 1. Get existing symptom
|
||||||
|
const existing = await this.prisma.$queryRawUnsafe<any[]>(`SELECT * FROM symptoms WHERE id = $1::uuid LIMIT 1`, id);
|
||||||
|
if (!existing || existing.length === 0) throw new NotFoundException('علامت یافت نشد');
|
||||||
|
const oldName = existing[0].name;
|
||||||
|
const newName = dto.name?.trim() || oldName;
|
||||||
|
const newSlug = dto.slug?.trim() || existing[0].slug;
|
||||||
|
|
||||||
|
return await this.prisma.$transaction(async (tx) => {
|
||||||
|
// Update symptoms table
|
||||||
|
const updated = await tx.$queryRawUnsafe(`
|
||||||
|
UPDATE symptoms
|
||||||
|
SET
|
||||||
|
name = $2,
|
||||||
|
slug = $3,
|
||||||
|
description = $4,
|
||||||
|
meta_title = $5,
|
||||||
|
meta_description = $6,
|
||||||
|
keywords = $7,
|
||||||
|
updated_at = CURRENT_TIMESTAMP
|
||||||
|
WHERE id = $1::uuid
|
||||||
|
RETURNING id, name, slug, description, meta_title as "metaTitle", meta_description as "metaDescription", keywords;
|
||||||
|
`, id, newName, newSlug, dto.description ?? existing[0].description, dto.metaTitle ?? existing[0].meta_title, dto.metaDescription ?? existing[0].meta_description, dto.keywords ?? existing[0].keywords);
|
||||||
|
|
||||||
|
// If name changed, cascade update across product_symptoms & products JSON
|
||||||
|
if (oldName !== newName) {
|
||||||
|
await tx.$executeRaw`UPDATE product_symptoms SET symptom = ${newName} WHERE symptom = ${oldName};`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
UPDATE products
|
||||||
|
SET dosage_config = jsonb_set(
|
||||||
|
dosage_config,
|
||||||
|
'{symptoms}',
|
||||||
|
(
|
||||||
|
SELECT jsonb_agg(
|
||||||
|
CASE
|
||||||
|
WHEN elem::text = to_jsonb(${oldName}::text)::text THEN to_jsonb(${newName}::text)
|
||||||
|
ELSE elem
|
||||||
|
END
|
||||||
|
)
|
||||||
|
FROM jsonb_array_elements(dosage_config->'symptoms') AS elem
|
||||||
|
)
|
||||||
|
)
|
||||||
|
WHERE dosage_config ? 'symptoms'
|
||||||
|
AND dosage_config->'symptoms' @> to_jsonb(${oldName}::text);
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return updated;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async deleteSymptom(id: string) {
|
||||||
|
const existing = await this.prisma.$queryRawUnsafe<any[]>(`SELECT * FROM symptoms WHERE id = $1::uuid LIMIT 1`, id);
|
||||||
|
if (!existing || existing.length === 0) throw new NotFoundException('علامت یافت نشد');
|
||||||
|
const name = existing[0].name;
|
||||||
|
|
||||||
|
return await this.prisma.$transaction(async (tx) => {
|
||||||
|
// Delete join links
|
||||||
|
await tx.$executeRaw`DELETE FROM product_symptoms WHERE symptom = ${name};`;
|
||||||
|
// Delete symptom row
|
||||||
|
await tx.$queryRawUnsafe(`DELETE FROM symptoms WHERE id = $1::uuid;`, id);
|
||||||
|
return { success: true, message: `علامت «${name}» با موفقیت حذف شد` };
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
import {
|
|
||||||
normalizeSearch,
|
|
||||||
pagination,
|
|
||||||
taskInput,
|
|
||||||
monthlyPlanInput,
|
|
||||||
} from './corporate-policy';
|
|
||||||
describe('corporate contract policy', () => {
|
|
||||||
it.each([
|
|
||||||
['2027-02', 28],
|
|
||||||
['2028-02', 29],
|
|
||||||
['2028-04', 30],
|
|
||||||
['2028-01', 31],
|
|
||||||
])('enforces real calendar coverage for %s', (month, count) => {
|
|
||||||
const id = '11111111-1111-4111-8111-111111111111';
|
|
||||||
const body = {
|
|
||||||
roadmapId: id,
|
|
||||||
month,
|
|
||||||
needs: [],
|
|
||||||
dailyArticles: Array.from({ length: Number(count) }, (_, i) => ({
|
|
||||||
title: 'new article',
|
|
||||||
description: 'instruction',
|
|
||||||
actionType: 'BLOG_NEW',
|
|
||||||
department: 'CONTENT_SEO',
|
|
||||||
goalId: id,
|
|
||||||
sourceIds: [id],
|
|
||||||
dueCycle: `${month}-${String(i + 1).padStart(2, '0')}`,
|
|
||||||
})),
|
|
||||||
};
|
|
||||||
expect(monthlyPlanInput(body).dailyArticles).toHaveLength(Number(count));
|
|
||||||
expect(() =>
|
|
||||||
monthlyPlanInput({ ...body, dailyArticles: body.dailyArticles.slice(1) }),
|
|
||||||
).toThrow();
|
|
||||||
expect(() =>
|
|
||||||
monthlyPlanInput({
|
|
||||||
...body,
|
|
||||||
dailyArticles: [...body.dailyArticles, body.dailyArticles[0]],
|
|
||||||
}),
|
|
||||||
).toThrow();
|
|
||||||
});
|
|
||||||
it('normalizes Persian letters, digits and separators', () => {
|
|
||||||
expect(normalizeSearch('كيك ۱۲۳ (ة)')).toBe('کیک 123 ه');
|
|
||||||
});
|
|
||||||
it('bounds pagination and sort keys', () => {
|
|
||||||
expect(pagination({ limit: '100' }).limit).toBe(100);
|
|
||||||
expect(() => pagination({ limit: '101' })).toThrow();
|
|
||||||
expect(() => pagination({ page: '-1' })).toThrow();
|
|
||||||
expect(() => pagination({ sortBy: 'password' })).toThrow();
|
|
||||||
});
|
|
||||||
it('defaults CEO priority and rejects status/command injection', () => {
|
|
||||||
expect(
|
|
||||||
taskInput({
|
|
||||||
title: 'عنوان',
|
|
||||||
description: 'کار',
|
|
||||||
department: 'CONTENT_SEO',
|
|
||||||
}).priority,
|
|
||||||
).toBe('CEO_EXPEDITE');
|
|
||||||
expect(() =>
|
|
||||||
taskInput({
|
|
||||||
title: 'x',
|
|
||||||
description: 'x',
|
|
||||||
department: 'CONTENT_SEO',
|
|
||||||
status: 'DONE',
|
|
||||||
}),
|
|
||||||
).toThrow();
|
|
||||||
expect(() =>
|
|
||||||
taskInput({ title: '', description: 'x', department: 'CONTENT_SEO' }),
|
|
||||||
).toThrow();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,317 +0,0 @@
|
|||||||
import { BadRequestException } from '@nestjs/common';
|
|
||||||
export const departments = [
|
|
||||||
'CONTENT_SEO',
|
|
||||||
'CATALOG_COMMERCE',
|
|
||||||
'WIKI_SCIENTIFIC',
|
|
||||||
'TECH_DEVOPS',
|
|
||||||
'MARKET_INTELLIGENCE',
|
|
||||||
];
|
|
||||||
export const priorities = ['CEO_EXPEDITE', 'CRITICAL', 'HIGH', 'MEDIUM', 'LOW'];
|
|
||||||
export const statuses = [
|
|
||||||
'TODO',
|
|
||||||
'IN_PROGRESS',
|
|
||||||
'TEST',
|
|
||||||
'DONE',
|
|
||||||
'BLOCKED',
|
|
||||||
'REJECTED',
|
|
||||||
'CANCELLED',
|
|
||||||
];
|
|
||||||
export function object(value: unknown, keys: string[]): Record<string, any> {
|
|
||||||
if (
|
|
||||||
!value ||
|
|
||||||
typeof value !== 'object' ||
|
|
||||||
Array.isArray(value) ||
|
|
||||||
Object.keys(value).some((k) => !keys.includes(k))
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Invalid fields');
|
|
||||||
return value as Record<string, any>;
|
|
||||||
}
|
|
||||||
export function text(value: unknown, max = 10000): string {
|
|
||||||
if (typeof value !== 'string' || !value.trim() || value.length > max)
|
|
||||||
throw new BadRequestException('Invalid text');
|
|
||||||
return value.trim();
|
|
||||||
}
|
|
||||||
export function uuid(value: unknown): string {
|
|
||||||
const id = text(value, 36);
|
|
||||||
if (
|
|
||||||
!/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(
|
|
||||||
id,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Invalid UUID');
|
|
||||||
return id.toLowerCase();
|
|
||||||
}
|
|
||||||
export function choice(value: unknown, values: string[]): string {
|
|
||||||
if (typeof value !== 'string' || !values.includes(value))
|
|
||||||
throw new BadRequestException('Invalid enum');
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
export function normalizeSearch(value: string): string {
|
|
||||||
return value
|
|
||||||
.normalize('NFKC')
|
|
||||||
.toLowerCase()
|
|
||||||
.replace(/[يى]/g, 'ی')
|
|
||||||
.replace(/ك/g, 'ک')
|
|
||||||
.replace(/ة/g, 'ه')
|
|
||||||
.replace(/[۰-۹٠-٩]/g, (c) =>
|
|
||||||
String(
|
|
||||||
'۰۱۲۳۴۵۶۷۸۹'.includes(c)
|
|
||||||
? '۰۱۲۳۴۵۶۷۸۹'.indexOf(c)
|
|
||||||
: '٠١٢٣٤٥٦٧٨٩'.indexOf(c),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
.replace(/[\u200c\u200d()()]/g, ' ')
|
|
||||||
.replace(/[\u064b-\u065f]/g, '')
|
|
||||||
.replace(/\s+/g, ' ')
|
|
||||||
.trim();
|
|
||||||
}
|
|
||||||
export function pagination(q: Record<string, any>) {
|
|
||||||
const page = Number(q.page ?? 1),
|
|
||||||
limit = Number(q.limit ?? 20);
|
|
||||||
if (
|
|
||||||
!Number.isSafeInteger(page) ||
|
|
||||||
page < 1 ||
|
|
||||||
page > 1000000 ||
|
|
||||||
!Number.isInteger(limit) ||
|
|
||||||
limit < 1 ||
|
|
||||||
limit > 100
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Invalid pagination');
|
|
||||||
const sortBy = choice(q.sortBy ?? 'createdAt', [
|
|
||||||
'createdAt',
|
|
||||||
'updatedAt',
|
|
||||||
'title',
|
|
||||||
'taskCode',
|
|
||||||
'priority',
|
|
||||||
'status',
|
|
||||||
]);
|
|
||||||
const sortOrder = choice(q.sortOrder ?? 'desc', ['asc', 'desc']) as
|
|
||||||
| 'asc'
|
|
||||||
| 'desc';
|
|
||||||
return { page, limit, skip: (page - 1) * limit, sortBy, sortOrder };
|
|
||||||
}
|
|
||||||
export function meta(total: number, page: number, limit: number) {
|
|
||||||
const totalPages = Math.ceil(total / limit);
|
|
||||||
return {
|
|
||||||
total,
|
|
||||||
page,
|
|
||||||
limit,
|
|
||||||
totalPages,
|
|
||||||
hasNextPage: page < totalPages,
|
|
||||||
hasPrevPage: page > 1,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
export function taskInput(input: unknown) {
|
|
||||||
const b = object(input, [
|
|
||||||
'title',
|
|
||||||
'department',
|
|
||||||
'description',
|
|
||||||
'priority',
|
|
||||||
'parentId',
|
|
||||||
'goalId',
|
|
||||||
'actionType',
|
|
||||||
'dueCycle',
|
|
||||||
]);
|
|
||||||
return {
|
|
||||||
title: text(b.title, 300),
|
|
||||||
description: text(b.description),
|
|
||||||
department: choice(b.department, departments),
|
|
||||||
priority: choice(b.priority ?? 'CEO_EXPEDITE', priorities),
|
|
||||||
parentId: b.parentId === undefined ? undefined : uuid(b.parentId),
|
|
||||||
goalId: b.goalId === undefined ? undefined : uuid(b.goalId),
|
|
||||||
actionType: choice(b.actionType ?? 'CEO_DIRECTIVE', [
|
|
||||||
'CEO_DIRECTIVE',
|
|
||||||
'BLOG_NEW',
|
|
||||||
'BLOG_UPDATE',
|
|
||||||
'CATALOG_ENRICH',
|
|
||||||
'WIKI_ENRICH',
|
|
||||||
'RESEARCH',
|
|
||||||
'ENGINEERING',
|
|
||||||
]),
|
|
||||||
dueCycle: b.dueCycle === undefined ? undefined : text(b.dueCycle, 40),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
export function planMonth(value: unknown): string {
|
|
||||||
const month = text(value, 7);
|
|
||||||
if (!/^(?:[2-9]\d{3})-(?:0[1-9]|1[0-2])$/.test(month))
|
|
||||||
throw new BadRequestException('Invalid YYYY-MM month');
|
|
||||||
return month;
|
|
||||||
}
|
|
||||||
export function monthlyPlanInput(input: unknown) {
|
|
||||||
const b = object(input, ['roadmapId', 'month', 'dailyArticles', 'needs']);
|
|
||||||
const month = planMonth(b.month);
|
|
||||||
const days = new Date(
|
|
||||||
Date.UTC(Number(month.slice(0, 4)), Number(month.slice(5)), 0),
|
|
||||||
).getUTCDate();
|
|
||||||
if (
|
|
||||||
!Array.isArray(b.dailyArticles) ||
|
|
||||||
b.dailyArticles.length !== days ||
|
|
||||||
!Array.isArray(b.needs) ||
|
|
||||||
b.needs.length > 200
|
|
||||||
)
|
|
||||||
throw new BadRequestException(
|
|
||||||
'Full daily article coverage and bounded needs required',
|
|
||||||
);
|
|
||||||
const mapping: Record<string, string> = {
|
|
||||||
BLOG_NEW: 'CONTENT_SEO',
|
|
||||||
BLOG_UPDATE: 'CONTENT_SEO',
|
|
||||||
CATALOG_ENRICH: 'CATALOG_COMMERCE',
|
|
||||||
WIKI_ENRICH: 'WIKI_SCIENTIFIC',
|
|
||||||
ENGINEERING: 'TECH_DEVOPS',
|
|
||||||
};
|
|
||||||
const parse = (raw: unknown, daily: boolean) => {
|
|
||||||
const t = object(raw, [
|
|
||||||
'title',
|
|
||||||
'description',
|
|
||||||
'department',
|
|
||||||
'priority',
|
|
||||||
'goalId',
|
|
||||||
'actionType',
|
|
||||||
'dueCycle',
|
|
||||||
'sourceIds',
|
|
||||||
'target',
|
|
||||||
'reason',
|
|
||||||
]);
|
|
||||||
const actionType = choice(
|
|
||||||
t.actionType,
|
|
||||||
daily
|
|
||||||
? ['BLOG_NEW']
|
|
||||||
: ['BLOG_UPDATE', 'CATALOG_ENRICH', 'WIKI_ENRICH', 'ENGINEERING'],
|
|
||||||
);
|
|
||||||
const department = choice(t.department, [mapping[actionType]]);
|
|
||||||
const dueCycle = text(t.dueCycle, 10);
|
|
||||||
const date = new Date(dueCycle + 'T00:00:00Z');
|
|
||||||
if (
|
|
||||||
!/^\d{4}-\d{2}-\d{2}$/.test(dueCycle) ||
|
|
||||||
!dueCycle.startsWith(month + '-') ||
|
|
||||||
!Number.isFinite(date.getTime()) ||
|
|
||||||
date.toISOString().slice(0, 10) !== dueCycle
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Invalid plan day');
|
|
||||||
if (
|
|
||||||
!Array.isArray(t.sourceIds) ||
|
|
||||||
!t.sourceIds.length ||
|
|
||||||
t.sourceIds.length > 30
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Stored sources required');
|
|
||||||
const sourceIds = t.sourceIds.map(uuid);
|
|
||||||
if (new Set(sourceIds).size !== sourceIds.length)
|
|
||||||
throw new BadRequestException('Duplicate source');
|
|
||||||
if (daily && (t.target !== undefined || t.reason !== undefined))
|
|
||||||
throw new BadRequestException('Daily new articles cannot be needs');
|
|
||||||
return {
|
|
||||||
title: text(t.title, 300),
|
|
||||||
description: text(t.description),
|
|
||||||
department,
|
|
||||||
actionType,
|
|
||||||
dueCycle,
|
|
||||||
priority: choice(t.priority ?? 'MEDIUM', priorities),
|
|
||||||
goalId: uuid(t.goalId),
|
|
||||||
sourceIds,
|
|
||||||
...(daily
|
|
||||||
? {}
|
|
||||||
: { target: text(t.target, 2000), reason: text(t.reason) }),
|
|
||||||
};
|
|
||||||
};
|
|
||||||
const dailyArticles = b.dailyArticles.map((t) => parse(t, true));
|
|
||||||
if (new Set(dailyArticles.map((t) => t.dueCycle)).size !== days)
|
|
||||||
throw new BadRequestException(
|
|
||||||
'Exactly one new article per calendar day required',
|
|
||||||
);
|
|
||||||
const needs = b.needs.map((t) => parse(t, false));
|
|
||||||
if (
|
|
||||||
new Set(needs.map((t) => canonical([t.actionType, t.target, t.dueCycle])))
|
|
||||||
.size !== needs.length
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Duplicate need');
|
|
||||||
return { roadmapId: uuid(b.roadmapId), month, dailyArticles, needs };
|
|
||||||
}
|
|
||||||
export function canonical(value: any): string {
|
|
||||||
if (Array.isArray(value)) return '[' + value.map(canonical).join(',') + ']';
|
|
||||||
if (value && typeof value === 'object')
|
|
||||||
return (
|
|
||||||
'{' +
|
|
||||||
Object.keys(value)
|
|
||||||
.sort()
|
|
||||||
.map((k) => JSON.stringify(k) + ':' + canonical(value[k]))
|
|
||||||
.join(',') +
|
|
||||||
'}'
|
|
||||||
);
|
|
||||||
return JSON.stringify(value);
|
|
||||||
}
|
|
||||||
/** Public projection must also cover nested evidence and child records. */
|
|
||||||
export function publicData(value: any): any {
|
|
||||||
if (value instanceof Date) return value;
|
|
||||||
if (Array.isArray(value)) return value.map(publicData);
|
|
||||||
if (value && typeof value === 'object')
|
|
||||||
return Object.fromEntries(
|
|
||||||
Object.entries(value)
|
|
||||||
.filter(([key]) => key !== 'claimToken')
|
|
||||||
.map(([key, item]) => [key, publicData(item)]),
|
|
||||||
);
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
export function httpsUrl(value: unknown): string {
|
|
||||||
const raw = text(value, 2000);
|
|
||||||
try {
|
|
||||||
if (!/^https:\/\/[a-z0-9]/i.test(raw) || /[\s\\]/.test(raw))
|
|
||||||
throw new Error();
|
|
||||||
const u = new URL(raw);
|
|
||||||
const host = u.hostname.toLowerCase();
|
|
||||||
if (
|
|
||||||
u.protocol !== 'https:' ||
|
|
||||||
u.username ||
|
|
||||||
u.password ||
|
|
||||||
!/^(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,63}$/.test(host) ||
|
|
||||||
host === 'localhost' ||
|
|
||||||
host.endsWith('.localhost') ||
|
|
||||||
/(^|\.)example\.(com|org|net)$/.test(host)
|
|
||||||
)
|
|
||||||
throw new Error();
|
|
||||||
return raw;
|
|
||||||
} catch {
|
|
||||||
throw new BadRequestException('Valid HTTPS host URL required');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
export function timestamp(value: unknown, message: string): Date {
|
|
||||||
if (
|
|
||||||
typeof value !== 'string' ||
|
|
||||||
!/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,3})?Z$/.test(value)
|
|
||||||
)
|
|
||||||
throw new BadRequestException(message);
|
|
||||||
const date = new Date(value);
|
|
||||||
if (
|
|
||||||
!Number.isFinite(date.getTime()) ||
|
|
||||||
date.getTime() > Date.now() ||
|
|
||||||
date.toISOString().slice(0, 19) !== value.slice(0, 19)
|
|
||||||
)
|
|
||||||
throw new BadRequestException(message);
|
|
||||||
return date;
|
|
||||||
}
|
|
||||||
export function evidenceInput(input: unknown) {
|
|
||||||
const b = object(input, [
|
|
||||||
'claimToken',
|
|
||||||
'artifactUri',
|
|
||||||
'sha256',
|
|
||||||
'summary',
|
|
||||||
'tool',
|
|
||||||
'result',
|
|
||||||
]);
|
|
||||||
const uri = text(b.artifactUri, 2000);
|
|
||||||
|
|
||||||
const sha = text(b.sha256, 64);
|
|
||||||
if (!/^[a-f0-9]{64}$/.test(sha))
|
|
||||||
throw new BadRequestException('Invalid digest');
|
|
||||||
if (uri.startsWith('urn:')) {
|
|
||||||
if (uri !== 'urn:sha256:' + sha)
|
|
||||||
throw new BadRequestException('Digest locator mismatch');
|
|
||||||
} else httpsUrl(uri);
|
|
||||||
return {
|
|
||||||
claimToken: uuid(b.claimToken),
|
|
||||||
artifactUri: uri,
|
|
||||||
sha256: sha,
|
|
||||||
summary: text(b.summary),
|
|
||||||
tool: text(b.tool, 100),
|
|
||||||
result: text(b.result),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,138 +0,0 @@
|
|||||||
import {
|
|
||||||
Body,
|
|
||||||
Controller,
|
|
||||||
Get,
|
|
||||||
Headers,
|
|
||||||
Param,
|
|
||||||
Post,
|
|
||||||
Query,
|
|
||||||
Req,
|
|
||||||
UnauthorizedException,
|
|
||||||
UseGuards,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { JwtAuthGuard } from '../../auth/jwt-auth.guard';
|
|
||||||
import { RolesGuard } from '../../common/guards/roles.guard';
|
|
||||||
import { Roles } from '../../common/decorators/roles.decorator';
|
|
||||||
import { CorporateService } from './corporate.service';
|
|
||||||
import { randomUUID } from 'crypto';
|
|
||||||
import { text } from './corporate-policy';
|
|
||||||
|
|
||||||
@UseGuards(JwtAuthGuard, RolesGuard)
|
|
||||||
@Roles('Admin', 'SUPER_ADMIN')
|
|
||||||
@Controller('admin/hermes')
|
|
||||||
export class CorporateController {
|
|
||||||
constructor(private readonly service: CorporateService) {}
|
|
||||||
private actor(req: any) {
|
|
||||||
// API keys must use their authenticated key identity, not an editable worker label.
|
|
||||||
const user = req.user;
|
|
||||||
const id = user?.id ?? user?.sub;
|
|
||||||
if (!id) throw new UnauthorizedException('Authenticated subject required');
|
|
||||||
return (user.isApiKey ? 'apikey:' : 'user:') + text(String(id), 200);
|
|
||||||
}
|
|
||||||
private key(key?: string) {
|
|
||||||
return text(key, 200);
|
|
||||||
}
|
|
||||||
@Get('runtime') runtime() {
|
|
||||||
return {
|
|
||||||
mode: 'MANUAL_DORMANT',
|
|
||||||
schedulesEnabled: false,
|
|
||||||
externalExecutionEnabled: false,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@Get('tasks') tasks(@Query() query: Record<string, any>) {
|
|
||||||
return this.service.tasks(query);
|
|
||||||
}
|
|
||||||
@Get('tasks/:id') detail(@Param('id') id: string) {
|
|
||||||
return this.service.detail(id);
|
|
||||||
}
|
|
||||||
@Post('tasks') create(
|
|
||||||
@Req() req: any,
|
|
||||||
@Headers('idempotency-key') key: string,
|
|
||||||
@Body() body: unknown,
|
|
||||||
) {
|
|
||||||
return this.service.create(this.actor(req), key ?? randomUUID(), body);
|
|
||||||
}
|
|
||||||
@Post('claims') claim(
|
|
||||||
@Req() req: any,
|
|
||||||
@Headers('idempotency-key') key: string,
|
|
||||||
@Body() body: unknown,
|
|
||||||
) {
|
|
||||||
return this.service.claim(this.actor(req), this.key(key), body);
|
|
||||||
}
|
|
||||||
@Post('tasks/:id/evidence') evidence(
|
|
||||||
@Req() req: any,
|
|
||||||
@Headers('idempotency-key') key: string,
|
|
||||||
@Param('id') id: string,
|
|
||||||
@Body() body: unknown,
|
|
||||||
) {
|
|
||||||
return this.service.submitEvidence(
|
|
||||||
this.actor(req),
|
|
||||||
this.key(key),
|
|
||||||
id,
|
|
||||||
body,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@Post('tasks/:id/reviews') review(
|
|
||||||
@Req() req: any,
|
|
||||||
@Headers('idempotency-key') key: string,
|
|
||||||
@Param('id') id: string,
|
|
||||||
@Body() body: unknown,
|
|
||||||
) {
|
|
||||||
return this.service.review(this.actor(req), this.key(key), id, body);
|
|
||||||
}
|
|
||||||
@Post('tasks/:id/effects') effect(
|
|
||||||
@Req() req: any,
|
|
||||||
@Headers('idempotency-key') key: string,
|
|
||||||
@Param('id') id: string,
|
|
||||||
@Body() body: unknown,
|
|
||||||
) {
|
|
||||||
return this.service.effect(this.actor(req), this.key(key), id, body);
|
|
||||||
}
|
|
||||||
@Get('market-insights') insights(@Query() q: Record<string, any>) {
|
|
||||||
return this.service.collection('market-insights', q);
|
|
||||||
}
|
|
||||||
@Post('market-insights') research(
|
|
||||||
@Req() req: any,
|
|
||||||
@Headers('idempotency-key') key: string,
|
|
||||||
@Body() body: unknown,
|
|
||||||
) {
|
|
||||||
return this.service.research(this.actor(req), this.key(key), body);
|
|
||||||
}
|
|
||||||
@Get('monthly-roadmap') roadmaps(@Query() q: Record<string, any>) {
|
|
||||||
return this.service.collection('monthly-roadmap', q);
|
|
||||||
}
|
|
||||||
@Post('monthly-roadmap') roadmap(
|
|
||||||
@Req() req: any,
|
|
||||||
@Headers('idempotency-key') key: string,
|
|
||||||
@Body() body: unknown,
|
|
||||||
) {
|
|
||||||
return this.service.roadmap(this.actor(req), this.key(key), body);
|
|
||||||
}
|
|
||||||
@Post('monthly-plans') persistMonthlyPlan(
|
|
||||||
@Req() req: any,
|
|
||||||
@Headers('idempotency-key') key: string,
|
|
||||||
@Body() body: unknown,
|
|
||||||
) {
|
|
||||||
return this.service.persistMonthlyPlan(
|
|
||||||
this.actor(req),
|
|
||||||
this.key(key),
|
|
||||||
body,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@Get('monthly-plans/:roadmapId') monthlyPlan(
|
|
||||||
@Param('roadmapId') roadmapId: string,
|
|
||||||
@Query('month') month: string,
|
|
||||||
) {
|
|
||||||
return this.service.monthlyPlan(roadmapId, month);
|
|
||||||
}
|
|
||||||
@Get('reports') reports(@Query() q: Record<string, any>) {
|
|
||||||
return this.service.collection('reports', q);
|
|
||||||
}
|
|
||||||
@Post('reports') report(
|
|
||||||
@Req() req: any,
|
|
||||||
@Headers('idempotency-key') key: string,
|
|
||||||
@Body() body: unknown,
|
|
||||||
) {
|
|
||||||
return this.service.report(this.actor(req), this.key(key), body);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,840 +0,0 @@
|
|||||||
import passport from 'passport';
|
|
||||||
import { Strategy, ExtractJwt } from 'passport-jwt';
|
|
||||||
import { PrismaClient } from '@prisma/client';
|
|
||||||
import { Test } from '@nestjs/testing';
|
|
||||||
import { INestApplication, ValidationPipe } from '@nestjs/common';
|
|
||||||
import { randomUUID } from 'crypto';
|
|
||||||
import request from 'supertest';
|
|
||||||
import { PrismaService } from '../../prisma/prisma.service';
|
|
||||||
import { CorporateController } from './corporate.controller';
|
|
||||||
import { CorporateService } from './corporate.service';
|
|
||||||
import { ApiKeysService } from '../api-keys.service';
|
|
||||||
|
|
||||||
const integration = process.env.CORPORATE_TEST_DATABASE_URL
|
|
||||||
? describe
|
|
||||||
: describe.skip;
|
|
||||||
integration('corporate API / disposable PostgreSQL', () => {
|
|
||||||
let app: INestApplication, db: PrismaService;
|
|
||||||
const key = () => randomUUID();
|
|
||||||
const post = (path: string, body: any, actor = 'executor', op = key()) =>
|
|
||||||
request(app.getHttpServer())
|
|
||||||
.post('/admin/hermes/' + path)
|
|
||||||
.set('x-api-key', actor)
|
|
||||||
.set('Idempotency-Key', op)
|
|
||||||
.send(body);
|
|
||||||
const input = {
|
|
||||||
title: 'كيك ۱۲۳',
|
|
||||||
description: 'integration fixture',
|
|
||||||
department: 'CONTENT_SEO',
|
|
||||||
};
|
|
||||||
beforeAll(async () => {
|
|
||||||
// Explicit disposable loopback opt-in only; never consumes runtime DATABASE_URL.
|
|
||||||
const url = new URL(process.env.CORPORATE_TEST_DATABASE_URL!);
|
|
||||||
if (url.hostname !== '127.0.0.1' || url.pathname !== '/corporate_test')
|
|
||||||
throw new Error('Disposable loopback corporate_test DB required');
|
|
||||||
passport.use(
|
|
||||||
'jwt',
|
|
||||||
new Strategy(
|
|
||||||
{
|
|
||||||
jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
|
|
||||||
secretOrKey: 'test-only-not-runtime',
|
|
||||||
},
|
|
||||||
(_payload, done) => done(null, false),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
db = new PrismaClient({
|
|
||||||
datasources: { db: { url: process.env.CORPORATE_TEST_DATABASE_URL } },
|
|
||||||
}) as PrismaService;
|
|
||||||
const module = await Test.createTestingModule({
|
|
||||||
controllers: [CorporateController],
|
|
||||||
providers: [
|
|
||||||
CorporateService,
|
|
||||||
{ provide: PrismaService, useValue: db },
|
|
||||||
{
|
|
||||||
provide: ApiKeysService,
|
|
||||||
useValue: {
|
|
||||||
validateKey: async (id: string) => ({
|
|
||||||
id,
|
|
||||||
isApiKey: true,
|
|
||||||
role: 'Admin',
|
|
||||||
scopes: id === 'unscoped' ? [] : ['admin'],
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}).compile();
|
|
||||||
app = module.createNestApplication();
|
|
||||||
app.useGlobalPipes(new ValidationPipe({ whitelist: true, forbidNonWhitelisted: true, transform: true }));
|
|
||||||
await app.listen(0, '127.0.0.1');
|
|
||||||
});
|
|
||||||
afterAll(async () => {
|
|
||||||
if (db)
|
|
||||||
await db.$executeRawUnsafe(
|
|
||||||
'TRUNCATE corporate_operations, corporate_reports, corporate_effects, corporate_reviews, corporate_evidence, corporate_events, corporate_tasks, corporate_goals, corporate_roadmaps, corporate_sources, corporate_research CASCADE',
|
|
||||||
);
|
|
||||||
await app?.close();
|
|
||||||
await db?.$disconnect();
|
|
||||||
passport.unuse('jwt');
|
|
||||||
});
|
|
||||||
beforeEach(async () => {
|
|
||||||
await db.$executeRawUnsafe(
|
|
||||||
'TRUNCATE corporate_operations, corporate_reports, corporate_effects, corporate_reviews, corporate_evidence, corporate_events, corporate_tasks, corporate_goals, corporate_roadmaps, corporate_sources, corporate_research CASCADE',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
async function planFixture(month = '2996-02') {
|
|
||||||
const research = (
|
|
||||||
await post('market-insights', {
|
|
||||||
title: 'monthly fixture',
|
|
||||||
category: 'TREND',
|
|
||||||
source: 'disposable receipt',
|
|
||||||
opportunity: 'test planning',
|
|
||||||
impact: 'LOW',
|
|
||||||
recommendedAction: 'plan',
|
|
||||||
cadence: 'MONTHLY',
|
|
||||||
provenance: {
|
|
||||||
method: 'fixture',
|
|
||||||
collector: 'jest',
|
|
||||||
context: 'disposable',
|
|
||||||
},
|
|
||||||
sources: [
|
|
||||||
{
|
|
||||||
url: 'https://pubmed.ncbi.nlm.nih.gov/',
|
|
||||||
title: 'fixture',
|
|
||||||
excerpt: 'test only',
|
|
||||||
retrievedAt: '2026-01-01T00:00:00Z',
|
|
||||||
sha256: 'a'.repeat(64),
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}).expect(201)
|
|
||||||
).body;
|
|
||||||
const roadmap = (
|
|
||||||
await post('monthly-roadmap', {
|
|
||||||
researchId: research.id,
|
|
||||||
month,
|
|
||||||
cycleName: 'monthly fixture',
|
|
||||||
seasonalTheme: 'test',
|
|
||||||
strategicGoals: ['coverage'],
|
|
||||||
plannedArticlesCount: 29,
|
|
||||||
plannedRefreshesCount: 0,
|
|
||||||
plannedCatalogEnrichments: 0,
|
|
||||||
goals: [
|
|
||||||
'CONTENT_SEO',
|
|
||||||
'CATALOG_COMMERCE',
|
|
||||||
'WIKI_SCIENTIFIC',
|
|
||||||
'TECH_DEVOPS',
|
|
||||||
].map((department) => ({
|
|
||||||
title: department,
|
|
||||||
department,
|
|
||||||
acceptanceCriteria: 'independent QA',
|
|
||||||
metric: 'coverage',
|
|
||||||
})),
|
|
||||||
}).expect(201)
|
|
||||||
).body;
|
|
||||||
const task = (
|
|
||||||
actionType: string,
|
|
||||||
department: string,
|
|
||||||
dueCycle: string,
|
|
||||||
) => ({
|
|
||||||
title: actionType + ' ' + dueCycle,
|
|
||||||
description: 'Evidence-backed instruction requiring QA',
|
|
||||||
actionType,
|
|
||||||
department,
|
|
||||||
dueCycle,
|
|
||||||
goalId: roadmap.goals.find((g: any) => g.department === department).id,
|
|
||||||
sourceIds: [research.sources[0].id],
|
|
||||||
...(actionType === 'BLOG_NEW'
|
|
||||||
? {}
|
|
||||||
: {
|
|
||||||
target: 'https://canina.ir/identified-gap',
|
|
||||||
reason: 'Documented coverage gap',
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
return {
|
|
||||||
research,
|
|
||||||
roadmap,
|
|
||||||
body: {
|
|
||||||
roadmapId: roadmap.id,
|
|
||||||
month,
|
|
||||||
dailyArticles: Array.from({ length: 29 }, (_, i) =>
|
|
||||||
task(
|
|
||||||
'BLOG_NEW',
|
|
||||||
'CONTENT_SEO',
|
|
||||||
`${month}-${String(i + 1).padStart(2, '0')}`,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
needs: [
|
|
||||||
task('BLOG_UPDATE', 'CONTENT_SEO', month + '-01'),
|
|
||||||
task('CATALOG_ENRICH', 'CATALOG_COMMERCE', month + '-02'),
|
|
||||||
task('WIKI_ENRICH', 'WIKI_SCIENTIFIC', month + '-03'),
|
|
||||||
task('ENGINEERING', 'TECH_DEVOPS', month + '-04'),
|
|
||||||
],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
it('persists a complete leap-month daily-new plan, separate needs and evidence lineage with readback', async () => {
|
|
||||||
const { body, research, roadmap } = await planFixture();
|
|
||||||
body.roadmapId = body.roadmapId.toUpperCase();
|
|
||||||
for (const entry of [...body.dailyArticles, ...body.needs]) {
|
|
||||||
entry.goalId = entry.goalId.toUpperCase();
|
|
||||||
entry.sourceIds = entry.sourceIds.map((id: string) => id.toUpperCase());
|
|
||||||
}
|
|
||||||
const op = key();
|
|
||||||
const created = (
|
|
||||||
await post('monthly-plans', body, 'planner', op).expect(201)
|
|
||||||
).body;
|
|
||||||
expect(created.tasks).toHaveLength(33);
|
|
||||||
const need = created.tasks.find((t: any) => t.actionType === 'WIKI_ENRICH');
|
|
||||||
expect(need.logs[0].payload).toMatchObject({
|
|
||||||
target: body.needs[2].target,
|
|
||||||
reason: body.needs[2].reason,
|
|
||||||
});
|
|
||||||
expect(
|
|
||||||
created.tasks.filter((t: any) => t.actionType === 'BLOG_NEW'),
|
|
||||||
).toHaveLength(29);
|
|
||||||
expect(created.tasks.every((t: any) => t.status === 'TODO')).toBe(true);
|
|
||||||
expect(
|
|
||||||
(await post('monthly-plans', body, 'planner', op).expect(201)).body,
|
|
||||||
).toEqual(created);
|
|
||||||
const read = await request(app.getHttpServer())
|
|
||||||
.get(`/admin/hermes/monthly-plans/${roadmap.id.toUpperCase()}?month=${body.month}`)
|
|
||||||
.set('x-api-key', 'executor')
|
|
||||||
.expect(200);
|
|
||||||
expect(read.body).toEqual(created);
|
|
||||||
const detail = await request(app.getHttpServer())
|
|
||||||
.get('/admin/hermes/tasks/' + created.tasks[0].id)
|
|
||||||
.set('x-api-key', 'executor')
|
|
||||||
.expect(200);
|
|
||||||
expect(detail.body.logs[0].step).toBe('PLANNED');
|
|
||||||
expect(detail.body.logs[0].payload).toMatchObject({
|
|
||||||
researchId: research.id,
|
|
||||||
roadmapId: roadmap.id,
|
|
||||||
month: body.month,
|
|
||||||
dueCycle: body.month + '-01',
|
|
||||||
sourceIds: [research.sources[0].id],
|
|
||||||
});
|
|
||||||
expect(await db.corporateOperation.count()).toBe(3);
|
|
||||||
expect((await post('claims', {}).expect(201)).body.task).toBeNull();
|
|
||||||
});
|
|
||||||
it('validates calendar, action separation, needs and stored lineage without partial writes', async () => {
|
|
||||||
const { body } = await planFixture();
|
|
||||||
const mutations: Array<[number, (b: any) => void]> = [
|
|
||||||
[400, (b) => b.dailyArticles.pop()],
|
|
||||||
[400, (b) => (b.dailyArticles[1].dueCycle = b.dailyArticles[0].dueCycle)],
|
|
||||||
[400, (b) => (b.dailyArticles[0].dueCycle = '2028-02-30')],
|
|
||||||
[400, (b) => (b.month = '2028-13')],
|
|
||||||
[400, (b) => (b.dailyArticles[0].actionType = 'BLOG_UPDATE')],
|
|
||||||
[400, (b) => (b.needs[0].actionType = 'BLOG_NEW')],
|
|
||||||
[400, (b) => (b.needs[0].reason = ' ')],
|
|
||||||
[400, (b) => delete b.needs[0].target],
|
|
||||||
[400, (b) => (b.needs[0].department = 'WIKI_SCIENTIFIC')],
|
|
||||||
[400, (b) => (b.dailyArticles[0].sourceIds = [])],
|
|
||||||
[409, (b) => (b.dailyArticles[0].sourceIds = [key()])],
|
|
||||||
[409, (b) => (b.dailyArticles[0].goalId = key())],
|
|
||||||
[409, (b) => (b.needs[0].goalId = b.needs[1].goalId)],
|
|
||||||
[409, (b) => (b.roadmapId = key())],
|
|
||||||
];
|
|
||||||
for (const [status, mutate] of mutations) {
|
|
||||||
const invalid = JSON.parse(JSON.stringify(body));
|
|
||||||
mutate(invalid);
|
|
||||||
await post('monthly-plans', invalid).expect(status);
|
|
||||||
expect(await db.corporateTask.count()).toBe(0);
|
|
||||||
expect(await db.corporateEvent.count()).toBe(0);
|
|
||||||
expect(await db.corporateOperation.count()).toBe(2);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
it('serializes competing actors and keys on roadmap/month, rejects changed replay and keeps auth dormant', async () => {
|
|
||||||
const { body } = await planFixture();
|
|
||||||
await request(app.getHttpServer())
|
|
||||||
.post('/admin/hermes/monthly-plans')
|
|
||||||
.send(body)
|
|
||||||
.expect(401);
|
|
||||||
await post('monthly-plans', body, 'unscoped').expect(403);
|
|
||||||
const op = key();
|
|
||||||
const otherOp = key();
|
|
||||||
let release!: () => void;
|
|
||||||
let ready!: () => void;
|
|
||||||
const locked = new Promise<void>((r) => (ready = r));
|
|
||||||
const hold = new Promise<void>((r) => (release = r));
|
|
||||||
const scope = JSON.stringify(['monthly-plan', body.roadmapId, body.month]);
|
|
||||||
const blocker = db.$transaction(async (tx) => {
|
|
||||||
await tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtextextended(${scope}, 0))`;
|
|
||||||
ready();
|
|
||||||
await hold;
|
|
||||||
});
|
|
||||||
await locked;
|
|
||||||
const pending = [
|
|
||||||
post('monthly-plans', body, 'planner', op).then((r) => r),
|
|
||||||
post('monthly-plans', body, 'other', otherOp).then((r) => r),
|
|
||||||
];
|
|
||||||
try {
|
|
||||||
let waiters = 0;
|
|
||||||
for (let i = 0; i < 100; i++) {
|
|
||||||
const rows = await db.$queryRaw<any[]>`SELECT pid FROM pg_stat_activity
|
|
||||||
WHERE datname=current_database() AND wait_event_type='Lock' AND query LIKE '%pg_advisory_xact_lock%'`;
|
|
||||||
waiters = rows.length;
|
|
||||||
if (waiters >= 2) break;
|
|
||||||
await new Promise((r) => setTimeout(r, 10));
|
|
||||||
}
|
|
||||||
expect(waiters).toBeGreaterThanOrEqual(2);
|
|
||||||
} finally {
|
|
||||||
release();
|
|
||||||
await blocker;
|
|
||||||
}
|
|
||||||
const results = await Promise.all(pending);
|
|
||||||
expect(results.map((r) => r.status).sort()).toEqual([201, 409]);
|
|
||||||
expect(await db.corporateTask.count()).toBe(33);
|
|
||||||
expect(await db.corporateEvent.count({ where: { step: 'PLANNED' } })).toBe(
|
|
||||||
33,
|
|
||||||
);
|
|
||||||
const winner = results[0].status === 201 ? 'planner' : 'other';
|
|
||||||
const winningOp = winner === 'planner' ? op : otherOp;
|
|
||||||
await post(
|
|
||||||
'monthly-plans',
|
|
||||||
{ ...body, needs: [] },
|
|
||||||
winner,
|
|
||||||
winningOp,
|
|
||||||
).expect(409);
|
|
||||||
expect(
|
|
||||||
(await post('monthly-plans', body, winner, winningOp).expect(201)).body,
|
|
||||||
).toEqual(results[winner === 'planner' ? 0 : 1].body);
|
|
||||||
const runtime = await request(app.getHttpServer())
|
|
||||||
.get('/admin/hermes/runtime')
|
|
||||||
.set('x-api-key', 'executor')
|
|
||||||
.expect(200);
|
|
||||||
expect(runtime.body).toEqual({
|
|
||||||
mode: 'MANUAL_DORMANT',
|
|
||||||
schedulesEnabled: false,
|
|
||||||
externalExecutionEnabled: false,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
it('rolls back a mid-plan database failure including tasks, events and idempotency receipt', async () => {
|
|
||||||
const { body } = await planFixture();
|
|
||||||
// Disposable-only trigger fails after the first task/event have been written.
|
|
||||||
await db.$executeRawUnsafe(
|
|
||||||
`CREATE FUNCTION reject_plan_event() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN IF NEW.step='PLANNED' AND NEW.payload->>'dueCycle'='2996-02-02' THEN RAISE EXCEPTION 'injected plan failure'; END IF; RETURN NEW; END $$`,
|
|
||||||
);
|
|
||||||
await db.$executeRawUnsafe(
|
|
||||||
'CREATE TRIGGER reject_plan_event BEFORE INSERT ON corporate_events FOR EACH ROW EXECUTE FUNCTION reject_plan_event()',
|
|
||||||
);
|
|
||||||
const op = key();
|
|
||||||
try {
|
|
||||||
await post('monthly-plans', body, 'planner', op).expect(500);
|
|
||||||
expect(await db.corporateTask.count()).toBe(0);
|
|
||||||
expect(await db.corporateEvent.count()).toBe(0);
|
|
||||||
expect(await db.corporateOperation.count()).toBe(2);
|
|
||||||
} finally {
|
|
||||||
await db.$executeRawUnsafe(
|
|
||||||
'DROP TRIGGER reject_plan_event ON corporate_events',
|
|
||||||
);
|
|
||||||
await db.$executeRawUnsafe('DROP FUNCTION reject_plan_event()');
|
|
||||||
}
|
|
||||||
await post('monthly-plans', body, 'planner', op).expect(201);
|
|
||||||
});
|
|
||||||
it('gates only PLANNED future tasks while legacy future dueCycle remains claimable and UTC today is eligible', async () => {
|
|
||||||
const { body } = await planFixture();
|
|
||||||
await post('monthly-plans', body).expect(201);
|
|
||||||
const legacy = (
|
|
||||||
await post('tasks', { ...input, dueCycle: '2999-12-31' }).expect(201)
|
|
||||||
).body;
|
|
||||||
expect((await post('claims', {}).expect(201)).body.task.id).toBe(legacy.id);
|
|
||||||
expect((await post('claims', {}).expect(201)).body.task).toBeNull();
|
|
||||||
// Model the persisted event's due-day boundary in the disposable DB without changing system time.
|
|
||||||
const planned = await db.corporateTask.findFirstOrThrow({
|
|
||||||
where: { actionType: 'BLOG_NEW' },
|
|
||||||
});
|
|
||||||
const day = new Date().toISOString().slice(0, 10);
|
|
||||||
await db.corporateTask.update({
|
|
||||||
where: { id: planned.id },
|
|
||||||
data: { dueCycle: day },
|
|
||||||
});
|
|
||||||
expect((await post('claims', {}).expect(201)).body.task).toBeNull(); // mismatch fails closed
|
|
||||||
const event = await db.corporateEvent.findFirstOrThrow({
|
|
||||||
where: { taskId: planned.id, step: 'PLANNED' },
|
|
||||||
});
|
|
||||||
await db.corporateEvent.update({
|
|
||||||
where: { id: event.id },
|
|
||||||
data: { payload: { ...(event.payload as object), dueCycle: day } },
|
|
||||||
});
|
|
||||||
expect((await post('claims', {}).expect(201)).body.task.id).toBe(
|
|
||||||
planned.id,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
it('rejects children after a parent claim commits while child creation waits on its row lock', async () => {
|
|
||||||
const parent = (await post('tasks', input).expect(201)).body;
|
|
||||||
let release!: () => void, locked!: () => void;
|
|
||||||
const ready = new Promise<void>((r) => (locked = r));
|
|
||||||
const hold = new Promise<void>((r) => (release = r));
|
|
||||||
const claiming = db.$transaction(async (tx) => {
|
|
||||||
await tx.$queryRaw`SELECT id FROM corporate_tasks WHERE id=${parent.id}::uuid FOR UPDATE`;
|
|
||||||
await tx.corporateTask.update({
|
|
||||||
where: { id: parent.id },
|
|
||||||
data: {
|
|
||||||
status: 'IN_PROGRESS',
|
|
||||||
claimToken: key(),
|
|
||||||
assignedAgent: 'executor',
|
|
||||||
leasedUntil: new Date(Date.now() + 60000),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
locked();
|
|
||||||
await hold;
|
|
||||||
});
|
|
||||||
await ready;
|
|
||||||
const pending = post('tasks', { ...input, parentId: parent.id }).then(
|
|
||||||
(r) => r,
|
|
||||||
);
|
|
||||||
try {
|
|
||||||
// Observe actual competing PostgreSQL lock wait, not a timing-only race.
|
|
||||||
let waiting = false;
|
|
||||||
for (let i = 0; i < 100; i++) {
|
|
||||||
const rows = await db.$queryRaw<
|
|
||||||
any[]
|
|
||||||
>`SELECT pid FROM pg_stat_activity WHERE datname=current_database() AND wait_event_type='Lock' AND query LIKE '%corporate_tasks%'`;
|
|
||||||
if (rows.length) {
|
|
||||||
waiting = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
await new Promise((r) => setTimeout(r, 10));
|
|
||||||
}
|
|
||||||
expect(waiting).toBe(true);
|
|
||||||
} finally {
|
|
||||||
release();
|
|
||||||
await claiming;
|
|
||||||
}
|
|
||||||
expect((await pending).status).toBe(409);
|
|
||||||
expect(
|
|
||||||
await db.corporateTask.count({ where: { parentId: parent.id } }),
|
|
||||||
).toBe(0);
|
|
||||||
});
|
|
||||||
it('accepts children on TODO and BLOCKED, which prevents parent claiming', async () => {
|
|
||||||
for (const status of ['TODO', 'BLOCKED'] as const) {
|
|
||||||
const parent = (await post('tasks', input).expect(201)).body;
|
|
||||||
await db.corporateTask.update({
|
|
||||||
where: { id: parent.id },
|
|
||||||
data: { status },
|
|
||||||
});
|
|
||||||
const child = (
|
|
||||||
await post('tasks', { ...input, parentId: parent.id }).expect(201)
|
|
||||||
).body;
|
|
||||||
expect((await post('claims', {}).expect(201)).body.task.id).toBe(
|
|
||||||
child.id,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
it('rejects malformed artifact locators and mismatched digest URNs before persistence', async () => {
|
|
||||||
const task = (await post('tasks', input).expect(201)).body;
|
|
||||||
const claim = (await post('claims', {}).expect(201)).body.task;
|
|
||||||
const body = {
|
|
||||||
claimToken: claim.claimToken,
|
|
||||||
artifactUri: '',
|
|
||||||
sha256: 'a'.repeat(64),
|
|
||||||
summary: 'receipt',
|
|
||||||
tool: 'jest',
|
|
||||||
result: 'passed',
|
|
||||||
};
|
|
||||||
for (const artifactUri of [
|
|
||||||
'https://',
|
|
||||||
'https://?x',
|
|
||||||
'https:///pubmed.ncbi.nlm.nih.gov/x',
|
|
||||||
'https://pubmed.ncbi.nlm.nih.gov./x',
|
|
||||||
'https://bad host/x',
|
|
||||||
'https://user:pass@host.org/a',
|
|
||||||
'https://localhost/a',
|
|
||||||
'https://127.1/a',
|
|
||||||
'https://[::1]/a',
|
|
||||||
'urn:sha256:',
|
|
||||||
'urn:sha256:' + 'b'.repeat(64),
|
|
||||||
]) {
|
|
||||||
await post(`tasks/${task.id}/evidence`, { ...body, artifactUri }).expect(
|
|
||||||
400,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
expect(await db.corporateEvidence.count()).toBe(0);
|
|
||||||
await post(`tasks/${task.id}/evidence`, {
|
|
||||||
...body,
|
|
||||||
artifactUri: 'https://pubmed.ncbi.nlm.nih.gov/123/',
|
|
||||||
}).expect(201);
|
|
||||||
});
|
|
||||||
it('rejects implicit timestamp coercions in source and effect inputs', async () => {
|
|
||||||
const service = app.get(CorporateService);
|
|
||||||
const research = {
|
|
||||||
title: 'research',
|
|
||||||
category: 'TREND',
|
|
||||||
source: 'receipt',
|
|
||||||
opportunity: 'investigate',
|
|
||||||
impact: 'LOW',
|
|
||||||
recommendedAction: 'measure',
|
|
||||||
cadence: 'MONTHLY',
|
|
||||||
provenance: { method: 'test', collector: 'fixture', context: 'isolated' },
|
|
||||||
sources: [
|
|
||||||
{
|
|
||||||
url: 'https://pubmed.ncbi.nlm.nih.gov/',
|
|
||||||
title: 'source',
|
|
||||||
excerpt: 'receipt',
|
|
||||||
retrievedAt: '',
|
|
||||||
sha256: 'a'.repeat(64),
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
for (const time of [
|
|
||||||
null,
|
|
||||||
0,
|
|
||||||
false,
|
|
||||||
[],
|
|
||||||
'2026-01-01',
|
|
||||||
'2026-02-30T00:00:00Z',
|
|
||||||
]) {
|
|
||||||
await expect(
|
|
||||||
Promise.resolve().then(() =>
|
|
||||||
service.research('fixture', key(), {
|
|
||||||
...research,
|
|
||||||
sources: [{ ...research.sources[0], retrievedAt: time }],
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
).rejects.toThrow();
|
|
||||||
await expect(
|
|
||||||
Promise.resolve().then(() =>
|
|
||||||
service.effect('fixture', key(), key(), {
|
|
||||||
metric: 'views',
|
|
||||||
availability: 'UNAVAILABLE',
|
|
||||||
source: 'none',
|
|
||||||
observedAt: time,
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
).rejects.toThrow('Invalid observation time');
|
|
||||||
}
|
|
||||||
for (const url of ['https://', 'https://?bad', 'https://bad host'])
|
|
||||||
await expect(
|
|
||||||
Promise.resolve().then(() =>
|
|
||||||
service.research('fixture', key(), {
|
|
||||||
...research,
|
|
||||||
sources: [
|
|
||||||
{
|
|
||||||
...research.sources[0],
|
|
||||||
retrievedAt: '2026-01-01T00:00:00Z',
|
|
||||||
url,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
).rejects.toThrow();
|
|
||||||
expect(await db.corporateResearch.count()).toBe(0);
|
|
||||||
});
|
|
||||||
it('public reads strip claim tokens recursively while claim and replay retain ownership token', async () => {
|
|
||||||
const parent = (await post('tasks', input).expect(201)).body;
|
|
||||||
const child = (
|
|
||||||
await post('tasks', { ...input, parentId: parent.id }).expect(201)
|
|
||||||
).body;
|
|
||||||
const op = key();
|
|
||||||
const claim = (await post('claims', {}, 'executor', op).expect(201)).body
|
|
||||||
.task;
|
|
||||||
expect(claim.claimToken).toBeTruthy();
|
|
||||||
expect(
|
|
||||||
(await post('claims', {}, 'executor', op).expect(201)).body.task
|
|
||||||
.claimToken,
|
|
||||||
).toBe(claim.claimToken);
|
|
||||||
await post(`tasks/${child.id}/evidence`, {
|
|
||||||
claimToken: claim.claimToken,
|
|
||||||
artifactUri: 'urn:sha256:' + 'a'.repeat(64),
|
|
||||||
sha256: 'a'.repeat(64),
|
|
||||||
summary: 'receipt',
|
|
||||||
tool: 'jest',
|
|
||||||
result: 'passed',
|
|
||||||
}).expect(201);
|
|
||||||
for (const path of ['tasks', 'tasks/' + child.id, 'tasks/' + parent.id]) {
|
|
||||||
const r = await request(app.getHttpServer())
|
|
||||||
.get('/admin/hermes/' + path)
|
|
||||||
.set('x-api-key', 'competitor')
|
|
||||||
.expect(200);
|
|
||||||
expect(JSON.stringify(r.body)).not.toContain('claimToken');
|
|
||||||
expect(JSON.stringify(r.body)).not.toContain(claim.claimToken);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
it('bounds detail relations and report snapshots with explicit truncation and immutable replay', async () => {
|
|
||||||
const task = (await post('tasks', input).expect(201)).body;
|
|
||||||
await db.corporateEvent.createMany({
|
|
||||||
data: Array.from({ length: 105 }, () => ({
|
|
||||||
taskId: task.id,
|
|
||||||
speaker: 'SYSTEM',
|
|
||||||
speakerName: 'fixture',
|
|
||||||
step: 'FIXTURE',
|
|
||||||
content: 'x'.repeat(10000),
|
|
||||||
payload: { nested: ['x'.repeat(10000)] },
|
|
||||||
})),
|
|
||||||
});
|
|
||||||
const detail = await request(app.getHttpServer())
|
|
||||||
.get('/admin/hermes/tasks/' + task.id)
|
|
||||||
.set('x-api-key', 'executor')
|
|
||||||
.expect(200);
|
|
||||||
expect(detail.body.logs).toHaveLength(100);
|
|
||||||
expect(detail.body.relationsMeta.logs).toEqual({
|
|
||||||
total: 106,
|
|
||||||
returned: 100,
|
|
||||||
limit: 100,
|
|
||||||
truncated: true,
|
|
||||||
});
|
|
||||||
const op = key(),
|
|
||||||
body = { day: new Date().toISOString().slice(0, 10), summary: 'bounded' };
|
|
||||||
const report = (await post('reports', body, 'executor', op).expect(201))
|
|
||||||
.body;
|
|
||||||
expect(report.snapshot.events).toHaveLength(100);
|
|
||||||
expect(report.snapshot.meta.events).toEqual({
|
|
||||||
total: 106,
|
|
||||||
returned: 100,
|
|
||||||
limit: 100,
|
|
||||||
truncated: true,
|
|
||||||
});
|
|
||||||
expect(report.snapshot.events.every((e: any) => !('payload' in e))).toBe(
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
expect(report.snapshot.meta.fieldsTruncated).toBe(true);
|
|
||||||
expect(
|
|
||||||
Buffer.byteLength(JSON.stringify(report.body ?? report)),
|
|
||||||
).toBeLessThan(1000000);
|
|
||||||
await db.corporateEvent.deleteMany();
|
|
||||||
expect(
|
|
||||||
(await post('reports', body, 'executor', op).expect(201)).body,
|
|
||||||
).toEqual(report);
|
|
||||||
});
|
|
||||||
it('rolls back oversized mutation responses instead of persisting huge idempotency values', async () => {
|
|
||||||
const service = app.get(CorporateService) as any;
|
|
||||||
const before = await db.corporateTask.count();
|
|
||||||
await expect(
|
|
||||||
service.operation('fixture', 'oversize', key(), {}, async (tx: any) => {
|
|
||||||
await tx.corporateTask.create({
|
|
||||||
data: {
|
|
||||||
title: 'rollback',
|
|
||||||
description: 'fixture',
|
|
||||||
taskCode: key(),
|
|
||||||
normalizedTitle: 'rollback',
|
|
||||||
normalizedCode: key(),
|
|
||||||
department: 'CONTENT_SEO',
|
|
||||||
createdBy: 'fixture',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
return { value: 'x'.repeat(1100000) };
|
|
||||||
}),
|
|
||||||
).rejects.toThrow('Operation response exceeds limit');
|
|
||||||
expect(await db.corporateTask.count()).toBe(before);
|
|
||||||
expect(await db.corporateOperation.count()).toBe(0);
|
|
||||||
});
|
|
||||||
it('auth, UI list contract, normalized search, immutable idempotent replay', async () => {
|
|
||||||
await request(app.getHttpServer()).get('/admin/hermes/tasks').expect(401);
|
|
||||||
await post('tasks', input, 'unscoped').expect(403);
|
|
||||||
const op = key(),
|
|
||||||
a = await post('tasks', input, 'executor', op).expect(201);
|
|
||||||
const b = await post('tasks', input, 'executor', op).expect(201);
|
|
||||||
expect(b.body.id).toBe(a.body.id);
|
|
||||||
await post('tasks', { ...input, title: 'changed' }, 'executor', op).expect(
|
|
||||||
409,
|
|
||||||
);
|
|
||||||
const list = await request(app.getHttpServer())
|
|
||||||
.get('/admin/hermes/tasks?search=کیک%20123&limit=1')
|
|
||||||
.set('x-api-key', 'executor')
|
|
||||||
.expect(200);
|
|
||||||
expect(list.body.meta).toEqual({
|
|
||||||
total: 1,
|
|
||||||
page: 1,
|
|
||||||
limit: 1,
|
|
||||||
totalPages: 1,
|
|
||||||
hasNextPage: false,
|
|
||||||
hasPrevPage: false,
|
|
||||||
});
|
|
||||||
expect(list.body.data[0].priority).toBe('CEO_EXPEDITE');
|
|
||||||
await request(app.getHttpServer())
|
|
||||||
.get('/admin/hermes/tasks?limit=101')
|
|
||||||
.set('x-api-key', 'executor')
|
|
||||||
.expect(400);
|
|
||||||
await request(app.getHttpServer())
|
|
||||||
.get('/admin/hermes/tasks?sortBy=password')
|
|
||||||
.set('x-api-key', 'executor')
|
|
||||||
.expect(400);
|
|
||||||
});
|
|
||||||
it('claims exclusively, expires/reclaims, fences stale executor, requires independent QA', async () => {
|
|
||||||
const task = (await post('tasks', input).expect(201)).body;
|
|
||||||
const claims = await Promise.all([
|
|
||||||
post('claims', {}, 'executor'),
|
|
||||||
post('claims', {}, 'competitor'),
|
|
||||||
]);
|
|
||||||
expect(claims.filter((x) => x.body.task !== null)).toHaveLength(1);
|
|
||||||
const claimed = claims.find((x) => x.body.task !== null)!.body.task;
|
|
||||||
const oldActor = claimed.assignedAgent.replace('apikey:', '');
|
|
||||||
await db.$executeRaw`UPDATE corporate_tasks SET "leasedUntil"=clock_timestamp()-interval '1 second' WHERE id=${task.id}::uuid`;
|
|
||||||
const renewed = (await post('claims', {}, 'new-executor').expect(201)).body
|
|
||||||
.task;
|
|
||||||
expect(renewed.claimToken).not.toBe(claimed.claimToken);
|
|
||||||
const evidence = {
|
|
||||||
claimToken: claimed.claimToken,
|
|
||||||
artifactUri: 'urn:sha256:' + 'a'.repeat(64),
|
|
||||||
sha256: 'a'.repeat(64),
|
|
||||||
summary: 'receipt',
|
|
||||||
tool: 'jest',
|
|
||||||
result: 'passed',
|
|
||||||
};
|
|
||||||
await post(`tasks/${task.id}/evidence`, evidence, oldActor).expect(409);
|
|
||||||
const e = (
|
|
||||||
await post(
|
|
||||||
`tasks/${task.id}/evidence`,
|
|
||||||
{ ...evidence, claimToken: renewed.claimToken },
|
|
||||||
'new-executor',
|
|
||||||
).expect(201)
|
|
||||||
).body;
|
|
||||||
const review = {
|
|
||||||
evidenceId: e.id,
|
|
||||||
passed: true,
|
|
||||||
findings: 'verified',
|
|
||||||
verification: {
|
|
||||||
artifactUri: e.artifactUri,
|
|
||||||
sha256: e.sha256,
|
|
||||||
method: 'digest readback',
|
|
||||||
result: 'match',
|
|
||||||
},
|
|
||||||
};
|
|
||||||
await post(`tasks/${task.id}/reviews`, review, 'new-executor').expect(409);
|
|
||||||
await post(`tasks/${task.id}/reviews`, review, 'reviewer').expect(201);
|
|
||||||
const detail = await request(app.getHttpServer())
|
|
||||||
.get('/admin/hermes/tasks/' + task.id)
|
|
||||||
.set('x-api-key', 'reviewer')
|
|
||||||
.expect(200);
|
|
||||||
expect(detail.body.status).toBe('DONE');
|
|
||||||
expect(detail.body.logs.map((x: any) => x.step)).toContain('QA_PASSED');
|
|
||||||
await post(`tasks/${task.id}/effects`, {
|
|
||||||
metric: 'engagement',
|
|
||||||
availability: 'UNAVAILABLE',
|
|
||||||
observed: 0,
|
|
||||||
source: 'provider unavailable',
|
|
||||||
observedAt: new Date().toISOString(),
|
|
||||||
}).expect(400);
|
|
||||||
});
|
|
||||||
it('skips a held row lock and gives CEO priority before lower priorities', async () => {
|
|
||||||
const urgent = (await post('tasks', input).expect(201)).body;
|
|
||||||
const low = (await post('tasks', { ...input, priority: 'LOW' }).expect(201))
|
|
||||||
.body;
|
|
||||||
let release!: () => void, locked!: () => void;
|
|
||||||
const ready = new Promise<void>((r) => (locked = r)),
|
|
||||||
hold = new Promise<void>((r) => (release = r));
|
|
||||||
const locking = db.$transaction(async (tx) => {
|
|
||||||
await tx.$queryRaw`SELECT id FROM corporate_tasks WHERE id=${urgent.id}::uuid FOR UPDATE`;
|
|
||||||
locked();
|
|
||||||
await hold;
|
|
||||||
});
|
|
||||||
await ready;
|
|
||||||
try {
|
|
||||||
const claim = (await post('claims', {}).expect(201)).body.task;
|
|
||||||
expect(claim.id).toBe(low.id);
|
|
||||||
} finally {
|
|
||||||
release();
|
|
||||||
await locking;
|
|
||||||
}
|
|
||||||
const next = (await post('claims', {}, 'other').expect(201)).body.task;
|
|
||||||
expect(next.id).toBe(urgent.id);
|
|
||||||
});
|
|
||||||
it('serializes simultaneous duplicate mutations into one durable record', async () => {
|
|
||||||
const op = key();
|
|
||||||
const responses = await Promise.all([
|
|
||||||
post('tasks', input, 'executor', op),
|
|
||||||
post('tasks', input, 'executor', op),
|
|
||||||
]);
|
|
||||||
expect(responses.map((r) => r.status)).toEqual([201, 201]);
|
|
||||||
expect(responses[0].body.id).toBe(responses[1].body.id);
|
|
||||||
expect(await db.corporateTask.count()).toBe(1);
|
|
||||||
});
|
|
||||||
it('gates parents on children, persists provenance, roadmap/goals and reports', async () => {
|
|
||||||
const parent = (await post('tasks', input).expect(201)).body;
|
|
||||||
const child = (
|
|
||||||
await post('tasks', { ...input, parentId: parent.id }).expect(201)
|
|
||||||
).body;
|
|
||||||
const claim = (await post('claims', {}).expect(201)).body.task;
|
|
||||||
expect(claim.id).toBe(child.id);
|
|
||||||
const e = (
|
|
||||||
await post(`tasks/${child.id}/evidence`, {
|
|
||||||
claimToken: claim.claimToken,
|
|
||||||
artifactUri: 'urn:sha256:' + 'b'.repeat(64),
|
|
||||||
sha256: 'b'.repeat(64),
|
|
||||||
summary: 'child artifact',
|
|
||||||
tool: 'jest',
|
|
||||||
result: 'receipt',
|
|
||||||
}).expect(201)
|
|
||||||
).body;
|
|
||||||
await post(
|
|
||||||
`tasks/${child.id}/reviews`,
|
|
||||||
{
|
|
||||||
evidenceId: e.id,
|
|
||||||
passed: false,
|
|
||||||
findings: 'needs correction',
|
|
||||||
verification: {
|
|
||||||
artifactUri: e.artifactUri,
|
|
||||||
sha256: e.sha256,
|
|
||||||
method: 'readback',
|
|
||||||
result: 'failed',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
'reviewer',
|
|
||||||
).expect(201);
|
|
||||||
expect(
|
|
||||||
(await db.corporateTask.findUniqueOrThrow({ where: { id: parent.id } }))
|
|
||||||
.status,
|
|
||||||
).toBe('BLOCKED');
|
|
||||||
expect((await post('claims', {}).expect(201)).body.task.id).toBe(child.id);
|
|
||||||
const research = (
|
|
||||||
await post('market-insights', {
|
|
||||||
title: 'fixture research',
|
|
||||||
category: 'TREND',
|
|
||||||
source: 'study receipt',
|
|
||||||
opportunity: 'investigate',
|
|
||||||
impact: 'LOW',
|
|
||||||
recommendedAction: 'measure',
|
|
||||||
cadence: 'MONTHLY',
|
|
||||||
provenance: {
|
|
||||||
method: 'test fixture',
|
|
||||||
collector: 'integration',
|
|
||||||
context: 'disposable',
|
|
||||||
},
|
|
||||||
sources: [
|
|
||||||
{
|
|
||||||
url: 'https://pubmed.ncbi.nlm.nih.gov/',
|
|
||||||
title: 'fixture',
|
|
||||||
excerpt: 'test-only',
|
|
||||||
retrievedAt: '2026-01-01T00:00:00Z',
|
|
||||||
sha256: 'a'.repeat(64),
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}).expect(201)
|
|
||||||
).body;
|
|
||||||
const roadmap = (
|
|
||||||
await post('monthly-roadmap', {
|
|
||||||
researchId: research.id,
|
|
||||||
cycleName: 'test',
|
|
||||||
month: '2026-10',
|
|
||||||
seasonalTheme: 'evidence pending seasonal analysis',
|
|
||||||
strategicGoals: ['measure'],
|
|
||||||
plannedArticlesCount: 31,
|
|
||||||
plannedRefreshesCount: 0,
|
|
||||||
plannedCatalogEnrichments: 0,
|
|
||||||
goals: [
|
|
||||||
{
|
|
||||||
title: 'goal',
|
|
||||||
department: 'CONTENT_SEO',
|
|
||||||
acceptanceCriteria: 'QA',
|
|
||||||
metric: 'engagement',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}).expect(201)
|
|
||||||
).body;
|
|
||||||
expect(roadmap.goals).toHaveLength(1);
|
|
||||||
await post('tasks', { ...input, goalId: roadmap.goals[0].id }).expect(201);
|
|
||||||
for (const path of ['market-insights', 'monthly-roadmap']) {
|
|
||||||
const r = await request(app.getHttpServer())
|
|
||||||
.get('/admin/hermes/' + path)
|
|
||||||
.set('x-api-key', 'executor')
|
|
||||||
.expect(200);
|
|
||||||
expect(r.body.meta.total).toBe(1);
|
|
||||||
}
|
|
||||||
const report = (
|
|
||||||
await post('reports', {
|
|
||||||
day: new Date().toISOString().slice(0, 10),
|
|
||||||
summary: 'test fixture daily report',
|
|
||||||
}).expect(201)
|
|
||||||
).body;
|
|
||||||
expect(report.snapshot.tasks).toHaveLength(3);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,828 +0,0 @@
|
|||||||
import {
|
|
||||||
Injectable,
|
|
||||||
BadRequestException,
|
|
||||||
ConflictException,
|
|
||||||
NotFoundException,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { Prisma, CorporatePriority } from '@prisma/client';
|
|
||||||
import { createHash, randomUUID } from 'crypto';
|
|
||||||
import { PrismaService } from '../../prisma/prisma.service';
|
|
||||||
import {
|
|
||||||
canonical,
|
|
||||||
monthlyPlanInput,
|
|
||||||
planMonth,
|
|
||||||
publicData,
|
|
||||||
choice,
|
|
||||||
departments,
|
|
||||||
evidenceInput,
|
|
||||||
httpsUrl,
|
|
||||||
timestamp,
|
|
||||||
meta,
|
|
||||||
normalizeSearch,
|
|
||||||
object,
|
|
||||||
pagination,
|
|
||||||
priorities,
|
|
||||||
statuses,
|
|
||||||
taskInput,
|
|
||||||
text,
|
|
||||||
uuid,
|
|
||||||
} from './corporate-policy';
|
|
||||||
type Tx = Prisma.TransactionClient;
|
|
||||||
@Injectable()
|
|
||||||
export class CorporateService {
|
|
||||||
constructor(private readonly db: PrismaService) {}
|
|
||||||
private async operation(
|
|
||||||
actor: string,
|
|
||||||
op: string,
|
|
||||||
key: string,
|
|
||||||
body: unknown,
|
|
||||||
fn: (tx: Tx) => Promise<any>,
|
|
||||||
) {
|
|
||||||
text(key, 200);
|
|
||||||
const scoped = createHash('sha256')
|
|
||||||
.update(canonical([actor, op, key]))
|
|
||||||
.digest('hex');
|
|
||||||
const hash = createHash('sha256').update(canonical(body)).digest('hex');
|
|
||||||
return this.db.$transaction(
|
|
||||||
async (tx) => {
|
|
||||||
await tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtextextended(${scoped}, 0))`;
|
|
||||||
const prior = await tx.corporateOperation.findUnique({
|
|
||||||
where: { key: scoped },
|
|
||||||
});
|
|
||||||
if (prior) {
|
|
||||||
if (prior.payloadHash !== hash)
|
|
||||||
throw new ConflictException('Idempotency key payload mismatch');
|
|
||||||
return prior.response;
|
|
||||||
}
|
|
||||||
const result = await fn(tx);
|
|
||||||
const serialized = JSON.stringify(result);
|
|
||||||
if (Buffer.byteLength(serialized, 'utf8') > 1000000)
|
|
||||||
throw new BadRequestException('Operation response exceeds limit');
|
|
||||||
const response = JSON.parse(serialized);
|
|
||||||
await tx.corporateOperation.create({
|
|
||||||
data: { key: scoped, payloadHash: hash, response },
|
|
||||||
});
|
|
||||||
return response;
|
|
||||||
},
|
|
||||||
{ maxWait: 10000, timeout: 20000 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
private event(
|
|
||||||
tx: Tx,
|
|
||||||
taskId: string,
|
|
||||||
actor: string,
|
|
||||||
step: string,
|
|
||||||
content: string,
|
|
||||||
speaker = 'SYSTEM',
|
|
||||||
payload?: any,
|
|
||||||
) {
|
|
||||||
return tx.corporateEvent.create({
|
|
||||||
data: { taskId, speaker, speakerName: actor, step, content, payload },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
private async lock(tx: Tx, id: string) {
|
|
||||||
uuid(id);
|
|
||||||
const rows = await tx.$queryRaw<
|
|
||||||
{ id: string }[]
|
|
||||||
>`SELECT id FROM corporate_tasks WHERE id=${id}::uuid FOR UPDATE`;
|
|
||||||
if (!rows.length) throw new NotFoundException('Task not found');
|
|
||||||
return tx.corporateTask.findUniqueOrThrow({ where: { id } });
|
|
||||||
}
|
|
||||||
private async fenced(tx: Tx, id: string, token: string, actor: string) {
|
|
||||||
const t = await this.lock(tx, id);
|
|
||||||
const rows = await tx.$queryRaw<
|
|
||||||
{ id: string }[]
|
|
||||||
>`SELECT id FROM corporate_tasks WHERE id=${id}::uuid AND "claimToken"=${token}::uuid AND "assignedAgent"=${actor} AND "leasedUntil">clock_timestamp() AND status='IN_PROGRESS'`;
|
|
||||||
if (!rows.length) throw new ConflictException('Stale lease or owner');
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
async tasks(q: Record<string, any>) {
|
|
||||||
const p = pagination(q),
|
|
||||||
where: Prisma.CorporateTaskWhereInput = {};
|
|
||||||
if (q.department) where.department = choice(q.department, departments);
|
|
||||||
if (q.priority)
|
|
||||||
where.priority = choice(q.priority, priorities) as CorporatePriority;
|
|
||||||
if (q.status) where.status = choice(q.status, statuses) as any;
|
|
||||||
if (q.search) {
|
|
||||||
const search = normalizeSearch(text(q.search, 300));
|
|
||||||
where.OR = [
|
|
||||||
{ normalizedTitle: { contains: search } },
|
|
||||||
{ normalizedCode: { contains: search } },
|
|
||||||
];
|
|
||||||
}
|
|
||||||
if (q.goalId) where.goalId = uuid(q.goalId);
|
|
||||||
return this.db.$transaction(
|
|
||||||
async (tx) => {
|
|
||||||
const total = await tx.corporateTask.count({ where });
|
|
||||||
const data = await tx.corporateTask.findMany({
|
|
||||||
where,
|
|
||||||
skip: p.skip,
|
|
||||||
take: p.limit,
|
|
||||||
orderBy: [{ [p.sortBy]: p.sortOrder }, { id: 'asc' }],
|
|
||||||
});
|
|
||||||
return publicData({ data, meta: meta(total, p.page, p.limit) });
|
|
||||||
},
|
|
||||||
{ isolationLevel: Prisma.TransactionIsolationLevel.RepeatableRead },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
async detail(id: string) {
|
|
||||||
uuid(id);
|
|
||||||
return this.db.$transaction(
|
|
||||||
async (tx) => {
|
|
||||||
const order = { id: 'asc' as const };
|
|
||||||
const task = await tx.corporateTask.findUnique({
|
|
||||||
where: { id },
|
|
||||||
include: {
|
|
||||||
logs: { take: 100, orderBy: [{ timestamp: 'asc' }, order] },
|
|
||||||
evidence: { take: 100, orderBy: order },
|
|
||||||
reviews: { take: 100, orderBy: order },
|
|
||||||
effects: { take: 100, orderBy: order },
|
|
||||||
children: { take: 100, orderBy: order },
|
|
||||||
_count: {
|
|
||||||
select: {
|
|
||||||
logs: true,
|
|
||||||
evidence: true,
|
|
||||||
reviews: true,
|
|
||||||
effects: true,
|
|
||||||
children: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (!task) throw new NotFoundException('Task not found');
|
|
||||||
const { _count, ...data } = task;
|
|
||||||
const relationsMeta = Object.fromEntries(
|
|
||||||
Object.entries(_count).map(([name, total]) => [
|
|
||||||
name,
|
|
||||||
{
|
|
||||||
total,
|
|
||||||
returned: Math.min(total, 100),
|
|
||||||
limit: 100,
|
|
||||||
truncated: total > 100,
|
|
||||||
},
|
|
||||||
]),
|
|
||||||
);
|
|
||||||
return publicData({ ...data, relationsMeta });
|
|
||||||
},
|
|
||||||
{ isolationLevel: Prisma.TransactionIsolationLevel.RepeatableRead },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
create(actor: string, key: string, input: unknown) {
|
|
||||||
const b = taskInput(input);
|
|
||||||
return this.operation(actor, 'create-task', key, b, async (tx) => {
|
|
||||||
if (b.parentId) {
|
|
||||||
const parent = await this.lock(tx, b.parentId);
|
|
||||||
if (!['TODO', 'BLOCKED'].includes(parent.status))
|
|
||||||
throw new ConflictException('Parent no longer accepts children');
|
|
||||||
}
|
|
||||||
const code = 'TSK-' + randomUUID();
|
|
||||||
const task = await tx.corporateTask.create({
|
|
||||||
data: {
|
|
||||||
...b,
|
|
||||||
priority: b.priority as CorporatePriority,
|
|
||||||
taskCode: code,
|
|
||||||
normalizedCode: normalizeSearch(code),
|
|
||||||
normalizedTitle: normalizeSearch(b.title),
|
|
||||||
createdBy: actor,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
await this.event(tx, task.id, actor, 'CREATED', b.description, 'CEO');
|
|
||||||
return task;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
private plannedWhere(
|
|
||||||
roadmapId: string,
|
|
||||||
month: string,
|
|
||||||
): Prisma.CorporateEventWhereInput {
|
|
||||||
return {
|
|
||||||
step: 'PLANNED',
|
|
||||||
AND: [
|
|
||||||
{ payload: { path: ['roadmapId'], equals: roadmapId } },
|
|
||||||
{ payload: { path: ['month'], equals: month } },
|
|
||||||
],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
private async readPlan(tx: Tx, roadmapId: string, month: string) {
|
|
||||||
const roadmap = await tx.corporateRoadmap.findUnique({
|
|
||||||
where: { id: roadmapId },
|
|
||||||
});
|
|
||||||
const tasks = await tx.corporateTask.findMany({
|
|
||||||
where: { logs: { some: this.plannedWhere(roadmapId, month) } },
|
|
||||||
include: {
|
|
||||||
logs: {
|
|
||||||
where: this.plannedWhere(roadmapId, month),
|
|
||||||
orderBy: { id: 'asc' },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
orderBy: [{ dueCycle: 'asc' }, { actionType: 'asc' }, { id: 'asc' }],
|
|
||||||
});
|
|
||||||
if (!roadmap || !tasks.length)
|
|
||||||
throw new NotFoundException('Monthly plan not found');
|
|
||||||
return publicData({
|
|
||||||
roadmapId,
|
|
||||||
month,
|
|
||||||
researchId: roadmap.researchId,
|
|
||||||
tasks,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
monthlyPlan(roadmapId: string, month: unknown) {
|
|
||||||
roadmapId = uuid(roadmapId);
|
|
||||||
const cycle = planMonth(month);
|
|
||||||
return this.db.$transaction((tx) => this.readPlan(tx, roadmapId, cycle), {
|
|
||||||
isolationLevel: Prisma.TransactionIsolationLevel.RepeatableRead,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
persistMonthlyPlan(actor: string, key: string, input: unknown) {
|
|
||||||
const b = monthlyPlanInput(input);
|
|
||||||
return this.operation(actor, 'monthly-plan', key, b, async (tx) => {
|
|
||||||
// Separate actor/key-independent fence: one complete plan per roadmap/month.
|
|
||||||
const scope = canonical(['monthly-plan', b.roadmapId, b.month]);
|
|
||||||
await tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtextextended(${scope}, 0))`;
|
|
||||||
if (
|
|
||||||
await tx.corporateEvent.count({
|
|
||||||
where: this.plannedWhere(b.roadmapId, b.month),
|
|
||||||
})
|
|
||||||
)
|
|
||||||
throw new ConflictException('Monthly plan already persisted');
|
|
||||||
const roadmap = await tx.corporateRoadmap.findUnique({
|
|
||||||
where: { id: b.roadmapId },
|
|
||||||
include: { goals: true, research: { include: { sources: true } } },
|
|
||||||
});
|
|
||||||
if (
|
|
||||||
!roadmap ||
|
|
||||||
roadmap.month !== b.month ||
|
|
||||||
!roadmap.research.sources.length
|
|
||||||
)
|
|
||||||
throw new ConflictException(
|
|
||||||
'Matching evidence-backed roadmap required',
|
|
||||||
);
|
|
||||||
const entries = [...b.dailyArticles, ...b.needs];
|
|
||||||
for (const entry of entries) {
|
|
||||||
if (
|
|
||||||
!roadmap.goals.some(
|
|
||||||
(g) => g.id === entry.goalId && g.department === entry.department,
|
|
||||||
) ||
|
|
||||||
!entry.sourceIds.every((id) =>
|
|
||||||
roadmap.research.sources.some((s) => s.id === id),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
throw new ConflictException(
|
|
||||||
'Goal/department and source lineage must match roadmap research',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
for (const entry of entries) {
|
|
||||||
const { sourceIds, target, reason, ...data } = entry;
|
|
||||||
const taskCode = 'TSK-' + randomUUID();
|
|
||||||
const task = await tx.corporateTask.create({
|
|
||||||
data: {
|
|
||||||
...data,
|
|
||||||
priority: data.priority as CorporatePriority,
|
|
||||||
status: 'TODO',
|
|
||||||
taskCode,
|
|
||||||
normalizedCode: normalizeSearch(taskCode),
|
|
||||||
normalizedTitle: normalizeSearch(data.title),
|
|
||||||
createdBy: actor,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
await this.event(
|
|
||||||
tx,
|
|
||||||
task.id,
|
|
||||||
actor,
|
|
||||||
'PLANNED',
|
|
||||||
entry.description,
|
|
||||||
'SYSTEM',
|
|
||||||
{
|
|
||||||
version: 1,
|
|
||||||
roadmapId: roadmap.id,
|
|
||||||
researchId: roadmap.researchId,
|
|
||||||
month: b.month,
|
|
||||||
goalId: entry.goalId,
|
|
||||||
department: entry.department,
|
|
||||||
actionType: entry.actionType,
|
|
||||||
dueCycle: entry.dueCycle,
|
|
||||||
sourceIds,
|
|
||||||
...(target ? { target, reason } : {}),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return this.readPlan(tx, b.roadmapId, b.month);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
claim(actor: string, key: string, input: unknown) {
|
|
||||||
const b = object(input, ['department', 'leaseSeconds']);
|
|
||||||
const department =
|
|
||||||
b.department === undefined ? null : choice(b.department, departments);
|
|
||||||
const seconds = Number(b.leaseSeconds ?? 300);
|
|
||||||
if (!Number.isInteger(seconds) || seconds < 30 || seconds > 900)
|
|
||||||
throw new BadRequestException('Lease must be 30..900 seconds');
|
|
||||||
return this.operation(
|
|
||||||
actor,
|
|
||||||
'claim',
|
|
||||||
key,
|
|
||||||
{ department, seconds },
|
|
||||||
async (tx) => {
|
|
||||||
const candidates = await tx.$queryRaw<
|
|
||||||
{ id: string }[]
|
|
||||||
>`SELECT t.id FROM corporate_tasks t
|
|
||||||
WHERE (t.status='TODO' OR (t.status='BLOCKED' AND EXISTS (SELECT 1 FROM corporate_tasks c WHERE c."parentId"=t.id)) OR (t.status='IN_PROGRESS' AND t."leasedUntil"<=clock_timestamp()))
|
|
||||||
AND NOT EXISTS (SELECT 1 FROM corporate_events e WHERE e."taskId"=t.id AND e.step='PLANNED'
|
|
||||||
AND (t."dueCycle" IS NULL OR t."dueCycle" !~ '^[0-9]{4}-[0-9]{2}-[0-9]{2}$'
|
|
||||||
OR e.payload->>'dueCycle' IS DISTINCT FROM t."dueCycle"
|
|
||||||
OR t."dueCycle">to_char(clock_timestamp() AT TIME ZONE 'UTC','YYYY-MM-DD')))
|
|
||||||
AND (${department}::text IS NULL OR t.department=${department})
|
|
||||||
AND NOT EXISTS (SELECT 1 FROM corporate_tasks c WHERE c."parentId"=t.id AND c.status<>'DONE')
|
|
||||||
ORDER BY t.priority ASC,t."updatedAt" ASC,t.id ASC FOR UPDATE OF t SKIP LOCKED LIMIT 1`;
|
|
||||||
if (!candidates.length) return { task: null };
|
|
||||||
const id = candidates[0].id,
|
|
||||||
token = randomUUID();
|
|
||||||
await tx.$executeRaw`UPDATE corporate_tasks SET status='IN_PROGRESS', "assignedAgent"=${actor}, "claimToken"=${token}::uuid, "leasedUntil"=clock_timestamp()+make_interval(secs=>${seconds}::int), "executionCount"="executionCount"+1,"updatedAt"=clock_timestamp() WHERE id=${id}::uuid`;
|
|
||||||
await this.event(tx, id, actor, 'CLAIMED', 'Manual lease acquired');
|
|
||||||
return {
|
|
||||||
task: await tx.corporateTask.findUniqueOrThrow({ where: { id } }),
|
|
||||||
};
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
submitEvidence(actor: string, key: string, id: string, input: unknown) {
|
|
||||||
const b = evidenceInput(input);
|
|
||||||
return this.operation(actor, 'evidence:' + id, key, b, async (tx) => {
|
|
||||||
await this.fenced(tx, id, b.claimToken, actor);
|
|
||||||
const e = await tx.corporateEvidence.create({
|
|
||||||
data: { ...b, taskId: id, executor: actor },
|
|
||||||
});
|
|
||||||
await tx.corporateTask.update({
|
|
||||||
where: { id },
|
|
||||||
data: { status: 'TEST', leasedUntil: null },
|
|
||||||
});
|
|
||||||
await this.event(
|
|
||||||
tx,
|
|
||||||
id,
|
|
||||||
actor,
|
|
||||||
'EVIDENCE_SUBMITTED',
|
|
||||||
b.summary,
|
|
||||||
'AGENT',
|
|
||||||
{ evidenceId: e.id },
|
|
||||||
);
|
|
||||||
return e;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
review(actor: string, key: string, id: string, input: unknown) {
|
|
||||||
const b = object(input, [
|
|
||||||
'evidenceId',
|
|
||||||
'passed',
|
|
||||||
'findings',
|
|
||||||
'verification',
|
|
||||||
]);
|
|
||||||
const evidenceId = uuid(b.evidenceId),
|
|
||||||
findings = text(b.findings);
|
|
||||||
if (typeof b.passed !== 'boolean')
|
|
||||||
throw new BadRequestException('passed must be boolean');
|
|
||||||
const v = object(b.verification, [
|
|
||||||
'artifactUri',
|
|
||||||
'sha256',
|
|
||||||
'method',
|
|
||||||
'result',
|
|
||||||
]);
|
|
||||||
const verification = {
|
|
||||||
artifactUri: text(v.artifactUri, 2000),
|
|
||||||
sha256: text(v.sha256, 64),
|
|
||||||
method: text(v.method, 1000),
|
|
||||||
result: text(v.result),
|
|
||||||
};
|
|
||||||
return this.operation(actor, 'review:' + id, key, b, async (tx) => {
|
|
||||||
uuid(id);
|
|
||||||
const relation = await tx.corporateTask.findUnique({
|
|
||||||
where: { id },
|
|
||||||
select: { parentId: true },
|
|
||||||
});
|
|
||||||
if (relation?.parentId) await this.lock(tx, relation.parentId);
|
|
||||||
const task = await this.lock(tx, id);
|
|
||||||
const evidence = await tx.corporateEvidence.findUnique({
|
|
||||||
where: { id: evidenceId },
|
|
||||||
});
|
|
||||||
if (
|
|
||||||
task.status !== 'TEST' ||
|
|
||||||
!evidence ||
|
|
||||||
evidence.taskId !== id ||
|
|
||||||
evidence.claimToken !== task.claimToken
|
|
||||||
)
|
|
||||||
throw new ConflictException('Current execution evidence required');
|
|
||||||
if (evidence.executor === actor)
|
|
||||||
throw new ConflictException('Independent reviewer required');
|
|
||||||
if (
|
|
||||||
verification.sha256 !== evidence.sha256 ||
|
|
||||||
verification.artifactUri !== evidence.artifactUri
|
|
||||||
)
|
|
||||||
throw new ConflictException('QA must verify exact artifact');
|
|
||||||
if (
|
|
||||||
b.passed &&
|
|
||||||
(await tx.corporateTask.count({
|
|
||||||
where: { parentId: id, status: { not: 'DONE' } },
|
|
||||||
}))
|
|
||||||
)
|
|
||||||
throw new ConflictException('Unfinished children');
|
|
||||||
const r = await tx.corporateReview.create({
|
|
||||||
data: {
|
|
||||||
taskId: id,
|
|
||||||
evidenceId,
|
|
||||||
reviewer: actor,
|
|
||||||
passed: b.passed,
|
|
||||||
findings,
|
|
||||||
verification,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
await tx.corporateTask.update({
|
|
||||||
where: { id },
|
|
||||||
data: {
|
|
||||||
status: b.passed ? 'DONE' : 'TODO',
|
|
||||||
claimToken: null,
|
|
||||||
leasedUntil: null,
|
|
||||||
qaCount: { increment: 1 },
|
|
||||||
rejectionCount: { increment: b.passed ? 0 : 1 },
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (!b.passed && task.parentId) {
|
|
||||||
await tx.corporateTask.update({
|
|
||||||
where: { id: task.parentId },
|
|
||||||
data: { status: 'BLOCKED' },
|
|
||||||
});
|
|
||||||
await this.event(
|
|
||||||
tx,
|
|
||||||
task.parentId,
|
|
||||||
actor,
|
|
||||||
'CHILD_QA_REJECTED',
|
|
||||||
'Parent blocked pending child correction',
|
|
||||||
'QA',
|
|
||||||
{ childId: id },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
await this.event(
|
|
||||||
tx,
|
|
||||||
id,
|
|
||||||
actor,
|
|
||||||
b.passed ? 'QA_PASSED' : 'QA_REJECTED',
|
|
||||||
findings,
|
|
||||||
'QA',
|
|
||||||
{ reviewId: r.id },
|
|
||||||
);
|
|
||||||
return r;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
async collection(
|
|
||||||
kind: 'market-insights' | 'monthly-roadmap' | 'reports',
|
|
||||||
q: Record<string, any>,
|
|
||||||
) {
|
|
||||||
const p = pagination(q);
|
|
||||||
return this.db.$transaction(
|
|
||||||
async (tx) => {
|
|
||||||
const model =
|
|
||||||
kind === 'market-insights'
|
|
||||||
? tx.corporateResearch
|
|
||||||
: kind === 'monthly-roadmap'
|
|
||||||
? tx.corporateRoadmap
|
|
||||||
: tx.corporateReport;
|
|
||||||
const where: any = {};
|
|
||||||
if (kind === 'market-insights' && q.category)
|
|
||||||
where.category = choice(q.category, [
|
|
||||||
'TREND',
|
|
||||||
'COMPETITOR',
|
|
||||||
'NEW_CHANNEL',
|
|
||||||
'CATALOG_GAP',
|
|
||||||
]);
|
|
||||||
if (kind === 'monthly-roadmap' && q.month)
|
|
||||||
where.month = text(q.month, 40);
|
|
||||||
const delegate = model as any;
|
|
||||||
const total = await delegate.count({ where });
|
|
||||||
const data = await delegate.findMany({
|
|
||||||
where,
|
|
||||||
skip: p.skip,
|
|
||||||
take: p.limit,
|
|
||||||
orderBy: [{ createdAt: 'desc' }, { id: 'asc' }],
|
|
||||||
...(kind === 'market-insights'
|
|
||||||
? { include: { sources: true } }
|
|
||||||
: kind === 'monthly-roadmap'
|
|
||||||
? { include: { goals: true } }
|
|
||||||
: {}),
|
|
||||||
});
|
|
||||||
return publicData({ data, meta: meta(total, p.page, p.limit) });
|
|
||||||
},
|
|
||||||
{ isolationLevel: Prisma.TransactionIsolationLevel.RepeatableRead },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
research(actor: string, key: string, input: unknown) {
|
|
||||||
const b = object(input, [
|
|
||||||
'title',
|
|
||||||
'category',
|
|
||||||
'source',
|
|
||||||
'opportunity',
|
|
||||||
'impact',
|
|
||||||
'recommendedAction',
|
|
||||||
'cadence',
|
|
||||||
'provenance',
|
|
||||||
'sources',
|
|
||||||
]);
|
|
||||||
if (!Array.isArray(b.sources) || !b.sources.length || b.sources.length > 30)
|
|
||||||
throw new BadRequestException('1..30 sources required');
|
|
||||||
const sources = b.sources.map((raw) => {
|
|
||||||
const s = object(raw, [
|
|
||||||
'url',
|
|
||||||
'title',
|
|
||||||
'excerpt',
|
|
||||||
'retrievedAt',
|
|
||||||
'sha256',
|
|
||||||
]);
|
|
||||||
const url = httpsUrl(s.url),
|
|
||||||
sha256 = text(s.sha256, 64),
|
|
||||||
retrievedAt = timestamp(s.retrievedAt, 'Invalid source time');
|
|
||||||
if (
|
|
||||||
!url.startsWith('https://') ||
|
|
||||||
!/^[a-f0-9]{64}$/.test(sha256) ||
|
|
||||||
!Number.isFinite(retrievedAt.getTime()) ||
|
|
||||||
retrievedAt.getTime() > Date.now()
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Invalid source');
|
|
||||||
return {
|
|
||||||
url,
|
|
||||||
sha256,
|
|
||||||
retrievedAt,
|
|
||||||
title: text(s.title, 300),
|
|
||||||
excerpt: text(s.excerpt),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
const provenance = object(b.provenance, ['method', 'collector', 'context']);
|
|
||||||
const data = {
|
|
||||||
title: text(b.title, 300),
|
|
||||||
category: choice(b.category, [
|
|
||||||
'TREND',
|
|
||||||
'COMPETITOR',
|
|
||||||
'NEW_CHANNEL',
|
|
||||||
'CATALOG_GAP',
|
|
||||||
]),
|
|
||||||
source: text(b.source, 2000),
|
|
||||||
opportunity: text(b.opportunity),
|
|
||||||
impact: choice(b.impact, ['HIGH', 'MEDIUM', 'LOW']),
|
|
||||||
recommendedAction: text(b.recommendedAction),
|
|
||||||
cadence: choice(b.cadence, ['MONTHLY', 'EVENT']),
|
|
||||||
provenance: {
|
|
||||||
method: text(provenance.method),
|
|
||||||
collector: text(provenance.collector, 300),
|
|
||||||
context: text(provenance.context),
|
|
||||||
},
|
|
||||||
createdBy: actor,
|
|
||||||
};
|
|
||||||
return this.operation(actor, 'research', key, b, (tx) =>
|
|
||||||
tx.corporateResearch.create({
|
|
||||||
data: { ...data, sources: { create: sources } },
|
|
||||||
include: { sources: true },
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
roadmap(actor: string, key: string, input: unknown) {
|
|
||||||
const b = object(input, [
|
|
||||||
'researchId',
|
|
||||||
'cycleName',
|
|
||||||
'month',
|
|
||||||
'seasonalTheme',
|
|
||||||
'strategicGoals',
|
|
||||||
'plannedArticlesCount',
|
|
||||||
'plannedRefreshesCount',
|
|
||||||
'plannedCatalogEnrichments',
|
|
||||||
'isActive',
|
|
||||||
'goals',
|
|
||||||
]);
|
|
||||||
if (
|
|
||||||
!Array.isArray(b.strategicGoals) ||
|
|
||||||
!b.strategicGoals.length ||
|
|
||||||
b.strategicGoals.length > 30 ||
|
|
||||||
!Array.isArray(b.goals) ||
|
|
||||||
!b.goals.length ||
|
|
||||||
b.goals.length > 100
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Goals required');
|
|
||||||
for (const k of [
|
|
||||||
'plannedArticlesCount',
|
|
||||||
'plannedRefreshesCount',
|
|
||||||
'plannedCatalogEnrichments',
|
|
||||||
])
|
|
||||||
if (!Number.isInteger(b[k]) || b[k] < 0 || b[k] > 10000)
|
|
||||||
throw new BadRequestException('Invalid counts');
|
|
||||||
if (b.isActive !== undefined && typeof b.isActive !== 'boolean')
|
|
||||||
throw new BadRequestException('Invalid active flag');
|
|
||||||
const goals = b.goals.map((raw) => {
|
|
||||||
const g = object(raw, [
|
|
||||||
'title',
|
|
||||||
'department',
|
|
||||||
'acceptanceCriteria',
|
|
||||||
'metric',
|
|
||||||
'target',
|
|
||||||
]);
|
|
||||||
if (
|
|
||||||
g.target !== undefined &&
|
|
||||||
(typeof g.target !== 'number' || !Number.isFinite(g.target))
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Invalid target');
|
|
||||||
return {
|
|
||||||
title: text(g.title, 300),
|
|
||||||
department: choice(g.department, departments),
|
|
||||||
acceptanceCriteria: text(g.acceptanceCriteria),
|
|
||||||
metric: text(g.metric, 300),
|
|
||||||
target: g.target,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
const data = {
|
|
||||||
researchId: uuid(b.researchId),
|
|
||||||
cycleName: text(b.cycleName, 300),
|
|
||||||
month: text(b.month, 40),
|
|
||||||
seasonalTheme: text(b.seasonalTheme),
|
|
||||||
strategicGoals: b.strategicGoals.map((g) => text(g, 1000)),
|
|
||||||
plannedArticlesCount: b.plannedArticlesCount,
|
|
||||||
plannedRefreshesCount: b.plannedRefreshesCount,
|
|
||||||
plannedCatalogEnrichments: b.plannedCatalogEnrichments,
|
|
||||||
isActive: b.isActive ?? false,
|
|
||||||
createdBy: actor,
|
|
||||||
};
|
|
||||||
return this.operation(actor, 'roadmap', key, b, async (tx) => {
|
|
||||||
const research = await tx.corporateResearch.findUnique({
|
|
||||||
where: { id: data.researchId },
|
|
||||||
include: { sources: true },
|
|
||||||
});
|
|
||||||
if (!research || !research.sources.length)
|
|
||||||
throw new ConflictException('Evidence-backed research required');
|
|
||||||
const result = await tx.corporateRoadmap.create({
|
|
||||||
data: { ...data, goals: { create: goals } },
|
|
||||||
include: { goals: true },
|
|
||||||
});
|
|
||||||
await tx.corporateResearch.update({
|
|
||||||
where: { id: research.id },
|
|
||||||
data: { status: 'IN_BACKLOG' },
|
|
||||||
});
|
|
||||||
return result;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
effect(actor: string, key: string, id: string, input: unknown) {
|
|
||||||
const b = object(input, [
|
|
||||||
'metric',
|
|
||||||
'availability',
|
|
||||||
'baseline',
|
|
||||||
'observed',
|
|
||||||
'source',
|
|
||||||
'observedAt',
|
|
||||||
]);
|
|
||||||
const availability = choice(b.availability, [
|
|
||||||
'MEASURED',
|
|
||||||
'UNAVAILABLE',
|
|
||||||
'UNINSTRUMENTED',
|
|
||||||
'BUSINESS_DISABLED',
|
|
||||||
]);
|
|
||||||
for (const k of ['baseline', 'observed'])
|
|
||||||
if (
|
|
||||||
b[k] !== undefined &&
|
|
||||||
b[k] !== null &&
|
|
||||||
(typeof b[k] !== 'number' || !Number.isFinite(b[k]))
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Invalid metric');
|
|
||||||
if (availability === 'MEASURED' && typeof b.observed !== 'number')
|
|
||||||
throw new BadRequestException('Measured value required');
|
|
||||||
if (
|
|
||||||
availability !== 'MEASURED' &&
|
|
||||||
(b.observed != null || b.baseline != null)
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Unavailable is not zero');
|
|
||||||
const observedAt = timestamp(b.observedAt, 'Invalid observation time');
|
|
||||||
if (
|
|
||||||
!Number.isFinite(observedAt.getTime()) ||
|
|
||||||
observedAt.getTime() > Date.now()
|
|
||||||
)
|
|
||||||
throw new BadRequestException('Invalid observation time');
|
|
||||||
return this.operation(actor, 'effect:' + id, key, b, async (tx) => {
|
|
||||||
const task = await this.lock(tx, id);
|
|
||||||
if (task.status !== 'DONE')
|
|
||||||
throw new ConflictException('Effects require completed QA');
|
|
||||||
const e = await tx.corporateEffect.create({
|
|
||||||
data: {
|
|
||||||
taskId: id,
|
|
||||||
metric: text(b.metric, 300),
|
|
||||||
availability,
|
|
||||||
baseline: b.baseline,
|
|
||||||
observed: b.observed,
|
|
||||||
source: text(b.source, 2000),
|
|
||||||
observedAt,
|
|
||||||
recordedBy: actor,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
await this.event(tx, id, actor, 'EFFECT_RECORDED', e.metric, 'SYSTEM', {
|
|
||||||
effectId: e.id,
|
|
||||||
});
|
|
||||||
return e;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
report(actor: string, key: string, input: unknown) {
|
|
||||||
const b = object(input, ['day', 'summary']);
|
|
||||||
const day = text(b.day, 10),
|
|
||||||
summary = text(b.summary);
|
|
||||||
if (
|
|
||||||
!/^\d{4}-\d{2}-\d{2}$/.test(day) ||
|
|
||||||
!Number.isFinite(Date.parse(day + 'T00:00:00Z'))
|
|
||||||
)
|
|
||||||
throw new BadRequestException('ISO day required');
|
|
||||||
return this.operation(actor, 'report', key, b, async (tx) => {
|
|
||||||
const start = new Date(day + 'T00:00:00Z'),
|
|
||||||
end = new Date(start.getTime() + 86400000);
|
|
||||||
const taskWhere = { updatedAt: { gte: start, lt: end } };
|
|
||||||
const eventWhere = { timestamp: { gte: start, lt: end } };
|
|
||||||
const effectWhere = { createdAt: { gte: start, lt: end } };
|
|
||||||
const totals = {
|
|
||||||
tasks: await tx.corporateTask.count({ where: taskWhere }),
|
|
||||||
events: await tx.corporateEvent.count({ where: eventWhere }),
|
|
||||||
effects: await tx.corporateEffect.count({ where: effectWhere }),
|
|
||||||
};
|
|
||||||
const tasks = await tx.corporateTask.findMany({
|
|
||||||
where: taskWhere,
|
|
||||||
take: 100,
|
|
||||||
orderBy: [{ updatedAt: 'asc' }, { id: 'asc' }],
|
|
||||||
select: {
|
|
||||||
id: true,
|
|
||||||
taskCode: true,
|
|
||||||
title: true,
|
|
||||||
status: true,
|
|
||||||
department: true,
|
|
||||||
updatedAt: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const events = await tx.corporateEvent.findMany({
|
|
||||||
where: eventWhere,
|
|
||||||
take: 100,
|
|
||||||
orderBy: [{ timestamp: 'asc' }, { id: 'asc' }],
|
|
||||||
select: {
|
|
||||||
id: true,
|
|
||||||
taskId: true,
|
|
||||||
timestamp: true,
|
|
||||||
speaker: true,
|
|
||||||
speakerName: true,
|
|
||||||
step: true,
|
|
||||||
content: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const effects = await tx.corporateEffect.findMany({
|
|
||||||
where: effectWhere,
|
|
||||||
take: 100,
|
|
||||||
orderBy: [{ createdAt: 'asc' }, { id: 'asc' }],
|
|
||||||
select: {
|
|
||||||
id: true,
|
|
||||||
taskId: true,
|
|
||||||
metric: true,
|
|
||||||
availability: true,
|
|
||||||
baseline: true,
|
|
||||||
observed: true,
|
|
||||||
source: true,
|
|
||||||
observedAt: true,
|
|
||||||
createdAt: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
let fieldsTruncated = false;
|
|
||||||
const project = (rows: any[]) =>
|
|
||||||
rows.map((row) =>
|
|
||||||
Object.fromEntries(
|
|
||||||
Object.entries(row).map(([name, value]) => {
|
|
||||||
if (typeof value === 'string' && value.length > 1000) {
|
|
||||||
fieldsTruncated = true;
|
|
||||||
return [name, value.slice(0, 1000)];
|
|
||||||
}
|
|
||||||
return [name, value];
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
const bounded = {
|
|
||||||
tasks: project(tasks),
|
|
||||||
events: project(events),
|
|
||||||
effects: project(effects),
|
|
||||||
};
|
|
||||||
const counts = Object.fromEntries(
|
|
||||||
Object.entries(totals).map(([name, total]) => [
|
|
||||||
name,
|
|
||||||
{
|
|
||||||
total,
|
|
||||||
returned: Math.min(total, 100),
|
|
||||||
limit: 100,
|
|
||||||
truncated: total > 100,
|
|
||||||
},
|
|
||||||
]),
|
|
||||||
);
|
|
||||||
const snapshot = JSON.parse(
|
|
||||||
JSON.stringify({
|
|
||||||
timezone: 'UTC',
|
|
||||||
...bounded,
|
|
||||||
meta: {
|
|
||||||
...counts,
|
|
||||||
fieldsTruncated,
|
|
||||||
stringLimit: 1000,
|
|
||||||
eventPayloadsOmitted: true,
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
return tx.corporateReport.create({
|
|
||||||
data: { day, summary, snapshot, createdBy: actor },
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -76,7 +76,7 @@ describe("MediaService", () => {
|
|||||||
|
|
||||||
const validFile = {
|
const validFile = {
|
||||||
originalname: "product-cover.webp",
|
originalname: "product-cover.webp",
|
||||||
buffer: Buffer.from("dummy-image-bytes"),
|
buffer: Buffer.from([0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x45, 0x42, 0x50, 0x56, 0x50, 0x38]),
|
||||||
mimetype: "image/webp",
|
mimetype: "image/webp",
|
||||||
size: 5000,
|
size: 5000,
|
||||||
} as any;
|
} as any;
|
||||||
|
|||||||
@@ -79,6 +79,28 @@ export class MediaService {
|
|||||||
"پسوند فایل ارسالی مجاز نیست (فرمت SVG و فایلهای اجرایی مسدود هستند).",
|
"پسوند فایل ارسالی مجاز نیست (فرمت SVG و فایلهای اجرایی مسدود هستند).",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SEC-01: Magic number verification for uploaded binary content
|
||||||
|
const buf = file.buffer;
|
||||||
|
if (!buf || buf.length < 4) {
|
||||||
|
throw new BadRequestException("فایل نامعتبر یا آسیبدیده است.");
|
||||||
|
}
|
||||||
|
|
||||||
|
const isJpeg = buf[0] === 0xff && buf[1] === 0xd8 && buf[2] === 0xff;
|
||||||
|
const isPng = buf[0] === 0x89 && buf[1] === 0x50 && buf[2] === 0x4e && buf[3] === 0x47;
|
||||||
|
const isGif = buf[0] === 0x47 && buf[1] === 0x49 && buf[2] === 0x46; // GIF87a or GIF89a
|
||||||
|
const isPdf = buf[0] === 0x25 && buf[1] === 0x50 && buf[2] === 0x44 && buf[3] === 0x46; // %PDF
|
||||||
|
const isWebp =
|
||||||
|
buf.length >= 12 &&
|
||||||
|
buf[0] === 0x52 && buf[1] === 0x49 && buf[2] === 0x46 && buf[3] === 0x46 && // RIFF
|
||||||
|
buf[8] === 0x57 && buf[9] === 0x45 && buf[10] === 0x42 && buf[11] === 0x50; // WEBP
|
||||||
|
|
||||||
|
if (!isJpeg && !isPng && !isGif && !isPdf && !isWebp) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
"محتوای باینری فایل با پسوند یا هدر ادعایی همخوانی ندارد (اعتبارسنجی امضای فایل رد شد).",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const filename = `${uniqueSuffix}${ext}`;
|
const filename = `${uniqueSuffix}${ext}`;
|
||||||
const filePath = path.join(uploadDir, filename);
|
const filePath = path.join(uploadDir, filename);
|
||||||
|
|
||||||
|
|||||||
@@ -1,125 +0,0 @@
|
|||||||
import {
|
|
||||||
Controller,
|
|
||||||
Get,
|
|
||||||
Post,
|
|
||||||
Put,
|
|
||||||
Patch,
|
|
||||||
Delete,
|
|
||||||
Body,
|
|
||||||
Param,
|
|
||||||
Query,
|
|
||||||
UseGuards,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
|
||||||
import { AdvisorsService, CreateAdvisorDto } from './advisors.service';
|
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
|
||||||
|
|
||||||
@Controller('admin')
|
|
||||||
@UseGuards(JwtAuthGuard)
|
|
||||||
export class AdvisorsController {
|
|
||||||
constructor(
|
|
||||||
private readonly advisorsService: AdvisorsService,
|
|
||||||
private readonly prisma: PrismaService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Advisors Management
|
|
||||||
*/
|
|
||||||
@Get('advisors')
|
|
||||||
async listAdvisors() {
|
|
||||||
const data = await this.advisorsService.listAdvisors();
|
|
||||||
return { success: true, data };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('advisors')
|
|
||||||
async createAdvisor(@Body() dto: CreateAdvisorDto) {
|
|
||||||
const data = await this.advisorsService.createAdvisor(dto);
|
|
||||||
return { success: true, message: 'مشاور جدید با موفقیت اضافه شد.', data };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Put('advisors/:id')
|
|
||||||
async updateAdvisor(@Param('id') id: string, @Body() dto: Partial<CreateAdvisorDto>) {
|
|
||||||
const data = await this.advisorsService.updateAdvisor(id, dto);
|
|
||||||
return { success: true, message: 'اطلاعات مشاور بهروزرسانی شد.', data };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Patch('advisors/:id/set-default')
|
|
||||||
async setDefaultAdvisor(@Param('id') id: string) {
|
|
||||||
const data = await this.advisorsService.setDefaultAdvisor(id);
|
|
||||||
return { success: true, message: 'مشاور با موفقیت به عنوان پیشفرض سیستم انتخاب شد.', data };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Delete('advisors/:id')
|
|
||||||
async deleteAdvisor(@Param('id') id: string) {
|
|
||||||
return this.advisorsService.deleteAdvisor(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Leads (Contact Requests) Management
|
|
||||||
*/
|
|
||||||
@Get('leads')
|
|
||||||
async listLeads(
|
|
||||||
@Query('page') page?: number,
|
|
||||||
@Query('limit') limit?: number,
|
|
||||||
@Query('status') status?: string,
|
|
||||||
@Query('search') search?: string,
|
|
||||||
) {
|
|
||||||
const data = await this.advisorsService.listLeads({ page, limit, status, search });
|
|
||||||
return { success: true, data };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Patch('leads/:id/status')
|
|
||||||
async updateLeadStatus(
|
|
||||||
@Param('id') id: string,
|
|
||||||
@Body() body: { status: string; notes?: string },
|
|
||||||
) {
|
|
||||||
const data = await this.advisorsService.updateLeadStatus(id, body.status, body.notes);
|
|
||||||
return { success: true, message: 'وضعیت درخواست تماس بهروزرسانی شد.', data };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Delete('leads/:id')
|
|
||||||
async deleteLead(@Param('id') id: string) {
|
|
||||||
return this.advisorsService.deleteLead(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Product Advisor Linking
|
|
||||||
*/
|
|
||||||
@Get('products/:productId/advisor')
|
|
||||||
async getProductAdvisor(@Param('productId') productId: string) {
|
|
||||||
const pa = await this.prisma.productAdvisor.findFirst({
|
|
||||||
where: { productId },
|
|
||||||
include: { advisor: true },
|
|
||||||
});
|
|
||||||
return { success: true, data: pa?.advisor || null };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('products/:productId/advisor')
|
|
||||||
async assignProductAdvisor(
|
|
||||||
@Param('productId') productId: string,
|
|
||||||
@Body() body: { advisorId: string | null },
|
|
||||||
) {
|
|
||||||
if (!body.advisorId) {
|
|
||||||
// Remove product advisor assignment
|
|
||||||
await this.prisma.productAdvisor.deleteMany({ where: { productId } });
|
|
||||||
return { success: true, message: 'مشاور اختصاصی محصول حذف و به حالت پیشفرض بازگشت.' };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Upsert assignment
|
|
||||||
await this.prisma.productAdvisor.upsert({
|
|
||||||
where: {
|
|
||||||
productId_advisorId: {
|
|
||||||
productId,
|
|
||||||
advisorId: body.advisorId,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
create: {
|
|
||||||
productId,
|
|
||||||
advisorId: body.advisorId,
|
|
||||||
},
|
|
||||||
update: {},
|
|
||||||
});
|
|
||||||
|
|
||||||
return { success: true, message: 'مشاور اختصاصی محصول با موفقیت تعیین شد.' };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import { Module } from '@nestjs/common';
|
|
||||||
import { PrismaModule } from '../prisma/prisma.module';
|
|
||||||
import { NotificationsModule } from '../notifications/notifications.module';
|
|
||||||
import { AdvisorsService } from './advisors.service';
|
|
||||||
import { AdvisorsController } from './advisors.controller';
|
|
||||||
import { PublicLeadController } from './public-lead.controller';
|
|
||||||
|
|
||||||
@Module({
|
|
||||||
imports: [PrismaModule, NotificationsModule],
|
|
||||||
controllers: [AdvisorsController, PublicLeadController],
|
|
||||||
providers: [AdvisorsService],
|
|
||||||
exports: [AdvisorsService],
|
|
||||||
})
|
|
||||||
export class AdvisorsModule {}
|
|
||||||
@@ -1,111 +0,0 @@
|
|||||||
import { Test, TestingModule } from '@nestjs/testing';
|
|
||||||
import { AdvisorsService } from './advisors.service';
|
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
|
||||||
import { NotificationsQueueService } from '../notifications/notifications-queue.service';
|
|
||||||
import { BadRequestException } from '@nestjs/common';
|
|
||||||
|
|
||||||
describe('AdvisorsService', () => {
|
|
||||||
let service: AdvisorsService;
|
|
||||||
let prisma: any;
|
|
||||||
let queueService: any;
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
prisma = {
|
|
||||||
advisorContact: {
|
|
||||||
findMany: jest.fn(),
|
|
||||||
findUnique: jest.fn(),
|
|
||||||
findFirst: jest.fn(),
|
|
||||||
create: jest.fn(),
|
|
||||||
update: jest.fn(),
|
|
||||||
updateMany: jest.fn(),
|
|
||||||
delete: jest.fn(),
|
|
||||||
},
|
|
||||||
lead: {
|
|
||||||
findMany: jest.fn(),
|
|
||||||
count: jest.fn(),
|
|
||||||
findUnique: jest.fn(),
|
|
||||||
create: jest.fn(),
|
|
||||||
update: jest.fn(),
|
|
||||||
delete: jest.fn(),
|
|
||||||
},
|
|
||||||
product: {
|
|
||||||
findUnique: jest.fn(),
|
|
||||||
},
|
|
||||||
productAdvisor: {
|
|
||||||
findFirst: jest.fn(),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
queueService = {
|
|
||||||
enqueue: jest.fn().mockResolvedValue({ id: 'q-1' }),
|
|
||||||
};
|
|
||||||
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
|
||||||
providers: [
|
|
||||||
AdvisorsService,
|
|
||||||
{ provide: PrismaService, useValue: prisma },
|
|
||||||
{ provide: NotificationsQueueService, useValue: queueService },
|
|
||||||
],
|
|
||||||
}).compile();
|
|
||||||
|
|
||||||
service = module.get<AdvisorsService>(AdvisorsService);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should list advisors with counts', async () => {
|
|
||||||
prisma.advisorContact.findMany.mockResolvedValueOnce([
|
|
||||||
{
|
|
||||||
id: 'adv-1',
|
|
||||||
name: 'دکتر علوی',
|
|
||||||
phone: '09123456789',
|
|
||||||
isDefault: true,
|
|
||||||
isActive: true,
|
|
||||||
_count: { productAdvisors: 2, leads: 5 },
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
const result = await service.listAdvisors();
|
|
||||||
expect(result).toHaveLength(1);
|
|
||||||
expect(result[0].name).toBe('دکتر علوی');
|
|
||||||
expect(result[0].productsCount).toBe(2);
|
|
||||||
expect(result[0].leadsCount).toBe(5);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create lead and enqueue notifications for default advisor and client', async () => {
|
|
||||||
prisma.lead.count.mockResolvedValueOnce(0); // rate limit
|
|
||||||
prisma.advisorContact.findFirst.mockResolvedValueOnce({
|
|
||||||
id: 'adv-def',
|
|
||||||
name: 'مشاور پیشفرض',
|
|
||||||
phone: '09120000000',
|
|
||||||
isDefault: true,
|
|
||||||
isActive: true,
|
|
||||||
});
|
|
||||||
prisma.lead.create.mockResolvedValueOnce({
|
|
||||||
id: 'lead-1',
|
|
||||||
firstName: 'علی',
|
|
||||||
lastName: 'رضایی',
|
|
||||||
phone: '09129876543',
|
|
||||||
advisorId: 'adv-def',
|
|
||||||
status: 'PENDING',
|
|
||||||
});
|
|
||||||
|
|
||||||
const res = await service.handlePublicLead({
|
|
||||||
firstName: 'علی',
|
|
||||||
lastName: 'رضایی',
|
|
||||||
phone: '09129876543',
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(res.success).toBe(true);
|
|
||||||
expect(res.leadId).toBe('lead-1');
|
|
||||||
expect(queueService.enqueue).toHaveBeenCalledTimes(2); // 1 for advisor, 1 for client
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should reject invalid phone format', async () => {
|
|
||||||
await expect(
|
|
||||||
service.handlePublicLead({
|
|
||||||
firstName: 'تست',
|
|
||||||
lastName: 'تستی',
|
|
||||||
phone: '1234',
|
|
||||||
}),
|
|
||||||
).rejects.toThrow(BadRequestException);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,379 +0,0 @@
|
|||||||
import { Injectable, BadRequestException, NotFoundException, Logger } from '@nestjs/common';
|
|
||||||
import { IsString, IsNotEmpty, IsOptional, IsBoolean } from 'class-validator';
|
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
|
||||||
import { NotificationsQueueService } from '../notifications/notifications-queue.service';
|
|
||||||
|
|
||||||
export class CreateAdvisorDto {
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
name!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
phone!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
title?: string;
|
|
||||||
|
|
||||||
@IsBoolean()
|
|
||||||
@IsOptional()
|
|
||||||
isDefault?: boolean;
|
|
||||||
|
|
||||||
@IsBoolean()
|
|
||||||
@IsOptional()
|
|
||||||
isActive?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class CreateLeadDto {
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
firstName!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
lastName!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
phone!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
productId?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class AdvisorsService {
|
|
||||||
private readonly logger = new Logger(AdvisorsService.name);
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private readonly prisma: PrismaService,
|
|
||||||
private readonly queueService: NotificationsQueueService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* List all advisors with attached product count and leads count
|
|
||||||
*/
|
|
||||||
async listAdvisors() {
|
|
||||||
const advisors = await this.prisma.advisorContact.findMany({
|
|
||||||
orderBy: [{ isDefault: 'desc' }, { createdAt: 'desc' }],
|
|
||||||
include: {
|
|
||||||
_count: {
|
|
||||||
select: {
|
|
||||||
productAdvisors: true,
|
|
||||||
leads: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return advisors.map((a) => ({
|
|
||||||
id: a.id,
|
|
||||||
name: a.name,
|
|
||||||
phone: a.phone,
|
|
||||||
title: a.title,
|
|
||||||
isDefault: a.isDefault,
|
|
||||||
isActive: a.isActive,
|
|
||||||
productsCount: a._count.productAdvisors,
|
|
||||||
leadsCount: a._count.leads,
|
|
||||||
createdAt: a.createdAt,
|
|
||||||
updatedAt: a.updatedAt,
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new advisor
|
|
||||||
*/
|
|
||||||
async createAdvisor(dto: CreateAdvisorDto) {
|
|
||||||
if (!dto.name || !dto.phone) {
|
|
||||||
throw new BadRequestException('نام و شماره موبایل مشاور الزامی است.');
|
|
||||||
}
|
|
||||||
|
|
||||||
const cleanPhone = dto.phone.trim();
|
|
||||||
const existing = await this.prisma.advisorContact.findUnique({
|
|
||||||
where: { phone: cleanPhone },
|
|
||||||
});
|
|
||||||
if (existing) {
|
|
||||||
throw new BadRequestException('مشاوری با این شماره تلفن قبلاً ثبت شده است.');
|
|
||||||
}
|
|
||||||
|
|
||||||
// If marked default, unset others first
|
|
||||||
if (dto.isDefault) {
|
|
||||||
await this.prisma.advisorContact.updateMany({
|
|
||||||
where: { isDefault: true },
|
|
||||||
data: { isDefault: false },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const advisor = await this.prisma.advisorContact.create({
|
|
||||||
data: {
|
|
||||||
name: dto.name.trim(),
|
|
||||||
phone: cleanPhone,
|
|
||||||
title: dto.title?.trim() || null,
|
|
||||||
isDefault: Boolean(dto.isDefault),
|
|
||||||
isActive: dto.isActive !== undefined ? Boolean(dto.isActive) : true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return advisor;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update advisor
|
|
||||||
*/
|
|
||||||
async updateAdvisor(id: string, dto: Partial<CreateAdvisorDto>) {
|
|
||||||
const existing = await this.prisma.advisorContact.findUnique({ where: { id } });
|
|
||||||
if (!existing) throw new NotFoundException('مشاور مورد نظر یافت نشد.');
|
|
||||||
|
|
||||||
if (dto.phone && dto.phone !== existing.phone) {
|
|
||||||
const phoneExists = await this.prisma.advisorContact.findUnique({
|
|
||||||
where: { phone: dto.phone.trim() },
|
|
||||||
});
|
|
||||||
if (phoneExists && phoneExists.id !== id) {
|
|
||||||
throw new BadRequestException('شماره تلفن وارد شده برای مشاور دیگری ثبت شده است.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dto.isDefault) {
|
|
||||||
await this.prisma.advisorContact.updateMany({
|
|
||||||
where: { isDefault: true, id: { not: id } },
|
|
||||||
data: { isDefault: false },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.prisma.advisorContact.update({
|
|
||||||
where: { id },
|
|
||||||
data: {
|
|
||||||
name: dto.name ? dto.name.trim() : undefined,
|
|
||||||
phone: dto.phone ? dto.phone.trim() : undefined,
|
|
||||||
title: dto.title !== undefined ? dto.title?.trim() || null : undefined,
|
|
||||||
isDefault: dto.isDefault !== undefined ? Boolean(dto.isDefault) : undefined,
|
|
||||||
isActive: dto.isActive !== undefined ? Boolean(dto.isActive) : undefined,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set advisor as default
|
|
||||||
*/
|
|
||||||
async setDefaultAdvisor(id: string) {
|
|
||||||
const existing = await this.prisma.advisorContact.findUnique({ where: { id } });
|
|
||||||
if (!existing) throw new NotFoundException('مشاور یافت نشد.');
|
|
||||||
|
|
||||||
await this.prisma.advisorContact.updateMany({
|
|
||||||
where: { isDefault: true },
|
|
||||||
data: { isDefault: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
return this.prisma.advisorContact.update({
|
|
||||||
where: { id },
|
|
||||||
data: { isDefault: true, isActive: true },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Delete advisor
|
|
||||||
*/
|
|
||||||
async deleteAdvisor(id: string) {
|
|
||||||
const existing = await this.prisma.advisorContact.findUnique({ where: { id } });
|
|
||||||
if (!existing) throw new NotFoundException('مشاور یافت نشد.');
|
|
||||||
|
|
||||||
await this.prisma.advisorContact.delete({ where: { id } });
|
|
||||||
return { success: true, message: 'مشاور با موفقیت حذف شد.' };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* List customer leads (contact requests)
|
|
||||||
*/
|
|
||||||
async listLeads(query: { page?: number; limit?: number; status?: string; search?: string }) {
|
|
||||||
const page = Math.max(1, Number(query.page || 1));
|
|
||||||
const limit = Math.max(1, Math.min(100, Number(query.limit || 20)));
|
|
||||||
const skip = (page - 1) * limit;
|
|
||||||
|
|
||||||
const where: any = {};
|
|
||||||
if (query.status && query.status !== 'ALL') {
|
|
||||||
where.status = query.status;
|
|
||||||
}
|
|
||||||
if (query.search) {
|
|
||||||
where.OR = [
|
|
||||||
{ firstName: { contains: query.search, mode: 'insensitive' } },
|
|
||||||
{ lastName: { contains: query.search, mode: 'insensitive' } },
|
|
||||||
{ phone: { contains: query.search, mode: 'insensitive' } },
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
const [items, total] = await Promise.all([
|
|
||||||
this.prisma.lead.findMany({
|
|
||||||
where,
|
|
||||||
orderBy: { createdAt: 'desc' },
|
|
||||||
skip,
|
|
||||||
take: limit,
|
|
||||||
include: {
|
|
||||||
advisor: {
|
|
||||||
select: { id: true, name: true, phone: true, title: true },
|
|
||||||
},
|
|
||||||
product: {
|
|
||||||
select: { id: true, nameFa: true, nameEn: true, slug: true, imageUrl: true },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
this.prisma.lead.count({ where }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
const [pendingCount, contactedCount, cancelledCount] = await Promise.all([
|
|
||||||
this.prisma.lead.count({ where: { status: 'PENDING' } }),
|
|
||||||
this.prisma.lead.count({ where: { status: 'CONTACTED' } }),
|
|
||||||
this.prisma.lead.count({ where: { status: 'CANCELLED' } }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
return {
|
|
||||||
items,
|
|
||||||
total,
|
|
||||||
page,
|
|
||||||
limit,
|
|
||||||
totalPages: Math.ceil(total / limit) || 1,
|
|
||||||
stats: {
|
|
||||||
total,
|
|
||||||
pending: pendingCount,
|
|
||||||
contacted: contactedCount,
|
|
||||||
cancelled: cancelledCount,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update lead status or notes
|
|
||||||
*/
|
|
||||||
async updateLeadStatus(id: string, status: string, notes?: string) {
|
|
||||||
const lead = await this.prisma.lead.findUnique({ where: { id } });
|
|
||||||
if (!lead) throw new NotFoundException('درخواست تماس یافت نشد.');
|
|
||||||
|
|
||||||
return this.prisma.lead.update({
|
|
||||||
where: { id },
|
|
||||||
data: {
|
|
||||||
status,
|
|
||||||
notes: notes !== undefined ? notes : undefined,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Delete lead
|
|
||||||
*/
|
|
||||||
async deleteLead(id: string) {
|
|
||||||
await this.prisma.lead.delete({ where: { id } });
|
|
||||||
return { success: true, message: 'درخواست تماس با موفقیت حذف شد.' };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Public Lead Creation from Website
|
|
||||||
*/
|
|
||||||
async handlePublicLead(dto: CreateLeadDto) {
|
|
||||||
if (!dto.firstName || !dto.lastName || !dto.phone) {
|
|
||||||
throw new BadRequestException('نام، نام خانوادگی و شماره موبایل الزامی است.');
|
|
||||||
}
|
|
||||||
|
|
||||||
const cleanPhone = dto.phone.replace(/\s+/g, '').replace(/^(\+98|0098)/, '0');
|
|
||||||
if (!/^09\d{9}$/.test(cleanPhone)) {
|
|
||||||
throw new BadRequestException('شماره موبایل وارد شده نامعتبر است (مثال: ۰۹۱۲۳۴۵۶۷۸۹).');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Rate limit: max 3 requests per 24 hours per phone
|
|
||||||
const oneDayAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);
|
|
||||||
const countToday = await this.prisma.lead.count({
|
|
||||||
where: {
|
|
||||||
phone: cleanPhone,
|
|
||||||
createdAt: { gte: oneDayAgo },
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (countToday >= 3) {
|
|
||||||
throw new BadRequestException('حداکثر تعداد درخواست روزانه برای این شماره تکمیل شده است. همکاران ما به زودی با شما تماس خواهند گرفت.');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Resolve advisor: Product-specific -> Default advisor -> First active advisor
|
|
||||||
let advisor = null;
|
|
||||||
let product = null;
|
|
||||||
|
|
||||||
if (dto.productId) {
|
|
||||||
product = await this.prisma.product.findUnique({
|
|
||||||
where: { id: dto.productId },
|
|
||||||
select: { id: true, nameFa: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
const pa = await this.prisma.productAdvisor.findFirst({
|
|
||||||
where: { productId: dto.productId },
|
|
||||||
include: { advisor: true },
|
|
||||||
});
|
|
||||||
if (pa?.advisor?.isActive) {
|
|
||||||
advisor = pa.advisor;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!advisor) {
|
|
||||||
advisor = await this.prisma.advisorContact.findFirst({
|
|
||||||
where: { isDefault: true, isActive: true },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!advisor) {
|
|
||||||
advisor = await this.prisma.advisorContact.findFirst({
|
|
||||||
where: { isActive: true },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create lead record in DB
|
|
||||||
const lead = await this.prisma.lead.create({
|
|
||||||
data: {
|
|
||||||
firstName: dto.firstName.trim(),
|
|
||||||
lastName: dto.lastName.trim(),
|
|
||||||
phone: cleanPhone,
|
|
||||||
productId: dto.productId || null,
|
|
||||||
advisorId: advisor?.id || null,
|
|
||||||
status: 'PENDING',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// Enqueue SMS notification to Advisor
|
|
||||||
// Pattern 580260: "مشاور گرامی، درخواست تماس جدیدی از {0} با شماره {1} برای {2} ثبت شد. canina.ir"
|
|
||||||
if (advisor) {
|
|
||||||
const productName = product ? product.nameFa : 'مشاوره عمومی';
|
|
||||||
const advisorMsg = `مشاور گرامی، درخواست تماس جدیدی از ${dto.firstName} ${dto.lastName} (${cleanPhone}) برای «${productName}» ثبت شد. لطفاً در اسرع وقت تماس حاصل فرمایید.`;
|
|
||||||
const clientName = `${dto.firstName} ${dto.lastName}`.trim();
|
|
||||||
|
|
||||||
await this.queueService.enqueue({
|
|
||||||
channel: 'SMS',
|
|
||||||
recipient: advisor.phone,
|
|
||||||
event: 'NEW_LEAD',
|
|
||||||
content: advisorMsg,
|
|
||||||
payload: {
|
|
||||||
patternId: 580260, // Registered official advisor pattern
|
|
||||||
args: [clientName, cleanPhone, productName],
|
|
||||||
},
|
|
||||||
idempotencyKey: `lead_advisor_${lead.id}`,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Enqueue confirmation SMS to Client
|
|
||||||
// Pattern 580259: "{0} عزیز، درخواست مشاوره شما در کنینا ثبت شد. مشاوران ما به زودی با شما تماس خواهند گرفت. canina.ir"
|
|
||||||
const clientMsg = `${dto.firstName} عزیز، درخواست مشاوره شما در کنینا ثبت شد. مشاوران تخصصی ما به زودی با شما تماس خواهند گرفت.`;
|
|
||||||
await this.queueService.enqueue({
|
|
||||||
channel: 'SMS',
|
|
||||||
recipient: cleanPhone,
|
|
||||||
event: 'LEAD_CONFIRMATION',
|
|
||||||
content: clientMsg,
|
|
||||||
payload: {
|
|
||||||
patternId: 580259, // Registered official client pattern
|
|
||||||
args: [dto.firstName.trim()],
|
|
||||||
},
|
|
||||||
idempotencyKey: `lead_client_${lead.id}`,
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
message: 'درخواست مشاوره شما با موفقیت ثبت شد. مشاور ما به زودی با شما تماس خواهد گرفت.',
|
|
||||||
leadId: lead.id,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
import {
|
|
||||||
Controller,
|
|
||||||
Post,
|
|
||||||
Body,
|
|
||||||
HttpCode,
|
|
||||||
HttpStatus,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { AdvisorsService, CreateLeadDto } from './advisors.service';
|
|
||||||
|
|
||||||
@Controller('public')
|
|
||||||
export class PublicLeadController {
|
|
||||||
constructor(private readonly advisorsService: AdvisorsService) {}
|
|
||||||
|
|
||||||
@Post('lead')
|
|
||||||
@HttpCode(HttpStatus.OK)
|
|
||||||
async createLead(@Body() dto: CreateLeadDto) {
|
|
||||||
const result = await this.advisorsService.handlePublicLead(dto);
|
|
||||||
return {
|
|
||||||
ok: true,
|
|
||||||
success: true,
|
|
||||||
message: result.message,
|
|
||||||
leadId: result.leadId,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { TasksModule } from './common/services/tasks.module';
|
||||||
import { Module, NestModule, MiddlewareConsumer } from "@nestjs/common";
|
import { Module, NestModule, MiddlewareConsumer } from "@nestjs/common";
|
||||||
import { PrismaModule } from "./prisma/prisma.module";
|
import { PrismaModule } from "./prisma/prisma.module";
|
||||||
import { SupportChatModule } from './support-chat/support-chat.module';
|
import { SupportChatModule } from './support-chat/support-chat.module';
|
||||||
@@ -36,8 +37,6 @@ import { DoctorsModule } from "./doctors/doctors.module";
|
|||||||
import { FaqModule } from "./faq/faq.module";
|
import { FaqModule } from "./faq/faq.module";
|
||||||
import { MenuModule } from "./menu/menu.module";
|
import { MenuModule } from "./menu/menu.module";
|
||||||
import { RevalidationModule } from "./common/revalidation/revalidation.module";
|
import { RevalidationModule } from "./common/revalidation/revalidation.module";
|
||||||
import { NotificationsModule } from "./notifications/notifications.module";
|
|
||||||
import { AdvisorsModule } from "./advisors/advisors.module";
|
|
||||||
|
|
||||||
import { Request, Response, NextFunction } from "express";
|
import { Request, Response, NextFunction } from "express";
|
||||||
|
|
||||||
@@ -81,8 +80,7 @@ import { Request, Response, NextFunction } from "express";
|
|||||||
B2BModule,
|
B2BModule,
|
||||||
FaqModule,
|
FaqModule,
|
||||||
MenuModule,
|
MenuModule,
|
||||||
NotificationsModule,
|
TasksModule,
|
||||||
AdvisorsModule,
|
|
||||||
],
|
],
|
||||||
controllers: [MetricsController],
|
controllers: [MetricsController],
|
||||||
providers: [
|
providers: [
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import { AdminModule } from "../admin/admin.module";
|
|||||||
import { getJwtSecret } from "./auth.constants";
|
import { getJwtSecret } from "./auth.constants";
|
||||||
|
|
||||||
import { RedisModule } from "../redis/redis.module";
|
import { RedisModule } from "../redis/redis.module";
|
||||||
import { NotificationsModule } from "../notifications/notifications.module";
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -17,7 +16,6 @@ import { NotificationsModule } from "../notifications/notifications.module";
|
|||||||
forwardRef(() => AdminModule),
|
forwardRef(() => AdminModule),
|
||||||
PassportModule,
|
PassportModule,
|
||||||
RedisModule,
|
RedisModule,
|
||||||
NotificationsModule,
|
|
||||||
JwtModule.registerAsync({
|
JwtModule.registerAsync({
|
||||||
useFactory: () => ({
|
useFactory: () => ({
|
||||||
secret: getJwtSecret(),
|
secret: getJwtSecret(),
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { PrismaService } from "../prisma/prisma.service";
|
|||||||
import { JwtService } from "@nestjs/jwt";
|
import { JwtService } from "@nestjs/jwt";
|
||||||
import { RedisService } from "../redis/redis.service";
|
import { RedisService } from "../redis/redis.service";
|
||||||
import { SmsService } from "../common/services/sms.service";
|
import { SmsService } from "../common/services/sms.service";
|
||||||
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
|
|
||||||
import { BadRequestException } from "@nestjs/common";
|
import { BadRequestException } from "@nestjs/common";
|
||||||
|
|
||||||
describe("AuthService", () => {
|
describe("AuthService", () => {
|
||||||
@@ -44,7 +43,6 @@ describe("AuthService", () => {
|
|||||||
{ provide: JwtService, useValue: mockJwt },
|
{ provide: JwtService, useValue: mockJwt },
|
||||||
{ provide: RedisService, useValue: mockRedis },
|
{ provide: RedisService, useValue: mockRedis },
|
||||||
{ provide: SmsService, useValue: mockSms },
|
{ provide: SmsService, useValue: mockSms },
|
||||||
{ provide: TransactionalEmailsService, useValue: { sendWelcome: jest.fn().mockResolvedValue(undefined), sendOrderCreated: jest.fn().mockResolvedValue(undefined), sendOrderPaid: jest.fn().mockResolvedValue(undefined), sendOrderShipped: jest.fn().mockResolvedValue(undefined), sendContactConfirmation: jest.fn().mockResolvedValue(undefined), notifyAdminsAboutContact: jest.fn().mockResolvedValue(undefined) } },
|
|
||||||
],
|
],
|
||||||
}).compile();
|
}).compile();
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import { RedisService } from "../redis/redis.service";
|
|||||||
import { SendOtpDto } from "./dto/send-otp.dto";
|
import { SendOtpDto } from "./dto/send-otp.dto";
|
||||||
import { VerifyOtpDto } from "./dto/verify-otp.dto";
|
import { VerifyOtpDto } from "./dto/verify-otp.dto";
|
||||||
import { SmsService } from "../common/services/sms.service";
|
import { SmsService } from "../common/services/sms.service";
|
||||||
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
|
|
||||||
import * as bcrypt from "bcryptjs";
|
import * as bcrypt from "bcryptjs";
|
||||||
import * as crypto from "crypto";
|
import * as crypto from "crypto";
|
||||||
import { normalizeMobile } from "../common/utils/phone.utils";
|
import { normalizeMobile } from "../common/utils/phone.utils";
|
||||||
@@ -43,7 +42,6 @@ export class AuthService {
|
|||||||
private jwtService: JwtService,
|
private jwtService: JwtService,
|
||||||
private redisService: RedisService,
|
private redisService: RedisService,
|
||||||
private smsService: SmsService,
|
private smsService: SmsService,
|
||||||
private transactionalEmails: TransactionalEmailsService,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
private async generateTokens(payload: Record<string, any>) {
|
private async generateTokens(payload: Record<string, any>) {
|
||||||
@@ -259,13 +257,6 @@ export class AuthService {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// Fire-and-forget welcome email when register provided an address
|
|
||||||
if (user.email) {
|
|
||||||
this.transactionalEmails
|
|
||||||
.sendWelcome(user.email, user.firstName)
|
|
||||||
.catch(() => {});
|
|
||||||
}
|
|
||||||
|
|
||||||
const payload = { sub: user.id, phoneNumber: user.mobile, role: user.role };
|
const payload = { sub: user.id, phoneNumber: user.mobile, role: user.role };
|
||||||
const tokens = await this.generateTokens(payload);
|
const tokens = await this.generateTokens(payload);
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ describe("BlogsService", () => {
|
|||||||
describe("findAll", () => {
|
describe("findAll", () => {
|
||||||
it("should query published blogs with pagination", async () => {
|
it("should query published blogs with pagination", async () => {
|
||||||
const blogs = [
|
const blogs = [
|
||||||
{ id: "1", title: "Blog 1", isPublished: true, status: "PUBLISHED" },
|
{ id: "1", title: "Blog 1", isPublished: true, status: "PUBLISHED", author: null },
|
||||||
];
|
];
|
||||||
mockPrisma.blog.findMany.mockResolvedValue(blogs);
|
mockPrisma.blog.findMany.mockResolvedValue(blogs);
|
||||||
mockPrisma.blog.count.mockResolvedValue(1);
|
mockPrisma.blog.count.mockResolvedValue(1);
|
||||||
@@ -49,6 +49,8 @@ describe("BlogsService", () => {
|
|||||||
expect(mockPrisma.blog.findMany).toHaveBeenCalled();
|
expect(mockPrisma.blog.findMany).toHaveBeenCalled();
|
||||||
expect(result.data).toEqual(blogs);
|
expect(result.data).toEqual(blogs);
|
||||||
expect(result.meta.total).toBe(1);
|
expect(result.meta.total).toBe(1);
|
||||||
|
const query = mockPrisma.blog.findMany.mock.calls[0][0];
|
||||||
|
expect(query.include.author).toBeUndefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should filter by categorySlug and search term", async () => {
|
it("should filter by categorySlug and search term", async () => {
|
||||||
|
|||||||
@@ -68,9 +68,6 @@ export class BlogsService {
|
|||||||
[sortBy === "createdAt" ? "createdAt" : "publishedAt"]: sortOrder,
|
[sortBy === "createdAt" ? "createdAt" : "publishedAt"]: sortOrder,
|
||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
author: {
|
|
||||||
select: { firstName: true, lastName: true },
|
|
||||||
},
|
|
||||||
category: {
|
category: {
|
||||||
select: { id: true, name: true, slug: true },
|
select: { id: true, name: true, slug: true },
|
||||||
},
|
},
|
||||||
@@ -110,7 +107,6 @@ export class BlogsService {
|
|||||||
take: 4,
|
take: 4,
|
||||||
orderBy: { publishedAt: "desc" },
|
orderBy: { publishedAt: "desc" },
|
||||||
include: {
|
include: {
|
||||||
author: { select: { firstName: true, lastName: true } },
|
|
||||||
category: { select: { id: true, name: true, slug: true } },
|
category: { select: { id: true, name: true, slug: true } },
|
||||||
tags: { select: { id: true, name: true, slug: true } },
|
tags: { select: { id: true, name: true, slug: true } },
|
||||||
_count: { select: { comments: { where: { status: "APPROVED" } } } },
|
_count: { select: { comments: { where: { status: "APPROVED" } } } },
|
||||||
@@ -127,7 +123,6 @@ export class BlogsService {
|
|||||||
take: 4,
|
take: 4,
|
||||||
orderBy: { publishedAt: "desc" },
|
orderBy: { publishedAt: "desc" },
|
||||||
include: {
|
include: {
|
||||||
author: { select: { firstName: true, lastName: true } },
|
|
||||||
category: { select: { id: true, name: true, slug: true } },
|
category: { select: { id: true, name: true, slug: true } },
|
||||||
tags: { select: { id: true, name: true, slug: true } },
|
tags: { select: { id: true, name: true, slug: true } },
|
||||||
_count: { select: { comments: { where: { status: "APPROVED" } } } },
|
_count: { select: { comments: { where: { status: "APPROVED" } } } },
|
||||||
@@ -163,9 +158,6 @@ export class BlogsService {
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
author: {
|
|
||||||
select: { firstName: true, lastName: true },
|
|
||||||
},
|
|
||||||
category: {
|
category: {
|
||||||
select: { id: true, name: true, slug: true },
|
select: { id: true, name: true, slug: true },
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -38,8 +38,6 @@ export interface SmsConfig {
|
|||||||
shippingBodyId: number;
|
shippingBodyId: number;
|
||||||
b2bBodyId: number;
|
b2bBodyId: number;
|
||||||
petCareBodyId: number;
|
petCareBodyId: number;
|
||||||
leadAdvisorBodyId?: number;
|
|
||||||
leadConfirmationBodyId?: number;
|
|
||||||
rules?: SmsRule[];
|
rules?: SmsRule[];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,16 +122,6 @@ export class SmsService {
|
|||||||
process.env.MELIPAYAMAK_PET_CARE_BODY_ID ||
|
process.env.MELIPAYAMAK_PET_CARE_BODY_ID ||
|
||||||
"0",
|
"0",
|
||||||
),
|
),
|
||||||
leadAdvisorBodyId: Number(
|
|
||||||
dbConfig.leadAdvisorBodyId ||
|
|
||||||
process.env.MELIPAYAMAK_LEAD_ADVISOR_BODY_ID ||
|
|
||||||
"580260",
|
|
||||||
),
|
|
||||||
leadConfirmationBodyId: Number(
|
|
||||||
dbConfig.leadConfirmationBodyId ||
|
|
||||||
process.env.MELIPAYAMAK_LEAD_CONFIRMATION_BODY_ID ||
|
|
||||||
"580259",
|
|
||||||
),
|
|
||||||
rules: Array.isArray(dbConfig.rules)
|
rules: Array.isArray(dbConfig.rules)
|
||||||
? (dbConfig.rules as SmsRule[])
|
? (dbConfig.rules as SmsRule[])
|
||||||
: DEFAULT_SMS_RULES,
|
: DEFAULT_SMS_RULES,
|
||||||
@@ -152,8 +140,6 @@ export class SmsService {
|
|||||||
),
|
),
|
||||||
b2bBodyId: Number(process.env.MELIPAYAMAK_B2B_BODY_ID || "508083"),
|
b2bBodyId: Number(process.env.MELIPAYAMAK_B2B_BODY_ID || "508083"),
|
||||||
petCareBodyId: Number(process.env.MELIPAYAMAK_PET_CARE_BODY_ID || "0"),
|
petCareBodyId: Number(process.env.MELIPAYAMAK_PET_CARE_BODY_ID || "0"),
|
||||||
leadAdvisorBodyId: Number(process.env.MELIPAYAMAK_LEAD_ADVISOR_BODY_ID || "580260"),
|
|
||||||
leadConfirmationBodyId: Number(process.env.MELIPAYAMAK_LEAD_CONFIRMATION_BODY_ID || "580259"),
|
|
||||||
rules: DEFAULT_SMS_RULES,
|
rules: DEFAULT_SMS_RULES,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -1391,88 +1377,13 @@ export class SmsService {
|
|||||||
});
|
});
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// 2. Dispatch generic direct SMS via MeliPayamak SendSMS endpoint if fromNumber configured, else fall back to local log
|
this.logger.log(`[SMS Text Sent] To: ${phone}, Content: ${message}`);
|
||||||
return new Promise((resolve) => {
|
|
||||||
const payload = JSON.stringify({
|
|
||||||
username: config.username,
|
|
||||||
password: config.password,
|
|
||||||
to: phone,
|
|
||||||
from: config.fromNumber || "50004001100228",
|
|
||||||
text: message,
|
|
||||||
isFlash: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
const req = https.request(
|
|
||||||
"https://rest.payamak-panel.com/api/SendSMS/SendSMS",
|
|
||||||
{
|
|
||||||
method: "POST",
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
"Content-Length": Buffer.byteLength(payload),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
(res) => {
|
|
||||||
let data = "";
|
|
||||||
res.on("data", (chunk: Buffer | string) => (data += String(chunk)));
|
|
||||||
res.on("end", () => {
|
|
||||||
void (async () => {
|
|
||||||
try {
|
|
||||||
const json = JSON.parse(data) as { Value?: number | string; RetStatus?: number; StrRetStatus?: string };
|
|
||||||
const val = Number(json.Value ?? 0);
|
|
||||||
if (val > 15 || json.RetStatus === 1) {
|
|
||||||
this.logger.log(`[SMS Text Sent] To: ${phone}, RecId: ${val}`);
|
|
||||||
await this.recordLog({
|
await this.recordLog({
|
||||||
receptor: phone,
|
receptor: phone,
|
||||||
type: "GENERIC_TEXT",
|
type: "GENERIC_TEXT",
|
||||||
messageText: message,
|
messageText: message,
|
||||||
status: "SUCCESS",
|
status: "SUCCESS",
|
||||||
recId: String(val),
|
|
||||||
});
|
|
||||||
resolve(true);
|
|
||||||
} else {
|
|
||||||
const errMsg = `خطای ارسال پیامک متنی با کد: ${val} (${json.StrRetStatus || ''})`;
|
|
||||||
this.logger.error(`[SMS Text Error] To: ${phone}, Code: ${val}`);
|
|
||||||
await this.recordLog({
|
|
||||||
receptor: phone,
|
|
||||||
type: "GENERIC_TEXT",
|
|
||||||
messageText: message,
|
|
||||||
status: "FAILED",
|
|
||||||
errorMessage: errMsg,
|
|
||||||
});
|
|
||||||
resolve(false);
|
|
||||||
}
|
|
||||||
} catch (err: unknown) {
|
|
||||||
const msg = err instanceof Error ? err.message : String(err);
|
|
||||||
await this.recordLog({
|
|
||||||
receptor: phone,
|
|
||||||
type: "GENERIC_TEXT",
|
|
||||||
messageText: message,
|
|
||||||
status: "FAILED",
|
|
||||||
errorMessage: `خطای پارس پاسخ ملی پیامک: ${data || msg}`,
|
|
||||||
});
|
|
||||||
resolve(false);
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
});
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
req.on("error", (err: Error) => {
|
|
||||||
void (async () => {
|
|
||||||
this.logger.error(`[SMS Text Network Error] To: ${phone}: ${err.message}`);
|
|
||||||
await this.recordLog({
|
|
||||||
receptor: phone,
|
|
||||||
type: "GENERIC_TEXT",
|
|
||||||
messageText: message,
|
|
||||||
status: "FAILED",
|
|
||||||
errorMessage: err.message,
|
|
||||||
});
|
|
||||||
resolve(false);
|
|
||||||
})();
|
|
||||||
});
|
|
||||||
|
|
||||||
req.write(payload);
|
|
||||||
req.end();
|
|
||||||
});
|
});
|
||||||
|
return Promise.resolve(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TasksService } from './tasks.service';
|
||||||
|
import { OrdersModule } from '../../orders/orders.module';
|
||||||
|
import { PaymentModule } from '../../payment/payment.module';
|
||||||
|
import { RedisModule } from '../../redis/redis.module';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [OrdersModule, PaymentModule, RedisModule],
|
||||||
|
providers: [TasksService],
|
||||||
|
exports: [TasksService],
|
||||||
|
})
|
||||||
|
export class TasksModule {}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
import { Injectable, Logger, OnApplicationBootstrap, OnApplicationShutdown } from '@nestjs/common';
|
||||||
|
import { OrdersService } from '../../orders/orders.service';
|
||||||
|
import { RedisService } from '../../redis/redis.service';
|
||||||
|
import { PaymentService } from '../../payment/payment.service';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class TasksService implements OnApplicationBootstrap, OnApplicationShutdown {
|
||||||
|
private readonly logger = new Logger(TasksService.name);
|
||||||
|
private reservationTimer: NodeJS.Timeout | null = null;
|
||||||
|
private reconciliationTimer: NodeJS.Timeout | null = null;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private readonly ordersService: OrdersService,
|
||||||
|
private readonly paymentService: PaymentService,
|
||||||
|
private readonly redisService: RedisService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
onApplicationBootstrap() {
|
||||||
|
this.logger.log('Starting background maintenance tasks...');
|
||||||
|
|
||||||
|
// 1. Release expired inventory reservations every 5 minutes (300,000 ms)
|
||||||
|
this.reservationTimer = setInterval(async () => {
|
||||||
|
const lockAcquired = await this.redisService.acquireLock('task:inventory_release', 240);
|
||||||
|
if (!lockAcquired) {
|
||||||
|
this.logger.debug('[Task:Inventory] Another instance holds the lock, skipping execution.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const result = await this.ordersService.releaseExpiredInventoryReservations();
|
||||||
|
if (result.releasedCount > 0) {
|
||||||
|
this.logger.log(`[Task:Inventory] Automatically released ${result.releasedCount} expired inventory reservations.`);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
this.logger.error('[Task:Inventory] Failed to release expired inventory reservations:', err);
|
||||||
|
} finally {
|
||||||
|
await this.redisService.releaseLock('task:inventory_release');
|
||||||
|
}
|
||||||
|
}, 5 * 60 * 1000);
|
||||||
|
|
||||||
|
// 2. Reconcile pending online payment transactions every 10 minutes (600,000 ms)
|
||||||
|
this.reconciliationTimer = setInterval(async () => {
|
||||||
|
const lockAcquired = await this.redisService.acquireLock('task:payment_reconciliation', 540);
|
||||||
|
if (!lockAcquired) {
|
||||||
|
this.logger.debug('[Task:PaymentReconciliation] Another instance holds the lock, skipping execution.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const result = await this.paymentService.reconcilePendingTransactions();
|
||||||
|
if (result.total > 0) {
|
||||||
|
this.logger.log(`[Task:PaymentReconciliation] Checked ${result.total} transactions: ${result.verified} verified, ${result.failed} failed.`);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
this.logger.error('[Task:PaymentReconciliation] Failed to reconcile pending payments:', err);
|
||||||
|
} finally {
|
||||||
|
await this.redisService.releaseLock('task:payment_reconciliation');
|
||||||
|
}
|
||||||
|
}, 10 * 60 * 1000);
|
||||||
|
|
||||||
|
// Initial check on startup after 30 seconds
|
||||||
|
setTimeout(async () => {
|
||||||
|
try {
|
||||||
|
await this.ordersService.releaseExpiredInventoryReservations();
|
||||||
|
} catch (err) {
|
||||||
|
this.logger.warn('[Task:Startup] Initial inventory check warning:', err);
|
||||||
|
}
|
||||||
|
}, 30 * 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
onApplicationShutdown() {
|
||||||
|
this.logger.log('Stopping background maintenance tasks...');
|
||||||
|
if (this.reservationTimer) {
|
||||||
|
clearInterval(this.reservationTimer);
|
||||||
|
this.reservationTimer = null;
|
||||||
|
}
|
||||||
|
if (this.reconciliationTimer) {
|
||||||
|
clearInterval(this.reconciliationTimer);
|
||||||
|
this.reconciliationTimer = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,10 +2,9 @@ import { Module } from "@nestjs/common";
|
|||||||
import { ContactController } from "./contact.controller";
|
import { ContactController } from "./contact.controller";
|
||||||
import { ContactService } from "./contact.service";
|
import { ContactService } from "./contact.service";
|
||||||
import { SmsModule } from "../common/sms.module";
|
import { SmsModule } from "../common/sms.module";
|
||||||
import { NotificationsModule } from "../notifications/notifications.module";
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [SmsModule, NotificationsModule],
|
imports: [SmsModule],
|
||||||
controllers: [ContactController],
|
controllers: [ContactController],
|
||||||
providers: [ContactService],
|
providers: [ContactService],
|
||||||
exports: [ContactService],
|
exports: [ContactService],
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { Test, TestingModule } from "@nestjs/testing";
|
|||||||
import { ContactService, CreateContactSubmissionDto } from "./contact.service";
|
import { ContactService, CreateContactSubmissionDto } from "./contact.service";
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
import { PrismaService } from "../prisma/prisma.service";
|
||||||
import { SmsService } from "../common/services/sms.service";
|
import { SmsService } from "../common/services/sms.service";
|
||||||
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
|
|
||||||
|
|
||||||
describe("ContactService", () => {
|
describe("ContactService", () => {
|
||||||
let service: ContactService;
|
let service: ContactService;
|
||||||
@@ -35,17 +34,6 @@ describe("ContactService", () => {
|
|||||||
provide: SmsService,
|
provide: SmsService,
|
||||||
useValue: mockSmsService,
|
useValue: mockSmsService,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
provide: TransactionalEmailsService,
|
|
||||||
useValue: {
|
|
||||||
sendWelcome: jest.fn().mockResolvedValue(undefined),
|
|
||||||
sendOrderCreated: jest.fn().mockResolvedValue(undefined),
|
|
||||||
sendOrderPaid: jest.fn().mockResolvedValue(undefined),
|
|
||||||
sendOrderShipped: jest.fn().mockResolvedValue(undefined),
|
|
||||||
sendContactConfirmation: jest.fn().mockResolvedValue(undefined),
|
|
||||||
notifyAdminsAboutContact: jest.fn().mockResolvedValue(undefined),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
}).compile();
|
}).compile();
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { Injectable, Logger } from "@nestjs/common";
|
import { Injectable, Logger } from "@nestjs/common";
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
import { PrismaService } from "../prisma/prisma.service";
|
||||||
import { SmsService } from "../common/services/sms.service";
|
import { SmsService } from "../common/services/sms.service";
|
||||||
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
|
|
||||||
|
|
||||||
export interface CreateContactSubmissionDto {
|
export interface CreateContactSubmissionDto {
|
||||||
name: string;
|
name: string;
|
||||||
@@ -26,7 +25,6 @@ export class ContactService {
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly prisma: PrismaService,
|
private readonly prisma: PrismaService,
|
||||||
private readonly smsService: SmsService,
|
private readonly smsService: SmsService,
|
||||||
private readonly transactionalEmails: TransactionalEmailsService,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async submitContactForm(dto: CreateContactSubmissionDto) {
|
async submitContactForm(dto: CreateContactSubmissionDto) {
|
||||||
@@ -58,28 +56,6 @@ export class ContactService {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Email confirmation to submitter + admin notify (non-blocking)
|
|
||||||
void Promise.resolve(
|
|
||||||
this.transactionalEmails.notifyAdminsAboutContact({
|
|
||||||
name: dto.name,
|
|
||||||
phone: dto.phone,
|
|
||||||
email: dto.email,
|
|
||||||
subject: dto.subject,
|
|
||||||
message: dto.message,
|
|
||||||
submissionId: submission.id,
|
|
||||||
}),
|
|
||||||
).catch(() => {});
|
|
||||||
if (dto.email) {
|
|
||||||
void Promise.resolve(
|
|
||||||
this.transactionalEmails.sendContactConfirmation(
|
|
||||||
dto.email,
|
|
||||||
dto.name,
|
|
||||||
dto.message,
|
|
||||||
submission.id,
|
|
||||||
),
|
|
||||||
).catch(() => {});
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
message:
|
message:
|
||||||
|
|||||||
@@ -1,98 +0,0 @@
|
|||||||
/**
|
|
||||||
* Branded HTML wrappers for Canina transactional emails.
|
|
||||||
* Colors match the storefront tokens in frontend/application/app/globals.css.
|
|
||||||
*/
|
|
||||||
|
|
||||||
const BRAND = {
|
|
||||||
blue: '#1E4053',
|
|
||||||
gold: '#F1B646',
|
|
||||||
teal: '#9BC8CC',
|
|
||||||
dark: '#060709',
|
|
||||||
soft: '#F4F7F6',
|
|
||||||
border: '#E5ECE9',
|
|
||||||
muted: '#445D60',
|
|
||||||
} as const;
|
|
||||||
|
|
||||||
export function escapeHtml(value: string): string {
|
|
||||||
return String(value)
|
|
||||||
.replace(/&/g, '&')
|
|
||||||
.replace(/</g, '<')
|
|
||||||
.replace(/>/g, '>')
|
|
||||||
.replace(/"/g, '"')
|
|
||||||
.replace(/'/g, ''');
|
|
||||||
}
|
|
||||||
|
|
||||||
export function textToHtmlParagraphs(text: string): string {
|
|
||||||
return escapeHtml(text)
|
|
||||||
.split(/\r?\n/)
|
|
||||||
.map((line) => (line.trim().length === 0 ? ' ' : line))
|
|
||||||
.join('<br/>');
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface CaninaEmailLayoutOptions {
|
|
||||||
title: string;
|
|
||||||
bodyHtml: string;
|
|
||||||
eyebrow?: string;
|
|
||||||
footerNote?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function renderCaninaEmailLayout(options: CaninaEmailLayoutOptions): string {
|
|
||||||
const title = escapeHtml(options.title);
|
|
||||||
const eyebrow = escapeHtml(options.eyebrow || 'CANINA');
|
|
||||||
const footerNote = escapeHtml(
|
|
||||||
options.footerNote || 'این پیام از طرف فروشگاه کنینا ارسال شده است.',
|
|
||||||
);
|
|
||||||
|
|
||||||
return `<!DOCTYPE html>
|
|
||||||
<html lang="fa" dir="rtl">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<title>${title}</title>
|
|
||||||
</head>
|
|
||||||
<body style="margin:0;padding:0;background:${BRAND.soft};color:${BRAND.dark};font-family:Tahoma,Arial,sans-serif;line-height:1.9;font-size:15px;">
|
|
||||||
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:${BRAND.soft};">
|
|
||||||
<tr>
|
|
||||||
<td align="center" style="padding:28px 14px;">
|
|
||||||
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="border-collapse:collapse;max-width:600px;background:#ffffff;text-align:right;border:1px solid ${BRAND.border};">
|
|
||||||
<tr>
|
|
||||||
<td style="padding:0;height:4px;background:${BRAND.gold};font-size:0;line-height:0;"> </td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="padding:24px 28px 8px;background:${BRAND.blue};">
|
|
||||||
<p style="margin:0;font-size:11px;letter-spacing:0.18em;color:${BRAND.teal};">${eyebrow}</p>
|
|
||||||
<p style="margin:8px 0 0;font-size:22px;font-weight:700;color:#ffffff;">کنینا</p>
|
|
||||||
<p style="margin:4px 0 0;font-size:13px;color:${BRAND.gold};">مکمل تخصصی حیوانات خانگی</p>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="padding:28px;">
|
|
||||||
<h1 style="margin:0 0 16px;font-size:20px;font-weight:700;color:${BRAND.blue};">${title}</h1>
|
|
||||||
<div style="color:${BRAND.muted};">${options.bodyHtml}</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="padding:18px 28px;background:${BRAND.dark};color:#d5dde0;font-size:12px;">
|
|
||||||
<p style="margin:0;color:#ffffff;font-weight:700;">کنینا ایران</p>
|
|
||||||
<p style="margin:8px 0 0;">
|
|
||||||
<a href="mailto:support@canina.ir" style="color:${BRAND.gold};text-decoration:none;" dir="ltr">support@canina.ir</a>
|
|
||||||
·
|
|
||||||
<a href="https://canina.ir" style="color:${BRAND.teal};text-decoration:none;" dir="ltr">canina.ir</a>
|
|
||||||
</p>
|
|
||||||
<p style="margin:10px 0 0;color:#9aa8ad;">${footerNote}</p>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</body>
|
|
||||||
</html>`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function renderCaninaNotificationEmail(subject: string, content: string): string {
|
|
||||||
return renderCaninaEmailLayout({
|
|
||||||
title: subject || 'اطلاعیه کنینا',
|
|
||||||
bodyHtml: `<p style="margin:0;">${textToHtmlParagraphs(content || '')}</p>`,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,392 +0,0 @@
|
|||||||
import { Injectable, Logger } from '@nestjs/common';
|
|
||||||
import * as net from 'net';
|
|
||||||
import * as tls from 'tls';
|
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
|
||||||
|
|
||||||
export interface SmtpConfig {
|
|
||||||
enabled: boolean;
|
|
||||||
host: string;
|
|
||||||
port: number;
|
|
||||||
secure?: boolean; // true for 465 (TLS), false for 587/25 (STARTTLS)
|
|
||||||
user: string;
|
|
||||||
password: string;
|
|
||||||
fromName: string;
|
|
||||||
fromEmail: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface SendMailOptions {
|
|
||||||
to: string;
|
|
||||||
subject: string;
|
|
||||||
text?: string;
|
|
||||||
html?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class EmailService {
|
|
||||||
private readonly logger = new Logger(EmailService.name);
|
|
||||||
|
|
||||||
constructor(private readonly prisma: PrismaService) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Read SMTP configuration from DB Setting table with fallback to env variables
|
|
||||||
*/
|
|
||||||
async getConfig(): Promise<SmtpConfig> {
|
|
||||||
try {
|
|
||||||
const setting = await this.prisma.setting.findFirst({
|
|
||||||
where: { category: 'email' },
|
|
||||||
});
|
|
||||||
const dbConfig = (setting?.value as Record<string, any>) || {};
|
|
||||||
|
|
||||||
return {
|
|
||||||
enabled: dbConfig.enabled !== undefined ? Boolean(dbConfig.enabled) : true,
|
|
||||||
host: dbConfig.host || process.env.SMTP_HOST || 'mail.canina.ir',
|
|
||||||
port: Number(dbConfig.port || process.env.SMTP_PORT || 587),
|
|
||||||
secure: dbConfig.secure !== undefined ? Boolean(dbConfig.secure) : Number(dbConfig.port || 587) === 465,
|
|
||||||
user: dbConfig.user || process.env.SMTP_USER || '',
|
|
||||||
password: dbConfig.password || process.env.SMTP_PASSWORD || '',
|
|
||||||
fromName: dbConfig.fromName || process.env.SMTP_FROM_NAME || 'کنینا ایران',
|
|
||||||
fromEmail: dbConfig.fromEmail || process.env.SMTP_FROM_EMAIL || 'support@canina.ir',
|
|
||||||
};
|
|
||||||
} catch (err: any) {
|
|
||||||
this.logger.error(`Error loading email config: ${err?.message}`);
|
|
||||||
return {
|
|
||||||
enabled: true,
|
|
||||||
host: process.env.SMTP_HOST || 'mail.canina.ir',
|
|
||||||
port: Number(process.env.SMTP_PORT || 587),
|
|
||||||
secure: Number(process.env.SMTP_PORT || 587) === 465,
|
|
||||||
user: process.env.SMTP_USER || '',
|
|
||||||
password: process.env.SMTP_PASSWORD || '',
|
|
||||||
fromName: 'کنینا ایران',
|
|
||||||
fromEmail: 'support@canina.ir',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save SMTP configuration to database
|
|
||||||
*/
|
|
||||||
async saveConfig(dto: Partial<SmtpConfig>): Promise<SmtpConfig> {
|
|
||||||
const current = await this.getConfig();
|
|
||||||
const port = Number(dto.port ?? current.port);
|
|
||||||
const secure = dto.secure !== undefined ? Boolean(dto.secure) : (port === 465);
|
|
||||||
|
|
||||||
const updated: SmtpConfig = {
|
|
||||||
...current,
|
|
||||||
...dto,
|
|
||||||
port,
|
|
||||||
secure,
|
|
||||||
};
|
|
||||||
|
|
||||||
const existing = await this.prisma.setting.findFirst({ where: { category: 'email' } });
|
|
||||||
if (existing) {
|
|
||||||
await this.prisma.setting.update({
|
|
||||||
where: { id: existing.id },
|
|
||||||
data: { value: updated as any },
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
await this.prisma.setting.create({
|
|
||||||
data: {
|
|
||||||
category: 'email',
|
|
||||||
key: 'smtp_config',
|
|
||||||
value: updated as any,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return updated;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test SMTP connection with the given or stored configuration
|
|
||||||
*/
|
|
||||||
async testConnection(customConfig?: Partial<SmtpConfig>): Promise<{ success: boolean; message: string; banner?: string }> {
|
|
||||||
const config = customConfig ? { ...(await this.getConfig()), ...customConfig } : await this.getConfig();
|
|
||||||
|
|
||||||
if (!config.host || !config.port) {
|
|
||||||
return { success: false, message: 'آدرس هاست و پورت SMTP الزامی است.' };
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Promise((resolve) => {
|
|
||||||
// If port is 465 or secure=true, connect via direct TLS
|
|
||||||
const isExplicitTls = Boolean(config.secure) || Number(config.port) === 465;
|
|
||||||
let buffer = '';
|
|
||||||
let stage = 0; // 0=greet, 1=ehlo, 2=auth_login, 3=user, 4=pass, 5=quit
|
|
||||||
let banner = '';
|
|
||||||
|
|
||||||
const timer = setTimeout(() => {
|
|
||||||
try {
|
|
||||||
socket.destroy();
|
|
||||||
} catch {}
|
|
||||||
resolve({ success: false, message: 'تایماوت در اتصال به سرور SMTP (بیش از ۱۰ ثانیه)' });
|
|
||||||
}, 10000);
|
|
||||||
|
|
||||||
const cleanup = (res: { success: boolean; message: string; banner?: string }) => {
|
|
||||||
clearTimeout(timer);
|
|
||||||
try {
|
|
||||||
socket.end();
|
|
||||||
socket.destroy();
|
|
||||||
} catch {}
|
|
||||||
resolve(res);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleData = (chunk: Buffer) => {
|
|
||||||
buffer += chunk.toString('utf8');
|
|
||||||
const lines = buffer.split('\r\n');
|
|
||||||
buffer = lines.pop() || '';
|
|
||||||
|
|
||||||
for (const line of lines) {
|
|
||||||
if (!line) continue;
|
|
||||||
const code = parseInt(line.substring(0, 3), 10);
|
|
||||||
const isFinal = line.charAt(3) === ' ';
|
|
||||||
|
|
||||||
if (!isFinal) continue; // Multi-line response continuation
|
|
||||||
|
|
||||||
if (stage === 0) {
|
|
||||||
banner = line;
|
|
||||||
if (code >= 200 && code < 300) {
|
|
||||||
stage = 1;
|
|
||||||
socket.write(`EHLO canina.ir\r\n`);
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, message: `پاسخ ناموفق از سرور: ${line}`, banner });
|
|
||||||
}
|
|
||||||
} else if (stage === 1) {
|
|
||||||
if (code >= 200 && code < 300) {
|
|
||||||
if (config.user && config.password) {
|
|
||||||
stage = 2;
|
|
||||||
socket.write('AUTH LOGIN\r\n');
|
|
||||||
} else {
|
|
||||||
stage = 5;
|
|
||||||
socket.write('QUIT\r\n');
|
|
||||||
return cleanup({ success: true, message: 'اتصال به سرور SMTP بدون احراز هویت با موفقیت برقرار شد.', banner });
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, message: `خطای EHLO: ${line}`, banner });
|
|
||||||
}
|
|
||||||
} else if (stage === 2) {
|
|
||||||
if (code === 334) {
|
|
||||||
stage = 3;
|
|
||||||
socket.write(Buffer.from(config.user).toString('base64') + '\r\n');
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, message: `سرور از AUTH LOGIN پشتیبانی نمیکند یا خطا داد: ${line}`, banner });
|
|
||||||
}
|
|
||||||
} else if (stage === 3) {
|
|
||||||
if (code === 334) {
|
|
||||||
stage = 4;
|
|
||||||
socket.write(Buffer.from(config.password).toString('base64') + '\r\n');
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, message: `نام کاربری پذیرفته نشد: ${line}`, banner });
|
|
||||||
}
|
|
||||||
} else if (stage === 4) {
|
|
||||||
if (code === 235 || (code >= 200 && code < 300)) {
|
|
||||||
stage = 5;
|
|
||||||
socket.write('QUIT\r\n');
|
|
||||||
return cleanup({ success: true, message: 'اتصال و احراز هویت با سرور SMTP با موفقیت تأیید شد.', banner });
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, message: `احراز هویت ناموفق بود (نام کاربری یا رمز عبور اشتباه است): ${line}`, banner });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let socket: net.Socket;
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (isExplicitTls) {
|
|
||||||
socket = tls.connect({
|
|
||||||
host: config.host,
|
|
||||||
port: config.port,
|
|
||||||
rejectUnauthorized: false,
|
|
||||||
}, () => {});
|
|
||||||
} else {
|
|
||||||
socket = net.connect({
|
|
||||||
host: config.host,
|
|
||||||
port: config.port,
|
|
||||||
}, () => {});
|
|
||||||
}
|
|
||||||
|
|
||||||
socket.on('data', handleData);
|
|
||||||
socket.on('error', (err) => {
|
|
||||||
cleanup({ success: false, message: `خطای شبکه در ارتباط با ${config.host}:${config.port} - ${err.message}` });
|
|
||||||
});
|
|
||||||
} catch (err: any) {
|
|
||||||
cleanup({ success: false, message: `خطا در باز کردن سوکت: ${err?.message}` });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send a MIME Email message through SMTP
|
|
||||||
*/
|
|
||||||
async sendMail(options: SendMailOptions, customConfig?: Partial<SmtpConfig>): Promise<{ success: boolean; messageId?: string; error?: string }> {
|
|
||||||
const config = customConfig ? { ...(await this.getConfig()), ...customConfig } : await this.getConfig();
|
|
||||||
|
|
||||||
if (!config.enabled) {
|
|
||||||
return { success: false, error: 'سرویس ارسال ایمیل در تنظیمات غیرفعال است.' };
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!config.host || !options.to) {
|
|
||||||
return { success: false, error: 'هاست SMTP یا آدرس گیرنده مشخص نشده است.' };
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Promise((resolve) => {
|
|
||||||
// If port is 465 or secure=true, connect via direct TLS
|
|
||||||
const isExplicitTls = Boolean(config.secure) || Number(config.port) === 465;
|
|
||||||
let buffer = '';
|
|
||||||
let stage = 0; // 0=greet, 1=ehlo, 2=auth_login, 3=user, 4=pass, 5=mail_from, 6=rcpt_to, 7=data_cmd, 8=data_body, 9=quit
|
|
||||||
const messageId = `<${Date.now()}.${Math.random().toString(36).substring(2)}@${config.host}>`;
|
|
||||||
|
|
||||||
const timer = setTimeout(() => {
|
|
||||||
try {
|
|
||||||
socket.destroy();
|
|
||||||
} catch {}
|
|
||||||
resolve({ success: false, error: 'تایماوت ارسال ایمیل (۱۵ ثانیه)' });
|
|
||||||
}, 15000);
|
|
||||||
|
|
||||||
const cleanup = (res: { success: boolean; messageId?: string; error?: string }) => {
|
|
||||||
clearTimeout(timer);
|
|
||||||
try {
|
|
||||||
socket.end();
|
|
||||||
socket.destroy();
|
|
||||||
} catch {}
|
|
||||||
resolve(res);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleData = (chunk: Buffer) => {
|
|
||||||
buffer += chunk.toString('utf8');
|
|
||||||
const lines = buffer.split('\r\n');
|
|
||||||
buffer = lines.pop() || '';
|
|
||||||
|
|
||||||
for (const line of lines) {
|
|
||||||
if (!line) continue;
|
|
||||||
const code = parseInt(line.substring(0, 3), 10);
|
|
||||||
const isFinal = line.charAt(3) === ' ';
|
|
||||||
|
|
||||||
if (!isFinal) continue;
|
|
||||||
|
|
||||||
if (stage === 0) {
|
|
||||||
if (code >= 200 && code < 300) {
|
|
||||||
stage = 1;
|
|
||||||
socket.write(`EHLO canina.ir\r\n`);
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, error: `پاسخ سرور: ${line}` });
|
|
||||||
}
|
|
||||||
} else if (stage === 1) {
|
|
||||||
if (code >= 200 && code < 300) {
|
|
||||||
if (config.user && config.password) {
|
|
||||||
stage = 2;
|
|
||||||
socket.write('AUTH LOGIN\r\n');
|
|
||||||
} else {
|
|
||||||
stage = 5;
|
|
||||||
socket.write(`MAIL FROM:<${config.fromEmail}>\r\n`);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, error: `خطای EHLO: ${line}` });
|
|
||||||
}
|
|
||||||
} else if (stage === 2) {
|
|
||||||
if (code === 334) {
|
|
||||||
stage = 3;
|
|
||||||
socket.write(Buffer.from(config.user).toString('base64') + '\r\n');
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, error: `خطای احراز هویت: ${line}` });
|
|
||||||
}
|
|
||||||
} else if (stage === 3) {
|
|
||||||
if (code === 334) {
|
|
||||||
stage = 4;
|
|
||||||
socket.write(Buffer.from(config.password).toString('base64') + '\r\n');
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, error: `نام کاربری رد شد: ${line}` });
|
|
||||||
}
|
|
||||||
} else if (stage === 4) {
|
|
||||||
if (code === 235 || (code >= 200 && code < 300)) {
|
|
||||||
stage = 5;
|
|
||||||
socket.write(`MAIL FROM:<${config.fromEmail}>\r\n`);
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, error: `رمز عبور رد شد: ${line}` });
|
|
||||||
}
|
|
||||||
} else if (stage === 5) {
|
|
||||||
if (code >= 200 && code < 300) {
|
|
||||||
stage = 6;
|
|
||||||
socket.write(`RCPT TO:<${options.to}>\r\n`);
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, error: `آدرس فرستنده رد شد: ${line}` });
|
|
||||||
}
|
|
||||||
} else if (stage === 6) {
|
|
||||||
if (code >= 200 && code < 300) {
|
|
||||||
stage = 7;
|
|
||||||
socket.write('DATA\r\n');
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, error: `آدرس گیرنده رد شد: ${line}` });
|
|
||||||
}
|
|
||||||
} else if (stage === 7) {
|
|
||||||
if (code === 354) {
|
|
||||||
stage = 8;
|
|
||||||
const encodedSubject = `=?UTF-8?B?${Buffer.from(options.subject).toString('base64')}?=`;
|
|
||||||
const encodedFromName = `=?UTF-8?B?${Buffer.from(config.fromName).toString('base64')}?=`;
|
|
||||||
const boundary = `boundary_${Date.now()}`;
|
|
||||||
|
|
||||||
let emailBody = '';
|
|
||||||
emailBody += `From: ${encodedFromName} <${config.fromEmail}>\r\n`;
|
|
||||||
emailBody += `To: <${options.to}>\r\n`;
|
|
||||||
emailBody += `Subject: ${encodedSubject}\r\n`;
|
|
||||||
emailBody += `Message-ID: ${messageId}\r\n`;
|
|
||||||
emailBody += `Date: ${new Date().toUTCString()}\r\n`;
|
|
||||||
emailBody += `MIME-Version: 1.0\r\n`;
|
|
||||||
emailBody += `Content-Type: multipart/alternative; boundary="${boundary}"\r\n\r\n`;
|
|
||||||
|
|
||||||
if (options.text) {
|
|
||||||
emailBody += `--${boundary}\r\n`;
|
|
||||||
emailBody += `Content-Type: text/plain; charset=UTF-8\r\n`;
|
|
||||||
emailBody += `Content-Transfer-Encoding: base64\r\n\r\n`;
|
|
||||||
emailBody += Buffer.from(options.text).toString('base64') + '\r\n\r\n';
|
|
||||||
}
|
|
||||||
|
|
||||||
const htmlContent = options.html || options.text || '';
|
|
||||||
emailBody += `--${boundary}\r\n`;
|
|
||||||
emailBody += `Content-Type: text/html; charset=UTF-8\r\n`;
|
|
||||||
emailBody += `Content-Transfer-Encoding: base64\r\n\r\n`;
|
|
||||||
emailBody += Buffer.from(htmlContent).toString('base64') + '\r\n\r\n';
|
|
||||||
|
|
||||||
emailBody += `--${boundary}--\r\n.\r\n`;
|
|
||||||
|
|
||||||
socket.write(emailBody);
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, error: `دستور DATA رد شد: ${line}` });
|
|
||||||
}
|
|
||||||
} else if (stage === 8) {
|
|
||||||
if (code >= 200 && code < 300) {
|
|
||||||
stage = 9;
|
|
||||||
socket.write('QUIT\r\n');
|
|
||||||
return cleanup({ success: true, messageId });
|
|
||||||
} else {
|
|
||||||
return cleanup({ success: false, error: `رد شدن ارسال محتوا: ${line}` });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let socket: net.Socket;
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (isExplicitTls) {
|
|
||||||
socket = tls.connect({
|
|
||||||
host: config.host,
|
|
||||||
port: config.port,
|
|
||||||
rejectUnauthorized: false,
|
|
||||||
}, () => {});
|
|
||||||
} else {
|
|
||||||
socket = net.connect({
|
|
||||||
host: config.host,
|
|
||||||
port: config.port,
|
|
||||||
}, () => {});
|
|
||||||
}
|
|
||||||
|
|
||||||
socket.on('data', handleData);
|
|
||||||
socket.on('error', (err) => {
|
|
||||||
cleanup({ success: false, error: `خطای ارسال: ${err.message}` });
|
|
||||||
});
|
|
||||||
} catch (err: any) {
|
|
||||||
cleanup({ success: false, error: `خطا در باز کردن اتصال: ${err?.message}` });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,127 +0,0 @@
|
|||||||
import { Test, TestingModule } from '@nestjs/testing';
|
|
||||||
import { NotificationsQueueService } from './notifications-queue.service';
|
|
||||||
import { EmailService } from './email.service';
|
|
||||||
import { SmsService } from '../common/services/sms.service';
|
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
|
||||||
|
|
||||||
describe('NotificationsQueueService', () => {
|
|
||||||
let service: NotificationsQueueService;
|
|
||||||
let prisma: any;
|
|
||||||
let emailService: any;
|
|
||||||
let smsService: any;
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
prisma = {
|
|
||||||
notificationQueue: {
|
|
||||||
findUnique: jest.fn(),
|
|
||||||
create: jest.fn(),
|
|
||||||
update: jest.fn(),
|
|
||||||
findMany: jest.fn(),
|
|
||||||
count: jest.fn(),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
emailService = {
|
|
||||||
sendMail: jest.fn().mockResolvedValue({ success: true, messageId: 'msg-123' }),
|
|
||||||
};
|
|
||||||
|
|
||||||
smsService = {
|
|
||||||
sendPatternSms: jest.fn().mockResolvedValue(true),
|
|
||||||
sendSms: jest.fn().mockResolvedValue(true),
|
|
||||||
};
|
|
||||||
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
|
||||||
providers: [
|
|
||||||
NotificationsQueueService,
|
|
||||||
{ provide: PrismaService, useValue: prisma },
|
|
||||||
{ provide: EmailService, useValue: emailService },
|
|
||||||
{ provide: SmsService, useValue: smsService },
|
|
||||||
],
|
|
||||||
}).compile();
|
|
||||||
|
|
||||||
service = module.get<NotificationsQueueService>(NotificationsQueueService);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should enqueue notification and preserve idempotency', async () => {
|
|
||||||
prisma.notificationQueue.findUnique.mockResolvedValueOnce(null);
|
|
||||||
prisma.notificationQueue.create.mockResolvedValueOnce({
|
|
||||||
id: 'queue-1',
|
|
||||||
channel: 'EMAIL',
|
|
||||||
recipient: 'user@example.com',
|
|
||||||
event: 'ORDER_CREATED',
|
|
||||||
content: 'Hello World',
|
|
||||||
idempotencyKey: 'idemp-1',
|
|
||||||
status: 'QUEUED',
|
|
||||||
attempts: 0,
|
|
||||||
});
|
|
||||||
|
|
||||||
const res = await service.enqueue({
|
|
||||||
channel: 'EMAIL',
|
|
||||||
recipient: 'user@example.com',
|
|
||||||
event: 'ORDER_CREATED',
|
|
||||||
content: 'Hello World',
|
|
||||||
idempotencyKey: 'idemp-1',
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(prisma.notificationQueue.findUnique).toHaveBeenCalledWith({ where: { idempotencyKey: 'idemp-1' } });
|
|
||||||
expect(prisma.notificationQueue.create).toHaveBeenCalled();
|
|
||||||
expect(res.id).toBe('queue-1');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return existing notification if idempotency key exists', async () => {
|
|
||||||
const existing = {
|
|
||||||
id: 'existing-1',
|
|
||||||
channel: 'SMS',
|
|
||||||
recipient: '09121111111',
|
|
||||||
event: 'OTP',
|
|
||||||
content: '12345',
|
|
||||||
idempotencyKey: 'idemp-2',
|
|
||||||
status: 'SENT',
|
|
||||||
};
|
|
||||||
prisma.notificationQueue.findUnique.mockResolvedValueOnce(existing);
|
|
||||||
|
|
||||||
const res = await service.enqueue({
|
|
||||||
channel: 'SMS',
|
|
||||||
recipient: '09121111111',
|
|
||||||
event: 'OTP',
|
|
||||||
content: '12345',
|
|
||||||
idempotencyKey: 'idemp-2',
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(prisma.notificationQueue.create).not.toHaveBeenCalled();
|
|
||||||
expect(res.id).toBe('existing-1');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should process email queue item and mark as SENT', async () => {
|
|
||||||
const item = {
|
|
||||||
id: 'item-1',
|
|
||||||
channel: 'EMAIL',
|
|
||||||
recipient: 'user@example.com',
|
|
||||||
subject: 'Test Subject',
|
|
||||||
content: 'Test Body',
|
|
||||||
payload: {},
|
|
||||||
status: 'QUEUED',
|
|
||||||
attempts: 0,
|
|
||||||
maxAttempts: 3,
|
|
||||||
};
|
|
||||||
prisma.notificationQueue.findUnique.mockResolvedValueOnce(item);
|
|
||||||
prisma.notificationQueue.update.mockResolvedValue({});
|
|
||||||
|
|
||||||
await service.processItem('item-1');
|
|
||||||
|
|
||||||
expect(emailService.sendMail).toHaveBeenCalledWith({
|
|
||||||
to: 'user@example.com',
|
|
||||||
subject: 'Test Subject',
|
|
||||||
text: 'Test Body',
|
|
||||||
html: expect.stringContaining('Test Body'),
|
|
||||||
});
|
|
||||||
const sentHtml = String((emailService.sendMail as jest.Mock).mock.calls[0][0].html);
|
|
||||||
expect(sentHtml).toContain('#1E4053');
|
|
||||||
expect(sentHtml).toContain('#F1B646');
|
|
||||||
expect(sentHtml).toContain('support@canina.ir');
|
|
||||||
expect(prisma.notificationQueue.update).toHaveBeenCalledWith({
|
|
||||||
where: { id: 'item-1' },
|
|
||||||
data: expect.objectContaining({ status: 'SENT' }),
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,281 +0,0 @@
|
|||||||
import { Injectable, Logger, OnModuleInit, OnModuleDestroy } from '@nestjs/common';
|
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
|
||||||
import { EmailService } from './email.service';
|
|
||||||
import { renderCaninaNotificationEmail } from './email-layout';
|
|
||||||
import { SmsService } from '../common/services/sms.service';
|
|
||||||
|
|
||||||
export interface EnqueueOptions {
|
|
||||||
channel: 'SMS' | 'EMAIL';
|
|
||||||
recipient: string;
|
|
||||||
event: string;
|
|
||||||
subject?: string;
|
|
||||||
content: string;
|
|
||||||
payload?: any;
|
|
||||||
idempotencyKey?: string;
|
|
||||||
maxAttempts?: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class NotificationsQueueService implements OnModuleInit, OnModuleDestroy {
|
|
||||||
private readonly logger = new Logger(NotificationsQueueService.name);
|
|
||||||
private workerInterval: NodeJS.Timeout | null = null;
|
|
||||||
private isProcessing = false;
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private readonly prisma: PrismaService,
|
|
||||||
private readonly emailService: EmailService,
|
|
||||||
private readonly smsService: SmsService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
onModuleInit() {
|
|
||||||
// Run background queue processor every 15 seconds
|
|
||||||
this.workerInterval = setInterval(() => {
|
|
||||||
this.processQueue().catch((err) => {
|
|
||||||
this.logger.error(`Error in queue worker: ${err?.message}`);
|
|
||||||
});
|
|
||||||
}, 15000);
|
|
||||||
}
|
|
||||||
|
|
||||||
onModuleDestroy() {
|
|
||||||
if (this.workerInterval) {
|
|
||||||
clearInterval(this.workerInterval);
|
|
||||||
this.workerInterval = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enqueue a durable notification with idempotency check
|
|
||||||
*/
|
|
||||||
async enqueue(options: EnqueueOptions) {
|
|
||||||
if (options.idempotencyKey) {
|
|
||||||
const existing = await this.prisma.notificationQueue.findUnique({
|
|
||||||
where: { idempotencyKey: options.idempotencyKey },
|
|
||||||
});
|
|
||||||
if (existing) {
|
|
||||||
this.logger.log(`Notification idempotency matched for key: ${options.idempotencyKey}`);
|
|
||||||
return existing;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const item = await this.prisma.notificationQueue.create({
|
|
||||||
data: {
|
|
||||||
channel: options.channel,
|
|
||||||
recipient: options.recipient,
|
|
||||||
event: options.event,
|
|
||||||
subject: options.subject || null,
|
|
||||||
content: options.content,
|
|
||||||
payload: options.payload ?? null,
|
|
||||||
idempotencyKey: options.idempotencyKey || null,
|
|
||||||
maxAttempts: options.maxAttempts ?? 3,
|
|
||||||
status: 'QUEUED',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// Attempt immediate asynchronous process in the background
|
|
||||||
setImmediate(() => {
|
|
||||||
this.processItem(item.id).catch(() => {});
|
|
||||||
});
|
|
||||||
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Process a single queued item by ID
|
|
||||||
*/
|
|
||||||
async processItem(id: string) {
|
|
||||||
const item = await this.prisma.notificationQueue.findUnique({ where: { id } });
|
|
||||||
if (!item || item.status === 'SENT') return;
|
|
||||||
|
|
||||||
if (item.attempts >= item.maxAttempts) {
|
|
||||||
await this.prisma.notificationQueue.update({
|
|
||||||
where: { id },
|
|
||||||
data: { status: 'FAILED' },
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.prisma.notificationQueue.update({
|
|
||||||
where: { id },
|
|
||||||
data: {
|
|
||||||
status: 'PROCESSING',
|
|
||||||
attempts: { increment: 1 },
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (item.channel === 'EMAIL') {
|
|
||||||
const payloadObj = (item.payload as Record<string, any>) || {};
|
|
||||||
const subject = item.subject || 'اطلاعیه کنینا ایران';
|
|
||||||
const res = await this.emailService.sendMail({
|
|
||||||
to: item.recipient,
|
|
||||||
subject,
|
|
||||||
text: item.content,
|
|
||||||
html: payloadObj.html || renderCaninaNotificationEmail(subject, item.content || ''),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (res.success) {
|
|
||||||
await this.prisma.notificationQueue.update({
|
|
||||||
where: { id },
|
|
||||||
data: {
|
|
||||||
status: 'SENT',
|
|
||||||
sentAt: new Date(),
|
|
||||||
lastError: null,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
throw new Error(res.error || 'خطای نامشخص در ارسال ایمیل');
|
|
||||||
}
|
|
||||||
} else if (item.channel === 'SMS') {
|
|
||||||
const payloadObj = (item.payload as Record<string, any>) || {};
|
|
||||||
if (payloadObj.patternId && Array.isArray(payloadObj.args)) {
|
|
||||||
const sent = await this.smsService.sendPatternSms({
|
|
||||||
to: item.recipient,
|
|
||||||
bodyId: Number(payloadObj.patternId),
|
|
||||||
args: payloadObj.args,
|
|
||||||
type: item.event,
|
|
||||||
});
|
|
||||||
if (!sent) {
|
|
||||||
throw new Error(`ارسال پیامک پترن ${payloadObj.patternId} ناموفق بود.`);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
const sent = await this.smsService.sendSms(item.recipient, item.content);
|
|
||||||
if (!sent) {
|
|
||||||
throw new Error(`ارسال پیامک متنی به ${item.recipient} ناموفق بود.`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.prisma.notificationQueue.update({
|
|
||||||
where: { id },
|
|
||||||
data: {
|
|
||||||
status: 'SENT',
|
|
||||||
sentAt: new Date(),
|
|
||||||
lastError: null,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} catch (err: any) {
|
|
||||||
const isFinalAttempt = item.attempts + 1 >= item.maxAttempts;
|
|
||||||
await this.prisma.notificationQueue.update({
|
|
||||||
where: { id },
|
|
||||||
data: {
|
|
||||||
status: isFinalAttempt ? 'FAILED' : 'QUEUED',
|
|
||||||
lastError: err?.message || 'خطا در ارسال پیام',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
this.logger.warn(`Failed to deliver notification ${id} (${item.channel} to ${item.recipient}): ${err?.message}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Process pending batch of queue
|
|
||||||
*/
|
|
||||||
async processQueue(batchSize = 10) {
|
|
||||||
if (this.isProcessing) return;
|
|
||||||
this.isProcessing = true;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const pendingItems = await this.prisma.notificationQueue.findMany({
|
|
||||||
where: {
|
|
||||||
status: 'QUEUED',
|
|
||||||
attempts: { lt: 3 },
|
|
||||||
},
|
|
||||||
orderBy: { createdAt: 'asc' },
|
|
||||||
take: batchSize,
|
|
||||||
});
|
|
||||||
|
|
||||||
for (const item of pendingItems) {
|
|
||||||
await this.processItem(item.id);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
this.isProcessing = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retry a failed notification manually
|
|
||||||
*/
|
|
||||||
async retry(id: string) {
|
|
||||||
const item = await this.prisma.notificationQueue.findUnique({ where: { id } });
|
|
||||||
if (!item) throw new Error('آیتم صف یافت نشد.');
|
|
||||||
|
|
||||||
const updated = await this.prisma.notificationQueue.update({
|
|
||||||
where: { id },
|
|
||||||
data: {
|
|
||||||
status: 'QUEUED',
|
|
||||||
attempts: 0,
|
|
||||||
lastError: null,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
setImmediate(() => {
|
|
||||||
this.processItem(id).catch(() => {});
|
|
||||||
});
|
|
||||||
|
|
||||||
return updated;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get queue items with filtering and pagination
|
|
||||||
*/
|
|
||||||
async getQueue(query: { page?: number; limit?: number; status?: string; channel?: string; search?: string }) {
|
|
||||||
const page = Math.max(1, Number(query.page || 1));
|
|
||||||
const limit = Math.max(1, Math.min(100, Number(query.limit || 20)));
|
|
||||||
const skip = (page - 1) * limit;
|
|
||||||
|
|
||||||
const where: any = {};
|
|
||||||
if (query.status) where.status = query.status;
|
|
||||||
if (query.channel) where.channel = query.channel;
|
|
||||||
if (query.search) {
|
|
||||||
where.OR = [
|
|
||||||
{ recipient: { contains: query.search, mode: 'insensitive' } },
|
|
||||||
{ subject: { contains: query.search, mode: 'insensitive' } },
|
|
||||||
{ event: { contains: query.search, mode: 'insensitive' } },
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
const [items, total] = await Promise.all([
|
|
||||||
this.prisma.notificationQueue.findMany({
|
|
||||||
where,
|
|
||||||
orderBy: { createdAt: 'desc' },
|
|
||||||
skip,
|
|
||||||
take: limit,
|
|
||||||
}),
|
|
||||||
this.prisma.notificationQueue.count({ where }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
const stats = await this.getStats();
|
|
||||||
|
|
||||||
return {
|
|
||||||
items,
|
|
||||||
total,
|
|
||||||
page,
|
|
||||||
limit,
|
|
||||||
totalPages: Math.ceil(total / limit) || 1,
|
|
||||||
stats,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get overall stats
|
|
||||||
*/
|
|
||||||
async getStats() {
|
|
||||||
const [total, queued, processing, sent, failed] = await Promise.all([
|
|
||||||
this.prisma.notificationQueue.count(),
|
|
||||||
this.prisma.notificationQueue.count({ where: { status: 'QUEUED' } }),
|
|
||||||
this.prisma.notificationQueue.count({ where: { status: 'PROCESSING' } }),
|
|
||||||
this.prisma.notificationQueue.count({ where: { status: 'SENT' } }),
|
|
||||||
this.prisma.notificationQueue.count({ where: { status: 'FAILED' } }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
return {
|
|
||||||
total,
|
|
||||||
queued,
|
|
||||||
processing,
|
|
||||||
sent,
|
|
||||||
failed,
|
|
||||||
successRate: total > 0 ? Math.round((sent / total) * 100) : 100,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,330 +0,0 @@
|
|||||||
import {
|
|
||||||
Controller,
|
|
||||||
Get,
|
|
||||||
Post,
|
|
||||||
Put,
|
|
||||||
Delete,
|
|
||||||
Body,
|
|
||||||
Param,
|
|
||||||
Query,
|
|
||||||
UseGuards,
|
|
||||||
BadRequestException,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
|
||||||
import { EmailService } from './email.service';
|
|
||||||
import { escapeHtml, renderCaninaEmailLayout, textToHtmlParagraphs } from './email-layout';
|
|
||||||
import { NotificationsQueueService } from './notifications-queue.service';
|
|
||||||
import { SmsService } from '../common/services/sms.service';
|
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
|
||||||
import {
|
|
||||||
UpdateEmailConfigDto,
|
|
||||||
TestSmtpDto,
|
|
||||||
SendTestEmailDto,
|
|
||||||
SendTestSmsDto,
|
|
||||||
ManualSendDto,
|
|
||||||
CreateTemplateDto,
|
|
||||||
} from './notifications.dto';
|
|
||||||
|
|
||||||
@Controller('admin/notifications')
|
|
||||||
@UseGuards(JwtAuthGuard)
|
|
||||||
export class NotificationsController {
|
|
||||||
constructor(
|
|
||||||
private readonly emailService: EmailService,
|
|
||||||
private readonly queueService: NotificationsQueueService,
|
|
||||||
private readonly smsService: SmsService,
|
|
||||||
private readonly prisma: PrismaService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get notification settings (Email & SMS)
|
|
||||||
*/
|
|
||||||
@Get('config')
|
|
||||||
async getConfig() {
|
|
||||||
const [email, sms] = await Promise.all([
|
|
||||||
this.emailService.getConfig(),
|
|
||||||
this.smsService.getSmsConfig(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Mask password for security
|
|
||||||
const maskedEmail = {
|
|
||||||
...email,
|
|
||||||
password: email.password ? '••••••••' : '',
|
|
||||||
};
|
|
||||||
|
|
||||||
const maskedSms = {
|
|
||||||
...sms,
|
|
||||||
password: sms.password ? '••••••••' : '',
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
data: {
|
|
||||||
email: maskedEmail,
|
|
||||||
sms: maskedSms,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update SMTP Email config
|
|
||||||
*/
|
|
||||||
@Put('email-config')
|
|
||||||
async updateEmailConfig(@Body() dto: UpdateEmailConfigDto) {
|
|
||||||
// If password is masked, don't overwrite with dots
|
|
||||||
if (dto.password && dto.password.includes('•')) {
|
|
||||||
delete dto.password;
|
|
||||||
}
|
|
||||||
|
|
||||||
const saved = await this.emailService.saveConfig(dto);
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
message: 'تنظیمات ایمیل با موفقیت ذخیره شد.',
|
|
||||||
data: {
|
|
||||||
...saved,
|
|
||||||
password: saved.password ? '••••••••' : '',
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test SMTP connection live
|
|
||||||
*/
|
|
||||||
@Post('test-smtp')
|
|
||||||
async testSmtp(@Body() customConfig?: TestSmtpDto) {
|
|
||||||
if (customConfig?.password && customConfig.password.includes('•')) {
|
|
||||||
delete customConfig.password;
|
|
||||||
}
|
|
||||||
|
|
||||||
const res = await this.emailService.testConnection(customConfig);
|
|
||||||
return {
|
|
||||||
success: res.success,
|
|
||||||
message: res.message,
|
|
||||||
banner: res.banner,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send test email
|
|
||||||
*/
|
|
||||||
@Post('send-test-email')
|
|
||||||
async sendTestEmail(@Body() body: SendTestEmailDto) {
|
|
||||||
if (!body.to) throw new BadRequestException('آدرس ایمیل مقصد الزامی است.');
|
|
||||||
|
|
||||||
const subject = body.subject || 'تست اتصال ایمیل - کنینا ایران';
|
|
||||||
const message =
|
|
||||||
body.message ||
|
|
||||||
'این یک ایمیل آزمایشی جهت بررسی صحت تنظیمات سرور SMTP در فروشگاه کنینا است.';
|
|
||||||
const res = await this.emailService.sendMail({
|
|
||||||
to: body.to,
|
|
||||||
subject,
|
|
||||||
text: message,
|
|
||||||
html: renderCaninaEmailLayout({
|
|
||||||
title: subject,
|
|
||||||
bodyHtml: `<p style="margin:0 0 16px;">${textToHtmlParagraphs(message)}</p><p style="margin:0;font-size:13px;color:#7A9B9F;">زمان ارسال: ${escapeHtml(new Date().toLocaleString('fa-IR'))}</p>`,
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!res.success) {
|
|
||||||
throw new BadRequestException(res.error || 'ارسال ایمیل تستی ناموفق بود.');
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
message: `ایمیل تستی با موفقیت به ${body.to} ارسال شد.`,
|
|
||||||
messageId: res.messageId,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send test SMS
|
|
||||||
*/
|
|
||||||
@Post('send-test-sms')
|
|
||||||
async sendTestSms(@Body() body: SendTestSmsDto) {
|
|
||||||
if (!body.to || !body.message) {
|
|
||||||
throw new BadRequestException('شماره موبایل و متن پیام الزامی است.');
|
|
||||||
}
|
|
||||||
|
|
||||||
const res = await this.smsService.sendSms(body.to, body.message);
|
|
||||||
if (!res) throw new BadRequestException('ارسال پیامک تستی ناموفق بود.');
|
|
||||||
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
message: `پیامک تستی با موفقیت به ${body.to} ارسال شد.`,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Manual targeted notification send
|
|
||||||
*/
|
|
||||||
@Post('manual-send')
|
|
||||||
async manualSend(@Body() body: ManualSendDto) {
|
|
||||||
if (!body.channel || !body.content) {
|
|
||||||
throw new BadRequestException('کانال ارسال و متن پیام الزامی است.');
|
|
||||||
}
|
|
||||||
|
|
||||||
let targetList: string[] = [];
|
|
||||||
|
|
||||||
if (body.targetType === 'single') {
|
|
||||||
if (!body.recipient) throw new BadRequestException('گیرنده پیام مشخص نشده است.');
|
|
||||||
targetList = [body.recipient.trim()];
|
|
||||||
} else if (body.targetType === 'custom_list') {
|
|
||||||
if (!Array.isArray(body.recipients) || !body.recipients.length) {
|
|
||||||
throw new BadRequestException('لیست گیرندگان خالی است.');
|
|
||||||
}
|
|
||||||
targetList = body.recipients.map((r) => r.trim()).filter(Boolean);
|
|
||||||
} else if (body.targetType === 'all_users') {
|
|
||||||
const users = await this.prisma.user.findMany({
|
|
||||||
select: { mobile: true, email: true },
|
|
||||||
take: 1000,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (body.channel === 'SMS') {
|
|
||||||
targetList = users.map((u) => u.mobile).filter(Boolean) as string[];
|
|
||||||
} else {
|
|
||||||
targetList = users.map((u) => u.email).filter(Boolean) as string[];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!targetList.length) {
|
|
||||||
throw new BadRequestException('هیچ گیرنده معتبری برای ارسال یافت نشد.');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Enqueue all items into durable queue
|
|
||||||
const queuedItems = await Promise.all(
|
|
||||||
targetList.map((rec) =>
|
|
||||||
this.queueService.enqueue({
|
|
||||||
channel: body.channel,
|
|
||||||
recipient: rec,
|
|
||||||
event: 'MANUAL_TARGETED_SEND',
|
|
||||||
subject: body.subject,
|
|
||||||
content: body.content,
|
|
||||||
idempotencyKey: `manual_${body.channel}_${rec}_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`,
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
message: `${queuedItems.length} پیام با موفقیت در صف ارسال قرار گرفت.`,
|
|
||||||
count: queuedItems.length,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get queue items and statistics
|
|
||||||
*/
|
|
||||||
@Get('queue')
|
|
||||||
async getQueue(
|
|
||||||
@Query('page') page?: number,
|
|
||||||
@Query('limit') limit?: number,
|
|
||||||
@Query('status') status?: string,
|
|
||||||
@Query('channel') channel?: string,
|
|
||||||
@Query('search') search?: string,
|
|
||||||
) {
|
|
||||||
const data = await this.queueService.getQueue({ page, limit, status, channel, search });
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
data,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retry failed queue item
|
|
||||||
*/
|
|
||||||
@Post('queue/:id/retry')
|
|
||||||
async retryQueueItem(@Param('id') id: string) {
|
|
||||||
const retried = await this.queueService.retry(id);
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
message: 'پیام مجدداً در صف ارسال قرار گرفت.',
|
|
||||||
data: retried,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get notification templates & event definitions
|
|
||||||
*/
|
|
||||||
@Get('templates')
|
|
||||||
async getTemplates() {
|
|
||||||
const templates = await this.prisma.notificationTemplate.findMany({
|
|
||||||
orderBy: { createdAt: 'desc' },
|
|
||||||
});
|
|
||||||
|
|
||||||
const defaultEvents = [
|
|
||||||
{ event: 'ORDER_CREATED', name: 'ثبت سفارش جدید', variables: ['order_id', 'customer_name', 'total_amount'] },
|
|
||||||
{ event: 'PAYMENT_SUCCESS', name: 'پرداخت موفق سفارش', variables: ['order_id', 'track_id', 'amount'] },
|
|
||||||
{ event: 'ORDER_SHIPPED', name: 'ارسال سفارش پستی', variables: ['order_id', 'tracking_code', 'carrier'] },
|
|
||||||
{ event: 'NEW_LEAD', name: 'درخواست تماس یا مشاوره جدید', variables: ['lead_name', 'phone', 'product_name'] },
|
|
||||||
{ event: 'USER_REGISTERED', name: 'ثبتنام کاربر جدید', variables: ['user_name', 'mobile'] },
|
|
||||||
{ event: 'TICKET_REPLIED', name: 'پاسخ به تیکت پشتیبانی', variables: ['ticket_id', 'user_name'] },
|
|
||||||
];
|
|
||||||
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
data: {
|
|
||||||
templates,
|
|
||||||
events: defaultEvents,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create or update notification template
|
|
||||||
*/
|
|
||||||
@Post('templates')
|
|
||||||
async upsertTemplate(@Body() dto: CreateTemplateDto) {
|
|
||||||
if (!dto.channel || !dto.event || !dto.name || !dto.body) {
|
|
||||||
throw new BadRequestException('اطلاعات ضروری قالب ناقص است.');
|
|
||||||
}
|
|
||||||
|
|
||||||
const data = {
|
|
||||||
channel: dto.channel,
|
|
||||||
event: dto.event,
|
|
||||||
name: dto.name,
|
|
||||||
subject: dto.subject || null,
|
|
||||||
body: dto.body,
|
|
||||||
patternCode: dto.patternCode || null,
|
|
||||||
variables: dto.variables || [],
|
|
||||||
recipientType: dto.recipientType || 'customer',
|
|
||||||
customRecipient: dto.customRecipient || null,
|
|
||||||
isActive: dto.isActive !== undefined ? dto.isActive : true,
|
|
||||||
};
|
|
||||||
|
|
||||||
let template;
|
|
||||||
if (dto.id) {
|
|
||||||
template = await this.prisma.notificationTemplate.update({
|
|
||||||
where: { id: dto.id },
|
|
||||||
data,
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
template = await this.prisma.notificationTemplate.upsert({
|
|
||||||
where: {
|
|
||||||
channel_event: {
|
|
||||||
channel: dto.channel,
|
|
||||||
event: dto.event,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
create: data,
|
|
||||||
update: data,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
message: 'قالب رویداد با موفقیت ذخیره شد.',
|
|
||||||
data: template,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Delete template
|
|
||||||
*/
|
|
||||||
@Delete('templates/:id')
|
|
||||||
async deleteTemplate(@Param('id') id: string) {
|
|
||||||
await this.prisma.notificationTemplate.delete({ where: { id } });
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
message: 'قالب رویداد حذف شد.',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,172 +0,0 @@
|
|||||||
import { IsString, IsNotEmpty, IsOptional, IsNumber, IsBoolean, IsIn, IsArray } from 'class-validator';
|
|
||||||
|
|
||||||
export class UpdateEmailConfigDto {
|
|
||||||
@IsBoolean()
|
|
||||||
@IsOptional()
|
|
||||||
enabled?: boolean;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
host!: string;
|
|
||||||
|
|
||||||
@IsNumber()
|
|
||||||
port!: number;
|
|
||||||
|
|
||||||
@IsBoolean()
|
|
||||||
@IsOptional()
|
|
||||||
secure?: boolean = true;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
user?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
password?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
from?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
fromName?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
fromEmail?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class TestSmtpDto {
|
|
||||||
@IsBoolean()
|
|
||||||
@IsOptional()
|
|
||||||
enabled?: boolean;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
host?: string;
|
|
||||||
|
|
||||||
@IsNumber()
|
|
||||||
@IsOptional()
|
|
||||||
port?: number;
|
|
||||||
|
|
||||||
@IsBoolean()
|
|
||||||
@IsOptional()
|
|
||||||
secure?: boolean = true;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
user?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
password?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
from?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
fromName?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
fromEmail?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class SendTestEmailDto {
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
to!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
subject?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
message?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class SendTestSmsDto {
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
to!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
message!: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class ManualSendDto {
|
|
||||||
@IsString()
|
|
||||||
@IsIn(['SMS', 'EMAIL'])
|
|
||||||
channel!: 'SMS' | 'EMAIL';
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsIn(['single', 'all_users', 'custom_list'])
|
|
||||||
targetType!: 'single' | 'all_users' | 'custom_list';
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
recipient?: string;
|
|
||||||
|
|
||||||
@IsArray()
|
|
||||||
@IsOptional()
|
|
||||||
recipients?: string[];
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
subject?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
content!: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class CreateTemplateDto {
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
id?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsIn(['SMS', 'EMAIL'])
|
|
||||||
channel!: 'SMS' | 'EMAIL';
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
event!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
name!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
subject?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
body!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
patternCode?: string;
|
|
||||||
|
|
||||||
@IsArray()
|
|
||||||
@IsOptional()
|
|
||||||
variables?: string[];
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
recipientType?: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
customRecipient?: string;
|
|
||||||
|
|
||||||
@IsBoolean()
|
|
||||||
@IsOptional()
|
|
||||||
isActive?: boolean;
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
import { Module } from '@nestjs/common';
|
|
||||||
import { PrismaModule } from '../prisma/prisma.module';
|
|
||||||
import { SmsModule } from '../common/sms.module';
|
|
||||||
import { EmailService } from './email.service';
|
|
||||||
import { NotificationsQueueService } from './notifications-queue.service';
|
|
||||||
import { NotificationsController } from './notifications.controller';
|
|
||||||
import { TransactionalEmailsService } from './transactional-emails.service';
|
|
||||||
|
|
||||||
@Module({
|
|
||||||
imports: [PrismaModule, SmsModule],
|
|
||||||
controllers: [NotificationsController],
|
|
||||||
providers: [EmailService, NotificationsQueueService, TransactionalEmailsService],
|
|
||||||
exports: [EmailService, NotificationsQueueService, TransactionalEmailsService],
|
|
||||||
})
|
|
||||||
export class NotificationsModule {}
|
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
import { Injectable, Logger } from '@nestjs/common';
|
|
||||||
import { EmailService } from './email.service';
|
|
||||||
import {
|
|
||||||
escapeHtml,
|
|
||||||
renderCaninaEmailLayout,
|
|
||||||
textToHtmlParagraphs,
|
|
||||||
} from './email-layout';
|
|
||||||
|
|
||||||
const ADMIN_NOTIFY_TO = [
|
|
||||||
'support@canina.ir',
|
|
||||||
'parsa.aghaee@gmail.com',
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class TransactionalEmailsService {
|
|
||||||
private readonly logger = new Logger(TransactionalEmailsService.name);
|
|
||||||
|
|
||||||
constructor(private readonly emailService: EmailService) {}
|
|
||||||
|
|
||||||
private async sendSafe(to: string, subject: string, text: string, html: string) {
|
|
||||||
try {
|
|
||||||
const res = await this.emailService.sendMail({ to, subject, text, html });
|
|
||||||
if (!res.success) {
|
|
||||||
this.logger.warn(`Email to ${to} failed: ${res.error || 'unknown'}`);
|
|
||||||
}
|
|
||||||
return res;
|
|
||||||
} catch (err) {
|
|
||||||
this.logger.warn(`Email to ${to} threw: ${(err as Error).message}`);
|
|
||||||
return { success: false, error: (err as Error).message };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async sendWelcome(to: string | null | undefined, firstName?: string | null) {
|
|
||||||
if (!to) return;
|
|
||||||
const name = (firstName || '').trim() || 'کاربر گرامی';
|
|
||||||
const subject = 'به کنینا خوش آمدید';
|
|
||||||
const text = `سلام ${name}،\n\nثبتنام شما در فروشگاه کنینا با موفقیت انجام شد.\n\ncanina.ir`;
|
|
||||||
const html = renderCaninaEmailLayout({
|
|
||||||
title: subject,
|
|
||||||
bodyHtml: `<p style="margin:0 0 12px;">سلام ${escapeHtml(name)}،</p><p style="margin:0;">ثبتنام شما در فروشگاه کنینا با موفقیت انجام شد. از این به بعد میتوانید سفارشها و وضعیت حساب خود را از سایت پیگیری کنید.</p>`,
|
|
||||||
});
|
|
||||||
await this.sendSafe(to, subject, text, html);
|
|
||||||
}
|
|
||||||
|
|
||||||
async sendOrderCreated(to: string | null | undefined, order: { id?: string; trackingNumber?: string | null; totalAmount?: number | string | { toString(): string } | null }) {
|
|
||||||
if (!to) return;
|
|
||||||
const orderRef = escapeHtml(String(order.trackingNumber || order.id || ''));
|
|
||||||
const amount = Number(order.totalAmount || 0);
|
|
||||||
const subject = 'سفارش شما در کنینا ثبت شد';
|
|
||||||
const text = `سفارش شما ثبت شد.\nشماره/کد: ${order.trackingNumber || order.id || ''}\nمبلغ: ${amount.toLocaleString('fa-IR')} تومان`;
|
|
||||||
const html = renderCaninaEmailLayout({
|
|
||||||
title: subject,
|
|
||||||
bodyHtml: `<p style="margin:0 0 12px;">سفارش شما ثبت شد.</p><p style="margin:0 0 8px;">شناسه/کد پیگیری: <b dir="ltr">${orderRef}</b></p><p style="margin:0;">مبلغ سفارش: <b>${escapeHtml(amount.toLocaleString('fa-IR'))}</b> تومان</p><p style="margin:16px 0 0;font-size:13px;color:#7A9B9F;">این پیام بهتنهایی بهمعنای تأیید پرداخت نیست؛ وضعیت پرداخت را در حساب کاربری بررسی کنید.</p>`,
|
|
||||||
});
|
|
||||||
await this.sendSafe(to, subject, text, html);
|
|
||||||
}
|
|
||||||
|
|
||||||
async sendOrderPaid(to: string | null | undefined, order: { id?: string; trackingNumber?: string | null; totalAmount?: number | string | { toString(): string } | null }) {
|
|
||||||
if (!to) return;
|
|
||||||
const orderRef = escapeHtml(String(order.trackingNumber || order.id || ''));
|
|
||||||
const amount = Number(order.totalAmount || 0);
|
|
||||||
const subject = 'پرداخت سفارش کنینا تأیید شد';
|
|
||||||
const text = `پرداخت سفارش تأیید شد.\nشماره/کد: ${order.trackingNumber || order.id || ''}\nمبلغ: ${amount.toLocaleString('fa-IR')} تومان`;
|
|
||||||
const html = renderCaninaEmailLayout({
|
|
||||||
title: subject,
|
|
||||||
bodyHtml: `<p style="margin:0 0 12px;">پرداخت سفارش شما با موفقیت تأیید شد.</p><p style="margin:0 0 8px;">شناسه/کد پیگیری: <b dir="ltr">${orderRef}</b></p><p style="margin:0;">مبلغ پرداختشده: <b>${escapeHtml(amount.toLocaleString('fa-IR'))}</b> تومان</p>`,
|
|
||||||
});
|
|
||||||
await this.sendSafe(to, subject, text, html);
|
|
||||||
}
|
|
||||||
|
|
||||||
async sendOrderShipped(
|
|
||||||
to: string | null | undefined,
|
|
||||||
order: { id?: string; trackingNumber?: string | null },
|
|
||||||
trackingCode?: string,
|
|
||||||
) {
|
|
||||||
if (!to) return;
|
|
||||||
const track = escapeHtml(String(trackingCode || order.trackingNumber || 'ارسال با پیک شهری'));
|
|
||||||
const orderRef = escapeHtml(String(order.trackingNumber || order.id || ''));
|
|
||||||
const subject = 'سفارش کنینا ارسال شد';
|
|
||||||
const text = `سفارش شما ارسال شد.\nسفارش: ${order.trackingNumber || order.id || ''}\nرهگیری: ${trackingCode || order.trackingNumber || 'ارسال با پیک شهری'}`;
|
|
||||||
const html = renderCaninaEmailLayout({
|
|
||||||
title: subject,
|
|
||||||
bodyHtml: `<p style="margin:0 0 12px;">وضعیت سفارش به ارسالشده تغییر کرد.</p><p style="margin:0 0 8px;">سفارش: <b dir="ltr">${orderRef}</b></p><p style="margin:0;">کد/روش ارسال: <b dir="ltr">${track}</b></p>`,
|
|
||||||
});
|
|
||||||
await this.sendSafe(to, subject, text, html);
|
|
||||||
}
|
|
||||||
|
|
||||||
async sendContactConfirmation(to: string | null | undefined, name: string, message: string, submissionId?: string) {
|
|
||||||
if (!to) return;
|
|
||||||
const subject = 'پیام شما در کنینا ثبت شد';
|
|
||||||
const text = `سلام ${name}،\n\nپیام شما ثبت شد و بهزودی بررسی میشود.\nشناسه: ${submissionId || ''}\n\n${message}`;
|
|
||||||
const html = renderCaninaEmailLayout({
|
|
||||||
title: subject,
|
|
||||||
bodyHtml: `<p style="margin:0 0 12px;">سلام ${escapeHtml(name)}،</p><p style="margin:0 0 16px;">پیام شما از طریق فرم تماس کنینا ثبت شد و بهزودی بررسی میشود.</p><div style="padding:14px;background:#F4F7F6;border:1px solid #E5ECE9;border-right:3px solid #F1B646;"><p style="margin:0;white-space:pre-wrap;">${textToHtmlParagraphs(message || '')}</p></div>${submissionId ? `<p style="margin:16px 0 0;font-size:13px;color:#7A9B9F;">شناسه پیگیری: <span dir="ltr">#${escapeHtml(submissionId)}</span></p>` : ''}`,
|
|
||||||
});
|
|
||||||
await this.sendSafe(to, subject, text, html);
|
|
||||||
}
|
|
||||||
|
|
||||||
async notifyAdminsAboutContact(dto: {
|
|
||||||
name: string;
|
|
||||||
phone: string;
|
|
||||||
email?: string;
|
|
||||||
subject?: string;
|
|
||||||
message: string;
|
|
||||||
submissionId?: string;
|
|
||||||
}) {
|
|
||||||
const subject = `پیام جدید فرم تماس کنینا${dto.subject ? ` — ${dto.subject}` : ''}`;
|
|
||||||
const text = `نام: ${dto.name}\nتلفن: ${dto.phone}\nایمیل: ${dto.email || '-'}\nموضوع: ${dto.subject || '-'}\nشناسه: ${dto.submissionId || '-'}\n\n${dto.message}`;
|
|
||||||
const html = renderCaninaEmailLayout({
|
|
||||||
title: 'پیام جدید از فرم تماس',
|
|
||||||
bodyHtml: `<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
|
|
||||||
<tr><td style="padding:10px 12px;background:#F4F7F6;border:1px solid #E5ECE9;width:110px;">نام</td><td style="padding:10px 12px;border:1px solid #E5ECE9;">${escapeHtml(dto.name)}</td></tr>
|
|
||||||
<tr><td style="padding:10px 12px;background:#F4F7F6;border:1px solid #E5ECE9;">تلفن</td><td style="padding:10px 12px;border:1px solid #E5ECE9;" dir="ltr">${escapeHtml(dto.phone)}</td></tr>
|
|
||||||
<tr><td style="padding:10px 12px;background:#F4F7F6;border:1px solid #E5ECE9;">ایمیل</td><td style="padding:10px 12px;border:1px solid #E5ECE9;" dir="ltr">${escapeHtml(dto.email || '-')}</td></tr>
|
|
||||||
<tr><td style="padding:10px 12px;background:#F4F7F6;border:1px solid #E5ECE9;vertical-align:top;">پیام</td><td style="padding:10px 12px;border:1px solid #E5ECE9;white-space:pre-wrap;">${textToHtmlParagraphs(dto.message || '')}</td></tr>
|
|
||||||
</table>`,
|
|
||||||
});
|
|
||||||
await Promise.all(
|
|
||||||
ADMIN_NOTIFY_TO.map((to) => this.sendSafe(to, subject, text, html)),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +1,10 @@
|
|||||||
import { Module } from "@nestjs/common";
|
import { Module } from "@nestjs/common";
|
||||||
import { OrdersService } from "./orders.service";
|
import { OrdersService } from "./orders.service";
|
||||||
import { OrdersController } from "./orders.controller";
|
import { OrdersController } from "./orders.controller";
|
||||||
import { NotificationsModule } from "../notifications/notifications.module";
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [NotificationsModule],
|
|
||||||
controllers: [OrdersController],
|
controllers: [OrdersController],
|
||||||
providers: [OrdersService],
|
providers: [OrdersService],
|
||||||
|
exports: [OrdersService],
|
||||||
})
|
})
|
||||||
export class OrdersModule {}
|
export class OrdersModule {}
|
||||||
@@ -2,7 +2,6 @@ import { Test, TestingModule } from "@nestjs/testing";
|
|||||||
import { OrdersService } from "./orders.service";
|
import { OrdersService } from "./orders.service";
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
import { PrismaService } from "../prisma/prisma.service";
|
||||||
import { SmsService } from "../common/services/sms.service";
|
import { SmsService } from "../common/services/sms.service";
|
||||||
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
|
|
||||||
import { NotFoundException, BadRequestException } from "@nestjs/common";
|
import { NotFoundException, BadRequestException } from "@nestjs/common";
|
||||||
import { Prisma } from "@prisma/client";
|
import { Prisma } from "@prisma/client";
|
||||||
|
|
||||||
@@ -40,7 +39,7 @@ describe("OrdersService", () => {
|
|||||||
uiText: {
|
uiText: {
|
||||||
findFirst: jest.fn().mockResolvedValue(null),
|
findFirst: jest.fn().mockResolvedValue(null),
|
||||||
},
|
},
|
||||||
$executeRaw: jest.fn(),
|
$executeRaw: jest.fn().mockResolvedValue(1),
|
||||||
$transaction: jest.fn(),
|
$transaction: jest.fn(),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -59,7 +58,6 @@ describe("OrdersService", () => {
|
|||||||
OrdersService,
|
OrdersService,
|
||||||
{ provide: PrismaService, useValue: mockPrisma },
|
{ provide: PrismaService, useValue: mockPrisma },
|
||||||
{ provide: SmsService, useValue: mockSmsService },
|
{ provide: SmsService, useValue: mockSmsService },
|
||||||
{ provide: TransactionalEmailsService, useValue: { sendWelcome: jest.fn().mockResolvedValue(undefined), sendOrderCreated: jest.fn().mockResolvedValue(undefined), sendOrderPaid: jest.fn().mockResolvedValue(undefined), sendOrderShipped: jest.fn().mockResolvedValue(undefined), sendContactConfirmation: jest.fn().mockResolvedValue(undefined), notifyAdminsAboutContact: jest.fn().mockResolvedValue(undefined) } },
|
|
||||||
],
|
],
|
||||||
}).compile();
|
}).compile();
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import { PrismaService } from "../prisma/prisma.service";
|
|||||||
import { PaginationDto } from "../common/dto/pagination.dto";
|
import { PaginationDto } from "../common/dto/pagination.dto";
|
||||||
import { CreateOrderDto } from "./dto/create-order.dto";
|
import { CreateOrderDto } from "./dto/create-order.dto";
|
||||||
import { SmsService } from "../common/services/sms.service";
|
import { SmsService } from "../common/services/sms.service";
|
||||||
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
|
|
||||||
import { Prisma } from "@prisma/client";
|
import { Prisma } from "@prisma/client";
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@@ -18,7 +17,6 @@ export class OrdersService {
|
|||||||
constructor(
|
constructor(
|
||||||
private prisma: PrismaService,
|
private prisma: PrismaService,
|
||||||
private smsService: SmsService,
|
private smsService: SmsService,
|
||||||
private transactionalEmails: TransactionalEmailsService,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
private generateTrackingNumber(): string {
|
private generateTrackingNumber(): string {
|
||||||
@@ -305,9 +303,6 @@ export class OrdersService {
|
|||||||
this.logger.warn(`Failed to trigger wallet order SMS: ${err}`);
|
this.logger.warn(`Failed to trigger wallet order SMS: ${err}`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
this.transactionalEmails
|
|
||||||
.sendOrderPaid(user.email, createdWalletOrder)
|
|
||||||
.catch(() => {});
|
|
||||||
|
|
||||||
return createdWalletOrder;
|
return createdWalletOrder;
|
||||||
}
|
}
|
||||||
@@ -351,13 +346,14 @@ export class OrdersService {
|
|||||||
// Deduct inventory immediately for non-online orders (card to card)
|
// Deduct inventory immediately for non-online orders (card to card)
|
||||||
if (!isOnline) {
|
if (!isOnline) {
|
||||||
for (const item of createOrderDto.items) {
|
for (const item of createOrderDto.items) {
|
||||||
|
// BE-05: Atomic decrement with inventory constraint guard
|
||||||
const updated = await tx.product.update({
|
const updated = await tx.product.update({
|
||||||
where: { id: item.productId },
|
where: { id: item.productId },
|
||||||
data: {
|
data: {
|
||||||
stock: { decrement: item.quantity },
|
stock: { decrement: item.quantity },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (updated.stock <= 0) {
|
if (updated && updated.stock <= 0) {
|
||||||
await tx.product.update({
|
await tx.product.update({
|
||||||
where: { id: item.productId },
|
where: { id: item.productId },
|
||||||
data: { stockStatus: "OUT_OF_STOCK" },
|
data: { stockStatus: "OUT_OF_STOCK" },
|
||||||
@@ -380,11 +376,6 @@ export class OrdersService {
|
|||||||
.triggerEvent("ORDER_CREATED", orderData)
|
.triggerEvent("ORDER_CREATED", orderData)
|
||||||
.catch(() => {});
|
.catch(() => {});
|
||||||
}
|
}
|
||||||
if (user?.email) {
|
|
||||||
this.transactionalEmails
|
|
||||||
.sendOrderCreated(user.email, createdOrder)
|
|
||||||
.catch(() => {});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return createdOrder;
|
return createdOrder;
|
||||||
@@ -539,9 +530,6 @@ export class OrdersService {
|
|||||||
: "پیک شهری";
|
: "پیک شهری";
|
||||||
|
|
||||||
this.smsService.triggerEvent("ORDER_SHIPPED", orderData).catch(() => {});
|
this.smsService.triggerEvent("ORDER_SHIPPED", orderData).catch(() => {});
|
||||||
this.transactionalEmails
|
|
||||||
.sendOrderShipped(updatedOrder.user?.email, updatedOrder, finalTracking)
|
|
||||||
.catch(() => {});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return updatedOrder;
|
return updatedOrder;
|
||||||
@@ -720,9 +708,6 @@ export class OrdersService {
|
|||||||
.triggerEvent("ORDER_PAID", orderData)
|
.triggerEvent("ORDER_PAID", orderData)
|
||||||
.catch(() => {});
|
.catch(() => {});
|
||||||
}
|
}
|
||||||
this.transactionalEmails
|
|
||||||
.sendOrderPaid(user.email, order)
|
|
||||||
.catch(() => {});
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { Module } from "@nestjs/common";
|
import { Module } from "@nestjs/common";
|
||||||
import { NotificationsModule } from "../notifications/notifications.module";
|
|
||||||
import { PaymentController } from "./payment.controller";
|
import { PaymentController } from "./payment.controller";
|
||||||
import { PaymentService } from "./payment.service";
|
import { PaymentService } from "./payment.service";
|
||||||
import { ZibalService } from "./zibal.service";
|
import { ZibalService } from "./zibal.service";
|
||||||
@@ -8,7 +7,7 @@ import { PrismaModule } from "../prisma/prisma.module";
|
|||||||
import { SmsModule } from "../common/sms.module";
|
import { SmsModule } from "../common/sms.module";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [NotificationsModule, PrismaModule, SmsModule],
|
imports: [PrismaModule, SmsModule],
|
||||||
controllers: [PaymentController],
|
controllers: [PaymentController],
|
||||||
providers: [PaymentService, ZibalService, ZibalEBankService],
|
providers: [PaymentService, ZibalService, ZibalEBankService],
|
||||||
exports: [PaymentService, ZibalService, ZibalEBankService],
|
exports: [PaymentService, ZibalService, ZibalEBankService],
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { PaymentService } from "./payment.service";
|
|||||||
import { PrismaService } from "../prisma/prisma.service";
|
import { PrismaService } from "../prisma/prisma.service";
|
||||||
import { ZibalService } from "./zibal.service";
|
import { ZibalService } from "./zibal.service";
|
||||||
import { SmsService } from "../common/services/sms.service";
|
import { SmsService } from "../common/services/sms.service";
|
||||||
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
|
|
||||||
import { BadRequestException, NotFoundException } from "@nestjs/common";
|
import { BadRequestException, NotFoundException } from "@nestjs/common";
|
||||||
import { Prisma } from "@prisma/client";
|
import { Prisma } from "@prisma/client";
|
||||||
|
|
||||||
@@ -73,7 +72,6 @@ describe("PaymentService", () => {
|
|||||||
{ provide: PrismaService, useValue: mockPrisma },
|
{ provide: PrismaService, useValue: mockPrisma },
|
||||||
{ provide: ZibalService, useValue: mockZibalService },
|
{ provide: ZibalService, useValue: mockZibalService },
|
||||||
{ provide: SmsService, useValue: mockSmsService },
|
{ provide: SmsService, useValue: mockSmsService },
|
||||||
{ provide: TransactionalEmailsService, useValue: { sendWelcome: jest.fn().mockResolvedValue(undefined), sendOrderCreated: jest.fn().mockResolvedValue(undefined), sendOrderPaid: jest.fn().mockResolvedValue(undefined), sendOrderShipped: jest.fn().mockResolvedValue(undefined), sendContactConfirmation: jest.fn().mockResolvedValue(undefined), notifyAdminsAboutContact: jest.fn().mockResolvedValue(undefined) } },
|
|
||||||
],
|
],
|
||||||
}).compile();
|
}).compile();
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import {
|
|||||||
import { PrismaService } from "../prisma/prisma.service";
|
import { PrismaService } from "../prisma/prisma.service";
|
||||||
import { ZibalService } from "./zibal.service";
|
import { ZibalService } from "./zibal.service";
|
||||||
import { SmsService } from "../common/services/sms.service";
|
import { SmsService } from "../common/services/sms.service";
|
||||||
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
|
|
||||||
import { Prisma } from "@prisma/client";
|
import { Prisma } from "@prisma/client";
|
||||||
import { AdminTransactionFilterDto } from "./dto/admin-transaction-filter.dto";
|
import { AdminTransactionFilterDto } from "./dto/admin-transaction-filter.dto";
|
||||||
|
|
||||||
@@ -25,7 +24,6 @@ export class PaymentService {
|
|||||||
private readonly prisma: PrismaService,
|
private readonly prisma: PrismaService,
|
||||||
private readonly zibalService: ZibalService,
|
private readonly zibalService: ZibalService,
|
||||||
private readonly smsService: SmsService,
|
private readonly smsService: SmsService,
|
||||||
private readonly transactionalEmails: TransactionalEmailsService,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -449,11 +447,19 @@ export class PaymentService {
|
|||||||
if (orderWithItems?.orderItems) {
|
if (orderWithItems?.orderItems) {
|
||||||
for (const item of orderWithItems.orderItems) {
|
for (const item of orderWithItems.orderItems) {
|
||||||
if (item.productId) {
|
if (item.productId) {
|
||||||
|
// BE-05: Atomic decrement with inventory constraint guard
|
||||||
|
let updateCount = 1;
|
||||||
|
if (typeof (tx as any).$executeRaw === 'function') {
|
||||||
|
updateCount = await tx.$executeRaw`
|
||||||
|
UPDATE products
|
||||||
|
SET stock = stock - ${item.quantity},
|
||||||
|
stock_status = CASE WHEN stock - ${item.quantity} <= 0 THEN 'OUT_OF_STOCK'::"StockStatus" ELSE stock_status END
|
||||||
|
WHERE id = ${item.productId}::uuid AND stock >= ${item.quantity}
|
||||||
|
`;
|
||||||
|
} else {
|
||||||
const updated = await tx.product.update({
|
const updated = await tx.product.update({
|
||||||
where: { id: item.productId },
|
where: { id: item.productId },
|
||||||
data: {
|
data: { stock: { decrement: item.quantity } },
|
||||||
stock: { decrement: item.quantity },
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
if (updated.stock <= 0) {
|
if (updated.stock <= 0) {
|
||||||
await tx.product.update({
|
await tx.product.update({
|
||||||
@@ -462,6 +468,13 @@ export class PaymentService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (updateCount === 0) {
|
||||||
|
this.logger.error(
|
||||||
|
`[CriticalInventoryAlert] Product ${item.productId} lacked sufficient stock for paid order ${transaction.orderId} (requested ${item.quantity}). Manual inventory check required.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -643,16 +656,6 @@ export class PaymentService {
|
|||||||
this.smsService.triggerEvent("ORDER_PAID", orderData).catch((err) => {
|
this.smsService.triggerEvent("ORDER_PAID", orderData).catch((err) => {
|
||||||
this.logger.warn(`Could not trigger SMS event ORDER_PAID: ${err}`);
|
this.logger.warn(`Could not trigger SMS event ORDER_PAID: ${err}`);
|
||||||
});
|
});
|
||||||
const emailTo =
|
|
||||||
transaction.user?.email ||
|
|
||||||
order?.user?.email ||
|
|
||||||
null;
|
|
||||||
const orderForEmail = order || transaction.order;
|
|
||||||
if (emailTo && orderForEmail) {
|
|
||||||
this.transactionalEmails
|
|
||||||
.sendOrderPaid(emailTo, orderForEmail)
|
|
||||||
.catch(() => {});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send SMS notification if wallet top-up
|
// Send SMS notification if wallet top-up
|
||||||
|
|||||||
@@ -1,13 +1,39 @@
|
|||||||
import { Injectable, OnModuleInit, OnModuleDestroy } from "@nestjs/common";
|
import { Injectable, OnModuleInit, OnModuleDestroy } from "@nestjs/common";
|
||||||
import { PrismaClient } from "@prisma/client";
|
import { PrismaClient } from "@prisma/client";
|
||||||
|
|
||||||
|
import { Logger } from "@nestjs/common";
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class PrismaService
|
export class PrismaService
|
||||||
extends PrismaClient
|
extends PrismaClient
|
||||||
implements OnModuleInit, OnModuleDestroy
|
implements OnModuleInit, OnModuleDestroy
|
||||||
{
|
{
|
||||||
|
private readonly logger = new Logger(PrismaService.name);
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
super({
|
||||||
|
log: [
|
||||||
|
{ emit: "event", level: "query" },
|
||||||
|
{ emit: "stdout", level: "error" },
|
||||||
|
{ emit: "stdout", level: "warn" },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
async onModuleInit() {
|
async onModuleInit() {
|
||||||
await this.$connect();
|
await this.$connect();
|
||||||
|
|
||||||
|
// BE-07: Slow query logging interceptor (> 300ms)
|
||||||
|
if (typeof (this as any).$on === "function") {
|
||||||
|
(this as any).$on("query", (e: any) => {
|
||||||
|
if (e.duration >= 300) {
|
||||||
|
this.logger.warn(
|
||||||
|
`[SlowQueryAlert] Duration: ${e.duration}ms | Target: ${e.target} | Query: ${e.query.substring(0, 300)}...`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
await this.ensureTablesExist();
|
await this.ensureTablesExist();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,9 @@ describe("ProductsService", () => {
|
|||||||
findFirst: jest.fn(),
|
findFirst: jest.fn(),
|
||||||
count: jest.fn(),
|
count: jest.fn(),
|
||||||
},
|
},
|
||||||
|
orderItem: {
|
||||||
|
groupBy: jest.fn().mockResolvedValue([]),
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
const mockRevalidationService = {
|
const mockRevalidationService = {
|
||||||
|
|||||||
@@ -87,6 +87,7 @@ export class ProductsService {
|
|||||||
|
|
||||||
const skip = (page - 1) * limit;
|
const skip = (page - 1) * limit;
|
||||||
|
|
||||||
|
// 1. Fetch products with lean relations (no heavy N+1 orderItems join)
|
||||||
const [rawProducts, total] = await Promise.all([
|
const [rawProducts, total] = await Promise.all([
|
||||||
this.prisma.product.findMany({
|
this.prisma.product.findMany({
|
||||||
where: whereClause,
|
where: whereClause,
|
||||||
@@ -96,15 +97,33 @@ export class ProductsService {
|
|||||||
include: {
|
include: {
|
||||||
ingredientList: true,
|
ingredientList: true,
|
||||||
symptoms: true,
|
symptoms: true,
|
||||||
orderItems: {
|
|
||||||
where: { order: { status: { not: "CANCELLED" } } },
|
|
||||||
select: { quantity: true },
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
this.prisma.product.count({ where: whereClause }),
|
this.prisma.product.count({ where: whereClause }),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// 2. Efficient single aggregate query for total sold counts for the current page slice
|
||||||
|
const productIds = rawProducts.map((p) => p.id);
|
||||||
|
let salesMap: Record<string, number> = {};
|
||||||
|
|
||||||
|
if (productIds.length > 0) {
|
||||||
|
const salesAgg = await this.prisma.orderItem.groupBy({
|
||||||
|
by: ['productId'],
|
||||||
|
_sum: { quantity: true },
|
||||||
|
where: {
|
||||||
|
productId: { in: productIds },
|
||||||
|
order: { status: { not: 'CANCELLED' } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
salesMap = salesAgg.reduce((acc, row) => {
|
||||||
|
if (row.productId) {
|
||||||
|
acc[row.productId] = Number(row._sum.quantity) || 0;
|
||||||
|
}
|
||||||
|
return acc;
|
||||||
|
}, {} as Record<string, number>);
|
||||||
|
}
|
||||||
|
|
||||||
const isWholesaleOrAdmin =
|
const isWholesaleOrAdmin =
|
||||||
userRole === "User_Wholesale" ||
|
userRole === "User_Wholesale" ||
|
||||||
userRole === "User_Partner" ||
|
userRole === "User_Partner" ||
|
||||||
@@ -113,12 +132,8 @@ export class ProductsService {
|
|||||||
const isAdmin = userRole === "ADMIN" || userRole === "SuperAdmin";
|
const isAdmin = userRole === "ADMIN" || userRole === "SuperAdmin";
|
||||||
|
|
||||||
const data = rawProducts.map((p) => {
|
const data = rawProducts.map((p) => {
|
||||||
const totalSold =
|
const totalSold = salesMap[p.id] || 0;
|
||||||
p.orderItems?.reduce(
|
const { buyPrice, wholesalePrice, ...publicProduct } = p;
|
||||||
(acc, item) => acc + (Number(item.quantity) || 0),
|
|
||||||
0,
|
|
||||||
) || 0;
|
|
||||||
const { buyPrice, wholesalePrice, orderItems, ...publicProduct } = p;
|
|
||||||
void buyPrice;
|
void buyPrice;
|
||||||
void wholesalePrice;
|
void wholesalePrice;
|
||||||
if (!isWholesaleOrAdmin) {
|
if (!isWholesaleOrAdmin) {
|
||||||
|
|||||||
@@ -45,4 +45,20 @@ export class RedisService implements OnModuleInit, OnModuleDestroy {
|
|||||||
async ttl(key: string): Promise<number> {
|
async ttl(key: string): Promise<number> {
|
||||||
return this.client.ttl(key);
|
return this.client.ttl(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Acquire a distributed lock using Redis SET NX EX
|
||||||
|
* Returns true if lock acquired, false otherwise
|
||||||
|
*/
|
||||||
|
async acquireLock(key: string, ttlSeconds: number = 60): Promise<boolean> {
|
||||||
|
const res = await this.client.set(`lock:${key}`, "1", "EX", ttlSeconds, "NX");
|
||||||
|
return res === "OK";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Release a distributed lock
|
||||||
|
*/
|
||||||
|
async releaseLock(key: string): Promise<void> {
|
||||||
|
await this.client.del(`lock:${key}`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -13,7 +13,7 @@ class TestJwt extends PassportStrategy(Strategy) {
|
|||||||
const selected = { enabled:true, provider:'configured-1234567890abcdef', model:'real-model', label:'پشتیبان تست', icon:'paw' };
|
const selected = { enabled:true, provider:'configured-1234567890abcdef', model:'real-model', label:'پشتیبان تست', icon:'paw' };
|
||||||
describe('smart chat settings', () => {
|
describe('smart chat settings', () => {
|
||||||
let stored:any = null;
|
let stored:any = null;
|
||||||
const prisma:any = { setting:{ findUnique:jest.fn(async()=>stored), upsert:jest.fn(async(q:any)=>{stored={value:q.create.value};return stored;}) }, product:{findMany:jest.fn(async()=>[])}, user:{findUnique:jest.fn()}, order:{findMany:jest.fn()} };
|
const prisma:any = { setting:{ findUnique:jest.fn(async()=>stored), upsert:jest.fn(async(q:any)=>{stored={value:q.create.value};return stored;}) }, product:{findMany:jest.fn(async()=>[])}, user:{findUnique:jest.fn()}, order:{findMany:jest.fn()}, supportConversation:{create:jest.fn(async(q:any)=>({id:q.data.id,messages:[]})),findUnique:jest.fn(async()=>null),update:jest.fn(async()=>({}))}, supportConversationMessage:{createMany:jest.fn(async()=>({count:2}))} };
|
||||||
let service:SupportChatSettingsService;
|
let service:SupportChatSettingsService;
|
||||||
beforeEach(()=>{stored=null;jest.clearAllMocks();service=new SupportChatSettingsService(prisma);process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='key';});
|
beforeEach(()=>{stored=null;jest.clearAllMocks();service=new SupportChatSettingsService(prisma);process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='key';});
|
||||||
afterEach(()=>jest.restoreAllMocks());
|
afterEach(()=>jest.restoreAllMocks());
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ describe('model intent routing', () => {
|
|||||||
let service: SupportChatService;
|
let service: SupportChatService;
|
||||||
beforeEach(()=>{jest.clearAllMocks();process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='test';service=new SupportChatService(prisma, { read: async () => ({ enabled: true, provider: 'p', model: 'm' }) } as any);});
|
beforeEach(()=>{jest.clearAllMocks();process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='test';service=new SupportChatService(prisma, { read: async () => ({ enabled: true, provider: 'p', model: 'm' }) } as any);});
|
||||||
afterEach(()=>jest.restoreAllMocks());
|
afterEach(()=>jest.restoreAllMocks());
|
||||||
function model(body:any) { return jest.spyOn(global,'fetch').mockResolvedValue({ok:true,json:async()=>body} as any); }
|
function model(body:any) { return jest.spyOn(global,'fetch').mockImplementation(async(url)=>({ok:true,json:async()=>String(url).endsWith('/classify')?body:(body.answer?body:{answer:'پاسخ تست'})} as any)); }
|
||||||
it('guest model wallet does not load private rows',async()=>{model({intent:'wallet'});expect((await service.ask({message:'cheghadr etebar daram'})).answer).toContain('وارد');expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();});
|
it('guest model wallet does not load private rows',async()=>{model({intent:'wallet'});expect((await service.ask({message:'cheghadr etebar daram'})).answer).toContain('وارد');expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();});
|
||||||
it('forwards only the authenticated user pet context',async()=>{const f=model({intent:'public'});prisma.pet={findMany:jest.fn().mockResolvedValue([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:[{condition:'حساسیت'}]}])};await service.ask({message:'جرم دندان RSL چیست؟'},{id:'alice'});const body=JSON.parse(f.mock.calls[0][1]!.body as string);expect(body.pet_context).toEqual([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:['حساسیت']}]);});
|
it('forwards only the authenticated user pet context',async()=>{const f=model({intent:'public'});prisma.pet={findMany:jest.fn().mockResolvedValue([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:[{condition:'حساسیت'}]}])};await service.ask({message:'جرم دندان RSL چیست؟'},{id:'alice'});const body=JSON.parse(f.mock.calls[0][1]!.body as string);expect(body.pet_context).toEqual([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:['حساسیت']}]);prisma.pet={findMany:jest.fn().mockResolvedValue([])};});
|
||||||
it('uses semantic model intent rather than message keywords',async()=>{const f=model({intent:'wallet'});expect((await service.ask({message:'چقدر اعتبار دارم؟'},{id:'alice'})).answer).toContain('17');expect(prisma.user.findUnique).toHaveBeenCalledWith({where:{id:'alice'},select:{walletBalance:true}});expect(JSON.parse(f.mock.calls[0][1]!.body as string)).toEqual({message:'چقدر اعتبار دارم؟',conversation_history:[],pet_context:[],selection:{provider:'p',model:'m'}});expect(f).toHaveBeenCalledTimes(1);});
|
it('uses semantic model intent rather than message keywords',async()=>{const f=model({intent:'wallet'});expect((await service.ask({message:'چقدر اعتبار دارم؟'},{id:'alice'})).answer).toContain('17');expect(prisma.user.findUnique).toHaveBeenCalledWith({where:{id:'alice'},select:{walletBalance:true}});expect(JSON.parse(f.mock.calls[0][1]!.body as string)).toEqual({message:'چقدر اعتبار دارم؟',conversation_history:[],pet_context:[],selection:{provider:'p',model:'m'}});expect(f).toHaveBeenCalledTimes(1);});
|
||||||
it.each([{intent:'admin'},{intent:'wallet',userId:'bob'},{answer:'orders'},{intent:null},{}])('fails closed on invalid classifier %j',async body=>{model(body);await expect(service.ask({message:'سلام'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();expect(prisma.product.findMany).not.toHaveBeenCalled();});
|
it.each([{intent:'admin'},{intent:'wallet',userId:'bob'},{answer:'orders'},{intent:null},{}])('fails closed on invalid classifier %j',async body=>{model(body);await expect(service.ask({message:'سلام'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();expect(prisma.product.findMany).not.toHaveBeenCalled();});
|
||||||
it('classifier outage does not fall back to keyword routing',async()=>{jest.spyOn(global,'fetch').mockRejectedValue(new Error('secret'));await expect(service.ask({message:'کیف پول'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();});
|
it('classifier outage does not fall back to keyword routing',async()=>{jest.spyOn(global,'fetch').mockRejectedValue(new Error('secret'));await expect(service.ask({message:'کیف پول'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();});
|
||||||
|
|||||||
+5
-23
@@ -1,3 +1,5 @@
|
|||||||
|
version: '3.8'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
db_stage:
|
db_stage:
|
||||||
image: postgres:16-alpine
|
image: postgres:16-alpine
|
||||||
@@ -23,36 +25,22 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: ./backend
|
context: ./backend
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
args:
|
|
||||||
NPM_REGISTRY: ${NPM_REGISTRY:-}
|
|
||||||
container_name: canino_backend_stage
|
container_name: canino_backend_stage
|
||||||
restart: always
|
restart: always
|
||||||
env_file:
|
|
||||||
- path: .support-chat.env
|
|
||||||
required: false
|
|
||||||
- path: .revalidation.env
|
|
||||||
required: false
|
|
||||||
dns:
|
|
||||||
- 217.218.127.127
|
|
||||||
- 217.218.155.155
|
|
||||||
environment:
|
environment:
|
||||||
- DATABASE_URL=postgresql://canino_stage:caninopassword_stage@db_stage:5432/caninodb_stage?schema=public
|
- DATABASE_URL=postgresql://canino_stage:caninopassword_stage@db_stage:5432/caninodb_stage?schema=public
|
||||||
- SUPPORT_CHAT_URL=http://canina-bot:8643/support/ask
|
|
||||||
- REDIS_HOST=redis_stage
|
- REDIS_HOST=redis_stage
|
||||||
- REDIS_PORT=6379
|
- REDIS_PORT=6379
|
||||||
- PORT=3000
|
- PORT=3000
|
||||||
- FRONTEND_URL=https://stage.canina.ir
|
- ADMIN_PASSWORD=Z6nYnJRG_sg3pnz2J9wZ7dLsPj61cd5k
|
||||||
- ENABLE_SWAGGER=false
|
|
||||||
# Code-only stage startup: schema/seed changes require separate authorization.
|
|
||||||
command: ["node", "dist/main.js"]
|
|
||||||
volumes:
|
volumes:
|
||||||
- canina_stage_uploads:/app/uploads
|
- canina_stage_uploads:/app/uploads
|
||||||
- /opt/services/proxy/certs/canina:/app/ssl_certs
|
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.canina-api-stage.rule=Host(`stageapi.canina.ir`)"
|
- "traefik.http.routers.canina-api-stage.rule=Host(`stageapi.canina.ir`)"
|
||||||
- "traefik.http.routers.canina-api-stage.entrypoints=websecure"
|
- "traefik.http.routers.canina-api-stage.entrypoints=websecure"
|
||||||
- "traefik.http.routers.canina-api-stage.tls=true"
|
- "traefik.http.routers.canina-api-stage.tls=true"
|
||||||
|
- "traefik.http.routers.canina-api-stage.tls.certresolver=arvan"
|
||||||
- "traefik.http.services.canina-api-stage.loadbalancer.server.port=3000"
|
- "traefik.http.services.canina-api-stage.loadbalancer.server.port=3000"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db_stage
|
- db_stage
|
||||||
@@ -65,22 +53,16 @@ services:
|
|||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
args:
|
args:
|
||||||
NPM_REGISTRY: ${NPM_REGISTRY:-}
|
|
||||||
NEXT_PUBLIC_API_URL: "https://stageapi.canina.ir/api"
|
NEXT_PUBLIC_API_URL: "https://stageapi.canina.ir/api"
|
||||||
VITE_API_URL: "https://stageapi.canina.ir"
|
VITE_API_URL: "https://stageapi.canina.ir"
|
||||||
container_name: canino_frontend_stage
|
container_name: canino_frontend_stage
|
||||||
restart: always
|
restart: always
|
||||||
env_file:
|
|
||||||
- path: .revalidation.env
|
|
||||||
required: false
|
|
||||||
dns:
|
|
||||||
- 217.218.127.127
|
|
||||||
- 217.218.155.155
|
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.canina-stage.rule=Host(`stage.canina.ir`) || Host(`stageadmin.canina.ir`)"
|
- "traefik.http.routers.canina-stage.rule=Host(`stage.canina.ir`) || Host(`stageadmin.canina.ir`)"
|
||||||
- "traefik.http.routers.canina-stage.entrypoints=websecure"
|
- "traefik.http.routers.canina-stage.entrypoints=websecure"
|
||||||
- "traefik.http.routers.canina-stage.tls=true"
|
- "traefik.http.routers.canina-stage.tls=true"
|
||||||
|
- "traefik.http.routers.canina-stage.tls.certresolver=arvan"
|
||||||
- "traefik.http.routers.canina-stage.middlewares=staging-robots-headers"
|
- "traefik.http.routers.canina-stage.middlewares=staging-robots-headers"
|
||||||
- "traefik.http.middlewares.staging-robots-headers.headers.customresponseheaders.X-Robots-Tag=noindex, nofollow, nosnippet, noarchive"
|
- "traefik.http.middlewares.staging-robots-headers.headers.customresponseheaders.X-Robots-Tag=noindex, nofollow, nosnippet, noarchive"
|
||||||
- "traefik.http.services.canina-stage.loadbalancer.server.port=8080"
|
- "traefik.http.services.canina-stage.loadbalancer.server.port=8080"
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
# Canina UX Modernization — Task Register
|
||||||
|
|
||||||
|
Source: live Chromium audits, source audit at `bec76393b`, and QA/SEO/content reviews.
|
||||||
|
Status model: TODO -> IN_PROGRESS -> TEST -> DONE. Estimates are engineering hours, not elapsed calendar time.
|
||||||
|
|
||||||
|
| ID | Owner departments | Pri | Estimate | Dependencies | Acceptance summary | Status |
|
||||||
|
|---|---|---:|---:|---|---|---|
|
||||||
|
| UX-PMO-001 | PMO | P0 | 4h | audits | Register, owners, dependencies, release gates and evidence contract are versioned | DONE |
|
||||||
|
| UX-DEV-001 | Dev + QA | P0 | 12h | none | `/login` and `/cart` are real routes, no 404, mobile/desktop smoke tests pass | IN_PROGRESS |
|
||||||
|
| UX-CAT-001 | Dev + UX + QA | P0 | 24h | UX-DEV-001 | Shop has deterministic SSR/client data states: success/loading/empty/error/retry | TODO |
|
||||||
|
| UX-CAT-002 | Dev + Product + QA | P0 | 24h | UX-CAT-001 | Catalog uses typed pagination/query URL state; no limit-999 hydration | TODO |
|
||||||
|
| UX-DATA-001 | Dev + DevOps | P0 | 20h | UX-CAT-001 | API errors are typed/actionable; cache tags and invalidation are verified | TODO |
|
||||||
|
| UX-A11Y-001 | UX + Dev + QA | P0 | 16h | UX-DEV-001 | Forms/buttons/overlays have names, labels, focus return and keyboard operation | TODO |
|
||||||
|
| UX-RESP-001 | UX + Dev + QA | P1 | 20h | UX-CAT-001 | 360/390/768/1024/1440 layouts have no unintended overflow and 44px targets | TODO |
|
||||||
|
| UX-PDP-001 | Product + UX + Dev + QA | P1 | 20h | UX-CAT-001 | PDP has one H1 and above-fold image/name/price/stock/CTA at all viewports | TODO |
|
||||||
|
| UX-CHECKOUT-001 | Payments + Dev + QA | P1 | 20h | UX-A11Y-001 | Checkout fields have labels/autocomplete/inputmode and announced errors | TODO |
|
||||||
|
| UX-NAV-001 | UX + Product + Dev | P1 | 16h | UX-RESP-001 | Mobile/desktop navigation is canonical, active state and cart state are consistent | TODO |
|
||||||
|
| UX-SEARCH-001 | Product + UX + SEO + Dev | P1 | 16h | UX-CAT-002 | Search landmark, Persian normalization, result count and actionable no-results state | TODO |
|
||||||
|
| UX-CONTENT-001 | Content + UX | P1 | 12h | UX-NAV-001 | Persian CTA/glossary unified across shop, wiki, auth, cart and footer | TODO |
|
||||||
|
| UX-CONTACT-001 | Support + Dev + Product | P1 | 4h | settings readback | No empty `tel:`/`mailto:` targets; official values verified live | TODO |
|
||||||
|
| UX-SEO-001 | SEO + Dev + QA | P1 | 16h | UX-CAT-002 | Category URLs, canonical/H1/meta and sitemap parity are tested | TODO |
|
||||||
|
| UX-SEO-002 | SEO + Dev + Content | P1 | 12h | UX-SEO-001 | Product 404 is real 404; Product/Offer/Breadcrumb JSON-LD matches facts | TODO |
|
||||||
|
| UX-MEDIA-001 | Content + SEO + Dev | P2 | 12h | UX-PDP-001 | Product/blog/feed images are valid, same-item, HTTPS and have useful alt text | TODO |
|
||||||
|
| UX-PERF-001 | Dev + DevOps + QA | P0 | 24h | UX-CAT-002, UX-RESP-001 | Mobile LCP/CLS/INP budgets, reduced-motion and image dimensions are verified | TODO |
|
||||||
|
| UX-ARCH-001 | Dev + UX | P1 | 24h | UX-CAT-001 | ArchivePage/global shell split into typed, independently testable feature modules | TODO |
|
||||||
|
| UX-STATE-001 | Dev + Commerce + QA | P0 | 24h | UX-DATA-001 | Cart price/stock/order state is backend-authoritative and persisted safely | TODO |
|
||||||
|
| UX-TEST-001 | Dev + QA | P0 | 16h | UX-DEV-001 | npm test/typecheck/lint scripts and coverage gates execute in clean checkout | TODO |
|
||||||
|
| UX-E2E-001 | QA + DevOps | P1 | 20h | UX-TEST-001, UX-RESP-001 | Chromium desktop/mobile smoke covers shop/PDP/cart/login/checkout/errors | TODO |
|
||||||
|
| UX-CI-001 | DevOps + Dev + QA | P0 | 20h | UX-TEST-001, UX-E2E-001 | CI gates lint/type/unit/build/E2E/perf and publishes evidence | TODO |
|
||||||
|
| UX-DEPLOY-001 | DevOps + QA | P1 | 24h | UX-CI-001 | Immutable SHA deployment, health checks, smoke gate and rollback are documented/tested | TODO |
|
||||||
|
| UX-CLAIMS-001 | R&D + Content + Compliance + human vet review | P1 | 32h | legal/vet access | 35 product/media medical claims have evidence/status and no unsupported claims publish | BLOCKED_EXTERNAL_REVIEW |
|
||||||
|
| UX-VERIFY-001 | PMO + QA + Analytics | P2 | 16h | all release tasks | Live release checklist, CWV/error/catalog/checkout telemetry and go/no-go evidence | TODO |
|
||||||
|
|
||||||
|
**Current program estimate:** 396 engineering/review hours; critical path is lower with parallel teams. External legal/human-veterinarian review, recruited user panel, GSC/GA4 access and payment sandbox are explicit blockers where applicable.
|
||||||
|
|
||||||
|
## Immediate execution order
|
||||||
|
|
||||||
|
1. UX-DEV-001 — restore login/cart routes (current)
|
||||||
|
2. UX-TEST-001 — make frontend test/typecheck gates executable
|
||||||
|
3. UX-A11Y-001 + UX-RESP-001 — fix shared interaction and responsive foundations
|
||||||
|
4. UX-CAT-001/002 + UX-DATA-001 — reliable catalog flow
|
||||||
|
5. UX-PDP-001 + UX-CHECKOUT-001 + UX-STATE-001 — conversion journey
|
||||||
|
6. SEO/content/media/performance/CI/deployment gates
|
||||||
|
7. Live verification and release decision
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
import {
|
import {
|
||||||
Activity,
|
Activity,
|
||||||
Bell,
|
|
||||||
CheckSquare,
|
CheckSquare,
|
||||||
BookOpen,
|
BookOpen,
|
||||||
Building2,
|
Building2,
|
||||||
@@ -110,7 +109,7 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
|
|||||||
items: [
|
items: [
|
||||||
{ icon: LayoutDashboard, label: 'نمای کلی داشبورد', path: '/' },
|
{ icon: LayoutDashboard, label: 'نمای کلی داشبورد', path: '/' },
|
||||||
{ icon: TrendingUp, label: 'گزارشات و تحلیل فروش', path: '/reports' },
|
{ icon: TrendingUp, label: 'گزارشات و تحلیل فروش', path: '/reports' },
|
||||||
{ icon: MessageSquare, label: 'پشتیبان هوشمند سایت', path: '/settings/smart-chat' },
|
{ icon: MessageSquare, label: 'تحلیل مشاوره سایت', path: '/settings/smart-chat' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -158,6 +157,7 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
|
|||||||
{ icon: Package, label: 'لیست محصولات', path: '/products' },
|
{ icon: Package, label: 'لیست محصولات', path: '/products' },
|
||||||
{ icon: Star, label: 'نظرات و امتیازات', path: '/reviews' },
|
{ icon: Star, label: 'نظرات و امتیازات', path: '/reviews' },
|
||||||
{ icon: FolderTree, label: 'دستهبندیهای تخصصی', path: '/categories' },
|
{ icon: FolderTree, label: 'دستهبندیهای تخصصی', path: '/categories' },
|
||||||
|
{ icon: Activity, label: 'علائم بالینی و درمانی', path: '/symptoms' },
|
||||||
{ icon: Tag, label: 'کدهای تخفیف', path: '/coupons' },
|
{ icon: Tag, label: 'کدهای تخفیف', path: '/coupons' },
|
||||||
{ icon: Sparkles, label: 'مشاور هوشمند بالینی', path: '/smart-advisor' },
|
{ icon: Sparkles, label: 'مشاور هوشمند بالینی', path: '/smart-advisor' },
|
||||||
{ icon: FileText, label: 'نسخههای دریافتی', path: '/prescriptions' },
|
{ icon: FileText, label: 'نسخههای دریافتی', path: '/prescriptions' },
|
||||||
@@ -171,7 +171,6 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
|
|||||||
{ icon: Users, label: 'مدیریت کاربران', path: '/users' },
|
{ icon: Users, label: 'مدیریت کاربران', path: '/users' },
|
||||||
{ icon: Heart, label: 'پرونده پتها (همدمها)', path: '/pets' },
|
{ icon: Heart, label: 'پرونده پتها (همدمها)', path: '/pets' },
|
||||||
{ icon: MessageSquare, label: 'تیکتها و مشاوره تخصصی', path: '/tickets' },
|
{ icon: MessageSquare, label: 'تیکتها و مشاوره تخصصی', path: '/tickets' },
|
||||||
{ icon: PhoneCall, label: 'مشاوران و لیدهای تماس', path: '/advisors' },
|
|
||||||
{ icon: Building2, label: 'پرتال B2B و همکاران', path: '/b2b' },
|
{ icon: Building2, label: 'پرتال B2B و همکاران', path: '/b2b' },
|
||||||
{ icon: PhoneCall, label: 'اطلاعات تماس و پیامها', path: '/contact' },
|
{ icon: PhoneCall, label: 'اطلاعات تماس و پیامها', path: '/contact' },
|
||||||
],
|
],
|
||||||
@@ -203,7 +202,6 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
|
|||||||
{ icon: CreditCard, label: 'روشهای پرداخت و زیبال', path: '/settings/payment-methods' },
|
{ icon: CreditCard, label: 'روشهای پرداخت و زیبال', path: '/settings/payment-methods' },
|
||||||
{ icon: Truck, label: 'تنظیمات ارسال و کرایه', path: '/settings/shipping' },
|
{ icon: Truck, label: 'تنظیمات ارسال و کرایه', path: '/settings/shipping' },
|
||||||
{ icon: DollarSign, label: 'تنظیمات مالی و مالیات', path: '/settings/financial' },
|
{ icon: DollarSign, label: 'تنظیمات مالی و مالیات', path: '/settings/financial' },
|
||||||
{ icon: Bell, label: 'مرکز اطلاعرسانی (ایمیل و صف)', path: '/settings/notifications' },
|
|
||||||
{ icon: MessageSquare, label: 'درگاه پیامک (MeliPayamak)', path: '/settings/sms' },
|
{ icon: MessageSquare, label: 'درگاه پیامک (MeliPayamak)', path: '/settings/sms' },
|
||||||
{ icon: ShieldCheck, label: 'گواهی SSL و امنیت', path: '/settings/ssl' },
|
{ icon: ShieldCheck, label: 'گواهی SSL و امنیت', path: '/settings/ssl' },
|
||||||
{ icon: Key, label: 'کلیدهای دسترسی (API Keys)', path: '/settings/api-keys' },
|
{ icon: Key, label: 'کلیدهای دسترسی (API Keys)', path: '/settings/api-keys' },
|
||||||
|
|||||||
@@ -1,512 +0,0 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
|
||||||
import {
|
|
||||||
Users,
|
|
||||||
UserPlus,
|
|
||||||
PhoneCall,
|
|
||||||
CheckCircle2,
|
|
||||||
Clock,
|
|
||||||
Trash2,
|
|
||||||
Edit2,
|
|
||||||
Star,
|
|
||||||
Search,
|
|
||||||
Package,
|
|
||||||
} from 'lucide-react';
|
|
||||||
import { toast } from 'react-hot-toast';
|
|
||||||
import Button from '../components/ui/Button';
|
|
||||||
import Spinner from '../components/ui/Spinner';
|
|
||||||
import Modal from '../components/ui/Modal';
|
|
||||||
import api from '../services/api';
|
|
||||||
|
|
||||||
interface Advisor {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
phone: string;
|
|
||||||
title?: string;
|
|
||||||
isDefault: boolean;
|
|
||||||
isActive: boolean;
|
|
||||||
productsCount: number;
|
|
||||||
leadsCount: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Lead {
|
|
||||||
id: string;
|
|
||||||
firstName: string;
|
|
||||||
lastName: string;
|
|
||||||
phone: string;
|
|
||||||
status: string;
|
|
||||||
notes?: string;
|
|
||||||
createdAt: string;
|
|
||||||
advisor?: { id: string; name: string; phone: string; title?: string };
|
|
||||||
product?: { id: string; nameFa: string; nameEn: string; slug: string };
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function AdvisorsManagementPage() {
|
|
||||||
const [activeTab, setActiveTab] = useState<'leads' | 'advisors'>('leads');
|
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
|
||||||
|
|
||||||
// Advisors State
|
|
||||||
const [advisors, setAdvisors] = useState<Advisor[]>([]);
|
|
||||||
const [isAdvisorModalOpen, setIsAdvisorModalOpen] = useState(false);
|
|
||||||
const [editingAdvisor, setEditingAdvisor] = useState<Advisor | null>(null);
|
|
||||||
const [advisorForm, setAdvisorForm] = useState({
|
|
||||||
name: '',
|
|
||||||
phone: '',
|
|
||||||
title: '',
|
|
||||||
isDefault: false,
|
|
||||||
isActive: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
// Leads State
|
|
||||||
const [leads, setLeads] = useState<Lead[]>([]);
|
|
||||||
const [leadStats, setLeadStats] = useState({ total: 0, pending: 0, contacted: 0, cancelled: 0 });
|
|
||||||
const [leadFilterStatus, setLeadFilterStatus] = useState<string>('ALL');
|
|
||||||
const [searchTerm, setSearchTerm] = useState('');
|
|
||||||
|
|
||||||
const loadAdvisors = async () => {
|
|
||||||
try {
|
|
||||||
const res = await api.get('/admin/advisors');
|
|
||||||
if (res.data?.success) {
|
|
||||||
setAdvisors(res.data.data);
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
toast.error('خطا در دریافت لیست مشاوران');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const loadLeads = async () => {
|
|
||||||
try {
|
|
||||||
setIsLoading(true);
|
|
||||||
const res = await api.get(`/admin/leads?status=${leadFilterStatus}&search=${encodeURIComponent(searchTerm)}`);
|
|
||||||
if (res.data?.success) {
|
|
||||||
setLeads(res.data.data.items);
|
|
||||||
if (res.data.data.stats) setLeadStats(res.data.data.stats);
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
toast.error('خطا در دریافت لیست درخواستهای تماس');
|
|
||||||
} finally {
|
|
||||||
setIsLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
loadAdvisors();
|
|
||||||
loadLeads();
|
|
||||||
}, [leadFilterStatus]);
|
|
||||||
|
|
||||||
const handleSearch = (e: React.FormEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
loadLeads();
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleSaveAdvisor = async (e: React.FormEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
if (!advisorForm.name.trim() || !advisorForm.phone.trim()) {
|
|
||||||
toast.error('نام و شماره موبایل الزامی است.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (editingAdvisor) {
|
|
||||||
await api.put(`/admin/advisors/${editingAdvisor.id}`, advisorForm);
|
|
||||||
toast.success('مشاور با موفقیت ویرایش شد.');
|
|
||||||
} else {
|
|
||||||
await api.post('/admin/advisors', advisorForm);
|
|
||||||
toast.success('مشاور جدید افزوده شد.');
|
|
||||||
}
|
|
||||||
setIsAdvisorModalOpen(false);
|
|
||||||
setEditingAdvisor(null);
|
|
||||||
setAdvisorForm({ name: '', phone: '', title: '', isDefault: false, isActive: true });
|
|
||||||
loadAdvisors();
|
|
||||||
} catch (err: any) {
|
|
||||||
toast.error(err?.response?.data?.message || 'خطا در ثبت مشاور');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleSetDefaultAdvisor = async (id: string) => {
|
|
||||||
try {
|
|
||||||
await api.patch(`/admin/advisors/${id}/set-default`);
|
|
||||||
toast.success('مشاور به عنوان پیشفرض تعیین شد.');
|
|
||||||
loadAdvisors();
|
|
||||||
} catch (err: any) {
|
|
||||||
toast.error('خطا در تغییر مشاور پیشفرض');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleDeleteAdvisor = async (id: string) => {
|
|
||||||
if (!window.confirm('آیا از حذف این مشاور اطمینان دارید؟')) return;
|
|
||||||
try {
|
|
||||||
await api.delete(`/admin/advisors/${id}`);
|
|
||||||
toast.success('مشاور حذف شد.');
|
|
||||||
loadAdvisors();
|
|
||||||
} catch (err: any) {
|
|
||||||
toast.error('خطا در حذف مشاور');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleUpdateLeadStatus = async (id: string, status: string) => {
|
|
||||||
try {
|
|
||||||
await api.patch(`/admin/leads/${id}/status`, { status });
|
|
||||||
toast.success('وضعیت درخواست تماس بهروز شد.');
|
|
||||||
loadLeads();
|
|
||||||
} catch (err: any) {
|
|
||||||
toast.error('خطا در بهروزرسانی وضعیت');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="space-y-6 pb-12 font-vazir text-gray-800">
|
|
||||||
{/* Header */}
|
|
||||||
<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
|
|
||||||
<div>
|
|
||||||
<h1 className="flex items-center gap-2.5 text-2xl font-black text-gray-900">
|
|
||||||
<PhoneCall className="h-7 w-7 text-purple-600" />
|
|
||||||
درخواستهای تماس و مشاوران کاتالوگ
|
|
||||||
</h1>
|
|
||||||
<p className="mt-1 text-sm text-gray-500">
|
|
||||||
مدیریت لیدهای تماس وبسایت، انتساب مشاوران پیشفرض و اختصاصی محصولات
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center gap-3">
|
|
||||||
<Button onClick={() => {
|
|
||||||
setEditingAdvisor(null);
|
|
||||||
setAdvisorForm({ name: '', phone: '', title: '', isDefault: false, isActive: true });
|
|
||||||
setIsAdvisorModalOpen(true);
|
|
||||||
}}>
|
|
||||||
<UserPlus className="h-4 w-4" />
|
|
||||||
افزودن مشاور جدید
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Tabs */}
|
|
||||||
<div className="flex border-b border-gray-200 bg-white px-4 rounded-xl shadow-sm">
|
|
||||||
<button
|
|
||||||
onClick={() => setActiveTab('leads')}
|
|
||||||
className={`flex items-center gap-2 py-4 px-4 font-bold text-sm border-b-2 transition-all ${
|
|
||||||
activeTab === 'leads'
|
|
||||||
? 'border-purple-600 text-purple-600'
|
|
||||||
: 'border-transparent text-gray-500 hover:text-gray-800'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<PhoneCall className="h-4 w-4" />
|
|
||||||
درخواستهای تماس کاربران (Leads)
|
|
||||||
{leadStats.pending > 0 && (
|
|
||||||
<span className="rounded-full bg-amber-100 px-2 py-0.5 text-xs text-amber-700 font-bold">
|
|
||||||
{leadStats.pending} نیازمند تماس
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => setActiveTab('advisors')}
|
|
||||||
className={`flex items-center gap-2 py-4 px-4 font-bold text-sm border-b-2 transition-all ${
|
|
||||||
activeTab === 'advisors'
|
|
||||||
? 'border-purple-600 text-purple-600'
|
|
||||||
: 'border-transparent text-gray-500 hover:text-gray-800'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<Users className="h-4 w-4" />
|
|
||||||
لیست مشاوران تخصصی
|
|
||||||
<span className="rounded-full bg-gray-100 px-2 py-0.5 text-xs text-gray-600 font-bold">
|
|
||||||
{advisors.length}
|
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Tab: Leads */}
|
|
||||||
{activeTab === 'leads' && (
|
|
||||||
<div className="space-y-6">
|
|
||||||
<div className="grid grid-cols-1 gap-4 sm:grid-cols-4">
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-5 shadow-sm">
|
|
||||||
<span className="text-xs font-bold text-gray-400">مجموع درخواستها</span>
|
|
||||||
<p className="mt-2 text-2xl font-black text-gray-900">{leadStats.total}</p>
|
|
||||||
</div>
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-5 shadow-sm">
|
|
||||||
<span className="text-xs font-bold text-amber-500">در انتظار تماس</span>
|
|
||||||
<p className="mt-2 text-2xl font-black text-amber-600">{leadStats.pending}</p>
|
|
||||||
</div>
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-5 shadow-sm">
|
|
||||||
<span className="text-xs font-bold text-emerald-500">تماس گرفته شده</span>
|
|
||||||
<p className="mt-2 text-2xl font-black text-emerald-600">{leadStats.contacted}</p>
|
|
||||||
</div>
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-5 shadow-sm">
|
|
||||||
<span className="text-xs font-bold text-gray-400">لغو شده / ناموفق</span>
|
|
||||||
<p className="mt-2 text-2xl font-black text-gray-600">{leadStats.cancelled}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-6 shadow-sm">
|
|
||||||
<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between mb-4">
|
|
||||||
<form onSubmit={handleSearch} className="flex gap-2 w-full sm:w-80">
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
placeholder="جستجو با نام یا شماره..."
|
|
||||||
value={searchTerm}
|
|
||||||
onChange={(e) => setSearchTerm(e.target.value)}
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2 text-sm focus:border-purple-600 focus:outline-none"
|
|
||||||
/>
|
|
||||||
<Button type="submit" variant="outline" size="sm">
|
|
||||||
<Search className="h-4 w-4" />
|
|
||||||
</Button>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<div className="flex gap-2">
|
|
||||||
{['ALL', 'PENDING', 'CONTACTED', 'CANCELLED'].map((st) => (
|
|
||||||
<button
|
|
||||||
key={st}
|
|
||||||
onClick={() => setLeadFilterStatus(st)}
|
|
||||||
className={`rounded-lg px-3 py-1.5 text-xs font-bold transition-all ${
|
|
||||||
leadFilterStatus === st
|
|
||||||
? 'bg-purple-600 text-white'
|
|
||||||
: 'bg-gray-100 text-gray-600 hover:bg-gray-200'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
{st === 'ALL' ? 'همه' : st === 'PENDING' ? 'در انتظار' : st === 'CONTACTED' ? 'تماس گرفته شده' : 'لغو'}
|
|
||||||
</button>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="overflow-x-auto">
|
|
||||||
<table className="w-full text-right text-sm">
|
|
||||||
<thead className="bg-gray-50 text-xs font-bold text-gray-500 uppercase">
|
|
||||||
<tr>
|
|
||||||
<th className="py-3 px-4">کاربر متقاضی</th>
|
|
||||||
<th className="py-3 px-4">شماره تماس</th>
|
|
||||||
<th className="py-3 px-4">محصول مرتبط</th>
|
|
||||||
<th className="py-3 px-4">مشاور منتسب</th>
|
|
||||||
<th className="py-3 px-4">زمان ثبت</th>
|
|
||||||
<th className="py-3 px-4">وضعیت</th>
|
|
||||||
<th className="py-3 px-4">عملیات</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody className="divide-y divide-gray-100">
|
|
||||||
{leads.length === 0 ? (
|
|
||||||
<tr>
|
|
||||||
<td colSpan={7} className="py-8 text-center text-gray-400">
|
|
||||||
هیچ درخواست تماسی یافت نشد.
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
) : (
|
|
||||||
leads.map((l) => (
|
|
||||||
<tr key={l.id} className="hover:bg-gray-50/50">
|
|
||||||
<td className="py-3.5 px-4 font-bold text-gray-900">
|
|
||||||
{l.firstName} {l.lastName}
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4 font-mono font-medium text-purple-700 dir-ltr text-right">
|
|
||||||
<a href={`tel:${l.phone}`} className="hover:underline">
|
|
||||||
{l.phone}
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4 text-xs text-gray-600">
|
|
||||||
{l.product ? l.product.nameFa : <span className="text-gray-400">مشاوره عمومی</span>}
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4 text-xs font-medium text-gray-700">
|
|
||||||
{l.advisor ? `${l.advisor.name} (${l.advisor.phone})` : <span className="text-gray-400">پیشفرض</span>}
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4 text-xs text-gray-400">
|
|
||||||
{new Date(l.createdAt).toLocaleDateString('fa-IR')} - {new Date(l.createdAt).toLocaleTimeString('fa-IR', { hour: '2-digit', minute: '2-digit' })}
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4">
|
|
||||||
<span className={`inline-flex rounded-full px-2.5 py-0.5 text-xs font-bold ${
|
|
||||||
l.status === 'CONTACTED'
|
|
||||||
? 'bg-emerald-50 text-emerald-700'
|
|
||||||
: l.status === 'CANCELLED'
|
|
||||||
? 'bg-gray-100 text-gray-600'
|
|
||||||
: 'bg-amber-50 text-amber-700'
|
|
||||||
}`}>
|
|
||||||
{l.status === 'CONTACTED' ? 'تماس گرفته شد' : l.status === 'CANCELLED' ? 'لغو شده' : 'در انتظار تماس'}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4">
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
{l.status !== 'CONTACTED' && (
|
|
||||||
<button
|
|
||||||
onClick={() => handleUpdateLeadStatus(l.id, 'CONTACTED')}
|
|
||||||
title="ثبت به عنوان تماس گرفته شده"
|
|
||||||
className="rounded p-1 text-emerald-600 hover:bg-emerald-50"
|
|
||||||
>
|
|
||||||
<CheckCircle2 className="h-4 w-4" />
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
{l.status !== 'CANCELLED' && (
|
|
||||||
<button
|
|
||||||
onClick={() => handleUpdateLeadStatus(l.id, 'CANCELLED')}
|
|
||||||
title="لغو درخواست"
|
|
||||||
className="rounded p-1 text-gray-400 hover:bg-gray-100"
|
|
||||||
>
|
|
||||||
<Trash2 className="h-4 w-4" />
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
))
|
|
||||||
)}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Tab: Advisors */}
|
|
||||||
{activeTab === 'advisors' && (
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-6 shadow-sm">
|
|
||||||
<div className="overflow-x-auto">
|
|
||||||
<table className="w-full text-right text-sm">
|
|
||||||
<thead className="bg-gray-50 text-xs font-bold text-gray-500 uppercase">
|
|
||||||
<tr>
|
|
||||||
<th className="py-3 px-4">نام مشاور</th>
|
|
||||||
<th className="py-3 px-4">شماره همراه</th>
|
|
||||||
<th className="py-3 px-4">عنوان / تخصص</th>
|
|
||||||
<th className="py-3 px-4">محصولات منتسب</th>
|
|
||||||
<th className="py-3 px-4">تعداد لیدها</th>
|
|
||||||
<th className="py-3 px-4">نقش</th>
|
|
||||||
<th className="py-3 px-4">وضعیت</th>
|
|
||||||
<th className="py-3 px-4">عملیات</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody className="divide-y divide-gray-100">
|
|
||||||
{advisors.map((adv) => (
|
|
||||||
<tr key={adv.id} className="hover:bg-gray-50/50">
|
|
||||||
<td className="py-3.5 px-4 font-bold text-gray-900">{adv.name}</td>
|
|
||||||
<td className="py-3.5 px-4 font-mono font-medium text-gray-700">{adv.phone}</td>
|
|
||||||
<td className="py-3.5 px-4 text-xs text-gray-500">{adv.title || '-'}</td>
|
|
||||||
<td className="py-3.5 px-4 text-xs font-bold text-purple-600">{adv.productsCount} محصول</td>
|
|
||||||
<td className="py-3.5 px-4 text-xs font-bold text-gray-700">{adv.leadsCount} درخواست</td>
|
|
||||||
<td className="py-3.5 px-4">
|
|
||||||
{adv.isDefault ? (
|
|
||||||
<span className="inline-flex items-center gap-1 rounded-full bg-amber-50 px-2.5 py-0.5 text-xs font-bold text-amber-700">
|
|
||||||
<Star className="h-3 w-3 fill-amber-500 text-amber-500" />
|
|
||||||
پیشفرض سیستم
|
|
||||||
</span>
|
|
||||||
) : (
|
|
||||||
<button
|
|
||||||
onClick={() => handleSetDefaultAdvisor(adv.id)}
|
|
||||||
className="text-xs text-gray-400 hover:text-purple-600 hover:underline"
|
|
||||||
>
|
|
||||||
تنظیم به عنوان پیشفرض
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4">
|
|
||||||
<span className={`inline-flex rounded-full px-2 py-0.5 text-xs font-bold ${
|
|
||||||
adv.isActive ? 'bg-emerald-50 text-emerald-700' : 'bg-gray-100 text-gray-600'
|
|
||||||
}`}>
|
|
||||||
{adv.isActive ? 'فعال' : 'غیرفعال'}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4">
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<button
|
|
||||||
onClick={() => {
|
|
||||||
setEditingAdvisor(adv);
|
|
||||||
setAdvisorForm({
|
|
||||||
name: adv.name,
|
|
||||||
phone: adv.phone,
|
|
||||||
title: adv.title || '',
|
|
||||||
isDefault: adv.isDefault,
|
|
||||||
isActive: adv.isActive,
|
|
||||||
});
|
|
||||||
setIsAdvisorModalOpen(true);
|
|
||||||
}}
|
|
||||||
className="rounded p-1 text-gray-500 hover:bg-gray-100"
|
|
||||||
>
|
|
||||||
<Edit2 className="h-4 w-4" />
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => handleDeleteAdvisor(adv.id)}
|
|
||||||
className="rounded p-1 text-red-500 hover:bg-red-50"
|
|
||||||
>
|
|
||||||
<Trash2 className="h-4 w-4" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
))}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Modal: Advisor Create/Edit */}
|
|
||||||
<Modal
|
|
||||||
isOpen={isAdvisorModalOpen}
|
|
||||||
onClose={() => setIsAdvisorModalOpen(false)}
|
|
||||||
title={editingAdvisor ? 'ویرایش مشاور' : 'افزودن مشاور جدید'}
|
|
||||||
>
|
|
||||||
<form onSubmit={handleSaveAdvisor} className="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1">نام و نام خانوادگی مشاور</label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={advisorForm.name}
|
|
||||||
onChange={(e) => setAdvisorForm({ ...advisorForm, name: e.target.value })}
|
|
||||||
placeholder="مثال: دکتر مهدی صابری"
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2 text-sm focus:border-purple-600 focus:outline-none"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1">شماره تلفن همراه</label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
dir="ltr"
|
|
||||||
value={advisorForm.phone}
|
|
||||||
onChange={(e) => setAdvisorForm({ ...advisorForm, phone: e.target.value })}
|
|
||||||
placeholder="09121234567"
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2 text-sm font-mono focus:border-purple-600 focus:outline-none"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1">عنوان تخصصی یا سمت</label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={advisorForm.title}
|
|
||||||
onChange={(e) => setAdvisorForm({ ...advisorForm, title: e.target.value })}
|
|
||||||
placeholder="مثال: کارشناس تغذیه سگ و گربه"
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2 text-sm focus:border-purple-600 focus:outline-none"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex items-center gap-6 pt-2">
|
|
||||||
<label className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={advisorForm.isDefault}
|
|
||||||
onChange={(e) => setAdvisorForm({ ...advisorForm, isDefault: e.target.checked })}
|
|
||||||
className="h-4 w-4 rounded text-purple-600 focus:ring-purple-500"
|
|
||||||
/>
|
|
||||||
<span className="text-xs font-bold text-gray-700">مشاور پیشفرض سیستم</span>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={advisorForm.isActive}
|
|
||||||
onChange={(e) => setAdvisorForm({ ...advisorForm, isActive: e.target.checked })}
|
|
||||||
className="h-4 w-4 rounded text-purple-600 focus:ring-purple-500"
|
|
||||||
/>
|
|
||||||
<span className="text-xs font-bold text-gray-700">مشاور فعال</span>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex justify-end gap-2 pt-4 border-t border-gray-100">
|
|
||||||
<Button variant="outline" type="button" onClick={() => setIsAdvisorModalOpen(false)}>
|
|
||||||
انصراف
|
|
||||||
</Button>
|
|
||||||
<Button type="submit">
|
|
||||||
ذخیره
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</Modal>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -214,20 +214,4 @@ describe('FAQManager Component', () => {
|
|||||||
expect(toast.success).toHaveBeenCalledWith('سوال حذف شد');
|
expect(toast.success).toHaveBeenCalledWith('سوال حذف شد');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('filters FAQs by search term', async () => {
|
|
||||||
vi.mocked(api.get).mockResolvedValueOnce({ data: mockFaqs });
|
|
||||||
render(<FAQManager />);
|
|
||||||
|
|
||||||
await waitFor(() => {
|
|
||||||
expect(screen.getByText('سوال اول تست')).toBeTruthy();
|
|
||||||
expect(screen.getByText('سوال دوم تست')).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
const searchInput = screen.getByPlaceholderText('جستجو در متن سوال یا پاسخ متداول...');
|
|
||||||
fireEvent.change(searchInput, { target: { value: 'سوال اول' } });
|
|
||||||
|
|
||||||
expect(screen.getByText('سوال اول تست')).toBeTruthy();
|
|
||||||
expect(screen.queryByText('سوال دوم تست')).toBeNull();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Edit2,HelpCircle,Plus,ToggleLeft,ToggleRight,Trash2,Search } from 'lucide-react';
|
import { Edit2,HelpCircle,Plus,ToggleLeft,ToggleRight,Trash2 } from 'lucide-react';
|
||||||
import { useCallback,useEffect,useState } from 'react';
|
import { useCallback,useEffect,useState } from 'react';
|
||||||
import { toast } from 'react-hot-toast';
|
import { toast } from 'react-hot-toast';
|
||||||
import Button from '../components/ui/Button';
|
import Button from '../components/ui/Button';
|
||||||
@@ -20,7 +20,6 @@ interface FAQ {
|
|||||||
|
|
||||||
export default function FAQManager() {
|
export default function FAQManager() {
|
||||||
const [faqs, setFaqs] = useState<FAQ[]>([]);
|
const [faqs, setFaqs] = useState<FAQ[]>([]);
|
||||||
const [searchTerm, setSearchTerm] = useState('');
|
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
const [isLoading, setIsLoading] = useState(true);
|
||||||
const [isModalOpen, setIsModalOpen] = useState(false);
|
const [isModalOpen, setIsModalOpen] = useState(false);
|
||||||
const [editingFaq, setEditingFaq] = useState<FAQ | null>(null);
|
const [editingFaq, setEditingFaq] = useState<FAQ | null>(null);
|
||||||
@@ -121,13 +120,6 @@ export default function FAQManager() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const filteredFaqs = faqs.filter(
|
|
||||||
(f) =>
|
|
||||||
!searchTerm.trim() ||
|
|
||||||
f.question.toLowerCase().includes(searchTerm.toLowerCase()) ||
|
|
||||||
f.answer.toLowerCase().includes(searchTerm.toLowerCase())
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
<div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
|
<div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
|
||||||
@@ -150,45 +142,30 @@ export default function FAQManager() {
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Info Box & Search Filter */}
|
{/* Info Box */}
|
||||||
<div className="bg-orange-50 border border-orange-200 rounded-xl p-4 text-sm text-orange-800">
|
<div className="bg-orange-50 border border-orange-200 rounded-xl p-4 text-sm text-orange-800">
|
||||||
<strong>💡 نکته SEO:</strong> سوالات فعال به صورت خودکار با markup <code className="bg-orange-100 px-1 rounded">FAQPage</code> در صفحه اصلی نمایش داده میشوند و در نتایج گوگل به عنوان Rich Snippet ظاهر میشوند.
|
<strong>💡 نکته SEO:</strong> سوالات فعال به صورت خودکار با markup <code className="bg-orange-100 px-1 rounded">FAQPage</code> در صفحه اصلی نمایش داده میشوند و در نتایج گوگل به عنوان Rich Snippet ظاهر میشوند.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="relative">
|
|
||||||
<Search className="w-5 h-5 text-gray-400 absolute right-3.5 top-3 pointer-events-none" />
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
placeholder="جستجو در متن سوال یا پاسخ متداول..."
|
|
||||||
value={searchTerm}
|
|
||||||
onChange={(e) => setSearchTerm(e.target.value)}
|
|
||||||
className="w-full pl-4 pr-11 py-2.5 bg-white border border-gray-200 rounded-xl text-sm focus:border-orange-500 focus:outline-none"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* List */}
|
{/* List */}
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
{isLoading ? (
|
{isLoading ? (
|
||||||
<div className="flex justify-center py-12">
|
<div className="flex justify-center py-12">
|
||||||
<Spinner size="lg" className="text-purple-600" />
|
<Spinner size="lg" className="text-purple-600" />
|
||||||
</div>
|
</div>
|
||||||
) : filteredFaqs.length === 0 ? (
|
) : faqs.length === 0 ? (
|
||||||
<div className="bg-white rounded-2xl border border-gray-200 py-16 text-center">
|
<div className="bg-white rounded-2xl border border-gray-200 py-16 text-center">
|
||||||
<HelpCircle className="w-12 h-12 text-gray-300 mx-auto mb-3" />
|
<HelpCircle className="w-12 h-12 text-gray-300 mx-auto mb-3" />
|
||||||
<p className="text-gray-500 font-medium">
|
<p className="text-gray-500 font-medium">هیچ سوالی ثبت نشده است</p>
|
||||||
{searchTerm ? 'هیچ سوالی با این عبارت یافت نشد' : 'هیچ سوالی ثبت نشده است'}
|
|
||||||
</p>
|
|
||||||
{!searchTerm && (
|
|
||||||
<button
|
<button
|
||||||
onClick={() => openModal()}
|
onClick={() => openModal()}
|
||||||
className="mt-4 text-purple-600 font-bold hover:underline text-sm cursor-pointer"
|
className="mt-4 text-purple-600 font-bold hover:underline text-sm cursor-pointer"
|
||||||
>
|
>
|
||||||
اولین سوال را اضافه کنید
|
اولین سوال را اضافه کنید
|
||||||
</button>
|
</button>
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
filteredFaqs.map((faq) => (
|
faqs.map((faq) => (
|
||||||
<div
|
<div
|
||||||
key={faq.id}
|
key={faq.id}
|
||||||
className={`bg-white rounded-2xl border p-5 transition-all ${
|
className={`bg-white rounded-2xl border p-5 transition-all ${
|
||||||
|
|||||||
@@ -1,725 +0,0 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
|
||||||
import {
|
|
||||||
Bell,
|
|
||||||
Mail,
|
|
||||||
MessageSquare,
|
|
||||||
Server,
|
|
||||||
Send,
|
|
||||||
ListFilter,
|
|
||||||
RefreshCw,
|
|
||||||
CheckCircle2,
|
|
||||||
AlertCircle,
|
|
||||||
Clock,
|
|
||||||
ShieldCheck,
|
|
||||||
Plus,
|
|
||||||
Trash2,
|
|
||||||
ExternalLink,
|
|
||||||
} from 'lucide-react';
|
|
||||||
import { toast } from 'react-hot-toast';
|
|
||||||
import Button from '../components/ui/Button';
|
|
||||||
import Spinner from '../components/ui/Spinner';
|
|
||||||
import api from '../services/api';
|
|
||||||
|
|
||||||
interface EmailConfig {
|
|
||||||
enabled: boolean;
|
|
||||||
host: string;
|
|
||||||
port: number;
|
|
||||||
secure: boolean;
|
|
||||||
user: string;
|
|
||||||
password?: string;
|
|
||||||
fromName: string;
|
|
||||||
fromEmail: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface QueueItem {
|
|
||||||
id: string;
|
|
||||||
channel: 'SMS' | 'EMAIL';
|
|
||||||
recipient: string;
|
|
||||||
event: string;
|
|
||||||
subject?: string;
|
|
||||||
content: string;
|
|
||||||
status: 'QUEUED' | 'PROCESSING' | 'SENT' | 'FAILED';
|
|
||||||
attempts: number;
|
|
||||||
maxAttempts: number;
|
|
||||||
lastError?: string;
|
|
||||||
sentAt?: string;
|
|
||||||
createdAt: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface NotificationTemplate {
|
|
||||||
id: string;
|
|
||||||
channel: 'SMS' | 'EMAIL';
|
|
||||||
event: string;
|
|
||||||
name: string;
|
|
||||||
subject?: string;
|
|
||||||
body: string;
|
|
||||||
recipientType: string;
|
|
||||||
isActive: boolean;
|
|
||||||
variables: string[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function NotificationsSettingsPage() {
|
|
||||||
const [activeTab, setActiveTab] = useState<'overview' | 'email' | 'templates' | 'manual' | 'queue'>('overview');
|
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
|
||||||
|
|
||||||
// Email Config State
|
|
||||||
const [emailConfig, setEmailConfig] = useState<EmailConfig>({
|
|
||||||
enabled: true,
|
|
||||||
host: 'mail.parsaaghayi.ir',
|
|
||||||
port: 465,
|
|
||||||
secure: true,
|
|
||||||
user: '',
|
|
||||||
password: '',
|
|
||||||
fromName: 'کنینا ایران',
|
|
||||||
fromEmail: 'info@canina.ir',
|
|
||||||
});
|
|
||||||
const [isSavingEmail, setIsSavingEmail] = useState(false);
|
|
||||||
const [isTestingSmtp, setIsTestingSmtp] = useState(false);
|
|
||||||
const [smtpStatus, setSmtpStatus] = useState<{ checked: boolean; success: boolean; message: string } | null>(null);
|
|
||||||
|
|
||||||
// Queue state
|
|
||||||
const [queueItems, setQueueItems] = useState<QueueItem[]>([]);
|
|
||||||
const [queueStats, setQueueStats] = useState({ total: 0, queued: 0, sent: 0, failed: 0, successRate: 100 });
|
|
||||||
const [isLoadingQueue, setIsLoadingQueue] = useState(false);
|
|
||||||
|
|
||||||
// Templates state
|
|
||||||
const [templates, setTemplates] = useState<NotificationTemplate[]>([]);
|
|
||||||
const [eventsList, setEventsList] = useState<{ event: string; name: string; variables: string[] }[]>([]);
|
|
||||||
|
|
||||||
// Manual Send State
|
|
||||||
const [manualForm, setManualForm] = useState({
|
|
||||||
channel: 'SMS' as 'SMS' | 'EMAIL',
|
|
||||||
targetType: 'single' as 'single' | 'all_users' | 'custom_list',
|
|
||||||
recipient: '',
|
|
||||||
subject: '',
|
|
||||||
content: '',
|
|
||||||
});
|
|
||||||
const [isSendingManual, setIsSendingManual] = useState(false);
|
|
||||||
|
|
||||||
// Load Initial Config
|
|
||||||
const loadConfig = async () => {
|
|
||||||
try {
|
|
||||||
setIsLoading(true);
|
|
||||||
const res = await api.get('/admin/notifications/config');
|
|
||||||
if (res.data?.success) {
|
|
||||||
setEmailConfig(res.data.data.email);
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
toast.error('خطا در دریافت تنظیمات اطلاعرسانی');
|
|
||||||
} finally {
|
|
||||||
setIsLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const loadQueue = async () => {
|
|
||||||
try {
|
|
||||||
setIsLoadingQueue(true);
|
|
||||||
const res = await api.get('/admin/notifications/queue?limit=50');
|
|
||||||
if (res.data?.success) {
|
|
||||||
setQueueItems(res.data.data.items);
|
|
||||||
if (res.data.data.stats) setQueueStats(res.data.data.stats);
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
} finally {
|
|
||||||
setIsLoadingQueue(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const loadTemplates = async () => {
|
|
||||||
try {
|
|
||||||
const res = await api.get('/admin/notifications/templates');
|
|
||||||
if (res.data?.success) {
|
|
||||||
setTemplates(res.data.data.templates);
|
|
||||||
setEventsList(res.data.data.events || []);
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
loadConfig();
|
|
||||||
loadQueue();
|
|
||||||
loadTemplates();
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const handleSaveEmail = async (e: React.FormEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
try {
|
|
||||||
setIsSavingEmail(true);
|
|
||||||
const res = await api.put('/admin/notifications/email-config', emailConfig);
|
|
||||||
if (res.data?.success) {
|
|
||||||
toast.success(res.data.message || 'تنظیمات سرور ایمیل ذخیره شد.');
|
|
||||||
}
|
|
||||||
} catch (err: any) {
|
|
||||||
toast.error(err?.response?.data?.message || 'خطا در ذخیره تنظیمات ایمیل');
|
|
||||||
} finally {
|
|
||||||
setIsSavingEmail(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleTestSmtp = async () => {
|
|
||||||
try {
|
|
||||||
setIsTestingSmtp(true);
|
|
||||||
setSmtpStatus(null);
|
|
||||||
const res = await api.post('/admin/notifications/test-smtp', emailConfig);
|
|
||||||
setSmtpStatus({
|
|
||||||
checked: true,
|
|
||||||
success: res.data?.success,
|
|
||||||
message: res.data?.message,
|
|
||||||
});
|
|
||||||
if (res.data?.success) {
|
|
||||||
toast.success('اتصال به سرور SMTP با موفقیت برقرار شد.');
|
|
||||||
} else {
|
|
||||||
toast.error(res.data?.message || 'خطا در اتصال به سرور SMTP');
|
|
||||||
}
|
|
||||||
} catch (err: any) {
|
|
||||||
const msg = err?.response?.data?.message || 'خطا در تست اتصال سرور';
|
|
||||||
setSmtpStatus({ checked: true, success: false, message: msg });
|
|
||||||
toast.error(msg);
|
|
||||||
} finally {
|
|
||||||
setIsTestingSmtp(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleManualSend = async (e: React.FormEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
if (!manualForm.content.trim()) {
|
|
||||||
toast.error('متن پیام الزامی است.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
setIsSendingManual(true);
|
|
||||||
const res = await api.post('/admin/notifications/manual-send', manualForm);
|
|
||||||
if (res.data?.success) {
|
|
||||||
toast.success(res.data.message || 'پیام با موفقیت در صف ارسال قرار گرفت.');
|
|
||||||
setManualForm({ ...manualForm, recipient: '', subject: '', content: '' });
|
|
||||||
loadQueue();
|
|
||||||
}
|
|
||||||
} catch (err: any) {
|
|
||||||
toast.error(err?.response?.data?.message || 'خطا در ثبت پیام در صف');
|
|
||||||
} finally {
|
|
||||||
setIsSendingManual(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleRetryQueue = async (id: string) => {
|
|
||||||
try {
|
|
||||||
const res = await api.post(`/admin/notifications/queue/${id}/retry`);
|
|
||||||
if (res.data?.success) {
|
|
||||||
toast.success('پیام مجدداً در صف قرار گرفت.');
|
|
||||||
loadQueue();
|
|
||||||
}
|
|
||||||
} catch (err: any) {
|
|
||||||
toast.error('خطا در ارسال مجدد');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if (isLoading) {
|
|
||||||
return (
|
|
||||||
<div className="flex h-96 items-center justify-center">
|
|
||||||
<Spinner size="lg" />
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="space-y-6 pb-12 font-vazir text-gray-800">
|
|
||||||
{/* Header */}
|
|
||||||
<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
|
|
||||||
<div>
|
|
||||||
<h1 className="flex items-center gap-2.5 text-2xl font-black text-gray-900">
|
|
||||||
<Bell className="h-7 w-7 text-purple-600" />
|
|
||||||
مرکز مدیریت اطلاعرسانی و پیامها
|
|
||||||
</h1>
|
|
||||||
<p className="mt-1 text-sm text-gray-500">
|
|
||||||
پیکربندی یکپارچه ایمیل (SMTP)، سامانه پیامک، صف ارسال پایدار و رویدادهای خودکار
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Tabs */}
|
|
||||||
<div className="flex border-b border-gray-200 bg-white px-4 rounded-xl shadow-sm">
|
|
||||||
<button
|
|
||||||
onClick={() => setActiveTab('overview')}
|
|
||||||
className={`flex items-center gap-2 py-4 px-4 font-bold text-sm border-b-2 transition-all ${
|
|
||||||
activeTab === 'overview'
|
|
||||||
? 'border-purple-600 text-purple-600'
|
|
||||||
: 'border-transparent text-gray-500 hover:text-gray-800'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<Server className="h-4 w-4" />
|
|
||||||
داشبورد و وضعیت
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => setActiveTab('email')}
|
|
||||||
className={`flex items-center gap-2 py-4 px-4 font-bold text-sm border-b-2 transition-all ${
|
|
||||||
activeTab === 'email'
|
|
||||||
? 'border-purple-600 text-purple-600'
|
|
||||||
: 'border-transparent text-gray-500 hover:text-gray-800'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<Mail className="h-4 w-4" />
|
|
||||||
تنظیمات ایمیل (SMTP)
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => setActiveTab('templates')}
|
|
||||||
className={`flex items-center gap-2 py-4 px-4 font-bold text-sm border-b-2 transition-all ${
|
|
||||||
activeTab === 'templates'
|
|
||||||
? 'border-purple-600 text-purple-600'
|
|
||||||
: 'border-transparent text-gray-500 hover:text-gray-800'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<ListFilter className="h-4 w-4" />
|
|
||||||
قالبهای رویدادها
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => setActiveTab('manual')}
|
|
||||||
className={`flex items-center gap-2 py-4 px-4 font-bold text-sm border-b-2 transition-all ${
|
|
||||||
activeTab === 'manual'
|
|
||||||
? 'border-purple-600 text-purple-600'
|
|
||||||
: 'border-transparent text-gray-500 hover:text-gray-800'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<Send className="h-4 w-4" />
|
|
||||||
ارسال دستی هدفمند
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => setActiveTab('queue')}
|
|
||||||
className={`flex items-center gap-2 py-4 px-4 font-bold text-sm border-b-2 transition-all ${
|
|
||||||
activeTab === 'queue'
|
|
||||||
? 'border-purple-600 text-purple-600'
|
|
||||||
: 'border-transparent text-gray-500 hover:text-gray-800'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<Clock className="h-4 w-4" />
|
|
||||||
صف ارسال و لاگها
|
|
||||||
{queueStats.failed > 0 && (
|
|
||||||
<span className="rounded-full bg-red-100 px-2 py-0.5 text-xs text-red-600 font-bold">
|
|
||||||
{queueStats.failed} خطا
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Tab: Overview */}
|
|
||||||
{activeTab === 'overview' && (
|
|
||||||
<div className="space-y-6">
|
|
||||||
<div className="grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-4">
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-5 shadow-sm">
|
|
||||||
<span className="text-xs font-bold text-gray-400">مجموع پیامهای صف</span>
|
|
||||||
<p className="mt-2 text-3xl font-black text-gray-900">{queueStats.total}</p>
|
|
||||||
</div>
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-5 shadow-sm">
|
|
||||||
<span className="text-xs font-bold text-emerald-500">ارسال موفق</span>
|
|
||||||
<p className="mt-2 text-3xl font-black text-emerald-600">{queueStats.sent}</p>
|
|
||||||
</div>
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-5 shadow-sm">
|
|
||||||
<span className="text-xs font-bold text-amber-500">در حال پردازش / صف</span>
|
|
||||||
<p className="mt-2 text-3xl font-black text-amber-600">{queueStats.queued}</p>
|
|
||||||
</div>
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-5 shadow-sm">
|
|
||||||
<span className="text-xs font-bold text-red-500">ناموفق با تلاش مجدد</span>
|
|
||||||
<p className="mt-2 text-3xl font-black text-red-600">{queueStats.failed}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-6 shadow-sm">
|
|
||||||
<div className="flex items-center justify-between pb-4 border-b border-gray-100">
|
|
||||||
<div className="flex items-center gap-3">
|
|
||||||
<div className="rounded-xl bg-purple-50 p-3 text-purple-600">
|
|
||||||
<Mail className="h-6 w-6" />
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3 className="font-bold text-gray-900">سرویس ایمیل سازمانی</h3>
|
|
||||||
<p className="text-xs text-gray-400">پروتکل SMTP / TLS اختصاصی</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<span className={`inline-flex rounded-full px-2.5 py-1 text-xs font-bold ${
|
|
||||||
emailConfig.enabled ? 'bg-emerald-50 text-emerald-700' : 'bg-gray-100 text-gray-600'
|
|
||||||
}`}>
|
|
||||||
{emailConfig.enabled ? 'فعال' : 'غیرفعال'}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="mt-4 space-y-2 text-sm text-gray-600">
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span>سرور میزبان:</span>
|
|
||||||
<span className="font-mono text-gray-900 font-medium">{emailConfig.host || '-'}</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span>پورت اتصال:</span>
|
|
||||||
<span className="font-mono text-gray-900 font-medium">{emailConfig.port}</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span>فرستنده پیشفرض:</span>
|
|
||||||
<span className="font-mono text-gray-900 font-medium">{emailConfig.fromEmail}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-6 shadow-sm">
|
|
||||||
<div className="flex items-center justify-between pb-4 border-b border-gray-100">
|
|
||||||
<div className="flex items-center gap-3">
|
|
||||||
<div className="rounded-xl bg-violet-50 p-3 text-violet-600">
|
|
||||||
<MessageSquare className="h-6 w-6" />
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3 className="font-bold text-gray-900">درگاه پیامک (MeliPayamak)</h3>
|
|
||||||
<p className="text-xs text-gray-400">ارسال خدماتی با الگوهای تایید شده</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<span className="inline-flex rounded-full bg-emerald-50 px-2.5 py-1 text-xs font-bold text-emerald-700">
|
|
||||||
متصل
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="mt-4 space-y-2 text-sm text-gray-600">
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span>وضعیت اتصال:</span>
|
|
||||||
<span className="text-emerald-600 font-bold">برقرار</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span>قالبهای پیامک:</span>
|
|
||||||
<a href="/settings/sms" className="flex items-center gap-1 text-purple-600 hover:underline">
|
|
||||||
مشاهده تنظیمات پیشرفته ملیپیامک
|
|
||||||
<ExternalLink className="h-3 w-3" />
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Tab: Email SMTP */}
|
|
||||||
{activeTab === 'email' && (
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-6 shadow-sm">
|
|
||||||
<form onSubmit={handleSaveEmail} className="space-y-6 max-w-3xl">
|
|
||||||
<div className="flex items-center justify-between border-b border-gray-100 pb-4">
|
|
||||||
<div>
|
|
||||||
<h3 className="text-lg font-bold text-gray-900">پیکربندی سرور ارسال ایمیل (SMTP)</h3>
|
|
||||||
<p className="text-xs text-gray-500">مشخصات سرور میل اختصاصی خود را وارد نمایید</p>
|
|
||||||
</div>
|
|
||||||
<label className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={emailConfig.enabled}
|
|
||||||
onChange={(e) => setEmailConfig({ ...emailConfig, enabled: e.target.checked })}
|
|
||||||
className="h-4 w-4 rounded text-purple-600 focus:ring-purple-500"
|
|
||||||
/>
|
|
||||||
<span className="text-sm font-bold text-gray-700">فعالسازی ارسال ایمیل</span>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">هاست سرور SMTP</label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
dir="ltr"
|
|
||||||
value={emailConfig.host}
|
|
||||||
onChange={(e) => setEmailConfig({ ...emailConfig, host: e.target.value })}
|
|
||||||
placeholder="mail.canina.ir"
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm font-mono focus:border-purple-600 focus:outline-none"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">پورت اتصال</label>
|
|
||||||
<input
|
|
||||||
type="number"
|
|
||||||
dir="ltr"
|
|
||||||
value={emailConfig.port}
|
|
||||||
onChange={(e) => setEmailConfig({ ...emailConfig, port: Number(e.target.value) })}
|
|
||||||
placeholder="587 یا 465"
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm font-mono focus:border-purple-600 focus:outline-none"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">نام کاربری (ایمیل ورود)</label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
dir="ltr"
|
|
||||||
value={emailConfig.user}
|
|
||||||
onChange={(e) => setEmailConfig({ ...emailConfig, user: e.target.value })}
|
|
||||||
placeholder="info@canina.ir"
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm font-mono focus:border-purple-600 focus:outline-none"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">رمز عبور ایمیل</label>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
dir="ltr"
|
|
||||||
value={emailConfig.password}
|
|
||||||
onChange={(e) => setEmailConfig({ ...emailConfig, password: e.target.value })}
|
|
||||||
placeholder="••••••••"
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm font-mono focus:border-purple-600 focus:outline-none"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">نام فرستنده (Sender Name)</label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={emailConfig.fromName}
|
|
||||||
onChange={(e) => setEmailConfig({ ...emailConfig, fromName: e.target.value })}
|
|
||||||
placeholder="کنینا ایران"
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm focus:border-purple-600 focus:outline-none"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">آدرس ایمیل فرستنده (From Address)</label>
|
|
||||||
<input
|
|
||||||
type="email"
|
|
||||||
dir="ltr"
|
|
||||||
value={emailConfig.fromEmail}
|
|
||||||
onChange={(e) => setEmailConfig({ ...emailConfig, fromEmail: e.target.value })}
|
|
||||||
placeholder="info@canina.ir"
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm font-mono focus:border-purple-600 focus:outline-none"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Test result status */}
|
|
||||||
{smtpStatus && (
|
|
||||||
<div className={`flex items-center gap-3 rounded-xl p-4 text-sm ${
|
|
||||||
smtpStatus.success ? 'bg-emerald-50 text-emerald-800' : 'bg-red-50 text-red-800'
|
|
||||||
}`}>
|
|
||||||
{smtpStatus.success ? <CheckCircle2 className="h-5 w-5 shrink-0" /> : <AlertCircle className="h-5 w-5 shrink-0" />}
|
|
||||||
<span>{smtpStatus.message}</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div className="flex items-center gap-3 pt-4 border-t border-gray-100">
|
|
||||||
<Button type="submit" disabled={isSavingEmail}>
|
|
||||||
{isSavingEmail ? <Spinner size="sm" /> : 'ذخیره تنظیمات'}
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="outline"
|
|
||||||
onClick={handleTestSmtp}
|
|
||||||
disabled={isTestingSmtp}
|
|
||||||
>
|
|
||||||
{isTestingSmtp ? <Spinner size="sm" /> : 'تست اتصال به سرور (SMTP Test)'}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Tab: Templates */}
|
|
||||||
{activeTab === 'templates' && (
|
|
||||||
<div className="space-y-6">
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-6 shadow-sm">
|
|
||||||
<h3 className="text-lg font-bold text-gray-900 mb-4">قالبهای خودکار سیستم بر اساس رویداد</h3>
|
|
||||||
<div className="overflow-x-auto">
|
|
||||||
<table className="w-full text-right text-sm">
|
|
||||||
<thead className="bg-gray-50 text-xs font-bold text-gray-500 uppercase">
|
|
||||||
<tr>
|
|
||||||
<th className="py-3 px-4">نام رویداد</th>
|
|
||||||
<th className="py-3 px-4">کانال</th>
|
|
||||||
<th className="py-3 px-4">عنوان / موضوع</th>
|
|
||||||
<th className="py-3 px-4">گیرنده</th>
|
|
||||||
<th className="py-3 px-4">متغیرها</th>
|
|
||||||
<th className="py-3 px-4">وضعیت</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody className="divide-y divide-gray-100">
|
|
||||||
{eventsList.map((ev) => (
|
|
||||||
<tr key={ev.event} className="hover:bg-gray-50/50">
|
|
||||||
<td className="py-3.5 px-4 font-bold text-gray-900">{ev.name}</td>
|
|
||||||
<td className="py-3.5 px-4">
|
|
||||||
<span className="rounded-md bg-purple-50 px-2 py-1 text-xs font-bold text-purple-700">
|
|
||||||
SMS & EMAIL
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4 text-gray-600 font-mono text-xs">{ev.event}</td>
|
|
||||||
<td className="py-3.5 px-4 text-gray-600">کاربر / مشتری</td>
|
|
||||||
<td className="py-3.5 px-4 text-xs font-mono text-gray-400">
|
|
||||||
{ev.variables.join(', ')}
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4">
|
|
||||||
<span className="inline-flex items-center gap-1 text-xs text-emerald-600 font-bold">
|
|
||||||
<CheckCircle2 className="h-3.5 w-3.5" />
|
|
||||||
فعال
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
))}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Tab: Manual Send */}
|
|
||||||
{activeTab === 'manual' && (
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-6 shadow-sm max-w-2xl">
|
|
||||||
<h3 className="text-lg font-bold text-gray-900 mb-2">ارسال دستی و هدفمند پیام</h3>
|
|
||||||
<p className="text-xs text-gray-500 mb-6">پیامک یا ایمیل دلخواه خود را به یک کاربر یا گروههای مشخص ارسال کنید</p>
|
|
||||||
|
|
||||||
<form onSubmit={handleManualSend} className="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">کانال ارسال</label>
|
|
||||||
<div className="flex gap-4">
|
|
||||||
<label className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<input
|
|
||||||
type="radio"
|
|
||||||
name="channel"
|
|
||||||
checked={manualForm.channel === 'SMS'}
|
|
||||||
onChange={() => setManualForm({ ...manualForm, channel: 'SMS' })}
|
|
||||||
className="text-purple-600 focus:ring-purple-500"
|
|
||||||
/>
|
|
||||||
<span className="text-sm font-medium">پیامک (SMS)</span>
|
|
||||||
</label>
|
|
||||||
<label className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<input
|
|
||||||
type="radio"
|
|
||||||
name="channel"
|
|
||||||
checked={manualForm.channel === 'EMAIL'}
|
|
||||||
onChange={() => setManualForm({ ...manualForm, channel: 'EMAIL' })}
|
|
||||||
className="text-purple-600 focus:ring-purple-500"
|
|
||||||
/>
|
|
||||||
<span className="text-sm font-medium">ایمیل (Email)</span>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">
|
|
||||||
{manualForm.channel === 'SMS' ? 'شماره موبایل گیرنده' : 'آدرس ایمیل گیرنده'}
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
dir="ltr"
|
|
||||||
value={manualForm.recipient}
|
|
||||||
onChange={(e) => setManualForm({ ...manualForm, recipient: e.target.value })}
|
|
||||||
placeholder={manualForm.channel === 'SMS' ? '09121234567' : 'user@example.com'}
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm font-mono focus:border-purple-600 focus:outline-none"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{manualForm.channel === 'EMAIL' && (
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">موضوع ایمیل</label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={manualForm.subject}
|
|
||||||
onChange={(e) => setManualForm({ ...manualForm, subject: e.target.value })}
|
|
||||||
placeholder="موضوع اطلاعیه..."
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm focus:border-purple-600 focus:outline-none"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">متن پیام</label>
|
|
||||||
<textarea
|
|
||||||
rows={4}
|
|
||||||
value={manualForm.content}
|
|
||||||
onChange={(e) => setManualForm({ ...manualForm, content: e.target.value })}
|
|
||||||
placeholder="متن پیام خود را اینجا بنویسید..."
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm focus:border-purple-600 focus:outline-none"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<Button type="submit" disabled={isSendingManual}>
|
|
||||||
{isSendingManual ? <Spinner size="sm" /> : 'ثبت در صف ارسال'}
|
|
||||||
</Button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Tab: Queue & Logs */}
|
|
||||||
{activeTab === 'queue' && (
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-6 shadow-sm">
|
|
||||||
<div className="flex items-center justify-between mb-4">
|
|
||||||
<h3 className="text-lg font-bold text-gray-900">صف پردازش پایدار نوتیفیکیشنها</h3>
|
|
||||||
<Button variant="outline" size="sm" onClick={loadQueue} disabled={isLoadingQueue}>
|
|
||||||
<RefreshCw className={`h-4 w-4 ${isLoadingQueue ? 'animate-spin' : ''}`} />
|
|
||||||
بهروزرسانی صف
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="overflow-x-auto">
|
|
||||||
<table className="w-full text-right text-sm">
|
|
||||||
<thead className="bg-gray-50 text-xs font-bold text-gray-500 uppercase">
|
|
||||||
<tr>
|
|
||||||
<th className="py-3 px-4">گیرنده</th>
|
|
||||||
<th className="py-3 px-4">کانال</th>
|
|
||||||
<th className="py-3 px-4">رویداد</th>
|
|
||||||
<th className="py-3 px-4">تلاش</th>
|
|
||||||
<th className="py-3 px-4">وضعیت</th>
|
|
||||||
<th className="py-3 px-4">زمان ثبت</th>
|
|
||||||
<th className="py-3 px-4">عملیات</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody className="divide-y divide-gray-100">
|
|
||||||
{queueItems.length === 0 ? (
|
|
||||||
<tr>
|
|
||||||
<td colSpan={7} className="py-8 text-center text-gray-400">
|
|
||||||
هیچ پیامی در صف وجود ندارد.
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
) : (
|
|
||||||
queueItems.map((item) => (
|
|
||||||
<tr key={item.id} className="hover:bg-gray-50/50">
|
|
||||||
<td className="py-3.5 px-4 font-mono font-medium text-gray-900">{item.recipient}</td>
|
|
||||||
<td className="py-3.5 px-4">
|
|
||||||
<span className={`rounded-md px-2 py-0.5 text-xs font-bold ${
|
|
||||||
item.channel === 'EMAIL' ? 'bg-blue-50 text-blue-700' : 'bg-violet-50 text-violet-700'
|
|
||||||
}`}>
|
|
||||||
{item.channel}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4 text-xs font-mono text-gray-600">{item.event}</td>
|
|
||||||
<td className="py-3.5 px-4 font-mono text-xs">{item.attempts} / {item.maxAttempts}</td>
|
|
||||||
<td className="py-3.5 px-4">
|
|
||||||
<span className={`inline-flex rounded-full px-2 py-0.5 text-xs font-bold ${
|
|
||||||
item.status === 'SENT'
|
|
||||||
? 'bg-emerald-50 text-emerald-700'
|
|
||||||
: item.status === 'FAILED'
|
|
||||||
? 'bg-red-50 text-red-700'
|
|
||||||
: 'bg-amber-50 text-amber-700'
|
|
||||||
}`}>
|
|
||||||
{item.status === 'SENT' ? 'ارسال شده' : item.status === 'FAILED' ? 'ناموفق' : 'در صف'}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4 text-xs text-gray-400">
|
|
||||||
{new Date(item.createdAt).toLocaleTimeString('fa-IR')}
|
|
||||||
</td>
|
|
||||||
<td className="py-3.5 px-4">
|
|
||||||
{item.status === 'FAILED' && (
|
|
||||||
<button
|
|
||||||
onClick={() => handleRetryQueue(item.id)}
|
|
||||||
className="text-xs text-purple-600 hover:underline font-bold"
|
|
||||||
>
|
|
||||||
تلاش مجدد
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
))
|
|
||||||
)}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -31,6 +31,7 @@ import api from '../services/api';
|
|||||||
|
|
||||||
|
|
||||||
export interface OrderItem {
|
export interface OrderItem {
|
||||||
|
requiresRx?: boolean;
|
||||||
id?: string;
|
id?: string;
|
||||||
name?: string;
|
name?: string;
|
||||||
priceValue?: number;
|
priceValue?: number;
|
||||||
@@ -758,6 +759,12 @@ export default function Orders() {
|
|||||||
سفارش جدید
|
سفارش جدید
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
|
{(order.orderItems || order.items || []).some(it => it.product?.requiresRx) && (
|
||||||
|
<span className="inline-flex items-center gap-1 px-2 py-0.5 rounded-full text-[10px] font-black bg-rose-600 text-white shadow-xs animate-pulse" title="نیازمند تماس تلفنی و تایید نسخه دامپزشک">
|
||||||
|
<span>Rx</span>
|
||||||
|
<span>هماهنگی نسخه</span>
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex flex-wrap gap-1.5 mt-2 font-vazir" dir="rtl">
|
<div className="flex flex-wrap gap-1.5 mt-2 font-vazir" dir="rtl">
|
||||||
<span className={`text-[10px] font-bold font-vazir px-2 py-0.5 rounded-md border flex items-center gap-1 shadow-sm ${payInfo.color}`}>
|
<span className={`text-[10px] font-bold font-vazir px-2 py-0.5 rounded-md border flex items-center gap-1 shadow-sm ${payInfo.color}`}>
|
||||||
@@ -911,6 +918,24 @@ export default function Orders() {
|
|||||||
>
|
>
|
||||||
|
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
|
{/* Rx Warning Notice for Admin */}
|
||||||
|
{(selectedOrder.orderItems || selectedOrder.items || []).some(it => it.requiresRx || it.product?.requiresRx) && (
|
||||||
|
<div className="bg-rose-50 border border-rose-200 rounded-2xl p-4 flex items-center justify-between gap-3 text-rose-900 font-vazir shadow-xs" dir="rtl">
|
||||||
|
<div className="flex items-center gap-2.5">
|
||||||
|
<span className="w-8 h-8 rounded-xl bg-rose-600 text-white flex items-center justify-center font-black text-xs shrink-0 shadow-sm">Rx</span>
|
||||||
|
<div>
|
||||||
|
<h4 className="text-xs font-black">این سفارش شامل داروی نیازمند نسخه و نظارت دامپزشکی است</h4>
|
||||||
|
<p className="text-[11px] text-rose-700 font-medium mt-0.5">ارسال سفارش تنها پس از تماس تلفنی کارشناس پشتیبانی و تایید نسخه معتبر انجام شود.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<a
|
||||||
|
href={`tel:${selectedOrder.user?.mobile || selectedOrder.user?.phone || ''}`}
|
||||||
|
className="bg-rose-600 hover:bg-rose-700 text-white px-3.5 py-2 rounded-xl text-xs font-bold transition-all shadow-sm flex items-center gap-1.5 shrink-0"
|
||||||
|
>
|
||||||
|
<span>تماس با مشتری</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{/* Status & Timing Banner */}
|
{/* Status & Timing Banner */}
|
||||||
<div className="flex flex-wrap items-center justify-between gap-4 p-4 bg-purple-50/50 rounded-2xl border border-purple-100">
|
<div className="flex flex-wrap items-center justify-between gap-4 p-4 bg-purple-50/50 rounded-2xl border border-purple-100">
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import {
|
import {
|
||||||
Bell,
|
|
||||||
Building2,
|
Building2,
|
||||||
ChevronLeft,
|
ChevronLeft,
|
||||||
CreditCard,
|
CreditCard,
|
||||||
@@ -7,7 +6,6 @@ import {
|
|||||||
Globe,
|
Globe,
|
||||||
MessageSquare,
|
MessageSquare,
|
||||||
Palette,
|
Palette,
|
||||||
PhoneCall,
|
|
||||||
Save,
|
Save,
|
||||||
Settings as SettingsIcon,
|
Settings as SettingsIcon,
|
||||||
Share2,
|
Share2,
|
||||||
@@ -116,8 +114,6 @@ export default function Settings() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const SETTING_MODULES = [
|
const SETTING_MODULES = [
|
||||||
{ title: 'مرکز اطلاعرسانی و ایمیل', desc: 'پیکربندی سرور SMTP، صف ارسال پیامک و ایمیل و قالبهای خودکار', path: '/settings/notifications', icon: Bell, color: 'from-fuchsia-600 to-purple-800', badge: 'جدید' },
|
|
||||||
{ title: 'مشاوران تخصصی و لیدها', desc: 'مدیریت مشاوران کاتالوگ و پیگیری درخواستهای تماس کاربران', path: '/advisors', icon: PhoneCall, color: 'from-blue-600 to-indigo-800', badge: 'جدید' },
|
|
||||||
{ title: 'پشتیبان هوشمند سایت', desc: 'فعالسازی، ارائهدهنده و مدل، نام دکمه و آیکون دستیار', path: '/settings/smart-chat', icon: MessageSquare, color: 'from-purple-600 to-purple-800', badge: 'هوشمند' },
|
{ title: 'پشتیبان هوشمند سایت', desc: 'فعالسازی، ارائهدهنده و مدل، نام دکمه و آیکون دستیار', path: '/settings/smart-chat', icon: MessageSquare, color: 'from-purple-600 to-purple-800', badge: 'هوشمند' },
|
||||||
{
|
{
|
||||||
title: 'روشهای پرداخت و زیبال',
|
title: 'روشهای پرداخت و زیبال',
|
||||||
|
|||||||
@@ -1,140 +0,0 @@
|
|||||||
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
|
|
||||||
import React from 'react';
|
|
||||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
||||||
import SmartChatSettingsPage from './SmartChatSettingsPage';
|
|
||||||
import api from '../services/api';
|
|
||||||
import { toast } from 'react-hot-toast';
|
|
||||||
|
|
||||||
vi.mock('../services/api', () => ({
|
|
||||||
default: {
|
|
||||||
get: vi.fn(),
|
|
||||||
put: vi.fn(),
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock('react-hot-toast', () => ({
|
|
||||||
toast: {
|
|
||||||
success: vi.fn(),
|
|
||||||
error: vi.fn(),
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock('react-router-dom', () => ({
|
|
||||||
Link: ({ children, to, className }: any) => <a href={to} className={className}>{children}</a>,
|
|
||||||
}));
|
|
||||||
|
|
||||||
describe('SmartChatSettingsPage Component', () => {
|
|
||||||
const mockSettings = {
|
|
||||||
enabled: true,
|
|
||||||
provider: 'configured-test-1234',
|
|
||||||
model: 'gpt-test-model',
|
|
||||||
label: 'گفتگو با پشتیبان',
|
|
||||||
icon: 'chat',
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockCatalog = {
|
|
||||||
providers: [
|
|
||||||
{
|
|
||||||
id: 'configured-test-1234',
|
|
||||||
label: 'ارائهدهنده کنینا',
|
|
||||||
models: ['gpt-test-model', 'claude-test-model'],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockStats = {
|
|
||||||
conversations: 5,
|
|
||||||
messages: 12,
|
|
||||||
authenticated: 3,
|
|
||||||
anonymous: 2,
|
|
||||||
unanswered: 0,
|
|
||||||
followup: 1,
|
|
||||||
escalated: 0,
|
|
||||||
topics: {},
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockConversations = {
|
|
||||||
data: [
|
|
||||||
{
|
|
||||||
id: 'conv-1',
|
|
||||||
createdAt: '2026-11-07T10:00:00.000Z',
|
|
||||||
updatedAt: '2026-11-07T10:05:00.000Z',
|
|
||||||
unanswered: false,
|
|
||||||
needsFollowup: false,
|
|
||||||
escalationSignal: false,
|
|
||||||
user: { firstName: 'پارسا', lastName: 'آقایی', mobile: '09211231517' },
|
|
||||||
messages: [
|
|
||||||
{ role: 'user', content: 'سلام، مکمل مفاصل موجود دارید؟', createdAt: '2026-11-07T10:00:00.000Z' },
|
|
||||||
{ role: 'assistant', content: 'بله Canhydrox GAG موجود است.', createdAt: '2026-11-07T10:01:00.000Z' },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
vi.mocked(api.get).mockImplementation(async (url: string) => {
|
|
||||||
if (url === '/support-chat/settings') return { data: { data: mockSettings } };
|
|
||||||
if (url === '/support-chat/catalog') return { data: { data: mockCatalog } };
|
|
||||||
if (url === '/admin/support-chat/stats') return { data: { data: mockStats } };
|
|
||||||
if (url === '/admin/support-chat/conversations') return { data: { data: mockConversations } };
|
|
||||||
return { data: {} };
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it('renders settings tab and loads config correctly', async () => {
|
|
||||||
render(<SmartChatSettingsPage />);
|
|
||||||
|
|
||||||
await waitFor(() => {
|
|
||||||
expect(screen.getByText('پشتیبان هوشمند سایت (Smart Support Chat)')).toBeTruthy();
|
|
||||||
expect(screen.getByLabelText('نام دکمه و دستیار')).toHaveValue('گفتگو با پشتیبان');
|
|
||||||
expect(screen.getByLabelText('ارائهدهنده')).toHaveValue('configured-test-1234');
|
|
||||||
expect(screen.getByLabelText('مدل')).toHaveValue('gpt-test-model');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it('allows saving updated settings', async () => {
|
|
||||||
vi.mocked(api.put).mockResolvedValueOnce({ data: { success: true } });
|
|
||||||
|
|
||||||
render(<SmartChatSettingsPage />);
|
|
||||||
|
|
||||||
await waitFor(() => {
|
|
||||||
expect(screen.getByLabelText('نام دکمه و دستیار')).toHaveValue('گفتگو با پشتیبان');
|
|
||||||
});
|
|
||||||
|
|
||||||
const labelInput = screen.getByLabelText('نام دکمه و دستیار');
|
|
||||||
fireEvent.change(labelInput, { target: { value: 'پشتیبان آنلاین ۲۴ ساعته' } });
|
|
||||||
|
|
||||||
const submitBtn = screen.getByRole('button', { name: 'ذخیره تنظیمات' });
|
|
||||||
fireEvent.click(submitBtn);
|
|
||||||
|
|
||||||
await waitFor(() => {
|
|
||||||
expect(api.put).toHaveBeenCalledWith(
|
|
||||||
'/support-chat/settings',
|
|
||||||
expect.objectContaining({
|
|
||||||
label: 'پشتیبان آنلاین ۲۴ ساعته',
|
|
||||||
})
|
|
||||||
);
|
|
||||||
expect(toast.success).toHaveBeenCalledWith('تنظیمات پشتیبان هوشمند سایت با موفقیت ذخیره شد.');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it('switches to analytics tab and displays stats and conversations', async () => {
|
|
||||||
render(<SmartChatSettingsPage />);
|
|
||||||
|
|
||||||
await waitFor(() => {
|
|
||||||
expect(screen.getByText('تحلیل و تاریخچه مکالمات')).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
const analyticsTabBtn = screen.getByText('تحلیل و تاریخچه مکالمات');
|
|
||||||
fireEvent.click(analyticsTabBtn);
|
|
||||||
|
|
||||||
await waitFor(() => {
|
|
||||||
expect(screen.getByText('گفتگوها')).toBeTruthy();
|
|
||||||
expect(screen.getByText('5')).toBeTruthy();
|
|
||||||
expect(screen.getByText('سلام، مکمل مفاصل موجود دارید؟')).toBeTruthy();
|
|
||||||
expect(screen.getByText('بله Canhydrox GAG موجود است.')).toBeTruthy();
|
|
||||||
expect(screen.getByText('پارسا آقایی')).toBeTruthy();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,539 +1,59 @@
|
|||||||
import React, { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import {
|
|
||||||
MessageSquare,
|
|
||||||
Bot,
|
|
||||||
Settings,
|
|
||||||
BarChart3,
|
|
||||||
RefreshCw,
|
|
||||||
Sliders,
|
|
||||||
CheckCircle2,
|
|
||||||
AlertCircle,
|
|
||||||
HelpCircle,
|
|
||||||
ShieldCheck,
|
|
||||||
Save,
|
|
||||||
Clock,
|
|
||||||
Sparkles,
|
|
||||||
ArrowRight,
|
|
||||||
ExternalLink,
|
|
||||||
} from 'lucide-react';
|
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import { toast } from 'react-hot-toast';
|
import { toast } from 'react-hot-toast';
|
||||||
import api from '../services/api';
|
import api from '../services/api';
|
||||||
import Button from '../components/ui/Button';
|
import Button from '../components/ui/Button';
|
||||||
import Spinner from '../components/ui/Spinner';
|
|
||||||
|
|
||||||
type SettingsState = {
|
|
||||||
enabled: boolean;
|
|
||||||
provider: string;
|
|
||||||
model: string;
|
|
||||||
label: string;
|
|
||||||
icon: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
type Provider = {
|
|
||||||
id: string;
|
|
||||||
label: string;
|
|
||||||
models: string[];
|
|
||||||
};
|
|
||||||
|
|
||||||
type Stats = {
|
|
||||||
conversations: number;
|
|
||||||
messages: number;
|
|
||||||
authenticated: number;
|
|
||||||
anonymous: number;
|
|
||||||
unanswered: number;
|
|
||||||
followup: number;
|
|
||||||
escalated: number;
|
|
||||||
topics: Record<string, number>;
|
|
||||||
};
|
|
||||||
|
|
||||||
type Conversation = {
|
|
||||||
id: string;
|
|
||||||
createdAt: string;
|
|
||||||
updatedAt: string;
|
|
||||||
entryPath?: string;
|
|
||||||
unanswered: boolean;
|
|
||||||
needsFollowup: boolean;
|
|
||||||
escalationSignal: boolean;
|
|
||||||
summary?: string;
|
|
||||||
user?: {
|
|
||||||
firstName?: string;
|
|
||||||
lastName?: string;
|
|
||||||
mobile?: string;
|
|
||||||
email?: string;
|
|
||||||
} | null;
|
|
||||||
messages: {
|
|
||||||
role: string;
|
|
||||||
content: string;
|
|
||||||
createdAt: string;
|
|
||||||
}[];
|
|
||||||
};
|
|
||||||
|
|
||||||
|
type Settings = { enabled: boolean; provider: string; model: string; label: string; icon: string };
|
||||||
|
type Provider = { id: string; label: string; models: string[] };
|
||||||
const unwrap = (r: any) => r.data?.data ?? r.data;
|
const unwrap = (r: any) => r.data?.data ?? r.data;
|
||||||
|
|
||||||
export default function SmartChatSettingsPage() {
|
export default function SmartChatSettingsPage() {
|
||||||
const [activeTab, setActiveTab] = useState<'config' | 'analytics'>('config');
|
const [settings, setSettings] = useState<Settings | null>(null);
|
||||||
|
|
||||||
// Config State
|
|
||||||
const [settings, setSettings] = useState<SettingsState | null>(null);
|
|
||||||
const [providers, setProviders] = useState<Provider[]>([]);
|
const [providers, setProviders] = useState<Provider[]>([]);
|
||||||
const [isConfigLoading, setIsConfigLoading] = useState(true);
|
const [error, setError] = useState('');
|
||||||
const [isSaving, setIsSaving] = useState(false);
|
const [saving, setSaving] = useState(false);
|
||||||
const [configError, setConfigError] = useState('');
|
const load = async () => {
|
||||||
|
setError('');
|
||||||
// Analytics State
|
const [s, c] = await Promise.allSettled([api.get('/support-chat/settings'), api.get('/support-chat/catalog')]);
|
||||||
const [stats, setStats] = useState<Stats | null>(null);
|
if (s.status === 'fulfilled') setSettings(unwrap(s.value));
|
||||||
const [conversations, setConversations] = useState<Conversation[]>([]);
|
else setError('تنظیمات ذخیرهشده دریافت نشد. پشتیبان تا ثبت تنظیمات معتبر نمایش داده نمیشود.');
|
||||||
const [isAnalyticsLoading, setIsAnalyticsLoading] = useState(false);
|
if (c.status === 'fulfilled') setProviders(unwrap(c.value).providers);
|
||||||
const [analyticsError, setAnalyticsError] = useState('');
|
else { setProviders([]); setError('فهرست واقعی ارائهدهندگان در دسترس نیست. لطفاً دوباره تلاش کنید.'); }
|
||||||
const [dates, setDates] = useState({ startDate: '', endDate: '' });
|
|
||||||
|
|
||||||
// Load config & catalog
|
|
||||||
const loadConfig = async () => {
|
|
||||||
setIsConfigLoading(true);
|
|
||||||
setConfigError('');
|
|
||||||
try {
|
|
||||||
const [sRes, cRes] = await Promise.allSettled([
|
|
||||||
api.get('/support-chat/settings'),
|
|
||||||
api.get('/support-chat/catalog'),
|
|
||||||
]);
|
|
||||||
|
|
||||||
if (sRes.status === 'fulfilled') {
|
|
||||||
setSettings(unwrap(sRes.value));
|
|
||||||
} else {
|
|
||||||
setConfigError('تنظیمات ذخیرهشده دریافت نشد. لطفاً تنظیمات جدید ایجاد و ثبت نمایید.');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cRes.status === 'fulfilled') {
|
|
||||||
const cat = unwrap(cRes.value);
|
|
||||||
setProviders(cat.providers || []);
|
|
||||||
} else {
|
|
||||||
setProviders([]);
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
setConfigError('خطا در برقراری ارتباط با سامانه پشتیبان هوشمند.');
|
|
||||||
} finally {
|
|
||||||
setIsConfigLoading(false);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
useEffect(() => { void load(); }, []);
|
||||||
// Load analytics
|
const save = async (event: React.FormEvent) => {
|
||||||
const loadAnalytics = async () => {
|
event.preventDefault();
|
||||||
setIsAnalyticsLoading(true);
|
|
||||||
setAnalyticsError('');
|
|
||||||
try {
|
|
||||||
const params = Object.fromEntries(Object.entries(dates).filter(([, v]) => v));
|
|
||||||
const [sRes, cRes] = await Promise.all([
|
|
||||||
api.get('/admin/support-chat/stats', { params }),
|
|
||||||
api.get('/admin/support-chat/conversations', { params: { ...params, page: 1, limit: 50 } }),
|
|
||||||
]);
|
|
||||||
setStats(unwrap(sRes));
|
|
||||||
setConversations(unwrap(cRes).data || []);
|
|
||||||
} catch {
|
|
||||||
setAnalyticsError('گزارش تحلیلی مکالمات پشتیبان بارگذاری نشد.');
|
|
||||||
} finally {
|
|
||||||
setIsAnalyticsLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
loadConfig();
|
|
||||||
loadAnalytics();
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const handleSave = async (e: React.FormEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
if (!settings) return;
|
if (!settings) return;
|
||||||
setIsSaving(true);
|
setSaving(true);
|
||||||
try {
|
try {
|
||||||
await api.put('/support-chat/settings', settings);
|
await api.put('/support-chat/settings', settings);
|
||||||
const saved = unwrap(await api.get('/support-chat/settings'));
|
const saved = unwrap(await api.get('/support-chat/settings'));
|
||||||
setSettings(saved);
|
setSettings(saved);
|
||||||
setConfigError('');
|
setError('');
|
||||||
toast.success('تنظیمات پشتیبان هوشمند سایت با موفقیت ذخیره شد.');
|
toast.success('تنظیمات پشتیبان هوشمند ذخیره شد.');
|
||||||
} catch (err: any) {
|
} catch { toast.error('ذخیره تنظیمات انجام نشد؛ ارائهدهنده و مدل را بررسی کنید.'); }
|
||||||
const msg = err?.response?.data?.message || 'ذخیره تنظیمات انجام نشد؛ ارائهدهنده و مدل را بررسی نمایید.';
|
finally { setSaving(false); }
|
||||||
toast.error(msg);
|
|
||||||
} finally {
|
|
||||||
setIsSaving(false);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
const icons: Record<string, string> = { chat: '💬', paw: '🐾', bot: '🤖' };
|
||||||
const icons: Record<string, string> = {
|
return <div dir="rtl" className="space-y-6 font-vazir">
|
||||||
chat: '💬',
|
<Link to="/settings">← تنظیمات فروشگاه</Link>
|
||||||
paw: '🐾',
|
<h2 className="text-2xl font-black">پشتیبان هوشمند سایت</h2>
|
||||||
bot: '🤖',
|
<p>انتخاب مدل برای تشخیص درخواست و پاسخگویی یکسان است. اطلاعات حساب مشتری به مدل ارسال نمیشود.</p>
|
||||||
};
|
{error && <div role="alert" className="rounded-xl bg-amber-50 p-4">{error} <button type="button" onClick={load}>تلاش دوباره</button></div>}
|
||||||
|
{!settings ? <Button onClick={() => setSettings({ enabled: false, provider: '', model: '', label: '', icon: 'chat' })}>ایجاد تنظیمات جدید</Button> :
|
||||||
return (
|
<form onSubmit={save} className="space-y-5 rounded-2xl bg-white p-6 border border-gray-200">
|
||||||
<div className="space-y-6 pb-12 font-vazir text-gray-800" dir="rtl">
|
<label className="flex gap-2"><input type="checkbox" checked={settings.enabled} onChange={e => setSettings({ ...settings, enabled: e.target.checked })} />فعالسازی پشتیبان هوشمند</label>
|
||||||
{/* Header */}
|
<label className="block">ارائهدهنده<select aria-label="ارائهدهنده" className="block border rounded-xl p-3 w-full" value={settings.provider} onChange={e => setSettings({ ...settings, provider: e.target.value, model: '' })}>
|
||||||
<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
|
<option value="">انتخاب ارائهدهنده</option>{providers.map(p => <option key={p.id} value={p.id}>{p.label}</option>)}
|
||||||
<div>
|
</select></label>
|
||||||
<div className="flex items-center gap-2 text-xs text-gray-400 mb-1">
|
<label className="block">مدل<select aria-label="مدل" disabled={!settings.provider} className="block border rounded-xl p-3 w-full" value={settings.model} onChange={e => setSettings({ ...settings, model: e.target.value })}>
|
||||||
<Link to="/settings" className="hover:text-purple-600 transition">تنظیمات فروشگاه</Link>
|
<option value="">انتخاب مدل</option>{providers.find(p => p.id === settings.provider)?.models.map(m => <option key={m} value={m}>{m}</option>)}
|
||||||
<span>/</span>
|
</select></label>
|
||||||
<span className="text-gray-600 font-bold">پشتیبان هوشمند سایت</span>
|
<label className="block">نام دکمه و دستیار<input aria-label="نام دکمه و دستیار" required maxLength={60} className="block border rounded-xl p-3 w-full" value={settings.label} onChange={e => setSettings({ ...settings, label: e.target.value })} /></label>
|
||||||
</div>
|
<label className="block">آیکون دستیار<select aria-label="آیکون دستیار" className="block border rounded-xl p-3 w-full" value={settings.icon} onChange={e => setSettings({ ...settings, icon: e.target.value })}><option value="chat">💬 گفتگو</option><option value="paw">🐾 پنجه</option><option value="bot">🤖 ربات</option></select></label>
|
||||||
<h1 className="flex items-center gap-2.5 text-2xl font-black text-gray-900">
|
<p className="text-sm text-gray-500">برای امنیت سایت فقط آیکونهای داخلی قابل انتخاب هستند؛ نشانی یا SVG دلخواه پذیرفته نمیشود.</p>
|
||||||
<Bot className="h-7 w-7 text-purple-600" />
|
<div aria-label="پیشنمایش دکمه" className="inline-flex gap-2 rounded-full bg-[#1E4053] text-white px-4 py-3"><span>{icons[settings.icon]}</span><span>{settings.label}</span></div>
|
||||||
پشتیبان هوشمند سایت (Smart Support Chat)
|
<div><Button type="submit" disabled={saving || (settings.enabled && (!settings.provider || !settings.model))}>{saving ? 'در حال ذخیره…' : 'ذخیره تنظیمات'}</Button></div>
|
||||||
</h1>
|
</form>}
|
||||||
<p className="mt-1 text-sm text-gray-500">
|
</div>;
|
||||||
پیکربندی هوش مصنوعی دستیار مشتری، مدل زبانی، کلید شناور سایت و تحلیل مکالمات کاربران
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center gap-3">
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
onClick={() => {
|
|
||||||
loadConfig();
|
|
||||||
loadAnalytics();
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<RefreshCw className="h-4 w-4" />
|
|
||||||
بروزرسانی وضعیت
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Tabs */}
|
|
||||||
<div className="flex border-b border-gray-200 bg-white px-4 rounded-xl shadow-sm">
|
|
||||||
<button
|
|
||||||
onClick={() => setActiveTab('config')}
|
|
||||||
className={`flex items-center gap-2 py-4 px-4 font-bold text-sm border-b-2 transition-all ${
|
|
||||||
activeTab === 'config'
|
|
||||||
? 'border-purple-600 text-purple-600'
|
|
||||||
: 'border-transparent text-gray-500 hover:text-gray-800'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<Sliders className="h-4 w-4" />
|
|
||||||
تنظیمات و پیکربندی دستیار
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => setActiveTab('analytics')}
|
|
||||||
className={`flex items-center gap-2 py-4 px-4 font-bold text-sm border-b-2 transition-all ${
|
|
||||||
activeTab === 'analytics'
|
|
||||||
? 'border-purple-600 text-purple-600'
|
|
||||||
: 'border-transparent text-gray-500 hover:text-gray-800'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<BarChart3 className="h-4 w-4" />
|
|
||||||
تحلیل و تاریخچه مکالمات
|
|
||||||
{stats && stats.conversations > 0 && (
|
|
||||||
<span className="rounded-full bg-purple-100 px-2 py-0.5 text-xs font-bold text-purple-700">
|
|
||||||
{stats.conversations}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Tab 1: Config */}
|
|
||||||
{activeTab === 'config' && (
|
|
||||||
<div className="space-y-6">
|
|
||||||
{configError && (
|
|
||||||
<div
|
|
||||||
role="alert"
|
|
||||||
className="flex items-center justify-between rounded-2xl border border-amber-200 bg-amber-50/80 p-4 text-sm text-amber-800 shadow-sm"
|
|
||||||
>
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<AlertCircle className="h-5 w-5 text-amber-600 flex-shrink-0" />
|
|
||||||
<span>{configError}</span>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={loadConfig}
|
|
||||||
className="font-bold text-purple-700 hover:underline"
|
|
||||||
>
|
|
||||||
تلاش دوباره
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{isConfigLoading ? (
|
|
||||||
<div className="flex h-64 items-center justify-center rounded-2xl border border-gray-100 bg-white shadow-sm">
|
|
||||||
<Spinner size="lg" />
|
|
||||||
</div>
|
|
||||||
) : !settings ? (
|
|
||||||
<div className="rounded-2xl border border-dashed border-gray-300 bg-white p-12 text-center shadow-sm">
|
|
||||||
<Bot className="mx-auto h-12 w-12 text-gray-400 mb-3" />
|
|
||||||
<h3 className="text-lg font-bold text-gray-800 mb-1">پیکربندی اولیه یافت نشد</h3>
|
|
||||||
<p className="text-sm text-gray-500 mb-6">برای فعالسازی پشتیبان هوشمند روی فروشگاه، تنظیمات اولیه را ثبت کنید.</p>
|
|
||||||
<Button
|
|
||||||
onClick={() =>
|
|
||||||
setSettings({
|
|
||||||
enabled: false,
|
|
||||||
provider: providers[0]?.id || '',
|
|
||||||
model: providers[0]?.models[0] || '',
|
|
||||||
label: 'گفتگو با پشتیبان',
|
|
||||||
icon: 'chat',
|
|
||||||
})
|
|
||||||
}
|
|
||||||
>
|
|
||||||
ایجاد تنظیمات جدید
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<form onSubmit={handleSave} className="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
|
||||||
{/* Main settings card */}
|
|
||||||
<div className="lg:col-span-2 space-y-6">
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-6 shadow-sm space-y-5">
|
|
||||||
<div className="flex items-center justify-between border-b border-gray-100 pb-4">
|
|
||||||
<div>
|
|
||||||
<h3 className="text-lg font-bold text-gray-900">وضعیت سرویس هوش مصنوعی</h3>
|
|
||||||
<p className="text-xs text-gray-500">فعال یا غیرفعال بودن پنجره چت در فروشگاه</p>
|
|
||||||
</div>
|
|
||||||
<label className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={settings.enabled}
|
|
||||||
onChange={(e) => setSettings({ ...settings, enabled: e.target.checked })}
|
|
||||||
className="h-4 w-4 rounded text-purple-600 focus:ring-purple-500"
|
|
||||||
/>
|
|
||||||
<span className="text-sm font-bold text-gray-700">فعالسازی پشتیبان هوشمند</span>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">ارائهدهنده سرویس (Provider)</label>
|
|
||||||
<select
|
|
||||||
aria-label="ارائهدهنده"
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm focus:border-purple-600 focus:outline-none bg-white"
|
|
||||||
value={settings.provider}
|
|
||||||
onChange={(e) =>
|
|
||||||
setSettings({ ...settings, provider: e.target.value, model: '' })
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<option value="">انتخاب ارائهدهنده</option>
|
|
||||||
{providers.map((p) => (
|
|
||||||
<option key={p.id} value={p.id}>
|
|
||||||
{p.label}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">مدل هوش مصنوعی (AI Model)</label>
|
|
||||||
<select
|
|
||||||
aria-label="مدل"
|
|
||||||
disabled={!settings.provider}
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm focus:border-purple-600 focus:outline-none bg-white disabled:bg-gray-50 disabled:text-gray-400"
|
|
||||||
value={settings.model}
|
|
||||||
onChange={(e) => setSettings({ ...settings, model: e.target.value })}
|
|
||||||
>
|
|
||||||
<option value="">انتخاب مدل</option>
|
|
||||||
{providers
|
|
||||||
.find((p) => p.id === settings.provider)
|
|
||||||
?.models.map((m) => (
|
|
||||||
<option key={m} value={m}>
|
|
||||||
{m}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4 pt-2">
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">نام دکمه و دستیار</label>
|
|
||||||
<input
|
|
||||||
aria-label="نام دکمه و دستیار"
|
|
||||||
required
|
|
||||||
maxLength={60}
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm focus:border-purple-600 focus:outline-none"
|
|
||||||
value={settings.label}
|
|
||||||
onChange={(e) => setSettings({ ...settings, label: e.target.value })}
|
|
||||||
placeholder="گفتگو با پشتیبان"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">آیکون دستیار</label>
|
|
||||||
<select
|
|
||||||
aria-label="آیکون دستیار"
|
|
||||||
className="w-full rounded-xl border border-gray-200 px-3 py-2.5 text-sm focus:border-purple-600 focus:outline-none bg-white"
|
|
||||||
value={settings.icon}
|
|
||||||
onChange={(e) => setSettings({ ...settings, icon: e.target.value })}
|
|
||||||
>
|
|
||||||
<option value="chat">💬 گفتگو (Chat)</option>
|
|
||||||
<option value="paw">🐾 پنجه حیوانات (Paw)</option>
|
|
||||||
<option value="bot">🤖 ربات هوشمند (Bot)</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="pt-4 border-t border-gray-100 flex items-center justify-between">
|
|
||||||
<p className="text-xs text-gray-400">
|
|
||||||
برای امنیت کامل فروشگاه، فقط آیکونهای استاندارد داخلی سامانه مجاز هستند.
|
|
||||||
</p>
|
|
||||||
<Button
|
|
||||||
type="submit"
|
|
||||||
disabled={isSaving || (settings.enabled && (!settings.provider || !settings.model))}
|
|
||||||
>
|
|
||||||
{isSaving ? <Spinner size="sm" /> : 'ذخیره تنظیمات'}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Sidebar preview card */}
|
|
||||||
<div className="space-y-6">
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-6 shadow-sm space-y-4">
|
|
||||||
<h4 className="text-sm font-bold text-gray-900 flex items-center gap-2">
|
|
||||||
<Sparkles className="h-4 w-4 text-purple-600" />
|
|
||||||
پیشنمایش زنده المان در فروشگاه
|
|
||||||
</h4>
|
|
||||||
<p className="text-xs text-gray-500 leading-relaxed">
|
|
||||||
نحوه نمایش دکمه در کپسول دو تکه ناوبری مشتری:
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div className="p-6 rounded-2xl bg-gray-50 border border-gray-200 flex flex-col items-center justify-center gap-3">
|
|
||||||
<div
|
|
||||||
aria-label="پیشنمایش دکمه"
|
|
||||||
className="inline-flex items-center gap-2 rounded-full bg-[#1E4053] text-white px-5 py-2.5 shadow-md font-bold text-sm"
|
|
||||||
>
|
|
||||||
<span>{icons[settings.icon] || '💬'}</span>
|
|
||||||
<span>{settings.label || 'گفتگو با پشتیبان'}</span>
|
|
||||||
</div>
|
|
||||||
<span className="text-[11px] text-gray-400">
|
|
||||||
وضعیت کنونی: {settings.enabled ? '🟢 فعال در فروشگاه' : '🔴 غیرفعال'}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="rounded-xl bg-purple-50/50 p-4 border border-purple-100 text-xs text-purple-800 space-y-2">
|
|
||||||
<div className="font-bold flex items-center gap-1.5">
|
|
||||||
<ShieldCheck className="h-4 w-4 text-purple-600" />
|
|
||||||
امنیت و حریم خصوصی دادهها
|
|
||||||
</div>
|
|
||||||
<p className="leading-relaxed text-gray-600">
|
|
||||||
انتخاب مدل برای تشخیص نوع درخواست و پاسخگویی به صورت یکپارچه عمل میکند. هیچ اطلاعات هویتی یا اطلاعات حساب کاربری به مدل ارسال نخواهد شد.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Tab 2: Analytics */}
|
|
||||||
{activeTab === 'analytics' && (
|
|
||||||
<div className="space-y-6">
|
|
||||||
{analyticsError && (
|
|
||||||
<div role="alert" className="rounded-2xl border border-red-200 bg-red-50 p-4 text-sm text-red-700">
|
|
||||||
{analyticsError}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Filters */}
|
|
||||||
<div className="rounded-2xl border border-gray-100 bg-white p-5 shadow-sm flex flex-wrap items-end gap-4">
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">از تاریخ</label>
|
|
||||||
<input
|
|
||||||
type="date"
|
|
||||||
className="rounded-xl border border-gray-200 px-3 py-2 text-sm focus:border-purple-600 focus:outline-none"
|
|
||||||
value={dates.startDate}
|
|
||||||
onChange={(e) => setDates({ ...dates, startDate: e.target.value })}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label className="block text-xs font-bold text-gray-700 mb-1.5">تا تاریخ</label>
|
|
||||||
<input
|
|
||||||
type="date"
|
|
||||||
className="rounded-xl border border-gray-200 px-3 py-2 text-sm focus:border-purple-600 focus:outline-none"
|
|
||||||
value={dates.endDate}
|
|
||||||
onChange={(e) => setDates({ ...dates, endDate: e.target.value })}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<Button variant="secondary" onClick={loadAnalytics} disabled={isAnalyticsLoading}>
|
|
||||||
اعمال فیلتر
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Stats Grid */}
|
|
||||||
{stats && (
|
|
||||||
<div className="grid grid-cols-2 gap-4 md:grid-cols-4 lg:grid-cols-7">
|
|
||||||
{[
|
|
||||||
['گفتگوها', stats.conversations, 'text-blue-600', 'bg-blue-50'],
|
|
||||||
['کل پیامها', stats.messages, 'text-purple-600', 'bg-purple-50'],
|
|
||||||
['کاربران عضو', stats.authenticated, 'text-emerald-600', 'bg-emerald-50'],
|
|
||||||
['مهمان', stats.anonymous, 'text-gray-600', 'bg-gray-100'],
|
|
||||||
['بیپاسخ', stats.unanswered, 'text-red-600', 'bg-red-50'],
|
|
||||||
['نیازمند پیگیری', stats.followup, 'text-amber-600', 'bg-amber-50'],
|
|
||||||
['سیگنال هشدار', stats.escalated, 'text-rose-600', 'bg-rose-50'],
|
|
||||||
].map(([label, value, textColor, bgColor]) => (
|
|
||||||
<div key={String(label)} className="rounded-2xl border border-gray-100 bg-white p-4 shadow-sm text-center">
|
|
||||||
<div className="text-xs font-bold text-gray-500 mb-1">{label}</div>
|
|
||||||
<div className={`text-2xl font-black ${textColor}`}>{value}</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Conversations list */}
|
|
||||||
{isAnalyticsLoading ? (
|
|
||||||
<div className="flex h-64 items-center justify-center rounded-2xl border border-gray-100 bg-white shadow-sm">
|
|
||||||
<Spinner size="lg" />
|
|
||||||
</div>
|
|
||||||
) : conversations.length === 0 ? (
|
|
||||||
<div className="rounded-2xl border border-dashed border-gray-300 bg-white p-12 text-center text-gray-400">
|
|
||||||
<MessageSquare className="mx-auto h-12 w-12 text-gray-300 mb-2" />
|
|
||||||
هنوز مکالمهای با پشتیبان هوشمند ثبت نشده است.
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="space-y-4">
|
|
||||||
{conversations.map((row) => (
|
|
||||||
<article key={row.id} className="rounded-2xl border border-gray-100 bg-white p-5 shadow-sm space-y-3">
|
|
||||||
<div className="flex items-center justify-between border-b border-gray-100 pb-3">
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<span className="font-bold text-sm text-gray-900">
|
|
||||||
{row.user
|
|
||||||
? `${row.user.firstName || ''} ${row.user.lastName || ''}`.trim() || 'کاربر ثبتنامشده'
|
|
||||||
: 'مشتری مهمان'}
|
|
||||||
</span>
|
|
||||||
{row.user?.mobile && (
|
|
||||||
<span className="text-xs font-mono text-gray-500 bg-gray-100 px-2 py-0.5 rounded-lg">
|
|
||||||
{row.user.mobile}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="text-xs text-gray-400 flex items-center gap-1">
|
|
||||||
<Clock className="h-3 w-3" />
|
|
||||||
{new Date(row.updatedAt).toLocaleString('fa-IR')}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex gap-2 text-xs">
|
|
||||||
{row.unanswered && <span className="rounded-lg bg-red-50 text-red-700 px-2.5 py-1 font-bold">بیپاسخ</span>}
|
|
||||||
{row.needsFollowup && <span className="rounded-lg bg-amber-50 text-amber-700 px-2.5 py-1 font-bold">نیازمند پیگیری</span>}
|
|
||||||
{row.escalationSignal && <span className="rounded-lg bg-rose-50 text-rose-700 px-2.5 py-1 font-bold">ارجاع فوری</span>}
|
|
||||||
{row.entryPath && <span className="rounded-lg bg-gray-50 text-gray-500 px-2.5 py-1 font-mono">صفحه: {row.entryPath}</span>}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="space-y-2 pt-1">
|
|
||||||
{row.messages.map((m, i) => (
|
|
||||||
<div
|
|
||||||
key={`${row.id}-${i}`}
|
|
||||||
className={`rounded-xl p-3 text-sm leading-relaxed ${
|
|
||||||
m.role === 'user' ? 'bg-purple-50/70 border border-purple-100 text-purple-950 mr-4' : 'bg-gray-50 border border-gray-100 text-gray-800 ml-4'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<div className="font-bold text-xs text-gray-500 mb-1">
|
|
||||||
{m.role === 'user' ? '👤 پیام مشتری:' : '🤖 پاسخ پشتیبان هوشمند:'}
|
|
||||||
</div>
|
|
||||||
<div>{m.content}</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</article>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,321 @@
|
|||||||
|
import { Edit2, Plus, Search, Trash2, Activity, Tag, Sparkles } from 'lucide-react';
|
||||||
|
import { useCallback, useEffect, useState } from 'react';
|
||||||
|
import { toast } from 'react-hot-toast';
|
||||||
|
import Button from '../components/ui/Button';
|
||||||
|
import ConfirmModal from '../components/ui/ConfirmModal';
|
||||||
|
import Modal from '../components/ui/Modal';
|
||||||
|
import Pagination from '../components/ui/Pagination';
|
||||||
|
import Spinner from '../components/ui/Spinner';
|
||||||
|
import api from '../services/api';
|
||||||
|
import { useSearchParams } from 'react-router-dom';
|
||||||
|
|
||||||
|
export interface Symptom {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
slug: string;
|
||||||
|
description?: string;
|
||||||
|
metaTitle?: string;
|
||||||
|
metaDescription?: string;
|
||||||
|
keywords?: string;
|
||||||
|
productsCount?: number;
|
||||||
|
createdAt?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function SymptomsPage() {
|
||||||
|
const [searchParams, setSearchParams] = useSearchParams();
|
||||||
|
const [symptoms, setSymptoms] = useState<Symptom[]>([]);
|
||||||
|
const [isLoading, setIsLoading] = useState(true);
|
||||||
|
const [search, setSearch] = useState(() => searchParams.get('search') || '');
|
||||||
|
const [page, setPage] = useState(() => Number(searchParams.get('page')) || 1);
|
||||||
|
const [totalPages, setTotalPages] = useState(1);
|
||||||
|
const limit = 15;
|
||||||
|
|
||||||
|
const [isModalOpen, setIsModalOpen] = useState(false);
|
||||||
|
const [editingSymptom, setEditingSymptom] = useState<Symptom | null>(null);
|
||||||
|
const [deleteTargetId, setDeleteTargetId] = useState<string | null>(null);
|
||||||
|
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||||
|
|
||||||
|
const [formData, setFormData] = useState({
|
||||||
|
name: '',
|
||||||
|
slug: '',
|
||||||
|
description: '',
|
||||||
|
metaTitle: '',
|
||||||
|
metaDescription: '',
|
||||||
|
keywords: ''
|
||||||
|
});
|
||||||
|
|
||||||
|
const openModal = (symptom: Symptom | null = null) => {
|
||||||
|
if (symptom) {
|
||||||
|
setEditingSymptom(symptom);
|
||||||
|
setFormData({
|
||||||
|
name: symptom.name,
|
||||||
|
slug: symptom.slug,
|
||||||
|
description: symptom.description || '',
|
||||||
|
metaTitle: symptom.metaTitle || '',
|
||||||
|
metaDescription: symptom.metaDescription || '',
|
||||||
|
keywords: symptom.keywords || ''
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
setEditingSymptom(null);
|
||||||
|
setFormData({
|
||||||
|
name: '',
|
||||||
|
slug: '',
|
||||||
|
description: '',
|
||||||
|
metaTitle: '',
|
||||||
|
metaDescription: '',
|
||||||
|
keywords: ''
|
||||||
|
});
|
||||||
|
}
|
||||||
|
setIsModalOpen(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const closeModal = () => {
|
||||||
|
setIsModalOpen(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const fetchSymptoms = useCallback(async () => {
|
||||||
|
try {
|
||||||
|
setIsLoading(true);
|
||||||
|
const res = await api.get('/admin/symptoms', { params: { page, limit, search } });
|
||||||
|
if (res.data?.data) {
|
||||||
|
setSymptoms(res.data.data);
|
||||||
|
setTotalPages(res.data.meta?.lastPage || 1);
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
toast.error('خطا در دریافت لیست علائم');
|
||||||
|
} finally {
|
||||||
|
setIsLoading(false);
|
||||||
|
}
|
||||||
|
}, [page, search]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
fetchSymptoms();
|
||||||
|
}, [fetchSymptoms]);
|
||||||
|
|
||||||
|
const handleSubmit = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
if (!formData.name.trim()) {
|
||||||
|
toast.error('نام علامت الزامی است');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
setIsSubmitting(true);
|
||||||
|
if (editingSymptom) {
|
||||||
|
await api.put(`/admin/symptoms/${editingSymptom.id}`, formData);
|
||||||
|
toast.success('علامت با موفقیت ویرایش و در تمامی محصولات همگام شد');
|
||||||
|
} else {
|
||||||
|
await api.post('/admin/symptoms', formData);
|
||||||
|
toast.success('علامت درمانی جدید با موفقیت ایجاد شد');
|
||||||
|
}
|
||||||
|
closeModal();
|
||||||
|
fetchSymptoms();
|
||||||
|
} catch {
|
||||||
|
toast.error('خطا در ذخیره اطلاعات علامت');
|
||||||
|
} finally {
|
||||||
|
setIsSubmitting(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDelete = async () => {
|
||||||
|
if (!deleteTargetId) return;
|
||||||
|
try {
|
||||||
|
await api.delete(`/admin/symptoms/${deleteTargetId}`);
|
||||||
|
toast.success('علامت با موفقیت حذف شد');
|
||||||
|
setDeleteTargetId(null);
|
||||||
|
fetchSymptoms();
|
||||||
|
} catch {
|
||||||
|
toast.error('خطا در حذف علامت');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-6 font-vazir" dir="rtl">
|
||||||
|
{/* Header */}
|
||||||
|
<div className="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 bg-white p-6 rounded-3xl border border-gray-100 shadow-sm">
|
||||||
|
<div>
|
||||||
|
<div className="flex items-center gap-2.5">
|
||||||
|
<span className="w-10 h-10 rounded-2xl bg-canina-blue/10 text-canina-blue flex items-center justify-center">
|
||||||
|
<Activity className="w-5 h-5 text-purple-600" />
|
||||||
|
</span>
|
||||||
|
<h1 className="text-xl font-black text-gray-900">مدیریت علائم بالینی و درمانی</h1>
|
||||||
|
</div>
|
||||||
|
<p className="text-xs text-gray-500 font-bold mt-1">
|
||||||
|
تعریف و ویرایش علائم، بهینهسازی متادیتاهای سئو و همگامسازی یکپارچه با محصولات کاتالوگ
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Button onClick={() => openModal()} className="bg-purple-600 hover:bg-purple-700 text-white rounded-2xl px-5 py-3 flex items-center gap-2 font-bold text-xs shadow-md shadow-purple-600/20">
|
||||||
|
<Plus className="w-4 h-4" />
|
||||||
|
<span>افزودن علامت جدید</span>
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Filter & Search */}
|
||||||
|
<div className="bg-white p-4 rounded-3xl border border-gray-100 shadow-sm flex items-center gap-3">
|
||||||
|
<div className="relative flex-1">
|
||||||
|
<Search className="w-4 h-4 text-gray-400 absolute right-3 top-1/2 -translate-y-1/2" />
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
placeholder="جستجوی علامت بالینی بر اساس نام یا اسلاگ..."
|
||||||
|
value={search}
|
||||||
|
onChange={(e) => {
|
||||||
|
setSearch(e.target.value);
|
||||||
|
setPage(1);
|
||||||
|
}}
|
||||||
|
className="w-full bg-gray-50 border border-gray-200 rounded-2xl py-2.5 pr-10 pl-4 text-xs focus:outline-none focus:ring-2 focus:ring-purple-500/20"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Table */}
|
||||||
|
<div className="bg-white rounded-3xl border border-gray-100 shadow-sm overflow-hidden">
|
||||||
|
{isLoading ? (
|
||||||
|
<div className="py-20 flex justify-center">
|
||||||
|
<Spinner />
|
||||||
|
</div>
|
||||||
|
) : symptoms.length === 0 ? (
|
||||||
|
<div className="py-20 text-center text-gray-400 font-bold text-sm">
|
||||||
|
هیچ علامت بالینی یافت نشد.
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="overflow-x-auto">
|
||||||
|
<table className="w-full text-right text-xs">
|
||||||
|
<thead className="bg-gray-50/75 border-b border-gray-100 text-gray-500 font-black uppercase">
|
||||||
|
<tr>
|
||||||
|
<th className="px-6 py-4">نام علامت بالینی</th>
|
||||||
|
<th className="px-6 py-4">اسلاگ URL</th>
|
||||||
|
<th className="px-6 py-4">محصولات متصل</th>
|
||||||
|
<th className="px-6 py-4">سئو متاتایتل</th>
|
||||||
|
<th className="px-6 py-4 text-left">عملیات</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody className="divide-y divide-gray-100">
|
||||||
|
{symptoms.map((symptom) => (
|
||||||
|
<tr key={symptom.id} className="hover:bg-purple-50/20 transition-colors">
|
||||||
|
<td className="px-6 py-4 font-black text-gray-900 flex items-center gap-2">
|
||||||
|
<Tag className="w-3.5 h-3.5 text-purple-600" />
|
||||||
|
<span>{symptom.name}</span>
|
||||||
|
</td>
|
||||||
|
<td className="px-6 py-4 font-mono text-gray-500 dir-ltr text-right">
|
||||||
|
{symptom.slug}
|
||||||
|
</td>
|
||||||
|
<td className="px-6 py-4">
|
||||||
|
<span className="px-2.5 py-1 bg-purple-50 text-purple-700 font-black rounded-lg border border-purple-100">
|
||||||
|
{symptom.productsCount || 0} محصول
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td className="px-6 py-4 text-gray-600 max-w-xs truncate" title={symptom.metaTitle}>
|
||||||
|
{symptom.metaTitle || '—'}
|
||||||
|
</td>
|
||||||
|
<td className="px-6 py-4 text-left space-x-2 space-x-reverse">
|
||||||
|
<button
|
||||||
|
onClick={() => openModal(symptom)}
|
||||||
|
className="p-2 text-blue-600 hover:bg-blue-50 rounded-xl transition-colors"
|
||||||
|
title="ویرایش و سئو"
|
||||||
|
>
|
||||||
|
<Edit2 className="w-4 h-4" />
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => setDeleteTargetId(symptom.id)}
|
||||||
|
className="p-2 text-red-600 hover:bg-red-50 rounded-xl transition-colors"
|
||||||
|
title="حذف"
|
||||||
|
>
|
||||||
|
<Trash2 className="w-4 h-4" />
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="p-4 border-t border-gray-100 flex justify-center">
|
||||||
|
<Pagination currentPage={page} totalPages={totalPages} onPageChange={(p) => setPage(p)} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Modal CRUD */}
|
||||||
|
<Modal isOpen={isModalOpen} onClose={closeModal} title={editingSymptom ? 'ویرایش علامت و سئو' : 'تعریف علامت جدید'}>
|
||||||
|
<form onSubmit={handleSubmit} className="space-y-4">
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs font-bold text-gray-700 mb-1">نام علامت درمانی (فارسی) *</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
required
|
||||||
|
value={formData.name}
|
||||||
|
onChange={(e) => setFormData({ ...formData, name: e.target.value })}
|
||||||
|
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-3 text-xs focus:outline-none focus:ring-2 focus:ring-purple-500/20"
|
||||||
|
placeholder="مثلاً: پوکی استخوان یا کمخونی"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs font-bold text-gray-700 mb-1">اسلاگ URL و انگلیسی</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={formData.slug}
|
||||||
|
onChange={(e) => setFormData({ ...formData, slug: e.target.value })}
|
||||||
|
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-3 text-xs dir-ltr focus:outline-none focus:ring-2 focus:ring-purple-500/20"
|
||||||
|
placeholder="anemia یا osteoporosis"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs font-bold text-gray-700 mb-1">توضیحات تشخیصی و بالینی</label>
|
||||||
|
<textarea
|
||||||
|
rows={3}
|
||||||
|
value={formData.description}
|
||||||
|
onChange={(e) => setFormData({ ...formData, description: e.target.value })}
|
||||||
|
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-3 text-xs focus:outline-none focus:ring-2 focus:ring-purple-500/20"
|
||||||
|
placeholder="توضیحات بالینی و پروتکلهای مکملهای درمانی..."
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="pt-2 border-t border-gray-100 space-y-3">
|
||||||
|
<div className="flex items-center gap-1.5 text-xs font-black text-purple-700">
|
||||||
|
<Sparkles className="w-3.5 h-3.5" />
|
||||||
|
<span>تنظیمات پیشرفته سئو (SEO Meta)</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label className="block text-[11px] font-bold text-gray-600 mb-1">Meta Title</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={formData.metaTitle}
|
||||||
|
onChange={(e) => setFormData({ ...formData, metaTitle: e.target.value })}
|
||||||
|
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-2.5 text-xs"
|
||||||
|
placeholder="عنوان سئو در نتایج گوگل..."
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label className="block text-[11px] font-bold text-gray-600 mb-1">Meta Description</label>
|
||||||
|
<textarea
|
||||||
|
rows={2}
|
||||||
|
value={formData.metaDescription}
|
||||||
|
onChange={(e) => setFormData({ ...formData, metaDescription: e.target.value })}
|
||||||
|
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-2.5 text-xs"
|
||||||
|
placeholder="توضیحات متای صفحه سئو..."
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex justify-end gap-2 pt-4">
|
||||||
|
<Button type="button" variant="outline" onClick={closeModal}>انصراف</Button>
|
||||||
|
<Button type="submit" disabled={isSubmitting} className="bg-purple-600 hover:bg-purple-700 text-white">
|
||||||
|
{isSubmitting ? 'در حال ثبت...' : (editingSymptom ? 'بروزرسانی یکپارچه' : 'ثبت علامت')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</Modal>
|
||||||
|
|
||||||
|
{/* Delete Confirmation */}
|
||||||
|
<ConfirmModal
|
||||||
|
isOpen={!!deleteTargetId}
|
||||||
|
onClose={() => setDeleteTargetId(null)}
|
||||||
|
onConfirm={handleDelete}
|
||||||
|
title="حذف علامت بالینی"
|
||||||
|
description="با حذف این علامت، ارتباط آن از تمام محصولات کاتالوگ نیز به طور خودکار حذف خواهد شد. آیا مطمئن هستید؟"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -13,9 +13,12 @@ const Products = lazyWithRetry(() => import('../pages/Products'));
|
|||||||
const Orders = lazyWithRetry(() => import('../pages/Orders'));
|
const Orders = lazyWithRetry(() => import('../pages/Orders'));
|
||||||
const Coupons = lazyWithRetry(() => import('../pages/Coupons'));
|
const Coupons = lazyWithRetry(() => import('../pages/Coupons'));
|
||||||
const SmartChatSettingsPage = lazyWithRetry(() => import('../pages/SmartChatSettingsPage'));
|
const SmartChatSettingsPage = lazyWithRetry(() => import('../pages/SmartChatSettingsPage'));
|
||||||
|
const SupportChatAnalyticsPage = lazyWithRetry(() => import('../pages/SupportChatAnalyticsPage'));
|
||||||
const Settings = lazyWithRetry(() => import('../pages/Settings'));
|
const Settings = lazyWithRetry(() => import('../pages/Settings'));
|
||||||
const Reports = lazyWithRetry(() => import('../pages/Reports'));
|
const Reports = lazyWithRetry(() => import('../pages/Reports'));
|
||||||
const Categories = lazyWithRetry(() => import('../pages/Categories'));
|
const Categories = lazyWithRetry(() => import('../pages/Categories'));
|
||||||
|
const SymptomsPage = lazyWithRetry(() => import('../pages/SymptomsPage'));
|
||||||
|
|
||||||
const Blogs = lazyWithRetry(() => import('../pages/Blogs'));
|
const Blogs = lazyWithRetry(() => import('../pages/Blogs'));
|
||||||
const Wiki = lazyWithRetry(() => import('../pages/Wiki'));
|
const Wiki = lazyWithRetry(() => import('../pages/Wiki'));
|
||||||
const Pets = lazyWithRetry(() => import('../pages/Pets'));
|
const Pets = lazyWithRetry(() => import('../pages/Pets'));
|
||||||
@@ -38,8 +41,6 @@ const ZibalPortalPage = lazyWithRetry(() => import('../pages/ZibalPortalPage'));
|
|||||||
const ShippingSettingsPage = lazyWithRetry(() => import('../pages/ShippingSettingsPage'));
|
const ShippingSettingsPage = lazyWithRetry(() => import('../pages/ShippingSettingsPage'));
|
||||||
const SystemSettingsPage = lazyWithRetry(() => import('../pages/SystemSettingsPage'));
|
const SystemSettingsPage = lazyWithRetry(() => import('../pages/SystemSettingsPage'));
|
||||||
const SmsSettingsPage = lazyWithRetry(() => import('../pages/SmsSettingsPage'));
|
const SmsSettingsPage = lazyWithRetry(() => import('../pages/SmsSettingsPage'));
|
||||||
const NotificationsSettingsPage = lazyWithRetry(() => import('../pages/NotificationsSettingsPage'));
|
|
||||||
const AdvisorsManagementPage = lazyWithRetry(() => import('../pages/AdvisorsManagementPage'));
|
|
||||||
const SslSettingsPage = lazyWithRetry(() => import('../pages/SslSettingsPage'));
|
const SslSettingsPage = lazyWithRetry(() => import('../pages/SslSettingsPage'));
|
||||||
const ApiKeysPage = lazyWithRetry(() => import('../pages/ApiKeysPage'));
|
const ApiKeysPage = lazyWithRetry(() => import('../pages/ApiKeysPage'));
|
||||||
const Transactions = lazyWithRetry(() => import('../pages/Transactions'));
|
const Transactions = lazyWithRetry(() => import('../pages/Transactions'));
|
||||||
@@ -82,21 +83,20 @@ export const router = createBrowserRouter([
|
|||||||
{ path: 'zibal-portal/*', element: <ZibalPortalPage /> },
|
{ path: 'zibal-portal/*', element: <ZibalPortalPage /> },
|
||||||
{ path: 'coupons/*', element: <Coupons /> },
|
{ path: 'coupons/*', element: <Coupons /> },
|
||||||
{ path: 'settings', element: <Settings /> },
|
{ path: 'settings', element: <Settings /> },
|
||||||
{ path: 'settings/smart-chat', element: <SmartChatSettingsPage /> },
|
{ path: 'settings/smart-chat', element: <SupportChatAnalyticsPage /> },
|
||||||
{ path: 'settings/smart-chat/config', element: <SmartChatSettingsPage /> },
|
{ path: 'settings/smart-chat/config', element: <SmartChatSettingsPage /> },
|
||||||
{ path: 'settings/payment-methods', element: <PaymentGatewaysPage /> },
|
{ path: 'settings/payment-methods', element: <PaymentGatewaysPage /> },
|
||||||
{ path: 'settings/shipping', element: <ShippingSettingsPage /> },
|
{ path: 'settings/shipping', element: <ShippingSettingsPage /> },
|
||||||
{ path: 'settings/ssl', element: <SslSettingsPage /> },
|
{ path: 'settings/ssl', element: <SslSettingsPage /> },
|
||||||
{ path: 'settings/api-keys', element: <ApiKeysPage /> },
|
{ path: 'settings/api-keys', element: <ApiKeysPage /> },
|
||||||
{ path: 'settings/sms', element: <SmsSettingsPage /> },
|
{ path: 'settings/sms', element: <SmsSettingsPage /> },
|
||||||
{ path: 'settings/notifications', element: <NotificationsSettingsPage /> },
|
|
||||||
{ path: 'advisors/*', element: <AdvisorsManagementPage /> },
|
|
||||||
{ path: 'leads/*', element: <AdvisorsManagementPage /> },
|
|
||||||
{ path: 'settings/seo', element: <SeoSettingsPage /> },
|
{ path: 'settings/seo', element: <SeoSettingsPage /> },
|
||||||
{ path: 'settings/financial', element: <FinancialSettingsPage /> },
|
{ path: 'settings/financial', element: <FinancialSettingsPage /> },
|
||||||
{ path: 'settings/system', element: <SystemSettingsPage /> },
|
{ path: 'settings/system', element: <SystemSettingsPage /> },
|
||||||
{ path: 'reports/*', element: <Reports /> },
|
{ path: 'reports/*', element: <Reports /> },
|
||||||
{ path: 'categories/*', element: <Categories /> },
|
{ path: 'categories/*', element: <Categories /> },
|
||||||
|
{ path: 'symptoms/*', element: <SymptomsPage /> },
|
||||||
|
|
||||||
{ path: 'blogs/*', element: <Blogs /> },
|
{ path: 'blogs/*', element: <Blogs /> },
|
||||||
{ path: 'wiki/*', element: <Wiki /> },
|
{ path: 'wiki/*', element: <Wiki /> },
|
||||||
{ path: 'videos/*', element: <Videos /> },
|
{ path: 'videos/*', element: <Videos /> },
|
||||||
|
|||||||
@@ -0,0 +1,194 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
||||||
|
import { render, screen, cleanup } from "@testing-library/react";
|
||||||
|
|
||||||
|
// Mock next/navigation
|
||||||
|
let currentPathname = "/";
|
||||||
|
const mockRouter = {
|
||||||
|
push: vi.fn(),
|
||||||
|
replace: vi.fn(),
|
||||||
|
back: vi.fn(),
|
||||||
|
prefetch: vi.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
vi.mock("next/navigation", () => ({
|
||||||
|
usePathname: () => currentPathname,
|
||||||
|
useRouter: () => mockRouter,
|
||||||
|
useSearchParams: () => new URLSearchParams(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Mock dynamic components to render test identifiers
|
||||||
|
vi.mock("next/dynamic", () => ({
|
||||||
|
default: (loader: any) => {
|
||||||
|
const str = loader.toString();
|
||||||
|
const isCart = str.includes("CartDrawer");
|
||||||
|
const isAuth = str.includes("AuthModal");
|
||||||
|
const isLogin = str.includes("LoginModal");
|
||||||
|
return function MockDynamic(props: any) {
|
||||||
|
if (props.isOpen === false) return null;
|
||||||
|
if (isCart) return <div data-testid="shell-cart-drawer" data-open={String(props.isOpen)} />;
|
||||||
|
if (isAuth) return <div data-testid="shell-auth-modal" data-open={String(props.isOpen)} />;
|
||||||
|
if (isLogin) return <div data-testid="shell-login-modal" data-open={String(props.isOpen)} />;
|
||||||
|
return <div data-testid="shell-dynamic-other" />;
|
||||||
|
};
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../components/Header", () => ({
|
||||||
|
default: () => <header data-testid="shell-header">Header</header>,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../components/Footer", () => ({
|
||||||
|
default: () => <footer data-testid="shell-footer">Footer</footer>,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../components/NetworkBanner", () => ({
|
||||||
|
NetworkBanner: () => null,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../components/NavigationProgressBar", () => ({
|
||||||
|
default: () => null,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../components/MobileBottomNav", () => ({
|
||||||
|
default: () => null,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../components/PrescriptionUploadModal", () => ({
|
||||||
|
default: () => null,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("sonner", () => ({
|
||||||
|
Toaster: () => null,
|
||||||
|
toast: { success: vi.fn(), error: vi.fn() },
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Mock real components used inside page routes
|
||||||
|
vi.mock("../components/AuthModal", () => ({
|
||||||
|
default: (props: any) => (
|
||||||
|
<div data-testid="page-auth-modal" data-isopen={String(props.isOpen)} />
|
||||||
|
),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../components/CartDrawer", () => ({
|
||||||
|
default: (props: any) => (
|
||||||
|
<div data-testid="page-cart-drawer" data-isopen={String(props.isOpen)} />
|
||||||
|
),
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Mock stores
|
||||||
|
const mockUserStoreState: any = {
|
||||||
|
isAuthModalOpen: false,
|
||||||
|
setAuthModalOpen: vi.fn(),
|
||||||
|
fetchProfile: vi.fn().mockResolvedValue({}),
|
||||||
|
user: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
vi.mock("../lib/store/userStore", () => {
|
||||||
|
const store = (selector?: any) => (typeof selector === "function" ? selector(mockUserStoreState) : mockUserStoreState);
|
||||||
|
store.getState = () => mockUserStoreState;
|
||||||
|
return { useUserStore: store };
|
||||||
|
});
|
||||||
|
|
||||||
|
const mockSettingsStoreState: any = {
|
||||||
|
fetchSettings: vi.fn().mockResolvedValue({}),
|
||||||
|
getText: vi.fn().mockReturnValue(""),
|
||||||
|
getBoolean: vi.fn().mockReturnValue(false),
|
||||||
|
};
|
||||||
|
|
||||||
|
vi.mock("../lib/store/settingsStore", () => {
|
||||||
|
const store = (selector?: any) => (typeof selector === "function" ? selector(mockSettingsStoreState) : mockSettingsStoreState);
|
||||||
|
store.getState = () => mockSettingsStoreState;
|
||||||
|
return { useSettingsStore: store };
|
||||||
|
});
|
||||||
|
|
||||||
|
const mockUIStoreState: any = {
|
||||||
|
isCartOpen: false,
|
||||||
|
isLoginModalOpen: false,
|
||||||
|
isB2BPortalOpen: false,
|
||||||
|
advisorData: null,
|
||||||
|
setCartOpen: vi.fn(),
|
||||||
|
setLoginModalOpen: vi.fn(),
|
||||||
|
setB2BPortalOpen: vi.fn(),
|
||||||
|
clearAdvisorData: vi.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
vi.mock("../lib/store/uiStore", () => {
|
||||||
|
const store = (selector?: any) => (typeof selector === "function" ? selector(mockUIStoreState) : mockUIStoreState);
|
||||||
|
store.getState = () => mockUIStoreState;
|
||||||
|
return { useUIStore: store };
|
||||||
|
});
|
||||||
|
|
||||||
|
import ClientLayout from "../app/ClientLayout";
|
||||||
|
import LoginPage from "../app/login/page";
|
||||||
|
import CartPage from "../app/cart/page";
|
||||||
|
|
||||||
|
describe("ClientLayout Shell & Singleton Modals Integration (UX-28)", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
mockUserStoreState.isAuthModalOpen = false;
|
||||||
|
mockUIStoreState.isCartOpen = false;
|
||||||
|
currentPathname = "/";
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
cleanup();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("renders singleton CartDrawer and AuthModal in ClientLayout on normal routes when opened", () => {
|
||||||
|
mockUIStoreState.isCartOpen = true;
|
||||||
|
mockUserStoreState.isAuthModalOpen = true;
|
||||||
|
|
||||||
|
render(
|
||||||
|
<ClientLayout>
|
||||||
|
<div>Content</div>
|
||||||
|
</ClientLayout>
|
||||||
|
);
|
||||||
|
|
||||||
|
// On normal route, Header, Footer, and active drawers are rendered
|
||||||
|
expect(screen.getByTestId("shell-header")).toBeTruthy();
|
||||||
|
expect(screen.getByTestId("shell-footer")).toBeTruthy();
|
||||||
|
expect(screen.getByTestId("shell-cart-drawer")).toBeTruthy();
|
||||||
|
expect(screen.getByTestId("shell-auth-modal")).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("ensures no duplicate CartDrawer exists when user visits /cart utility route", () => {
|
||||||
|
currentPathname = "/cart";
|
||||||
|
mockUIStoreState.isCartOpen = true; // Even if UI store flag was left open
|
||||||
|
|
||||||
|
const { container } = render(
|
||||||
|
<ClientLayout>
|
||||||
|
<CartPage />
|
||||||
|
</ClientLayout>
|
||||||
|
);
|
||||||
|
|
||||||
|
// Footer and shell-level CartDrawer must be suppressed on /cart
|
||||||
|
expect(screen.queryByTestId("shell-footer")).toBeNull();
|
||||||
|
|
||||||
|
// Page level cart drawer is present
|
||||||
|
expect(screen.getByTestId("page-cart-drawer")).toBeTruthy();
|
||||||
|
|
||||||
|
// Shell level dynamic cart drawer is NOT rendered because isUtilityRoute is true
|
||||||
|
expect(screen.queryByTestId("shell-cart-drawer")).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("ensures no duplicate AuthModal exists when user visits /login utility route", () => {
|
||||||
|
currentPathname = "/login";
|
||||||
|
mockUserStoreState.isAuthModalOpen = true; // Even if userStore auth flag was left open
|
||||||
|
|
||||||
|
const { container } = render(
|
||||||
|
<ClientLayout>
|
||||||
|
<LoginPage />
|
||||||
|
</ClientLayout>
|
||||||
|
);
|
||||||
|
|
||||||
|
// Footer and shell-level AuthModal must be suppressed on /login
|
||||||
|
expect(screen.queryByTestId("shell-footer")).toBeNull();
|
||||||
|
|
||||||
|
// Page level auth modal is present
|
||||||
|
expect(screen.getByTestId("page-auth-modal")).toBeTruthy();
|
||||||
|
|
||||||
|
// Shell level dynamic auth modal is NOT rendered because isUtilityRoute is true
|
||||||
|
expect(screen.queryByTestId("shell-auth-modal")).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -38,10 +38,12 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
|
|||||||
const setLoginModalOpen = useUIStore((state) => state.setLoginModalOpen);
|
const setLoginModalOpen = useUIStore((state) => state.setLoginModalOpen);
|
||||||
const setB2BPortalOpen = useUIStore((state) => state.setB2BPortalOpen);
|
const setB2BPortalOpen = useUIStore((state) => state.setB2BPortalOpen);
|
||||||
const clearAdvisorData = useUIStore((state) => state.clearAdvisorData);
|
const clearAdvisorData = useUIStore((state) => state.clearAdvisorData);
|
||||||
const [isPrescriptionModalOpen, setIsPrescriptionModalOpen] = useState(false);
|
const isPrescriptionModalOpen = useUIStore((state) => state.isPrescriptionModalOpen);
|
||||||
|
const setPrescriptionModalOpen = useUIStore((state) => state.setPrescriptionModalOpen);
|
||||||
|
|
||||||
const pathname = usePathname();
|
const pathname = usePathname();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
const isUtilityRoute = pathname === "/login" || pathname === "/cart";
|
||||||
|
|
||||||
const fetchProfile = useUserStore((state) => state.fetchProfile);
|
const fetchProfile = useUserStore((state) => state.fetchProfile);
|
||||||
const role = useUserStore((state) => state.role);
|
const role = useUserStore((state) => state.role);
|
||||||
@@ -177,17 +179,17 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
|
|||||||
<main className={`min-h-screen ${pathname === '/catalog' ? 'bg-slate-950' : ''}`}>
|
<main className={`min-h-screen ${pathname === '/catalog' ? 'bg-slate-950' : ''}`}>
|
||||||
{children}
|
{children}
|
||||||
</main>
|
</main>
|
||||||
<Footer onNavigate={handleNavigate} onShopNavigate={navigateToShop} onB2BOpen={() => setB2BPortalOpen(true)} />
|
{!isUtilityRoute && <Footer onNavigate={handleNavigate} onShopNavigate={navigateToShop} onB2BOpen={() => setB2BPortalOpen(true)} />}
|
||||||
|
|
||||||
{isB2BPortalOpen && isB2BEnabled && (
|
{isB2BPortalOpen && isB2BEnabled && (
|
||||||
<B2BPortal onClose={() => setB2BPortalOpen(false)} />
|
<B2BPortal onClose={() => setB2BPortalOpen(false)} />
|
||||||
)}
|
)}
|
||||||
<CartDrawer
|
{!isUtilityRoute && <CartDrawer
|
||||||
isOpen={isCartOpen}
|
isOpen={isCartOpen}
|
||||||
onClose={() => setCartOpen(false)}
|
onClose={() => setCartOpen(false)}
|
||||||
onCheckout={() => { setCartOpen(false); router.push('/checkout'); }}
|
onCheckout={() => { setCartOpen(false); router.push('/checkout'); }}
|
||||||
onShopNavigate={navigateToShop}
|
onShopNavigate={navigateToShop}
|
||||||
/>
|
/>}
|
||||||
<LoginModal
|
<LoginModal
|
||||||
isOpen={isLoginModalOpen}
|
isOpen={isLoginModalOpen}
|
||||||
onClose={() => {
|
onClose={() => {
|
||||||
@@ -223,21 +225,17 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
|
|||||||
petName={advisorData?.name as string | undefined}
|
petName={advisorData?.name as string | undefined}
|
||||||
isAdvisorContext={!!advisorData}
|
isAdvisorContext={!!advisorData}
|
||||||
/>
|
/>
|
||||||
<AuthModal
|
{!isUtilityRoute && <AuthModal
|
||||||
isOpen={isAuthModalOpen}
|
isOpen={isAuthModalOpen}
|
||||||
onClose={() => setAuthModalOpen(false)}
|
onClose={() => setAuthModalOpen(false)}
|
||||||
/>
|
/>}
|
||||||
<PrescriptionUploadModal
|
<PrescriptionUploadModal
|
||||||
isOpen={isPrescriptionModalOpen}
|
isOpen={isPrescriptionModalOpen}
|
||||||
onClose={() => setIsPrescriptionModalOpen(false)}
|
onClose={() => setPrescriptionModalOpen(false)}
|
||||||
/>
|
/>
|
||||||
<MobileBottomNav
|
<MobileBottomNav
|
||||||
onPrescriptionOpen={() => {
|
onPrescriptionOpen={() => {
|
||||||
if (!isLoggedIn) {
|
setPrescriptionModalOpen(true);
|
||||||
setAuthModalOpen(true);
|
|
||||||
} else {
|
|
||||||
setIsPrescriptionModalOpen(true);
|
|
||||||
}
|
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<Toaster position="top-center" expand={true} richColors closeButton />
|
<Toaster position="top-center" expand={true} richColors closeButton />
|
||||||
|
|||||||
@@ -72,12 +72,12 @@ export default function HomeClient({ initialData }: HomeClientProps) {
|
|||||||
|
|
||||||
|
|
||||||
{/* Navigation to Sections */}
|
{/* Navigation to Sections */}
|
||||||
<section className="py-8 sm:py-14 bg-medical-gray-50 border-y border-medical-gray-100 font-sans">
|
<section className="py-5 sm:py-14 bg-medical-gray-50 border-y border-medical-gray-100 font-sans">
|
||||||
<div className="max-w-7xl mx-auto px-4 grid md:grid-cols-2 gap-5 sm:gap-8">
|
<div className="max-w-7xl mx-auto px-4 grid md:grid-cols-2 gap-5 sm:gap-8">
|
||||||
{/* Specialty Shop Card */}
|
{/* Specialty Shop Card */}
|
||||||
<Link
|
<Link
|
||||||
href="/shop"
|
href="/shop"
|
||||||
className="group relative overflow-hidden rounded-3xl sm:rounded-[2.5rem] bg-gradient-to-br from-white via-blue-50/50 to-canina-blue/10 p-6 sm:p-10 border border-blue-200/70 shadow-md hover:shadow-2xl hover:border-canina-blue/50 hover:-translate-y-1 transition-all duration-500 block"
|
className="group relative overflow-hidden rounded-2xl sm:rounded-[2.5rem] bg-gradient-to-br from-white via-blue-50/50 to-canina-blue/10 p-4 sm:p-10 border border-blue-200/70 shadow-xs sm:shadow-md hover:shadow-2xl hover:border-canina-blue/50 hover:-translate-y-1 transition-all duration-500 block"
|
||||||
>
|
>
|
||||||
{/* Ambient Glows */}
|
{/* Ambient Glows */}
|
||||||
<div className="absolute -top-16 -left-16 w-44 h-44 bg-canina-blue/15 rounded-full blur-3xl group-hover:scale-150 transition-transform duration-700 pointer-events-none" />
|
<div className="absolute -top-16 -left-16 w-44 h-44 bg-canina-blue/15 rounded-full blur-3xl group-hover:scale-150 transition-transform duration-700 pointer-events-none" />
|
||||||
@@ -112,7 +112,7 @@ export default function HomeClient({ initialData }: HomeClientProps) {
|
|||||||
{/* Scientific Wiki Card */}
|
{/* Scientific Wiki Card */}
|
||||||
<Link
|
<Link
|
||||||
href="/wiki"
|
href="/wiki"
|
||||||
className="group relative overflow-hidden rounded-3xl sm:rounded-[2.5rem] bg-gradient-to-br from-white via-emerald-50/50 to-teal-500/10 p-6 sm:p-10 border border-emerald-200/70 shadow-md hover:shadow-2xl hover:border-emerald-500/50 hover:-translate-y-1 transition-all duration-500 block"
|
className="group relative overflow-hidden rounded-2xl sm:rounded-[2.5rem] bg-gradient-to-br from-white via-emerald-50/50 to-teal-500/10 p-4 sm:p-10 border border-emerald-200/70 shadow-xs sm:shadow-md hover:shadow-2xl hover:border-emerald-500/50 hover:-translate-y-1 transition-all duration-500 block"
|
||||||
>
|
>
|
||||||
{/* Ambient Glows */}
|
{/* Ambient Glows */}
|
||||||
<div className="absolute -top-16 -left-16 w-44 h-44 bg-emerald-500/15 rounded-full blur-3xl group-hover:scale-150 transition-transform duration-700 pointer-events-none" />
|
<div className="absolute -top-16 -left-16 w-44 h-44 bg-emerald-500/15 rounded-full blur-3xl group-hover:scale-150 transition-transform duration-700 pointer-events-none" />
|
||||||
@@ -147,7 +147,7 @@ export default function HomeClient({ initialData }: HomeClientProps) {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
{/* About Section Teaser */}
|
{/* About Section Teaser */}
|
||||||
<section className="py-8 sm:py-16 bg-white overflow-hidden font-sans">
|
<section className="py-5 sm:py-16 bg-white overflow-hidden font-sans">
|
||||||
<div className="max-w-7xl mx-auto px-4 grid lg:grid-cols-2 gap-8 lg:gap-24 items-center">
|
<div className="max-w-7xl mx-auto px-4 grid lg:grid-cols-2 gap-8 lg:gap-24 items-center">
|
||||||
<div className="relative overflow-hidden rounded-2xl sm:rounded-[3rem]">
|
<div className="relative overflow-hidden rounded-2xl sm:rounded-[3rem]">
|
||||||
<div className="absolute -top-10 -right-10 w-40 h-40 bg-canina-blue/5 rounded-full blur-3xl" />
|
<div className="absolute -top-10 -right-10 w-40 h-40 bg-canina-blue/5 rounded-full blur-3xl" />
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
import { NextResponse } from 'next/server';
|
||||||
|
|
||||||
|
export const dynamic = 'force-dynamic';
|
||||||
|
|
||||||
|
export async function GET() {
|
||||||
|
const commitSha =
|
||||||
|
process.env.NEXT_PUBLIC_GIT_COMMIT ||
|
||||||
|
process.env.GIT_COMMIT_SHA ||
|
||||||
|
process.env.COMMIT_SHA ||
|
||||||
|
'local-build';
|
||||||
|
|
||||||
|
const buildTime =
|
||||||
|
process.env.BUILD_TIMESTAMP ||
|
||||||
|
process.env.NEXT_PUBLIC_BUILD_TIME ||
|
||||||
|
new Date().toISOString();
|
||||||
|
|
||||||
|
const environment = process.env.NODE_ENV || 'production';
|
||||||
|
const service = 'frontend';
|
||||||
|
|
||||||
|
return NextResponse.json({
|
||||||
|
status: 'ok',
|
||||||
|
service,
|
||||||
|
commitSha,
|
||||||
|
buildTime,
|
||||||
|
environment,
|
||||||
|
}, {
|
||||||
|
status: 200,
|
||||||
|
headers: {
|
||||||
|
'Cache-Control': 'no-store, no-cache, must-revalidate',
|
||||||
|
'X-Commit-Sha': commitSha,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import { describe, it, expect } from 'vitest';
|
||||||
|
import { GET } from './route';
|
||||||
|
|
||||||
|
describe('Deployment Metadata Endpoint Gate (UX-37)', () => {
|
||||||
|
it('returns valid deployment signature, status and commit header', async () => {
|
||||||
|
const response = await GET();
|
||||||
|
expect(response.status).toBe(200);
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
expect(data.status).toBe('ok');
|
||||||
|
expect(data.service).toBe('frontend');
|
||||||
|
expect(data).toHaveProperty('commitSha');
|
||||||
|
expect(data).toHaveProperty('buildTime');
|
||||||
|
expect(data).toHaveProperty('environment');
|
||||||
|
|
||||||
|
expect(response.headers.get('Cache-Control')).toBe('no-store, no-cache, must-revalidate');
|
||||||
|
expect(response.headers.get('X-Commit-Sha')).toBeDefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
||||||
|
import React from 'react';
|
||||||
|
import BlogPostPage from './page';
|
||||||
|
|
||||||
|
vi.mock('../../../lib/seo', () => ({
|
||||||
|
getSeoConfig: vi.fn().mockResolvedValue({
|
||||||
|
brandNameFa: 'کنینا ایران',
|
||||||
|
canonicalBaseUrl: 'https://canina.ir',
|
||||||
|
ogImageUrl: '/assets/og.jpg',
|
||||||
|
defaultMetaDescription: 'توضیحات پیشفرض',
|
||||||
|
titleSeparator: '|',
|
||||||
|
titlePosition: 'suffix',
|
||||||
|
}),
|
||||||
|
formatPageTitle: vi.fn((title) => `${title} | کنینا ایران`),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock('../../../components/BlogPostClient', () => ({
|
||||||
|
default: () => <div data-testid="blog-post-client" />,
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe('BlogPostPage FAQPage Schema injection (SEO-P1-07)', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.stubEnv('INTERNAL_API_URL', 'http://backend:3000/api');
|
||||||
|
vi.stubEnv('NEXT_PUBLIC_SITE_URL', 'https://canina.ir');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.unstubAllGlobals();
|
||||||
|
vi.unstubAllEnvs();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('injects FAQPage JSON-LD schema when article contains questions and answers', async () => {
|
||||||
|
const blogData = {
|
||||||
|
slug: 'joint-health',
|
||||||
|
title: 'سلامت مفاصل سگ',
|
||||||
|
content: `
|
||||||
|
<article>
|
||||||
|
<p>مقدمهای درباره مفاصل سگ.</p>
|
||||||
|
<details>
|
||||||
|
<summary>آیا این مکمل برای سگ مسن مناسب است؟</summary>
|
||||||
|
<p>بله، بسیار توصیه میشود و روند تخریب مفصل را کند میکند.</p>
|
||||||
|
</details>
|
||||||
|
</article>
|
||||||
|
`,
|
||||||
|
createdAt: '2026-01-01',
|
||||||
|
publishedAt: '2026-01-01',
|
||||||
|
};
|
||||||
|
|
||||||
|
vi.stubGlobal(
|
||||||
|
'fetch',
|
||||||
|
vi.fn().mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
json: async () => blogData,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
const jsx = await BlogPostPage({ params: Promise.resolve({ slug: 'joint-health' }) });
|
||||||
|
expect(jsx).toBeDefined();
|
||||||
|
|
||||||
|
// Verify scripts in JSX tree
|
||||||
|
const scripts = React.Children.toArray(jsx.props.children).filter(
|
||||||
|
(child: any) => child?.type === 'script' && child?.props?.['type'] === 'application/ld+json'
|
||||||
|
);
|
||||||
|
|
||||||
|
// There should be 3 schemas: Article, Breadcrumb, and FAQPage
|
||||||
|
expect(scripts.length).toBe(3);
|
||||||
|
|
||||||
|
const faqScript: any = scripts.find((s: any) => s.props['data-testid'] === 'faq-schema');
|
||||||
|
expect(faqScript).toBeDefined();
|
||||||
|
|
||||||
|
const faqJson = JSON.parse(faqScript.props.dangerouslySetInnerHTML.__html);
|
||||||
|
expect(faqJson['@type']).toBe('FAQPage');
|
||||||
|
expect(faqJson.mainEntity).toHaveLength(1);
|
||||||
|
expect(faqJson.mainEntity[0].name).toBe('آیا این مکمل برای سگ مسن مناسب است؟');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not inject FAQPage schema when article does not have FAQs', async () => {
|
||||||
|
const blogData = {
|
||||||
|
slug: 'nutrition',
|
||||||
|
title: 'تغذیه سگ',
|
||||||
|
content: '<p>یک مقاله ساده بدون سوال و جواب یا آکاردئون.</p>',
|
||||||
|
createdAt: '2026-01-01',
|
||||||
|
publishedAt: '2026-01-01',
|
||||||
|
};
|
||||||
|
|
||||||
|
vi.stubGlobal(
|
||||||
|
'fetch',
|
||||||
|
vi.fn().mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
json: async () => blogData,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
const jsx = await BlogPostPage({ params: Promise.resolve({ slug: 'nutrition' }) });
|
||||||
|
const scripts = React.Children.toArray(jsx.props.children).filter(
|
||||||
|
(child: any) => child?.type === 'script' && child?.props?.['type'] === 'application/ld+json'
|
||||||
|
);
|
||||||
|
|
||||||
|
// Only Article and Breadcrumb schemas
|
||||||
|
expect(scripts.length).toBe(2);
|
||||||
|
const faqScript = scripts.find((s: any) => s.props['data-testid'] === 'faq-schema');
|
||||||
|
expect(faqScript).toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
||||||
vi.mock('../../../lib/seo', () => ({ getSeoConfig: async () => ({brandNameFa:'Canina', ogImageUrl:'https://example.org/unrelated.webp'}), formatPageTitle: (s:string) => s }));
|
|
||||||
vi.mock('../../../components/BlogPostClient', () => ({default: () => null}));
|
|
||||||
vi.mock('next/navigation', () => ({notFound: () => {throw Error('404')}}));
|
|
||||||
import Page, {generateMetadata} from './page';
|
|
||||||
const base = {title:'Existing article',content:'Body',slug:'existing',publishedAt:'2026-11-15T05:41:53Z'};
|
|
||||||
let blog: any;
|
|
||||||
beforeEach(() => {blog={...base}; vi.stubGlobal('fetch',vi.fn(async () => ({ok:true,json:async () => blog})));});
|
|
||||||
describe('article-owned media', () => {
|
|
||||||
it.each([null,undefined,'',' '])('omits unrelated imagery for %s', async (image) => {
|
|
||||||
blog.imageUrl=image; blog.ogImage=image;
|
|
||||||
const metadata:any=await generateMetadata({params:Promise.resolve({slug:'existing'})});
|
|
||||||
expect(metadata.openGraph.images).toEqual([]);
|
|
||||||
expect(metadata.twitter.images).toEqual([]);
|
|
||||||
expect(metadata.twitter.card).toBe('summary');
|
|
||||||
const page:any=await Page({params:Promise.resolve({slug:'existing'})});
|
|
||||||
const schema=JSON.parse(page.props.children[0].props.dangerouslySetInnerHTML.__html);
|
|
||||||
expect(schema).not.toHaveProperty('image');
|
|
||||||
});
|
|
||||||
it('retains authored OG precedence and Article image', async () => {
|
|
||||||
blog.imageUrl='/uploads/article.webp'; blog.ogImage='/uploads/social.webp';
|
|
||||||
const metadata:any=await generateMetadata({params:Promise.resolve({slug:'existing'})});
|
|
||||||
expect(metadata.openGraph.images[0].url).toBe('/uploads/social.webp');
|
|
||||||
const page:any=await Page({params:Promise.resolve({slug:'existing'})});
|
|
||||||
expect(JSON.parse(page.props.children[0].props.dangerouslySetInnerHTML.__html).image[0]).toContain('/uploads/article.webp');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -4,6 +4,8 @@ import type { Metadata } from 'next';
|
|||||||
import BlogPostClient from "../../../components/BlogPostClient";
|
import BlogPostClient from "../../../components/BlogPostClient";
|
||||||
import { getSeoConfig, formatPageTitle } from "../../../lib/seo";
|
import { getSeoConfig, formatPageTitle } from "../../../lib/seo";
|
||||||
import { safeJsonLd } from "../../../lib/schema";
|
import { safeJsonLd } from "../../../lib/schema";
|
||||||
|
import { sanitizeBlogHtml } from "../../../lib/sanitizeBlogHtml";
|
||||||
|
import { extractFaqsFromHtml, generateFAQPageSchema } from "../../../lib/extractFaqs";
|
||||||
|
|
||||||
function safeIso(val: any, fallback?: string): string | undefined {
|
function safeIso(val: any, fallback?: string): string | undefined {
|
||||||
if (!val) return fallback;
|
if (!val) return fallback;
|
||||||
@@ -77,7 +79,7 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
|
|||||||
(typeof blog.content === 'string' ? blog.content.substring(0, 155).replace(/<[^>]+>/g, '') : '') ||
|
(typeof blog.content === 'string' ? blog.content.substring(0, 155).replace(/<[^>]+>/g, '') : '') ||
|
||||||
config.defaultMetaDescription;
|
config.defaultMetaDescription;
|
||||||
const canonicalUrl = blog.canonicalUrl ? blog.canonicalUrl.replace(/\/+$/, '') : `${siteUrl}/blog/${slug}`;
|
const canonicalUrl = blog.canonicalUrl ? blog.canonicalUrl.replace(/\/+$/, '') : `${siteUrl}/blog/${slug}`;
|
||||||
const ogImageUrl = (typeof blog.ogImage === 'string' ? blog.ogImage.trim() : '') || (typeof blog.imageUrl === 'string' ? blog.imageUrl.trim() : '');
|
const ogImageUrl = blog.ogImage || blog.imageUrl || config.ogImageUrl;
|
||||||
const ogTitle = blog.ogTitle || title;
|
const ogTitle = blog.ogTitle || title;
|
||||||
const ogDesc = blog.ogDescription || description;
|
const ogDesc = blog.ogDescription || description;
|
||||||
|
|
||||||
@@ -133,14 +135,14 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
|
|||||||
openGraph: {
|
openGraph: {
|
||||||
title: ogTitle,
|
title: ogTitle,
|
||||||
description: ogDesc,
|
description: ogDesc,
|
||||||
images: ogImageUrl ? [
|
images: [
|
||||||
{
|
{
|
||||||
url: ogImageUrl,
|
url: ogImageUrl,
|
||||||
width: 1200,
|
width: 1200,
|
||||||
height: 630,
|
height: 630,
|
||||||
alt: blog.imageAlt || blog.title || title,
|
alt: blog.imageAlt || blog.title || title,
|
||||||
},
|
},
|
||||||
] : [],
|
],
|
||||||
url: canonicalUrl,
|
url: canonicalUrl,
|
||||||
siteName: config.brandNameFa,
|
siteName: config.brandNameFa,
|
||||||
type: "article",
|
type: "article",
|
||||||
@@ -150,10 +152,10 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
|
|||||||
tags: blog.tags?.map((t: any) => typeof t === 'string' ? t : t?.name).filter(Boolean) || [],
|
tags: blog.tags?.map((t: any) => typeof t === 'string' ? t : t?.name).filter(Boolean) || [],
|
||||||
},
|
},
|
||||||
twitter: {
|
twitter: {
|
||||||
card: ogImageUrl ? "summary_large_image" : "summary",
|
card: "summary_large_image",
|
||||||
title: ogTitle,
|
title: ogTitle,
|
||||||
description: ogDesc,
|
description: ogDesc,
|
||||||
images: ogImageUrl ? [ogImageUrl] : [],
|
images: [ogImageUrl],
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -182,6 +184,7 @@ export default async function BlogPostPage({ params }: { params: Promise<{ slug:
|
|||||||
const publishedIso = safeIso(blog.publishedAt) || safeIso(blog.createdAt) || new Date().toISOString();
|
const publishedIso = safeIso(blog.publishedAt) || safeIso(blog.createdAt) || new Date().toISOString();
|
||||||
const modifiedIso = safeIso(blog.updatedAt) || publishedIso;
|
const modifiedIso = safeIso(blog.updatedAt) || publishedIso;
|
||||||
|
|
||||||
|
const sanitizedContent = sanitizeBlogHtml(blog.content);
|
||||||
const schemaType = blog.schemaType || 'BlogPosting';
|
const schemaType = blog.schemaType || 'BlogPosting';
|
||||||
|
|
||||||
const authorSchema = blog.author && (blog.author.firstName || blog.author.lastName)
|
const authorSchema = blog.author && (blog.author.firstName || blog.author.lastName)
|
||||||
@@ -205,9 +208,9 @@ export default async function BlogPostPage({ params }: { params: Promise<{ slug:
|
|||||||
},
|
},
|
||||||
headline: blog.title,
|
headline: blog.title,
|
||||||
description: blog.excerpt || blog.metaDescription || blog.title,
|
description: blog.excerpt || blog.metaDescription || blog.title,
|
||||||
...(typeof blog.imageUrl === 'string' && blog.imageUrl.trim()
|
image: blog.imageUrl
|
||||||
? { image: [new URL(blog.imageUrl.trim(), siteUrl).href] }
|
? [blog.imageUrl.startsWith('http') ? blog.imageUrl : `${siteUrl}${blog.imageUrl.startsWith('/') ? '' : '/'}${blog.imageUrl}`]
|
||||||
: {}),
|
: [config.ogImageUrl.startsWith('http') ? config.ogImageUrl : `${siteUrl}${config.ogImageUrl.startsWith('/') ? '' : '/'}${config.ogImageUrl}`],
|
||||||
datePublished: publishedIso,
|
datePublished: publishedIso,
|
||||||
dateModified: modifiedIso,
|
dateModified: modifiedIso,
|
||||||
author: authorSchema,
|
author: authorSchema,
|
||||||
@@ -265,6 +268,10 @@ export default async function BlogPostPage({ params }: { params: Promise<{ slug:
|
|||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// SEO-P1-07: Auto-detect and inject FAQPage Schema when article content contains Q&As or accordion structures
|
||||||
|
const extractedFaqs = extractFaqsFromHtml(blog.content || '');
|
||||||
|
const faqPageSchema = generateFAQPageSchema(extractedFaqs);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<script
|
<script
|
||||||
@@ -275,10 +282,18 @@ export default async function BlogPostPage({ params }: { params: Promise<{ slug:
|
|||||||
type="application/ld+json"
|
type="application/ld+json"
|
||||||
dangerouslySetInnerHTML={{ __html: safeJsonLd(breadcrumbJsonLd) }}
|
dangerouslySetInnerHTML={{ __html: safeJsonLd(breadcrumbJsonLd) }}
|
||||||
/>
|
/>
|
||||||
|
{faqPageSchema && (
|
||||||
|
<script
|
||||||
|
type="application/ld+json"
|
||||||
|
data-testid="faq-schema"
|
||||||
|
dangerouslySetInnerHTML={{ __html: safeJsonLd(faqPageSchema) }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
<BlogPostClient
|
<BlogPostClient
|
||||||
blog={blog}
|
blog={blog}
|
||||||
publishedDate={publishedDate}
|
publishedDate={publishedDate}
|
||||||
authorName={authorName}
|
authorName={authorName}
|
||||||
|
sanitizedContent={sanitizedContent}
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { describe, expect, it, vi } from "vitest";
|
||||||
|
import { render, screen } from "@testing-library/react";
|
||||||
|
import CartPage from "./page";
|
||||||
|
|
||||||
|
vi.mock("../../components/CartDrawer", () => ({
|
||||||
|
default: ({ isOpen, onCheckout, onShopNavigate }: { isOpen: boolean; onCheckout: () => void; onShopNavigate: () => void }) => isOpen ? (
|
||||||
|
<div role="region" aria-label="سبد خرید">
|
||||||
|
<button onClick={onCheckout}>تکمیل سفارش</button>
|
||||||
|
<button onClick={onShopNavigate}>مشاهده محصولات</button>
|
||||||
|
</div>
|
||||||
|
) : null,
|
||||||
|
}));
|
||||||
|
vi.mock("next/navigation", () => ({ useRouter: () => ({ push: vi.fn() }) }));
|
||||||
|
|
||||||
|
describe("/cart route", () => {
|
||||||
|
it("renders the cart experience and provides journey actions", () => {
|
||||||
|
render(<CartPage />);
|
||||||
|
expect(screen.getByRole("heading", { name: "سبد خرید" })).toBeTruthy();
|
||||||
|
expect(screen.getAllByRole("region", { name: "سبد خرید" })).toHaveLength(1);
|
||||||
|
expect(screen.getByRole("button", { name: "تکمیل سفارش" })).toBeTruthy();
|
||||||
|
expect(screen.getByRole("button", { name: "مشاهده محصولات" })).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import CartDrawer from "../../components/CartDrawer";
|
||||||
|
|
||||||
|
export default function CartPage() {
|
||||||
|
const router = useRouter();
|
||||||
|
return (
|
||||||
|
<main className="min-h-screen bg-medical-gray-50" dir="rtl">
|
||||||
|
<h1 className="sr-only">سبد خرید</h1>
|
||||||
|
<CartDrawer
|
||||||
|
isOpen
|
||||||
|
onClose={() => router.push("/")}
|
||||||
|
onCheckout={() => router.push("/checkout")}
|
||||||
|
onShopNavigate={() => router.push("/shop")}
|
||||||
|
/>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -42,7 +42,7 @@ export default async function ContactPage() {
|
|||||||
type="application/ld+json"
|
type="application/ld+json"
|
||||||
dangerouslySetInnerHTML={{ __html: safeJsonLd(breadcrumbs) }}
|
dangerouslySetInnerHTML={{ __html: safeJsonLd(breadcrumbs) }}
|
||||||
/>
|
/>
|
||||||
<div className="bg-medical-gray-50 py-16 px-4 sm:px-6 lg:px-8 font-vazir" dir="rtl">
|
<div className="bg-medical-gray-50 pt-10 pb-28 sm:py-16 px-4 sm:px-6 lg:px-8 font-vazir" dir="rtl">
|
||||||
<div className="max-w-6xl mx-auto space-y-16">
|
<div className="max-w-6xl mx-auto space-y-16">
|
||||||
|
|
||||||
{/* Title */}
|
{/* Title */}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
|
|
||||||
html, body {
|
html, body {
|
||||||
font-family: var(--font-vazir), "Vazirmatn", sans-serif !important;
|
font-family: var(--font-vazir), "Vazirmatn", sans-serif !important;
|
||||||
@apply bg-medical-gray-50 text-medical-gray-900 antialiased max-w-[100vw] overflow-x-hidden;
|
@apply bg-medical-gray-50 text-medical-gray-900 antialiased w-full max-w-full overflow-x-clip;
|
||||||
font-feature-settings: "ss01", "ss02", "cv01", "cv11";
|
font-feature-settings: "ss01", "ss02", "cv01", "cv11";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,15 +74,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Authored body links remain recognizable without relying on color alone. */
|
|
||||||
.article-html-content a {
|
|
||||||
color: var(--color-canina-blue);
|
|
||||||
font-weight: 700;
|
|
||||||
text-decoration: underline;
|
|
||||||
text-underline-offset: 4px;
|
|
||||||
}
|
|
||||||
.article-html-content a:hover { color: var(--color-medical-gray-900); }
|
|
||||||
|
|
||||||
/* Sonner Toasts Vazirmatn Font & Mobile Offset */
|
/* Sonner Toasts Vazirmatn Font & Mobile Offset */
|
||||||
[data-sonner-toaster] {
|
[data-sonner-toaster] {
|
||||||
font-family: "Vazirmatn", sans-serif !important;
|
font-family: "Vazirmatn", sans-serif !important;
|
||||||
@@ -149,6 +140,12 @@
|
|||||||
background: var(--color-canina-blue);
|
background: var(--color-canina-blue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Mobile catalog filter edge affordances (clean mask-based fade) */
|
||||||
|
.mobile-filter-mask {
|
||||||
|
-webkit-mask-image: linear-gradient(to right, transparent, black 24px, black calc(100% - 24px), transparent 100%);
|
||||||
|
mask-image: linear-gradient(to right, transparent, black 24px, black calc(100% - 24px), transparent 100%);
|
||||||
|
}
|
||||||
|
|
||||||
/* Micro horizontal scrollbar for dark backgrounds (catalog etc.) */
|
/* Micro horizontal scrollbar for dark backgrounds (catalog etc.) */
|
||||||
.micro-hscroll-dark {
|
.micro-hscroll-dark {
|
||||||
scrollbar-width: thin;
|
scrollbar-width: thin;
|
||||||
|
|||||||
@@ -0,0 +1,82 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { describe, it, expect, vi } from "vitest";
|
||||||
|
import { render, screen } from "@testing-library/react";
|
||||||
|
|
||||||
|
// Mock child components to verify presence without side-effects
|
||||||
|
vi.mock("../components/Hero", () => ({
|
||||||
|
default: () => <section data-testid="hero-section">Hero</section>,
|
||||||
|
}));
|
||||||
|
vi.mock("../components/SmartAdvisor", () => ({
|
||||||
|
default: () => <section data-testid="smart-advisor-section">SmartAdvisor</section>,
|
||||||
|
}));
|
||||||
|
vi.mock("../components/BannerPlacement", () => ({
|
||||||
|
default: ({ position }: { position: string }) => (
|
||||||
|
<section data-testid={`banner-placement-${position}`}>BannerPlacement {position}</section>
|
||||||
|
),
|
||||||
|
}));
|
||||||
|
vi.mock("../components/FeaturedProducts", () => ({
|
||||||
|
default: () => <section data-testid="featured-products-section">FeaturedProducts</section>,
|
||||||
|
}));
|
||||||
|
vi.mock("../components/VetGallery", () => ({
|
||||||
|
default: () => <section data-testid="vet-gallery-section">VetGallery</section>,
|
||||||
|
}));
|
||||||
|
vi.mock("../components/TestimonialsSection", () => ({
|
||||||
|
default: () => <section data-testid="testimonials-section">TestimonialsSection</section>,
|
||||||
|
}));
|
||||||
|
vi.mock("../components/BlogPreviewSection", () => ({
|
||||||
|
default: () => <section data-testid="blog-preview-section">BlogPreviewSection</section>,
|
||||||
|
}));
|
||||||
|
vi.mock("../components/FAQSection", () => ({
|
||||||
|
default: () => <section data-testid="faq-section">FAQSection</section>,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("next/link", () => ({
|
||||||
|
default: ({ children, href, ...props }: any) => <a href={href} {...props}>{children}</a>,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("next/image", () => ({
|
||||||
|
default: ({ src, alt, ...props }: any) => <img src={src} alt={alt} {...props} />,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../lib/services/api", () => ({
|
||||||
|
default: {
|
||||||
|
get: vi.fn().mockReturnValue(new Promise(() => {})), // Avoid triggering state updates during test
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../lib/store/settingsStore", () => ({
|
||||||
|
useSettingsStore: (selector?: any) => {
|
||||||
|
const s = { getText: (k: string, d: string) => d };
|
||||||
|
return typeof selector === "function" ? selector(s) : s;
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
import HomeClient from "./HomeClient";
|
||||||
|
|
||||||
|
describe("Home Sections Mobile Retention Gate (UX-35)", () => {
|
||||||
|
it("strictly retains 100% of all core Home sections and feature cards without mobile exclusion or deletion", () => {
|
||||||
|
const { container } = render(<HomeClient initialData={null} />);
|
||||||
|
|
||||||
|
// Verify presence of all major sections
|
||||||
|
expect(screen.getByTestId("hero-section")).toBeTruthy();
|
||||||
|
expect(screen.getByTestId("smart-advisor-section")).toBeTruthy();
|
||||||
|
expect(screen.getByTestId("banner-placement-home_middle")).toBeTruthy();
|
||||||
|
expect(screen.getByTestId("featured-products-section")).toBeTruthy();
|
||||||
|
expect(screen.getByTestId("vet-gallery-section")).toBeTruthy();
|
||||||
|
expect(screen.getByTestId("testimonials-section")).toBeTruthy();
|
||||||
|
expect(screen.getByTestId("blog-preview-section")).toBeTruthy();
|
||||||
|
expect(screen.getByTestId("faq-section")).toBeTruthy();
|
||||||
|
|
||||||
|
// Verify navigation specialty cards
|
||||||
|
expect(screen.getByText("داروخانه تخصصی مکملها")).toBeTruthy();
|
||||||
|
expect(screen.getByText("دانشنامه علمی و مقالات")).toBeTruthy();
|
||||||
|
|
||||||
|
// Ensure none of the sections have `hidden` alone as a display class on mobile
|
||||||
|
const sections = container.querySelectorAll("section");
|
||||||
|
expect(sections.length).toBeGreaterThanOrEqual(10);
|
||||||
|
sections.forEach((sec) => {
|
||||||
|
const classList = sec.className.split(/\s+/);
|
||||||
|
expect(classList).not.toContain("hidden");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -4,7 +4,6 @@ import NextTopLoader from 'nextjs-toploader';
|
|||||||
import ClientLayout from './ClientLayout';
|
import ClientLayout from './ClientLayout';
|
||||||
import AnalyticsDeferred from '../components/AnalyticsDeferred';
|
import AnalyticsDeferred from '../components/AnalyticsDeferred';
|
||||||
import SupportChat from '../components/SupportChat';
|
import SupportChat from '../components/SupportChat';
|
||||||
import ContactAdvisorButton from '../components/ContactAdvisorButton';
|
|
||||||
import { getSeoConfig } from '../lib/seo';
|
import { getSeoConfig } from '../lib/seo';
|
||||||
import { vazirmatn, lalezar } from '../lib/fonts';
|
import { vazirmatn, lalezar } from '../lib/fonts';
|
||||||
import { generateOrganizationSchema } from '../lib/schema';
|
import { generateOrganizationSchema } from '../lib/schema';
|
||||||
@@ -72,6 +71,10 @@ export async function generateMetadata(): Promise<Metadata> {
|
|||||||
},
|
},
|
||||||
alternates: {
|
alternates: {
|
||||||
canonical: '/',
|
canonical: '/',
|
||||||
|
languages: {
|
||||||
|
'fa-IR': `${siteUrl}/`,
|
||||||
|
'x-default': `${siteUrl}/`,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
formatDetection: {
|
formatDetection: {
|
||||||
email: false,
|
email: false,
|
||||||
@@ -149,7 +152,12 @@ export default async function RootLayout({
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
const safeJsonLd = JSON.stringify([orgSchema, webSiteSchema]).replace(/</g, '\\u003c');
|
const rootSchemaGraph = {
|
||||||
|
'@context': 'https://schema.org',
|
||||||
|
'@graph': [orgSchema, webSiteSchema],
|
||||||
|
};
|
||||||
|
|
||||||
|
const safeJsonLd = JSON.stringify(rootSchemaGraph).replace(/</g, '\\u003c');
|
||||||
|
|
||||||
const gaId = config.googleAnalyticsId?.trim();
|
const gaId = config.googleAnalyticsId?.trim();
|
||||||
const isGaEnabled = Boolean(gaId && config.enableGoogleAnalytics !== false);
|
const isGaEnabled = Boolean(gaId && config.enableGoogleAnalytics !== false);
|
||||||
@@ -202,7 +210,6 @@ export default async function RootLayout({
|
|||||||
{children}
|
{children}
|
||||||
</ClientLayout>
|
</ClientLayout>
|
||||||
<SupportChat />
|
<SupportChat />
|
||||||
<ContactAdvisorButton hideFloatingButton={true} />
|
|
||||||
|
|
||||||
{/* Deferred Analytics (GTM, GA4, Clarity) to unblock Main Thread */}
|
{/* Deferred Analytics (GTM, GA4, Clarity) to unblock Main Thread */}
|
||||||
<AnalyticsDeferred
|
<AnalyticsDeferred
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { describe, expect, it, vi } from "vitest";
|
||||||
|
import { render, screen } from "@testing-library/react";
|
||||||
|
import LoginPage from "./page";
|
||||||
|
|
||||||
|
vi.mock("../../components/AuthModal", () => ({
|
||||||
|
default: ({ isOpen }: { isOpen: boolean }) => isOpen ? <div role="dialog">ورود به حساب</div> : null,
|
||||||
|
}));
|
||||||
|
vi.mock("next/navigation", () => ({ useRouter: () => ({ push: vi.fn() }) }));
|
||||||
|
|
||||||
|
describe("/login route", () => {
|
||||||
|
it("renders the authentication experience instead of a missing-page route", () => {
|
||||||
|
render(<LoginPage />);
|
||||||
|
expect(screen.getByRole("heading", { name: "ورود یا ثبتنام" })).toBeTruthy();
|
||||||
|
expect(screen.getAllByRole("dialog")).toHaveLength(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import AuthModal from "../../components/AuthModal";
|
||||||
|
|
||||||
|
export default function LoginPage() {
|
||||||
|
const router = useRouter();
|
||||||
|
return (
|
||||||
|
<main className="min-h-screen bg-medical-gray-50 px-4 py-12" dir="rtl">
|
||||||
|
<h1 className="sr-only">ورود یا ثبتنام</h1>
|
||||||
|
<AuthModal isOpen onClose={() => router.push("/")} />
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,284 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import React, { useState } from "react";
|
||||||
|
import {
|
||||||
|
Stethoscope,
|
||||||
|
Upload,
|
||||||
|
CheckCircle2,
|
||||||
|
ShieldCheck,
|
||||||
|
FileText,
|
||||||
|
Clock,
|
||||||
|
Send,
|
||||||
|
Phone,
|
||||||
|
Sparkles,
|
||||||
|
AlertCircle
|
||||||
|
} from "lucide-react";
|
||||||
|
import { toast } from "sonner";
|
||||||
|
import api from "../../lib/services/api";
|
||||||
|
|
||||||
|
export default function PrescriptionPageClient() {
|
||||||
|
const [file, setFile] = useState<File | null>(null);
|
||||||
|
const [phone, setPhone] = useState("");
|
||||||
|
const [petName, setPetName] = useState("");
|
||||||
|
const [petType, setPetType] = useState<"سگ" | "گربه">("سگ");
|
||||||
|
const [notes, setNotes] = useState("");
|
||||||
|
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||||
|
const [isSuccess, setIsSuccess] = useState(false);
|
||||||
|
|
||||||
|
const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
|
if (e.target.files && e.target.files[0]) {
|
||||||
|
setFile(e.target.files[0]);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSubmit = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
if (!file) {
|
||||||
|
toast.error("لطفاً تصویر یا فایل PDF نسخه پزشکی را بارگذاری کنید.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const cleanPhone = phone.trim();
|
||||||
|
if (!/^09\d{9}$/.test(cleanPhone)) {
|
||||||
|
toast.error("لطفاً یک شماره همراه معتبر ۱۱ رقمی وارد نمایید (مثال: ۰۹۱۲۳۴۵۶۷۸۹).");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setIsSubmitting(true);
|
||||||
|
try {
|
||||||
|
// 1. Submit to public B2B inquiry endpoint with prescription classification
|
||||||
|
await api.post("/b2b/inquire", {
|
||||||
|
companyName: `نسخه پزشکی دامپزشک (${petType} به نام ${petName || 'بدون نام'})`,
|
||||||
|
contactName: petName ? `سرپرست: ${petName}` : "مراجعهکننده آنلاین",
|
||||||
|
email: `rx-${Date.now()}@canina.ir`,
|
||||||
|
phone: cleanPhone,
|
||||||
|
businessType: `ثبت نسخه دارویی (${petType})`,
|
||||||
|
estimatedVolume: "نسخه تکموردی بیمار",
|
||||||
|
message: `نام پت: ${petName || 'قید نشده'} | گونه: ${petType} | فایل: ${file.name} | توضیحات نسخه: ${notes || 'توضیحی ثبت نشده'}`,
|
||||||
|
});
|
||||||
|
|
||||||
|
setIsSubmitting(false);
|
||||||
|
setIsSuccess(true);
|
||||||
|
toast.success("نسخه پزشکی شما با موفقیت ثبت شد. دامپزشک کشیک کنینا به زودی با شما تماس خواهد گرفت.");
|
||||||
|
} catch {
|
||||||
|
setIsSubmitting(false);
|
||||||
|
toast.error("خطایی در ثبت اطلاعات نسخه رخ داد. لطفاً مجدداً تلاش کنید.");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="bg-medical-gray-50 min-h-screen font-vazir py-12 px-4 sm:px-6 lg:px-8" dir="rtl">
|
||||||
|
<div className="max-w-4xl mx-auto space-y-8">
|
||||||
|
|
||||||
|
{/* Header */}
|
||||||
|
<div className="text-center space-y-4">
|
||||||
|
<div className="inline-flex items-center gap-2 px-4 py-2 bg-emerald-50 text-emerald-800 border border-emerald-200 rounded-full text-xs font-bold shadow-xs">
|
||||||
|
<Stethoscope className="w-4 h-4 text-emerald-600" />
|
||||||
|
سامانه رسمی ارزیابی و تطبیق نسخه دارویی پت
|
||||||
|
</div>
|
||||||
|
<h1 className="text-3xl sm:text-4xl font-black text-medical-gray-900 tracking-tight">
|
||||||
|
ثبت آنلاین نسخه دامپزشک و تطبیق مکملهای <span className="text-canina-blue">کنینا آلمان</span>
|
||||||
|
</h1>
|
||||||
|
<p className="text-sm sm:text-base text-medical-gray-600 max-w-2xl mx-auto leading-relaxed">
|
||||||
|
نسخه تجویزی پزشک معالج همدم خود را بارگذاری نمایید تا کادر دامپزشکان متخصص کنینا ایران مکملهای دارویی اصل و سازگار با دوز تجویزی را ارزیابی و به شما معرفی کنند.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Benefits bar */}
|
||||||
|
<div className="grid sm:grid-cols-3 gap-4">
|
||||||
|
<div className="bg-white p-4 rounded-2xl border border-medical-gray-200 shadow-xs flex items-center gap-3">
|
||||||
|
<div className="w-10 h-10 rounded-xl bg-emerald-50 text-emerald-600 flex items-center justify-center shrink-0">
|
||||||
|
<ShieldCheck className="w-5 h-5" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h4 className="text-xs font-black text-medical-gray-900">تطبیق دقیق دارویی</h4>
|
||||||
|
<p className="text-[11px] text-medical-gray-500">معادلسازی برندهای آلمانی و دوز</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="bg-white p-4 rounded-2xl border border-medical-gray-200 shadow-xs flex items-center gap-3">
|
||||||
|
<div className="w-10 h-10 rounded-xl bg-blue-50 text-canina-blue flex items-center justify-center shrink-0">
|
||||||
|
<Clock className="w-5 h-5" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h4 className="text-xs font-black text-medical-gray-900">پاسخگویی سریع</h4>
|
||||||
|
<p className="text-[11px] text-medical-gray-500">بررسی توسط دامپزشک زیر ۲ ساعت</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="bg-white p-4 rounded-2xl border border-medical-gray-200 shadow-xs flex items-center gap-3">
|
||||||
|
<div className="w-10 h-10 rounded-xl bg-amber-50 text-amber-600 flex items-center justify-center shrink-0">
|
||||||
|
<Sparkles className="w-5 h-5" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h4 className="text-xs font-black text-medical-gray-900">مشاوره تغذیه رایگان</h4>
|
||||||
|
<p className="text-[11px] text-medical-gray-500">همراه با راهنمای رژیم و دوز مصرف</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Form Card */}
|
||||||
|
<div className="bg-white rounded-3xl border border-medical-gray-200 shadow-xl overflow-hidden p-6 sm:p-10">
|
||||||
|
{isSuccess ? (
|
||||||
|
<div className="text-center py-12 space-y-4">
|
||||||
|
<div className="w-20 h-20 bg-emerald-100 text-emerald-600 rounded-full flex items-center justify-center mx-auto shadow-lg shadow-emerald-500/20">
|
||||||
|
<CheckCircle2 className="w-10 h-10" />
|
||||||
|
</div>
|
||||||
|
<h3 className="text-2xl font-black text-medical-gray-900">نسخه پزشکی با موفقیت ثبت شد</h3>
|
||||||
|
<p className="text-sm text-medical-gray-600 max-w-md mx-auto leading-relaxed">
|
||||||
|
اطلاعات نسخه برای کادر دامپزشکی کنینا ارسال شد. همکاران ما پس از بررسی دقیق فرمولاسیون و انطباق دوز دارویی، از طریق شماره تماس واردشده با شما ارتباط خواهند گرفت.
|
||||||
|
</p>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => {
|
||||||
|
setFile(null);
|
||||||
|
setNotes("");
|
||||||
|
setPetName("");
|
||||||
|
setIsSuccess(false);
|
||||||
|
}}
|
||||||
|
className="inline-flex items-center gap-2 bg-canina-blue text-white px-6 py-3 rounded-xl font-bold text-xs shadow-md hover:bg-canina-blue/90 transition-all cursor-pointer"
|
||||||
|
>
|
||||||
|
ثبت نسخه جدید دیگر
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<form onSubmit={handleSubmit} className="space-y-6">
|
||||||
|
|
||||||
|
{/* Pet Info */}
|
||||||
|
<div className="grid sm:grid-cols-2 gap-4">
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs font-bold text-medical-gray-700 mb-2">
|
||||||
|
گونه حیوان خانگی <span className="text-red-500">*</span>
|
||||||
|
</label>
|
||||||
|
<div className="grid grid-cols-2 gap-3">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setPetType("سگ")}
|
||||||
|
className={`p-3 rounded-2xl border text-xs font-black flex items-center justify-center gap-2 transition-all cursor-pointer ${
|
||||||
|
petType === "سگ"
|
||||||
|
? "border-canina-blue bg-blue-50/50 text-canina-blue ring-2 ring-canina-blue/20"
|
||||||
|
: "border-medical-gray-200 text-medical-gray-600 hover:bg-medical-gray-50"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
🐶 سگ
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setPetType("گربه")}
|
||||||
|
className={`p-3 rounded-2xl border text-xs font-black flex items-center justify-center gap-2 transition-all cursor-pointer ${
|
||||||
|
petType === "گربه"
|
||||||
|
? "border-canina-blue bg-blue-50/50 text-canina-blue ring-2 ring-canina-blue/20"
|
||||||
|
: "border-medical-gray-200 text-medical-gray-600 hover:bg-medical-gray-50"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
🐱 گربه
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label htmlFor="rx-petName" className="block text-xs font-bold text-medical-gray-700 mb-2">
|
||||||
|
نام همدم (پت)
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="rx-petName"
|
||||||
|
type="text"
|
||||||
|
placeholder="مثال: لئو، ببری، جسی..."
|
||||||
|
value={petName}
|
||||||
|
onChange={(e) => setPetName(e.target.value)}
|
||||||
|
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl px-4 py-3 text-sm text-medical-gray-900 focus:bg-white focus:border-canina-blue focus:ring-4 focus:ring-canina-blue/10 outline-none transition-all"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Phone */}
|
||||||
|
<div>
|
||||||
|
<label htmlFor="rx-phone" className="block text-xs font-bold text-medical-gray-700 mb-2">
|
||||||
|
شماره تماس همراه (جهت دریافت نتیجه ارزیابی) <span className="text-red-500">*</span>
|
||||||
|
</label>
|
||||||
|
<div className="relative">
|
||||||
|
<input
|
||||||
|
id="rx-phone"
|
||||||
|
type="tel"
|
||||||
|
required
|
||||||
|
placeholder="۰۹۱۲۳۴۵۶۷۸۹"
|
||||||
|
value={phone}
|
||||||
|
onChange={(e) => setPhone(e.target.value)}
|
||||||
|
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl px-4 py-3 pl-10 text-sm text-medical-gray-900 focus:bg-white focus:border-canina-blue focus:ring-4 focus:ring-canina-blue/10 outline-none transition-all dir-ltr text-right"
|
||||||
|
/>
|
||||||
|
<Phone className="w-4 h-4 text-medical-gray-400 absolute left-3 top-1/2 -translate-y-1/2" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* File Upload Zone */}
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs font-bold text-medical-gray-700 mb-2">
|
||||||
|
بارگذاری تصویر یا فایل PDF نسخه <span className="text-red-500">*</span>
|
||||||
|
</label>
|
||||||
|
<div className="relative border-2 border-dashed border-medical-gray-300 hover:border-canina-blue rounded-3xl p-6 sm:p-8 text-center transition-all bg-medical-gray-50/50 hover:bg-blue-50/20">
|
||||||
|
<input
|
||||||
|
id="rx-file-input"
|
||||||
|
type="file"
|
||||||
|
accept="image/jpeg,image/png,image/webp,application/pdf"
|
||||||
|
required
|
||||||
|
onChange={handleFileChange}
|
||||||
|
className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
|
||||||
|
/>
|
||||||
|
<div className="space-y-3 pointer-events-none">
|
||||||
|
<div className="w-14 h-14 rounded-2xl bg-canina-blue/10 text-canina-blue flex items-center justify-center mx-auto">
|
||||||
|
<Upload className="w-7 h-7" />
|
||||||
|
</div>
|
||||||
|
{file ? (
|
||||||
|
<div className="space-y-1">
|
||||||
|
<p className="text-sm font-black text-medical-gray-900">{file.name}</p>
|
||||||
|
<p className="text-xs text-emerald-600 font-bold">فایل با موفقیت انتخاب شد (برای تغییر کلیک کنید)</p>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-1">
|
||||||
|
<p className="text-sm font-black text-medical-gray-900">
|
||||||
|
برای انتخاب فایل یا عکس نسخه، اینجا کلیک کنید یا فایل را بکشید
|
||||||
|
</p>
|
||||||
|
<p className="text-xs text-medical-gray-400">
|
||||||
|
فرمتهای مجاز: JPG, PNG, WEBP یا PDF (حداکثر ۱۰ مگابایت)
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Notes */}
|
||||||
|
<div>
|
||||||
|
<label htmlFor="rx-notes" className="block text-xs font-bold text-medical-gray-700 mb-2">
|
||||||
|
توضیحات تکمیلی یا علائم حیوان (اختیاری)
|
||||||
|
</label>
|
||||||
|
<textarea
|
||||||
|
id="rx-notes"
|
||||||
|
rows={3}
|
||||||
|
placeholder="اگر حیوان به ماده غذایی خاصی حساسیت دارد یا داروی همزمانی مصرف میکند در اینجا ذکر فرمایید..."
|
||||||
|
value={notes}
|
||||||
|
onChange={(e) => setNotes(e.target.value)}
|
||||||
|
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl px-4 py-3 text-sm text-medical-gray-900 focus:bg-white focus:border-canina-blue focus:ring-4 focus:ring-canina-blue/10 outline-none transition-all"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Submit Button */}
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
disabled={isSubmitting}
|
||||||
|
className="w-full bg-canina-blue hover:bg-canina-blue/90 text-white font-black text-base py-4 rounded-2xl shadow-xl shadow-canina-blue/20 transition-all flex items-center justify-center gap-2 cursor-pointer disabled:opacity-50"
|
||||||
|
>
|
||||||
|
{isSubmitting ? (
|
||||||
|
<span>در حال ارسال نسخه و ثبت درخواست...</span>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<Send className="w-5 h-5" />
|
||||||
|
<span>ارسال و ثبت نسخه جهت ارزیابی دامپزشک</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import React from "react";
|
||||||
|
import type { Metadata } from "next";
|
||||||
|
import PrescriptionPageClient from "./PrescriptionPageClient";
|
||||||
|
import { getPageMetadata } from "../../lib/seo";
|
||||||
|
|
||||||
|
export async function generateMetadata(): Promise<Metadata> {
|
||||||
|
return getPageMetadata('prescriptions', {
|
||||||
|
canonicalPath: '/prescriptions',
|
||||||
|
fallbackTitle: 'ثبت و ارزیابی نسخه دامپزشک | مشاوره تخصصی دارویی کنینا ایران',
|
||||||
|
fallbackDesc: 'سامانه آنلاین آپلود و تحلیل نسخه دامپزشک جهت تطبیق با مکملهای دارویی اصل Canina Pharma آلمان با نظارت کادر مجرب دامپزشکان.',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function PrescriptionPage() {
|
||||||
|
return <PrescriptionPageClient />;
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { describe, it, expect, vi } from "vitest";
|
||||||
|
import { render, fireEvent, waitFor } from "@testing-library/react";
|
||||||
|
|
||||||
|
const mockPost = vi.fn().mockResolvedValue({ data: { success: true } });
|
||||||
|
vi.mock("axios", () => {
|
||||||
|
const mAxios = {
|
||||||
|
post: vi.fn(() => Promise.resolve({ data: { success: true } })),
|
||||||
|
get: vi.fn(() => Promise.resolve({ data: { success: true } })),
|
||||||
|
interceptors: {
|
||||||
|
request: { use: vi.fn(), eject: vi.fn() },
|
||||||
|
response: { use: vi.fn(), eject: vi.fn() },
|
||||||
|
},
|
||||||
|
create: () => mAxios,
|
||||||
|
};
|
||||||
|
return { default: mAxios };
|
||||||
|
});
|
||||||
|
|
||||||
|
vi.mock("sonner", () => ({
|
||||||
|
toast: {
|
||||||
|
success: vi.fn(),
|
||||||
|
error: vi.fn(),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
import api from "../../lib/services/api";
|
||||||
|
import PrescriptionPageClient from "./PrescriptionPageClient";
|
||||||
|
|
||||||
|
describe("PrescriptionPageClient Suite (B2B-03)", () => {
|
||||||
|
it("renders online prescription portal and submits without requiring login", async () => {
|
||||||
|
const { container } = render(<PrescriptionPageClient />);
|
||||||
|
|
||||||
|
const phoneInput = container.querySelector("#rx-phone") as HTMLInputElement;
|
||||||
|
const petNameInput = container.querySelector("#rx-petName") as HTMLInputElement;
|
||||||
|
const fileInput = container.querySelector("#rx-file-input") as HTMLInputElement;
|
||||||
|
const form = container.querySelector("form") as HTMLFormElement;
|
||||||
|
|
||||||
|
expect(phoneInput).not.toBeNull();
|
||||||
|
expect(fileInput).not.toBeNull();
|
||||||
|
expect(form).not.toBeNull();
|
||||||
|
|
||||||
|
// Create fake file
|
||||||
|
const fakeFile = new File(["dummy content"], "prescription.jpg", { type: "image/jpeg" });
|
||||||
|
|
||||||
|
fireEvent.change(phoneInput, { target: { value: "09121114455" } });
|
||||||
|
fireEvent.change(petNameInput, { target: { value: "لئو" } });
|
||||||
|
fireEvent.change(fileInput, { target: { files: [fakeFile] } });
|
||||||
|
|
||||||
|
fireEvent.submit(form);
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(api.post).toHaveBeenCalledWith(
|
||||||
|
"/b2b/inquire",
|
||||||
|
expect.objectContaining({
|
||||||
|
phone: "09121114455",
|
||||||
|
companyName: expect.stringContaining("لئو"),
|
||||||
|
})
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { describe, it, expect, vi } from "vitest";
|
||||||
|
import { render, screen } from "@testing-library/react";
|
||||||
|
|
||||||
|
// Mock next/navigation
|
||||||
|
vi.mock("next/navigation", () => ({
|
||||||
|
usePathname: () => "/login",
|
||||||
|
useRouter: () => ({ push: vi.fn(), replace: vi.fn(), back: vi.fn() }),
|
||||||
|
useSearchParams: () => new URLSearchParams(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("next/link", () => ({
|
||||||
|
default: ({ children, href, ...props }: any) => <a href={href} {...props}>{children}</a>,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("next/image", () => ({
|
||||||
|
default: (props: any) => <img {...props} />,
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Mock sub-components with exact path matching
|
||||||
|
vi.mock("../components/AuthModal", () => ({
|
||||||
|
default: ({ isOpen, onClose }: any) => (
|
||||||
|
<div data-testid="auth-modal" data-isopen={String(isOpen)}>
|
||||||
|
<button onClick={onClose}>بستن</button>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../components/CartDrawer", () => ({
|
||||||
|
default: ({ isOpen, onCheckout, onShopNavigate }: any) => (
|
||||||
|
<div data-testid="cart-drawer" data-isopen={String(isOpen)}>
|
||||||
|
<button onClick={onCheckout}>تکمیل سفارش</button>
|
||||||
|
<button onClick={onShopNavigate}>فروشگاه</button>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../components/PetProfile", () => ({
|
||||||
|
default: () => <div data-testid="pet-profile-component">Pet Profile</div>,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../components/VideosPage", () => ({
|
||||||
|
default: ({ initialVideos }: any) => (
|
||||||
|
<div data-testid="videos-page-component">Videos: {initialVideos?.length || 0}</div>
|
||||||
|
),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../components/SmartAdvisor", () => ({
|
||||||
|
default: () => <div data-testid="smart-advisor-component">Smart Advisor</div>,
|
||||||
|
}));
|
||||||
|
|
||||||
|
import LoginPage from "./login/page";
|
||||||
|
import CartPage from "./cart/page";
|
||||||
|
import ProfilePage from "./profile/page";
|
||||||
|
import VideosPage from "./videos/page";
|
||||||
|
import SmartAdvisorPage from "./smart-advisor/page";
|
||||||
|
|
||||||
|
describe("Lightweight Utility Routes and Responsive Layouts (UX-29)", () => {
|
||||||
|
it("renders LoginPage with minimal semantic wrapper and single accessible h1", () => {
|
||||||
|
const { container } = render(<LoginPage />);
|
||||||
|
const h1 = screen.getByRole("heading", { level: 1 });
|
||||||
|
expect(h1.textContent).toContain("ورود یا ثبتنام");
|
||||||
|
expect(screen.getByTestId("auth-modal")).toBeTruthy();
|
||||||
|
const main = container.querySelector("main");
|
||||||
|
expect(main).not.toBeNull();
|
||||||
|
expect(main?.getAttribute("dir")).toBe("rtl");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("renders CartPage with semantic main wrapper and single accessible h1", () => {
|
||||||
|
const { container } = render(<CartPage />);
|
||||||
|
const h1 = screen.getByRole("heading", { level: 1 });
|
||||||
|
expect(h1.textContent).toContain("سبد خرید");
|
||||||
|
expect(screen.getByTestId("cart-drawer")).toBeTruthy();
|
||||||
|
const main = container.querySelector("main");
|
||||||
|
expect(main).not.toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("renders ProfilePage cleanly delegating to PetProfile component", () => {
|
||||||
|
render(<ProfilePage />);
|
||||||
|
expect(screen.getByTestId("pet-profile-component")).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("renders VideosPage cleanly passing initial videos dataset", async () => {
|
||||||
|
const component = await VideosPage();
|
||||||
|
render(component);
|
||||||
|
expect(screen.getByTestId("videos-page-component")).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("renders SmartAdvisorPage with semantic breadcrumbs, h1 and advisor container", () => {
|
||||||
|
render(<SmartAdvisorPage />);
|
||||||
|
const h1 = screen.getByRole("heading", { level: 1 });
|
||||||
|
expect(h1.textContent).toMatch(/مشاوره تخصصی و راهنمای/);
|
||||||
|
expect(screen.getByTestId("smart-advisor-component")).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -37,6 +37,8 @@ export default function robots(): MetadataRoute.Robots {
|
|||||||
`${baseUrl}/sitemap.xml`,
|
`${baseUrl}/sitemap.xml`,
|
||||||
`${baseUrl}/sitemap-products.xml`,
|
`${baseUrl}/sitemap-products.xml`,
|
||||||
`${baseUrl}/sitemap-categories.xml`,
|
`${baseUrl}/sitemap-categories.xml`,
|
||||||
|
`${baseUrl}/sitemap-blog.xml`,
|
||||||
|
`${baseUrl}/sitemap-wiki.xml`,
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { notFound } from 'next/navigation';
|
||||||
import ProductPage from "../../../components/ProductPage";
|
import ProductPage from "../../../components/ProductPage";
|
||||||
import { productService } from "../../../lib/services/productService";
|
import { productService } from "../../../lib/services/productService";
|
||||||
import type { Metadata } from 'next';
|
import type { Metadata } from 'next';
|
||||||
@@ -133,7 +134,7 @@ export default async function ShopProductPage({ params }: { params: Promise<{ sl
|
|||||||
const product = await productService.getProductBySlug(resolvedParams.slug);
|
const product = await productService.getProductBySlug(resolvedParams.slug);
|
||||||
|
|
||||||
if (!product) {
|
if (!product) {
|
||||||
return <ProductPage productSlug={resolvedParams.slug} />;
|
notFound();
|
||||||
}
|
}
|
||||||
|
|
||||||
const siteUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://canina.ir';
|
const siteUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://canina.ir';
|
||||||
@@ -349,7 +350,7 @@ export default async function ShopProductPage({ params }: { params: Promise<{ sl
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}>
|
}>
|
||||||
<ProductPage productSlug={resolvedParams.slug} />
|
<ProductPage productSlug={resolvedParams.slug} initialProduct={product} />
|
||||||
</Suspense>
|
</Suspense>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import ArchivePage from "../../components/ArchivePage";
|
import ArchivePage from "../../components/ArchivePage";
|
||||||
import { getPageMetadata } from "../../lib/seo";
|
import { getPageMetadata } from "../../lib/seo";
|
||||||
|
import { productService } from "../../lib/services/productService";
|
||||||
|
import type { PetType } from "../../lib/data/products";
|
||||||
|
|
||||||
export async function generateMetadata({
|
export async function generateMetadata({
|
||||||
searchParams,
|
searchParams,
|
||||||
@@ -41,6 +43,9 @@ export default async function Shop({ searchParams }: { searchParams: Promise<{ [
|
|||||||
const symptomsParam = typeof resolvedParams.symptoms === 'string' ? resolvedParams.symptoms : "";
|
const symptomsParam = typeof resolvedParams.symptoms === 'string' ? resolvedParams.symptoms : "";
|
||||||
const symptomSingle = typeof resolvedParams.symptom === 'string' ? resolvedParams.symptom : "";
|
const symptomSingle = typeof resolvedParams.symptom === 'string' ? resolvedParams.symptom : "";
|
||||||
const symptoms = symptomsParam || (symptomSingle ? symptomSingle : "");
|
const symptoms = symptomsParam || (symptomSingle ? symptomSingle : "");
|
||||||
|
const pageParam = typeof resolvedParams.page === "string" ? parseInt(resolvedParams.page, 10) : 1;
|
||||||
|
const initialPage = isNaN(pageParam) || pageParam < 1 ? 1 : pageParam;
|
||||||
|
const { data: initialProducts } = await productService.getProducts({ category, petType: petType as PetType | "all", query: search, symptom: symptomSingle, limit: 999 });
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ArchivePage
|
<ArchivePage
|
||||||
@@ -48,6 +53,8 @@ export default async function Shop({ searchParams }: { searchParams: Promise<{ [
|
|||||||
initialSearch={search}
|
initialSearch={search}
|
||||||
initialPetType={petType}
|
initialPetType={petType}
|
||||||
initialSymptoms={symptoms}
|
initialSymptoms={symptoms}
|
||||||
|
initialProducts={initialProducts}
|
||||||
|
initialPage={initialPage}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
import { NextResponse } from 'next/server';
|
||||||
|
|
||||||
|
export const dynamic = 'force-dynamic';
|
||||||
|
export const revalidate = 3600; // Revalidate every hour
|
||||||
|
|
||||||
|
type SitemapBlog = {
|
||||||
|
slug: string;
|
||||||
|
noIndex?: boolean;
|
||||||
|
status: string;
|
||||||
|
updatedAt?: string;
|
||||||
|
createdAt?: string;
|
||||||
|
featured?: boolean;
|
||||||
|
title?: string;
|
||||||
|
imageUrl?: string;
|
||||||
|
ogImage?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function GET() {
|
||||||
|
const baseUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://canina.ir';
|
||||||
|
const apiUrl =
|
||||||
|
process.env.INTERNAL_API_URL || process.env.NEXT_PUBLIC_API_URL || 'http://localhost:4001/api';
|
||||||
|
const normalizedApiUrl = apiUrl.replace(/\/$/, '');
|
||||||
|
const apiBase = normalizedApiUrl.endsWith('/api') ? normalizedApiUrl : `${normalizedApiUrl}/api`;
|
||||||
|
|
||||||
|
const blogRoutes: SitemapBlog[] = [];
|
||||||
|
|
||||||
|
try {
|
||||||
|
let page = 1;
|
||||||
|
let lastPage = 1;
|
||||||
|
do {
|
||||||
|
const res = await fetch(`${apiBase}/blogs?page=${page}&limit=20`, { cache: 'no-store' });
|
||||||
|
if (!res.ok) throw new Error(`Blog sitemap request failed: ${res.status}`);
|
||||||
|
const data = await res.json();
|
||||||
|
const blogsList: SitemapBlog[] = data.data || [];
|
||||||
|
if (!blogsList.length) break;
|
||||||
|
|
||||||
|
const validBlogs = blogsList.filter((b) => !b.noIndex && b.status === 'PUBLISHED');
|
||||||
|
blogRoutes.push(...validBlogs);
|
||||||
|
|
||||||
|
lastPage = Number(data.meta?.lastPage) || 1;
|
||||||
|
page += 1;
|
||||||
|
} while (page <= lastPage);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to fetch blogs for sitemap-blog.xml:', err);
|
||||||
|
}
|
||||||
|
|
||||||
|
const urlsXml = blogRoutes
|
||||||
|
.map((blog) => {
|
||||||
|
const loc = `${baseUrl}/blog/${encodeURIComponent(blog.slug)}`;
|
||||||
|
const lastmod = blog.updatedAt
|
||||||
|
? new Date(blog.updatedAt).toISOString()
|
||||||
|
: blog.createdAt
|
||||||
|
? new Date(blog.createdAt).toISOString()
|
||||||
|
: new Date().toISOString();
|
||||||
|
const priority = blog.featured ? '0.9' : '0.7';
|
||||||
|
const primaryImg = blog.ogImage || blog.imageUrl;
|
||||||
|
const title = blog.title || 'مقاله وبلاگ تخصصی کنینا';
|
||||||
|
|
||||||
|
const imageTag = primaryImg
|
||||||
|
? `\n <image:image>\n <image:loc>${
|
||||||
|
primaryImg.startsWith('http') ? primaryImg : `${baseUrl}${primaryImg.startsWith('/') ? '' : '/'}${primaryImg}`
|
||||||
|
}</image:loc>\n <image:title><![CDATA[${title}]]></image:title>\n </image:image>`
|
||||||
|
: '';
|
||||||
|
|
||||||
|
return ` <url>\n <loc>${loc}</loc>\n <lastmod>${lastmod}</lastmod>\n <changefreq>weekly</changefreq>\n <priority>${priority}</priority>${imageTag}\n </url>`;
|
||||||
|
})
|
||||||
|
.join('\n');
|
||||||
|
|
||||||
|
const xmlContent = `<?xml version="1.0" encoding="UTF-8"?>\n<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"\n xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">\n${urlsXml}\n</urlset>`;
|
||||||
|
|
||||||
|
return new NextResponse(xmlContent, {
|
||||||
|
status: 200,
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/xml; charset=utf-8',
|
||||||
|
'Cache-Control': 'public, max-age=3600, s-maxage=3600, stale-while-revalidate=86400',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
import { NextResponse } from 'next/server';
|
||||||
|
|
||||||
|
export const dynamic = 'force-dynamic';
|
||||||
|
export const revalidate = 86400; // Revalidate daily
|
||||||
|
|
||||||
|
type SitemapWikiTerm = {
|
||||||
|
key: string;
|
||||||
|
term: string;
|
||||||
|
definition?: string;
|
||||||
|
updatedAt?: string;
|
||||||
|
createdAt?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function GET() {
|
||||||
|
const baseUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://canina.ir';
|
||||||
|
const apiUrl =
|
||||||
|
process.env.INTERNAL_API_URL || process.env.NEXT_PUBLIC_API_URL || 'http://localhost:4001/api';
|
||||||
|
const normalizedApiUrl = apiUrl.replace(/\/$/, '');
|
||||||
|
const apiBase = normalizedApiUrl.endsWith('/api') ? normalizedApiUrl : `${normalizedApiUrl}/api`;
|
||||||
|
|
||||||
|
const wikiRoutes: SitemapWikiTerm[] = [];
|
||||||
|
|
||||||
|
try {
|
||||||
|
let page = 1;
|
||||||
|
let lastPage = 1;
|
||||||
|
do {
|
||||||
|
const res = await fetch(`${apiBase}/wiki?page=${page}&limit=50`, { cache: 'no-store' });
|
||||||
|
if (!res.ok) throw new Error(`Wiki sitemap request failed: ${res.status}`);
|
||||||
|
const data = await res.json();
|
||||||
|
const wikiList: SitemapWikiTerm[] = data.data || [];
|
||||||
|
if (!wikiList.length) break;
|
||||||
|
|
||||||
|
wikiRoutes.push(...wikiList);
|
||||||
|
|
||||||
|
lastPage = Number(data.meta?.lastPage) || 1;
|
||||||
|
page += 1;
|
||||||
|
} while (page <= lastPage);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to fetch wiki terms for sitemap-wiki.xml:', err);
|
||||||
|
}
|
||||||
|
|
||||||
|
const urlsXml = wikiRoutes
|
||||||
|
.map((item) => {
|
||||||
|
const loc = `${baseUrl}/wiki/${encodeURIComponent(item.key)}`;
|
||||||
|
const lastmod = item.updatedAt
|
||||||
|
? new Date(item.updatedAt).toISOString()
|
||||||
|
: item.createdAt
|
||||||
|
? new Date(item.createdAt).toISOString()
|
||||||
|
: new Date().toISOString();
|
||||||
|
|
||||||
|
return ` <url>\n <loc>${loc}</loc>\n <lastmod>${lastmod}</lastmod>\n <changefreq>weekly</changefreq>\n <priority>0.8</priority>\n </url>`;
|
||||||
|
})
|
||||||
|
.join('\n');
|
||||||
|
|
||||||
|
const xmlContent = `<?xml version="1.0" encoding="UTF-8"?>\n<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n${urlsXml}\n</urlset>`;
|
||||||
|
|
||||||
|
return new NextResponse(xmlContent, {
|
||||||
|
status: 200,
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/xml; charset=utf-8',
|
||||||
|
'Cache-Control': 'public, max-age=86400, s-maxage=86400, stale-while-revalidate=604800',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
import { afterEach, describe, expect, it, vi } from 'vitest';
|
||||||
|
import robots from './robots';
|
||||||
|
import { GET as getBlogSitemap } from './sitemap-blog.xml/route';
|
||||||
|
import { GET as getWikiSitemap } from './sitemap-wiki.xml/route';
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.unstubAllGlobals();
|
||||||
|
vi.unstubAllEnvs();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Sub-sitemaps and robots.ts integration (SEO-P1-10)', () => {
|
||||||
|
it('registers sitemap-blog.xml and sitemap-wiki.xml in robots.ts', () => {
|
||||||
|
vi.stubEnv('NEXT_PUBLIC_APP_ENV', 'production');
|
||||||
|
vi.stubEnv('NODE_ENV', 'production');
|
||||||
|
vi.stubEnv('NEXT_PUBLIC_SITE_URL', 'https://canina.ir');
|
||||||
|
|
||||||
|
const config = robots();
|
||||||
|
const sitemaps = Array.isArray(config.sitemap) ? config.sitemap : [config.sitemap];
|
||||||
|
|
||||||
|
expect(sitemaps).toContain('https://canina.ir/sitemap.xml');
|
||||||
|
expect(sitemaps).toContain('https://canina.ir/sitemap-products.xml');
|
||||||
|
expect(sitemaps).toContain('https://canina.ir/sitemap-categories.xml');
|
||||||
|
expect(sitemaps).toContain('https://canina.ir/sitemap-blog.xml');
|
||||||
|
expect(sitemaps).toContain('https://canina.ir/sitemap-wiki.xml');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('generates sitemap-blog.xml correctly with published blogs and image tags', async () => {
|
||||||
|
vi.stubEnv('INTERNAL_API_URL', 'http://backend:3000/api');
|
||||||
|
vi.stubEnv('NEXT_PUBLIC_SITE_URL', 'https://canina.ir');
|
||||||
|
|
||||||
|
const fetchMock = vi.fn().mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
json: async () => ({
|
||||||
|
data: [
|
||||||
|
{
|
||||||
|
slug: 'puppy-nutrition',
|
||||||
|
title: 'تغذیه توله سگ',
|
||||||
|
status: 'PUBLISHED',
|
||||||
|
updatedAt: '2026-10-10T12:00:00.000Z',
|
||||||
|
featured: true,
|
||||||
|
imageUrl: '/uploads/puppy.jpg',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
slug: 'hidden-blog',
|
||||||
|
title: 'مقاله پیشنویس',
|
||||||
|
status: 'DRAFT',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
meta: { lastPage: 1 },
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
vi.stubGlobal('fetch', fetchMock);
|
||||||
|
|
||||||
|
const res = await getBlogSitemap();
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const xml = await res.text();
|
||||||
|
|
||||||
|
expect(xml).toContain('<loc>https://canina.ir/blog/puppy-nutrition</loc>');
|
||||||
|
expect(xml).toContain('<priority>0.9</priority>');
|
||||||
|
expect(xml).toContain('<image:loc>https://canina.ir/uploads/puppy.jpg</image:loc>');
|
||||||
|
expect(xml).toContain('تغذیه توله سگ');
|
||||||
|
expect(xml).not.toContain('hidden-blog');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('generates sitemap-wiki.xml correctly with scientific terms', async () => {
|
||||||
|
vi.stubEnv('INTERNAL_API_URL', 'http://backend:3000/api');
|
||||||
|
vi.stubEnv('NEXT_PUBLIC_SITE_URL', 'https://canina.ir');
|
||||||
|
|
||||||
|
const fetchMock = vi.fn().mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
json: async () => ({
|
||||||
|
data: [
|
||||||
|
{
|
||||||
|
key: 'omega-3',
|
||||||
|
term: 'امگا ۳',
|
||||||
|
updatedAt: '2026-09-01T10:00:00.000Z',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
meta: { lastPage: 1 },
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
vi.stubGlobal('fetch', fetchMock);
|
||||||
|
|
||||||
|
const res = await getWikiSitemap();
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const xml = await res.text();
|
||||||
|
|
||||||
|
expect(xml).toContain('<loc>https://canina.ir/wiki/omega-3</loc>');
|
||||||
|
expect(xml).toContain('<priority>0.8</priority>');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { notFound } from 'next/navigation';
|
||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
import { ChevronRight, Sparkles, Package, ArrowLeft, ShieldCheck } from 'lucide-react';
|
import { ChevronRight, Sparkles, Package, ArrowLeft, ShieldCheck } from 'lucide-react';
|
||||||
import type { Metadata } from 'next';
|
import type { Metadata } from 'next';
|
||||||
@@ -11,15 +12,38 @@ const apiBase = API_URL.endsWith('/api') ? API_URL : `${API_URL.replace(/\/$/, '
|
|||||||
|
|
||||||
async function getWikiTerm(key: string) {
|
async function getWikiTerm(key: string) {
|
||||||
try {
|
try {
|
||||||
|
// 1. Try scientific terms endpoint
|
||||||
const res = await fetch(`${apiBase}/wiki/${encodeURIComponent(key)}`, {
|
const res = await fetch(`${apiBase}/wiki/${encodeURIComponent(key)}`, {
|
||||||
next: { revalidate: 3600, tags: ['wiki', `wiki-${key}`] }
|
next: { revalidate: 3600, tags: ['wiki', `wiki-${key}`] }
|
||||||
});
|
});
|
||||||
if (!res.ok) return null;
|
if (res.ok) {
|
||||||
return await res.json();
|
return await res.json();
|
||||||
} catch (error) {
|
|
||||||
console.error('[Wiki] Error fetching term:', error);
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.warn('[Wiki] /wiki/:key failed, trying /ingredients fallback:', error);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 2. Fallback to ingredients endpoint if slug is an ingredient slug
|
||||||
|
const ingRes = await fetch(`${apiBase}/ingredients/${encodeURIComponent(key)}`, {
|
||||||
|
next: { revalidate: 3600, tags: ['ingredients', `ing-${key}`] }
|
||||||
|
});
|
||||||
|
if (ingRes.ok) {
|
||||||
|
const ing = await ingRes.json();
|
||||||
|
return {
|
||||||
|
key: ing.slug,
|
||||||
|
term: ing.nameFa || ing.nameEn || ing.slug,
|
||||||
|
definition: ing.description || `بررسی تخصصی ترکیب دارویی و خواص ${ing.nameFa || ing.nameEn} در کاتالوگ مکملهای کنینا آلمان.`,
|
||||||
|
metaTitle: `خواص دارویی ${ing.nameFa || ing.nameEn} | دانشنامه کنینا ایران`,
|
||||||
|
metaDescription: (ing.description || '').slice(0, 155),
|
||||||
|
wikiId: ing.slug,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('[Wiki] Error fetching ingredient fallback:', error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getRelatedProducts(termName: string) {
|
async function getRelatedProducts(termName: string) {
|
||||||
@@ -81,15 +105,7 @@ export default async function WikiTermPage({ params }: { params: Promise<{ slug:
|
|||||||
const term = await getWikiTerm(slug);
|
const term = await getWikiTerm(slug);
|
||||||
|
|
||||||
if (!term) {
|
if (!term) {
|
||||||
return (
|
notFound();
|
||||||
<div className="min-h-[50vh] flex flex-col items-center justify-center font-vazir text-center px-4" dir="rtl">
|
|
||||||
<h1 className="text-3xl font-black text-medical-gray-900 mb-4">ترکیب علمی یافت نشد</h1>
|
|
||||||
<Link href="/wiki" className="text-canina-blue font-bold flex items-center gap-2">
|
|
||||||
<ChevronRight className="w-4 h-4" />
|
|
||||||
بازگشت به دانشنامه
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const relatedProducts = await getRelatedProducts(term.term);
|
const relatedProducts = await getRelatedProducts(term.term);
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
import { useUserStore } from "../lib/store/userStore";
|
||||||
import React, { useState, useMemo, useEffect, useCallback } from "react";
|
import React, { useState, useMemo, useEffect, useCallback } from "react";
|
||||||
|
import { createPortal } from "react-dom";
|
||||||
import { toPersian, isProductOutOfStock } from "../lib/utils";
|
import { toPersian, isProductOutOfStock } from "../lib/utils";
|
||||||
import { Product, PetType } from "../lib/data/products";
|
import { Product, PetType } from "../lib/data/products";
|
||||||
import { usePetStore } from "../lib/store/usePetStore";
|
import { usePetStore } from "../lib/store/usePetStore";
|
||||||
@@ -86,7 +88,8 @@ export const ArchiveProductCard: React.FC<{ product: Product }> = ({ product })
|
|||||||
const { addItem } = useCartStore();
|
const { addItem } = useCartStore();
|
||||||
const cartItem = useCartStore((s) => s.items.find(i => i.product.id === product.id));
|
const cartItem = useCartStore((s) => s.items.find(i => i.product.id === product.id));
|
||||||
const [isAdding, setIsAdding] = useState(false);
|
const [isAdding, setIsAdding] = useState(false);
|
||||||
const activePet = usePetStore(state => state.pets.find(p => p.id === state.activePetId) || null);
|
const isLoggedIn = useUserStore(s => s.isLoggedIn);
|
||||||
|
const activePet = usePetStore(state => (isLoggedIn ? (state.pets.find(p => p.id === state.activePetId) || null) : null));
|
||||||
const { showPrices, allowCart, showPreorderBtn } = useCatalogMode();
|
const { showPrices, allowCart, showPreorderBtn } = useCatalogMode();
|
||||||
const productUrl = `/shop/${product.slug || product.id}`;
|
const productUrl = `/shop/${product.slug || product.id}`;
|
||||||
|
|
||||||
@@ -128,15 +131,11 @@ export const ArchiveProductCard: React.FC<{ product: Product }> = ({ product })
|
|||||||
href={productUrl}
|
href={productUrl}
|
||||||
className="group bg-white rounded-[2.5rem] border border-medical-gray-200 overflow-hidden hover:shadow-2xl transition-all flex flex-col h-full relative"
|
className="group bg-white rounded-[2.5rem] border border-medical-gray-200 overflow-hidden hover:shadow-2xl transition-all flex flex-col h-full relative"
|
||||||
>
|
>
|
||||||
{product.specialBadge && (
|
{/* SpecialBadge moved below image to avoid covering product photo */}
|
||||||
<div className="absolute top-4 right-4 z-10 bg-canina-blue text-white text-2xs font-black uppercase tracking-widest px-3 py-1 rounded-full shadow-lg">
|
|
||||||
{product.specialBadge}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{compatibility && (
|
{compatibility && (
|
||||||
<div className={`absolute top-14 right-4 z-10 text-3xs font-black uppercase tracking-widest px-3 py-1 rounded-full shadow-md flex items-center gap-1 ${compatibility.type === 'alert' ? 'bg-amber-100 text-amber-700' :
|
<div className={`absolute top-4 right-4 z-10 text-3xs font-black uppercase tracking-widest px-2.5 py-1 rounded-full shadow-md flex items-center gap-1 backdrop-blur-xs ${compatibility.type === 'alert' ? 'bg-amber-500/90 text-white' :
|
||||||
compatibility.type === 'success' ? 'bg-green-100 text-green-700' : 'bg-medical-gray-100 text-medical-gray-600'
|
compatibility.type === 'success' ? 'bg-emerald-600/90 text-white' : 'bg-canina-blue/90 text-white'
|
||||||
}`}>
|
}`}>
|
||||||
{compatibility.type === 'alert' ? (
|
{compatibility.type === 'alert' ? (
|
||||||
forBoth ? (
|
forBoth ? (
|
||||||
@@ -183,6 +182,13 @@ export const ArchiveProductCard: React.FC<{ product: Product }> = ({ product })
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="p-6 flex flex-col flex-1">
|
<div className="p-6 flex flex-col flex-1">
|
||||||
|
{product.specialBadge && (
|
||||||
|
<div className="mb-2">
|
||||||
|
<span className="inline-block bg-canina-blue/10 text-canina-blue border border-canina-blue/20 text-[10px] font-black px-2.5 py-1 rounded-lg line-clamp-1 font-vazir" title={product.specialBadge}>
|
||||||
|
{product.specialBadge}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<div className="text-2xs font-bold text-canina-blue uppercase tracking-widest mb-2">{product.category}</div>
|
<div className="text-2xs font-bold text-canina-blue uppercase tracking-widest mb-2">{product.category}</div>
|
||||||
<div className="flex flex-col gap-1 mb-3">
|
<div className="flex flex-col gap-1 mb-3">
|
||||||
<h3 dir="rtl" className="text-base font-black text-medical-gray-900 group-hover:text-canina-blue transition-colors leading-tight text-right font-vazir">
|
<h3 dir="rtl" className="text-base font-black text-medical-gray-900 group-hover:text-canina-blue transition-colors leading-tight text-right font-vazir">
|
||||||
@@ -272,7 +278,8 @@ const ArchiveProductListItem: React.FC<{ product: Product }> = ({ product }) =>
|
|||||||
const { addItem } = useCartStore();
|
const { addItem } = useCartStore();
|
||||||
const cartItem = useCartStore((s) => s.items.find(i => i.product.id === product.id));
|
const cartItem = useCartStore((s) => s.items.find(i => i.product.id === product.id));
|
||||||
const [isAdding, setIsAdding] = useState(false);
|
const [isAdding, setIsAdding] = useState(false);
|
||||||
const activePet = usePetStore(state => state.pets.find(p => p.id === state.activePetId) || null);
|
const isLoggedIn = useUserStore(s => s.isLoggedIn);
|
||||||
|
const activePet = usePetStore(state => (isLoggedIn ? (state.pets.find(p => p.id === state.activePetId) || null) : null));
|
||||||
const productUrl = `/shop/${product.slug || product.id}`;
|
const productUrl = `/shop/${product.slug || product.id}`;
|
||||||
|
|
||||||
const handleAddToCart = (e: React.MouseEvent) => {
|
const handleAddToCart = (e: React.MouseEvent) => {
|
||||||
@@ -324,11 +331,7 @@ const ArchiveProductListItem: React.FC<{ product: Product }> = ({ product }) =>
|
|||||||
className="w-full h-full group-hover:scale-105 transition-transform duration-500"
|
className="w-full h-full group-hover:scale-105 transition-transform duration-500"
|
||||||
imgClassName="w-full h-full object-contain"
|
imgClassName="w-full h-full object-contain"
|
||||||
/>
|
/>
|
||||||
{product.specialBadge && (
|
{/* List specialBadge moved below */}
|
||||||
<div className="absolute top-1 right-1 z-10 bg-canina-blue text-white text-[9px] font-black uppercase px-1.5 py-0.5 rounded-md shadow-xs">
|
|
||||||
{product.specialBadge}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="absolute bottom-1 left-1 flex gap-1">
|
<div className="absolute bottom-1 left-1 flex gap-1">
|
||||||
{forDog && (
|
{forDog && (
|
||||||
<div className="w-5 h-5 bg-white/90 backdrop-blur-xs rounded-md flex items-center justify-center text-medical-gray-500 border border-medical-gray-100 shadow-2xs" title="مناسب برای سگ">
|
<div className="w-5 h-5 bg-white/90 backdrop-blur-xs rounded-md flex items-center justify-center text-medical-gray-500 border border-medical-gray-100 shadow-2xs" title="مناسب برای سگ">
|
||||||
@@ -449,12 +452,18 @@ export default function ArchivePage({
|
|||||||
initialCategory = "all",
|
initialCategory = "all",
|
||||||
initialSearch = "",
|
initialSearch = "",
|
||||||
initialPetType = "all",
|
initialPetType = "all",
|
||||||
initialSymptoms = ""
|
initialSymptoms = "",
|
||||||
|
initialProducts = [],
|
||||||
|
initialPage = 1,
|
||||||
|
initialLimit = 12
|
||||||
}: {
|
}: {
|
||||||
initialCategory?: string,
|
initialCategory?: string,
|
||||||
initialSearch?: string,
|
initialSearch?: string,
|
||||||
initialPetType?: string,
|
initialPetType?: string,
|
||||||
initialSymptoms?: string
|
initialSymptoms?: string,
|
||||||
|
initialProducts?: Product[],
|
||||||
|
initialPage?: number,
|
||||||
|
initialLimit?: number
|
||||||
}) {
|
}) {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const getText = useSettingsStore(state => state.getText);
|
const getText = useSettingsStore(state => state.getText);
|
||||||
@@ -463,10 +472,18 @@ export default function ArchivePage({
|
|||||||
const [activeSymptoms, setActiveSymptoms] = useState<string[]>(initialSymptoms ? initialSymptoms.split(',') : []);
|
const [activeSymptoms, setActiveSymptoms] = useState<string[]>(initialSymptoms ? initialSymptoms.split(',') : []);
|
||||||
const [searchQuery, setSearchQuery] = useState(initialSearch);
|
const [searchQuery, setSearchQuery] = useState(initialSearch);
|
||||||
const [isUpdating, setIsUpdating] = useState(false);
|
const [isUpdating, setIsUpdating] = useState(false);
|
||||||
const [filteredProducts, setFilteredProducts] = useState<Product[]>([]);
|
const [fetchError, setFetchError] = useState<string | null>(null);
|
||||||
|
const [filteredProducts, setFilteredProducts] = useState<Product[]>(() => orderProductsByAvailability(initialProducts));
|
||||||
const [sortBy, setSortBy] = useState<string>("createdAt");
|
const [sortBy, setSortBy] = useState<string>("createdAt");
|
||||||
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("desc");
|
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("desc");
|
||||||
const [viewMode, setViewMode] = useState<"list" | "grid">("list");
|
const [viewMode, setViewMode] = useState<"list" | "grid">("list");
|
||||||
|
const [currentPage, setCurrentPage] = useState<number>(() => Math.max(1, initialPage));
|
||||||
|
const pageSize = Math.max(1, initialLimit);
|
||||||
|
const [isMounted, setIsMounted] = useState<boolean>(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setIsMounted(true);
|
||||||
|
}, []);
|
||||||
const [isMobileSolutionsOpen, setIsMobileSolutionsOpen] = useState(false);
|
const [isMobileSolutionsOpen, setIsMobileSolutionsOpen] = useState(false);
|
||||||
const [isMobileSymptomsOpen, setIsMobileSymptomsOpen] = useState(false);
|
const [isMobileSymptomsOpen, setIsMobileSymptomsOpen] = useState(false);
|
||||||
|
|
||||||
@@ -524,6 +541,7 @@ export default function ArchivePage({
|
|||||||
}
|
}
|
||||||
|
|
||||||
lastInitialPropsRef.current = { initialCategory, initialSearch, initialPetType, initialSymptoms };
|
lastInitialPropsRef.current = { initialCategory, initialSearch, initialPetType, initialSymptoms };
|
||||||
|
setCurrentPage(initialPage || 1);
|
||||||
|
|
||||||
// Normalize Input
|
// Normalize Input
|
||||||
const normSearch = (initialSearch || "").trim().toLowerCase();
|
const normSearch = (initialSearch || "").trim().toLowerCase();
|
||||||
@@ -543,6 +561,7 @@ export default function ArchivePage({
|
|||||||
setSelectedPet((initialPetType as PetType) || "all");
|
setSelectedPet((initialPetType as PetType) || "all");
|
||||||
setActiveSymptoms(initialSymptoms ? initialSymptoms.split(',').filter(Boolean) : []);
|
setActiveSymptoms(initialSymptoms ? initialSymptoms.split(',').filter(Boolean) : []);
|
||||||
}
|
}
|
||||||
|
setCurrentPage(1);
|
||||||
}, [initialCategory, initialSearch, initialPetType, initialSymptoms]);
|
}, [initialCategory, initialSearch, initialPetType, initialSymptoms]);
|
||||||
|
|
||||||
// Update URL Query Parameters
|
// Update URL Query Parameters
|
||||||
@@ -552,15 +571,20 @@ export default function ArchivePage({
|
|||||||
if (selectedPet && selectedPet !== "all") params.set('petType', selectedPet);
|
if (selectedPet && selectedPet !== "all") params.set('petType', selectedPet);
|
||||||
if (searchQuery) params.set('search', searchQuery);
|
if (searchQuery) params.set('search', searchQuery);
|
||||||
if (activeSymptoms.length > 0) params.set('symptoms', activeSymptoms.join(','));
|
if (activeSymptoms.length > 0) params.set('symptoms', activeSymptoms.join(','));
|
||||||
|
if (currentPage > 1) params.set('page', String(currentPage));
|
||||||
|
|
||||||
const queryString = params.toString();
|
const queryString = params.toString();
|
||||||
const newUrl = `/shop${queryString ? `?${queryString}` : ''}`;
|
const newUrl = `/shop${queryString ? `?${queryString}` : ''}`;
|
||||||
if (typeof window !== 'undefined' && window.location.pathname + window.location.search !== newUrl) {
|
if (typeof window !== 'undefined' && window.location.pathname + window.location.search !== newUrl) {
|
||||||
router.replace(newUrl, { scroll: false });
|
router.replace(newUrl, { scroll: false });
|
||||||
}
|
}
|
||||||
}, [selectedCategory, selectedPet, searchQuery, activeSymptoms, router]);
|
}, [selectedCategory, selectedPet, searchQuery, activeSymptoms, currentPage, router]);
|
||||||
|
|
||||||
|
const hasInitialProducts = Boolean(initialProducts && initialProducts.length > 0);
|
||||||
|
const didSkipInitialFetch = React.useRef(false);
|
||||||
|
|
||||||
const fetchProducts = useCallback(async () => {
|
const fetchProducts = useCallback(async () => {
|
||||||
|
setFetchError(null);
|
||||||
setIsUpdating(true);
|
setIsUpdating(true);
|
||||||
try {
|
try {
|
||||||
const res = await productService.getProducts({
|
const res = await productService.getProducts({
|
||||||
@@ -579,17 +603,23 @@ export default function ArchivePage({
|
|||||||
}
|
}
|
||||||
|
|
||||||
setFilteredProducts(orderProductsByAvailability(result));
|
setFilteredProducts(orderProductsByAvailability(result));
|
||||||
|
setCurrentPage(1);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Failed to fetch products:", error);
|
console.error("Failed to fetch products:", error);
|
||||||
toast.error("خطا در دریافت لیست محصولات از سرور. لطفاً صفحه را رفرش کنید.");
|
toast.error("خطا در دریافت لیست محصولات از سرور.");
|
||||||
|
setFetchError("خطا در برقراری ارتباط با سرور یا دریافت اطلاعات محصولات.");
|
||||||
} finally {
|
} finally {
|
||||||
setIsUpdating(false);
|
setIsUpdating(false);
|
||||||
}
|
}
|
||||||
}, [selectedCategory, selectedPet, searchQuery, sortBy, sortOrder, activeSymptoms]);
|
}, [selectedCategory, selectedPet, searchQuery, sortBy, sortOrder, activeSymptoms]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (hasInitialProducts && !didSkipInitialFetch.current) {
|
||||||
|
didSkipInitialFetch.current = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
Promise.resolve().then(() => fetchProducts());
|
Promise.resolve().then(() => fetchProducts());
|
||||||
}, [fetchProducts]);
|
}, [fetchProducts, hasInitialProducts]);
|
||||||
|
|
||||||
const toggleSymptom = (s: string) => {
|
const toggleSymptom = (s: string) => {
|
||||||
setActiveSymptoms(prev => prev.includes(s) ? prev.filter(item => item !== s) : [...prev, s]);
|
setActiveSymptoms(prev => prev.includes(s) ? prev.filter(item => item !== s) : [...prev, s]);
|
||||||
@@ -696,6 +726,7 @@ export default function ArchivePage({
|
|||||||
<div className="relative mb-3">
|
<div className="relative mb-3">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
|
aria-label="جستجوی علائم"
|
||||||
placeholder="جستجوی علائم..."
|
placeholder="جستجوی علائم..."
|
||||||
value={symptomSearch}
|
value={symptomSearch}
|
||||||
onChange={(e) => setSymptomSearch(e.target.value)}
|
onChange={(e) => setSymptomSearch(e.target.value)}
|
||||||
@@ -740,22 +771,23 @@ export default function ArchivePage({
|
|||||||
|
|
||||||
{/* Main Content */}
|
{/* Main Content */}
|
||||||
<main className="flex-1 relative">
|
<main className="flex-1 relative">
|
||||||
{/* Desktop Top Title & Search / Sort Row */}
|
{/* Semantic Single H1 across breakpoints */}
|
||||||
<div className="hidden lg:flex flex-col sm:flex-row items-center justify-between mb-6 gap-4">
|
<div className="flex flex-col lg:flex-row items-start lg:items-center justify-between mb-2 lg:mb-6 gap-2 lg:gap-4">
|
||||||
{getText('shop_catalog_title', '').trim() ? (
|
<h1
|
||||||
<h2
|
className="text-2xl lg:text-3xl font-black text-medical-gray-900"
|
||||||
className="text-3xl font-black text-medical-gray-900"
|
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: getText('shop_catalog_title', 'کاتولوگ دارویی <span class="text-canina-blue">Canina</span>')
|
__html: getText('shop_catalog_title', 'کاتالوگ و فروشگاه مکملهای دارویی <span class="text-canina-blue">کنینا</span>')
|
||||||
|
.replace(/^\s*<h1[^>]*>/i, '')
|
||||||
|
.replace(/<\/h1>\s*$/i, '')
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
) : null}
|
|
||||||
|
|
||||||
<div className="flex items-center gap-3 w-auto">
|
<div className="hidden lg:flex items-center gap-3 w-auto">
|
||||||
{/* Sort Dropdown */}
|
{/* Sort Dropdown */}
|
||||||
<div className="flex items-center gap-2 bg-white border border-medical-gray-200 rounded-2xl px-3 py-2 text-xs font-bold shadow-xs">
|
<div className="flex items-center gap-2 bg-white border border-medical-gray-200 rounded-2xl px-3 py-2 text-xs font-bold shadow-xs">
|
||||||
<span className="text-medical-gray-400 whitespace-nowrap">مرتبسازی:</span>
|
<span className="text-medical-gray-400 whitespace-nowrap">مرتبسازی:</span>
|
||||||
<select
|
<select
|
||||||
|
aria-label="مرتبسازی محصولات"
|
||||||
value={`${sortBy}:${sortOrder}`}
|
value={`${sortBy}:${sortOrder}`}
|
||||||
onChange={(e) => {
|
onChange={(e) => {
|
||||||
const [b, o] = e.target.value.split(':');
|
const [b, o] = e.target.value.split(':');
|
||||||
@@ -777,6 +809,7 @@ export default function ArchivePage({
|
|||||||
<input
|
<input
|
||||||
data-testid="shop-search-input"
|
data-testid="shop-search-input"
|
||||||
type="text"
|
type="text"
|
||||||
|
aria-label="جستجوی محصول"
|
||||||
placeholder="جستجوی محصول..."
|
placeholder="جستجوی محصول..."
|
||||||
value={searchQuery}
|
value={searchQuery}
|
||||||
onChange={(e) => setSearchQuery(e.target.value)}
|
onChange={(e) => setSearchQuery(e.target.value)}
|
||||||
@@ -786,18 +819,6 @@ export default function ArchivePage({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Mobile Title (Only if set in admin) */}
|
|
||||||
{getText('shop_catalog_title', '').trim() ? (
|
|
||||||
<div className="lg:hidden mb-2">
|
|
||||||
<h2
|
|
||||||
className="text-2xl font-black text-medical-gray-900"
|
|
||||||
dangerouslySetInnerHTML={{
|
|
||||||
__html: getText('shop_catalog_title', 'کاتولوگ دارویی <span class="text-canina-blue">Canina</span>')
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
) : null}
|
|
||||||
|
|
||||||
{/* Mobile Controls: Horizontal Sliding Filters & View Toggle Row */}
|
{/* Mobile Controls: Horizontal Sliding Filters & View Toggle Row */}
|
||||||
<div className="lg:hidden flex flex-col gap-2 mb-2">
|
<div className="lg:hidden flex flex-col gap-2 mb-2">
|
||||||
{/* Search Bar on Mobile */}
|
{/* Search Bar on Mobile */}
|
||||||
@@ -806,6 +827,7 @@ export default function ArchivePage({
|
|||||||
<input
|
<input
|
||||||
data-testid="shop-search-input-mobile"
|
data-testid="shop-search-input-mobile"
|
||||||
type="text"
|
type="text"
|
||||||
|
aria-label="جستجوی محصول"
|
||||||
placeholder="جستجوی محصول..."
|
placeholder="جستجوی محصول..."
|
||||||
value={searchQuery}
|
value={searchQuery}
|
||||||
onChange={(e) => setSearchQuery(e.target.value)}
|
onChange={(e) => setSearchQuery(e.target.value)}
|
||||||
@@ -815,7 +837,8 @@ export default function ArchivePage({
|
|||||||
|
|
||||||
|
|
||||||
{/* Horizontal Scrollable Row for Sort, Pet Type, Solutions & Symptoms Filter */}
|
{/* Horizontal Scrollable Row for Sort, Pet Type, Solutions & Symptoms Filter */}
|
||||||
<div className="flex items-center gap-2 overflow-x-auto pb-2.5 pt-0.5 micro-hscroll -mx-4 px-4 select-none touch-pan-x mt-2 mb-4">
|
<div className="relative -mx-4 mt-2 mb-4" data-testid="mobile-catalog-filters-edge">
|
||||||
|
<div data-testid="mobile-catalog-filters" aria-label="فیلترهای محصولات" className="flex items-center gap-2 overflow-x-auto pb-2.5 pt-0.5 micro-hscroll px-4 select-none touch-pan-x mobile-filter-mask">
|
||||||
|
|
||||||
{/* 1. View Mode Switch: 2 Buttons (List / Card) */}
|
{/* 1. View Mode Switch: 2 Buttons (List / Card) */}
|
||||||
<div className="flex-shrink-0 inline-flex items-center bg-white border border-medical-gray-200 rounded-xl p-0.5 shadow-2xs mr-auto">
|
<div className="flex-shrink-0 inline-flex items-center bg-white border border-medical-gray-200 rounded-xl p-0.5 shadow-2xs mr-auto">
|
||||||
@@ -902,23 +925,23 @@ export default function ArchivePage({
|
|||||||
}}
|
}}
|
||||||
className={`flex items-center gap-1.5 px-3 py-1.5 rounded-xl border text-[11px] font-black shadow-2xs transition-all whitespace-nowrap ${selectedCategory !== "all" ? "bg-canina-blue text-white border-canina-blue" : "bg-white border-medical-gray-200 text-medical-gray-700"}`}
|
className={`flex items-center gap-1.5 px-3 py-1.5 rounded-xl border text-[11px] font-black shadow-2xs transition-all whitespace-nowrap ${selectedCategory !== "all" ? "bg-canina-blue text-white border-canina-blue" : "bg-white border-medical-gray-200 text-medical-gray-700"}`}
|
||||||
>
|
>
|
||||||
<span>{selectedCategory !== "all" ? (CATEGORY_LABELS[selectedCategory] || "راهکار درمانی") : "راهکار درمانی"}</span>
|
<span>{selectedCategory !== "all" ? (CATEGORY_LABELS[selectedCategory] || "دستهبندی") : "دستهبندی و راهکار"}</span>
|
||||||
<ChevronDown className={`w-3 h-3 transition-transform ${isMobileSolutionsOpen ? "rotate-180" : ""}`} />
|
<ChevronDown className={`w-3 h-3 transition-transform ${isMobileSolutionsOpen ? "rotate-180" : ""}`} />
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{isMobileSolutionsOpen && (
|
{isMobileSolutionsOpen && isMounted && createPortal(
|
||||||
<div className="fixed inset-0 z-50 flex items-end justify-center bg-black/40 backdrop-blur-xs font-vazir" onClick={() => setIsMobileSolutionsOpen(false)}>
|
<div className="fixed inset-0 z-[9999] flex items-end justify-center bg-black/50 backdrop-blur-xs font-vazir" dir="rtl" onClick={() => setIsMobileSolutionsOpen(false)}>
|
||||||
<div
|
<div
|
||||||
className="w-full max-w-lg bg-white rounded-t-3xl p-5 border-t border-medical-gray-200 shadow-2xl max-h-[75vh] flex flex-col animate-in slide-in-from-bottom duration-200"
|
className="w-full max-w-lg bg-white rounded-t-3xl p-5 border-t border-medical-gray-200 shadow-2xl max-h-[75vh] flex flex-col animate-in slide-in-from-bottom duration-200"
|
||||||
onClick={(e) => e.stopPropagation()}
|
onClick={(e) => e.stopPropagation()}
|
||||||
>
|
>
|
||||||
<div className="w-10 h-1 bg-medical-gray-200 rounded-full mx-auto mb-3 shrink-0" />
|
<div className="w-10 h-1 bg-medical-gray-200 rounded-full mx-auto mb-3 shrink-0" />
|
||||||
<div className="flex items-center justify-between pb-3 border-b border-medical-gray-100 mb-3 shrink-0">
|
<div className="flex items-center justify-between pb-3 border-b border-medical-gray-100 mb-3 shrink-0">
|
||||||
<h4 className="font-black text-sm text-medical-gray-900">انتخاب راهکار درمانی</h4>
|
<h4 className="font-black text-sm text-medical-gray-900">فیلتر دستهبندی و راهکار درمانی</h4>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setIsMobileSolutionsOpen(false)}
|
onClick={() => setIsMobileSolutionsOpen(false)}
|
||||||
className="text-xs text-medical-gray-400 hover:text-medical-gray-700 font-bold p-1"
|
className="text-xs text-medical-gray-400 hover:text-medical-gray-700 font-bold p-1 cursor-pointer"
|
||||||
>
|
>
|
||||||
بستن ✕
|
بستن ✕
|
||||||
</button>
|
</button>
|
||||||
@@ -932,7 +955,7 @@ export default function ArchivePage({
|
|||||||
setSelectedCategory(cat.id);
|
setSelectedCategory(cat.id);
|
||||||
setIsMobileSolutionsOpen(false);
|
setIsMobileSolutionsOpen(false);
|
||||||
}}
|
}}
|
||||||
className={`w-full flex items-center gap-3 px-4 py-3 rounded-2xl text-xs font-bold text-right transition-colors border ${selectedCategory === cat.id ? "bg-canina-blue border-canina-blue text-white" : "bg-white border-medical-gray-100 hover:bg-medical-gray-50 text-medical-gray-700"}`}
|
className={`w-full flex items-center gap-3 px-4 py-3 rounded-2xl text-xs font-bold text-right transition-colors border cursor-pointer ${selectedCategory === cat.id ? "bg-canina-blue border-canina-blue text-white" : "bg-white border-medical-gray-100 hover:bg-medical-gray-50 text-medical-gray-700"}`}
|
||||||
>
|
>
|
||||||
<span className="shrink-0">{cat.icon}</span>
|
<span className="shrink-0">{cat.icon}</span>
|
||||||
<span className="truncate">{cat.label}</span>
|
<span className="truncate">{cat.label}</span>
|
||||||
@@ -940,7 +963,8 @@ export default function ArchivePage({
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>,
|
||||||
|
document.body
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -958,8 +982,8 @@ export default function ArchivePage({
|
|||||||
<ChevronDown className={`w-3 h-3 transition-transform ${isMobileSymptomsOpen ? "rotate-180" : ""}`} />
|
<ChevronDown className={`w-3 h-3 transition-transform ${isMobileSymptomsOpen ? "rotate-180" : ""}`} />
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{isMobileSymptomsOpen && (
|
{isMobileSymptomsOpen && isMounted && createPortal(
|
||||||
<div className="fixed inset-0 z-50 flex items-end justify-center bg-black/40 backdrop-blur-xs font-vazir" onClick={() => setIsMobileSymptomsOpen(false)}>
|
<div className="fixed inset-0 z-[9999] flex items-end justify-center bg-black/50 backdrop-blur-xs font-vazir" dir="rtl" onClick={() => setIsMobileSymptomsOpen(false)}>
|
||||||
<div
|
<div
|
||||||
className="w-full max-w-lg bg-white rounded-t-3xl p-5 border-t border-medical-gray-200 shadow-2xl max-h-[80vh] flex flex-col animate-in slide-in-from-bottom duration-200"
|
className="w-full max-w-lg bg-white rounded-t-3xl p-5 border-t border-medical-gray-200 shadow-2xl max-h-[80vh] flex flex-col animate-in slide-in-from-bottom duration-200"
|
||||||
onClick={(e) => e.stopPropagation()}
|
onClick={(e) => e.stopPropagation()}
|
||||||
@@ -975,7 +999,7 @@ export default function ArchivePage({
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setActiveSymptoms([])}
|
onClick={() => setActiveSymptoms([])}
|
||||||
className="text-xs font-bold text-red-500 hover:underline px-1"
|
className="text-xs font-bold text-red-500 hover:underline px-1 cursor-pointer"
|
||||||
>
|
>
|
||||||
پاک کردن همه
|
پاک کردن همه
|
||||||
</button>
|
</button>
|
||||||
@@ -983,7 +1007,7 @@ export default function ArchivePage({
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setIsMobileSymptomsOpen(false)}
|
onClick={() => setIsMobileSymptomsOpen(false)}
|
||||||
className="text-xs text-medical-gray-400 hover:text-medical-gray-700 font-bold p-1"
|
className="text-xs text-medical-gray-400 hover:text-medical-gray-700 font-bold p-1 cursor-pointer"
|
||||||
>
|
>
|
||||||
بستن ✕
|
بستن ✕
|
||||||
</button>
|
</button>
|
||||||
@@ -994,6 +1018,7 @@ export default function ArchivePage({
|
|||||||
<Search className="absolute right-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-medical-gray-400" />
|
<Search className="absolute right-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-medical-gray-400" />
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
|
aria-label="جستجوی علائم"
|
||||||
placeholder="جستجوی علائم بیماری یا نیاز دارویی..."
|
placeholder="جستجوی علائم بیماری یا نیاز دارویی..."
|
||||||
value={symptomSearch}
|
value={symptomSearch}
|
||||||
onChange={(e) => setSymptomSearch(e.target.value)}
|
onChange={(e) => setSymptomSearch(e.target.value)}
|
||||||
@@ -1012,7 +1037,7 @@ export default function ArchivePage({
|
|||||||
key={s}
|
key={s}
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => toggleSymptom(s)}
|
onClick={() => toggleSymptom(s)}
|
||||||
className={`px-3 py-1.5 rounded-xl text-xs font-bold transition-all border whitespace-nowrap ${activeSymptoms.includes(s)
|
className={`px-3 py-1.5 rounded-xl text-xs font-bold transition-all border whitespace-nowrap cursor-pointer ${activeSymptoms.includes(s)
|
||||||
? "bg-canina-blue border-canina-blue text-white shadow-2xs"
|
? "bg-canina-blue border-canina-blue text-white shadow-2xs"
|
||||||
: "bg-medical-gray-50 border-medical-gray-200 text-medical-gray-600 hover:border-canina-blue/40 hover:text-canina-blue"
|
: "bg-medical-gray-50 border-medical-gray-200 text-medical-gray-600 hover:border-canina-blue/40 hover:text-canina-blue"
|
||||||
}`}
|
}`}
|
||||||
@@ -1027,16 +1052,20 @@ export default function ArchivePage({
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setIsMobileSymptomsOpen(false)}
|
onClick={() => setIsMobileSymptomsOpen(false)}
|
||||||
className="w-full bg-canina-blue text-white py-2.5 rounded-xl font-bold text-xs shadow-lg shadow-canina-blue/20"
|
className="w-full bg-canina-blue text-white py-2.5 rounded-xl font-bold text-xs shadow-lg shadow-canina-blue/20 cursor-pointer"
|
||||||
>
|
>
|
||||||
مشاهده نتایج {activeSymptoms.length > 0 ? `(${toPersian(activeSymptoms.length)} علامت)` : ""}
|
مشاهده نتایج {activeSymptoms.length > 0 ? `(${toPersian(activeSymptoms.length)} علامت)` : ""}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>,
|
||||||
|
document.body
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Active Filters Bar with X Dismiss Cross Buttons */}
|
{/* Active Filters Bar with X Dismiss Cross Buttons */}
|
||||||
@@ -1077,7 +1106,23 @@ export default function ArchivePage({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
<AnimatePresence mode="wait">
|
<AnimatePresence mode="wait">
|
||||||
{isUpdating ? (
|
{fetchError ? (
|
||||||
|
<div key="fetch-error" data-testid="shop-fetch-error" className="bg-white rounded-[2.5rem] p-10 sm:p-14 text-center border border-rose-200/80 shadow-sm flex flex-col items-center">
|
||||||
|
<div className="w-16 h-16 bg-rose-50 rounded-2xl flex items-center justify-center text-rose-500 mb-4 border border-rose-100">
|
||||||
|
<AlertCircle className="w-8 h-8" />
|
||||||
|
</div>
|
||||||
|
<h3 className="text-xl font-black text-medical-gray-900 mb-2">خطا در دریافت اطلاعات محصولات</h3>
|
||||||
|
<p className="text-medical-gray-500 max-w-md mb-6 font-medium text-xs sm:text-sm leading-relaxed">{fetchError}</p>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => fetchProducts()}
|
||||||
|
className="inline-flex items-center gap-2 bg-canina-blue text-white px-6 py-2.5 rounded-xl font-black text-xs sm:text-sm hover:bg-canina-dark transition-all shadow-md shadow-canina-blue/20 cursor-pointer active:scale-95"
|
||||||
|
>
|
||||||
|
<Activity className="w-4 h-4" />
|
||||||
|
<span>تلاش مجدد</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
) : isUpdating ? (
|
||||||
viewMode === "list" ? (
|
viewMode === "list" ? (
|
||||||
<div key="skeleton-list" className="flex flex-col gap-3 lg:hidden">
|
<div key="skeleton-list" className="flex flex-col gap-3 lg:hidden">
|
||||||
{Array.from({ length: 8 }).map((_, i) => (
|
{Array.from({ length: 8 }).map((_, i) => (
|
||||||
@@ -1093,19 +1138,41 @@ export default function ArchivePage({
|
|||||||
)
|
)
|
||||||
) : filteredProducts.length > 0 ? (
|
) : filteredProducts.length > 0 ? (
|
||||||
<>
|
<>
|
||||||
{/* Keep API sort order inside each availability section. */}
|
{/* Progressive slice of products for optimal DOM density and mobile UX */}
|
||||||
{([{
|
{(() => {
|
||||||
|
const totalPages = Math.max(1, Math.ceil(filteredProducts.length / pageSize));
|
||||||
|
const safeCurrentPage = Math.min(currentPage, totalPages);
|
||||||
|
const startIndex = (safeCurrentPage - 1) * pageSize;
|
||||||
|
const slicedProducts = filteredProducts.slice(startIndex, startIndex + pageSize);
|
||||||
|
|
||||||
|
const totalInStock = filteredProducts.filter(product => !isProductOutOfStock(product)).length;
|
||||||
|
const totalOutOfStock = filteredProducts.filter(product => isProductOutOfStock(product)).length;
|
||||||
|
|
||||||
|
const sections = [
|
||||||
|
{
|
||||||
key: "available",
|
key: "available",
|
||||||
title: "محصولات موجود",
|
title: "محصولات موجود",
|
||||||
products: filteredProducts.filter(product => !isProductOutOfStock(product)),
|
totalCount: totalInStock,
|
||||||
}, {
|
products: slicedProducts.filter(product => !isProductOutOfStock(product)),
|
||||||
|
},
|
||||||
|
{
|
||||||
key: "unavailable",
|
key: "unavailable",
|
||||||
title: "محصولات ناموجود",
|
title: "محصولات ناموجود",
|
||||||
products: filteredProducts.filter(product => isProductOutOfStock(product)),
|
totalCount: totalOutOfStock,
|
||||||
}] as const).map(section => section.products.length > 0 && (
|
products: slicedProducts.filter(product => isProductOutOfStock(product)),
|
||||||
<section key={section.key} data-testid={`products-${section.key}`} className="mb-10 last:mb-0">
|
}
|
||||||
<h2 className="mb-5 text-xl font-black text-medical-gray-900">{section.title}</h2>
|
] as const;
|
||||||
{/* Mobile List View vs Card View (Desktop is always responsive multi-column grid) */}
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{sections.map(section => section.products.length > 0 && (
|
||||||
|
<section key={section.key} data-testid={`products-${section.key}`} className="mb-8 last:mb-0">
|
||||||
|
<div className="flex items-center justify-between mb-4">
|
||||||
|
<h2 className="text-xl font-black text-medical-gray-900">{section.title}</h2>
|
||||||
|
<span className="text-xs font-bold text-medical-gray-400">
|
||||||
|
{toPersian(section.totalCount)} محصول
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
<div
|
<div
|
||||||
key={viewMode}
|
key={viewMode}
|
||||||
className={
|
className={
|
||||||
@@ -1117,16 +1184,8 @@ export default function ArchivePage({
|
|||||||
<AnimatePresence mode="popLayout">
|
<AnimatePresence mode="popLayout">
|
||||||
{section.products.map((p: Product) => (
|
{section.products.map((p: Product) => (
|
||||||
<React.Fragment key={p.id}>
|
<React.Fragment key={p.id}>
|
||||||
{/* In list mode on mobile, render ArchiveProductListItem; on desktop (lg+), render standard card */}
|
|
||||||
{viewMode === "list" ? (
|
{viewMode === "list" ? (
|
||||||
<>
|
|
||||||
<div className="block lg:hidden w-full">
|
|
||||||
<ArchiveProductListItem product={p} />
|
<ArchiveProductListItem product={p} />
|
||||||
</div>
|
|
||||||
<div className="hidden lg:block h-full">
|
|
||||||
<ArchiveProductCard product={p} />
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
) : (
|
) : (
|
||||||
<ArchiveProductCard product={p} />
|
<ArchiveProductCard product={p} />
|
||||||
)}
|
)}
|
||||||
@@ -1137,6 +1196,64 @@ export default function ArchivePage({
|
|||||||
</section>
|
</section>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
|
{/* Pagination Controls */}
|
||||||
|
{totalPages > 1 && (
|
||||||
|
<nav aria-label="صفحهبندی محصولات" data-testid="shop-pagination" className="mt-10 mb-4 flex flex-col sm:flex-row items-center justify-between gap-4 bg-white border border-medical-gray-200/80 rounded-2xl p-4 shadow-xs font-vazir">
|
||||||
|
<div className="text-xs text-medical-gray-500 font-bold order-2 sm:order-1">
|
||||||
|
صفحه {toPersian(safeCurrentPage)} از {toPersian(totalPages)} (کل محصولات: {toPersian(filteredProducts.length)})
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2 order-1 sm:order-2">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
disabled={safeCurrentPage <= 1}
|
||||||
|
onClick={() => {
|
||||||
|
setCurrentPage(prev => Math.max(1, prev - 1));
|
||||||
|
window.scrollTo({ top: 0, behavior: "smooth" });
|
||||||
|
}}
|
||||||
|
aria-label="صفحه قبل"
|
||||||
|
className="px-3.5 py-2 text-xs font-bold rounded-xl border border-medical-gray-200 text-medical-gray-700 hover:border-canina-blue hover:text-canina-blue disabled:opacity-40 disabled:cursor-not-allowed transition-all"
|
||||||
|
>
|
||||||
|
قبلی
|
||||||
|
</button>
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
{Array.from({ length: totalPages }).map((_, i) => {
|
||||||
|
const pageNum = i + 1;
|
||||||
|
const isActive = pageNum === safeCurrentPage;
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
key={pageNum}
|
||||||
|
type="button"
|
||||||
|
onClick={() => {
|
||||||
|
setCurrentPage(pageNum);
|
||||||
|
window.scrollTo({ top: 0, behavior: "smooth" });
|
||||||
|
}}
|
||||||
|
aria-current={isActive ? "page" : undefined}
|
||||||
|
className={isActive ? "w-8 h-8 rounded-xl text-xs font-black transition-all flex items-center justify-center cursor-pointer bg-canina-blue text-white shadow-sm" : "w-8 h-8 rounded-xl text-xs font-black transition-all flex items-center justify-center cursor-pointer text-medical-gray-700 hover:bg-medical-gray-100 border border-medical-gray-200/60"}
|
||||||
|
>
|
||||||
|
{toPersian(pageNum)}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
disabled={safeCurrentPage >= totalPages}
|
||||||
|
onClick={() => {
|
||||||
|
setCurrentPage(prev => Math.min(totalPages, prev + 1));
|
||||||
|
window.scrollTo({ top: 0, behavior: "smooth" });
|
||||||
|
}}
|
||||||
|
aria-label="صفحه بعد"
|
||||||
|
className="px-3.5 py-2 text-xs font-bold rounded-xl border border-medical-gray-200 text-medical-gray-700 hover:border-canina-blue hover:text-canina-blue disabled:opacity-40 disabled:cursor-not-allowed transition-all"
|
||||||
|
>
|
||||||
|
بعدی
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
})()}
|
||||||
|
|
||||||
{/* SEO Category Rich Description Section (Rendered below products to maintain primary UX while boosting category SEO) */}
|
{/* SEO Category Rich Description Section (Rendered below products to maintain primary UX while boosting category SEO) */}
|
||||||
{selectedCategory !== "all" && (
|
{selectedCategory !== "all" && (
|
||||||
<div className="mt-12 bg-white border border-medical-gray-200 rounded-[2.5rem] p-8 md:p-10 shadow-sm space-y-4 font-vazir">
|
<div className="mt-12 bg-white border border-medical-gray-200 rounded-[2.5rem] p-8 md:p-10 shadow-sm space-y-4 font-vazir">
|
||||||
|
|||||||
@@ -0,0 +1,120 @@
|
|||||||
|
"use client";
|
||||||
|
import React, { useMemo } from "react";
|
||||||
|
import ArticleProductCard from "./ArticleProductCard";
|
||||||
|
|
||||||
|
interface ArticleContentRendererProps {
|
||||||
|
contentHtml: string;
|
||||||
|
relatedProducts?: any[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function parseContentWithProducts(
|
||||||
|
html: string,
|
||||||
|
relatedProducts: any[] = []
|
||||||
|
): Array<{ type: "html" | "product"; content?: string; product?: any }> {
|
||||||
|
if (!html) return [];
|
||||||
|
|
||||||
|
// Match tags like [product slug_or_id], [محصول slug_or_id]
|
||||||
|
// or HTML elements like <div data-product="slug_or_id"></div>
|
||||||
|
// or <span data-product="slug_or_id"></span>
|
||||||
|
const markerRegex = /(?:<p[^>]*>\s*)?(?:\[(?:product|محصول)\s+([a-zA-Z0-9_-]+)\]|<(?:div|span)[^>]*data-product=["']([a-zA-Z0-9_-]+)["'][^>]*>(?:<\/(?:div|span)>)?)(?:\s*<\/p>)?/gi;
|
||||||
|
|
||||||
|
const parts: Array<{ type: "html" | "product"; content?: string; product?: any }> = [];
|
||||||
|
let lastIndex = 0;
|
||||||
|
let match: RegExpExecArray | null;
|
||||||
|
|
||||||
|
// Build product lookup map (by slug, id)
|
||||||
|
const productMap = new Map<string, any>();
|
||||||
|
for (const prod of relatedProducts) {
|
||||||
|
if (prod.slug) productMap.set(String(prod.slug).toLowerCase(), prod);
|
||||||
|
if (prod.id) productMap.set(String(prod.id).toLowerCase(), prod);
|
||||||
|
}
|
||||||
|
|
||||||
|
while ((match = markerRegex.exec(html)) !== null) {
|
||||||
|
const matchedText = match[0];
|
||||||
|
const identifier = (match[1] || match[2] || "").trim();
|
||||||
|
const startIndex = match.index;
|
||||||
|
|
||||||
|
// Push preceding HTML
|
||||||
|
if (startIndex > lastIndex) {
|
||||||
|
const htmlSlice = html.slice(lastIndex, startIndex);
|
||||||
|
if (htmlSlice.trim()) {
|
||||||
|
parts.push({ type: "html", content: htmlSlice });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const matchedProduct = productMap.get(identifier.toLowerCase());
|
||||||
|
if (matchedProduct) {
|
||||||
|
parts.push({ type: "product", product: matchedProduct });
|
||||||
|
} else {
|
||||||
|
// If product not found in map, attempt fallback with slug info
|
||||||
|
parts.push({
|
||||||
|
type: "product",
|
||||||
|
product: {
|
||||||
|
id: identifier,
|
||||||
|
slug: identifier,
|
||||||
|
nameFa: `محصول ${identifier}`,
|
||||||
|
category: "مکمل دارویی کنینا",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
lastIndex = startIndex + matchedText.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Push remaining HTML
|
||||||
|
if (lastIndex < html.length) {
|
||||||
|
const trailingHtml = html.slice(lastIndex);
|
||||||
|
if (trailingHtml.trim()) {
|
||||||
|
parts.push({ type: "html", content: trailingHtml });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (parts.length === 0 && html) {
|
||||||
|
parts.push({ type: "html", content: html });
|
||||||
|
}
|
||||||
|
|
||||||
|
return parts;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function ArticleContentRenderer({
|
||||||
|
contentHtml,
|
||||||
|
relatedProducts = [],
|
||||||
|
}: ArticleContentRendererProps) {
|
||||||
|
const sections = useMemo(
|
||||||
|
() => parseContentWithProducts(contentHtml, relatedProducts),
|
||||||
|
[contentHtml, relatedProducts]
|
||||||
|
);
|
||||||
|
|
||||||
|
// If there are no product cards inserted, preserve the exact original markup structure
|
||||||
|
const hasProducts = sections.some((s) => s.type === "product");
|
||||||
|
if (!hasProducts) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className="prose prose-base sm:prose-lg max-w-none text-medical-gray-700 leading-loose space-y-5 article-html-content"
|
||||||
|
dangerouslySetInnerHTML={{ __html: contentHtml }}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="article-html-content space-y-6">
|
||||||
|
{sections.map((section, idx) => {
|
||||||
|
if (section.type === "product" && section.product) {
|
||||||
|
return (
|
||||||
|
<ArticleProductCard
|
||||||
|
key={`article-prod-${section.product.id || idx}`}
|
||||||
|
product={section.product}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={`article-html-${idx}`}
|
||||||
|
className="prose prose-base sm:prose-lg max-w-none text-medical-gray-700 leading-loose space-y-5"
|
||||||
|
dangerouslySetInnerHTML={{ __html: section.content || "" }}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,202 @@
|
|||||||
|
"use client";
|
||||||
|
import React, { useState } from "react";
|
||||||
|
import Link from "next/link";
|
||||||
|
import { ShoppingCart, Check, ExternalLink, ShieldCheck } from "lucide-react";
|
||||||
|
import SafeImage from "./SafeImage";
|
||||||
|
import { useCartStore } from "../lib/store/cartStore";
|
||||||
|
|
||||||
|
export interface ArticleProductCardProps {
|
||||||
|
product: {
|
||||||
|
id: string;
|
||||||
|
slug?: string;
|
||||||
|
nameFa: string;
|
||||||
|
nameEn?: string;
|
||||||
|
description?: string;
|
||||||
|
category?: { name: string; slug?: string } | string;
|
||||||
|
categorySlug?: string;
|
||||||
|
imageUrl?: string;
|
||||||
|
images?: string[];
|
||||||
|
priceValue?: number;
|
||||||
|
priceDisplay?: string;
|
||||||
|
prices?: { price: number; volume?: string }[];
|
||||||
|
stock?: number;
|
||||||
|
stockStatus?: string;
|
||||||
|
isOriginal?: boolean;
|
||||||
|
madeInGermany?: boolean;
|
||||||
|
rating?: number;
|
||||||
|
};
|
||||||
|
compact?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function ArticleProductCard({ product, compact = false }: ArticleProductCardProps) {
|
||||||
|
const [isAdded, setIsAdded] = useState(false);
|
||||||
|
const addItem = useCartStore((state) => state.addItem);
|
||||||
|
|
||||||
|
if (!product || !product.nameFa) return null;
|
||||||
|
|
||||||
|
const productUrl = `/shop/${encodeURIComponent(product.slug || product.id)}`;
|
||||||
|
const imageSrc =
|
||||||
|
product.imageUrl ||
|
||||||
|
(Array.isArray(product.images) && product.images[0]) ||
|
||||||
|
"/assets/images/canina-product-placeholder.png";
|
||||||
|
|
||||||
|
const categoryName =
|
||||||
|
typeof product.category === "string"
|
||||||
|
? product.category
|
||||||
|
: product.category?.name || product.categorySlug || "مکمل تخصصی کنینا";
|
||||||
|
|
||||||
|
// Price calculation
|
||||||
|
const rawPrice =
|
||||||
|
product.priceValue ||
|
||||||
|
(Array.isArray(product.prices) && product.prices[0]?.price) ||
|
||||||
|
0;
|
||||||
|
|
||||||
|
const formattedPrice =
|
||||||
|
product.priceDisplay ||
|
||||||
|
(rawPrice > 0 ? `${Number(rawPrice).toLocaleString("fa-IR")} تومان` : "تماس بگیرید");
|
||||||
|
|
||||||
|
const isOutOfStock =
|
||||||
|
product.stockStatus === "OUT_OF_STOCK" ||
|
||||||
|
product.stockStatus === "DISCONTINUED" ||
|
||||||
|
(typeof product.stock === "number" && product.stock <= 0);
|
||||||
|
|
||||||
|
const handleAddToCart = (e: React.MouseEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
if (isOutOfStock) return;
|
||||||
|
|
||||||
|
// Adapt to CartStore Product shape
|
||||||
|
const storeProduct: any = {
|
||||||
|
id: product.id,
|
||||||
|
slug: product.slug || product.id,
|
||||||
|
nameFa: product.nameFa,
|
||||||
|
nameEn: product.nameEn || "",
|
||||||
|
category: typeof product.category === "string" ? { name: product.category, slug: "" } : product.category,
|
||||||
|
priceValue: rawPrice,
|
||||||
|
images: [imageSrc],
|
||||||
|
stock: product.stock ?? 99,
|
||||||
|
stockStatus: product.stockStatus || "IN_STOCK",
|
||||||
|
};
|
||||||
|
|
||||||
|
addItem(storeProduct, 1);
|
||||||
|
setIsAdded(true);
|
||||||
|
setTimeout(() => {
|
||||||
|
setIsAdded(false);
|
||||||
|
}, 2500);
|
||||||
|
};
|
||||||
|
|
||||||
|
const buttonAriaLabel = isOutOfStock
|
||||||
|
? "ناموجود"
|
||||||
|
: isAdded
|
||||||
|
? "به سبد اضافه شد"
|
||||||
|
: "افزودن به سبد خرید";
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
data-testid="article-product-card"
|
||||||
|
className="my-6 sm:my-8 rounded-3xl bg-gradient-to-br from-white via-medical-gray-50/60 to-canina-blue/5 border-2 border-canina-blue/20 hover:border-canina-blue/40 shadow-lg hover:shadow-xl transition-all duration-300 overflow-hidden font-vazir text-right group not-prose"
|
||||||
|
dir="rtl"
|
||||||
|
>
|
||||||
|
<div className="p-4 sm:p-6 flex flex-col sm:flex-row items-center gap-4 sm:gap-6">
|
||||||
|
{/* Product Image Thumbnail */}
|
||||||
|
<Link
|
||||||
|
href={productUrl}
|
||||||
|
className="relative w-28 h-28 sm:w-32 sm:h-32 shrink-0 bg-white rounded-2xl p-2 border border-medical-gray-200/80 shadow-inner flex items-center justify-center overflow-hidden group-hover:scale-105 transition-transform duration-300"
|
||||||
|
aria-label={product.nameFa}
|
||||||
|
>
|
||||||
|
<SafeImage
|
||||||
|
src={imageSrc}
|
||||||
|
alt={product.nameFa}
|
||||||
|
className="w-full h-full"
|
||||||
|
imgClassName="w-full h-full object-contain"
|
||||||
|
/>
|
||||||
|
{/* Made In Germany Floating Pill on Image */}
|
||||||
|
<div className="absolute top-1.5 right-1.5 bg-black/80 backdrop-blur-xs text-white text-[9px] font-black px-1.5 py-0.5 rounded-md flex items-center gap-0.5 shadow-xs border border-white/20">
|
||||||
|
<span className="w-1.5 h-1.5 rounded-full bg-red-500 animate-pulse" />
|
||||||
|
<span>اصل آلمان</span>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
|
||||||
|
{/* Product Details */}
|
||||||
|
<div className="flex-1 min-w-0 w-full flex flex-col justify-between h-full space-y-2">
|
||||||
|
<div>
|
||||||
|
<div className="flex items-center justify-between gap-2 mb-1">
|
||||||
|
<span className="text-[11px] font-bold text-canina-blue bg-canina-blue/10 px-2.5 py-0.5 rounded-full">
|
||||||
|
{categoryName}
|
||||||
|
</span>
|
||||||
|
<div className="flex items-center gap-1 text-[11px] font-bold text-emerald-700 bg-emerald-50 px-2 py-0.5 rounded-md border border-emerald-200/60">
|
||||||
|
<ShieldCheck className="w-3.5 h-3.5 text-emerald-600" />
|
||||||
|
<span>ضمانت ۱۰۰٪ اصالت آلمان</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Link href={productUrl} className="block group-hover:text-canina-blue transition-colors">
|
||||||
|
<h4 className="text-base sm:text-lg font-black text-medical-gray-900 leading-snug truncate">
|
||||||
|
{product.nameFa}
|
||||||
|
</h4>
|
||||||
|
{product.nameEn && (
|
||||||
|
<span className="text-xs font-mono font-medium text-medical-gray-400 block truncate mt-0.5 dir-ltr text-right">
|
||||||
|
{product.nameEn}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</Link>
|
||||||
|
|
||||||
|
{product.description && (
|
||||||
|
<p className="text-xs text-medical-gray-600 line-clamp-2 mt-1 leading-relaxed">
|
||||||
|
{product.description}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Price & Action Button Row */}
|
||||||
|
<div className="flex flex-wrap items-center justify-between gap-3 pt-3 border-t border-medical-gray-200/60">
|
||||||
|
<div>
|
||||||
|
<span className="text-[10px] text-medical-gray-400 block font-bold">قیمت مصرفکننده:</span>
|
||||||
|
<span className="text-sm sm:text-base font-black text-canina-blue font-mono">
|
||||||
|
{formattedPrice}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Link
|
||||||
|
href={productUrl}
|
||||||
|
className="px-3.5 py-2 bg-white hover:bg-medical-gray-100 text-medical-gray-700 text-xs font-bold rounded-xl border border-medical-gray-200 transition-colors flex items-center gap-1.5 shadow-2xs"
|
||||||
|
>
|
||||||
|
<span>مشاهده مشخصات</span>
|
||||||
|
<ExternalLink className="w-3.5 h-3.5" />
|
||||||
|
</Link>
|
||||||
|
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={handleAddToCart}
|
||||||
|
disabled={isOutOfStock}
|
||||||
|
aria-label={buttonAriaLabel}
|
||||||
|
className={`px-4 py-2 text-xs font-black rounded-xl transition-all duration-300 flex items-center gap-1.5 shadow-md cursor-pointer ${
|
||||||
|
isOutOfStock
|
||||||
|
? "bg-medical-gray-200 text-medical-gray-400 cursor-not-allowed"
|
||||||
|
: isAdded
|
||||||
|
? "bg-emerald-600 text-white hover:bg-emerald-700"
|
||||||
|
: "bg-canina-blue hover:bg-canina-blue/90 text-white active:scale-95"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
{isAdded ? (
|
||||||
|
<>
|
||||||
|
<Check className="w-4 h-4 animate-in zoom-in-50" />
|
||||||
|
<span>به سبد اضافه شد</span>
|
||||||
|
</>
|
||||||
|
) : isOutOfStock ? (
|
||||||
|
<span>ناموجود</span>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<ShoppingCart className="w-4 h-4" />
|
||||||
|
<span>خرید مستقیم</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -434,6 +434,9 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
|
|||||||
|
|
||||||
{/* Modal Container */}
|
{/* Modal Container */}
|
||||||
<motion.div
|
<motion.div
|
||||||
|
role="dialog"
|
||||||
|
aria-modal="true"
|
||||||
|
aria-labelledby="auth-modal-title"
|
||||||
initial={{ opacity: 0, scale: 0.96, y: 20 }}
|
initial={{ opacity: 0, scale: 0.96, y: 20 }}
|
||||||
animate={{ opacity: 1, scale: 1, y: 0 }}
|
animate={{ opacity: 1, scale: 1, y: 0 }}
|
||||||
exit={{ opacity: 0, scale: 0.96, y: 20 }}
|
exit={{ opacity: 0, scale: 0.96, y: 20 }}
|
||||||
@@ -447,11 +450,13 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
|
|||||||
<ShieldCheck className="w-4 h-4" />
|
<ShieldCheck className="w-4 h-4" />
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<h3 className="text-sm font-black tracking-tight text-medical-gray-900 font-vazir">احراز هویت کنینا</h3>
|
<h3 id="auth-modal-title" className="text-sm font-black tracking-tight text-medical-gray-900 font-vazir">احراز هویت کنینا</h3>
|
||||||
<p className="text-[10px] text-medical-gray-400 font-bold font-vazir">ورود امن به حساب کاربری</p>
|
<p className="text-[10px] text-medical-gray-400 font-bold font-vazir">ورود امن به حساب کاربری</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
|
type="button"
|
||||||
|
aria-label="بستن پنجره احراز هویت"
|
||||||
onClick={onClose}
|
onClick={onClose}
|
||||||
className="w-8 h-8 rounded-full bg-white border border-medical-gray-200 flex items-center justify-center text-medical-gray-400 hover:text-medical-gray-700 hover:bg-medical-gray-100 transition-all cursor-pointer"
|
className="w-8 h-8 rounded-full bg-white border border-medical-gray-200 flex items-center justify-center text-medical-gray-400 hover:text-medical-gray-700 hover:bg-medical-gray-100 transition-all cursor-pointer"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -49,13 +49,17 @@ export default function B2BLandingClient() {
|
|||||||
|
|
||||||
setSubmitting(true);
|
setSubmitting(true);
|
||||||
try {
|
try {
|
||||||
await api.post('/wholesale/apply', {
|
await api.post('/b2b/inquire', {
|
||||||
businessName: `${formData.businessName} (${formData.businessType} - ${formData.city}) - رابط: ${formData.contactName}`,
|
companyName: formData.businessName,
|
||||||
licenseNumber: formData.phone,
|
contactName: formData.contactName || formData.businessName,
|
||||||
notes: formData.notes,
|
email: `partner-${Date.now()}@canina.ir`,
|
||||||
|
phone: formData.phone,
|
||||||
|
businessType: `${formData.businessType} (شهر: ${formData.city || 'نامشخص'})`,
|
||||||
|
estimatedVolume: 'ثبت لندینگ B2B سایت',
|
||||||
|
message: formData.notes || `درخواست شراکت و تامین رسمی برای ${formData.businessName} در شهر ${formData.city}`,
|
||||||
});
|
});
|
||||||
setSubmitted(true);
|
setSubmitted(true);
|
||||||
toast.success('درخواست همکاری شما با موفقیت ثبت شد. همکاران ما حداکثر تا ۲۴ ساعت آینده با شما تماس خواهند گرفت.');
|
toast.success('درخواست همکاری تجاری شما با موفقیت ثبت شد. تیم بازرگانی و پزشکی حداکثر تا ۲۴ ساعت کاری با شما تماس خواهند گرفت.');
|
||||||
} catch {
|
} catch {
|
||||||
toast.error('خطایی در ثبت درخواست رخ داد. لطفاً با پشتیبانی تماس بگیرید.');
|
toast.error('خطایی در ثبت درخواست رخ داد. لطفاً با پشتیبانی تماس بگیرید.');
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -89,23 +89,24 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
|
|||||||
initial={{ opacity: 0 }}
|
initial={{ opacity: 0 }}
|
||||||
animate={{ opacity: 1 }}
|
animate={{ opacity: 1 }}
|
||||||
exit={{ opacity: 0 }}
|
exit={{ opacity: 0 }}
|
||||||
className="fixed inset-0 z-[100] bg-medical-gray-900/60 backdrop-blur-md flex items-center justify-center p-4 md:p-10 font-vazir"
|
className="fixed inset-0 z-[100] bg-medical-gray-900/70 backdrop-blur-md flex items-center justify-center p-2 sm:p-4 md:p-8 font-vazir"
|
||||||
dir="rtl"
|
dir="rtl"
|
||||||
>
|
>
|
||||||
<motion.div
|
<motion.div
|
||||||
initial={{ scale: 0.9, opacity: 0, y: 20 }}
|
initial={{ scale: 0.9, opacity: 0, y: 20 }}
|
||||||
animate={{ scale: 1, opacity: 1, y: 0 }}
|
animate={{ scale: 1, opacity: 1, y: 0 }}
|
||||||
className="bg-white w-full max-w-6xl h-[90vh] rounded-[3rem] shadow-2xl overflow-hidden flex flex-col md:flex-row relative"
|
className="bg-white w-full max-w-6xl h-[95vh] sm:h-[90vh] rounded-3xl sm:rounded-[3rem] shadow-2xl overflow-hidden flex flex-col md:flex-row relative"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
onClick={onClose}
|
onClick={onClose}
|
||||||
className="absolute top-6 left-6 z-20 w-10 h-10 bg-medical-gray-100 rounded-full flex items-center justify-center text-medical-gray-500 hover:bg-red-50 hover:text-red-500 transition-all"
|
className="absolute top-4 left-4 sm:top-6 sm:left-6 z-30 min-w-[44px] min-h-[44px] w-11 h-11 bg-white/90 sm:bg-medical-gray-100 rounded-full flex items-center justify-center text-medical-gray-600 hover:bg-red-50 hover:text-red-500 transition-all shadow-md cursor-pointer"
|
||||||
|
aria-label="بستن پنجره"
|
||||||
>
|
>
|
||||||
<X className="w-5 h-5" />
|
<X className="w-5 h-5" />
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{/* Sidebar Info */}
|
{/* Sidebar Info */}
|
||||||
<div className="w-full md:w-80 bg-canina-blue p-10 text-white flex flex-col overflow-y-auto">
|
<div className="w-full md:w-80 bg-canina-blue p-5 sm:p-8 md:p-10 text-white flex flex-col overflow-y-auto shrink-0 max-h-[45vh] md:max-h-full">
|
||||||
<div className="mb-8">
|
<div className="mb-8">
|
||||||
<div className="w-16 h-16 bg-white/20 rounded-2xl flex items-center justify-center mb-6">
|
<div className="w-16 h-16 bg-white/20 rounded-2xl flex items-center justify-center mb-6">
|
||||||
<Building2 className="w-8 h-8" />
|
<Building2 className="w-8 h-8" />
|
||||||
@@ -162,32 +163,107 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
|
|||||||
{/* Main Grid Area */}
|
{/* Main Grid Area */}
|
||||||
<div className="flex-1 flex flex-col bg-medical-gray-50 overflow-hidden">
|
<div className="flex-1 flex flex-col bg-medical-gray-50 overflow-hidden">
|
||||||
{/* Header & Search */}
|
{/* Header & Search */}
|
||||||
<div className="p-8 border-b border-medical-gray-200 flex flex-col md:flex-row md:items-center justify-between gap-6 bg-white">
|
<div className="p-4 sm:p-6 md:p-8 border-b border-medical-gray-200 flex flex-col sm:flex-row sm:items-center justify-between gap-3 sm:gap-6 bg-white shrink-0">
|
||||||
<div className="relative flex-1 max-w-md">
|
<div className="relative flex-1 max-w-md">
|
||||||
<Search className="absolute right-4 top-1/2 -translate-y-1/2 w-4 h-4 text-medical-gray-400" />
|
<Search className="absolute right-3 sm:right-4 top-1/2 -translate-y-1/2 w-4 h-4 text-medical-gray-400" />
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
placeholder="جستجوی کد کالا یا نام محصول..."
|
placeholder="جستجوی کد کالا یا نام محصول..."
|
||||||
value={searchQuery}
|
value={searchQuery}
|
||||||
onChange={e => setSearchQuery(e.target.value)}
|
onChange={e => setSearchQuery(e.target.value)}
|
||||||
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl py-3 pr-11 pl-4 text-sm focus:outline-none focus:ring-2 focus:ring-canina-blue/20"
|
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-xl sm:rounded-2xl py-2.5 sm:py-3 pr-9 sm:pr-11 pl-4 text-xs sm:text-sm focus:outline-none focus:ring-2 focus:ring-canina-blue/20"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
onClick={handleAddAll}
|
onClick={handleAddAll}
|
||||||
disabled={totalItems === 0}
|
disabled={totalItems === 0}
|
||||||
className="bg-medical-gray-900 text-white px-8 py-3 rounded-2xl font-black text-sm flex items-center gap-2 hover:bg-canina-blue transition-colors disabled:opacity-30"
|
className="bg-medical-gray-900 text-white px-5 sm:px-8 py-2.5 sm:py-3 rounded-xl sm:rounded-2xl font-black text-xs sm:text-sm flex items-center justify-center gap-2 hover:bg-canina-blue transition-colors disabled:opacity-30 cursor-pointer shadow-md"
|
||||||
>
|
>
|
||||||
<ShoppingCart className="w-4 h-4" />
|
<ShoppingCart className="w-4 h-4" />
|
||||||
افزودن کلی ({totalItems} عدد)
|
<span>افزودن کلی ({toPersian(totalItems)} عدد)</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Table */}
|
{/* Products Container */}
|
||||||
<div className="flex-1 overflow-y-auto p-8">
|
<div className="flex-1 overflow-y-auto p-3 sm:p-6 md:p-8">
|
||||||
{loadError && <p role="alert">خطا در دریافت محصولات. لطفاً دوباره تلاش کنید.</p>}
|
{loadError && <p role="alert" className="text-red-500 font-bold text-xs p-4 bg-red-50 rounded-2xl mb-4">خطا در دریافت محصولات. لطفاً دوباره تلاش کنید.</p>}
|
||||||
<div className="bg-white border border-medical-gray-200 rounded-3xl overflow-hidden shadow-sm">
|
|
||||||
|
{/* Mobile View: Clean Card Layout for each product */}
|
||||||
|
<div className="md:hidden space-y-3">
|
||||||
|
{filteredProducts.map(product => {
|
||||||
|
const basePrice = product.priceValue || 0;
|
||||||
|
const wholesaleDiscountPercent = Number(useSettingsStore.getState().getText('B2B_DISCOUNT_PERCENT', '30')) || 30;
|
||||||
|
const prodWholesale = (product as unknown as { wholesalePrice?: number }).wholesalePrice;
|
||||||
|
const wholesalePrice = prodWholesale
|
||||||
|
? Number(prodWholesale)
|
||||||
|
: Math.round(basePrice * (1 - wholesaleDiscountPercent / 100));
|
||||||
|
const currentQty = quantities[product.id] || 0;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div key={product.id} className="bg-white border border-medical-gray-200 rounded-2xl p-3.5 shadow-xs space-y-3">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<div className="w-14 h-14 bg-medical-gray-50 rounded-xl p-1.5 shrink-0 border border-medical-gray-100 flex items-center justify-center">
|
||||||
|
<SafeImage src={product.image} className="w-full h-full" imgClassName="object-contain" alt={product.name} />
|
||||||
|
</div>
|
||||||
|
<div className="flex-1 min-w-0">
|
||||||
|
<h4 className="font-black text-xs text-medical-gray-900 leading-snug line-clamp-2">{product.name}</h4>
|
||||||
|
<span className="text-[10px] font-mono text-medical-gray-400 block mt-0.5 dir-ltr text-right">کد: {product.artNo}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center justify-between border-t border-medical-gray-100 pt-2.5 text-xs">
|
||||||
|
<div>
|
||||||
|
<span className="text-[10px] text-medical-gray-400 block font-medium">تکفروشی</span>
|
||||||
|
<span className="font-bold text-medical-gray-600 text-xs">{toPersian(basePrice.toLocaleString())} ت</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<span className="text-[10px] text-amber-600 block font-black">قیمت همکار B2B</span>
|
||||||
|
{isWholesaleVerified ? (
|
||||||
|
<span className="font-black text-amber-800 text-xs bg-amber-50 px-2 py-0.5 rounded-md border border-amber-200 inline-block">
|
||||||
|
{toPersian(wholesalePrice.toLocaleString())} ت
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="inline-flex items-center gap-1 text-[10px] font-bold text-gray-400 bg-gray-50 px-1.5 py-0.5 rounded">
|
||||||
|
<Lock className="w-2.5 h-2.5" />
|
||||||
|
تایید ادمین
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-1 bg-medical-gray-50 border border-medical-gray-200 rounded-xl p-1">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => handleQuantityChange(product.id, String(Math.max(0, currentQty - 1)))}
|
||||||
|
className="w-7 h-7 flex items-center justify-center bg-white rounded-lg text-gray-700 font-bold text-sm shadow-xs active:bg-gray-100"
|
||||||
|
>
|
||||||
|
-
|
||||||
|
</button>
|
||||||
|
<input
|
||||||
|
type="number"
|
||||||
|
min="0"
|
||||||
|
value={currentQty || ""}
|
||||||
|
onChange={(e) => handleQuantityChange(product.id, e.target.value)}
|
||||||
|
placeholder="0"
|
||||||
|
className="w-8 text-center bg-transparent font-mono font-black text-xs outline-none"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => handleQuantityChange(product.id, String(currentQty + 1))}
|
||||||
|
className="w-7 h-7 flex items-center justify-center bg-white rounded-lg text-gray-700 font-bold text-sm shadow-xs active:bg-gray-100"
|
||||||
|
>
|
||||||
|
+
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Desktop / Tablet View: Rich Table */}
|
||||||
|
<div className="hidden md:block bg-white border border-medical-gray-200 rounded-3xl overflow-hidden shadow-sm">
|
||||||
<table className="w-full text-right">
|
<table className="w-full text-right">
|
||||||
<thead className="bg-medical-gray-50 border-b border-medical-gray-200">
|
<thead className="bg-medical-gray-50 border-b border-medical-gray-200">
|
||||||
<tr>
|
<tr>
|
||||||
@@ -201,7 +277,6 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
|
|||||||
<tbody className="divide-y divide-medical-gray-100">
|
<tbody className="divide-y divide-medical-gray-100">
|
||||||
{filteredProducts.map(product => {
|
{filteredProducts.map(product => {
|
||||||
const basePrice = product.priceValue || 0;
|
const basePrice = product.priceValue || 0;
|
||||||
// Priority 1: Specific product wholesalePrice, Priority 2: General settings percentage discount (default 30%)
|
|
||||||
const wholesaleDiscountPercent = Number(useSettingsStore.getState().getText('B2B_DISCOUNT_PERCENT', '30')) || 30;
|
const wholesaleDiscountPercent = Number(useSettingsStore.getState().getText('B2B_DISCOUNT_PERCENT', '30')) || 30;
|
||||||
const prodWholesale = (product as unknown as { wholesalePrice?: number }).wholesalePrice;
|
const prodWholesale = (product as unknown as { wholesalePrice?: number }).wholesalePrice;
|
||||||
const wholesalePrice = prodWholesale
|
const wholesalePrice = prodWholesale
|
||||||
|
|||||||
Loaded 100 of 168 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user