@talkpilot/core-db 1.3.8 → 1.3.11

package/src/municipal/tickets/tickets.statistics.aggregation.ts

@@ -1,96 +1,110 @@
-import { CityName } from "../utils/types";
-import { STATS_MAX_TIME_MS, UNCLASSIFIED } from "./tickets.constants";
-import { getTicketsCollection } from "./tickets.getters";
-import type { TicketStatsDateRange } from "./tickets.types";
-
-const effectiveSubjectIdExpr = {
-  $ifNull: [
-    "$externalCallFields.event_subject_id",
-    {
-      $ifNull: [
-        "$externalCallFields.event_sub_subject_id",
-        "$externalCallFields.event_sub_subject_id2",
-      ],
-    },
-  ],
-};
-
-const departmentsSubjectsLookup = (cityName: CityName) => ({
-  $lookup: {
-    from: "departmentsSubjects",
-    let: { sid: "$effectiveSubjectId", c: cityName },
-    pipeline: [
-      {
-        $match: {
-          $expr: {
-            $and: [
-              { $eq: ["$cityName", "$$c"] },
-              {
-                $or: [
-                  { $eq: ["$subject_id", { $ifNull: ["$$sid", ""] }] },
-                  { $eq: ["$sub_subject_id", { $ifNull: ["$$sid", ""] }] },
-                  { $eq: ["$sub_subject_id2", { $ifNull: ["$$sid", ""] }] },
-                ],
-              },
-            ],
-          },
-        },
-      },
-      { $limit: 1 },
-    ],
-    as: "subj",
-  },
-});
-
-const subjectLabelExpr = {
-  $cond: {
-    if: { $gt: [{ $size: "$subj" }, 0] },
-    then: {
-      $ifNull: [{ $arrayElemAt: ["$subj.subjectName", 0] }, UNCLASSIFIED],
-    },
-    else: UNCLASSIFIED,
-  },
-};
-
-const ticketDateMatch = (dateRange: TicketStatsDateRange) => ({
-  createdAt: { $gte: dateRange.from, $lte: dateRange.to },
-});
-
-export const isDraftSubjectIdExpr = {
-  $or: [
-    { $eq: [{ $type: "$externalCallFields.event_subject_id" }, "missing"] },
-    { $eq: ["$externalCallFields.event_subject_id", null] },
-    {
-      $regexMatch: {
-        input: { $ifNull: ["$externalCallFields.event_subject_id", ""] },
-        regex: /^\s*$/,
-      },
-    },
-  ],
-};
-
-export const ticketsWithCallSidMatch = (
-  cityName: CityName,
-  dateRange: TicketStatsDateRange,
-) => ({
-  cityName,
-  callSid: { $exists: true, $nin: [null, ""] },
-  ...ticketDateMatch(dateRange),
-});
-
-export const subjectResolutionStages = (
-  cityName: CityName,
-): Record<string, unknown>[] => [
-  { $addFields: { effectiveSubjectId: effectiveSubjectIdExpr } },
-  departmentsSubjectsLookup(cityName),
-  { $addFields: { subject: subjectLabelExpr } },
-];
-
-export const runTicketStatsAggregate = async <T>(
-  pipeline: Record<string, unknown>[],
-): Promise<T[]> => {
-  const rows = await getTicketsCollection()
-    .aggregate(pipeline, { maxTimeMS: STATS_MAX_TIME_MS })
-    .toArray();
-  return rows as T[];
-};
+import { CityName } from "../utils/types";
+import { STATS_MAX_TIME_MS, UNCLASSIFIED } from "./tickets.constants";
+import { getTicketsCollection } from "./tickets.getters";
+import type { TicketStatsDateRange } from "./tickets.types";
+
+const effectiveSubjectIdExpr = {
+  $ifNull: [
+    "$externalCallFields.event_subject_id",
+    {
+      $ifNull: [
+        "$externalCallFields.event_sub_subject_id",
+        "$externalCallFields.event_sub_subject_id2",
+      ],
+    },
+  ],
+};
+
+const departmentsSubjectsLookup = (cityName: CityName) => ({
+  $lookup: {
+    from: "departmentsSubjects",
+    let: { sid: "$effectiveSubjectId", c: cityName },
+    pipeline: [
+      {
+        $match: {
+          $expr: {
+            $and: [
+              { $eq: ["$cityName", "$$c"] },
+              {
+                $or: [
+                  { $eq: ["$subject_id", { $ifNull: ["$$sid", ""] }] },
+                  { $eq: ["$sub_subject_id", { $ifNull: ["$$sid", ""] }] },
+                  { $eq: ["$sub_subject_id2", { $ifNull: ["$$sid", ""] }] },
+                ],
+              },
+            ],
+          },
+        },
+      },
+      { $limit: 1 },
+    ],
+    as: "subj",
+  },
+});
+
+const subjectLabelExpr = {
+  $cond: {
+    if: { $gt: [{ $size: "$subj" }, 0] },
+    then: {
+      $ifNull: [{ $arrayElemAt: ["$subj.subjectName", 0] }, UNCLASSIFIED],
+    },
+    else: UNCLASSIFIED,
+  },
+};
+
+const ticketDateMatch = (dateRange: TicketStatsDateRange) => ({
+  createdAt: { $gte: dateRange.from, $lte: dateRange.to },
+});
+
+/** Legacy draft detection for tickets created before isDraft existed. */
+export const isDraftSubjectIdExpr = {
+  $or: [
+    { $eq: [{ $type: "$externalCallFields.event_subject_id" }, "missing"] },
+    { $eq: ["$externalCallFields.event_subject_id", null] },
+    {
+      $regexMatch: {
+        input: { $ifNull: ["$externalCallFields.event_subject_id", ""] },
+        regex: /^\s*$/,
+      },
+    },
+  ],
+};
+
+/**
+ * Draft when isDraft is true, not draft when isDraft is false,
+ * otherwise fall back to legacy subject-id heuristic for older tickets.
+ */
+export const isDraftTicketExpr = {
+  $or: [
+    { $eq: ["$isDraft", true] },
+    {
+      $and: [{ $ne: ["$isDraft", false] }, isDraftSubjectIdExpr],
+    },
+  ],
+};
+
+export const ticketsWithCallSidMatch = (
+  cityName: CityName,
+  dateRange: TicketStatsDateRange,
+) => ({
+  cityName,
+  callSid: { $exists: true, $nin: [null, ""] },
+  ...ticketDateMatch(dateRange),
+});
+
+export const subjectResolutionStages = (
+  cityName: CityName,
+): Record<string, unknown>[] => [
+  { $addFields: { effectiveSubjectId: effectiveSubjectIdExpr } },
+  departmentsSubjectsLookup(cityName),
+  { $addFields: { subject: subjectLabelExpr } },
+];
+
+export const runTicketStatsAggregate = async <T>(
+  pipeline: Record<string, unknown>[],
+): Promise<T[]> => {
+  const rows = await getTicketsCollection()
+    .aggregate(pipeline, { maxTimeMS: STATS_MAX_TIME_MS })
+    .toArray();
+  return rows as T[];
+};

