@talkpilot/core-db 1.3.6 → 1.3.7

package/src/connection.ts

@@ -1,54 +1,54 @@
-import { mongodbClient } from "./talkpilot";
-import { municipalDataMongodbClient } from "./municipal";
-import { websitalkMongodbClient } from "./websitalk";
-
-let isConnected = false;
-
-/**
- * Ensures the database clients are initialized.
- * This function reads from MONGO_URI.
- */
-export async function ensureDbConnected() {
-  if (isConnected) {
-    return;
-  }
-
-  const mongoUri = process.env.MONGO_URI || process.env.MONGODB_URI;
-  const talkpilotUri = mongoUri;
-  const municipalUri = mongoUri;
-  const websiteTalkUri = mongoUri;
-
-  if (!talkpilotUri) {
-    console.warn("[core-db] MONGO_URI is not set");
-  } else {
-    const dbNameFromUri = talkpilotUri.split("/").pop()?.split("?")[0];
-    const dbName = dbNameFromUri || process.env.TALKPILOT_DB_NAME;
-    await mongodbClient.connect(talkpilotUri, dbName);
-    console.info(
-      `[core-db] Connected to TalkPilot MongoDB: ${dbName || "via env"}`,
-    );
-  }
-
-  if (!municipalUri) {
-    console.warn("[core-db] MONGO_URI is not set");
-  } else {
-    const dbNameFromUri = municipalUri.split("/").pop()?.split("?")[0];
-    const dbName = dbNameFromUri || process.env.MUNICIPAL_DB_NAME;
-    await municipalDataMongodbClient.connect(municipalUri, dbName);
-    console.info(
-      `[core-db] Connected to Municipal Data MongoDB: ${dbName || "via env"}`,
-    );
-  }
-
-  if (!websiteTalkUri) {
-    console.warn("[core-db] MONGO_URI is not set");
-  } else {
-    const dbName = process.env.WEBSITALK_DB_NAME;
-    await websitalkMongodbClient.connect(websiteTalkUri, dbName);
-    console.info(
-      `[core-db] Connected to Website Talk MongoDB: ${dbName || "website-talk (default)"}`,
-    );
-  }
-
-  isConnected = true;
-}
+import { mongodbClient } from "./talkpilot";
+import { municipalDataMongodbClient } from "./municipal";
+import { websitalkMongodbClient } from "./websitalk";
+
+let isConnected = false;
+
+/**
+ * Ensures the database clients are initialized.
+ * This function reads from MONGO_URI.
+ */
+export async function ensureDbConnected() {
+  if (isConnected) {
+    return;
+  }
+
+  const mongoUri = process.env.MONGO_URI || process.env.MONGODB_URI;
+  const talkpilotUri = mongoUri;
+  const municipalUri = mongoUri;
+  const websiteTalkUri = mongoUri;
+
+  if (!talkpilotUri) {
+    console.warn("[core-db] MONGO_URI is not set");
+  } else {
+    const dbNameFromUri = talkpilotUri.split("/").pop()?.split("?")[0];
+    const dbName = dbNameFromUri || process.env.TALKPILOT_DB_NAME;
+    await mongodbClient.connect(talkpilotUri, dbName);
+    console.info(
+      `[core-db] Connected to TalkPilot MongoDB: ${dbName || "via env"}`,
+    );
+  }
+
+  if (!municipalUri) {
+    console.warn("[core-db] MONGO_URI is not set");
+  } else {
+    const dbNameFromUri = municipalUri.split("/").pop()?.split("?")[0];
+    const dbName = dbNameFromUri || process.env.MUNICIPAL_DB_NAME;
+    await municipalDataMongodbClient.connect(municipalUri, dbName);
+    console.info(
+      `[core-db] Connected to Municipal Data MongoDB: ${dbName || "via env"}`,
+    );
+  }
+
+  if (!websiteTalkUri) {
+    console.warn("[core-db] MONGO_URI is not set");
+  } else {
+    const dbName = process.env.WEBSITALK_DB_NAME;
+    await websitalkMongodbClient.connect(websiteTalkUri, dbName);
+    console.info(
+      `[core-db] Connected to Website Talk MongoDB: ${dbName || "website-talk (default)"}`,
+    );
+  }
+
+  isConnected = true;
+}

package/src/index.ts

