Phase 4 Stage 10 backend: Chat-tab feeds (pending payments + cursor history)
Backend half of Stage 10 — the new Chat tab in the customer app that replaces /chat/history with a 3-sub-tab list (Aktif / Pembayaran / Selesai). - New GET /api/client/payment-sessions/pending — returns the customer's pending initial + extension payment sessions. Filter is status='pending' AND expires_at > NOW(). Mitra info comes from session_extensions → chat_sessions for extension rows, payment_sessions.targeted_mitra_id for targeted-curhat-lagi initial rows. TTL reuses the existing payment_session_timeout_minutes app_config row (default 20m) — no new config row needed since payment is still mocked. - getCustomerHistory migrated from offset (page/limit) to cursor pagination. Cursor is base64url(`<endedAtIso>|<id>`) with id-tiebreak in ORDER BY so rows with identical timestamps don't duplicate or skip across pages. SELECT now JOINs payment_sessions to surface `mode` (chat/call) for the Selesai-row voice-call pill. - requirement/flow_customer.mermaid.md: new §7 Chat Tab subgraph + Figma cross-ref entry for SChatList. - requirement/phase4-customer-flow-plan.md: Stage 10 plan section. Also carries forward earlier uncommitted "Post-Stage-8 corrections" notes from the Stage 9 sweep (boot path / SHome1st / onboarding fixes). Tests: +7 for getCustomerPendingPayments (initial null mitra, targeted-mitra fill, extension-via-session JOIN, mixed-newest-first, expired excluded, non-pending excluded, customer scoping). +10 for cursor history (empty, exact-fit, multi-page walk, same-timestamp tiebreak, limit clamp, customer scoping, CLOSING+COMPLETED only). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -204,31 +204,87 @@ export const getActiveSessionsByMitraWithUnread = async (mitraId) => {
|
||||
return sessions
|
||||
}
|
||||
|
||||
export const getCustomerHistory = async (customerId, { page = 1, limit = 20 } = {}) => {
|
||||
const offset = (page - 1) * limit
|
||||
const items = await sql`
|
||||
SELECT cs.id, cs.mitra_id, cs.status, cs.topic_sensitivity, cs.topics, cs.created_at, cs.paired_at, cs.ended_at,
|
||||
cs.duration_minutes, cs.price, cs.is_first_session_discount, cs.extended_minutes,
|
||||
m.display_name AS mitra_display_name,
|
||||
COALESCE(mos.is_online, false) AS mitra_is_online,
|
||||
(SELECT message FROM session_closures WHERE session_id = cs.id AND user_type = ${UserType.MITRA} LIMIT 1) AS mitra_closure_message,
|
||||
(SELECT message FROM session_closures WHERE session_id = cs.id AND user_type = ${UserType.CUSTOMER} LIMIT 1) AS customer_closure_message,
|
||||
(SELECT COUNT(*) FROM chat_sessions x
|
||||
WHERE x.customer_id = ${customerId} AND x.mitra_id = cs.mitra_id
|
||||
AND x.status IN (${SessionStatus.COMPLETED}, ${SessionStatus.CLOSING})) AS sessions_count
|
||||
FROM chat_sessions cs
|
||||
LEFT JOIN mitras m ON m.id = cs.mitra_id
|
||||
LEFT JOIN mitra_online_status mos ON mos.mitra_id = cs.mitra_id
|
||||
WHERE cs.customer_id = ${customerId}
|
||||
AND cs.status IN (${SessionStatus.COMPLETED}, ${SessionStatus.CLOSING})
|
||||
ORDER BY COALESCE(cs.ended_at, cs.created_at) DESC
|
||||
LIMIT ${limit} OFFSET ${offset}
|
||||
`
|
||||
const [{ count }] = await sql`
|
||||
SELECT COUNT(*) FROM chat_sessions WHERE customer_id = ${customerId}
|
||||
AND status IN (${SessionStatus.COMPLETED}, ${SessionStatus.CLOSING})
|
||||
`
|
||||
return { items, total: Number(count), page, limit }
|
||||
/**
|
||||
* Phase 4 Stage 10 — Selesai sub-tab uses cursor pagination on this endpoint.
|
||||
*
|
||||
* Cursor is a base64-encoded `<isoTimestamp>|<id>` of the last row's
|
||||
* `COALESCE(ended_at, created_at)` and `id`. The next page reads strictly
|
||||
* older rows, breaking ties on `id` so adjacent rows with the same timestamp
|
||||
* don't duplicate or skip across pages.
|
||||
*/
|
||||
const encodeHistoryCursor = (row) => {
|
||||
const ts = (row.ended_at ?? row.created_at).toISOString
|
||||
? (row.ended_at ?? row.created_at).toISOString()
|
||||
: new Date(row.ended_at ?? row.created_at).toISOString()
|
||||
return Buffer.from(`${ts}|${row.id}`, 'utf8').toString('base64url')
|
||||
}
|
||||
|
||||
const decodeHistoryCursor = (cursor) => {
|
||||
if (!cursor) return null
|
||||
try {
|
||||
const decoded = Buffer.from(cursor, 'base64url').toString('utf8')
|
||||
const [ts, id] = decoded.split('|')
|
||||
if (!ts || !id) return null
|
||||
return { ts, id }
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
export const getCustomerHistory = async (customerId, { cursor = null, limit = 20 } = {}) => {
|
||||
const cap = Math.min(Math.max(parseInt(limit, 10) || 20, 1), 50)
|
||||
const decoded = decodeHistoryCursor(cursor)
|
||||
// Fetch one extra to determine has_more without a second query
|
||||
const fetch = cap + 1
|
||||
const items = decoded
|
||||
? await sql`
|
||||
SELECT cs.id, cs.mitra_id, cs.status, cs.topic_sensitivity, cs.topics, cs.created_at, cs.paired_at, cs.ended_at,
|
||||
cs.duration_minutes, cs.price, cs.is_first_session_discount, cs.extended_minutes,
|
||||
ps.mode AS mode,
|
||||
m.display_name AS mitra_display_name,
|
||||
COALESCE(mos.is_online, false) AS mitra_is_online,
|
||||
(SELECT message FROM session_closures WHERE session_id = cs.id AND user_type = ${UserType.MITRA} LIMIT 1) AS mitra_closure_message,
|
||||
(SELECT message FROM session_closures WHERE session_id = cs.id AND user_type = ${UserType.CUSTOMER} LIMIT 1) AS customer_closure_message,
|
||||
(SELECT COUNT(*)::int FROM chat_sessions x
|
||||
WHERE x.customer_id = ${customerId} AND x.mitra_id = cs.mitra_id
|
||||
AND x.status IN (${SessionStatus.COMPLETED}, ${SessionStatus.CLOSING})) AS sessions_count
|
||||
FROM chat_sessions cs
|
||||
LEFT JOIN mitras m ON m.id = cs.mitra_id
|
||||
LEFT JOIN mitra_online_status mos ON mos.mitra_id = cs.mitra_id
|
||||
LEFT JOIN payment_sessions ps ON ps.id = cs.payment_session_id
|
||||
WHERE cs.customer_id = ${customerId}
|
||||
AND cs.status IN (${SessionStatus.COMPLETED}, ${SessionStatus.CLOSING})
|
||||
AND (
|
||||
COALESCE(cs.ended_at, cs.created_at) < ${decoded.ts}::timestamptz
|
||||
OR (COALESCE(cs.ended_at, cs.created_at) = ${decoded.ts}::timestamptz AND cs.id < ${decoded.id})
|
||||
)
|
||||
ORDER BY COALESCE(cs.ended_at, cs.created_at) DESC, cs.id DESC
|
||||
LIMIT ${fetch}
|
||||
`
|
||||
: await sql`
|
||||
SELECT cs.id, cs.mitra_id, cs.status, cs.topic_sensitivity, cs.topics, cs.created_at, cs.paired_at, cs.ended_at,
|
||||
cs.duration_minutes, cs.price, cs.is_first_session_discount, cs.extended_minutes,
|
||||
ps.mode AS mode,
|
||||
m.display_name AS mitra_display_name,
|
||||
COALESCE(mos.is_online, false) AS mitra_is_online,
|
||||
(SELECT message FROM session_closures WHERE session_id = cs.id AND user_type = ${UserType.MITRA} LIMIT 1) AS mitra_closure_message,
|
||||
(SELECT message FROM session_closures WHERE session_id = cs.id AND user_type = ${UserType.CUSTOMER} LIMIT 1) AS customer_closure_message,
|
||||
(SELECT COUNT(*)::int FROM chat_sessions x
|
||||
WHERE x.customer_id = ${customerId} AND x.mitra_id = cs.mitra_id
|
||||
AND x.status IN (${SessionStatus.COMPLETED}, ${SessionStatus.CLOSING})) AS sessions_count
|
||||
FROM chat_sessions cs
|
||||
LEFT JOIN mitras m ON m.id = cs.mitra_id
|
||||
LEFT JOIN mitra_online_status mos ON mos.mitra_id = cs.mitra_id
|
||||
LEFT JOIN payment_sessions ps ON ps.id = cs.payment_session_id
|
||||
WHERE cs.customer_id = ${customerId}
|
||||
AND cs.status IN (${SessionStatus.COMPLETED}, ${SessionStatus.CLOSING})
|
||||
ORDER BY COALESCE(cs.ended_at, cs.created_at) DESC, cs.id DESC
|
||||
LIMIT ${fetch}
|
||||
`
|
||||
const hasMore = items.length > cap
|
||||
const page = hasMore ? items.slice(0, cap) : items
|
||||
const nextCursor = hasMore ? encodeHistoryCursor(page[page.length - 1]) : null
|
||||
return { items: page, next_cursor: nextCursor, has_more: hasMore }
|
||||
}
|
||||
|
||||
export const getMitraHistory = async (mitraId, { page = 1, limit = 20 } = {}) => {
|
||||
|
||||
Reference in New Issue
Block a user