@talkpilot/core-db 1.3.23 → 1.3.25

package/dist/websitalk/websiteUrls/websiteUrls.setters.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteWebsiteUrl = exports.updateWebsiteUrl = exports.createWebsiteUrl = void 0;
+const index_1 = require("../index");
+const websiteUrls_getters_1 = require("./websiteUrls.getters");
+const createWebsiteUrl = async (input) => {
+    const now = new Date();
+    const { insertedId } = await (0, websiteUrls_getters_1.getWebsiteUrlsCollection)().insertOne({
+        clientId: input.clientId,
+        name: input.name,
+        baseUrl: input.baseUrl,
+        createdAt: now,
+        updatedAt: now,
+    });
+    return insertedId;
+};
+exports.createWebsiteUrl = createWebsiteUrl;
+const updateWebsiteUrl = async (id, updates) => {
+    return (0, websiteUrls_getters_1.getWebsiteUrlsCollection)().findOneAndUpdate({ _id: new index_1.ObjectId(id) }, { $set: { ...updates, updatedAt: new Date() } }, { returnDocument: "after" });
+};
+exports.updateWebsiteUrl = updateWebsiteUrl;
+const deleteWebsiteUrl = async (id) => {
+    const result = await (0, websiteUrls_getters_1.getWebsiteUrlsCollection)().deleteOne({
+        _id: new index_1.ObjectId(id),
+    });
+    return result.deletedCount > 0;
+};
+exports.deleteWebsiteUrl = deleteWebsiteUrl;
+//# sourceMappingURL=websiteUrls.setters.js.map

package/dist/websitalk/websiteUrls/websiteUrls.setters.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websiteUrls.setters.js","sourceRoot":"","sources":["../../../src/websitalk/websiteUrls/websiteUrls.setters.ts"],"names":[],"mappings":";;;AACA,oCAAoC;AACpC,+DAAoF;AAQ7E,MAAM,gBAAgB,GAAG,KAAK,EACnC,KAA4B,EACJ,EAAE;IAC1B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,8CAAwB,GAAE,CAAC,SAAS,CAAC;QAChE,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;KACf,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAbW,QAAA,gBAAgB,oBAa3B;AAEK,MAAM,gBAAgB,GAAG,KAAK,EACnC,EAAU,EACV,OAAsD,EACvB,EAAE;IACjC,OAAO,IAAA,8CAAwB,GAAE,CAAC,gBAAgB,CAChD,EAAE,GAAG,EAAE,IAAI,gBAAQ,CAAC,EAAE,CAAC,EAAE,EACzB,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,EAC/C,EAAE,cAAc,EAAE,OAAO,EAAE,CAC5B,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,gBAAgB,oBAS3B;AAEK,MAAM,gBAAgB,GAAG,KAAK,EAAE,EAAU,EAAoB,EAAE;IACrE,MAAM,MAAM,GAAG,MAAM,IAAA,8CAAwB,GAAE,CAAC,SAAS,CAAC;QACxD,GAAG,EAAE,IAAI,gBAAQ,CAAC,EAAE,CAAC;KACtB,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC;AACjC,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}

package/jest.config.js

@@ -1,20 +1,20 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  roots: ['<rootDir>/src'],
-  testPathIgnorePatterns: ['<rootDir>/src/__tests__/legacy/'],
-  testMatch: ['**/__tests__/**/*.spec.ts', '**/*.spec.ts'],
-  transform: {
-    '^.+\\.tsx?$': ['ts-jest', {
-      tsconfig: 'tsconfig.json',
-    }],
-  },
-  setupFilesAfterEnv: ['<rootDir>/src/__tests__/setup.ts'],
-  maxWorkers: 1,
-  verbose: true,
-  forceExit: true,
-  clearMocks: true,
-  resetMocks: true,
-  restoreMocks: true,
-};
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  roots: ['<rootDir>/src'],
+  testPathIgnorePatterns: ['<rootDir>/src/__tests__/legacy/'],
+  testMatch: ['**/__tests__/**/*.spec.ts', '**/*.spec.ts'],
+  transform: {
+    '^.+\\.tsx?$': ['ts-jest', {
+      tsconfig: 'tsconfig.json',
+    }],
+  },
+  setupFilesAfterEnv: ['<rootDir>/src/__tests__/setup.ts'],
+  maxWorkers: 1,
+  verbose: true,
+  forceExit: true,
+  clearMocks: true,
+  resetMocks: true,
+  restoreMocks: true,
+};