@@ -1,26 +1,26 @@
-// TalkPilot DB exports
-export * from "./talkpilot";
-export * from "./connection";
-
-export {
-  municipalDataMongodbClient,
-  getDb as getMunicipalDataDb,
-  setDb as setMunicipalDataDb,
-  ObjectId as MunicipalDataObjectId,
-} from "./municipal";
-export * from "./municipal/cities";
-export * from "./municipal/streets";
-export * from "./municipal/departmentsSubjects";
-export * from "./municipal/tickets";
-export * from "./municipal/systemInstructions";
-export * from "./municipal/muniIssues";
-export * from "./municipal/utils/types";
-
-export {
-  websitalkMongodbClient,
-  getDb as getWebsitalkDb,
-  setDb as setWebsitalkDb,
-  ObjectId as WebsitalkObjectId,
-} from "./websitalk";
-export * from "./websitalk/scans/scans.getters";
-export type * from "./websitalk/scans/scans.types";
+// TalkPilot DB exports
+export * from "./talkpilot";
+export * from "./connection";
+
+export {
+  municipalDataMongodbClient,
+  getDb as getMunicipalDataDb,
+  setDb as setMunicipalDataDb,
+  ObjectId as MunicipalDataObjectId,
+} from "./municipal";
+export * from "./municipal/cities";
+export * from "./municipal/streets";
+export * from "./municipal/departmentsSubjects";
+export * from "./municipal/tickets";
+export * from "./municipal/systemInstructions";
+export * from "./municipal/muniIssues";
+export * from "./municipal/utils/types";
+
+export {
+  websitalkMongodbClient,
+  getDb as getWebsitalkDb,
+  setDb as setWebsitalkDb,
+  ObjectId as WebsitalkObjectId,
+} from "./websitalk";
+export * from "./websitalk/scans/scans.getters";
+export type * from "./websitalk/scans/scans.types";

package/src/municipal/__tests__/validation.spec.ts

@@ -1,62 +1,62 @@
-import { municipalDataMongodbClient } from "../mongodb-client";
-import { MongoClient } from "mongodb";
-
-describe("MunicipalDataMongoDBClient Validation", () => {
-  const originalEnv = process.env;
-
-  beforeEach(() => {
-    process.env = { ...originalEnv };
-    delete process.env.MONGO_URI;
-    delete process.env.MONGODB_URI;
-
-    // Force reset singleton state
-    (municipalDataMongodbClient as any).client = null;
-    (municipalDataMongodbClient as any).db = null;
-  });
-
-  afterAll(async () => {
-    process.env = originalEnv;
-    await municipalDataMongodbClient.disconnect();
-  });
-
-  it("should succeed with default database name if only URI is provided", async () => {
-    const mockDb = { databaseName: "municipal-data" };
-    const connectSpy = jest
-      .spyOn(MongoClient.prototype, "connect")
-      .mockResolvedValue({} as any);
-    const dbSpy = jest
-      .spyOn(MongoClient.prototype, "db")
-      .mockReturnValue(mockDb as any);
-
-    const validUri = "mongodb://127.0.0.1:27017";
-    await municipalDataMongodbClient.connect(validUri);
-
-    expect(municipalDataMongodbClient.getDb()).toBeDefined();
-    expect(municipalDataMongodbClient.getDb().databaseName).toBe(
-      "municipal-data",
-    );
-
-    connectSpy.mockRestore();
-    dbSpy.mockRestore();
-  });
-
-  it("should allow overriding the default database name", async () => {
-    const mockDb = { databaseName: "custom-municipal-db" };
-    const connectSpy = jest
-      .spyOn(MongoClient.prototype, "connect")
-      .mockResolvedValue({} as any);
-    const dbSpy = jest
-      .spyOn(MongoClient.prototype, "db")
-      .mockReturnValue(mockDb as any);
-
-    const validUri = "mongodb://127.0.0.1:27017";
-    await municipalDataMongodbClient.connect(validUri, "custom-municipal-db");
-
-    expect(municipalDataMongodbClient.getDb().databaseName).toBe(
-      "custom-municipal-db",
-    );
-
-    connectSpy.mockRestore();
-    dbSpy.mockRestore();
-  });
-});
+import { municipalDataMongodbClient } from "../mongodb-client";
+import { MongoClient } from "mongodb";
+
+describe("MunicipalDataMongoDBClient Validation", () => {
+  const originalEnv = process.env;
+
+  beforeEach(() => {
+    process.env = { ...originalEnv };
+    delete process.env.MONGO_URI;
+    delete process.env.MONGODB_URI;
+
+    // Force reset singleton state
+    (municipalDataMongodbClient as any).client = null;
+    (municipalDataMongodbClient as any).db = null;
+  });
+
+  afterAll(async () => {
+    process.env = originalEnv;
+    await municipalDataMongodbClient.disconnect();
+  });
+
+  it("should succeed with default database name if only URI is provided", async () => {
+    const mockDb = { databaseName: "municipal-data" };
+    const connectSpy = jest
+      .spyOn(MongoClient.prototype, "connect")
+      .mockResolvedValue({} as any);
+    const dbSpy = jest
+      .spyOn(MongoClient.prototype, "db")
+      .mockReturnValue(mockDb as any);
+
+    const validUri = "mongodb://127.0.0.1:27017";
+    await municipalDataMongodbClient.connect(validUri);
+
+    expect(municipalDataMongodbClient.getDb()).toBeDefined();
+    expect(municipalDataMongodbClient.getDb().databaseName).toBe(
+      "municipal-data",
+    );
+
+    connectSpy.mockRestore();
+    dbSpy.mockRestore();
+  });
+
+  it("should allow overriding the default database name", async () => {
+    const mockDb = { databaseName: "custom-municipal-db" };
+    const connectSpy = jest
+      .spyOn(MongoClient.prototype, "connect")
+      .mockResolvedValue({} as any);
+    const dbSpy = jest
+      .spyOn(MongoClient.prototype, "db")
+      .mockReturnValue(mockDb as any);
+
+    const validUri = "mongodb://127.0.0.1:27017";
+    await municipalDataMongodbClient.connect(validUri, "custom-municipal-db");
+
+    expect(municipalDataMongodbClient.getDb().databaseName).toBe(
+      "custom-municipal-db",
+    );
+
+    connectSpy.mockRestore();
+    dbSpy.mockRestore();
+  });
+});

