@talkpilot/core-db 1.3.7 → 1.3.8

package/src/municipal/systemInstructions/instructions.getters.ts

@@ -1,57 +1,57 @@
-import { CityName, getDb, ObjectId } from "../index";
-import { Collection, Filter } from "mongodb";
-import { MIS_SystemInstruction, MIS_Tool } from "./instructions.types";
-
-export const getSystemInstructionsCollection =
-  (): Collection<MIS_SystemInstruction> => {
-    return getDb().collection<MIS_SystemInstruction>("system_instructions");
-  };
-/**
- * Find system instructions by filter
- * @param filter filter to apply
- * @returns array of system instructions
- */
-export const findSystemInstructions = async (
-  filter: Filter<MIS_SystemInstruction> = {},
-): Promise<MIS_SystemInstruction[]> => {
-  return await getSystemInstructionsCollection().find(filter).toArray();
-};
-
-/**
- * Get system instruction by id
- * @param id system instruction id
- * @returns system instruction or null if not found
- */
-export const getSystemInstructionById = async (
-  id: string,
-): Promise<MIS_SystemInstruction | null> => {
-  return await getSystemInstructionsCollection().findOne({
-    _id: new ObjectId(id),
-  });
-};
-/**
- * Get all active system instructions for a city
- * @param cityName city name
- * @returns array of active system instructions
- */
-export const getActiveSystemInstructionsByCity = async (
-  cityName: CityName,
-): Promise<MIS_SystemInstruction[]> => {
-  return await getSystemInstructionsCollection()
-    .find({ cityName, isActive: true })
-    .toArray();
-};
-/**
- * Get system instructions by tool and city
- * @param cityName city name
- * @param toolName tool name
- * @returns array of system instructions
- */
-export const getSystemInstructionsByToolAndCity = async (
-  cityName: CityName,
-  toolName: MIS_Tool,
-): Promise<MIS_SystemInstruction[]> => {
-  return await getSystemInstructionsCollection()
-    .find({ cityName: cityName, tool: toolName })
-    .toArray();
-};
+import { CityName, getDb, ObjectId } from "../index";
+import { Collection, Filter } from "mongodb";
+import { MIS_SystemInstruction, MIS_Tool } from "./instructions.types";
+
+export const getSystemInstructionsCollection =
+  (): Collection<MIS_SystemInstruction> => {
+    return getDb().collection<MIS_SystemInstruction>("system_instructions");
+  };
+/**
+ * Find system instructions by filter
+ * @param filter filter to apply
+ * @returns array of system instructions
+ */
+export const findSystemInstructions = async (
+  filter: Filter<MIS_SystemInstruction> = {},
+): Promise<MIS_SystemInstruction[]> => {
+  return await getSystemInstructionsCollection().find(filter).toArray();
+};
+
+/**
+ * Get system instruction by id
+ * @param id system instruction id
+ * @returns system instruction or null if not found
+ */
+export const getSystemInstructionById = async (
+  id: string,
+): Promise<MIS_SystemInstruction | null> => {
+  return await getSystemInstructionsCollection().findOne({
+    _id: new ObjectId(id),
+  });
+};
+/**
+ * Get all active system instructions for a city
+ * @param cityName city name
+ * @returns array of active system instructions
+ */
+export const getActiveSystemInstructionsByCity = async (
+  cityName: CityName,
+): Promise<MIS_SystemInstruction[]> => {
+  return await getSystemInstructionsCollection()
+    .find({ cityName, isActive: true })
+    .toArray();
+};
+/**
+ * Get system instructions by tool and city
+ * @param cityName city name
+ * @param toolName tool name
+ * @returns array of system instructions
+ */
+export const getSystemInstructionsByToolAndCity = async (
+  cityName: CityName,
+  toolName: MIS_Tool,
+): Promise<MIS_SystemInstruction[]> => {
+  return await getSystemInstructionsCollection()
+    .find({ cityName: cityName, tool: toolName })
+    .toArray();
+};

package/src/municipal/systemInstructions/instructions.setters.ts