package/package.json

@@ -1,46 +1,46 @@
-{
-  "name": "@talkpilot/core-db",
-  "version": "1.3.23",
-  "description": "Core database package for centralized connections and ORM integration.",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsc --watch",
-    "test": "jest",
-    "lint": "eslint 'src/**/*.{ts,tsx}'",
-    "format": "prettier --write \"src/**/*.{ts,tsx}\"",
-    "prepare": "npm run build"
-  },
-  "keywords": [
-    "database",
-    "orm",
-    "typescript",
-    "postgres",
-    "db-client"
-  ],
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "dayjs": "^1.11.21",
-    "express": "^4.18.0",
-    "google-libphonenumber": "^3.2.0",
-    "mongodb": "^6.11.0"
-  },
-  "devDependencies": {
-    "@faker-js/faker": "^8.0.0",
-    "@types/express": "^4.17.0",
-    "@types/google-libphonenumber": "^7.4.0",
-    "@types/jest": "^29.0.0",
-    "@types/node": "^20.0.0",
-    "fishery": "^2.4.0",
-    "jest": "^29.0.0",
-    "mongodb-memory-server": "^10.0.0",
-    "prettier": "^3.8.2",
-    "ts-jest": "^29.0.0",
-    "typescript": "^5.0.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  }
-}
+{
+  "name": "@talkpilot/core-db",
+  "version": "1.3.25",
+  "description": "Core database package for centralized connections and ORM integration.",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc --watch",
+    "test": "jest",
+    "lint": "eslint 'src/**/*.{ts,tsx}'",
+    "format": "prettier --write \"src/**/*.{ts,tsx}\"",
+    "prepare": "npm run build"
+  },
+  "keywords": [
+    "database",
+    "orm",
+    "typescript",
+    "postgres",
+    "db-client"
+  ],
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "dayjs": "^1.11.21",
+    "express": "^4.18.0",
+    "google-libphonenumber": "^3.2.0",
+    "mongodb": "^6.11.0"
+  },
+  "devDependencies": {
+    "@faker-js/faker": "^8.0.0",
+    "@types/express": "^4.17.0",
+    "@types/google-libphonenumber": "^7.4.0",
+    "@types/jest": "^29.0.0",
+    "@types/node": "^20.0.0",
+    "fishery": "^2.4.0",
+    "jest": "^29.0.0",
+    "mongodb-memory-server": "^10.0.0",
+    "prettier": "^3.8.2",
+    "ts-jest": "^29.0.0",
+    "typescript": "^5.0.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}

package/src/__tests__/setup.ts

@@ -1,20 +1,20 @@
-import { initTestDb, closeTestDb } from "../test-utils/db-utils";
-
-declare global {
-  // eslint-disable-next-line no-var
-  var db: import("mongodb").Db;
-}
-
-// Set up global mocks if needed
-// global.fetch = jest.fn();
-
-beforeEach(async () => {
-  global.db = await initTestDb();
-}, 30_000);
-
-afterEach(async () => {
-  await closeTestDb();
-  jest.resetAllMocks();
-});
-
-process.env.NODE_ENV = "test";
+import { initTestDb, closeTestDb } from "../test-utils/db-utils";
+
+declare global {
+  // eslint-disable-next-line no-var
+  var db: import("mongodb").Db;
+}
+
+// Set up global mocks if needed
+// global.fetch = jest.fn();
+
+beforeEach(async () => {
+  global.db = await initTestDb();
+}, 30_000);
+
+afterEach(async () => {
+  await closeTestDb();
+  jest.resetAllMocks();
+});
+
+process.env.NODE_ENV = "test";

package/src/connection.ts

@@ -1,54 +1,67 @@
-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;
+}
+
+export async function disconnectDb(): Promise<void> {
+  if (!isConnected) {
+    return;
+  }
+
+  await Promise.all([
+    mongodbClient.disconnect(),
+    municipalDataMongodbClient.disconnect(),
+    websitalkMongodbClient.disconnect(),
+  ]);
+  isConnected = false;
+}

package/src/index.ts

@@ -1,27 +1,27 @@
-// 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";
-export * from "./websitalk/websiteUrls";
+// 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";
+export * from "./websitalk/websiteUrls";

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";