@talkpilot/core-db 1.2.0 → 1.2.1

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

@@ -1,261 +1,261 @@
-import { CityName, getDb, ObjectId, Ticket } from "../index";
-import type { SubjectStatsItem } from "./tickets.types";
-import { Collection, Filter, ObjectId as MongoObjectId } from "mongodb";
-
-/**
- * Generate a new ticket ID as a string
- * @returns A new ObjectId as a string
- */
-export const generateTicketId = (): string => {
-  return new ObjectId().toString();
-};
-
-export const getTicketsCollection = (): Collection<Ticket> => {
-  return getDb().collection<Ticket>("tickets");
-};
-
-export const findTickets = async (
-  filter: Filter<Ticket> = {},
-): Promise<Ticket[]> => {
-  return await getTicketsCollection().find(filter).toArray();
-};
-
-export const findTicketsByCallSid = async (
-  callSid: string,
-): Promise<Ticket[]> => {
-  return await getTicketsCollection().find({ callSid }).toArray();
-};
-
-export const getTicketById = async (
-  ticketId: string,
-): Promise<Ticket | null> => {
-  const ticket = await getTicketsCollection().findOne({
-    _id: new ObjectId(ticketId),
-  });
-  return ticket ? ticket : null;
-};
-
-export const createTicket = async (
-  ticketData: Omit<Ticket, "_id" | "createdAt" | "updatedAt">,
-  ticketId?: string,
-): Promise<MongoObjectId> => {
-  const ticket: Ticket = {
-    _id: ticketId ? new ObjectId(ticketId) : new ObjectId(),
-    ...ticketData,
-    createdAt: new Date(),
-    updatedAt: new Date(),
-  };
-  const { insertedId } = await getTicketsCollection().insertOne(ticket);
-  return insertedId;
-};
-
-export const updateTicket = async (
-  ticketId: string,
-  data: Partial<Omit<Ticket, "_id" | "createdAt" | "updatedAt">>,
-): Promise<Ticket | null> => {
-  const result = await getTicketsCollection().findOneAndUpdate(
-    { _id: new ObjectId(ticketId) },
-    { $set: { ...data, updatedAt: new Date() } },
-    { returnDocument: "after" },
-  );
-  return result || null;
-};
-
-export const deleteTicket = async (ticketId: string): Promise<boolean> => {
-  const result = await getTicketsCollection().deleteOne({
-    _id: new ObjectId(ticketId),
-  });
-  return result.deletedCount > 0;
-};
-
-/**
- * Count tickets by city and date range (createdAt converted to given timezone).
- * Used as "open" tickets count when status is not available.
- */
-export async function getTicketsCountByCityAndDateRange(
-  cityName: string,
-  startStr: string,
-  endStr: string,
-  timezone: string,
-): Promise<number> {
-  const doc = await getTicketsCollection()
-    .aggregate<{ n: number }>([
-      { $match: { cityName, callSid: { $exists: true, $nin: [null, ""] } } },
-      {
-        $addFields: {
-          dateLocal: {
-            $dateToString: { format: "%Y-%m-%d", date: "$createdAt", timezone },
-          },
-        },
-      },
-      { $match: { dateLocal: { $gte: startStr, $lte: endStr } } },
-      { $count: "n" },
-    ])
-    .next();
-  return doc?.n ?? 0;
-}
-
-/**
- * Count of tickets by department (subject) from departmentsSubjects. Different departments (subject_id) are grouped, and sub-subjects are unified under their department.
- * Date filter: createdAt in [startStr, endStr] (in the given timezone). Fallback to "Unclassified" when no match is found in the lookup.
- */
-export async function getTicketsSubjectStats(
-  cityName: string,
-  startStr: string,
-  endStr: string,
-  timezone: string,
-): Promise<SubjectStatsItem[]> {
-  const coll = getTicketsCollection();
-  const rows = await coll
-    .aggregate<{ _id: string; subject: string; count: number }>([
-      { $match: { cityName } },
-      {
-        $addFields: {
-          dateLocal: {
-            $dateToString: { format: "%Y-%m-%d", date: "$createdAt", timezone },
-          },
-        },
-      },
-      { $match: { dateLocal: { $gte: startStr, $lte: endStr } } },
-      {
-        $addFields: {
-          effectiveSubjectId: {
-            $ifNull: [
-              "$externalCallFields.event_subject_id",
-              {
-                $ifNull: [
-                  "$externalCallFields.event_sub_subject_id",
-                  "$externalCallFields.event_sub_subject_id2",
-                ],
-              },
-            ],
-          },
-        },
-      },
-      {
-        $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",
-        },
-      },
-      {
-        $addFields: {
-          subject_id: {
-            $cond: {
-              if: { $gt: [{ $size: "$subj" }, 0] },
-              then: {
-                $ifNull: [{ $arrayElemAt: ["$subj.subject_id", 0] }, ""],
-              },
-              else: "",
-            },
-          },
-          subject: {
-            $cond: {
-              if: { $gt: [{ $size: "$subj" }, 0] },
-              then: {
-                $ifNull: [
-                  { $arrayElemAt: ["$subj.subjectName", 0] },
-                  "Unclassified",
-                ],
-              },
-              else: "Unclassified",
-            },
-          },
-        },
-      },
-      {
-        $group: {
-          _id: "$subject_id",
-          subject: { $first: "$subject" },
-          count: { $sum: 1 },
-        },
-      },
-      { $sort: { count: -1 } },
-    ])
-    .toArray();
-
-  const total = rows.reduce((s: number, r: any) => s + r.count, 0);
-  return rows.map((r: any) => ({
-    subject_name: r.subject,
-    subject_id: r._id,
-    count: r.count,
-    percentage: total > 0 ? Math.round((r.count / total) * 100) : 0,
-  }));
-}
-
-export const findTicketByQuery = async (query: Partial<Ticket>) => {
-  return await getTicketsCollection().findOne(query);
-};
-/**
- * Update ticket files by external call number
- */
-export const updateTicketFilesByCallNumber = async (params: {
-  cityName: CityName;
-  callNumber: string;
-  image1?: string;
-  image2?: string;
-  image3?: string;
-}): Promise<boolean> => {
-  const { cityName, callNumber, image1, image2, image3 } = params;
-
-  const update: any = {};
-  if (image1) update["externalCallFields.image1"] = image1;
-  if (image2) update["externalCallFields.image2"] = image2;
-  if (image3) update["externalCallFields.image3"] = image3;
-
-  const result = await getTicketsCollection().updateOne(
-    {
-      cityName: cityName,
-      "externalCallFields.call_number": callNumber,
-    },
-    {
-      $set: {
-        ...update,
-        updatedAt: new Date(),
-      },
-    },
-  );
-
-  return result.matchedCount > 0;
-};
-
-/**
- * Remove guestJwt from ticket by external call number
- */
-export const clearGuestJwtByCallNumber = async (params: {
-  cityName: CityName;
-  callNumber: string;
-}): Promise<boolean> => {
-  const { cityName, callNumber } = params;
-
-  const result = await getTicketsCollection().updateOne(
-    { cityName, "externalCallFields.call_number": callNumber },
-    { $unset: { guestJwt: "" }, $set: { updatedAt: new Date() } },
-  );
-
-  return result.matchedCount > 0;
-};
+import { CityName, getDb, ObjectId, Ticket } from "../index";
+import type { SubjectStatsItem } from "./tickets.types";
+import { Collection, Filter, ObjectId as MongoObjectId } from "mongodb";
+
+/**
+ * Generate a new ticket ID as a string
+ * @returns A new ObjectId as a string
+ */
+export const generateTicketId = (): string => {
+  return new ObjectId().toString();
+};
+
+export const getTicketsCollection = (): Collection<Ticket> => {
+  return getDb().collection<Ticket>("tickets");
+};
+
+export const findTickets = async (
+  filter: Filter<Ticket> = {},
+): Promise<Ticket[]> => {
+  return await getTicketsCollection().find(filter).toArray();
+};
+
+export const findTicketsByCallSid = async (
+  callSid: string,
+): Promise<Ticket[]> => {
+  return await getTicketsCollection().find({ callSid }).toArray();
+};
+
+export const getTicketById = async (
+  ticketId: string,
+): Promise<Ticket | null> => {
+  const ticket = await getTicketsCollection().findOne({
+    _id: new ObjectId(ticketId),
+  });
+  return ticket ? ticket : null;
+};
+
+export const createTicket = async (
+  ticketData: Omit<Ticket, "_id" | "createdAt" | "updatedAt">,
+  ticketId?: string,
+): Promise<MongoObjectId> => {
+  const ticket: Ticket = {
+    _id: ticketId ? new ObjectId(ticketId) : new ObjectId(),
+    ...ticketData,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+  };
+  const { insertedId } = await getTicketsCollection().insertOne(ticket);
+  return insertedId;
+};
+
+export const updateTicket = async (
+  ticketId: string,
+  data: Partial<Omit<Ticket, "_id" | "createdAt" | "updatedAt">>,
+): Promise<Ticket | null> => {
+  const result = await getTicketsCollection().findOneAndUpdate(
+    { _id: new ObjectId(ticketId) },
+    { $set: { ...data, updatedAt: new Date() } },
+    { returnDocument: "after" },
+  );
+  return result || null;
+};
+
+export const deleteTicket = async (ticketId: string): Promise<boolean> => {
+  const result = await getTicketsCollection().deleteOne({
+    _id: new ObjectId(ticketId),
+  });
+  return result.deletedCount > 0;
+};
+
+/**
+ * Count tickets by city and date range (createdAt converted to given timezone).
+ * Used as "open" tickets count when status is not available.
+ */
+export async function getTicketsCountByCityAndDateRange(
+  cityName: string,
+  startStr: string,
+  endStr: string,
+  timezone: string,
+): Promise<number> {
+  const doc = await getTicketsCollection()
+    .aggregate<{ n: number }>([
+      { $match: { cityName, callSid: { $exists: true, $nin: [null, ""] } } },
+      {
+        $addFields: {
+          dateLocal: {
+            $dateToString: { format: "%Y-%m-%d", date: "$createdAt", timezone },
+          },
+        },
+      },
+      { $match: { dateLocal: { $gte: startStr, $lte: endStr } } },
+      { $count: "n" },
+    ])
+    .next();
+  return doc?.n ?? 0;
+}
+
+/**
+ * Count of tickets by department (subject) from departmentsSubjects. Different departments (subject_id) are grouped, and sub-subjects are unified under their department.
+ * Date filter: createdAt in [startStr, endStr] (in the given timezone). Fallback to "Unclassified" when no match is found in the lookup.
+ */
+export async function getTicketsSubjectStats(
+  cityName: string,
+  startStr: string,
+  endStr: string,
+  timezone: string,
+): Promise<SubjectStatsItem[]> {
+  const coll = getTicketsCollection();
+  const rows = await coll
+    .aggregate<{ _id: string; subject: string; count: number }>([
+      { $match: { cityName } },
+      {
+        $addFields: {
+          dateLocal: {
+            $dateToString: { format: "%Y-%m-%d", date: "$createdAt", timezone },
+          },
+        },
+      },
+      { $match: { dateLocal: { $gte: startStr, $lte: endStr } } },
+      {
+        $addFields: {
+          effectiveSubjectId: {
+            $ifNull: [
+              "$externalCallFields.event_subject_id",
+              {
+                $ifNull: [
+                  "$externalCallFields.event_sub_subject_id",
+                  "$externalCallFields.event_sub_subject_id2",
+                ],
+              },
+            ],
+          },
+        },
+      },
+      {
+        $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",
+        },
+      },
+      {
+        $addFields: {
+          subject_id: {
+            $cond: {
+              if: { $gt: [{ $size: "$subj" }, 0] },
+              then: {
+                $ifNull: [{ $arrayElemAt: ["$subj.subject_id", 0] }, ""],
+              },
+              else: "",
+            },
+          },
+          subject: {
+            $cond: {
+              if: { $gt: [{ $size: "$subj" }, 0] },
+              then: {
+                $ifNull: [
+                  { $arrayElemAt: ["$subj.subjectName", 0] },
+                  "Unclassified",
+                ],
+              },
+              else: "Unclassified",
+            },
+          },
+        },
+      },
+      {
+        $group: {
+          _id: "$subject_id",
+          subject: { $first: "$subject" },
+          count: { $sum: 1 },
+        },
+      },
+      { $sort: { count: -1 } },
+    ])
+    .toArray();
+
+  const total = rows.reduce((s: number, r: any) => s + r.count, 0);
+  return rows.map((r: any) => ({
+    subject_name: r.subject,
+    subject_id: r._id,
+    count: r.count,
+    percentage: total > 0 ? Math.round((r.count / total) * 100) : 0,
+  }));
+}
+
+export const findTicketByQuery = async (query: Partial<Ticket>) => {
+  return await getTicketsCollection().findOne(query);
+};
+/**
+ * Update ticket files by external call number
+ */
+export const updateTicketFilesByCallNumber = async (params: {
+  cityName: CityName;
+  callNumber: string;
+  image1?: string;
+  image2?: string;
+  image3?: string;
+}): Promise<boolean> => {
+  const { cityName, callNumber, image1, image2, image3 } = params;
+
+  const update: any = {};
+  if (image1) update["externalCallFields.image1"] = image1;
+  if (image2) update["externalCallFields.image2"] = image2;
+  if (image3) update["externalCallFields.image3"] = image3;
+
+  const result = await getTicketsCollection().updateOne(
+    {
+      cityName: cityName,
+      "externalCallFields.call_number": callNumber,
+    },
+    {
+      $set: {
+        ...update,
+        updatedAt: new Date(),
+      },
+    },
+  );
+
+  return result.matchedCount > 0;
+};
+
+/**
+ * Remove guestJwt from ticket by external call number
+ */
+export const clearGuestJwtByCallNumber = async (params: {
+  cityName: CityName;
+  callNumber: string;
+}): Promise<boolean> => {
+  const { cityName, callNumber } = params;
+
+  const result = await getTicketsCollection().updateOne(
+    { cityName, "externalCallFields.call_number": callNumber },
+    { $unset: { guestJwt: "" }, $set: { updatedAt: new Date() } },
+  );
+
+  return result.matchedCount > 0;
+};

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