@@ -1,119 +1,119 @@
-import { ObjectId } from "../index";
-import { ObjectId as MongoObjectId } from "mongodb";
-import {
-  MIS_SystemInstruction,
-  MIS_TOOLS,
-  QUERY_TYPES,
-} from "./instructions.types";
-import { getSystemInstructionsCollection } from "./instructions.getters";
-
-/**
- * Validate system instruction data
- * @param data partial system instruction data
- * @throws Error if tool or queryType is invalid
- */
-const validateInstructionData = (data: Partial<MIS_SystemInstruction>) => {
-  if (
-    data.tool &&
-    !(Object.values(MIS_TOOLS) as string[]).includes(data.tool)
-  ) {
-    throw new Error(
-      `Invalid tool value: ${data.tool}. Allowed values are: ${Object.values(MIS_TOOLS).join(", ")}`,
-    );
-  }
-  if (
-    data.queryType &&
-    !(Object.values(QUERY_TYPES) as string[]).includes(data.queryType)
-  ) {
-    throw new Error(
-      `Invalid queryType value: ${data.queryType}. Allowed values are: ${Object.values(QUERY_TYPES).join(", ")}`,
-    );
-  }
-};
-
-/**
- * Create a new system instruction
- * @param instructionData system instruction data
- * @returns inserted system instruction id
- */
-export const createSystemInstruction = async (
-  instructionData: Omit<
-    MIS_SystemInstruction,
-    "_id" | "createdAt" | "updatedAt"
-  >,
-): Promise<MongoObjectId> => {
-  validateInstructionData(instructionData as Partial<MIS_SystemInstruction>);
-  const instruction: Omit<MIS_SystemInstruction, "_id"> = {
-    //append doc metadata to user provided data
-    ...instructionData,
-    createdAt: new Date(),
-    updatedAt: new Date(),
-  };
-  const { insertedId } = await getSystemInstructionsCollection().insertOne(
-    instruction as MIS_SystemInstruction,
-  );
-  return insertedId;
-};
-
-/**
- * Update a system instruction by id
- * @param id system instruction id
- * @param data partial system instruction data
- * @returns updated system instruction or null if not found
- */
-export const updateSystemInstruction = async (
-  id: string,
-  data: Partial<Omit<MIS_SystemInstruction, "_id" | "createdAt" | "updatedAt">>,
-): Promise<MIS_SystemInstruction | null> => {
-  validateInstructionData(data as Partial<MIS_SystemInstruction>);
-  const result = await getSystemInstructionsCollection().findOneAndUpdate(
-    { _id: new ObjectId(id) },
-    { $set: { ...data, updatedAt: new Date() } },
-    { returnDocument: "after" },
-  );
-  return result || null;
-};
-
-/**
- * Delete a system instruction by id
- * @param id system instruction id
- * @returns true if deleted, false otherwise
- */
-export const deleteSystemInstruction = async (id: string): Promise<boolean> => {
-  const result = await getSystemInstructionsCollection().deleteOne({
-    _id: new ObjectId(id),
-  });
-  return result.deletedCount > 0;
-};
-/**
- * Activate a system instruction by id, sets isActive to true.
- * Does not check the current instruction state, calling this on an active instruction will do nothing.
- * @param id system instruction id
- * @returns true on success, false otherwise
- */
-export const activateSystemInstruction = async (
-  id: string,
-): Promise<boolean> => {
-  const result = await getSystemInstructionsCollection().findOneAndUpdate(
-    { _id: new ObjectId(id) },
-    { $set: { isActive: true } },
-    { returnDocument: "after" },
-  );
-  return Boolean(result);
-};
-/**
- * Deactivate a system instruction by id, sets isActive to false.
- * Does not check the current instruction state, calling this on a deactivated instruction will do nothing.
- * @param id system instruction id
- * @returns true on success, false otherwise
- */
-export const deactivateSystemInstruction = async (
-  id: string,
-): Promise<boolean> => {
-  const result = await getSystemInstructionsCollection().findOneAndUpdate(
-    { _id: new ObjectId(id) },
-    { $set: { isActive: false } },
-    { returnDocument: "after" },
-  );
-  return Boolean(result);
-};
+import { ObjectId } from "../index";
+import { ObjectId as MongoObjectId } from "mongodb";
+import {
+  MIS_SystemInstruction,
+  MIS_TOOLS,
+  QUERY_TYPES,
+} from "./instructions.types";
+import { getSystemInstructionsCollection } from "./instructions.getters";
+
+/**
+ * Validate system instruction data
+ * @param data partial system instruction data
+ * @throws Error if tool or queryType is invalid
+ */
+const validateInstructionData = (data: Partial<MIS_SystemInstruction>) => {
+  if (
+    data.tool &&
+    !(Object.values(MIS_TOOLS) as string[]).includes(data.tool)
+  ) {
+    throw new Error(
+      `Invalid tool value: ${data.tool}. Allowed values are: ${Object.values(MIS_TOOLS).join(", ")}`,
+    );
+  }
+  if (
+    data.queryType &&
+    !(Object.values(QUERY_TYPES) as string[]).includes(data.queryType)
+  ) {
+    throw new Error(
+      `Invalid queryType value: ${data.queryType}. Allowed values are: ${Object.values(QUERY_TYPES).join(", ")}`,
+    );
+  }
+};
+
+/**
+ * Create a new system instruction
+ * @param instructionData system instruction data
+ * @returns inserted system instruction id
+ */
+export const createSystemInstruction = async (
+  instructionData: Omit<
+    MIS_SystemInstruction,
+    "_id" | "createdAt" | "updatedAt"
+  >,
+): Promise<MongoObjectId> => {
+  validateInstructionData(instructionData as Partial<MIS_SystemInstruction>);
+  const instruction: Omit<MIS_SystemInstruction, "_id"> = {
+    //append doc metadata to user provided data
+    ...instructionData,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+  };
+  const { insertedId } = await getSystemInstructionsCollection().insertOne(
+    instruction as MIS_SystemInstruction,
+  );
+  return insertedId;
+};
+
+/**
+ * Update a system instruction by id
+ * @param id system instruction id
+ * @param data partial system instruction data
+ * @returns updated system instruction or null if not found
+ */
+export const updateSystemInstruction = async (
+  id: string,
+  data: Partial<Omit<MIS_SystemInstruction, "_id" | "createdAt" | "updatedAt">>,
+): Promise<MIS_SystemInstruction | null> => {
+  validateInstructionData(data as Partial<MIS_SystemInstruction>);
+  const result = await getSystemInstructionsCollection().findOneAndUpdate(
+    { _id: new ObjectId(id) },
+    { $set: { ...data, updatedAt: new Date() } },
+    { returnDocument: "after" },
+  );
+  return result || null;
+};
+
+/**
+ * Delete a system instruction by id
+ * @param id system instruction id
+ * @returns true if deleted, false otherwise
+ */
+export const deleteSystemInstruction = async (id: string): Promise<boolean> => {
+  const result = await getSystemInstructionsCollection().deleteOne({
+    _id: new ObjectId(id),
+  });
+  return result.deletedCount > 0;
+};
+/**
+ * Activate a system instruction by id, sets isActive to true.
+ * Does not check the current instruction state, calling this on an active instruction will do nothing.
+ * @param id system instruction id
+ * @returns true on success, false otherwise
+ */
+export const activateSystemInstruction = async (
+  id: string,
+): Promise<boolean> => {
+  const result = await getSystemInstructionsCollection().findOneAndUpdate(
+    { _id: new ObjectId(id) },
+    { $set: { isActive: true } },
+    { returnDocument: "after" },
+  );
+  return Boolean(result);
+};
+/**
+ * Deactivate a system instruction by id, sets isActive to false.
+ * Does not check the current instruction state, calling this on a deactivated instruction will do nothing.
+ * @param id system instruction id
+ * @returns true on success, false otherwise
+ */
+export const deactivateSystemInstruction = async (
+  id: string,
+): Promise<boolean> => {
+  const result = await getSystemInstructionsCollection().findOneAndUpdate(
+    { _id: new ObjectId(id) },
+    { $set: { isActive: false } },
+    { returnDocument: "after" },
+  );
+  return Boolean(result);
+};