package/src/municipal/tickets/tickets.statistics.getters.ts

@@ -1,109 +1,109 @@
-import { CityName } from "../utils/types";
-import {
-  DAY_MS,
-  endOfCalendarDayInTz,
-  startOfCalendarDayInTz,
-} from "../../utils/date.utils";
-import { DEFAULT_LOOKBACK_DAYS } from "./tickets.constants";
-import {
-  isDraftSubjectIdExpr,
-  runTicketStatsAggregate,
-  subjectResolutionStages,
-  ticketsWithCallSidMatch,
-} from "./tickets.statistics.aggregation";
-import type {
-  TicketStatsDateRange,
-  TicketStatsDateScope,
-  TicketSubjectRow,
-} from "./tickets.types";
-
-export const resolveTicketStatsDateRange = (
-  dateScope?: TicketStatsDateScope,
-): TicketStatsDateRange => {
-  const to = dateScope?.to ?? new Date();
-  const from =
-    dateScope?.from ?? new Date(to.getTime() - DEFAULT_LOOKBACK_DAYS * DAY_MS);
-  return { from, to };
-};
-
-export const ticketStatsDateScopeFromYmd = (
-  startStr: string,
-  endStr: string,
-  timezone: string,
-): TicketStatsDateScope => ({
-  from: startOfCalendarDayInTz(startStr, timezone),
-  to: endOfCalendarDayInTz(endStr, timezone),
-});
-
-/** @deprecated Use findCallSidTicketCountsByCity instead. */
-export const findCallSidsWithTicketsByCity = async (
-  cityName: CityName,
-  dateScope?: TicketStatsDateScope,
-): Promise<string[]> => {
-  const rows = await runTicketStatsAggregate<{ _id: unknown }>([
-    { $match: ticketsWithCallSidMatch(cityName, resolveTicketStatsDateRange(dateScope)) },
-    { $group: { _id: "$callSid" } },
-  ]);
-  return rows
-    .filter((r) => r._id != null && r._id !== "")
-    .map((r) => String(r._id));
-};
-
-export const findCallSidTicketCountsByCity = async (
-  cityName: CityName,
-  dateScope?: TicketStatsDateScope,
-): Promise<Map<string, number>> => {
-  const rows = await runTicketStatsAggregate<{ _id: unknown; ticketCount: number }>([
-    { $match: ticketsWithCallSidMatch(cityName, resolveTicketStatsDateRange(dateScope)) },
-    { $group: { _id: "$callSid", ticketCount: { $sum: 1 } } },
-  ]);
-  return new Map(
-    rows
-      .filter((r) => r._id != null && r._id !== "")
-      .map((r) => [String(r._id), r.ticketCount])
-  );
-};
-
-
-/** @deprecated Use findCallSidDraftTicketCountsByCity instead. */
-export const findCallSidsWithDraftTicketsByCity = async (
-  cityName: CityName,
-  dateScope?: TicketStatsDateScope,
-): Promise<string[]> => {
-  const rows = await runTicketStatsAggregate<{ _id: unknown }>([
-    { $match: ticketsWithCallSidMatch(cityName, resolveTicketStatsDateRange(dateScope)) },
-    { $match: { $expr: isDraftSubjectIdExpr } },
-    { $group: { _id: "$callSid" } },
-  ]);
-  return rows
-    .filter((r) => r._id != null && r._id !== "")
-    .map((r) => String(r._id));
-};
-
-export const findCallSidDraftTicketCountsByCity = async (
-  cityName: CityName,
-  dateScope?: TicketStatsDateScope,
-): Promise<Map<string, number>> => {
-  const rows = await runTicketStatsAggregate<{ _id: unknown; ticketCount: number }>([
-    { $match: ticketsWithCallSidMatch(cityName, resolveTicketStatsDateRange(dateScope)) },
-    { $match: { $expr: isDraftSubjectIdExpr } },
-    { $group: { _id: "$callSid", ticketCount: { $sum: 1 } } },
-  ]);
-  return new Map(
-    rows
-      .filter((r) => r._id != null && r._id !== "")
-      .map((r) => [String(r._id), r.ticketCount])
-  );
-};
-
-export const findTicketSubjectRows = async (
-  cityName: CityName,
-  dateScope?: TicketStatsDateScope,
-): Promise<TicketSubjectRow[]> => {
-  const rows = await runTicketStatsAggregate<{ callSid: unknown; subject: unknown }>([
-    { $match: ticketsWithCallSidMatch(cityName, resolveTicketStatsDateRange(dateScope)) },
-    ...subjectResolutionStages(cityName),
-    { $project: { _id: 0, callSid: 1, subject: 1 } },
-  ]);
-  return rows.map((r) => ({ callSid: String(r.callSid), subject: String(r.subject) }));
-};
+import { CityName } from "../utils/types";
+import {
+  DAY_MS,
+  endOfCalendarDayInTz,
+  startOfCalendarDayInTz,
+} from "../../utils/date.utils";
+import { DEFAULT_LOOKBACK_DAYS } from "./tickets.constants";
+import {
+  isDraftTicketExpr,
+  runTicketStatsAggregate,
+  subjectResolutionStages,
+  ticketsWithCallSidMatch,
+} from "./tickets.statistics.aggregation";
+import type {
+  TicketStatsDateRange,
+  TicketStatsDateScope,
+  TicketSubjectRow,
+} from "./tickets.types";
+
+export const resolveTicketStatsDateRange = (
+  dateScope?: TicketStatsDateScope,
+): TicketStatsDateRange => {
+  const to = dateScope?.to ?? new Date();
+  const from =
+    dateScope?.from ?? new Date(to.getTime() - DEFAULT_LOOKBACK_DAYS * DAY_MS);
+  return { from, to };
+};
+
+export const ticketStatsDateScopeFromYmd = (
+  startStr: string,
+  endStr: string,
+  timezone: string,
+): TicketStatsDateScope => ({
+  from: startOfCalendarDayInTz(startStr, timezone),
+  to: endOfCalendarDayInTz(endStr, timezone),
+});
+
+/** @deprecated Use findCallSidTicketCountsByCity instead. */
+export const findCallSidsWithTicketsByCity = async (
+  cityName: CityName,
+  dateScope?: TicketStatsDateScope,
+): Promise<string[]> => {
+  const rows = await runTicketStatsAggregate<{ _id: unknown }>([
+    { $match: ticketsWithCallSidMatch(cityName, resolveTicketStatsDateRange(dateScope)) },
+    { $group: { _id: "$callSid" } },
+  ]);
+  return rows
+    .filter((r) => r._id != null && r._id !== "")
+    .map((r) => String(r._id));
+};
+
+export const findCallSidTicketCountsByCity = async (
+  cityName: CityName,
+  dateScope?: TicketStatsDateScope,
+): Promise<Map<string, number>> => {
+  const rows = await runTicketStatsAggregate<{ _id: unknown; ticketCount: number }>([
+    { $match: ticketsWithCallSidMatch(cityName, resolveTicketStatsDateRange(dateScope)) },
+    { $group: { _id: "$callSid", ticketCount: { $sum: 1 } } },
+  ]);
+  return new Map(
+    rows
+      .filter((r) => r._id != null && r._id !== "")
+      .map((r) => [String(r._id), r.ticketCount])
+  );
+};
+
+
+/** @deprecated Use findCallSidDraftTicketCountsByCity instead. */
+export const findCallSidsWithDraftTicketsByCity = async (
+  cityName: CityName,
+  dateScope?: TicketStatsDateScope,
+): Promise<string[]> => {
+  const rows = await runTicketStatsAggregate<{ _id: unknown }>([
+    { $match: ticketsWithCallSidMatch(cityName, resolveTicketStatsDateRange(dateScope)) },
+    { $match: { $expr: isDraftTicketExpr } },
+    { $group: { _id: "$callSid" } },
+  ]);
+  return rows
+    .filter((r) => r._id != null && r._id !== "")
+    .map((r) => String(r._id));
+};
+
+export const findCallSidDraftTicketCountsByCity = async (
+  cityName: CityName,
+  dateScope?: TicketStatsDateScope,
+): Promise<Map<string, number>> => {
+  const rows = await runTicketStatsAggregate<{ _id: unknown; ticketCount: number }>([
+    { $match: ticketsWithCallSidMatch(cityName, resolveTicketStatsDateRange(dateScope)) },
+    { $match: { $expr: isDraftTicketExpr } },
+    { $group: { _id: "$callSid", ticketCount: { $sum: 1 } } },
+  ]);
+  return new Map(
+    rows
+      .filter((r) => r._id != null && r._id !== "")
+      .map((r) => [String(r._id), r.ticketCount])
+  );
+};
+
+export const findTicketSubjectRows = async (
+  cityName: CityName,
+  dateScope?: TicketStatsDateScope,
+): Promise<TicketSubjectRow[]> => {
+  const rows = await runTicketStatsAggregate<{ callSid: unknown; subject: unknown }>([
+    { $match: ticketsWithCallSidMatch(cityName, resolveTicketStatsDateRange(dateScope)) },
+    ...subjectResolutionStages(cityName),
+    { $project: { _id: 0, callSid: 1, subject: 1 } },
+  ]);
+  return rows.map((r) => ({ callSid: String(r.callSid), subject: String(r.subject) }));
+};