@@ -1,43 +1,43 @@
-import { ObjectId, WithId } from "mongodb";
-
-import { CityName } from "../utils/types";
-
-export type Ticket = {
-  _id: ObjectId;
-  createdAt: Date;
-  updatedAt: Date;
-  callSid?: string;
-  cityName: CityName;
-  externalCallFields: {
-    // Request fields
-    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;
-    // Response fields (only if external call was successful)
-    call_number?: string;
-    status?: number; // Response status from Bina API (1 = success)
-    error?: string; // Error message from Bina API if any
-    image1?: string;
-    image2?: string;
-    image3?: string;
-    file1?: string;
-    file2?: string;
-    file3?: string;
-  };
-  guestJwt?: string;
-};
-
-export type TicketDoc = WithId<Ticket>;
-
-/** Call count by department (subject). */
-export type SubjectStatsItem = {
-  subject_name: string;
-  subject_id: string;
-  count: number;
-  percentage: number;
-};
+import { ObjectId, WithId } from "mongodb";
+
+import { CityName } from "../utils/types";
+
+export type Ticket = {
+  _id: ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+  callSid?: string;
+  cityName: CityName;
+  externalCallFields: {
+    // Request fields
+    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;
+    // Response fields (only if external call was successful)
+    call_number?: string;
+    status?: number; // Response status from Bina API (1 = success)
+    error?: string; // Error message from Bina API if any
+    image1?: string;
+    image2?: string;
+    image3?: string;
+    file1?: string;
+    file2?: string;
+    file3?: string;
+  };
+  guestJwt?: string;
+};
+
+export type TicketDoc = WithId<Ticket>;
+
+/** Call count by department (subject). */
+export type SubjectStatsItem = {
+  subject_name: string;
+  subject_id: string;
+  count: number;
+  percentage: number;
+};

package/src/municipal/utils/types.ts

@@ -1,11 +1,11 @@
-/**
- * City name type for municipal data
- */
-export type CityName =
-  | "ashdod"
-  | "maltar"
-  | "billit"
-  | "hashkelon"
-  | "eilat"
-  | "tests"
-  | string;
+/**
+ * City name type for municipal data
+ */
+export type CityName =
+  | "ashdod"
+  | "maltar"
+  | "billit"
+  | "hashkelon"
+  | "eilat"
+  | "tests"
+  | string;