package/src/municipal/systemInstructions/instructions.types.ts

@@ -1,30 +1,30 @@
-import { ObjectId } from "mongodb";
-
-import { CityName } from "../utils/types";
-
-export const MIS_TOOLS = {
-  findStreet: "findStreet",
-  findSubject: "findSubject",
-} as const;
-
-export const QUERY_TYPES = {
-  exactlyOne: "exactlyOne",
-  any: "any",
-  all: "all",
-  none: "none",
-} as const;
-
-export type MIS_Tool = (typeof MIS_TOOLS)[keyof typeof MIS_TOOLS];
-export type QueryType = (typeof QUERY_TYPES)[keyof typeof QUERY_TYPES];
-
-export type MIS_SystemInstruction = {
-  _id: ObjectId;
-  createdAt: Date;
-  updatedAt: Date;
-  cityName: CityName;
-  instruction: string;
-  isActive: boolean;
-  tool: MIS_Tool;
-  queryType: QueryType;
-  tags?: string[]; //no tags implies all wildcard (?)
-};
+import { ObjectId } from "mongodb";
+
+import { CityName } from "../utils/types";
+
+export const MIS_TOOLS = {
+  findStreet: "findStreet",
+  findSubject: "findSubject",
+} as const;
+
+export const QUERY_TYPES = {
+  exactlyOne: "exactlyOne",
+  any: "any",
+  all: "all",
+  none: "none",
+} as const;
+
+export type MIS_Tool = (typeof MIS_TOOLS)[keyof typeof MIS_TOOLS];
+export type QueryType = (typeof QUERY_TYPES)[keyof typeof QUERY_TYPES];
+
+export type MIS_SystemInstruction = {
+  _id: ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+  cityName: CityName;
+  instruction: string;
+  isActive: boolean;
+  tool: MIS_Tool;
+  queryType: QueryType;
+  tags?: string[]; //no tags implies all wildcard (?)
+};