package/src/municipal/tickets/tickets.types.ts

@@ -1,53 +1,54 @@
-import { ObjectId, WithId } from "mongodb";
-
-import { CityName } from "../utils/types";
-
-export type Ticket = {
-  _id: ObjectId;
-  createdAt: Date;
-  updatedAt: Date;
-  callSid?: string;
-  cityName: CityName;
-  externalCallFields: {
-    first_name?: string;
-    last_name?: string;
-    event_description?: string;
-    street?: string;
-    house_number?: string;
-    event_subject_id?: string;
-    event_sub_subject_id?: string;
-    event_sub_subject_id2?: string | null;
-    call_number?: string;
-    status?: number;
-    error?: string;
-    image1?: string;
-    image2?: string;
-    image3?: string;
-    file1?: string;
-    file2?: string;
-    file3?: string;
-  };
-  guestJwt?: string;
-};
-
-export type TicketDoc = WithId<Ticket>;
-
-export type SubjectItem = {
-  subject: string;
-  count: number;
-};
-
-export type TicketSubjectRow = {
-  callSid: string;
-  subject: string;
-};
-
-export type TicketStatsDateScope = {
-  from?: Date;
-  to?: Date;
-};
-
-export type TicketStatsDateRange = {
-  from: Date;
-  to: Date;
-};
+import { ObjectId, WithId } from "mongodb";
+
+import { CityName } from "../utils/types";
+
+export type Ticket = {
+  _id: ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+  callSid?: string;
+  isDraft?: boolean;
+  cityName: CityName;
+  externalCallFields: {
+    first_name?: string;
+    last_name?: string;
+    event_description?: string;
+    street?: string;
+    house_number?: string;
+    event_subject_id?: string;
+    event_sub_subject_id?: string;
+    event_sub_subject_id2?: string | null;
+    call_number?: string;
+    status?: number;
+    error?: string;
+    image1?: string;
+    image2?: string;
+    image3?: string;
+    file1?: string;
+    file2?: string;
+    file3?: string;
+  };
+  guestJwt?: string;
+};
+
+export type TicketDoc = WithId<Ticket>;
+
+export type SubjectItem = {
+  subject: string;
+  count: number;
+};
+
+export type TicketSubjectRow = {
+  callSid: string;
+  subject: string;
+};
+
+export type TicketStatsDateScope = {
+  from?: Date;
+  to?: Date;
+};
+
+export type TicketStatsDateRange = {
+  from: Date;
+  to: Date;
+};