package/src/municipal/cities/cities.getters.ts

@@ -1,50 +1,50 @@
-import { getDb, ObjectId, City } from "../index";
-import { Collection, Filter, ObjectId as MongoObjectId } from "mongodb";
-
-export const getCitiesCollection = (): Collection<City> => {
-  return getDb().collection<City>("cities");
-};
-
-export const findCities = async (
-  filter: Filter<City> = {},
-): Promise<City[]> => {
-  return await getCitiesCollection().find(filter).toArray();
-};
-
-export const getCityById = async (cityId: string): Promise<City | null> => {
-  const city = await getCitiesCollection().findOne({
-    _id: new ObjectId(cityId),
-  });
-  return city ? city : null;
-};
-
-export const createCity = async (
-  cityData: Omit<City, "_id" | "createdAt" | "updatedAt">,
-): Promise<MongoObjectId> => {
-  const city: Omit<City, "_id"> = {
-    ...cityData,
-    createdAt: new Date(),
-    updatedAt: new Date(),
-  };
-  const { insertedId } = await getCitiesCollection().insertOne(city as City);
-  return insertedId;
-};
-
-export const updateCity = async (
-  cityId: string,
-  data: Partial<Omit<City, "_id" | "createdAt" | "updatedAt">>,
-): Promise<City | null> => {
-  const result = await getCitiesCollection().findOneAndUpdate(
-    { _id: new ObjectId(cityId) },
-    { $set: { ...data, updatedAt: new Date() } },
-    { returnDocument: "after" },
-  );
-  return result || null;
-};
-
-export const deleteCity = async (cityId: string): Promise<boolean> => {
-  const result = await getCitiesCollection().deleteOne({
-    _id: new ObjectId(cityId),
-  });
-  return result.deletedCount > 0;
-};
+import { getDb, ObjectId, City } from "../index";
+import { Collection, Filter, ObjectId as MongoObjectId } from "mongodb";
+
+export const getCitiesCollection = (): Collection<City> => {
+  return getDb().collection<City>("cities");
+};
+
+export const findCities = async (
+  filter: Filter<City> = {},
+): Promise<City[]> => {
+  return await getCitiesCollection().find(filter).toArray();
+};
+
+export const getCityById = async (cityId: string): Promise<City | null> => {
+  const city = await getCitiesCollection().findOne({
+    _id: new ObjectId(cityId),
+  });
+  return city ? city : null;
+};
+
+export const createCity = async (
+  cityData: Omit<City, "_id" | "createdAt" | "updatedAt">,
+): Promise<MongoObjectId> => {
+  const city: Omit<City, "_id"> = {
+    ...cityData,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+  };
+  const { insertedId } = await getCitiesCollection().insertOne(city as City);
+  return insertedId;
+};
+
+export const updateCity = async (
+  cityId: string,
+  data: Partial<Omit<City, "_id" | "createdAt" | "updatedAt">>,
+): Promise<City | null> => {
+  const result = await getCitiesCollection().findOneAndUpdate(
+    { _id: new ObjectId(cityId) },
+    { $set: { ...data, updatedAt: new Date() } },
+    { returnDocument: "after" },
+  );
+  return result || null;
+};
+
+export const deleteCity = async (cityId: string): Promise<boolean> => {
+  const result = await getCitiesCollection().deleteOne({
+    _id: new ObjectId(cityId),
+  });
+  return result.deletedCount > 0;
+};

package/src/municipal/cities/cities.types.ts

@@ -1,11 +1,11 @@
-import { ObjectId, WithId } from "mongodb";
-
-export type City = {
-  _id: ObjectId;
-  createdAt: Date;
-  updatedAt: Date;
-  name: string;
-  displayName: string;
-};
-
-export type CityDoc = WithId<City>;
+import { ObjectId, WithId } from "mongodb";
+
+export type City = {
+  _id: ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+  name: string;
+  displayName: string;
+};
+
+export type CityDoc = WithId<City>;

package/src/municipal/cities/index.ts

@@ -1,2 +1,2 @@
-export * from "./cities.getters";
-export type { City, CityDoc } from "./cities.types";
+export * from "./cities.getters";
+export type { City, CityDoc } from "./cities.types";