package/src/municipal/tickets/__tests__/tickets.statistics.spec.ts

@@ -1,6 +1,6 @@
 import {
-  findCallSidsWithDraftTicketsByCity,
-  findCallSidsWithTicketsByCity,
+  findCallSidDraftTicketCountsByCity,
+  findCallSidTicketCountsByCity,
   getTicketsCollection,
   ticketStatsDateScopeFromYmd,
 } from "../../../index";
@@ -26,7 +26,7 @@ describe("tickets statistics getters", () => {
         updatedAt: new Date("2024-01-01T10:00:00.000Z"),
       }),
     ]);
-    expect(await findCallSidsWithTicketsByCity(CITY, mayScope())).toEqual(["CA-in-range"]);
+    expect(await findCallSidTicketCountsByCity(CITY, mayScope())).toEqual(new Map([["CA-in-range", 1]]));
   });
 
   it("should treat whitespace-only event_subject_id as draft", async () => {
@@ -46,6 +46,23 @@ describe("tickets statistics getters", () => {
         externalCallFields: { event_subject_id: "100" },
       }),
     ]);
-    expect(await findCallSidsWithDraftTicketsByCity(CITY, mayScope())).toEqual(["CA-draft-whitespace"]);
+    expect(await findCallSidDraftTicketCountsByCity(CITY, mayScope())).toEqual(new Map([["CA-draft-whitespace", 1]]));
+  });
+    it("should count multiple tickets on the same callSid", async () => {
+    await getTicketsCollection().insertMany([
+      createTicket({
+        cityName: CITY,
+        callSid: "CA-multi",
+        createdAt: new Date("2026-05-15T10:00:00.000Z"),
+        updatedAt: new Date("2026-05-15T10:00:00.000Z"),
+      }),
+      createTicket({
+        cityName: CITY,
+        callSid: "CA-multi",
+        createdAt: new Date("2026-05-15T11:00:00.000Z"),
+        updatedAt: new Date("2026-05-15T11:00:00.000Z"),
+      }),
+    ]);
+    expect(await findCallSidTicketCountsByCity(CITY, mayScope())).toEqual(new Map([["CA-multi", 2]]));
   });
 });

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

@@ -35,6 +35,7 @@ export const ticketStatsDateScopeFromYmd = (
   to: endOfCalendarDayInTz(endStr, timezone),
 });
 
+/** @deprecated Use findCallSidTicketCountsByCity instead. */
 export const findCallSidsWithTicketsByCity = async (
   cityName: CityName,
   dateScope?: TicketStatsDateScope,
@@ -43,9 +44,28 @@ export const findCallSidsWithTicketsByCity = async (
     { $match: ticketsWithCallSidMatch(cityName, resolveTicketStatsDateRange(dateScope)) },
     { $group: { _id: "$callSid" } },
   ]);
