Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions backend/apps/chat/tests/test_chat_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,22 @@ def test_admin_can_list_conversations_and_reply(
)


@pytest.mark.django_db
def test_admin_gets_a_conversation_summary(
admin_client: APIClient, customer: User
) -> None:
conversation = Conversation.objects.create(customer=customer)
Message.objects.create(conversation=conversation, sender=customer, body="Need help")

response = admin_client.get("/api/v1/chat/conversations/summary/")

assert response.status_code == 200
assert response.data["total"] == 1
assert response.data["by_status"][Conversation.Status.OPEN] == 1
assert response.data["unassigned_open"] == 1
assert response.data["unread_customer_messages"] == 1


@pytest.mark.django_db
def test_message_client_identifier_makes_rest_retries_idempotent(
customer_client: APIClient, customer: User
Expand Down
6 changes: 6 additions & 0 deletions backend/apps/chat/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from .views import (
AdminConversationListAPIView,
AdminConversationManageAPIView,
AdminConversationSummaryAPIView,
CustomerConversationAPIView,
MessageListCreateAPIView,
)
Expand All @@ -16,6 +17,11 @@
AdminConversationListAPIView.as_view(),
name="conversation-list",
),
path(
"conversations/summary/",
AdminConversationSummaryAPIView.as_view(),
name="conversation-summary",
),
path(
"conversations/<uuid:conversation_id>/",
AdminConversationManageAPIView.as_view(),
Expand Down
29 changes: 29 additions & 0 deletions backend/apps/chat/views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.db import transaction
from django.db.models import Count
from rest_framework import status
from rest_framework.exceptions import NotFound
from rest_framework.generics import ListAPIView
Expand All @@ -7,6 +8,8 @@
from rest_framework.response import Response
from rest_framework.views import APIView

from apps.accounts.models import User

from .models import Conversation, Message
from .permissions import IsPlatformAdmin
from .serializers import (
Expand Down Expand Up @@ -42,6 +45,32 @@ def get_queryset(self):
return Conversation.objects.select_related("customer", "assigned_admin")


class AdminConversationSummaryAPIView(APIView):
permission_classes = (IsPlatformAdmin,)

def get(self, request):
by_status = {status: 0 for status, _ in Conversation.Status.choices}
for item in Conversation.objects.values("status").annotate(count=Count("id")):
by_status[item["status"]] = item["count"]
open_conversations = Conversation.objects.filter(
status=Conversation.Status.OPEN
)
return Response(
{
"total": sum(by_status.values()),
"by_status": by_status,
"unassigned_open": open_conversations.filter(
assigned_admin__isnull=True
).count(),
"unread_customer_messages": Message.objects.filter(
conversation__status=Conversation.Status.OPEN,
sender__role=User.Role.CUSTOMER,
read_at__isnull=True,
).count(),
}
)


class AdminConversationManageAPIView(APIView):
permission_classes = (IsPlatformAdmin,)

Expand Down
12 changes: 12 additions & 0 deletions backend/apps/orders/tests/test_admin_orders_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,18 @@ def test_admin_lists_and_filters_orders(
assert response.data["results"][0]["customer_phone"] == customer.phone


@pytest.mark.django_db
def test_admin_gets_an_order_summary(
admin_client: APIClient, paid_order: Order
) -> None:
response = admin_client.get("/api/v1/orders/admin/summary/")

assert response.status_code == 200
assert response.data["total"] == 1
assert response.data["by_status"][Order.Status.PAID] == 1
assert response.data["by_status"][Order.Status.PENDING] == 0


@pytest.mark.django_db
def test_admin_can_move_paid_order_through_fulfilment(
admin_client: APIClient, paid_order: Order
Expand Down
6 changes: 6 additions & 0 deletions backend/apps/orders/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
AddressListCreateAPIView,
AdminOrderListAPIView,
AdminOrderStatusAPIView,
AdminOrderSummaryAPIView,
CheckoutAPIView,
OrderListAPIView,
StartPaymentAPIView,
Expand All @@ -15,6 +16,11 @@
urlpatterns = [
path("addresses/", AddressListCreateAPIView.as_view(), name="address-list"),
path("admin/", AdminOrderListAPIView.as_view(), name="admin-order-list"),
path(
"admin/summary/",
AdminOrderSummaryAPIView.as_view(),
name="admin-order-summary",
),
path(
"admin/<uuid:order_number>/status/",
AdminOrderStatusAPIView.as_view(),
Expand Down
12 changes: 11 additions & 1 deletion backend/apps/orders/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.contrib.auth import get_user_model
from django.db import transaction
from django.db.models import Q
from django.db.models import Count, Q
from django.http import HttpResponseRedirect
from rest_framework import status
from rest_framework.exceptions import NotFound, ValidationError
Expand Down Expand Up @@ -77,6 +77,16 @@ def get_queryset(self):
return queryset


class AdminOrderSummaryAPIView(APIView):
permission_classes = (IsPlatformAdmin,)

def get(self, request):
by_status = {status: 0 for status, _ in Order.Status.choices}
for item in Order.objects.values("status").annotate(count=Count("id")):
by_status[item["status"]] = item["count"]
return Response({"total": sum(by_status.values()), "by_status": by_status})


class AdminOrderStatusAPIView(APIView):
permission_classes = (IsPlatformAdmin,)

Expand Down
7 changes: 6 additions & 1 deletion backend/config/asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.base")

from channels.routing import ProtocolTypeRouter, URLRouter
from django.conf import settings
from django.contrib.staticfiles.handlers import ASGIStaticFilesHandler
from django.core.asgi import get_asgi_application

django_asgi_app = get_asgi_application()
http_application = (
ASGIStaticFilesHandler(django_asgi_app) if settings.DEBUG else django_asgi_app
)

from apps.chat.realtime import JwtAuthMiddleware
from apps.chat.routing import websocket_urlpatterns

application = ProtocolTypeRouter(
{
"http": django_asgi_app,
"http": http_application,
"websocket": JwtAuthMiddleware(URLRouter(websocket_urlpatterns)),
}
)
138 changes: 138 additions & 0 deletions frontend/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,16 @@ type AdminOrder = Order & {
type AdminOrdersResponse = Omit<OrdersResponse, "results"> & {
results: AdminOrder[];
};
type OrderSummary = {
total: number;
by_status: Record<string, number>;
};
type ConversationSummary = {
total: number;
by_status: Record<Conversation["status"], number>;
unassigned_open: number;
unread_customer_messages: number;
};
type Conversation = {
id: string;
customer_phone: string;
Expand Down Expand Up @@ -144,6 +154,7 @@ type Route =
| { name: "checkout" }
| { name: "payment-result" }
| { name: "profile" }
| { name: "admin-dashboard" }
| { name: "admin-orders" }
| { name: "chat" }
| { name: "admin-chat" }
Expand All @@ -166,6 +177,8 @@ function getRoute(): Route {
if (parts[0] === "payment-result" && parts.length === 1)
return { name: "payment-result" };
if (parts[0] === "profile" && parts.length === 1) return { name: "profile" };
if (parts[0] === "admin" && parts.length === 1)
return { name: "admin-dashboard" };
if (parts[0] === "admin" && parts[1] === "orders" && parts.length === 2)
return { name: "admin-orders" };
if (parts[0] === "chat" && parts.length === 1) return { name: "chat" };
Expand Down Expand Up @@ -1320,6 +1333,9 @@ function ProfilePage({
</button>
{user.role === "admin" && (
<div className="profile-admin-actions">
<AppLink className="admin-dashboard-link" href="/admin">
نمای کلی مدیریت
</AppLink>
<AppLink className="admin-dashboard-link" href="/admin/orders">
مدیریت سفارش‌ها
</AppLink>
Expand Down Expand Up @@ -1433,6 +1449,126 @@ function ProfilePage({
);
}

function AdminDashboardPage({ user }: { user: AuthUser | null }) {
const [orders, setOrders] = useState<OrderSummary | null>(null);
const [conversations, setConversations] =
useState<ConversationSummary | null>(null);
const [error, setError] = useState("");

useEffect(() => {
if (user?.role !== "admin") return;
setError("");
Promise.all([
fetchAuthenticated("/api/v1/orders/admin/summary/"),
fetchAuthenticated("/api/v1/chat/conversations/summary/"),
])
.then(async ([ordersResponse, conversationsResponse]) => {
if (!ordersResponse.ok) throw new Error(await getError(ordersResponse));
if (!conversationsResponse.ok)
throw new Error(await getError(conversationsResponse));
const [orderData, conversationData] = await Promise.all([
ordersResponse.json() as Promise<OrderSummary>,
conversationsResponse.json() as Promise<ConversationSummary>,
]);
setOrders(orderData);
setConversations(conversationData);
})
.catch((reason) =>
setError(
reason instanceof Error
? reason.message
: "دریافت نمای کلی مدیریت ناموفق بود.",
),
);
}, [user?.id, user?.role]);

if (user?.role !== "admin")
return (
<PageState
title="دسترسی ندارید"
text="این صفحه فقط برای حساب‌های مدیر در دسترس است."
/>
);

if (error) return <PageState title="نمای کلی در دسترس نیست" text={error} />;

return (
<main className="profile-page admin-dashboard-page">
<div className="page-heading">
<p className="eyebrow">مرکز عملیات</p>
<h1>نمای کلی مدیریت</h1>
<p>وضعیت سفارش‌ها و صف پشتیبانی را در یک نگاه پیگیری کن.</p>
</div>
{!orders || !conversations ? (
<p className="orders-state">در حال دریافت نمای کلی…</p>
) : (
<div className="admin-overview-grid">
<section className="admin-overview-card">
<div className="admin-overview-heading">
<div>
<p className="eyebrow">فروش</p>
<h2>سفارش‌ها</h2>
</div>
<strong>{orders.total}</strong>
</div>
<dl className="admin-overview-metrics">
<div>
<dt>در انتظار پرداخت</dt>
<dd>{orders.by_status.pending ?? 0}</dd>
</div>
<div>
<dt>آمادهٔ رسیدگی</dt>
<dd>{orders.by_status.paid ?? 0}</dd>
</div>
<div>
<dt>در حال ارسال</dt>
<dd>{orders.by_status.processing ?? 0}</dd>
</div>
<div>
<dt>ارسال‌شده</dt>
<dd>{orders.by_status.shipped ?? 0}</dd>
</div>
</dl>
<AppLink className="admin-dashboard-link" href="/admin/orders">
مدیریت سفارش‌ها
</AppLink>
</section>
<section className="admin-overview-card">
<div className="admin-overview-heading">
<div>
<p className="eyebrow">پشتیبانی</p>
<h2>گفت‌وگوها</h2>
</div>
<strong>{conversations.total}</strong>
</div>
<dl className="admin-overview-metrics">
<div>
<dt>گفت‌وگوی باز</dt>
<dd>{conversations.by_status.open ?? 0}</dd>
</div>
<div>
<dt>بدون مسئول</dt>
<dd>{conversations.unassigned_open}</dd>
</div>
<div>
<dt>پیام خوانده‌نشده</dt>
<dd>{conversations.unread_customer_messages}</dd>
</div>
<div>
<dt>حل‌شده</dt>
<dd>{conversations.by_status.resolved ?? 0}</dd>
</div>
</dl>
<AppLink className="admin-dashboard-link" href="/admin/chat">
گفت‌وگوهای پشتیبانی
</AppLink>
</section>
</div>
)}
</main>
);
}

function AdminOrdersPage({ user }: { user: AuthUser | null }) {
const [orders, setOrders] = useState<AdminOrder[]>([]);
const [ordersResponse, setOrdersResponse] =
Expand Down Expand Up @@ -2463,6 +2599,8 @@ function App() {
navigate("/");
}}
/>
) : route.name === "admin-dashboard" ? (
<AdminDashboardPage user={user} />
) : route.name === "admin-orders" ? (
<AdminOrdersPage user={user} />
) : route.name === "chat" ? (
Expand Down
Loading
Loading