Compare commits

..
Author SHA1 Message Date
devops 55d11fa597 fix(stage): route blog revalidation to Next and omit unrelated article media
Deploy Canina / deploy (push) Successful in 3m16s
2026-11-15 05:54:49 +00:00
devops 85ef01d337 fix(corporate): restore persisted orchestration APIs with code-only Stage CI
Deploy Canina / deploy (push) Successful in 4m39s
2026-11-14 07:32:10 +00:00
devops 4d41a5bbf7 fix(notifications): accept Prisma Decimal in order email payloads
Deploy Canina / deploy (push) Successful in 5m30s
Widen totalAmount typing so wallet/order/payment Prisma models type-check under tsc -b.
2026-11-10 13:35:54 +00:00
devops 625c3f5ce2 feat(notifications): send branded transactional emails for shop events
Deploy Canina / deploy (push) Failing after 1m57s
Add Canina-branded welcome, contact confirmation/admin notify, and order created/paid/shipped emails via support@canina.ir without blocking the SMS flows.
2026-11-10 13:27:37 +00:00
devops 6fbbd7140d feat(faq): add seed script for 5 real customer FAQs
Deploy Canina / deploy (push) Successful in 2m21s
2026-11-07 16:03:14 +00:00
devops 468856538c fix(faq): move clean-faqs script to prisma dir for execution
Deploy Canina / deploy (push) Successful in 2m17s
2026-11-07 15:58:01 +00:00
devops 27b61ce6d5 feat: 2-piece unified floating pill, smart-chat settings redesign, FAQ cleanup script
Deploy Canina / deploy (push) Successful in 5m7s
2026-11-07 15:52:17 +00:00
devops 054b9470ab fix(advisors): bind official patterns 580259/580260 in advisors service
Deploy Canina / deploy (push) Successful in 3m40s
2026-11-07 11:11:14 +00:00
devops 55d1bb5967 fix(advisors): use approved pattern 508083 as active fallback while new lead patterns 580259/580260 await review
Deploy Canina / deploy (push) Failing after 2m12s
2026-11-07 10:05:28 +00:00
devops 6c1a11a8e2 feat: register official MeliPayamak patterns 580259/580260 for lead advisor flow and enforce TLS port 465 for Stalwart SMTP
Deploy Canina / deploy (push) Successful in 3m11s
2026-11-07 10:00:45 +00:00
devops 1c4f7e9d10 fix: add missing schema tables migration, expand email config DTO, and connect live MeliPayamak SendSMS endpoint
Deploy Canina / deploy (push) Successful in 2m25s
2026-11-07 09:24:52 +00:00
devops d9cf64d0be fix(admin-panel): fix undefined SupportChatAnalyticsPage import in admin routes
Deploy Canina / deploy (push) Failing after 33s
2026-11-07 08:56:59 +00:00
devops 3a0e0f2acc fix(dto): add class-validator decorators for lead, advisor, and notification endpoints
Deploy Canina / deploy (push) Successful in 2m45s
2026-11-07 07:52:39 +00:00
devops fae4b570f9 feat(notifications & advisors): implement unified notification queue, SMTP config, and catalog advisor contact flow
Deploy Canina / deploy (push) Successful in 8m17s
2026-11-07 07:41:24 +00:00
devops d881dc491e feat: add advisor/contact flow tables and make Blog.authorId required
Deploy Canina / deploy (push) Successful in 25m44s
2026-11-05 08:33:30 +00:00
244 changed files with 9575 additions and 11017 deletions

No files matched your search