-  return rows.map((r) => String(r._id)).filter(Boolean);
+  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,
@@ -55,7 +75,25 @@ export const findCallSidsWithDraftTicketsByCity = async (
     { $match: { $expr: isDraftSubjectIdExpr } },
     { $group: { _id: "$callSid" } },
   ]);
-  return rows.map((r) => String(r._id)).filter(Boolean);
+  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 (

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;

package/src/talkpilot/__tests__/db.spec.ts

@@ -1,38 +1,38 @@
-import {
-  getFlowsCollection,
-  getSessionsCollection,
-  getResultsCollection,
-  getLeadsCollection,
-  getPhoneNumbersCollection,
-  getClientsCollection,
-  ObjectId,
-  getPlansCollection,
-  getSubscriptionsCollection,
-} from "../index";
-
-import { ObjectId as MongoObjectId } from "mongodb";
-
-describe("talkpilot core/db", () => {
-  it.each([
-    ["flows", getFlowsCollection],
-    ["sessions", getSessionsCollection],
-    ["results", getResultsCollection],
-    ["leads", getLeadsCollection],
-    ["phone_numbers", getPhoneNumbersCollection],
-    ["clients", getClientsCollection],
-    ["plans", getPlansCollection],
-    ["subscriptions", getSubscriptionsCollection],
-  ])('%s collection helper returns a "%s" collection', (name, getter) => {
-    expect(getter().collectionName).toBe(name);
-  });
-
-  it("ObjectId re-export behaves like mongodb.ObjectId", () => {
-    expect(ObjectId).toBe(MongoObjectId);
-
-    const id = new ObjectId();
-
-    expect(id).toBeInstanceOf(MongoObjectId);
-    expect(ObjectId.isValid(id)).toBe(true);
-    expect(id.toHexString()).toHaveLength(24);
-  });
-});
+import {
+  getFlowsCollection,
+  getSessionsCollection,
+  getResultsCollection,
+  getLeadsCollection,
+  getPhoneNumbersCollection,
+  getClientsCollection,
+  ObjectId,
+  getPlansCollection,
+  getSubscriptionsCollection,
+} from "../index";
+
+import { ObjectId as MongoObjectId } from "mongodb";
+
+describe("talkpilot core/db", () => {
+  it.each([
+    ["flows", getFlowsCollection],
+    ["sessions", getSessionsCollection],
+    ["results", getResultsCollection],
+    ["leads", getLeadsCollection],
+    ["phone_numbers", getPhoneNumbersCollection],
+    ["clients", getClientsCollection],
+    ["plans", getPlansCollection],
+    ["subscriptions", getSubscriptionsCollection],
+  ])('%s collection helper returns a "%s" collection', (name, getter) => {
+    expect(getter().collectionName).toBe(name);
+  });
+
+  it("ObjectId re-export behaves like mongodb.ObjectId", () => {
+    expect(ObjectId).toBe(MongoObjectId);
+
+    const id = new ObjectId();
+
+    expect(id).toBeInstanceOf(MongoObjectId);
+    expect(ObjectId.isValid(id)).toBe(true);
+    expect(id.toHexString()).toHaveLength(24);
+  });
+});

package/src/talkpilot/__tests__/mongodb-client.spec.ts

@@ -1,18 +1,18 @@
-import { getDb } from "../index";
-
-describe("MongoDBClient", () => {
-  it("should have a connected database instance from global setup", () => {
-    const db = getDb();
-    expect(db).toBeDefined();
-    expect(db.databaseName).toBe("test"); // Based on our setup.ts
-  });
-
-  it("should report as connected", async () => {
-    // Note: mongodbClient.connect() was called in global setup
-    // but through setDb, not necessarily through the client singleton instance
-    // since initTestDb calls setDb directly.
-
-    // In a real scenario, you'd use the client.
-    expect(true).toBe(true);
-  });
-});
+import { getDb } from "../index";
+
+describe("MongoDBClient", () => {
+  it("should have a connected database instance from global setup", () => {
+    const db = getDb();
+    expect(db).toBeDefined();
+    expect(db.databaseName).toBe("test"); // Based on our setup.ts
+  });
+
+  it("should report as connected", async () => {
+    // Note: mongodbClient.connect() was called in global setup
+    // but through setDb, not necessarily through the client singleton instance
+    // since initTestDb calls setDb directly.
+
+    // In a real scenario, you'd use the client.
+    expect(true).toBe(true);
+  });
+});