+6 -1
View File
@@ -14,6 +14,8 @@ jobs:
env:
BRANCH: ${{ github.ref_name }}
SUPPORT_CHAT_KEY: ${{ secrets.SUPPORT_CHAT_KEY }}
DEPLOY_SHA: ${{ github.sha }}
GITHUB_ACTIONS: 'true'
run: |
# 1. رفع مشکل DNS و غیرفعال کردن پروکسی برای دامنه محلی
echo "87.248.133.138 git.parsaaghayi.ir" >> /etc/hosts
@@ -25,7 +27,10 @@ jobs:
# 2. دانلود و اجرای اسکریپت deploy.sh بر اساس برنچ جاری
mkdir -p scripts
wget --no-proxy -qO scripts/deploy.sh https://git.parsaaghayi.ir/parsa/canina/raw/branch/${BRANCH}/scripts/deploy.sh
wget --no-proxy -qO scripts/deploy.sh https://git.parsaaghayi.ir/parsa/canina/raw/commit/${DEPLOY_SHA}/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
cd scripts
-2
View File
@@ -2,7 +2,6 @@ FROM node:20-alpine AS builder
USER root
RUN http_proxy=http://172.17.0.1:8888 https_proxy=http://172.17.0.1:8888 apk add --no-cache openssl || apk add --no-cache openssl || true
WORKDIR /app
ENV PRISMA_HIDE_UPDATE_MESSAGE=true
ENV PRISMA_SKIP_POSTINSTALL_GENERATE=true
ENV PRISMA_ENGINES_MIRROR=https://registry.npmmirror.com/-/binary/prisma
ENV DISABLE_OPENCOLLECTIVE=1
@@ -34,7 +33,6 @@ USER root
RUN http_proxy=http://172.17.0.1:8888 https_proxy=http://172.17.0.1:8888 apk add --no-cache openssl || apk add --no-cache openssl || true
RUN mkdir -p /app/uploads && chown node:node /app/uploads
WORKDIR /app
ENV PRISMA_HIDE_UPDATE_MESSAGE=true
COPY --chown=node:node --from=builder /app/package*.json ./
COPY --chown=node:node --from=builder /app/tsconfig.json ./tsconfig.json
COPY --chown=node:node --from=builder /app/eslint.config.mjs ./eslint.config.mjs
+35
View File
@@ -0,0 +1,35 @@
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();
});
@@ -1,3 +0,0 @@
ALTER TABLE blogs ADD COLUMN IF NOT EXISTS author_team VARCHAR(200);
ALTER TABLE blogs ADD COLUMN IF NOT EXISTS author_role VARCHAR(200);
ALTER TABLE blogs ADD COLUMN IF NOT EXISTS content_updated_at TIMESTAMPTZ;
@@ -0,0 +1,117 @@
-- 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;
@@ -0,0 +1,72 @@
-- 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");
+321 -5
View File
@@ -178,9 +178,7 @@ model Blog {
slug String @unique @db.VarChar(200)
content String @db.Text
excerpt String? @db.Text
authorId String? @map("author_id") @db.Uuid
authorTeam String? @map("author_team") @db.VarChar(200)
authorRole String? @map("author_role") @db.VarChar(200)
authorId String @map("author_id") @db.Uuid
categoryId String? @map("category_id") @db.Uuid
imageUrl String? @map("image_url") @db.Text
imageAlt String? @map("image_alt") @db.VarChar(255)
@@ -200,7 +198,6 @@ model Blog {
isPublished Boolean @default(true) @map("is_published")
publishedAt DateTime? @map("published_at") @db.Timestamptz()
scheduledAt DateTime? @map("scheduled_at") @db.Timestamptz()
contentUpdatedAt DateTime? @map("content_updated_at") @db.Timestamptz()
readingTime Int @default(3) @map("reading_time")
featured Boolean @default(false)
allowComments Boolean @default(true) @map("allow_comments")
@@ -212,7 +209,7 @@ model Blog {
createdAt DateTime @default(now()) @map("created_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)
tags BlogTag[]
comments BlogComment[]
@@ -289,6 +286,8 @@ model Product {
reviews ProductReview[]
competitorPriceLogs CompetitorPriceLog[]
priceSuggestions PriceSuggestion[]
productAdvisors ProductAdvisor[]
leads Lead[]
@@index([categorySlug])
@@index([suitableFor])
@@ -1091,3 +1090,320 @@ model DepartmentTask {
@@index([createdAt])
@@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")
}
+56
View File
@@ -0,0 +1,56 @@
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();
});
+65
View File
@@ -0,0 +1,65 @@
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();
});
+3 -33
View File
@@ -57,7 +57,7 @@ export class AdminController {
@ApiQuery({ name: "search", required: false, description: "جستجو" })
async getUsers(@Query() query: AdminQueryDto) {
const result = await this.adminService.getUsers(query);
return result;
return { success: true, ...result };
}
@Post("users")
@@ -145,7 +145,7 @@ export class AdminController {
@ApiQuery({ name: "search", required: false, description: "جستجو" })
async getProducts(@Query() query: AdminQueryDto) {
const result = await this.adminService.getProducts(query);
return result;
return { success: true, ...result };
}
@Post("products")
@@ -206,7 +206,7 @@ export class AdminController {
@ApiQuery({ name: "status", required: false, description: "فیلتر وضعیت" })
async getOrders(@Query() query: AdminQueryDto) {
const result = await this.adminService.getOrders(query);
return result;
return { success: true, ...result };
}
@Get("orders/:id")
@@ -354,34 +354,4 @@ export class AdminController {
await this.settingsService.updateBulkUiTexts(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;
}
}
+4
View File
@@ -1,4 +1,6 @@
import { Module } from "@nestjs/common";
import { CorporateController } from "./hermes/corporate.controller";
import { CorporateService } from "./hermes/corporate.service";
import { AdminController } from "./admin.controller";
import { AdminService } from "./admin.service";
import { ReportsController } from "./reports.controller";
@@ -33,6 +35,7 @@ import { SupportChatAnalyticsService } from "./support-chat-analytics.service";
@Module({
imports: [PrismaModule, RedisModule, SettingsModule],
controllers: [
CorporateController,
AdminController,
ReportsController,
MediaController,
@@ -52,6 +55,7 @@ import { SupportChatAnalyticsService } from "./support-chat-analytics.service";
SupportChatAnalyticsController,
],
providers: [
CorporateService,
AdminService,
ReportsService,
MediaService,
-160
View File
@@ -1869,164 +1869,4 @@ 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,271 +0,0 @@
import { Test, TestingModule } from "@nestjs/testing";
import { BadRequestException, NotFoundException } from "@nestjs/common";
import { ApprovalsController } from "./approvals.controller";
import { PrismaService } from "../prisma/prisma.service";
describe("ApprovalsController", () => {
let controller: ApprovalsController;
let prisma: {
approvalRequest: {
findUnique: jest.Mock;
findMany: jest.Mock;
count: jest.Mock;
create: jest.Mock;
update: jest.Mock;
delete: jest.Mock;
};
departmentTask: {
findFirst: jest.Mock;
findMany: jest.Mock;
create: jest.Mock;
update: jest.Mock;
deleteMany: jest.Mock;
updateMany: jest.Mock;
};
};
beforeEach(async () => {
prisma = {
approvalRequest: {
findUnique: jest.fn(),
findMany: jest.fn(),
count: jest.fn(),
create: jest.fn(),
update: jest.fn(),
delete: jest.fn(),
},
departmentTask: {
findFirst: jest.fn(),
findMany: jest.fn(),
create: jest.fn(),
update: jest.fn(),
deleteMany: jest.fn(),
updateMany: jest.fn(),
},
};
const module: TestingModule = await Test.createTestingModule({
controllers: [ApprovalsController],
providers: [
{
provide: PrismaService,
useValue: prisma,
},
],
}).compile();
controller = module.get<ApprovalsController>(ApprovalsController);
});
describe("decide - B2B_SUPPLIER_STRATEGY approval separation", () => {
it("B2B_SUPPLIER_STRATEGY approval must not create digital task nor set executedAt as physical action", async () => {
const approvalId = "b2b-strategy-uuid-1";
const approvalItem = {
id: approvalId,
department: "B2B",
category: "B2B_SUPPLIER_STRATEGY",
title: "[طرح استراتژیک تامین‌کننده] توسعه شبکه کلینیکی آلمان",
payload: { target: "German Suppliers", tier: "Direct" },
status: "PENDING",
};
prisma.approvalRequest.findUnique.mockResolvedValue(approvalItem);
prisma.approvalRequest.update.mockResolvedValue({
...approvalItem,
status: "APPROVED",
ceoNotes: "موافقت با مذاکره اولیه",
});
prisma.departmentTask.findFirst.mockResolvedValue(null);
const result = await controller.decide(approvalId, {
decision: "APPROVED",
ceoNotes: "موافقت با مذاکره اولیه",
});
expect(result.success).toBe(true);
expect(prisma.approvalRequest.update).toHaveBeenCalledWith({
where: { id: approvalId },
data: expect.objectContaining({
status: "APPROVED",
ceoNotes: "موافقت با مذاکره اولیه",
}),
});
// Verify executedAt is NOT set as physical action
const updateCall = prisma.approvalRequest.update.mock.calls[0][0];
expect(updateCall.data.executedAt).toBeUndefined();
// Verify NO digital task is created in departmentTask queue
expect(prisma.departmentTask.create).not.toHaveBeenCalled();
expect(prisma.departmentTask.update).not.toHaveBeenCalled();
});
it("B2B_SUPPLIER_STRATEGY approval must not requeue existing digital task", async () => {
const approvalId = "b2b-strategy-uuid-2";
const approvalItem = {
id: approvalId,
department: "B2B",
category: "B2B_SUPPLIER_STRATEGY",
title: "[طرح استراتژیک تامین‌کننده] پکیج نمونه دارویی",
payload: {},
status: "PENDING",
};
prisma.approvalRequest.findUnique.mockResolvedValue(approvalItem);
prisma.approvalRequest.update.mockResolvedValue({
...approvalItem,
status: "APPROVED",
});
prisma.departmentTask.findFirst.mockResolvedValue({
id: "task-existing-1",
status: "BACKLOG",
title: "Legacy task",
});
const result = await controller.decide(approvalId, {
decision: "APPROVED",
});
expect(result.success).toBe(true);
// Ensure existing task was NOT updated or requeued to TODO
expect(prisma.departmentTask.update).not.toHaveBeenCalled();
expect(prisma.departmentTask.create).not.toHaveBeenCalled();
});
});
describe("decide - SEO approval actionable digital task", () => {
it("SEO approval creates actionable digital task in TODO", async () => {
const approvalId = "seo-approval-uuid-1";
const approvalItem = {
id: approvalId,
department: "SEO",
category: "SEO",
title: "بهینه‌سازی متاتگ‌های صفحات دسته‌بندی گربه",
payload: { targetUrl: "/category/cat-food" },
status: "PENDING",
};
prisma.approvalRequest.findUnique.mockResolvedValue(approvalItem);
prisma.approvalRequest.update.mockResolvedValue({
...approvalItem,
status: "APPROVED",
ceoNotes: "در اولویت سئو قرار گیرد",
});
prisma.departmentTask.findFirst.mockResolvedValue(null);
prisma.departmentTask.create.mockResolvedValue({
id: "new-task-uuid",
code: "TSK-892110",
department: "SEO",
title: approvalItem.title,
status: "TODO",
priority: "HIGH",
assignee: "AI_AGENT",
approvalId: approvalId,
});
const result = await controller.decide(approvalId, {
decision: "APPROVED",
ceoNotes: "در اولویت سئو قرار گیرد",
});
expect(result.success).toBe(true);
expect(prisma.approvalRequest.update).toHaveBeenCalledWith({
where: { id: approvalId },
data: expect.objectContaining({
status: "APPROVED",
ceoNotes: "در اولویت سئو قرار گیرد",
}),
});
// Digital task MUST be created with status TODO
expect(prisma.departmentTask.create).toHaveBeenCalledWith({
data: expect.objectContaining({
department: "SEO",
title: approvalItem.title,
status: "TODO",
priority: "HIGH",
assignee: "AI_AGENT",
approvalId: approvalId,
}),
});
});
it("SEO approval requeues existing task to TODO when existing task found", async () => {
const approvalId = "seo-approval-uuid-2";
const approvalItem = {
id: approvalId,
department: "SEO",
category: "SEO",
title: "بررسی کنیبان سئو مقاله تغذیه سگ",
payload: {},
status: "PENDING",
};
const existingTask = {
id: "existing-task-99",
code: "TSK-112233",
status: "IN_REVIEW",
description: "Initial draft",
approvalId: approvalId,
};
prisma.approvalRequest.findUnique.mockResolvedValue(approvalItem);
prisma.approvalRequest.update.mockResolvedValue({
...approvalItem,
status: "APPROVED",
ceoNotes: "تایید نهایی جهت اقدام",
});
prisma.departmentTask.findFirst.mockResolvedValue(existingTask);
prisma.departmentTask.update.mockResolvedValue({
...existingTask,
status: "TODO",
});
const result = await controller.decide(approvalId, {
decision: "APPROVED",
ceoNotes: "تایید نهایی جهت اقدام",
});
expect(result.success).toBe(true);
expect(prisma.departmentTask.update).toHaveBeenCalledWith({
where: { id: existingTask.id },
data: expect.objectContaining({
status: "TODO",
}),
});
});
});
describe("decide - rejection handling", () => {
it("handles REJECTED decision cleanly without deleting approval audit history", async () => {
const approvalId = "approval-reject-uuid";
const approvalItem = {
id: approvalId,
department: "SEO",
category: "SEO",
title: "تغییر ساختار URL",
status: "PENDING",
};
prisma.approvalRequest.findUnique.mockResolvedValue(approvalItem);
prisma.approvalRequest.update.mockResolvedValue({
...approvalItem,
status: "REJECTED",
ceoNotes: "ریسک بالای افت رتبه سئو",
});
const result = await controller.decide(approvalId, {
decision: "REJECTED",
ceoNotes: "ریسک بالای افت رتبه سئو",
});
expect(result.success).toBe(true);
expect(prisma.approvalRequest.update).toHaveBeenCalledWith({
where: { id: approvalId },
data: expect.objectContaining({
status: "REJECTED",
ceoNotes: "ریسک بالای افت رتبه سئو",
}),
});
});
});
});
+11 -56
View File
@@ -106,6 +106,7 @@ export class ApprovalsController {
throw new NotFoundException(`Approval request ${id} not found`);
}
// شبیه‌سازی بسته به دسته‌بندی
let testResult: any = { status: "SIMULATION_SUCCESS" };
if (item.category === "PRICING") {
const payload = item.payload as any;
@@ -151,70 +152,26 @@ export class ApprovalsController {
}
if (dto.decision === "REJECTED") {
const updated = await (this.prisma as any).approvalRequest.update({
// 5. رد توسط مدیرعامل: تسک و درخواست کلاً از سیستم پاکسازی کامل می‌شوند
await (this.prisma as any).departmentTask.deleteMany({
where: { approvalId: id },
});
await (this.prisma as any).approvalRequest.delete({
where: { id },
data: {
status: "REJECTED",
ceoNotes: dto.ceoNotes || null,
},
});
if ((this.prisma as any).departmentTask?.updateMany) {
await (this.prisma as any).departmentTask.updateMany({
where: { approvalId: id },
data: { status: "REJECTED" },
});
}
return {
success: true,
message: "درخواست رد شد و در سوابق ممیزی ثبت گردید.",
data: updated,
message: "درخواست با موفقیت رد و از سیستم پاکسازی شد.",
};
}
// تفکیک اقدامات استراتژیک تامین‌کننده/مدیریتی از کارهای دیجیتال سایت
const isStrategicSupplierAction =
item.category === "B2B_SUPPLIER_STRATEGY" ||
item.category === "PARTNERSHIP" ||
(item.department === "B2B" && String(item.category || "").includes("STRATEGY"));
if (isStrategicSupplierAction) {
// طرح‌های B2B_SUPPLIER_STRATEGY منحصراً در سوابق مدیریتی تایید می‌شوند.
// هیچ تسک دیجیتالی ایجاد یا بازگشایی نمی‌شود و executedAt فیزیکی ثبت نمی‌گردد.
const updateData: any = {
status: "APPROVED",
ceoNotes: dto.ceoNotes || null,
};
if (dto.outcome || dto.evidence) {
const payload = typeof item.payload === "object" && item.payload !== null
? { ...(item.payload as Record<string, any>) }
: {};
if (dto.outcome) payload.outcome = dto.outcome;
if (dto.evidence) payload.evidence = dto.evidence;
updateData.payload = payload;
}
const updated = await (this.prisma as any).approvalRequest.update({
where: { id },
data: updateData,
});
return {
success: true,
message: "طرح استراتژیک تامین‌کننده تایید گردید و در سوابق مدیریتی ثبت شد.",
data: updated,
};
}
// کارهای دیجیتال (مانند SEO، محتوا، قیمت‌گذاری و فنی)
// تایید مجوز اجرای کار دیجیتال است و تسک متناظر را در صف TODO قرار می‌دهد
// 1. تایید مدیرعامل: وضعیت درخواست APPROVED و وضعیت تسک در صف اقدام به TODO تغییر می‌یابد
const updated = await (this.prisma as any).approvalRequest.update({
where: { id },
data: {
status: "APPROVED",
ceoNotes: dto.ceoNotes || null,
executedAt: new Date(),
},
});
@@ -228,16 +185,14 @@ export class ApprovalsController {
where: { id: existingTask.id },
data: {
status: "TODO",
description: dto.ceoNotes
? (existingTask.description || "") + "\n\n[یادداشت مدیرعامل]: " + dto.ceoNotes
: existingTask.description,
description: dto.ceoNotes ? (existingTask.description || "") + "\n\n[یادداشت مدیرعامل]: " + dto.ceoNotes : existingTask.description,
},
});
} else {
await (this.prisma as any).departmentTask.create({
data: {
code: "TSK-" + Date.now().toString().slice(-6),
department: item.department || "SEO",
department: item.department,
title: item.title,
description: dto.ceoNotes ? (item.title + "\n\n[یادداشت مدیرعامل]: " + dto.ceoNotes) : item.title,
status: "TODO",
@@ -229,15 +229,6 @@ describe("BlogsController (Admin)", () => {
expect(result).toEqual({ success: true, data: createdBlog });
});
it("propagates create validation failures", async () => {
const req = { user: { id: "admin-user-id" } };
const body = { title: "Bad date", contentUpdatedAt: "invalid", createdAt: "2000-01-01" };
mockBlogsService.createBlog.mockRejectedValueOnce(new Error("Invalid contentUpdatedAt"));
await expect(controller.createBlog(body, req)).rejects.toThrow("Invalid contentUpdatedAt");
expect(service.createBlog).toHaveBeenCalledWith(body, req.user.id);
});
it("updateBlog should update blog details and return success: true", async () => {
const blogId = "blog-10";
const body = {
@@ -253,14 +244,6 @@ describe("BlogsController (Admin)", () => {
expect(result).toEqual({ success: true, data: updatedBlog });
});
it("propagates invalid content timestamp rejection without accepting createdAt", async () => {
const body = { contentUpdatedAt: "invalid", createdAt: "2000-01-01" };
mockBlogsService.updateBlog.mockRejectedValueOnce(new Error("Invalid contentUpdatedAt"));
await expect(controller.updateBlog("blog-10", body)).rejects.toThrow("Invalid contentUpdatedAt");
expect(service.updateBlog).toHaveBeenCalledWith("blog-10", body);
});
it("deleteBlog should delete blog and return success: true", async () => {
const blogId = "blog-10";
mockBlogsService.deleteBlog.mockResolvedValue(undefined);
+1 -119
View File
@@ -203,50 +203,6 @@ describe("Admin BlogsService", () => {
expect(result).toEqual(createdBlog);
});
it("allowlists create fields and blocks server-owned and unknown fields", async () => {
mockPrisma.blog.create.mockResolvedValue({ id: "created", slug: "safe-post" });
await service.createBlog(
{
title: "Safe post",
slug: "safe-post",
content: "Safe content",
id: "client-id",
createdAt: "2000-01-01T00:00:00.000Z",
updatedAt: "2000-01-01T00:00:00.000Z",
viewCount: 999999,
serverOwned: "must-not-pass",
},
"user-admin-1",
);
const payload = mockPrisma.blog.create.mock.calls[0][0].data;
expect(payload).toEqual(expect.objectContaining({
title: "Safe post",
slug: "safe-post",
content: "Safe content",
}));
expect(payload).not.toHaveProperty("id");
expect(payload).not.toHaveProperty("createdAt");
expect(payload).not.toHaveProperty("updatedAt");
expect(payload).not.toHaveProperty("viewCount");
expect(payload).not.toHaveProperty("serverOwned");
});
it.each([
["contentUpdatedAt", { contentUpdatedAt: "not-a-date" }, "Invalid contentUpdatedAt"],
["publishedAt", { publishedAt: "not-a-date" }, "Invalid publishedAt"],
["scheduledAt", { scheduledAt: "not-a-date" }, "Invalid scheduledAt"],
])("rejects invalid explicit %s", async (_field, timestamps, message) => {
await expect(
service.createBlog(
{ title: "Bad date", slug: "bad-date", content: "Content", ...timestamps },
"user-admin-1",
),
).rejects.toThrow(message);
expect(mockPrisma.blog.create).not.toHaveBeenCalled();
});
it("should create a SCHEDULED blog if scheduledAt is in the future", async () => {
const futureDate = new Date(Date.now() + 86400000).toISOString();
const blogData = {
@@ -318,81 +274,6 @@ describe("Admin BlogsService", () => {
});
});
describe("material freshness and scheduled publishing", () => {
it("sets contentUpdatedAt intentionally and never rewrites createdAt", async () => {
mockPrisma.blog.findUnique.mockResolvedValue({ id: "b1", slug: "post", createdAt: new Date("2025-01-01") });
mockPrisma.blog.update.mockResolvedValue({ id: "b1", slug: "post" });
await service.updateBlog("b1", { title: "Material edit", markContentUpdated: true });
const payload = mockPrisma.blog.update.mock.calls[0][0].data;
expect(payload.contentUpdatedAt).toEqual(expect.any(Date));
expect(payload).not.toHaveProperty("markContentUpdated");
expect(payload).not.toHaveProperty("createdAt");
});
it("automatically marks freshness when material article content changes", async () => {
mockPrisma.blog.findUnique.mockResolvedValue({ id: "b1", slug: "post", content: "Old content" });
mockPrisma.blog.update.mockResolvedValue({ id: "b1", slug: "post" });
await service.updateBlog("b1", { content: "Meaningfully revised content" });
expect(mockPrisma.blog.update.mock.calls[0][0].data.contentUpdatedAt).toEqual(expect.any(Date));
});
it("does not mark freshness for attribution-only changes", async () => {
mockPrisma.blog.findUnique.mockResolvedValue({ id: "b1", slug: "post", content: "Same content" });
mockPrisma.blog.update.mockResolvedValue({ id: "b1", slug: "post" });
await service.updateBlog("b1", { authorTeam: "Clinical team", authorRole: "Review" });
expect(mockPrisma.blog.update.mock.calls[0][0].data).not.toHaveProperty("contentUpdatedAt");
});
it("allows explicitly clearing contentUpdatedAt", async () => {
mockPrisma.blog.findUnique.mockResolvedValue({ id: "b1", slug: "post" });
mockPrisma.blog.update.mockResolvedValue({ id: "b1", slug: "post" });
await service.updateBlog("b1", { contentUpdatedAt: null });
expect(mockPrisma.blog.update.mock.calls[0][0].data.contentUpdatedAt).toBeNull();
});
it("publishes due posts without rewriting createdAt", async () => {
const scheduledAt = new Date("2025-02-01T10:00:00Z");
mockPrisma.blog.findMany.mockResolvedValue([{ id: "b1", slug: "post", title: "Post", scheduledAt }]);
mockPrisma.blog.update.mockResolvedValue({});
await service.publishDueScheduledBlogs();
expect(mockPrisma.blog.update).toHaveBeenCalledWith({ where: { id: "b1" }, data: { status: "PUBLISHED", isPublished: true, publishedAt: scheduledAt } });
});
});
describe("updateBlog security and freshness validation", () => {
beforeEach(() => {
mockPrisma.blog.findUnique.mockResolvedValue({ id: "blog-1", slug: "safe" });
mockPrisma.blog.update.mockResolvedValue({ id: "blog-1", slug: "safe" });
});
it("allowlists mutable fields and ignores createdAt and unrecognized fields", async () => {
await service.updateBlog("blog-1", {
title: "Allowed title",
createdAt: "2000-01-01T00:00:00.000Z",
serverOwned: "must-not-pass",
});
const payload = mockPrisma.blog.update.mock.calls[0][0].data;
expect(payload.title).toBe("Allowed title");
expect(payload).not.toHaveProperty("createdAt");
expect(payload).not.toHaveProperty("serverOwned");
});
it("rejects an invalid explicit contentUpdatedAt", async () => {
await expect(
service.updateBlog("blog-1", { contentUpdatedAt: "not-a-date" }),
).rejects.toThrow("Invalid contentUpdatedAt");
expect(mockPrisma.blog.update).not.toHaveBeenCalled();
});
it("preserves explicit null clearing and markContentUpdated precedence", async () => {
await service.updateBlog("blog-1", { contentUpdatedAt: null });
expect(mockPrisma.blog.update.mock.calls[0][0].data.contentUpdatedAt).toBeNull();
await service.updateBlog("blog-1", {
contentUpdatedAt: "not-a-date",
markContentUpdated: true,
});
expect(mockPrisma.blog.update.mock.calls[1][0].data.contentUpdatedAt).toEqual(expect.any(Date));
});
});
describe("deleteBlog", () => {
it("should throw NotFoundException if blog not found", async () => {
mockPrisma.blog.findUnique.mockResolvedValue(null);
@@ -587,6 +468,7 @@ describe("Admin BlogsService", () => {
status: "PUBLISHED",
isPublished: true,
publishedAt: scheduledDate,
createdAt: scheduledDate,
},
});
expect(mockRevalidationService.revalidateBlog).toHaveBeenCalledWith(
+17 -120
View File
@@ -1,5 +1,4 @@
import {
BadRequestException,
Injectable,
NotFoundException,
OnModuleInit,
@@ -142,31 +141,16 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
async createBlog(data: any, currentUserId: string) {
const {
tags,
tagNames,
categoryId,
authorId,
publishedAt,
scheduledAt,
readingTime,
markContentUpdated,
contentUpdatedAt,
...rest
} = data;
const parseOptionalDate = (value: unknown, field: string): Date | null => {
if (value === undefined || value === null || value === "") return null;
const parsed = new Date(value as string | number | Date);
if (!Number.isFinite(parsed.getTime())) {
throw new BadRequestException(`Invalid ${field}`);
}
return parsed;
};
const parsedPublishedAt = parseOptionalDate(publishedAt, "publishedAt");
const parsedScheduledAt = parseOptionalDate(scheduledAt, "scheduledAt");
const parsedContentUpdatedAt = markContentUpdated
? new Date()
: parseOptionalDate(contentUpdatedAt, "contentUpdatedAt");
// Connect or create tags
const tagConnectOrCreate = [];
if (Array.isArray(tagNames) && tagNames.length > 0) {
@@ -187,12 +171,13 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
const targetAuthorId = authorId || currentUserId;
const now = new Date();
const parsedScheduledAt = scheduledAt ? new Date(scheduledAt) : null;
const isFutureSchedule = parsedScheduledAt && parsedScheduledAt > now;
let finalStatus = data.status || "PUBLISHED";
let finalStatus = rest.status || "PUBLISHED";
let finalIsPublished =
data.isPublished !== undefined ? data.isPublished : true;
let finalPublishedAt = parsedPublishedAt;
rest.isPublished !== undefined ? rest.isPublished : true;
let finalPublishedAt = publishedAt ? new Date(publishedAt) : null;
if (isFutureSchedule) {
finalStatus = "SCHEDULED";
@@ -206,45 +191,19 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
finalPublishedAt = now;
}
const createPayload = {
title: data.title,
slug: data.slug,
content: data.content,
excerpt: data.excerpt,
authorTeam: data.authorTeam,
authorRole: data.authorRole,
imageUrl: data.imageUrl,
imageAlt: data.imageAlt,
imageCaption: data.imageCaption,
metaTitle: data.metaTitle,
metaDescription: data.metaDescription,
keywords: data.keywords,
focusKeywords: data.focusKeywords,
canonicalUrl: data.canonicalUrl,
noIndex: data.noIndex,
noFollow: data.noFollow,
schemaType: data.schemaType,
ogTitle: data.ogTitle,
ogDescription: data.ogDescription,
ogImage: data.ogImage,
const createPayload: Prisma.BlogCreateInput = {
...rest,
status: finalStatus,
isPublished: finalIsPublished,
featured: data.featured,
allowComments: data.allowComments,
showOnHome: data.showOnHome,
homeDisplayMode: data.homeDisplayMode,
relatedProductIds: data.relatedProductIds,
relatedBlogIds: data.relatedBlogIds,
readingTime: readingTime !== undefined ? Number(readingTime) : 3,
readingTime: readingTime ? Number(readingTime) : 3,
publishedAt: finalPublishedAt,
scheduledAt: parsedScheduledAt,
contentUpdatedAt: parsedContentUpdatedAt,
author: { connect: { id: targetAuthorId } },
...(categoryId ? { category: { connect: { id: categoryId } } } : {}),
...(tagConnectOrCreate.length > 0
? { tags: { connectOrCreate: tagConnectOrCreate } }
: {}),
} satisfies Prisma.BlogCreateInput;
};
const created = await this.prisma.blog.create({
data: createPayload,
@@ -264,83 +223,19 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
if (!blog) throw new NotFoundException("Blog not found");
const {
tags,
tagNames,
categoryId,
authorId,
publishedAt,
scheduledAt,
readingTime,
markContentUpdated,
contentUpdatedAt,
...rest
} = data;
const mutableScalarFields = [
"title",
"slug",
"content",
"excerpt",
"authorTeam",
"authorRole",
"imageUrl",
"imageAlt",
"imageCaption",
"metaTitle",
"metaDescription",
"keywords",
"focusKeywords",
"canonicalUrl",
"noIndex",
"noFollow",
"schemaType",
"ogTitle",
"ogDescription",
"ogImage",
"status",
"isPublished",
"featured",
"allowComments",
"showOnHome",
"homeDisplayMode",
"relatedProductIds",
"relatedBlogIds",
] as const;
const updatePayload: Prisma.BlogUpdateInput = {};
for (const field of mutableScalarFields) {
if (data[field] !== undefined) {
(updatePayload as Record<string, unknown>)[field] = data[field];
}
}
const now = new Date();
const materialContentFields = [
"title",
"content",
"excerpt",
"imageUrl",
"imageAlt",
"imageCaption",
] as const;
const hasMaterialContentChange = materialContentFields.some(
(field) => data[field] !== undefined && data[field] !== blog[field],
);
if (markContentUpdated || (contentUpdatedAt === undefined && hasMaterialContentChange)) {
(updatePayload as Record<string, unknown>).contentUpdatedAt = now;
} else if (contentUpdatedAt !== undefined) {
if (contentUpdatedAt === null || contentUpdatedAt === "") {
(updatePayload as Record<string, unknown>).contentUpdatedAt = null;
} else {
const parsedContentUpdatedAt = new Date(contentUpdatedAt);
if (!Number.isFinite(parsedContentUpdatedAt.getTime())) {
throw new BadRequestException("Invalid contentUpdatedAt");
}
(updatePayload as Record<string, unknown>).contentUpdatedAt = parsedContentUpdatedAt;
}
}
Object.assign(updatePayload, {
...(readingTime !== undefined
? { readingTime: Number(readingTime) }
: {}),
const updatePayload: Prisma.BlogUpdateInput = {
...rest,
...(readingTime !== undefined
? { readingTime: Number(readingTime) }
: {}),
@@ -350,7 +245,7 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
? { category: { connect: { id: categoryId } } }
: { category: { disconnect: true } }
: {}),
});
};
if (scheduledAt !== undefined) {
const parsedScheduledAt = scheduledAt ? new Date(scheduledAt) : null;
@@ -364,6 +259,7 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
updatePayload.status = "PUBLISHED";
updatePayload.isPublished = true;
updatePayload.publishedAt = parsedScheduledAt;
updatePayload.createdAt = parsedScheduledAt;
}
} else if (publishedAt !== undefined) {
updatePayload.publishedAt = publishedAt ? new Date(publishedAt) : null;
@@ -576,6 +472,7 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
status: "PUBLISHED",
isPublished: true,
publishedAt: publishDate,
createdAt: publishDate,
},
});
@@ -1,84 +0,0 @@
import { BadRequestException } from "@nestjs/common";
import { assertTaskCanComplete } from "./department-task-completion.policy";
describe("department task completion policy", () => {
it("rejects model-only output without a live deliverable", () => {
expect(() =>
assertTaskCanComplete({
deliverableUrl: null,
acceptanceCriteria: { criteria: ["live URL responds 200"] },
executionLogs: [{ status: "COMPLETED_BY_AGENT" }],
}),
).toThrow(BadRequestException);
});
it("rejects completion without acceptance criteria", () => {
expect(() =>
assertTaskCanComplete({
deliverableUrl: "https://canina.ir/blog/verified",
acceptanceCriteria: null,
executionLogs: [{ status: "QA_PASSED" }],
}),
).toThrow(BadRequestException);
});
it("rejects completion without QA evidence", () => {
expect(() =>
assertTaskCanComplete({
deliverableUrl: "https://canina.ir/blog/verified",
acceptanceCriteria: { criteria: ["HTTP 200"] },
executionLogs: [{ status: "COMPLETED_BY_AGENT" }],
}),
).toThrow(BadRequestException);
});
it("allows completion with URL, criteria and QA evidence", () => {
expect(() =>
assertTaskCanComplete({
deliverableUrl: "https://canina.ir/blog/verified",
acceptanceCriteria: { criteria: ["HTTP 200"] },
executionLogs: [{ status: "QA_PASSED" }],
}),
).not.toThrow();
});
it("rejects pseudo-protocol canina:// deliverable URLs", () => {
expect(() =>
assertTaskCanComplete({
deliverableUrl: "canina://blog/sample-article",
acceptanceCriteria: { criteria: ["HTTP 200"] },
executionLogs: [{ status: "QA_PASSED" }],
}),
).toThrow(BadRequestException);
});
it("rejects git://stage staging or repo URLs as verifiable deliverable", () => {
expect(() =>
assertTaskCanComplete({
deliverableUrl: "git://stage/canina-repo#commit123",
acceptanceCriteria: { criteria: ["HTTP 200"] },
executionLogs: [{ status: "QA_PASSED" }],
}),
).toThrow(BadRequestException);
});
it("rejects missing or placeholder post-tsk article deliverables", () => {
expect(() =>
assertTaskCanComplete({
deliverableUrl: "https://canina.ir/blog/post-tsk-49102",
acceptanceCriteria: { criteria: ["HTTP 200"] },
executionLogs: [{ status: "QA_PASSED" }],
}),
).toThrow(BadRequestException);
});
it("rejects completion when QA evidence reports missing article or 404 error", () => {
expect(() =>
assertTaskCanComplete({
deliverableUrl: "https://canina.ir/blog/verified-article",
acceptanceCriteria: { criteria: ["HTTP 200"] },
executionLogs: [{ status: "QA_PASSED", note: "HTTP 404 - مقاله یافت نشد" }],
}),
).toThrow(BadRequestException);
});
});
@@ -1,93 +0,0 @@
import { BadRequestException } from "@nestjs/common";
export interface CompletableTask {
code?: string | null;
title?: string | null;
deliverableUrl?: string | null;
acceptanceCriteria?: unknown;
executionLogs?: unknown;
}
function hasAcceptanceCriteria(criteria: unknown): boolean {
if (!criteria) return false;
if (typeof criteria === "string") return criteria.trim().length > 0;
if (Array.isArray(criteria)) return criteria.length > 0;
if (typeof criteria === "object") {
const value = criteria as Record<string, unknown>;
const items = value.criteria;
return Array.isArray(items) ? items.length > 0 : Object.keys(value).length > 0;
}
return false;
}
function hasValidQaEvidence(logs: unknown): boolean {
if (!Array.isArray(logs)) return false;
const validPassStatuses = ["QA_PASSED", "VERIFIED", "PRODUCTION_VERIFIED"];
let foundValidPass = false;
for (const log of logs) {
if (!log || typeof log !== "object") continue;
const entry = log as Record<string, unknown>;
const status = String(entry.status || "").toUpperCase();
const note = String(entry.note || "").toLowerCase();
// Rejection of invalid QA claims: 404, missing article, not found, post-tsk
if (
note.includes("404") ||
note.includes("مقاله یافت نشد") ||
note.includes("not found") ||
note.includes("missing article") ||
note.includes("post-tsk")
) {
return false;
}
if (validPassStatuses.includes(status)) {
foundValidPass = true;
}
}
return foundValidPass;
}
export function assertTaskCanComplete(task: CompletableTask): void {
const rawUrl = task.deliverableUrl?.trim();
if (!rawUrl) {
throw new BadRequestException("DONE requires a verifiable deliverable URL");
}
const lowerUrl = rawUrl.toLowerCase();
// Reject internal pseudo-protocols
if (lowerUrl.startsWith("canina://") || lowerUrl.includes("canina://")) {
throw new BadRequestException("Deliverable URL cannot use pseudo-protocol canina://; an independently verifiable HTTP(S) URL is required");
}
// Reject git repository pointers or staging branches as production deliverables
if (lowerUrl.startsWith("git://") || lowerUrl.includes("git://stage")) {
throw new BadRequestException("Deliverable URL cannot be a git staging reference; an independently verifiable HTTP(S) URL is required");
}
// Must be an HTTP or HTTPS URL
if (!lowerUrl.startsWith("http://") && !lowerUrl.startsWith("https://")) {
throw new BadRequestException("DONE requires an independently verifiable HTTP or HTTPS deliverable URL");
}
// Reject deleted or placeholder post-tsk articles
if (/post[-_]?tsk/i.test(rawUrl)) {
throw new BadRequestException("Deliverable URL references an unverified or deleted post-tsk placeholder article");
}
if (task.title && /post[-_]?tsk/i.test(task.title)) {
throw new BadRequestException("Task references an unverified or deleted post-tsk article");
}
if (task.code && /post[-_]?tsk/i.test(task.code)) {
throw new BadRequestException("Task references an unverified or deleted post-tsk code");
}
if (!hasAcceptanceCriteria(task.acceptanceCriteria)) {
throw new BadRequestException("DONE requires explicit acceptance criteria");
}
if (!hasValidQaEvidence(task.executionLogs)) {
throw new BadRequestException("DONE requires QA/production verification evidence");
}
}
@@ -1,163 +0,0 @@
import { Test, TestingModule } from "@nestjs/testing";
import { BadRequestException, NotFoundException } from "@nestjs/common";
import { DepartmentTasksController } from "./department-tasks.controller";
import { PrismaService } from "../prisma/prisma.service";
describe("DepartmentTasksController", () => {
let controller: DepartmentTasksController;
let prisma: {
departmentTask: {
findUnique: jest.Mock;
findMany: jest.Mock;
count: jest.Mock;
create: jest.Mock;
update: jest.Mock;
delete: jest.Mock;
};
auditLog: {
create: jest.Mock;
};
};
beforeEach(async () => {
prisma = {
departmentTask: {
findUnique: jest.fn(),
findMany: jest.fn(),
count: jest.fn(),
create: jest.fn(),
update: jest.fn(),
delete: jest.fn(),
},
auditLog: {
create: jest.fn().mockResolvedValue({ id: "audit-1" }),
},
};
const module: TestingModule = await Test.createTestingModule({
controllers: [DepartmentTasksController],
providers: [
{
provide: PrismaService,
useValue: prisma,
},
],
}).compile();
controller = module.get<DepartmentTasksController>(DepartmentTasksController);
});
describe("updateStatus - verifiable completion guards", () => {
it("rejects completion with pseudo-protocol canina://", async () => {
const taskId = "task-101";
prisma.departmentTask.findUnique.mockResolvedValue({
id: taskId,
code: "TSK-100101",
title: "Test Task",
status: "TEST",
acceptanceCriteria: { criteria: ["200 OK"] },
executionLogs: [{ status: "QA_PASSED" }],
deliverableUrl: null,
});
await expect(
controller.updateStatus(taskId, {
status: "DONE",
deliverableUrl: "canina://blog/fake-article",
}),
).rejects.toThrow(BadRequestException);
});
it("rejects completion with git://stage repository reference", async () => {
const taskId = "task-102";
prisma.departmentTask.findUnique.mockResolvedValue({
id: taskId,
code: "TSK-100102",
title: "Test Task",
status: "TEST",
acceptanceCriteria: { criteria: ["200 OK"] },
executionLogs: [{ status: "QA_PASSED" }],
deliverableUrl: null,
});
await expect(
controller.updateStatus(taskId, {
status: "DONE",
deliverableUrl: "git://stage/canina-repo#commit-xyz",
}),
).rejects.toThrow(BadRequestException);
});
it("rejects completion with post-tsk placeholder article", async () => {
const taskId = "task-103";
prisma.departmentTask.findUnique.mockResolvedValue({
id: taskId,
code: "TSK-100103",
title: "Test Task",
status: "TEST",
acceptanceCriteria: { criteria: ["200 OK"] },
executionLogs: [{ status: "QA_PASSED" }],
deliverableUrl: null,
});
await expect(
controller.updateStatus(taskId, {
status: "DONE",
deliverableUrl: "https://canina.ir/blog/post-tsk-998877",
}),
).rejects.toThrow(BadRequestException);
});
it("rejects completion when QA log reports missing article / 404", async () => {
const taskId = "task-104";
prisma.departmentTask.findUnique.mockResolvedValue({
id: taskId,
code: "TSK-100104",
title: "Test Task",
status: "TEST",
acceptanceCriteria: { criteria: ["200 OK"] },
executionLogs: [],
deliverableUrl: "https://canina.ir/blog/real-article",
});
await expect(
controller.updateStatus(taskId, {
status: "DONE",
logNote: "QA_PASSED but received 404 - مقاله یافت نشد",
}),
).rejects.toThrow(BadRequestException);
});
it("allows completion with valid HTTPS deliverable URL and verified QA evidence", async () => {
const taskId = "task-105";
const existingTask = {
id: taskId,
code: "TSK-100105",
title: "Optimized Cat Food Landing",
status: "TEST",
acceptanceCriteria: { criteria: ["HTTP 200", "Lighthouse > 90"] },
executionLogs: [{ status: "PRODUCTION_VERIFIED", note: "Live 200 verified on production" }],
deliverableUrl: "https://canina.ir/blog/cat-food-nutrition",
};
prisma.departmentTask.findUnique.mockResolvedValue(existingTask);
prisma.departmentTask.update.mockResolvedValue({
...existingTask,
status: "DONE",
completedAt: new Date(),
});
const res = await controller.updateStatus(taskId, {
status: "DONE",
});
expect(res.success).toBe(true);
expect(prisma.departmentTask.update).toHaveBeenCalledWith({
where: { id: taskId },
data: expect.objectContaining({
status: "DONE",
completedAt: expect.any(Date),
}),
});
});
});
});
@@ -10,7 +10,6 @@ import {
UseGuards,
NotFoundException,
} from "@nestjs/common";
import { assertTaskCanComplete } from "./department-task-completion.policy";
import { ApiTags, ApiBearerAuth, ApiOperation } from "@nestjs/swagger";
import { JwtAuthGuard } from "../auth/jwt-auth.guard";
import { RolesGuard } from "../common/guards/roles.guard";
@@ -130,6 +129,7 @@ export class DepartmentTasksController {
},
});
// ثبت در تاریخچه لاگ‌ها
await (this.prisma as any).auditLog.create({
data: {
entity: "task",
@@ -165,17 +165,6 @@ export class DepartmentTasksController {
});
}
const candidateDeliverableUrl = body.deliverableUrl || existing.deliverableUrl;
if (body.status === "DONE") {
assertTaskCanComplete({
code: existing.code,
title: existing.title,
deliverableUrl: candidateDeliverableUrl,
acceptanceCriteria: existing.acceptanceCriteria,
executionLogs: logs,
});
}
const updateData: any = {
status: body.status,
executionLogs: logs,
@@ -183,6 +172,7 @@ export class DepartmentTasksController {
if (body.deliverableUrl) updateData.deliverableUrl = body.deliverableUrl;
if (body.status === "IN_PROGRESS" && !existing.startedAt) updateData.startedAt = new Date();
if (body.status === "DONE") updateData.completedAt = new Date();
// اگر تست QA ناموفق بود و به TODO برگشت، لاگ اصلاح ضمیمه می‌شود
if (body.status === "TODO" && body.logNote) {
updateData.description = (existing.description || "") + "\n\n[اصلاحات و تضمین کیفیت QA]: " + body.logNote;
}
@@ -192,6 +182,7 @@ export class DepartmentTasksController {
data: updateData,
});
// ثبت در تاریخچه
await (this.prisma as any).auditLog.create({
data: {
entity: "task",
@@ -33,16 +33,6 @@ export class DecideApprovalDto {
@IsOptional()
@IsString()
ceoNotes?: string;
@ApiPropertyOptional({ description: "نتیجه اقدام مدیریتی یا استراتژیک" })
@IsOptional()
@IsString()
outcome?: string;
@ApiPropertyOptional({ description: "مستندات و مدرک اقدام مدیریتی" })
@IsOptional()
@IsString()
evidence?: string;
}
export class QueryApprovalDto {
@@ -0,0 +1,69 @@
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();
});
});
@@ -0,0 +1,317 @@
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),
};
}
@@ -0,0 +1,138 @@
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);
}
}
@@ -0,0 +1,840 @@
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);
});
});
@@ -0,0 +1,828 @@
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 },
});
});
}
}
+1 -1
View File
@@ -76,7 +76,7 @@ describe("MediaService", () => {
const validFile = {
originalname: "product-cover.webp",
buffer: Buffer.from([0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x45, 0x42, 0x50, 0x56, 0x50, 0x38]),
buffer: Buffer.from("dummy-image-bytes"),
mimetype: "image/webp",
size: 5000,
} as any;
-22
View File
@@ -79,28 +79,6 @@ export class MediaService {
"پسوند فایل ارسالی مجاز نیست (فرمت 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 filePath = path.join(uploadDir, filename);
+125
View File
@@ -0,0 +1,125 @@
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: 'مشاور اختصاصی محصول با موفقیت تعیین شد.' };
}
}
+14
View File
@@ -0,0 +1,14 @@
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 {}
@@ -0,0 +1,111 @@
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);
});
});
+379
View File
@@ -0,0 +1,379 @@
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,
};
}
}
@@ -0,0 +1,25 @@
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,
};
}
}
+4 -2
View File
@@ -1,4 +1,3 @@
import { TasksModule } from './common/services/tasks.module';
import { Module, NestModule, MiddlewareConsumer } from "@nestjs/common";
import { PrismaModule } from "./prisma/prisma.module";
import { SupportChatModule } from './support-chat/support-chat.module';
@@ -37,6 +36,8 @@ import { DoctorsModule } from "./doctors/doctors.module";
import { FaqModule } from "./faq/faq.module";
import { MenuModule } from "./menu/menu.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";
@@ -80,7 +81,8 @@ import { Request, Response, NextFunction } from "express";
B2BModule,
FaqModule,
MenuModule,
TasksModule,
NotificationsModule,
AdvisorsModule,
],
controllers: [MetricsController],
providers: [
+2
View File
@@ -9,6 +9,7 @@ import { AdminModule } from "../admin/admin.module";
import { getJwtSecret } from "./auth.constants";
import { RedisModule } from "../redis/redis.module";
import { NotificationsModule } from "../notifications/notifications.module";
@Module({
imports: [
@@ -16,6 +17,7 @@ import { RedisModule } from "../redis/redis.module";
forwardRef(() => AdminModule),
PassportModule,
RedisModule,
NotificationsModule,
JwtModule.registerAsync({
useFactory: () => ({
secret: getJwtSecret(),
+2
View File
@@ -4,6 +4,7 @@ import { PrismaService } from "../prisma/prisma.service";
import { JwtService } from "@nestjs/jwt";
import { RedisService } from "../redis/redis.service";
import { SmsService } from "../common/services/sms.service";
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
import { BadRequestException } from "@nestjs/common";
describe("AuthService", () => {
@@ -43,6 +44,7 @@ describe("AuthService", () => {
{ provide: JwtService, useValue: mockJwt },
{ provide: RedisService, useValue: mockRedis },
{ 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();
+9
View File
@@ -11,6 +11,7 @@ import { RedisService } from "../redis/redis.service";
import { SendOtpDto } from "./dto/send-otp.dto";
import { VerifyOtpDto } from "./dto/verify-otp.dto";
import { SmsService } from "../common/services/sms.service";
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
import * as bcrypt from "bcryptjs";
import * as crypto from "crypto";
import { normalizeMobile } from "../common/utils/phone.utils";
@@ -42,6 +43,7 @@ export class AuthService {
private jwtService: JwtService,
private redisService: RedisService,
private smsService: SmsService,
private transactionalEmails: TransactionalEmailsService,
) {}
private async generateTokens(payload: Record<string, any>) {
@@ -257,6 +259,13 @@ 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 tokens = await this.generateTokens(payload);
+1 -22
View File
@@ -40,7 +40,7 @@ describe("BlogsService", () => {
describe("findAll", () => {
it("should query published blogs with pagination", async () => {
const blogs = [
{ id: "1", title: "Blog 1", isPublished: true, status: "PUBLISHED", author: null },
{ id: "1", title: "Blog 1", isPublished: true, status: "PUBLISHED" },
];
mockPrisma.blog.findMany.mockResolvedValue(blogs);
mockPrisma.blog.count.mockResolvedValue(1);
@@ -49,9 +49,6 @@ describe("BlogsService", () => {
expect(mockPrisma.blog.findMany).toHaveBeenCalled();
expect(result.data).toEqual(blogs);
expect(result.meta.total).toBe(1);
const query = mockPrisma.blog.findMany.mock.calls[0][0];
expect(query.include.author).toEqual({ select: { id: true, firstName: true, lastName: true } });
expect(query.orderBy).toEqual([{ publishedAt: "desc" }, { id: "asc" }]);
});
it("should filter by categorySlug and search term", async () => {
@@ -70,19 +67,7 @@ describe("BlogsService", () => {
});
});
it("selects the minimal public author identity for list results", async () => {
mockPrisma.blog.findMany.mockResolvedValue([]); mockPrisma.blog.count.mockResolvedValue(0);
await service.findAll({});
expect(mockPrisma.blog.findMany.mock.calls[0][0].include.author).toEqual({ select: { id: true, firstName: true, lastName: true } });
});
describe("findHomepage", () => {
it("selects the minimal public author identity for homepage results", async () => {
mockPrisma.blog.findMany.mockResolvedValueOnce([]).mockResolvedValueOnce([]);
await service.findHomepage();
for (const call of mockPrisma.blog.findMany.mock.calls.slice(0, 2)) expect(call[0].include.author).toEqual({ select: { id: true, firstName: true, lastName: true } });
});
it("should return selected blogs if showOnHome posts exist", async () => {
const selected = [{ id: "b1", title: "Hero Blog", showOnHome: true }];
mockPrisma.blog.findMany.mockResolvedValueOnce(selected);
@@ -105,12 +90,6 @@ describe("BlogsService", () => {
});
describe("findOneBySlug", () => {
it("selects the minimal public author identity for detail results", async () => {
mockPrisma.blog.findFirst.mockResolvedValue(null);
await expect(service.findOneBySlug("missing")).rejects.toThrow(NotFoundException);
expect(mockPrisma.blog.findFirst.mock.calls[0][0].include.author).toEqual({ select: { id: true, firstName: true, lastName: true } });
});
it("should throw NotFoundException if slug is empty or blog not found", async () => {
mockPrisma.blog.findFirst.mockResolvedValue(null);
await expect(service.findOneBySlug("unknown-slug")).rejects.toThrow(
+11 -16
View File
@@ -64,15 +64,12 @@ export class BlogsService {
where: whereClause,
skip,
take: Number(limit),
orderBy: [
{
[sortBy === "createdAt" ? "createdAt" : "publishedAt"]: sortOrder,
},
{ id: "asc" },
],
orderBy: {
[sortBy === "createdAt" ? "createdAt" : "publishedAt"]: sortOrder,
},
include: {
author: {
select: { id: true, firstName: true, lastName: true },
select: { firstName: true, lastName: true },
},
category: {
select: { id: true, name: true, slug: true },
@@ -111,11 +108,9 @@ export class BlogsService {
const selectedBlogs = await this.prisma.blog.findMany({
where: { ...baseWhere, showOnHome: true },
take: 4,
orderBy: [{ publishedAt: "desc" }, { id: "asc" }],
orderBy: { publishedAt: "desc" },
include: {
author: {
select: { id: true, firstName: true, lastName: true },
},
author: { select: { firstName: true, lastName: true } },
category: { select: { id: true, name: true, slug: true } },
tags: { select: { id: true, name: true, slug: true } },
_count: { select: { comments: { where: { status: "APPROVED" } } } },
@@ -130,11 +125,9 @@ export class BlogsService {
const newestBlogs = await this.prisma.blog.findMany({
where: baseWhere,
take: 4,
orderBy: [{ publishedAt: "desc" }, { id: "asc" }],
orderBy: { publishedAt: "desc" },
include: {
author: {
select: { id: true, firstName: true, lastName: true },
},
author: { select: { firstName: true, lastName: true } },
category: { select: { id: true, name: true, slug: true } },
tags: { select: { id: true, name: true, slug: true } },
_count: { select: { comments: { where: { status: "APPROVED" } } } },
@@ -170,7 +163,9 @@ export class BlogsService {
],
},
include: {
author: { select: { id: true, firstName: true, lastName: true } },
author: {
select: { firstName: true, lastName: true },
},
category: {
select: { id: true, name: true, slug: true },
},
@@ -1,61 +0,0 @@
import { CallHandler, ExecutionContext } from "@nestjs/common";
import { of, lastValueFrom } from "rxjs";
import { AdminRevalidationInterceptor } from "./admin-revalidation.interceptor";
import { RevalidationService } from "./revalidation.service";
describe("AdminRevalidationInterceptor", () => {
const revalidation = { revalidate: jest.fn().mockResolvedValue(true) } as unknown as RevalidationService;
const interceptor = new AdminRevalidationInterceptor(revalidation);
const next = { handle: () => of({ ok: true }) } as CallHandler;
beforeEach(() => jest.clearAllMocks());
function context(method: string, url: string): ExecutionContext {
return { switchToHttp: () => ({ getRequest: () => ({ method, originalUrl: url }) }) } as unknown as ExecutionContext;
}
it("invalidates blog list and detail after an admin blog mutation", async () => {
await lastValueFrom(interceptor.intercept(context("PUT", "/api/admin/blogs/blog-1"), next));
expect(revalidation.revalidate).toHaveBeenCalledWith(
expect.arrayContaining(["blogs", "blog-categories", "blog-tags", "home-data"]),
expect.arrayContaining(["/", "/blog"]),
);
});
it.each([
["/api/admin/products/p1", "products"],
["/api/admin/categories/c1", "categories"],
["/api/admin/wiki/glucosamine", "wiki"],
["/api/admin/settings", "settings"],
["/api/admin/cms/hero-banners/b1", "banners"],
["/api/admin/cms/vet-testimonials/t1", "testimonials"],
["/api/admin/reviews/r1", "products"],
["/api/admin/media/m1", "products"],
])("maps %s mutations to %s cache invalidation", async (url, expectedTag) => {
await lastValueFrom(interceptor.intercept(context("DELETE", url), next));
expect(revalidation.revalidate).toHaveBeenCalledWith(expect.arrayContaining([expectedTag]), expect.any(Array));
});
it("does not invalidate cache for reads or internal-only admin CRUD", async () => {
await lastValueFrom(interceptor.intercept(context("GET", "/api/admin/blogs"), next));
await lastValueFrom(interceptor.intercept(context("PUT", "/api/admin/users/u1"), next));
expect(revalidation.revalidate).not.toHaveBeenCalled();
});
it.each([
["/api/banners/banner-1", "banners"],
["/api/menu/menu-1", "menu"],
["/api/videos/video-1", "videos"],
["/api/testimonials/testimonial-1", "testimonials"],
["/api/faq/faq-1", "faq"],
["/api/ingredients/ingredient-1", "ingredients"],
["/api/doctors/doctor-1", "doctors"],
["/api/settings/seo", "seo-config"],
["/api/settings/ui-texts/HERO_TITLE", "ui-texts"],
["/api/contact/info", "settings"],
["/api/smart-advisor/rules/rule-1", "smart-advisor"],
])("maps storefront mutation %s to %s cache invalidation", async (url, expectedTag) => {
await lastValueFrom(interceptor.intercept(context("PATCH", url), next));
expect(revalidation.revalidate).toHaveBeenCalledWith(expect.arrayContaining([expectedTag]), expect.any(Array));
});
});
@@ -1,48 +0,0 @@
import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from "@nestjs/common";
import { Observable, tap } from "rxjs";
import { RevalidationService } from "./revalidation.service";
type Target = { tags: string[]; paths: string[] };
const TARGETS: Array<{ pattern: RegExp; target: Target }> = [
{ pattern: /^\/api\/banners(?:\/|$)/, target: { tags: ["banners", "home-data"], paths: ["/"] } },
{ pattern: /^\/api\/menu(?:\/|$)/, target: { tags: ["menu", "settings"], paths: ["/"] } },
{ pattern: /^\/api\/videos(?:\/|$)/, target: { tags: ["videos", "home-data"], paths: ["/", "/videos"] } },
{ pattern: /^\/api\/testimonials(?:\/|$)/, target: { tags: ["testimonials", "home-data"], paths: ["/"] } },
{ pattern: /^\/api\/faq(?:\/|$)/, target: { tags: ["faq"], paths: ["/faq"] } },
{ pattern: /^\/api\/ingredients(?:\/|$)/, target: { tags: ["ingredients", "products", "wiki"], paths: ["/shop", "/wiki"] } },
{ pattern: /^\/api\/doctors(?:\/|$)/, target: { tags: ["doctors", "settings"], paths: ["/contact"] } },
{ pattern: /^\/api\/settings\/seo(?:\/|$)/, target: { tags: ["seo-config", "settings"], paths: ["/", "/sitemap.xml"] } },
{ pattern: /^\/api\/settings\/(?:ui-texts|system|financial)(?:\/|$)/, target: { tags: ["ui-texts", "settings", "home-data"], paths: ["/"] } },
{ pattern: /^\/api\/contact\/info(?:\/|$)/, target: { tags: ["settings"], paths: ["/contact", "/"] } },
{ pattern: /^\/api\/smart-advisor\/rules(?:\/|$)/, target: { tags: ["smart-advisor", "products"], paths: ["/smart-advisor"] } },
{ pattern: /^\/api\/admin\/blogs(?:\/|$)/, target: { tags: ["blogs", "blog-categories", "blog-tags", "home-data"], paths: ["/", "/blog", "/sitemap.xml"] } },
{ pattern: /^\/api\/admin\/categories(?:\/|$)/, target: { tags: ["products", "categories", "home-data"], paths: ["/", "/shop", "/sitemap.xml"] } },
{ pattern: /^\/api\/admin\/wiki(?:\/|$)/, target: { tags: ["wiki", "scientific-terms"], paths: ["/wiki", "/sitemap.xml"] } },
{ pattern: /^\/api\/admin\/(?:settings|pricing)(?:\/|$)/, target: { tags: ["settings", "ui-texts", "seo-config", "products", "home-data"], paths: ["/", "/shop"] } },
{ pattern: /^\/api\/admin\/cms\/hero-banners(?:\/|$)/, target: { tags: ["banners", "home-data"], paths: ["/"] } },
{ pattern: /^\/api\/admin\/cms\/vet-testimonials(?:\/|$)/, target: { tags: ["testimonials", "home-data"], paths: ["/"] } },
{ pattern: /^\/api\/admin\/reviews(?:\/|$)/, target: { tags: ["products", "home-data"], paths: ["/", "/shop"] } },
{ pattern: /^\/api\/admin\/media(?:\/|$)/, target: { tags: ["products", "blogs", "wiki", "home-data"], paths: ["/", "/shop", "/blog", "/wiki"] } },
{ pattern: /^\/api\/admin\/products(?:\/|$)/, target: { tags: ["products", "home-data"], paths: ["/", "/shop", "/sitemap.xml"] } },
];
@Injectable()
export class AdminRevalidationInterceptor implements NestInterceptor {
constructor(private readonly revalidation: RevalidationService) {}
intercept(context: ExecutionContext, next: CallHandler): Observable<unknown> {
const request = context.switchToHttp().getRequest<{ method?: string; originalUrl?: string; url?: string }>();
const method = (request.method || "GET").toUpperCase();
const url = (request.originalUrl || request.url || "").split("?")[0];
const target = method === "GET" || method === "HEAD" || method === "OPTIONS"
? undefined
: TARGETS.find((entry) => entry.pattern.test(url))?.target;
return next.handle().pipe(
tap(() => {
if (target) void this.revalidation.revalidate(target.tags, target.paths);
}),
);
}
}
@@ -1,11 +1,9 @@
import { Global, Module } from "@nestjs/common";
import { APP_INTERCEPTOR } from "@nestjs/core";
import { AdminRevalidationInterceptor } from "./admin-revalidation.interceptor";
import { RevalidationService } from "./revalidation.service";
@Global()
@Module({
providers: [RevalidationService, { provide: APP_INTERCEPTOR, useClass: AdminRevalidationInterceptor }],
providers: [RevalidationService],
exports: [RevalidationService],
})
export class RevalidationModule {}
@@ -110,22 +110,4 @@ describe("RevalidationService", () => {
expect(pathSpy).toHaveBeenCalledWith("/shop/ART-100");
});
});
describe("revalidate batch", () => {
it("should send deduplicated tags and paths in one request", async () => {
const mockFetch = jest.spyOn(global, "fetch" as any).mockResolvedValue({ ok: true, status: 200 } as any);
const result = await service.revalidate(["blogs", "blogs"], ["/blog", "/blog"]);
expect(result).toBe(true);
expect(mockFetch).toHaveBeenCalledTimes(1);
expect(mockFetch).toHaveBeenCalledWith(
"http://frontend_mock:8080/api/revalidate",
expect.objectContaining({
method: "POST",
body: JSON.stringify({ tags: ["blogs"], paths: ["/blog"] }),
}),
);
});
});
});
@@ -31,32 +31,6 @@ export class RevalidationService {
return secret;
}
async revalidate(tags: string[] = [], paths: string[] = []): Promise<boolean> {
const cleanTags = [...new Set(tags.filter(Boolean))];
const cleanPaths = [...new Set(paths.filter((path) => path.startsWith("/")))];
if (!cleanTags.length && !cleanPaths.length) return true;
try {
const url = `${this.frontendUrl}/api/revalidate`;
const res = await fetch(url, {
method: "POST",
headers: {
"Content-Type": "application/json",
"x-revalidate-secret": this.secret,
},
body: JSON.stringify({ tags: cleanTags, paths: cleanPaths }),
});
if (!res.ok) {
this.logger.warn(`Failed to revalidate cache batch: ${res.status} ${res.statusText}`);
return false;
}
return true;
} catch (err: any) {
this.logger.debug(`Batch revalidation skipped or frontend offline: ${err?.message}`);
return false;
}
}
async revalidateTag(tag: string): Promise<boolean> {
try {
const url = `${this.frontendUrl}/api/revalidate`;
+96 -7
View File
@@ -38,6 +38,8 @@ export interface SmsConfig {
shippingBodyId: number;
b2bBodyId: number;
petCareBodyId: number;
leadAdvisorBodyId?: number;
leadConfirmationBodyId?: number;
rules?: SmsRule[];
}
@@ -122,6 +124,16 @@ export class SmsService {
process.env.MELIPAYAMAK_PET_CARE_BODY_ID ||
"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)
? (dbConfig.rules as SmsRule[])
: DEFAULT_SMS_RULES,
@@ -140,6 +152,8 @@ export class SmsService {
),
b2bBodyId: Number(process.env.MELIPAYAMAK_B2B_BODY_ID || "508083"),
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,
};
}
@@ -1377,13 +1391,88 @@ export class SmsService {
});
return false;
}
this.logger.log(`[SMS Text Sent] To: ${phone}, Content: ${message}`);
await this.recordLog({
receptor: phone,
type: "GENERIC_TEXT",
messageText: message,
status: "SUCCESS",
// 2. Dispatch generic direct SMS via MeliPayamak SendSMS endpoint if fromNumber configured, else fall back to local log
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({
receptor: phone,
type: "GENERIC_TEXT",
messageText: message,
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);
}
}
@@ -1,12 +0,0 @@
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 {}
@@ -1,80 +0,0 @@
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 -1
View File
@@ -2,9 +2,10 @@ import { Module } from "@nestjs/common";
import { ContactController } from "./contact.controller";
import { ContactService } from "./contact.service";
import { SmsModule } from "../common/sms.module";
import { NotificationsModule } from "../notifications/notifications.module";
@Module({
imports: [SmsModule],
imports: [SmsModule, NotificationsModule],
controllers: [ContactController],
providers: [ContactService],
exports: [ContactService],
@@ -2,6 +2,7 @@ import { Test, TestingModule } from "@nestjs/testing";
import { ContactService, CreateContactSubmissionDto } from "./contact.service";
import { PrismaService } from "../prisma/prisma.service";
import { SmsService } from "../common/services/sms.service";
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
describe("ContactService", () => {
let service: ContactService;
@@ -34,6 +35,17 @@ describe("ContactService", () => {
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();
+24
View File
@@ -1,6 +1,7 @@
import { Injectable, Logger } from "@nestjs/common";
import { PrismaService } from "../prisma/prisma.service";
import { SmsService } from "../common/services/sms.service";
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
export interface CreateContactSubmissionDto {
name: string;
@@ -25,6 +26,7 @@ export class ContactService {
constructor(
private readonly prisma: PrismaService,
private readonly smsService: SmsService,
private readonly transactionalEmails: TransactionalEmailsService,
) {}
async submitContactForm(dto: CreateContactSubmissionDto) {
@@ -56,6 +58,28 @@ 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 {
success: true,
message:
+98
View File
@@ -0,0 +1,98 @@
/**
* 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, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#39;');
}
export function textToHtmlParagraphs(text: string): string {
return escapeHtml(text)
.split(/\r?\n/)
.map((line) => (line.trim().length === 0 ? '&nbsp;' : 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;">&nbsp;</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>
&nbsp;·&nbsp;
<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>`,
});
}
+392
View File
@@ -0,0 +1,392 @@
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}` });
}
});
}
}
@@ -0,0 +1,127 @@
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' }),
});
});
});
@@ -0,0 +1,281 @@
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,
};
}
}
@@ -0,0 +1,330 @@
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: 'قالب رویداد حذف شد.',
};
}
}
@@ -0,0 +1,172 @@
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;
}
@@ -0,0 +1,15 @@
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 {}
@@ -0,0 +1,122 @@
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)),
);
}
}
+2 -1
View File
@@ -1,10 +1,11 @@
import { Module } from "@nestjs/common";
import { OrdersService } from "./orders.service";
import { OrdersController } from "./orders.controller";
import { NotificationsModule } from "../notifications/notifications.module";
@Module({
imports: [NotificationsModule],
controllers: [OrdersController],
providers: [OrdersService],
exports: [OrdersService],
})
export class OrdersModule {}
+3 -1
View File
@@ -2,6 +2,7 @@ import { Test, TestingModule } from "@nestjs/testing";
import { OrdersService } from "./orders.service";
import { PrismaService } from "../prisma/prisma.service";
import { SmsService } from "../common/services/sms.service";
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
import { NotFoundException, BadRequestException } from "@nestjs/common";
import { Prisma } from "@prisma/client";
@@ -39,7 +40,7 @@ describe("OrdersService", () => {
uiText: {
findFirst: jest.fn().mockResolvedValue(null),
},
$executeRaw: jest.fn().mockResolvedValue(1),
$executeRaw: jest.fn(),
$transaction: jest.fn(),
};
@@ -58,6 +59,7 @@ describe("OrdersService", () => {
OrdersService,
{ provide: PrismaService, useValue: mockPrisma },
{ 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();
+17 -2
View File
@@ -8,6 +8,7 @@ import { PrismaService } from "../prisma/prisma.service";
import { PaginationDto } from "../common/dto/pagination.dto";
import { CreateOrderDto } from "./dto/create-order.dto";
import { SmsService } from "../common/services/sms.service";
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
import { Prisma } from "@prisma/client";
@Injectable()
@@ -17,6 +18,7 @@ export class OrdersService {
constructor(
private prisma: PrismaService,
private smsService: SmsService,
private transactionalEmails: TransactionalEmailsService,
) {}
private generateTrackingNumber(): string {
@@ -303,6 +305,9 @@ export class OrdersService {
this.logger.warn(`Failed to trigger wallet order SMS: ${err}`);
});
}
this.transactionalEmails
.sendOrderPaid(user.email, createdWalletOrder)
.catch(() => {});
return createdWalletOrder;
}
@@ -346,14 +351,13 @@ export class OrdersService {
// Deduct inventory immediately for non-online orders (card to card)
if (!isOnline) {
for (const item of createOrderDto.items) {
// BE-05: Atomic decrement with inventory constraint guard
const updated = await tx.product.update({
where: { id: item.productId },
data: {
stock: { decrement: item.quantity },
},
});
if (updated && updated.stock <= 0) {
if (updated.stock <= 0) {
await tx.product.update({
where: { id: item.productId },
data: { stockStatus: "OUT_OF_STOCK" },
@@ -376,6 +380,11 @@ export class OrdersService {
.triggerEvent("ORDER_CREATED", orderData)
.catch(() => {});
}
if (user?.email) {
this.transactionalEmails
.sendOrderCreated(user.email, createdOrder)
.catch(() => {});
}
}
return createdOrder;
@@ -530,6 +539,9 @@ export class OrdersService {
: "پیک شهری";
this.smsService.triggerEvent("ORDER_SHIPPED", orderData).catch(() => {});
this.transactionalEmails
.sendOrderShipped(updatedOrder.user?.email, updatedOrder, finalTracking)
.catch(() => {});
}
return updatedOrder;
@@ -708,6 +720,9 @@ export class OrdersService {
.triggerEvent("ORDER_PAID", orderData)
.catch(() => {});
}
this.transactionalEmails
.sendOrderPaid(user.email, order)
.catch(() => {});
return {
success: true,
+2 -1
View File
@@ -1,4 +1,5 @@
import { Module } from "@nestjs/common";
import { NotificationsModule } from "../notifications/notifications.module";
import { PaymentController } from "./payment.controller";
import { PaymentService } from "./payment.service";
import { ZibalService } from "./zibal.service";
@@ -7,7 +8,7 @@ import { PrismaModule } from "../prisma/prisma.module";
import { SmsModule } from "../common/sms.module";
@Module({
imports: [PrismaModule, SmsModule],
imports: [NotificationsModule, PrismaModule, SmsModule],
controllers: [PaymentController],
providers: [PaymentService, ZibalService, ZibalEBankService],
exports: [PaymentService, ZibalService, ZibalEBankService],
@@ -3,6 +3,7 @@ import { PaymentService } from "./payment.service";
import { PrismaService } from "../prisma/prisma.service";
import { ZibalService } from "./zibal.service";
import { SmsService } from "../common/services/sms.service";
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
import { BadRequestException, NotFoundException } from "@nestjs/common";
import { Prisma } from "@prisma/client";
@@ -72,6 +73,7 @@ describe("PaymentService", () => {
{ provide: PrismaService, useValue: mockPrisma },
{ provide: ZibalService, useValue: mockZibalService },
{ 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();
+21 -24
View File
@@ -8,6 +8,7 @@ import {
import { PrismaService } from "../prisma/prisma.service";
import { ZibalService } from "./zibal.service";
import { SmsService } from "../common/services/sms.service";
import { TransactionalEmailsService } from "../notifications/transactional-emails.service";
import { Prisma } from "@prisma/client";
import { AdminTransactionFilterDto } from "./dto/admin-transaction-filter.dto";
@@ -24,6 +25,7 @@ export class PaymentService {
private readonly prisma: PrismaService,
private readonly zibalService: ZibalService,
private readonly smsService: SmsService,
private readonly transactionalEmails: TransactionalEmailsService,
) {}
/**
@@ -447,32 +449,17 @@ export class PaymentService {
if (orderWithItems?.orderItems) {
for (const item of orderWithItems.orderItems) {
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 },
data: {
stock: { decrement: item.quantity },
},
});
if (updated.stock <= 0) {
await tx.product.update({
where: { id: item.productId },
data: { stock: { decrement: item.quantity } },
data: { stockStatus: "OUT_OF_STOCK" },
});
if (updated.stock <= 0) {
await tx.product.update({
where: { id: item.productId },
data: { stockStatus: "OUT_OF_STOCK" },
});
}
}
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.`
);
}
}
}
@@ -656,6 +643,16 @@ export class PaymentService {
this.smsService.triggerEvent("ORDER_PAID", orderData).catch((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
-26
View File
@@ -1,39 +1,13 @@
import { Injectable, OnModuleInit, OnModuleDestroy } from "@nestjs/common";
import { PrismaClient } from "@prisma/client";
import { Logger } from "@nestjs/common";
@Injectable()
export class PrismaService
extends PrismaClient
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() {
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();
}
@@ -14,9 +14,6 @@ describe("ProductsService", () => {
findFirst: jest.fn(),
count: jest.fn(),
},
orderItem: {
groupBy: jest.fn().mockResolvedValue([]),
},
};
const mockRevalidationService = {
+10 -25
View File
@@ -87,7 +87,6 @@ export class ProductsService {
const skip = (page - 1) * limit;
// 1. Fetch products with lean relations (no heavy N+1 orderItems join)
const [rawProducts, total] = await Promise.all([
this.prisma.product.findMany({
where: whereClause,
@@ -97,33 +96,15 @@ export class ProductsService {
include: {
ingredientList: true,
symptoms: true,
orderItems: {
where: { order: { status: { not: "CANCELLED" } } },
select: { quantity: true },
},
},
}),
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 =
userRole === "User_Wholesale" ||
userRole === "User_Partner" ||
@@ -132,8 +113,12 @@ export class ProductsService {
const isAdmin = userRole === "ADMIN" || userRole === "SuperAdmin";
const data = rawProducts.map((p) => {
const totalSold = salesMap[p.id] || 0;
const { buyPrice, wholesalePrice, ...publicProduct } = p;
const totalSold =
p.orderItems?.reduce(
(acc, item) => acc + (Number(item.quantity) || 0),
0,
) || 0;
const { buyPrice, wholesalePrice, orderItems, ...publicProduct } = p;
void buyPrice;
void wholesalePrice;
if (!isWholesaleOrAdmin) {
-16
View File
@@ -45,20 +45,4 @@ export class RedisService implements OnModuleInit, OnModuleDestroy {
async ttl(key: string): Promise<number> {
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}`);
}
}
@@ -1,71 +0,0 @@
import { RouterUsageAdapter } from './router-usage.adapter';
const stats = {totalRequests:0,totalPromptTokens:0,totalCompletionTokens:0,totalCachedTokens:0,byModel:{},byProvider:{},byAccount:{}};
describe('bounded read-only adapter', () => {
afterEach(() => jest.restoreAllMocks());
it('uses only authenticated GET stats with a validated period and never follows redirects', async () => {
const fetcher = jest.spyOn(global, 'fetch').mockResolvedValue(new Response(JSON.stringify(stats)));
const adapter = new RouterUsageAdapter();
process.env.ROUTER_USAGE_BASE_URL = 'https://nr.parsaaghayi.ir';
process.env.ROUTER_USAGE_CLI_TOKEN = 'server-only-secret';
const result = await adapter.summary('24h');
expect(result.status).toBe('available');
expect(result.attribution).toEqual({scope:'9router_total',hermes:null,additive:false});
expect(fetcher).toHaveBeenCalledTimes(1);
expect(fetcher).toHaveBeenCalledWith('https://nr.parsaaghayi.ir/api/usage/stats?period=24h', expect.objectContaining({method:'GET',redirect:'error',headers:{'x-9r-cli-token':'server-only-secret',Accept:'application/json'}}));
expect(JSON.stringify(result)).not.toContain('server-only-secret');
});
it('rejects invalid time filters before IO', async () => {
const fetcher = jest.spyOn(global,'fetch');
await expect(new RouterUsageAdapter().summary('../providers')).rejects.toThrow();
expect(fetcher).not.toHaveBeenCalled();
});
it('fails closed when credential is missing', async () => {
delete process.env.ROUTER_USAGE_CLI_TOKEN;
const fetcher = jest.spyOn(global,'fetch');
const result = await new RouterUsageAdapter().summary('7d');
expect(result).toMatchObject({status:'unavailable',data:null,reason:'not_configured'});
expect(fetcher).not.toHaveBeenCalled();
});
it.each([401,403,429,500])('returns unknown data without upstream error text for %s', async status => {
process.env.ROUTER_USAGE_CLI_TOKEN='secret';
jest.spyOn(global,'fetch').mockResolvedValue(new Response('credential-secret',{status}));
const result = await new RouterUsageAdapter().summary('7d');
expect(result).toMatchObject({status:'unavailable',data:null,reason:'upstream_unavailable'});
expect(JSON.stringify(result)).not.toContain('credential-secret');
});
it('rejects oversized bodies even without content length', async () => {
process.env.ROUTER_USAGE_CLI_TOKEN='secret';
jest.spyOn(global,'fetch').mockResolvedValue(new Response('x'.repeat(1048577)));
expect(await new RouterUsageAdapter().summary('7d')).toMatchObject({status:'unavailable',data:null});
});
it('does not return stale last-good totals after a failure', async () => {
process.env.ROUTER_USAGE_CLI_TOKEN='secret';
jest.spyOn(global,'fetch').mockResolvedValueOnce(new Response(JSON.stringify(stats))).mockRejectedValueOnce(new Error('token-secret'));
const adapter=new RouterUsageAdapter();
expect((await adapter.summary('7d')).status).toBe('available');
expect(await adapter.summary('7d')).toMatchObject({status:'unavailable',data:null});
});
});
describe('transport boundaries', () => {
afterEach(()=>jest.restoreAllMocks());
it('never sends credentials to a configured alternate origin', async()=>{
process.env.ROUTER_USAGE_CLI_TOKEN='secret';
process.env.ROUTER_USAGE_BASE_URL='https://attacker.invalid';
const fetcher=jest.spyOn(global,'fetch');
expect(await new RouterUsageAdapter().summary()).toMatchObject({status:'unavailable',reason:'invalid_configuration'});
expect(fetcher).not.toHaveBeenCalled();
delete process.env.ROUTER_USAGE_BASE_URL;
});
it('bounds simultaneous upstream calls and exposes no stale totals', async()=>{
process.env.ROUTER_USAGE_CLI_TOKEN='secret';
let resolve!: (value: Response) => void;
const pending=new Promise<Response>(r=>{resolve=r;});
jest.spyOn(global,'fetch').mockReturnValue(pending);
const adapter=new RouterUsageAdapter();
const calls=Array.from({length:4},()=>adapter.summary());
expect(await adapter.summary()).toMatchObject({status:'unavailable',reason:'busy',data:null});
resolve(new Response('',{status:503}));
await Promise.all(calls);
});
});
@@ -1,45 +0,0 @@
import { BadRequestException, Injectable } from '@nestjs/common';
import { normalizeStats } from './router-usage.contract';
export const ROUTER_PERIODS = ['today','24h','7d','30d','60d','all'] as const;
@Injectable()
export class RouterUsageAdapter {
private active = 0;
async summary(period = '7d') {
if (!ROUTER_PERIODS.includes(period as typeof ROUTER_PERIODS[number])) throw new BadRequestException('Invalid period');
const base = {source:'9router' as const,period,attribution:{scope:'9router_total',hermes:null,additive:false},
capabilities:{errors:false,reasoningTokens:false,cacheWriteTokens:false,quota:false,customTimeRange:false},
freshness:{retrievedAt:null as string | null,sourceUpdatedAt:null,stale:null as boolean | null}};
const unavailable = (reason: string) => ({...base,status:'unavailable' as const,reason,data:null});
const token=process.env.ROUTER_USAGE_CLI_TOKEN;
if (!token) return unavailable('not_configured');
if (this.active >= 4) return unavailable('busy');
this.active++;
const controller = new AbortController();
const timeout = setTimeout(() => controller.abort(),5000);
try {
const url=new URL(process.env.ROUTER_USAGE_BASE_URL || 'https://nr.parsaaghayi.ir');
if (url.origin !== 'https://nr.parsaaghayi.ir' || url.username || url.password || url.pathname !== '/' || url.search || url.hash) return unavailable('invalid_configuration');
const response=await fetch(`${url.origin}/api/usage/stats?period=${period}`,{
method:'GET',redirect:'error',signal:controller.signal,
headers:{'x-9r-cli-token':token,Accept:'application/json'},
});
if (!response.ok || !response.body) throw new Error('Upstream unavailable');
const reader=response.body.getReader();
const chunks:Uint8Array[]=[];
let size=0;
try {
while (true) {
const {done,value}=await reader.read();
if (done) break;
size+=value.byteLength;
if (size>1048576) {await reader.cancel(); throw new Error('Response too large');}
chunks.push(value);
}
} finally { reader.releaseLock(); }
const data=normalizeStats(JSON.parse(Buffer.concat(chunks).toString('utf8')));
return {...base,status:'available' as const,reason:null,data,
freshness:{retrievedAt:new Date().toISOString(),sourceUpdatedAt:null,stale:null}};
} catch { return unavailable('upstream_unavailable'); }
finally { clearTimeout(timeout); this.active--; }
}
}
@@ -1,37 +0,0 @@
type RecordValue = Record<string, unknown>;
export function record(value: unknown): RecordValue {
if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error('Invalid upstream schema');
return value as RecordValue;
}
function count(value: unknown): number | null {
return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0 ? value : null;
}
function identifier(value: unknown): string | null {
return typeof value === 'string' && /^[a-zA-Z0-9_./:@()+ -]{1,180}$/.test(value) && !value.includes('@') && !/^(sk-|Bearer )/i.test(value) ? value : null;
}
function metrics(row: RecordValue, prefix = '') {
const key = (name: string) => prefix ? prefix + name[0].toUpperCase() + name.slice(1) : name;
return {
requests: count(row[key('requests')]), inputTokens: count(row[key('promptTokens')]),
outputTokens: count(row[key('completionTokens')]), cacheReadTokens: count(row[key('cachedTokens')]),
cacheWriteTokens: null, reasoningTokens: null, errors: null,
};
}
export function normalizeStats(value: unknown) {
const stats = record(value);
if (count(stats.totalRequests) === null) throw new Error('Invalid stats');
const rows = (key: string) => {
const entries = Object.entries(record(stats[key]));
if (entries.length > 2000) throw new Error('Too many aggregates');
return entries;
};
return {
totals: metrics(stats, 'total'),
providers: rows('byProvider').map(([id, row]) => ({provider: identifier(id), ...metrics(record(row))})),
models: rows('byModel').map(([, row]) => { const r = record(row); return {model: identifier(r.rawModel), provider: identifier(r.provider), ...metrics(r)}; }),
accounts: rows('byAccount').map(([, row]) => { const r = record(row); return {
accountId: identifier(r.connectionId), model: identifier(r.rawModel), provider: identifier(r.provider), ...metrics(r),
quota: {status: 'unknown' as const, remaining: null, resetAt: null, reason: 'upstream_quota_get_mutates_credentials'},
}; }),
};
}
@@ -1,22 +0,0 @@
import { Controller, Get, Header, Query, UseGuards, ValidationPipe } from '@nestjs/common';
import { AuthGuard } from '@nestjs/passport';
import { IsIn, IsOptional } from 'class-validator';
import { Roles } from '../common/decorators/roles.decorator';
import { RolesGuard } from '../common/guards/roles.guard';
import { ROUTER_PERIODS, RouterUsageAdapter } from './router-usage.adapter';
export class RouterUsageQuery {
@IsOptional()
@IsIn(ROUTER_PERIODS)
period?: string;
}
@Controller('admin/router-usage')
@UseGuards(AuthGuard('jwt'), RolesGuard)
@Roles('admin')
export class RouterUsageController {
constructor(private readonly adapter: RouterUsageAdapter) {}
@Get()
@Header('Cache-Control','private, no-store')
summary(@Query(new ValidationPipe({transform:true,whitelist:true,forbidNonWhitelisted:true})) query: RouterUsageQuery) {
return this.adapter.summary(query.period ?? '7d');
}
}
@@ -1,36 +0,0 @@
import { Test } from '@nestjs/testing';
import { INestApplication, ValidationPipe } from '@nestjs/common';
import { AuthGuard } from '@nestjs/passport';
import request from 'supertest';
import { RouterUsageModule } from './router-usage.module';
import { RouterUsageAdapter } from './router-usage.adapter';
describe('protected router usage HTTP contract', () => {
let app: INestApplication;
const summary=jest.fn().mockResolvedValue({status:'available',data:{}});
beforeAll(async () => {
const module=await Test.createTestingModule({imports:[RouterUsageModule]})
.overrideProvider(RouterUsageAdapter).useValue({summary})
.overrideGuard(AuthGuard('jwt')).useValue({canActivate(context: any){
const req=context.switchToHttp().getRequest();
if (!req.headers.authorization) return false;
req.user={role:req.headers.authorization}; return true;
}}).compile();
app=module.createNestApplication();
app.useGlobalPipes(new ValidationPipe({transform:true,whitelist:true,forbidNonWhitelisted:true}));
await app.init();
});
afterAll(async()=>app.close());
it('blocks unauthenticated access', async()=>{ await request(app.getHttpServer()).get('/admin/router-usage').expect(403); });
it('blocks non-admin users', async()=>{ await request(app.getHttpServer()).get('/admin/router-usage').set('Authorization','customer').expect(403); });
it('permits admins and defaults to 7d', async()=>{
await request(app.getHttpServer()).get('/admin/router-usage').set('Authorization','admin').expect(200);
expect(summary).toHaveBeenCalledWith('7d');
});
it('rejects unsupported custom time range', async()=>{
await request(app.getHttpServer()).get('/admin/router-usage?from=2026-01-01').set('Authorization','admin').expect(400);
});
it('rejects invalid period', async()=>{
await request(app.getHttpServer()).get('/admin/router-usage?period=invalid').set('Authorization','admin').expect(400);
});
});
@@ -1,6 +0,0 @@
import { Module } from '@nestjs/common';
import { RouterUsageController } from './router-usage.controller';
import { RouterUsageAdapter } from './router-usage.adapter';
import { RolesGuard } from '../common/guards/roles.guard';
@Module({controllers:[RouterUsageController],providers:[RouterUsageAdapter,RolesGuard],exports:[RouterUsageAdapter]})
export class RouterUsageModule {}
@@ -1,28 +0,0 @@
import { normalizeStats } from './router-usage.contract';
describe('9router stats allowlist', () => {
it('maps real aggregate fields without leaking API-key map keys or account labels', () => {
const result = normalizeStats({totalRequests:2,totalPromptTokens:10,totalCompletionTokens:4,totalCachedTokens:3,
byProvider:{codex:{requests:2,promptTokens:10,completionTokens:4,cachedTokens:3}},
byModel:{'m (codex)':{rawModel:'m',provider:'codex',requests:2}},
byAccount:{'private@example.com':{rawModel:'m',provider:'codex',connectionId:'account-1',accountName:'private@example.com',requests:2}},
byApiKey:{'SECRET-KEY|m':{apiKey:'SECRET-KEY'}},accessToken:'SECRET-TOKEN'});
expect(result.totals).toEqual({requests:2,inputTokens:10,outputTokens:4,cacheReadTokens:3,cacheWriteTokens:null,reasoningTokens:null,errors:null});
expect(result.models[0]).toMatchObject({model:'m',provider:'codex',requests:2});
expect(result.accounts[0]).toMatchObject({accountId:'account-1',quota:{status:'unknown',remaining:null,resetAt:null,reason:'upstream_quota_get_mutates_credentials'}});
expect(JSON.stringify(result)).not.toMatch(/SECRET|private@|accountName|byApiKey/);
});
});
describe('unknown rather than fabricated metrics', () => {
const empty = {totalRequests:0,byProvider:{},byModel:{},byAccount:{}};
it('preserves known zero and unknown missing counters separately', () => {
expect(normalizeStats(empty).totals).toEqual({requests:0,inputTokens:null,outputTokens:null,cacheReadTokens:null,cacheWriteTokens:null,reasoningTokens:null,errors:null});
});
it.each([null,{},[],{...empty,totalRequests:-1},{...empty,byModel:null}])('rejects invalid schemas', value => {
expect(()=>normalizeStats(value)).toThrow();
});
it('rejects unsafe metric values instead of coercing them to zero', () => {
expect(normalizeStats({...empty,totalPromptTokens:'10',totalCompletionTokens:-4,totalCachedTokens:Infinity}).totals).toMatchObject({inputTokens:null,outputTokens:null,cacheReadTokens:null});
});
});
+1 -23
View File
@@ -94,26 +94,4 @@ describe("SettingsService", () => {
});
expect(result.key).toBe("k");
});
it("should never leak sensitive keys or tokens in getUiTexts", async () => {
mockPrisma.uiText.findMany.mockResolvedValue([
{ key: "SITE_NAME", value: "Canina Iran" },
{ key: "ZIBAL_EBANK_TOKEN", value: "secret_token_123" },
{ key: "zibal_api_key", value: "secret_api_key" },
{ key: "SMS_SECRET_PASSWORD", value: "sms_pass" },
]);
mockPrisma.setting.findMany.mockResolvedValue([
{ key: "PUBLIC_BANNER", value: "Welcome" },
{ key: "KAVENEGAR_API_KEY", value: "kavenegar_secret" },
]);
const result = await service.getUiTexts();
const returnedKeys = result.map((r) => r.key);
expect(returnedKeys).toContain("SITE_NAME");
expect(returnedKeys).toContain("PUBLIC_BANNER");
expect(returnedKeys).not.toContain("ZIBAL_EBANK_TOKEN");
expect(returnedKeys).not.toContain("zibal_api_key");
expect(returnedKeys).not.toContain("SMS_SECRET_PASSWORD");
expect(returnedKeys).not.toContain("KAVENEGAR_API_KEY");
});
});
});
+4 -21
View File
@@ -269,27 +269,10 @@ export class SettingsService implements OnModuleInit {
mergedMap.set("b2b_enabled", val);
}
const SENSITIVE_KEY_PATTERNS = [
/token/i,
/secret/i,
/password/i,
/api_key/i,
/apikey/i,
/private/i,
/zibal/i,
/kavenegar/i,
/ghasedak/i,
/credential/i,
/account_id/i,
/access_key/i,
];
return Array.from(mergedMap.entries())
.filter(([key]) => !SENSITIVE_KEY_PATTERNS.some((pattern) => pattern.test(key)))
.map(([key, value]) => ({
key,
value,
}));
return Array.from(mergedMap.entries()).map(([key, value]) => ({
key,
value,
}));
}
async updateUiText(key: string, value: string) {
@@ -13,7 +13,7 @@ class TestJwt extends PassportStrategy(Strategy) {
const selected = { enabled:true, provider:'configured-1234567890abcdef', model:'real-model', label:'پشتیبان تست', icon:'paw' };
describe('smart chat settings', () => {
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()}, 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}))} };
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()} };
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';});
afterEach(()=>jest.restoreAllMocks());
@@ -5,9 +5,9 @@ describe('model intent routing', () => {
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);});
afterEach(()=>jest.restoreAllMocks());
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)); }
function model(body:any) { return jest.spyOn(global,'fetch').mockResolvedValue({ok:true,json:async()=>body} 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('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('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('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('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();});
+23 -5
View File
@@ -1,5 +1,3 @@
version: '3.8'
services:
db_stage:
image: postgres:16-alpine
@@ -25,22 +23,36 @@ services:
build:
context: ./backend
dockerfile: Dockerfile
args:
NPM_REGISTRY: ${NPM_REGISTRY:-}
container_name: canino_backend_stage
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:
- 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_PORT=6379
- PORT=3000
- ADMIN_PASSWORD=Z6nYnJRG_sg3pnz2J9wZ7dLsPj61cd5k
- FRONTEND_URL=https://stage.canina.ir
- ENABLE_SWAGGER=false
# Code-only stage startup: schema/seed changes require separate authorization.
command: ["node", "dist/main.js"]
volumes:
- canina_stage_uploads:/app/uploads
- /opt/services/proxy/certs/canina:/app/ssl_certs
labels:
- "traefik.enable=true"
- "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.tls=true"
- "traefik.http.routers.canina-api-stage.tls.certresolver=arvan"
- "traefik.http.services.canina-api-stage.loadbalancer.server.port=3000"
depends_on:
- db_stage
@@ -53,16 +65,22 @@ services:
context: .
dockerfile: Dockerfile
args:
NPM_REGISTRY: ${NPM_REGISTRY:-}
NEXT_PUBLIC_API_URL: "https://stageapi.canina.ir/api"
VITE_API_URL: "https://stageapi.canina.ir"
container_name: canino_frontend_stage
restart: always
env_file:
- path: .revalidation.env
required: false
dns:
- 217.218.127.127
- 217.218.155.155
labels:
- "traefik.enable=true"
- "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.tls=true"
- "traefik.http.routers.canina-stage.tls.certresolver=arvan"
- "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.services.canina-stage.loadbalancer.server.port=8080"
@@ -1,44 +0,0 @@
# 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
-41
View File
@@ -1,41 +0,0 @@
# 9router admin consumption adapter
## Wiring (integration owner)
Import `RouterUsageModule` from `backend/src/router-usage/router-usage.module` into the root application's imports. This branch deliberately does not edit app.module.ts. Existing AuthModule/JWT strategy must be registered by the application. Route requires a JWT bearer user with admin/superadmin role; API-key authentication is deliberately not enabled for this sensitive endpoint.
Set backend-only `ROUTER_USAGE_CLI_TOKEN` using the existing router CLI auth token from the operator secret store. Optional `ROUTER_USAGE_BASE_URL` must be exactly `https://nr.parsaaghayi.ir` (an origin slash is accepted). Do not ship this token to the frontend. No environment/configuration was changed during implementation. No push/deploy performed; integration follows CI/CD and production needs separate Gate2.
## Exact API
`GET /admin/router-usage?period=7d` (plus the existing application global prefix, if any).
Allowed periods: `today`, `24h`, `7d`, `30d`, `60d`, `all`; default `7d`. Unknown query properties/custom from/to ranges and invalid periods return 400. Missing/invalid JWT is rejected by Passport; authenticated non-admin gets 403. Response is private/no-store.
Response fields:
- `source: "9router"`, `period`
- `status: "available" | "unavailable"`
- `reason: null | "not_configured" | "invalid_configuration" | "busy" | "upstream_unavailable"`
- `attribution: {scope:"9router_total", hermes:null, additive:false}`
- `freshness: {retrievedAt: ISO8601|null, sourceUpdatedAt:null, stale:null}`. Retrieval time is NOT a guarantee of provider freshness. The source exposes no authoritative updated-at for aggregates. No last-good cache is served.
- `capabilities: {errors:false, reasoningTokens:false, cacheWriteTokens:false, quota:false, customTimeRange:false}`
- `data: null | {totals, providers:[], models:[], accounts:[]}`
Every metrics object contains `requests`, `inputTokens`, `outputTokens`, `cacheReadTokens`, `cacheWriteTokens`, `reasoningTokens`, `errors` (number|null). Zero is retained only if upstream reported zero; absent/invalid counters remain null. Input/output/cache map to promptTokens/completionTokens/cachedTokens; cache-read is a subset of input, never add it again. Cache-write/reasoning/errors are always null because the stats contract does not expose these aggregates.
Provider rows: `{provider,...metrics}`. Model rows: `{model,provider,...metrics}`. Account rows: `{accountId,model,provider,...metrics,quota:{status:"unknown",remaining:null,resetAt:null,reason:"upstream_quota_get_mutates_credentials"}}`. Account rows are upstream account/model summaries, NOT unique account inventory; accounts without usage are absent. IDs are validated, nullable if unsafe; account names/emails are never returned. No raw upstream maps, logs, prompts, provider data or credentials are returned. Dimensions are different views of the same consumption: do NOT sum totals+models+accounts. Hermes attribution remains unknown; do NOT add Hermes telemetry to router totals.
## Deployed-source inspection and real probe
Read-only inspected running `9router` image `decolua/9router:vpn`: compiled `/app/.next/server/app/api/usage/stats/route.js`, `/app/.next/server/chunks/9100.js`, `/app/.next/server/middleware.js`, `/app/.next/server/chunks/7211.js`, providers routes and `/app/open-sse/services/usage.js`. No credential tables or router DB contents were dumped/modified.
Verified stats route accepts the periods above. `today` uses router-local midnight, `24h` rolling history; 7/30/60d use router-local daily buckets, `all` all retained daily aggregates. This is not arbitrary UTC timestamp filtering; retention/completeness is upstream-owned.
Authenticated internal GET probe returned HTTP 200, 5 provider summaries, 21 model summaries, 21 account/model summaries. Verified model fields: requests, promptTokens, completionTokens, cachedTokens, cost, rawModel, provider, lastUsed. Account fields additionally include connectionId/accountName. Only schema/counts printed; no keys or account values printed. Public HTTPS reverse proxy path was not live-authenticated, so its separate proxy authentication/network reachability remains an operator verification step.
Dashboard routes authenticate using `x-9r-cli-token` or valid `auth_token` session cookie. Normal inference API Bearer keys do NOT authenticate these dashboard routes. CLI token is NOT the contents of cli-secret: deployed middleware computes first 16 hex characters of SHA256(machine-id + "9r-cli-auth" + cli-secret). Probe derived it only inside the router process command and never emitted it; no new token or configuration was created.
**Security finding:** stats `byApiKey` map keys contain raw inference keys, even when row fields are masked. Adapter discards this map entirely and never logs response bodies/errors.
**Quota blocker:** `GET /api/usage/[connectionId]` calls refreshAndUpdateCredentials, including updateProviderConnection; OAuth refresh/retry can persist credentials. It is NOT read-only despite being GET. Therefore adapter does NOT call it. Provider quota handlers can return quotas (used/total/remaining/resetAt), messages or synthesized unlimited defaults; these cannot safely be treated as verified provider truth here. Quota reset grants exist in provider helpers but must never be consumed by this adapter. No safe deployed cache-only provider quota route was established. A separately reviewed router-side non-mutating, provenance/timestamp-bearing quota snapshot API is required before exposing live remaining/reset. Quota is unknown, never zero/unlimited fabricated. Connection inventory/status refresh is also not represented as quota truth.
## Bounds and verification
Only fixed-origin authenticated GET `/api/usage/stats` is invoked; redirect:error, abort after 5 seconds, streaming cap 1 MiB, <=2000 rows per dimension, <=4 concurrent requests per backend process. No retries or stale cache. Schema/transport/auth/rate-limit/oversize failures produce unavailable + null data without raw errors. No SQL, POST or token refresh.
Strict test-first slices observed missing contract, adapter, module failures before implementation. Disposable containers used existing backend image dependencies, read-only source mounts, network disabled and copied source into ephemeral /work; no host dependencies/build output or running containers changed. `npm run build` passed. Focused: 3 suites/24 tests passed. Full backend regression: 92 suites/781 tests passed (existing negative-path tests log expected payment/SSL errors). HTTP guard tests replace JWT authentication only and exercise real RolesGuard; deployed JWT strategy remains application-owned.
+2 -5
View File
@@ -7,10 +7,7 @@
"dev": "vite --port 3400 --host 127.0.0.1",
"build": "vite build",
"lint": "eslint .",
"preview": "vite preview",
"test": "vitest run",
"test:watch": "vitest",
"typecheck": "tsc --noEmit"
"preview": "vite preview"
},
"dependencies": {
"@tanstack/react-query": "^5.101.0",
@@ -45,4 +42,4 @@
"typescript-eslint": "^8.59.2",
"vitest": "^4.1.11"
}
}
}
@@ -1,5 +1,6 @@
import {
Activity,
Bell,
CheckSquare,
BookOpen,
Building2,
@@ -109,7 +110,7 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
items: [
{ icon: LayoutDashboard, label: 'نمای کلی داشبورد', path: '/' },
{ icon: TrendingUp, label: 'گزارشات و تحلیل فروش', path: '/reports' },
{ icon: MessageSquare, label: 'تحلیل مشاوره سایت', path: '/settings/smart-chat' },
{ icon: MessageSquare, label: 'پشتیبان هوشمند سایت', path: '/settings/smart-chat' },
],
},
{
@@ -117,9 +118,7 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
title: 'حاکمیت، تاییدات و وظایف',
icon: CheckSquare,
items: [
{ icon: Building2, label: 'نمای وضعیت دپارتمان‌ها', path: '/governance/hq' },
{ icon: Briefcase, label: 'اقدامات مدیریتی و همکاری‌ها', path: '/manager-actions' },
{ icon: CheckSquare, label: 'مجوزهای عملیاتی', path: '/approvals' },
{ icon: CheckSquare, label: 'کارتابل تاییدات مدیریت', path: '/approvals' },
{ icon: Briefcase, label: 'وظایف دپارتمان‌ها و ایجنت‌ها', path: '/tasks' },
{ icon: History, label: 'تاریخچه تغییرات دیتابیس (Audit)', path: '/history' },
],
@@ -159,7 +158,6 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
{ icon: Package, label: 'لیست محصولات', path: '/products' },
{ icon: Star, label: 'نظرات و امتیازات', path: '/reviews' },
{ icon: FolderTree, label: 'دسته‌بندی‌های تخصصی', path: '/categories' },
{ icon: Activity, label: 'علائم بالینی و درمانی', path: '/symptoms' },
{ icon: Tag, label: 'کدهای تخفیف', path: '/coupons' },
{ icon: Sparkles, label: 'مشاور هوشمند بالینی', path: '/smart-advisor' },
{ icon: FileText, label: 'نسخه‌های دریافتی', path: '/prescriptions' },
@@ -173,6 +171,7 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
{ icon: Users, label: 'مدیریت کاربران', path: '/users' },
{ icon: Heart, label: 'پرونده پت‌ها (همدم‌ها)', path: '/pets' },
{ icon: MessageSquare, label: 'تیکت‌ها و مشاوره تخصصی', path: '/tickets' },
{ icon: PhoneCall, label: 'مشاوران و لیدهای تماس', path: '/advisors' },
{ icon: Building2, label: 'پرتال B2B و همکاران', path: '/b2b' },
{ icon: PhoneCall, label: 'اطلاعات تماس و پیام‌ها', path: '/contact' },
],
@@ -204,6 +203,7 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
{ icon: CreditCard, label: 'روش‌های پرداخت و زیبال', path: '/settings/payment-methods' },
{ icon: Truck, label: 'تنظیمات ارسال و کرایه', path: '/settings/shipping' },
{ icon: DollarSign, label: 'تنظیمات مالی و مالیات', path: '/settings/financial' },
{ icon: Bell, label: 'مرکز اطلاع‌رسانی (ایمیل و صف)', path: '/settings/notifications' },
{ icon: MessageSquare, label: 'درگاه پیامک (MeliPayamak)', path: '/settings/sms' },
{ icon: ShieldCheck, label: 'گواهی SSL و امنیت', path: '/settings/ssl' },
{ icon: Key, label: 'کلیدهای دسترسی (API Keys)', path: '/settings/api-keys' },
@@ -12,9 +12,6 @@ interface TopbarProps {
}
const SEARCHABLE_PAGES = [
{ label: "اقدامات مدیریتی و همکاری‌ها (Manager Actions)", path: "/manager-actions", keywords: ["اقدامات", "مدیریتی", "همکاری", "b2b", "تامین", "استراتژی", "actions"] },
{ label: "مجوزهای عملیاتی مدیریت (Operational Approvals)", path: "/approvals", keywords: ["مجوز", "مجوزها", "تاییدات", "approvals", "عملیاتی", "تایید"] },
{ label: "وضعیت دپارتمان‌ها و ارکستراسیون (HQ)", path: "/governance/hq", keywords: ["ارکستراسیون", "دپارتمان", "hq", "governance", "وضعیت"] },
{ label: 'داشبورد (خلاصه وضعیت فروشگاه)', path: '/', keywords: ['dashboard', 'آمار', 'فروش', 'خانه'] },
{ label: 'مرکز مانیتورینگ و سلامت سرویس‌ها', path: '/monitoring', keywords: ['monitoring', 'مانیتورینگ', 'سلامت', 'پینگ', 'وضعیت', 'سرعت'] },
{ label: 'مدیریت نسخه‌های پزشکی (Prescriptions)', path: '/prescriptions', keywords: ['نسخه', 'نسخه‌ها', 'پزشک', 'دارو', 'تجویز', 'rx', 'prescription', 'بررسی نسخه'] },
@@ -1,147 +0,0 @@
import React from 'react';
import { HelpCircle, Plus, Trash2 } from 'lucide-react';
import Button from '../ui/Button';
interface ProductFaqTabProps {
activeTab: string;
formData: any;
setFormData: React.Dispatch<React.SetStateAction<any>>;
}
export const ProductFaqTab: React.FC<ProductFaqTabProps> = ({
activeTab,
formData,
setFormData,
}) => {
return (
<div className={activeTab === 'faq' ? 'block space-y-5' : 'hidden'}>
{/* Top FAQ Controls */}
<div className="bg-white p-5 rounded-2xl border border-gray-200 shadow-sm space-y-4">
<div className="flex flex-col sm:flex-row sm:items-center justify-between gap-3 border-b pb-4">
<div>
<h4 className="text-sm font-black text-gray-800 flex items-center gap-2">
<HelpCircle className="w-4 h-4 text-purple-600" />
<span>بخش پرسش و پاسخ‌های متداول محصول (Product FAQs)</span>
</h4>
<p className="text-xs text-gray-500 mt-0.5">مدیریت آکاردئون پرسش‌های متداول در صفحه کالا و ثبت خودکار در سئوی گوگل (FAQPage Schema)</p>
</div>
<div className="flex items-center gap-2 shrink-0">
<label className="relative inline-flex items-center cursor-pointer">
<input
type="checkbox"
className="sr-only peer"
checked={formData.showFaqs}
onChange={(e) => setFormData({ ...formData, showFaqs: e.target.checked })}
/>
<div className="w-11 h-6 bg-gray-200 peer-focus:outline-none rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all peer-checked:bg-purple-600"></div>
</label>
<span className="text-xs font-bold text-gray-700">
{formData.showFaqs ? 'بخش FAQ فعال است' : 'بخش FAQ غیرفعال است'}
</span>
</div>
</div>
<div className="flex items-center justify-between flex-wrap gap-2 pt-1">
<Button
type="button"
variant="outline"
size="sm"
startIcon={Plus}
onClick={() => {
setFormData({
...formData,
faqs: [...(formData.faqs || []), { question: '', answer: '' }]
});
}}
className="border-purple-200 text-purple-700 hover:bg-purple-50 text-xs font-bold"
>
افزودن سوال جدید
</Button>
<button
type="button"
onClick={() => {
const defaultFaqs = [
{ question: `آیا مصرف ${formData.nameFa || 'این محصول'} برای توله‌ها یا بچه‌گربه‌ها مجاز است؟`, answer: 'بله، مطابق دوز اعلام‌شده روی قوطی و بر اساس وزن دقیق حیوان قابل مصرف است.' },
{ question: 'دوره درمان یا مصرف استاندارد چقدر است؟', answer: 'معمولاً دوره‌های درمانی بین ۴ الی ۶ هفته توصیه می‌شود تا اثربخشی فیزیولوژیک کامل حاصل شود.' },
{ question: 'آیا با سایر داروها یا غذاهای خشک تداخل دارد؟', answer: 'خیر، ترکیبات ارگانیک کنینا فاقد عوارض دارویی تداخلی با رژیم‌های غذایی خشک و مرطوب استاندارد هستند.' }
];
setFormData({
...formData,
faqs: [...(formData.faqs || []), ...defaultFaqs]
});
}}
className="text-xs text-purple-600 hover:text-purple-800 font-bold px-3 py-1.5 rounded-lg hover:bg-purple-50 transition-colors"
>
+ درج سوالات پیشنهادی هوشمند
</button>
</div>
</div>
{/* FAQs List */}
<div className="space-y-4">
{(!formData.faqs || formData.faqs.length === 0) ? (
<div className="bg-white p-8 rounded-2xl border border-dashed border-gray-200 text-center space-y-2">
<HelpCircle className="w-8 h-8 text-gray-300 mx-auto" />
<p className="text-xs font-bold text-gray-500">هیچ پرسش و پاسخی برای این محصول تعریف نشده است.</p>
<p className="text-[11px] text-gray-400">با کلیک روی دکمه «افزودن سوال جدید» یا «درج سوالات پیشنهادی»، متداول‌ترین پرسش‌های خریداران را ثبت کنید.</p>
</div>
) : (
formData.faqs.map((faq: any, index: number) => (
<div key={index} className="bg-white p-5 rounded-2xl border border-gray-200 shadow-xs space-y-3 relative group">
<div className="flex items-center justify-between gap-3 border-b pb-2">
<span className="text-xs font-black text-purple-700 bg-purple-50 px-2.5 py-1 rounded-lg">
پرسش شماره {index + 1}
</span>
<button
type="button"
onClick={() => {
const newFaqs = [...formData.faqs];
newFaqs.splice(index, 1);
setFormData({ ...formData, faqs: newFaqs });
}}
className="p-1.5 text-gray-400 hover:text-red-600 hover:bg-red-50 rounded-lg transition-colors"
title="حذف این پرسش"
>
<Trash2 className="w-4 h-4" />
</button>
</div>
<div className="space-y-1.5">
<label className="text-xs font-bold text-gray-700">عنوان پرسش *</label>
<input
type="text"
value={faq.question}
onChange={(e) => {
const newFaqs = [...formData.faqs];
newFaqs[index].question = e.target.value;
setFormData({ ...formData, faqs: newFaqs });
}}
placeholder="مثال: نحوه مصرف همراه با غذاست یا با معده خالی؟"
className="w-full px-4 py-2.5 rounded-xl border border-gray-200 focus:border-purple-500 outline-none text-xs font-bold"
dir="rtl"
/>
</div>
<div className="space-y-1.5">
<label className="text-xs font-bold text-gray-700">پاسخ تشریحی و تخصصی *</label>
<textarea
rows={2}
value={faq.answer}
onChange={(e) => {
const newFaqs = [...formData.faqs];
newFaqs[index].answer = e.target.value;
setFormData({ ...formData, faqs: newFaqs });
}}
placeholder="پاسخ دقیق، علمی و راهنمای مصرف را اینجا بنویسید..."
className="w-full px-4 py-2.5 rounded-xl border border-gray-200 focus:border-purple-500 outline-none text-xs font-medium leading-relaxed"
dir="rtl"
/>
</div>
</div>
))
)}
</div>
</div>
);
};
@@ -202,23 +202,6 @@ export default function MediaSelector({ isOpen, onClose, onSelect, multiple = fa
const files = Array.from(e.dataTransfer.files);
if (files.length === 0) return;
const ALLOWED_MIME_TYPES = ['image/jpeg', 'image/png', 'image/webp', 'image/svg+xml', 'image/gif', 'application/pdf'];
const MAX_FILE_SIZE = 15 * 1024 * 1024; // 15MB
const validFiles = files.filter(f => {
if (!ALLOWED_MIME_TYPES.includes(f.type) && !f.type.startsWith('image/')) {
toast.error(`فرمت فایل ${f.name} مجاز نمی‌باشد.`);
return false;
}
if (f.size > MAX_FILE_SIZE) {
toast.error(`حجم فایل ${f.name} بیش از حد مجاز (حداکثر ۱۵ مگابایت) است.`);
return false;
}
return true;
});
if (validFiles.length === 0) return;
setIsUploading(true);
let successCount = 0;
try {
@@ -0,0 +1,512 @@
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>
);
}
@@ -1,163 +0,0 @@
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
import { beforeEach, describe, expect, it, vi } from "vitest";
import toast from "react-hot-toast";
import api from "../services/api";
import ApprovalsPage from "./ApprovalsPage";
vi.mock("../services/api", () => {
return {
default: {
get: vi.fn(),
post: vi.fn(),
put: vi.fn(),
delete: vi.fn(),
},
};
});
vi.mock("react-hot-toast", () => ({
default: {
success: vi.fn(),
error: vi.fn(),
},
toast: {
success: vi.fn(),
error: vi.fn(),
},
}));
describe("ApprovalsPage Component", () => {
const mockApprovals = [
{
id: "app-1",
department: "CONTENT",
category: "CAMPAIGN",
title: "کمپین تخصصی مفاصل: برتری بالینی صدف لب‌سبز کنینا نسبت به وت‌اکسپرت",
status: "PENDING",
createdAt: "2026-10-19T10:00:00Z",
payload: {
"1_مسئله_و_شکاف_بازار": "قیمت گزاف قرص مفاصل وت‌اکسپرت لهستان باعث شکست دوره‌های درمانی شده است.",
"2_راه‌حل_و_مزیت_کنینا": "معرفی مکمل بی‌رقیب Velox Gelenkenergie ۱۰۰٪ عصاره صدف لب‌سبز با نصف قیمت رقیب.",
"3_طرح_اقدام_عملیاتی": "تولید لندینگ‌پیج جامع و سئومحور و اتصال مستقیم به ترب.",
"4_دپارتمان‌های_مسئول": "CONTENT, SEO, CLINICAL_RD",
"5_معیار_پذیرش_و_تکمیل": "رندر شدن لندینگ بدون خطای SSR و افزایش ایمپرشن ارگانیک."
}
},
{
id: "app-2",
department: "PRICING",
category: "PRICE_CHANGE",
title: "پیشنهاد اصلاح قیمت و همگام‌سازی با ترب: Canina Flexan 150g",
status: "PENDING",
createdAt: "2026-10-19T11:00:00Z",
payload: {
product_name: "Canina Flexan 150g",
current_price: 34800000,
suggested_price: 36500000,
margin_percent: 20.5,
competitor_min_torob: 37200000,
reason: "افزایش قیمت تامین‌کننده و میانگین قیمت ترب روی ۳۷.۲ میلیون ریال است."
}
},
{
id: "app-3",
department: "MARKETING",
category: "SMS_CAMPAIGN",
title: "کمپین یادآوری تمدید دوره مکمل‌های مفاصل و GAG",
status: "APPROVED",
createdAt: "2026-10-18T09:00:00Z",
executedAt: "2026-10-18T10:00:00Z",
ceoNotes: "تایید شد و پیامک‌ها ارسال شدند.",
payload: {
campaign_name: "Refill GAG 60-Day Reminder",
sms_pattern: "سلام {name} عزیز، دوره مکمل مفاصل کنینا رو به اتمام است.",
target_count: 86,
estimated_cost_irr: 860000,
expected_revenue_irr: 54000000,
expected_conversion_rate: "18%"
}
}
];
beforeEach(() => {
vi.clearAllMocks();
(api.get as any).mockResolvedValue({
data: {
success: true,
data: mockApprovals,
meta: {
total: 3,
pendingCount: 2,
},
},
});
});
it("renders header, KPI cards, and maps strategic 5-part proposal nicely", async () => {
render(<ApprovalsPage />);
expect(await screen.findByText(/کارتابل حاکمیت سازمانی و تاییدات مدیرعامل/i)).toBeInTheDocument();
expect(screen.getByText(/2 پیشنهاد منتظر تصمیم شما/i)).toBeInTheDocument();
// Verify 5-part structured fields are cleanly mapped
expect(screen.getByText(/مسئله و شکاف شناسایی‌شده در بازار:/i)).toBeInTheDocument();
expect(screen.getByText(/قیمت گزاف قرص مفاصل وت‌اکسپرت لهستان/i)).toBeInTheDocument();
expect(screen.getByText(/راه‌حل، محصول و مزیت رقابتی کنینا:/i)).toBeInTheDocument();
expect(screen.getByText(/Velox Gelenkenergie/i)).toBeInTheDocument();
});
it("renders pricing payload with current price, suggested price, and margin", async () => {
render(<ApprovalsPage />);
expect(await screen.findByText(/پیشنهاد اصلاح قیمت و همگام‌سازی با ترب/i)).toBeInTheDocument();
expect(screen.getByText(/محاسبه قیمت‌گذاری و سود ناخالص:/i)).toBeInTheDocument();
expect(screen.getByText(/20.5٪/i)).toBeInTheDocument();
});
it("approves a pending request with CEO directive note", async () => {
(api.put as any).mockResolvedValue({
data: { success: true },
});
render(<ApprovalsPage />);
expect(await screen.findByText(/کمپین تخصصی مفاصل/i)).toBeInTheDocument();
const approveButtons = screen.getAllByRole("button", { name: /تایید و صدور مجوز اجرا/i });
expect(approveButtons.length).toBeGreaterThan(0);
fireEvent.click(approveButtons[0]);
await waitFor(() => {
expect(api.put).toHaveBeenCalledWith(
"/admin/approvals/app-2/decide",
expect.objectContaining({ decision: "APPROVED" })
);
});
});
it("runs simulation test when clicking play button", async () => {
(api.post as any).mockResolvedValue({
data: {
success: true,
testResult: {
status: "SIMULATION_SUCCESS",
executionSafe: true,
},
},
});
render(<ApprovalsPage />);
const runTestButtons = await screen.findAllByRole("button", { name: /اجرای تست و شبیه‌سازی/i });
expect(runTestButtons.length).toBeGreaterThan(0);
fireEvent.click(runTestButtons[0]);
await waitFor(() => {
expect(api.post).toHaveBeenCalledWith("/admin/approvals/app-2/test");
});
expect(await screen.findByText(/نتیجه تست سلامت و شبیه‌سازی:/i)).toBeInTheDocument();
});
});
File diff suppressed because it is too large. Load diff
@@ -251,10 +251,6 @@ describe("Blogs Page Component", () => {
});
});
it("submits authorship fields and intentional material update control", async () => {
renderComponent(); await screen.findByText("راهنمای جامع نگهداری سگ پامرانین"); fireEvent.click(screen.getAllByTitle("ویرایش مقاله")[0]); fireEvent.change(screen.getByLabelText("تیم نویسندگی"),{target:{value:"Science"}}); fireEvent.change(screen.getByLabelText("نقش نویسنده"),{target:{value:"Vet"}}); fireEvent.click(screen.getByText("۳. زمان‌بندی و انتشار")); fireEvent.click(screen.getByLabelText("ثبت به‌روزرسانی محتوایی مهم")); fireEvent.click(screen.getByTestId("blog-save-btn")); await waitFor(()=>expect(api.put).toHaveBeenCalledWith("/admin/blogs/blog-1",expect.objectContaining({authorTeam:"Science",authorRole:"Vet",markContentUpdated:true})));
});
it("shows delete confirmation and deletes blog article", async () => {
vi.mocked(api.delete).mockResolvedValueOnce({ data: { success: true } });
-19
View File
@@ -70,9 +70,6 @@ export interface BlogPost {
content: string;
excerpt?: string;
authorId?: string;
authorTeam?: string;
authorRole?: string;
contentUpdatedAt?: string | null;
author?: {
id?: string;
firstName?: string;
@@ -171,9 +168,6 @@ export default function Blogs() {
content: '',
excerpt: '',
authorId: '',
authorTeam: '',
authorRole: '',
markContentUpdated: false,
categoryId: '',
tagNames: [] as string[],
imageUrl: '',
@@ -251,9 +245,6 @@ export default function Blogs() {
content: blog.content || '',
excerpt: blog.excerpt || '',
authorId: blog.authorId || (blog.author?.id || ''),
authorTeam: blog.authorTeam || '',
authorRole: blog.authorRole || '',
markContentUpdated: false,
categoryId: blog.categoryId || '',
tagNames: blog.tags ? blog.tags.map((t) => t.name) : [],
imageUrl: blog.imageUrl || '',
@@ -290,9 +281,6 @@ export default function Blogs() {
content: '',
excerpt: '',
authorId: authors[0]?.id || '',
authorTeam: '',
authorRole: '',
markContentUpdated: false,
categoryId: '',
tagNames: [],
imageUrl: '',
@@ -1015,11 +1003,6 @@ export default function Blogs() {
</div>
</div>
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<div><label htmlFor="author-team" className="text-xs font-bold text-gray-700">تیم نویسندگی</label><input id="author-team" value={formData.authorTeam} onChange={(e)=>setFormData({...formData,authorTeam:e.target.value})} className="w-full px-3 py-2.5 rounded-2xl border border-gray-200 text-xs" /></div>
<div><label htmlFor="author-role" className="text-xs font-bold text-gray-700">نقش نویسنده</label><input id="author-role" value={formData.authorRole} onChange={(e)=>setFormData({...formData,authorRole:e.target.value})} className="w-full px-3 py-2.5 rounded-2xl border border-gray-200 text-xs" /></div>
</div>
{/* Chips Tag Input */}
<div className="space-y-2 p-3.5 bg-gray-50/70 border border-gray-200 rounded-2xl">
<label className="text-xs font-bold text-gray-700 block">برچسب‌ها و تگ‌های مقاله (Tag Input)</label>
@@ -1178,8 +1161,6 @@ export default function Blogs() {
</div>
</div>
<label className="flex items-center gap-3 p-4 border border-blue-200 rounded-2xl bg-blue-50 cursor-pointer"><input type="checkbox" aria-label="ثبت به‌روزرسانی محتوایی مهم" checked={formData.markContentUpdated} onChange={(e)=>setFormData({...formData,markContentUpdated:e.target.checked})}/><span className="text-xs font-black">ثبت به‌روزرسانی محتوایی مهم</span></label>
<div className="grid grid-cols-1 sm:grid-cols-3 gap-3">
<label className="flex items-center gap-3 p-4 border border-gray-200 rounded-2xl bg-white hover:bg-gray-50 transition-colors cursor-pointer">
<input
@@ -1,352 +0,0 @@
import React, { useEffect, useState } from 'react';
import {
Building2,
CheckCircle2,
Clock,
AlertTriangle,
ArrowUpRight,
RefreshCw,
ShieldCheck,
Briefcase,
FileText,
Stethoscope,
Search,
Headphones,
Cpu,
Layers,
Terminal,
Activity,
XCircle,
} from 'lucide-react';
import { Link } from 'react-router-dom';
import api from '../services/api';
interface DepartmentCard {
id: string;
name: string;
role: string;
agentName: string;
avatarColor: string;
icon: any;
status: 'ACTIVE' | 'PROCESSING' | 'STANDBY';
currentFocus: string;
pendingApprovals: number;
completedTasks: number;
recentReasoningSnippet: string;
}
const BASE_DEPARTMENTS: Omit<DepartmentCard, 'status' | 'pendingApprovals' | 'completedTasks' | 'recentReasoningSnippet' | 'currentFocus'>[] = [
{
id: 'CONTENT',
name: 'واحد محتوا و وبلاگ تخصصی',
role: 'تحقیق عمیق، مقالات بالینی، تولید تصویر و سئوی محتوایی',
agentName: 'Canina-Content-Agent',
avatarColor: 'from-blue-600 to-indigo-700',
icon: FileText,
},
{
id: 'CLINICAL_RD',
name: 'واحد تحقیق و توسعه بالینی (R&D)',
role: 'فکت‌چکینگ پزشکی، اعتبارسنجی دوزها و مراجع داروسازی آلمان',
agentName: 'Canina-Medical-Agent',
avatarColor: 'from-emerald-600 to-teal-700',
icon: Stethoscope,
},
{
id: 'SEO',
name: 'واحد سئو و هوش بازار',
role: 'پایش سرچ کنسول، شناسایی کلمات کلیدی، بهینه‌سازی اسکیما و فید ترب',
agentName: 'Canina-SEO-Agent',
avatarColor: 'from-amber-500 to-orange-600',
icon: Search,
},
{
id: 'B2B',
name: 'واحد توسعه سازمانی و B2B',
role: 'پایپ‌لاین کلینیک‌ها، بیمارستان‌های دامپزشکی و بسته‌های نمایندگی',
agentName: 'Canina-B2B-Agent',
avatarColor: 'from-purple-600 to-violet-800',
icon: Building2,
},
{
id: 'DEVOPS',
name: 'واحد مهندسی، زیرساخت و امنیت',
role: 'پایش سلامت کانتینرها، مصرف دیسک، SSL و پایپ‌لاین آزمون‌محور TDD',
agentName: 'Canina-DevOps-Agent',
avatarColor: 'from-rose-600 to-red-700',
icon: Cpu,
},
{
id: 'SUPPORT',
name: 'واحد پشتیبانی و مشاوره هوشمند',
role: 'پاسخ‌گویی به مشتریان، تریاژ پرسش‌های پت و ثبت تیکت‌های پیگیری',
agentName: 'Canina-Support-Agent',
avatarColor: 'from-cyan-600 to-blue-700',
icon: Headphones,
}
];
export default function CompanyOrchestrationHQ() {
const [departments, setDepartments] = useState<DepartmentCard[]>([]);
const [totalPendingApprovals, setTotalPendingApprovals] = useState<number>(0);
const [totalTasksCount, setTotalTasksCount] = useState<number>(0);
const [isLoading, setIsLoading] = useState<boolean>(true);
const [hasError, setHasError] = useState<boolean>(false);
const fetchLiveStatus = async () => {
setIsLoading(true);
setHasError(false);
try {
const [_statsRes, tasksRes, approvalsRes] = await Promise.all([
api.get('/admin/department-tasks/stats'),
api.get('/admin/department-tasks?limit=100'),
api.get('/admin/approvals?limit=100')
]);
const tasks = tasksRes.data?.data || [];
const approvals = approvalsRes.data?.data || [];
// Calculate operational pending approvals (excluding non-authorization items)
const pendingApprovalsList = approvals.filter((a: any) =>
a.status === 'PENDING' && a.category !== 'B2B_SUPPLIER_STRATEGY'
);
setTotalPendingApprovals(pendingApprovalsList.length);
setTotalTasksCount(tasks.length);
const mapped: DepartmentCard[] = BASE_DEPARTMENTS.map(base => {
const deptTasks = tasks.filter((t: any) =>
t.department === base.id || (base.id === 'DEVOPS' && t.department === 'DEV')
);
const inProgress = deptTasks.find((t: any) => t.status === 'IN_PROGRESS');
const latestTask = deptTasks[0];
const completedCount = deptTasks.filter((t: any) => t.status === 'DONE').length;
let status: 'ACTIVE' | 'PROCESSING' | 'STANDBY' = 'STANDBY';
if (inProgress) status = 'ACTIVE';
else if (deptTasks.some((t: any) => t.status === 'TEST' || t.status === 'WAITING_DEPENDENCIES')) {
status = 'PROCESSING';
}
let currentFocus = 'آماده‌باش / بدون وظیفه فعال در حال حاضر';
if (inProgress) currentFocus = inProgress.title;
else if (latestTask) currentFocus = latestTask.title;
let snippet = 'بدون ثبت لاگ اجرایی در وظایف اخیر.';
if (latestTask?.executionLogs?.length) {
const lastLog = latestTask.executionLogs[latestTask.executionLogs.length - 1];
snippet = lastLog?.summary || lastLog?.note || (lastLog?.deliverable?.type ? `تحویل خروجی: ${lastLog.deliverable.type}` : snippet);
}
// Real department-specific pending approvals (strictly from live data, no synthetic telemetry)
const deptPendingCount = pendingApprovalsList.filter((a: any) =>
a.department === base.id || (base.id === 'DEVOPS' && a.department === 'DEV')
).length;
return {
...base,
status,
currentFocus,
pendingApprovals: deptPendingCount,
completedTasks: completedCount,
recentReasoningSnippet: snippet
};
});
setDepartments(mapped);
} catch (err) {
console.error('Error fetching live orchestration telemetry:', err);
setHasError(true);
} finally {
setIsLoading(false);
}
};
useEffect(() => {
fetchLiveStatus();
}, []);
return (
<div className="space-y-6 font-vazir" dir="rtl">
{/* Honest Executive Header */}
<div className="flex flex-col md:flex-row md:items-center justify-between gap-4 bg-white p-6 rounded-3xl border border-gray-200 shadow-sm">
<div>
<div className="flex items-center gap-3">
<div className="p-3 bg-purple-100 text-purple-700 rounded-2xl border border-purple-200">
<Building2 className="w-8 h-8" />
</div>
<div>
<h1 className="text-xl md:text-2xl font-black text-gray-900 flex items-center gap-3">
وضعیت و ارکستراسیون دپارتمان‌ها (Department Governance Status)
{hasError ? (
<span className="text-[10px] px-2.5 py-1 rounded-full font-black bg-rose-100 text-rose-800 border border-rose-300">
خطا در همگام‌سازی وضعیت
</span>
) : isLoading ? (
<span className="text-[10px] px-2.5 py-1 rounded-full font-black bg-blue-100 text-blue-800 border border-blue-300">
در حال دریافت داده‌ها...
</span>
) : (
<span className="text-[10px] px-2.5 py-1 rounded-full font-black bg-emerald-100 text-emerald-800 border border-emerald-300">
داده‌های زنده سیستم
</span>
)}
</h1>
<p className="text-xs text-gray-500 mt-1 font-medium">
پایش وظایف، وضعیت و خروجی عملیاتی دپارتمان‌ها و ایجنت‌ها بر اساس داده‌های واقعی سرویس
</p>
</div>
</div>
</div>
<div className="flex flex-wrap items-center gap-2.5">
<Link
to="/manager-actions"
className="flex items-center gap-1.5 px-3.5 py-2 bg-indigo-50 hover:bg-indigo-100 text-indigo-700 border border-indigo-200 rounded-xl text-xs font-bold transition-all"
>
<Briefcase className="w-4 h-4 text-indigo-600" />
<span>اقدامات مدیریتی و همکاری‌ها</span>
</Link>
<Link
to="/approvals"
className="flex items-center gap-1.5 px-3.5 py-2 bg-amber-50 hover:bg-amber-100 text-amber-800 border border-amber-300 rounded-xl text-xs font-bold transition-all"
>
<ShieldCheck className="w-4 h-4 text-amber-600" />
<span>مجوزهای عملیاتی ({totalPendingApprovals} مورد)</span>
</Link>
<button
type="button"
onClick={fetchLiveStatus}
disabled={isLoading}
className="inline-flex items-center gap-1.5 px-3 py-2 rounded-xl bg-gray-100 hover:bg-gray-200 text-gray-700 text-xs font-bold transition-all border border-gray-200 cursor-pointer disabled:opacity-50"
>
<RefreshCw className={`w-3.5 h-3.5 ${isLoading ? 'animate-spin' : ''}`} />
<span>تازه‌سازی</span>
</button>
</div>
</div>
{/* Honest Error State */}
{hasError ? (
<div className="bg-white p-8 rounded-3xl border border-rose-200 shadow-sm text-center space-y-3">
<XCircle className="w-12 h-12 text-rose-500 mx-auto" />
<h3 className="text-base font-black text-gray-900">داده‌های وضعیت در دسترس نیست</h3>
<p className="text-xs text-gray-500 max-w-md mx-auto">
امکان ارتباط با سرویس ارکستراسیون یا دریافت آمار وظایف دپارتمان‌ها وجود ندارد. به منظور حفظ صداقت عملیاتی، هیچ وضعیت شبیه‌سازی‌شده‌ای رندر نمی‌شود.
</p>
<button
type="button"
onClick={fetchLiveStatus}
className="px-4 py-2 bg-purple-600 hover:bg-purple-700 text-white rounded-xl text-xs font-bold transition-all"
>
تلاش مجدد جهت اتصال
</button>
</div>
) : isLoading ? (
<div className="py-24 flex flex-col justify-center items-center gap-3">
<RefreshCw className="w-8 h-8 text-purple-600 animate-spin" />
<span className="text-xs font-bold text-gray-500">در حال واکشی وضعیت واقعی دپارتمان‌ها...</span>
</div>
) : (
<>
{/* Honest Metrics Summary */}
<div className="grid grid-cols-2 md:grid-cols-4 gap-4">
<div className="bg-white p-4 rounded-2xl border border-gray-200 shadow-xs">
<span className="text-[11px] font-bold text-gray-500">کل دپارتمان‌های سازمانی</span>
<p className="text-2xl font-black text-gray-900 mt-1 font-mono">{departments.length}</p>
</div>
<div className="bg-white p-4 rounded-2xl border border-gray-200 shadow-xs">
<span className="text-[11px] font-bold text-gray-500">کل وظایف ثبت‌شده</span>
<p className="text-2xl font-black text-gray-900 mt-1 font-mono">{totalTasksCount}</p>
</div>
<div className="bg-white p-4 rounded-2xl border border-amber-200 shadow-xs">
<span className="text-[11px] font-bold text-amber-700">مجوزهای عملیاتی معلق</span>
<p className="text-2xl font-black text-amber-700 mt-1 font-mono">{totalPendingApprovals}</p>
</div>
<div className="bg-white p-4 rounded-2xl border border-emerald-200 shadow-xs">
<span className="text-[11px] font-bold text-emerald-700">دپارتمان‌های در حال کار</span>
<p className="text-2xl font-black text-emerald-700 mt-1 font-mono">
{departments.filter(d => d.status === 'ACTIVE').length}
</p>
</div>
</div>
{/* Department Cards Grid */}
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-5">
{departments.map((dept) => (
<div
key={dept.id}
className="bg-white border border-gray-200 rounded-3xl p-5 hover:border-purple-300 hover:shadow-md transition-all flex flex-col justify-between shadow-xs"
>
<div>
<div className="flex items-start justify-between gap-3">
<div className="flex items-center gap-3">
<div className={`p-3 rounded-2xl bg-gradient-to-br ${dept.avatarColor} text-white shadow-xs`}>
<dept.icon className="w-5 h-5" />
</div>
<div>
<h3 className="text-sm font-black text-gray-900">{dept.name}</h3>
<p className="text-[11px] text-purple-700 font-bold">{dept.agentName}</p>
</div>
</div>
<span className={`text-[10px] font-black px-2 py-0.5 rounded-full border ${
dept.status === 'ACTIVE'
? 'bg-emerald-50 text-emerald-800 border-emerald-200'
: dept.status === 'PROCESSING'
? 'bg-amber-50 text-amber-800 border-amber-200'
: 'bg-gray-100 text-gray-600 border-gray-200'
}`}>
{dept.status === 'ACTIVE' ? 'در حال کار' : dept.status === 'PROCESSING' ? 'در حال تست' : 'آماده‌باش'}
</span>
</div>
<p className="text-xs text-gray-600 mt-3 font-medium leading-relaxed">
{dept.role}
</p>
<div className="mt-4 p-3 rounded-2xl bg-gray-50 border border-gray-100 space-y-1">
<div className="text-[10px] font-bold text-gray-500 flex items-center gap-1.5">
<Activity className="w-3.5 h-3.5 text-purple-600" />
<span>تمرکز فعلی دپارتمان:</span>
</div>
<p className="text-xs text-gray-800 font-medium line-clamp-1">
{dept.currentFocus}
</p>
</div>
<div className="mt-2 p-3 rounded-2xl bg-gray-50 border border-gray-100 space-y-1">
<div className="text-[10px] font-bold text-gray-500 flex items-center gap-1.5">
<Terminal className="w-3.5 h-3.5 text-purple-600" />
<span>آخرین لاگ و استدلال واقعی:</span>
</div>
<p className="text-[11px] text-gray-700 font-mono leading-relaxed line-clamp-2">
{dept.recentReasoningSnippet}
</p>
</div>
</div>
<div className="mt-5 pt-4 border-t border-gray-100 flex items-center justify-between text-xs">
<div className="space-x-2 space-x-reverse text-gray-600">
<span>وظایف انجام‌شده: <strong className="text-gray-900 font-bold">{dept.completedTasks}</strong></span>
{dept.pendingApprovals > 0 && (
<span className="text-amber-700 font-bold">({dept.pendingApprovals} مجوز معلق)</span>
)}
</div>
<Link
to="/tasks"
className="flex items-center gap-1 text-purple-700 hover:text-purple-800 font-bold text-xs"
>
<span>مشاهده وظایف</span>
<ArrowUpRight className="w-3.5 h-3.5" />
</Link>
</div>
</div>
))}
</div>
</>
)}
</div>
);
}
@@ -43,14 +43,11 @@ describe('Dashboard Page Component', () => {
beforeEach(() => {
vi.clearAllMocks();
vi.mocked(api.get).mockImplementation((url: string) => {
if (url.includes('/admin/audit-logs')) {
return Promise.resolve({ data: { success: true, data: [] } } as any);
}
if (url.includes('/admin/approvals')) {
return Promise.resolve({ data: { success: true, meta: { pendingCount: 0 } } } as any);
}
return Promise.resolve({ data: { success: true, data: mockStats } } as any);
vi.mocked(api.get).mockResolvedValue({
data: {
success: true,
data: mockStats,
},
});
});
@@ -65,8 +62,8 @@ describe('Dashboard Page Component', () => {
it('renders dashboard headers and initial zero or placeholder stats', async () => {
renderDashboard();
expect(screen.getByText('داشبورد فرماندهی کنینا')).toBeInTheDocument();
expect(screen.getByText('خلاصه عملیات، وضعیت دیتابیس و نظارت بر وظایف خودکار سازمان')).toBeInTheDocument();
expect(screen.getByText('داشبورد')).toBeInTheDocument();
expect(screen.getByText('خلاصه‌ای از وضعیت فروشگاه کنینا')).toBeInTheDocument();
expect(screen.getByText('درآمد کل')).toBeInTheDocument();
expect(screen.getByText('سفارشات جدید')).toBeInTheDocument();
expect(screen.getByText('کاربران فعال')).toBeInTheDocument();
@@ -126,12 +123,7 @@ describe('Dashboard Page Component', () => {
it('falls back gracefully when API returns error', async () => {
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
vi.mocked(api.get).mockImplementation((url: string) => {
if (url.includes('/admin/dashboard/stats')) {
return Promise.reject(new Error('Network error'));
}
return Promise.resolve({ data: { success: true, data: [] } } as any);
});
vi.mocked(api.get).mockRejectedValueOnce(new Error('Network error'));
renderDashboard();
+6 -6
View File
@@ -73,7 +73,7 @@ export default function Dashboard() {
try {
const res = await api.get('/admin/audit-logs?limit=5');
if (res.data?.success) {
setRecentLogs(Array.isArray(res.data.data) ? res.data.data : (Array.isArray(res.data.data?.logs) ? res.data.data.logs : []));
setRecentLogs(res.data.data);
}
} catch (e) {
console.error('Failed to fetch audit logs widget', e);
@@ -117,10 +117,10 @@ export default function Dashboard() {
const COLORS = ['#8b5cf6', '#3b82f6', '#10b981'];
const stats = [
{ title: 'درآمد کل', value: `${(data?.revenue || 0).toLocaleString()} تومان`, icon: DollarSign, color: 'text-green-600', bg: 'bg-green-100', link: '/reports' },
{ title: 'سفارشات جدید', value: (data?.newOrders || 0).toString(), icon: ShoppingCart, color: 'text-blue-600', bg: 'bg-blue-100', link: '/orders' },
{ title: 'کاربران فعال', value: (data?.users || 0).toString(), icon: Users, color: 'text-purple-600', bg: 'bg-purple-100', link: '/users' },
{ title: 'بازدید امروز', value: (data?.todayVisits || 0).toString(), icon: Activity, color: 'text-orange-600', bg: 'bg-orange-100', link: '/reports' },
{ title: 'درآمد کل', value: `${data.revenue.toLocaleString()} تومان`, icon: DollarSign, color: 'text-green-600', bg: 'bg-green-100', link: '/reports' },
{ title: 'سفارشات جدید', value: data.newOrders.toString(), icon: ShoppingCart, color: 'text-blue-600', bg: 'bg-blue-100', link: '/orders' },
{ title: 'کاربران فعال', value: data.users.toString(), icon: Users, color: 'text-purple-600', bg: 'bg-purple-100', link: '/users' },
{ title: 'بازدید امروز', value: data.todayVisits.toString(), icon: Activity, color: 'text-orange-600', bg: 'bg-orange-100', link: '/reports' },
];
return (
@@ -217,7 +217,7 @@ export default function Dashboard() {
رکوردی در تاریخچه ثبت نشده است.
</div>
) : (
(Array.isArray(recentLogs) ? recentLogs : []).map((log) => (
recentLogs.map((log) => (
<div key={log.id} className="p-3 bg-gray-50 rounded-xl flex items-center justify-between text-xs hover:bg-purple-50/40 transition-colors">
<div className="flex items-center gap-2.5 overflow-hidden">
<span className="w-2 h-2 rounded-full bg-purple-500 shrink-0" />
@@ -214,4 +214,20 @@ describe('FAQManager Component', () => {
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();
});
});
+34 -11
View File
@@ -1,4 +1,4 @@
import { Edit2,HelpCircle,Plus,ToggleLeft,ToggleRight,Trash2 } from 'lucide-react';
import { Edit2,HelpCircle,Plus,ToggleLeft,ToggleRight,Trash2,Search } from 'lucide-react';
import { useCallback,useEffect,useState } from 'react';
import { toast } from 'react-hot-toast';
import Button from '../components/ui/Button';
@@ -20,6 +20,7 @@ interface FAQ {
export default function FAQManager() {
const [faqs, setFaqs] = useState<FAQ[]>([]);
const [searchTerm, setSearchTerm] = useState('');
const [isLoading, setIsLoading] = useState(true);
const [isModalOpen, setIsModalOpen] = useState(false);
const [editingFaq, setEditingFaq] = useState<FAQ | null>(null);
@@ -120,6 +121,13 @@ export default function FAQManager() {
}
};
const filteredFaqs = faqs.filter(
(f) =>
!searchTerm.trim() ||
f.question.toLowerCase().includes(searchTerm.toLowerCase()) ||
f.answer.toLowerCase().includes(searchTerm.toLowerCase())
);
return (
<div className="space-y-6">
<div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
@@ -142,30 +150,45 @@ export default function FAQManager() {
</Button>
</div>
{/* Info Box */}
{/* Info Box & Search Filter */}
<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 ظاهر می‌شوند.
</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 */}
<div className="space-y-3">
{isLoading ? (
<div className="flex justify-center py-12">
<Spinner size="lg" className="text-purple-600" />
</div>
) : faqs.length === 0 ? (
) : filteredFaqs.length === 0 ? (
<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" />
<p className="text-gray-500 font-medium">هیچ سوالی ثبت نشده است</p>
<button
onClick={() => openModal()}
className="mt-4 text-purple-600 font-bold hover:underline text-sm cursor-pointer"
>
اولین سوال را اضافه کنید
</button>
<p className="text-gray-500 font-medium">
{searchTerm ? 'هیچ سوالی با این عبارت یافت نشد' : 'هیچ سوالی ثبت نشده است'}
</p>
{!searchTerm && (
<button
onClick={() => openModal()}
className="mt-4 text-purple-600 font-bold hover:underline text-sm cursor-pointer"
>
اولین سوال را اضافه کنید
</button>
)}
</div>
) : (
faqs.map((faq) => (
filteredFaqs.map((faq) => (
<div
key={faq.id}
className={`bg-white rounded-2xl border p-5 transition-all ${
@@ -1,18 +0,0 @@
import { render, screen } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import api from '../services/api';
import CompanyOrchestrationHQ from './CompanyOrchestrationHQ';
vi.mock('../services/api', () => ({ default: { get: vi.fn() } }));
describe('governance source integrity', () => {
beforeEach(() => { vi.clearAllMocks(); });
it('shows unavailable instead of a synthetic active department when APIs fail', async () => {
vi.mocked(api.get).mockRejectedValue(new Error('offline'));
render(<MemoryRouter><CompanyOrchestrationHQ /></MemoryRouter>);
expect(await screen.findByText(/داده‌های وضعیت در دسترس نیست/)).toBeInTheDocument();
expect(screen.queryByText(/سیستم زنده و فعال/)).not.toBeInTheDocument();
expect(screen.queryByText(/نمای سه‌بعدی و بصری/)).not.toBeInTheDocument();
});
});
@@ -1,150 +0,0 @@
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import api from '../services/api';
import ManagerActionsPage from './ManagerActionsPage';
vi.mock('../services/api', () => ({
default: {
get: vi.fn(),
put: vi.fn(),
post: vi.fn(),
},
}));
vi.mock('react-hot-toast', () => ({
default: {
success: vi.fn(),
error: vi.fn(),
},
toast: {
success: vi.fn(),
error: vi.fn(),
},
}));
const mockItems = [
{
id: 'act-supplier-1',
category: 'B2B_SUPPLIER_STRATEGY',
department: 'B2B',
title: 'توسعه استراتژی تامین‌کننده صدف لب‌سبز آلمان',
status: 'IN_PROGRESS',
createdAt: '2026-10-19T08:00:00Z',
payload: {
'1_مسئله_و_شکاف_بازار': 'کمبود ماده موثره پودر صدف در خطوط تولید داخلی',
'2_راه‌حل_و_مزیت_کنینا': 'عقد تفاهم‌نامه مستقیم با تامین‌کننده لوکزامبورگ/آلمان',
'3_طرح_اقدام_عملیاتی': 'مذاکره بازرگانی جهت دریافت نمونه آزمایشگاهی و بچ آزمایشی',
'4_دپارتمان‌های_مسئول': 'B2B, CLINICAL_RD',
},
// No outcome or evidence yet
outcome: null,
evidence: null,
},
{
id: 'act-supplier-2',
category: 'B2B_SUPPLIER_STRATEGY',
department: 'B2B',
title: 'قرارداد عاملیت توزیع کلینیکی بیمارستان دامپزشکی مرکزی',
status: 'COMPLETED',
createdAt: '2026-10-18T10:00:00Z',
payload: {
partner_name: 'بیمارستان دامپزشکی مرکزی',
scope: 'توزیع انحصاری مکمل‌های مفاصل و آرامبخش',
},
outcome: 'انعقاد قرارداد رسمی عاملیت توزیع سالانه با سهمیه ماهانه ۵۰ بسته',
evidence: 'قرارداد امضاشده شماره B2B-1405-091 در بایگانی حقوقی',
},
{
id: 'auth-seo-1',
category: 'SEO',
department: 'SEO',
title: 'تغییر عنوان متاتگ و ریدایرکت‌های مقالات مفاصل',
status: 'PENDING',
createdAt: '2026-10-19T09:00:00Z',
payload: {
target_url: '/blog/joint-supplements-guide',
},
},
];
describe('ManagerActionsPage Component', () => {
beforeEach(() => {
vi.clearAllMocks();
vi.mocked(api.get).mockResolvedValue({
data: {
success: true,
data: mockItems,
},
});
});
it('renders B2B_SUPPLIER_STRATEGY items and excludes operational SEO authorizations', async () => {
render(
<MemoryRouter>
<ManagerActionsPage />
</MemoryRouter>
);
expect(await screen.findByText('توسعه استراتژی تامین‌کننده صدف لب‌سبز آلمان')).toBeInTheDocument();
expect(screen.getByText('قرارداد عاملیت توزیع کلینیکی بیمارستان دامپزشکی مرکزی')).toBeInTheDocument();
// SEO item belongs strictly in operational authorization queue, not here!
expect(screen.queryByText('تغییر عنوان متاتگ و ریدایرکت‌های مقالات مفاصل')).not.toBeInTheDocument();
});
it('never displays an approval button; requires explicit outcome and evidence for completion', async () => {
render(
<MemoryRouter>
<ManagerActionsPage />
</MemoryRouter>
);
await screen.findByText('توسعه استراتژی تامین‌کننده صدف لب‌سبز آلمان');
// Rule: Manager actions are NOT operational authorizations. No "approval" button allowed!
expect(screen.queryByRole('button', { name: /تایید و صدور مجوز اجرا/i })).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: /تایید درخواست/i })).not.toBeInTheDocument();
// Incomplete manager action shows explicit requirement indicator
expect(screen.getByText(/نیازمند ثبت نتیجه و مدرک جهت احراز تکمیل/i)).toBeInTheDocument();
// Completed action displays its explicit outcome and evidence
expect(screen.getByText(/انعقاد قرارداد رسمی عاملیت توزیع سالانه با سهمیه ماهانه ۵۰ بسته/i)).toBeInTheDocument();
expect(screen.getByText(/قرارداد امضاشده شماره B2B-1405-091 در بایگانی حقوقی/i)).toBeInTheDocument();
expect(screen.getByText(/تکمیل‌شده و احراز شده با مستندات/i)).toBeInTheDocument();
});
it('allows recording explicit outcome and evidence for an action', async () => {
vi.mocked(api.put).mockResolvedValue({
data: { success: true },
});
render(
<MemoryRouter>
<ManagerActionsPage />
</MemoryRouter>
);
expect(await screen.findByText('توسعه استراتژی تامین‌کننده صدف لب‌سبز آلمان')).toBeInTheDocument();
const outcomeInput = screen.getByPlaceholderText(/نتیجه حاصله از این اقدام مدیریتی.../i);
const evidenceInput = screen.getByPlaceholderText(/مستندات، شماره سند، لینک گزارش یا فایل.../i);
fireEvent.change(outcomeInput, { target: { value: 'نمونه اولیه آزمایشگاهی با خلوص ۹۸٪ تایید شد' } });
fireEvent.change(evidenceInput, { target: { value: 'گواهی آنالیز آزمایشگاه رازی کد QA-9921' } });
const submitBtn = screen.getByRole('button', { name: /ثبت نتیجه و مستندات اقدام/i });
fireEvent.click(submitBtn);
await waitFor(() => {
expect(api.put).toHaveBeenCalledWith(
'/admin/approvals/act-supplier-1/decide',
expect.objectContaining({
outcome: 'نمونه اولیه آزمایشگاهی با خلوص ۹۸٪ تایید شد',
evidence: 'گواهی آنالیز آزمایشگاه رازی کد QA-9921',
})
);
});
});
});
Loaded 100 of 244 files, more files were not shown because too many files have changed in this diff. Show more