@talkpilot/core-db 1.3.0 → 1.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -30
- package/dist/connection.d.ts.map +1 -1
- package/dist/connection.js +10 -0
- package/dist/connection.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/municipal/tickets/index.d.ts +1 -2
- package/dist/municipal/tickets/index.d.ts.map +1 -1
- package/dist/municipal/tickets/index.js +0 -1
- package/dist/municipal/tickets/index.js.map +1 -1
- package/dist/municipal/tickets/tickets.getters.d.ts +11 -0
- package/dist/municipal/tickets/tickets.getters.d.ts.map +1 -1
- package/dist/municipal/tickets/tickets.getters.js +128 -0
- package/dist/municipal/tickets/tickets.getters.js.map +1 -1
- package/dist/municipal/tickets/tickets.types.d.ts +5 -10
- package/dist/municipal/tickets/tickets.types.d.ts.map +1 -1
- package/dist/talkpilot/calls/calls.types.d.ts +2 -1
- package/dist/talkpilot/calls/calls.types.d.ts.map +1 -1
- package/dist/talkpilot/calls/calls.types.js +3 -0
- package/dist/talkpilot/calls/calls.types.js.map +1 -1
- package/dist/talkpilot/calls/dashboard/calls.dashboard.d.ts +1 -33
- package/dist/talkpilot/calls/dashboard/calls.dashboard.d.ts.map +1 -1
- package/dist/talkpilot/calls/dashboard/calls.dashboard.js +146 -131
- package/dist/talkpilot/calls/dashboard/calls.dashboard.js.map +1 -1
- package/dist/talkpilot/calls/dashboard/calls.dashboard.types.d.ts +6 -27
- package/dist/talkpilot/calls/dashboard/calls.dashboard.types.d.ts.map +1 -1
- package/dist/talkpilot/calls/index.d.ts +0 -3
- package/dist/talkpilot/calls/index.d.ts.map +1 -1
- package/dist/talkpilot/calls/index.js +0 -3
- package/dist/talkpilot/calls/index.js.map +1 -1
- package/dist/test-utils/db-utils.d.ts.map +1 -1
- package/dist/test-utils/db-utils.js +2 -0
- package/dist/test-utils/db-utils.js.map +1 -1
- package/dist/test-utils/factories/index.d.ts +1 -0
- package/dist/test-utils/factories/index.d.ts.map +1 -1
- package/dist/test-utils/factories/index.js +1 -0
- package/dist/test-utils/factories/index.js.map +1 -1
- package/dist/test-utils/factories/websitalk/scans.d.ts +5 -0
- package/dist/test-utils/factories/websitalk/scans.d.ts.map +1 -0
- package/dist/test-utils/factories/websitalk/scans.js +25 -0
- package/dist/test-utils/factories/websitalk/scans.js.map +1 -0
- package/dist/websitalk/index.d.ts +7 -0
- package/dist/websitalk/index.d.ts.map +1 -0
- package/dist/websitalk/index.js +34 -0
- package/dist/websitalk/index.js.map +1 -0
- package/dist/websitalk/mongodb-client.d.ts +13 -0
- package/dist/websitalk/mongodb-client.d.ts.map +1 -0
- package/dist/websitalk/mongodb-client.js +56 -0
- package/dist/websitalk/mongodb-client.js.map +1 -0
- package/dist/websitalk/scans/index.d.ts +3 -0
- package/dist/websitalk/scans/index.d.ts.map +1 -0
- package/dist/websitalk/scans/index.js +19 -0
- package/dist/websitalk/scans/index.js.map +1 -0
- package/dist/websitalk/scans/scans.getters.d.ts +12 -0
- package/dist/websitalk/scans/scans.getters.d.ts.map +1 -0
- package/dist/websitalk/scans/scans.getters.js +74 -0
- package/dist/websitalk/scans/scans.getters.js.map +1 -0
- package/dist/websitalk/scans/scans.types.d.ts +45 -0
- package/dist/websitalk/scans/scans.types.d.ts.map +1 -0
- package/dist/{talkpilot/calls/calls.statistics.types.js → websitalk/scans/scans.types.js} +1 -1
- package/dist/websitalk/scans/scans.types.js.map +1 -0
- package/package.json +1 -1
- package/src/connection.ts +12 -0
- package/src/index.ts +9 -0
- package/src/municipal/tickets/__tests__/tickets.getters.spec.ts +37 -1
- package/src/municipal/tickets/index.ts +1 -2
- package/src/municipal/tickets/tickets.getters.ts +140 -0
- package/src/municipal/tickets/tickets.types.ts +9 -14
- package/src/talkpilot/calls/__tests__/calls.dashboard.spec.ts +111 -8
- package/src/talkpilot/calls/calls.types.ts +2 -4
- package/src/talkpilot/calls/dashboard/calls.dashboard.ts +197 -148
- package/src/talkpilot/calls/dashboard/calls.dashboard.types.ts +12 -25
- package/src/talkpilot/calls/index.ts +0 -3
- package/src/talkpilot/clientsConfig/__tests__/clientsConfig.spec.ts +0 -7
- package/src/test-utils/db-utils.ts +3 -1
- package/src/test-utils/factories/index.ts +1 -0
- package/src/test-utils/factories/websitalk/scans.ts +23 -0
- package/src/websitalk/index.ts +15 -0
- package/src/websitalk/mongodb-client.ts +61 -0
- package/src/websitalk/scans/__tests__/scans.spec.ts +218 -0
- package/src/websitalk/scans/index.ts +2 -0
- package/src/websitalk/scans/scans.getters.ts +113 -0
- package/src/websitalk/scans/scans.types.ts +53 -0
- package/dist/municipal/tickets/tickets.constants.d.ts +0 -7
- package/dist/municipal/tickets/tickets.constants.d.ts.map +0 -1
- package/dist/municipal/tickets/tickets.constants.js +0 -10
- package/dist/municipal/tickets/tickets.constants.js.map +0 -1
- package/dist/municipal/tickets/tickets.deprecated.getters.d.ts +0 -12
- package/dist/municipal/tickets/tickets.deprecated.getters.d.ts.map +0 -1
- package/dist/municipal/tickets/tickets.deprecated.getters.js +0 -131
- package/dist/municipal/tickets/tickets.deprecated.getters.js.map +0 -1
- package/dist/municipal/tickets/tickets.statistics.aggregation.d.ts +0 -45
- package/dist/municipal/tickets/tickets.statistics.aggregation.d.ts.map +0 -1
- package/dist/municipal/tickets/tickets.statistics.aggregation.js +0 -98
- package/dist/municipal/tickets/tickets.statistics.aggregation.js.map +0 -1
- package/dist/municipal/tickets/tickets.statistics.dates.d.ts +0 -7
- package/dist/municipal/tickets/tickets.statistics.dates.d.ts.map +0 -1
- package/dist/municipal/tickets/tickets.statistics.dates.js +0 -40
- package/dist/municipal/tickets/tickets.statistics.dates.js.map +0 -1
- package/dist/municipal/tickets/tickets.statistics.getters.d.ts +0 -9
- package/dist/municipal/tickets/tickets.statistics.getters.d.ts.map +0 -1
- package/dist/municipal/tickets/tickets.statistics.getters.js +0 -55
- package/dist/municipal/tickets/tickets.statistics.getters.js.map +0 -1
- package/dist/municipal/tickets/tickets.statistics.pipeline.d.ts +0 -53
- package/dist/municipal/tickets/tickets.statistics.pipeline.d.ts.map +0 -1
- package/dist/municipal/tickets/tickets.statistics.pipeline.js +0 -112
- package/dist/municipal/tickets/tickets.statistics.pipeline.js.map +0 -1
- package/dist/municipal/tickets/tickets.statistics.utils.d.ts +0 -7
- package/dist/municipal/tickets/tickets.statistics.utils.d.ts.map +0 -1
- package/dist/municipal/tickets/tickets.statistics.utils.js +0 -40
- package/dist/municipal/tickets/tickets.statistics.utils.js.map +0 -1
- package/dist/talkpilot/calls/calls.constants.d.ts +0 -17
- package/dist/talkpilot/calls/calls.constants.d.ts.map +0 -1
- package/dist/talkpilot/calls/calls.constants.js +0 -20
- package/dist/talkpilot/calls/calls.constants.js.map +0 -1
- package/dist/talkpilot/calls/calls.statistics.getters.d.ts +0 -19
- package/dist/talkpilot/calls/calls.statistics.getters.d.ts.map +0 -1
- package/dist/talkpilot/calls/calls.statistics.getters.js +0 -375
- package/dist/talkpilot/calls/calls.statistics.getters.js.map +0 -1
- package/dist/talkpilot/calls/calls.statistics.ticketScope.d.ts +0 -12
- package/dist/talkpilot/calls/calls.statistics.ticketScope.d.ts.map +0 -1
- package/dist/talkpilot/calls/calls.statistics.ticketScope.js +0 -37
- package/dist/talkpilot/calls/calls.statistics.ticketScope.js.map +0 -1
- package/dist/talkpilot/calls/calls.statistics.tickets.d.ts +0 -17
- package/dist/talkpilot/calls/calls.statistics.tickets.d.ts.map +0 -1
- package/dist/talkpilot/calls/calls.statistics.tickets.js +0 -33
- package/dist/talkpilot/calls/calls.statistics.tickets.js.map +0 -1
- package/dist/talkpilot/calls/calls.statistics.types.d.ts +0 -39
- package/dist/talkpilot/calls/calls.statistics.types.d.ts.map +0 -1
- package/dist/talkpilot/calls/calls.statistics.types.js.map +0 -1
- package/dist/utils/date.utils.d.ts +0 -49
- package/dist/utils/date.utils.d.ts.map +0 -1
- package/dist/utils/date.utils.js +0 -103
- package/dist/utils/date.utils.js.map +0 -1
- package/dist/utils/statistics.aggregation.d.ts +0 -20
- package/dist/utils/statistics.aggregation.d.ts.map +0 -1
- package/dist/utils/statistics.aggregation.js +0 -43
- package/dist/utils/statistics.aggregation.js.map +0 -1
- package/src/municipal/tickets/__tests__/tickets.statistics.spec.ts +0 -104
- package/src/municipal/tickets/tickets.constants.ts +0 -8
- package/src/municipal/tickets/tickets.statistics.aggregation.ts +0 -113
- package/src/municipal/tickets/tickets.statistics.getters.ts +0 -93
- package/src/talkpilot/calls/__tests__/calls.statistics.spec.ts +0 -281
- package/src/talkpilot/calls/calls.constants.ts +0 -20
- package/src/talkpilot/calls/calls.statistics.getters.ts +0 -525
- package/src/talkpilot/calls/calls.statistics.types.ts +0 -44
- package/src/utils/date.utils.ts +0 -116
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { MongoMemoryServer } from "mongodb-memory-server";
|
|
2
2
|
import { MongoClient, Db } from "mongodb";
|
|
3
|
-
import { setDb, setMunicipalDataDb } from "../index";
|
|
3
|
+
import { setDb, setMunicipalDataDb, setWebsitalkDb } from "../index";
|
|
4
4
|
|
|
5
5
|
let mongoServer: MongoMemoryServer;
|
|
6
6
|
let client: MongoClient;
|
|
@@ -13,8 +13,10 @@ export async function initTestDb(): Promise<Db> {
|
|
|
13
13
|
await client.connect();
|
|
14
14
|
const talkpilotDb = client.db();
|
|
15
15
|
const municipalDb = client.db("municipal-data");
|
|
16
|
+
const websitalkDb = client.db("website-talk");
|
|
16
17
|
setDb(talkpilotDb);
|
|
17
18
|
setMunicipalDataDb(municipalDb);
|
|
19
|
+
setWebsitalkDb(websitalkDb);
|
|
18
20
|
return talkpilotDb;
|
|
19
21
|
}
|
|
20
22
|
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { Factory } from "fishery";
|
|
2
|
+
import { faker } from "@faker-js/faker";
|
|
3
|
+
import type { Scan } from "../../../websitalk";
|
|
4
|
+
|
|
5
|
+
export const scanFactory = Factory.define<Scan>(() => ({
|
|
6
|
+
clientId: faker.string.uuid(),
|
|
7
|
+
baseUrl: faker.internet.url(),
|
|
8
|
+
status: "CHECKING",
|
|
9
|
+
activeTasksCount: 0,
|
|
10
|
+
pagesScanned: 0,
|
|
11
|
+
pagesSkipped: 0,
|
|
12
|
+
skipped: [],
|
|
13
|
+
siteChrome: {
|
|
14
|
+
url: faker.internet.url(),
|
|
15
|
+
sourceType: "site_chrome",
|
|
16
|
+
},
|
|
17
|
+
createdAt: new Date(),
|
|
18
|
+
updatedAt: new Date(),
|
|
19
|
+
}));
|
|
20
|
+
|
|
21
|
+
export function createScanFixture(overrides?: Partial<Scan>): Scan {
|
|
22
|
+
return scanFactory.build(overrides);
|
|
23
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Db, ObjectId as MongoObjectId } from "mongodb";
|
|
2
|
+
|
|
3
|
+
export * from "./scans";
|
|
4
|
+
export { websitalkMongodbClient } from "./mongodb-client";
|
|
5
|
+
|
|
6
|
+
let db: Db;
|
|
7
|
+
export const setDb = (d: Db) => {
|
|
8
|
+
db = d;
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
export const getDb = (): Db => {
|
|
12
|
+
if (!db) throw new Error("Website Talk DB not initialised");
|
|
13
|
+
return db;
|
|
14
|
+
};
|
|
15
|
+
export const ObjectId = MongoObjectId;
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { MongoClient, Db } from "mongodb";
|
|
2
|
+
import { setDb } from "./index";
|
|
3
|
+
import { validateConfig, validateMongoUri } from "../utils/validation";
|
|
4
|
+
|
|
5
|
+
class WebsitalkMongoDBClient {
|
|
6
|
+
private client: MongoClient | null = null;
|
|
7
|
+
private db: Db | null = null;
|
|
8
|
+
private readonly defaultDbName = "website-talk";
|
|
9
|
+
|
|
10
|
+
async connect(uri?: string, dbName?: string): Promise<void> {
|
|
11
|
+
if (this.client) {
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
const mongodbUri = uri || process.env.MONGO_URI || process.env.MONGODB_URI;
|
|
16
|
+
validateConfig("MONGO_URI", mongodbUri);
|
|
17
|
+
validateMongoUri(mongodbUri!);
|
|
18
|
+
|
|
19
|
+
try {
|
|
20
|
+
this.client = new MongoClient(mongodbUri!);
|
|
21
|
+
await this.client.connect();
|
|
22
|
+
const targetDbName =
|
|
23
|
+
dbName || process.env.WEBSITALK_DB_NAME || this.defaultDbName;
|
|
24
|
+
this.db = this.client.db(targetDbName);
|
|
25
|
+
setDb(this.db);
|
|
26
|
+
console.info(`[core-db] Website Talk MongoDB connected: ${targetDbName}`);
|
|
27
|
+
} catch (error) {
|
|
28
|
+
console.error("[core-db] Website Talk connection failed", error);
|
|
29
|
+
throw error;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
async disconnect(): Promise<void> {
|
|
34
|
+
if (this.client) {
|
|
35
|
+
try {
|
|
36
|
+
await this.client.close();
|
|
37
|
+
this.client = null;
|
|
38
|
+
this.db = null;
|
|
39
|
+
console.info("Website Talk MongoDB disconnected successfully");
|
|
40
|
+
} catch (error) {
|
|
41
|
+
console.error("[core-db] Website Talk disconnection failed", error);
|
|
42
|
+
throw error;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
getDb(): Db {
|
|
48
|
+
if (!this.db) {
|
|
49
|
+
throw new Error(
|
|
50
|
+
"Website Talk database not initialized. Call connect() first.",
|
|
51
|
+
);
|
|
52
|
+
}
|
|
53
|
+
return this.db;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
isConnected(): boolean {
|
|
57
|
+
return this.client !== null && this.client !== undefined;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export const websitalkMongodbClient = new WebsitalkMongoDBClient();
|
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
import {
|
|
2
|
+
getScansCollection,
|
|
3
|
+
getScansByClientAndDateRange,
|
|
4
|
+
getScanFieldsByClientAndDateRange,
|
|
5
|
+
findScansByQuery,
|
|
6
|
+
countScans,
|
|
7
|
+
createScanDoc,
|
|
8
|
+
updateScanDoc,
|
|
9
|
+
getActiveScanStatus,
|
|
10
|
+
} from "../scans.getters";
|
|
11
|
+
import { createScanFixture } from "../../../test-utils/factories";
|
|
12
|
+
import { ObjectId } from "mongodb";
|
|
13
|
+
|
|
14
|
+
describe("db.websitalk.scans", () => {
|
|
15
|
+
describe("getScansByClientAndDateRange()", () => {
|
|
16
|
+
it("should return full scan documents within the date range", async () => {
|
|
17
|
+
const clientId = "dateRangeClient";
|
|
18
|
+
const startDate = new Date("2023-05-01");
|
|
19
|
+
const endDate = new Date("2023-05-31");
|
|
20
|
+
|
|
21
|
+
const scanInside = createScanFixture({ clientId, status: "COMPLETED" });
|
|
22
|
+
const scanBefore = createScanFixture({ clientId });
|
|
23
|
+
const scanAfter = createScanFixture({ clientId });
|
|
24
|
+
|
|
25
|
+
await getScansCollection().insertMany([
|
|
26
|
+
{ ...scanInside, createdAt: new Date("2023-05-15") },
|
|
27
|
+
{ ...scanBefore, createdAt: new Date("2023-04-30") },
|
|
28
|
+
{ ...scanAfter, createdAt: new Date("2023-06-01") },
|
|
29
|
+
]);
|
|
30
|
+
|
|
31
|
+
const result = await getScansByClientAndDateRange(
|
|
32
|
+
clientId,
|
|
33
|
+
startDate,
|
|
34
|
+
endDate,
|
|
35
|
+
);
|
|
36
|
+
|
|
37
|
+
expect(result.length).toBe(1);
|
|
38
|
+
expect(result[0]).toMatchObject({
|
|
39
|
+
clientId,
|
|
40
|
+
baseUrl: scanInside.baseUrl,
|
|
41
|
+
status: "COMPLETED",
|
|
42
|
+
});
|
|
43
|
+
expect(result[0]).toHaveProperty("siteChrome");
|
|
44
|
+
expect(result[0]).toHaveProperty("skipped");
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
it("should respect the date range boundaries (inclusive)", async () => {
|
|
48
|
+
const clientId = "boundaryClient";
|
|
49
|
+
const onStart = createScanFixture({ clientId });
|
|
50
|
+
const onEnd = createScanFixture({ clientId });
|
|
51
|
+
|
|
52
|
+
await getScansCollection().insertMany([
|
|
53
|
+
{ ...onStart, createdAt: new Date("2023-05-01") },
|
|
54
|
+
{ ...onEnd, createdAt: new Date("2023-05-31") },
|
|
55
|
+
]);
|
|
56
|
+
|
|
57
|
+
const result = await getScansByClientAndDateRange(
|
|
58
|
+
clientId,
|
|
59
|
+
new Date("2023-05-01"),
|
|
60
|
+
new Date("2023-05-31"),
|
|
61
|
+
);
|
|
62
|
+
|
|
63
|
+
expect(result.length).toBe(2);
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
describe("getScanFieldsByClientAndDateRange()", () => {
|
|
68
|
+
it("should return only the requested fields (plus _id)", async () => {
|
|
69
|
+
const clientId = "projectionClient";
|
|
70
|
+
const scan = createScanFixture({
|
|
71
|
+
clientId,
|
|
72
|
+
status: "COMPLETED",
|
|
73
|
+
siteChrome: { url: "https://example.com", sourceType: "site_chrome" },
|
|
74
|
+
skipped: [{ path: "/broken", reason: "HTTP 500" }],
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
await getScansCollection().insertOne({
|
|
78
|
+
...scan,
|
|
79
|
+
createdAt: new Date("2023-05-15"),
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
const [result] = await getScanFieldsByClientAndDateRange(
|
|
83
|
+
clientId,
|
|
84
|
+
new Date("2023-05-01"),
|
|
85
|
+
new Date("2023-05-31"),
|
|
86
|
+
["clientId", "baseUrl", "status"],
|
|
87
|
+
);
|
|
88
|
+
|
|
89
|
+
expect(result).toMatchObject({
|
|
90
|
+
clientId,
|
|
91
|
+
baseUrl: scan.baseUrl,
|
|
92
|
+
status: "COMPLETED",
|
|
93
|
+
});
|
|
94
|
+
expect(result).toHaveProperty("_id");
|
|
95
|
+
expect(result).not.toHaveProperty("siteChrome");
|
|
96
|
+
expect(result).not.toHaveProperty("skipped");
|
|
97
|
+
expect(result).not.toHaveProperty("createdAt");
|
|
98
|
+
});
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
describe("findScansByQuery() / countScans()", () => {
|
|
102
|
+
it("should find scans matching a raw filter and count them", async () => {
|
|
103
|
+
const clientId = "queryClient";
|
|
104
|
+
const completed = createScanFixture({ clientId, status: "COMPLETED" });
|
|
105
|
+
const scanning = createScanFixture({ clientId, status: "SCANNING" });
|
|
106
|
+
|
|
107
|
+
await getScansCollection().insertMany([completed, scanning]);
|
|
108
|
+
|
|
109
|
+
const result = await findScansByQuery({ clientId, status: "COMPLETED" });
|
|
110
|
+
const count = await countScans({ clientId });
|
|
111
|
+
|
|
112
|
+
expect(result.length).toBe(1);
|
|
113
|
+
expect(result[0].baseUrl).toBe(completed.baseUrl);
|
|
114
|
+
expect(count).toBe(2);
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
|
|
118
|
+
describe("createScanDoc()", () => {
|
|
119
|
+
it("should insert a scan with default values for the rest of the fields", async () => {
|
|
120
|
+
const clientId = "createClient";
|
|
121
|
+
const baseUrl = "https://example.com";
|
|
122
|
+
|
|
123
|
+
const { insertedId } = await createScanDoc({ clientId, baseUrl });
|
|
124
|
+
|
|
125
|
+
const result = await getScansCollection().findOne({ _id: insertedId });
|
|
126
|
+
|
|
127
|
+
expect(result).toMatchObject({
|
|
128
|
+
clientId,
|
|
129
|
+
baseUrl,
|
|
130
|
+
status: "CHECKING",
|
|
131
|
+
activeTasksCount: 0,
|
|
132
|
+
pagesScanned: 0,
|
|
133
|
+
pagesSkipped: 0,
|
|
134
|
+
skipped: [],
|
|
135
|
+
siteChrome: {},
|
|
136
|
+
});
|
|
137
|
+
expect(result?.createdAt).toBeInstanceOf(Date);
|
|
138
|
+
expect(result?.updatedAt).toBeInstanceOf(Date);
|
|
139
|
+
});
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
describe("updateScanDoc()", () => {
|
|
143
|
+
it("should update the given fields and bump updatedAt", async () => {
|
|
144
|
+
const scan = createScanFixture({ status: "SCANNING", pagesScanned: 0 });
|
|
145
|
+
const { insertedId } = await getScansCollection().insertOne(scan);
|
|
146
|
+
|
|
147
|
+
const result = await updateScanDoc(insertedId, {
|
|
148
|
+
status: "COMPLETED",
|
|
149
|
+
pagesScanned: 10,
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
expect(result).toMatchObject({
|
|
153
|
+
_id: insertedId,
|
|
154
|
+
status: "COMPLETED",
|
|
155
|
+
pagesScanned: 10,
|
|
156
|
+
});
|
|
157
|
+
expect(result?.updatedAt.getTime()).toBeGreaterThan(
|
|
158
|
+
scan.updatedAt.getTime(),
|
|
159
|
+
);
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
it("should return null when the scan does not exist", async () => {
|
|
163
|
+
const result = await updateScanDoc(new ObjectId(), { status: "FAILED" });
|
|
164
|
+
|
|
165
|
+
expect(result).toBeNull();
|
|
166
|
+
});
|
|
167
|
+
});
|
|
168
|
+
|
|
169
|
+
describe("getActiveScanStatus()", () => {
|
|
170
|
+
it("should return isActive: true with the status when the latest scan is still in progress", async () => {
|
|
171
|
+
const clientId = "activeClient";
|
|
172
|
+
|
|
173
|
+
await getScansCollection().insertMany([
|
|
174
|
+
createScanFixture({
|
|
175
|
+
clientId,
|
|
176
|
+
status: "COMPLETED",
|
|
177
|
+
createdAt: new Date("2023-05-01"),
|
|
178
|
+
}),
|
|
179
|
+
createScanFixture({
|
|
180
|
+
clientId,
|
|
181
|
+
status: "SCANNING",
|
|
182
|
+
createdAt: new Date("2023-05-15"),
|
|
183
|
+
}),
|
|
184
|
+
]);
|
|
185
|
+
|
|
186
|
+
const result = await getActiveScanStatus(clientId);
|
|
187
|
+
|
|
188
|
+
expect(result).toEqual({ isActive: true, status: "SCANNING" });
|
|
189
|
+
});
|
|
190
|
+
|
|
191
|
+
it("should return isActive: false when the latest scan finished (COMPLETED / FAILED)", async () => {
|
|
192
|
+
const clientId = "finishedClient";
|
|
193
|
+
|
|
194
|
+
await getScansCollection().insertMany([
|
|
195
|
+
createScanFixture({
|
|
196
|
+
clientId,
|
|
197
|
+
status: "SCANNING",
|
|
198
|
+
createdAt: new Date("2023-05-01"),
|
|
199
|
+
}),
|
|
200
|
+
createScanFixture({
|
|
201
|
+
clientId,
|
|
202
|
+
status: "FAILED",
|
|
203
|
+
createdAt: new Date("2023-05-15"),
|
|
204
|
+
}),
|
|
205
|
+
]);
|
|
206
|
+
|
|
207
|
+
const result = await getActiveScanStatus(clientId);
|
|
208
|
+
|
|
209
|
+
expect(result).toEqual({ isActive: false });
|
|
210
|
+
});
|
|
211
|
+
|
|
212
|
+
it("should return isActive: false when the client has no scans", async () => {
|
|
213
|
+
const result = await getActiveScanStatus("noScansClient");
|
|
214
|
+
|
|
215
|
+
expect(result).toEqual({ isActive: false });
|
|
216
|
+
});
|
|
217
|
+
});
|
|
218
|
+
});
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
import { Collection, Filter, ObjectId } from "mongodb";
|
|
2
|
+
import { getDb } from "../index";
|
|
3
|
+
import {
|
|
4
|
+
applyQueryOptions,
|
|
5
|
+
QueryOptions,
|
|
6
|
+
} from "../../talkpilot/utils/query.utils";
|
|
7
|
+
import type {
|
|
8
|
+
ActiveScanStatus,
|
|
9
|
+
Scan,
|
|
10
|
+
ScanDoc,
|
|
11
|
+
ScanStatus,
|
|
12
|
+
} from "./scans.types";
|
|
13
|
+
|
|
14
|
+
export const getScansCollection = (): Collection<Scan> => {
|
|
15
|
+
return getDb().collection<Scan>("scans");
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
export const getScansByClientAndDateRange = (
|
|
19
|
+
clientId: string,
|
|
20
|
+
startDate: Date,
|
|
21
|
+
endDate: Date,
|
|
22
|
+
): Promise<ScanDoc[]> => {
|
|
23
|
+
return getScansCollection()
|
|
24
|
+
.find({
|
|
25
|
+
clientId,
|
|
26
|
+
createdAt: {
|
|
27
|
+
$gte: startDate,
|
|
28
|
+
$lte: endDate,
|
|
29
|
+
},
|
|
30
|
+
})
|
|
31
|
+
.toArray();
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
export const getScanFieldsByClientAndDateRange = <K extends keyof Scan>(
|
|
35
|
+
clientId: string,
|
|
36
|
+
startDate: Date,
|
|
37
|
+
endDate: Date,
|
|
38
|
+
fields: K[],
|
|
39
|
+
): Promise<Pick<ScanDoc, "_id" | K>[]> => {
|
|
40
|
+
const projection = fields.reduce<Record<string, 1>>((acc, field) => {
|
|
41
|
+
acc[field as string] = 1;
|
|
42
|
+
return acc;
|
|
43
|
+
}, {});
|
|
44
|
+
|
|
45
|
+
return getScansCollection()
|
|
46
|
+
.find(
|
|
47
|
+
{
|
|
48
|
+
clientId,
|
|
49
|
+
createdAt: {
|
|
50
|
+
$gte: startDate,
|
|
51
|
+
$lte: endDate,
|
|
52
|
+
},
|
|
53
|
+
},
|
|
54
|
+
{ projection },
|
|
55
|
+
)
|
|
56
|
+
.toArray() as Promise<Pick<ScanDoc, "_id" | K>[]>;
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
export const createScanDoc = (
|
|
60
|
+
scan: Pick<Scan, "clientId" | "baseUrl" | "notifyPhoneNumber">,
|
|
61
|
+
) => {
|
|
62
|
+
return getScansCollection().insertOne({
|
|
63
|
+
...scan,
|
|
64
|
+
status: "CHECKING",
|
|
65
|
+
activeTasksCount: 0,
|
|
66
|
+
pagesScanned: 0,
|
|
67
|
+
pagesSkipped: 0,
|
|
68
|
+
skipped: [],
|
|
69
|
+
siteChrome: {} as Scan["siteChrome"],
|
|
70
|
+
createdAt: new Date(),
|
|
71
|
+
updatedAt: new Date(),
|
|
72
|
+
});
|
|
73
|
+
};
|
|
74
|
+
|
|
75
|
+
const FINISHED_SCAN_STATUSES: ScanStatus[] = ["COMPLETED", "FAILED"];
|
|
76
|
+
|
|
77
|
+
export const getActiveScanStatus = async (
|
|
78
|
+
clientId: string,
|
|
79
|
+
): Promise<ActiveScanStatus> => {
|
|
80
|
+
const latestScan = await getScansCollection().findOne(
|
|
81
|
+
{ clientId },
|
|
82
|
+
{ sort: { createdAt: -1 } },
|
|
83
|
+
);
|
|
84
|
+
|
|
85
|
+
if (!latestScan || FINISHED_SCAN_STATUSES.includes(latestScan.status)) {
|
|
86
|
+
return { isActive: false };
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
return { isActive: true, status: latestScan.status };
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
export const updateScanDoc = async (
|
|
93
|
+
scanId: ObjectId,
|
|
94
|
+
updates: Partial<Omit<Scan, "clientId" | "createdAt">>,
|
|
95
|
+
): Promise<ScanDoc | null> => {
|
|
96
|
+
return await getScansCollection().findOneAndUpdate(
|
|
97
|
+
{ _id: scanId },
|
|
98
|
+
{ $set: { ...updates, updatedAt: new Date() } },
|
|
99
|
+
{ returnDocument: "after" },
|
|
100
|
+
);
|
|
101
|
+
};
|
|
102
|
+
|
|
103
|
+
export const findScansByQuery = async (
|
|
104
|
+
query: Filter<Scan>,
|
|
105
|
+
options?: QueryOptions,
|
|
106
|
+
): Promise<ScanDoc[]> => {
|
|
107
|
+
const cursor = getScansCollection().find(query);
|
|
108
|
+
return await applyQueryOptions(cursor, options).toArray();
|
|
109
|
+
};
|
|
110
|
+
|
|
111
|
+
export const countScans = async (query: Filter<Scan>): Promise<number> => {
|
|
112
|
+
return getScansCollection().countDocuments(query);
|
|
113
|
+
};
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { WithId } from "mongodb";
|
|
2
|
+
|
|
3
|
+
export type ScanStatus =
|
|
4
|
+
| "CHECKING"
|
|
5
|
+
| "PREPARING"
|
|
6
|
+
| "SCANNING"
|
|
7
|
+
| "PROCESSING"
|
|
8
|
+
| "COMPLETED"
|
|
9
|
+
| "FAILED";
|
|
10
|
+
|
|
11
|
+
export type ActiveScanStatus =
|
|
12
|
+
| { isActive: true; status: ScanStatus }
|
|
13
|
+
| { isActive: false };
|
|
14
|
+
|
|
15
|
+
export type SiteChromeEntry = {
|
|
16
|
+
url: string;
|
|
17
|
+
urlCanonical?: string | null;
|
|
18
|
+
title?: string | null;
|
|
19
|
+
h1?: string | null;
|
|
20
|
+
language?: string | null;
|
|
21
|
+
sourceType?: string | null;
|
|
22
|
+
status?: string | null;
|
|
23
|
+
context?: string | null;
|
|
24
|
+
contentHash?: string | null;
|
|
25
|
+
errorMessage?: string | null;
|
|
26
|
+
breadcrumbs?: unknown;
|
|
27
|
+
description?: string | null;
|
|
28
|
+
sourceUrl?: string | null;
|
|
29
|
+
fetchedAt?: Date | null;
|
|
30
|
+
createdAt?: Date;
|
|
31
|
+
updatedAt?: Date;
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
export type SkippedEntry = {
|
|
35
|
+
path: string;
|
|
36
|
+
reason: string;
|
|
37
|
+
};
|
|
38
|
+
|
|
39
|
+
export type Scan = {
|
|
40
|
+
clientId: string;
|
|
41
|
+
baseUrl: string;
|
|
42
|
+
notifyPhoneNumber?: string | null;
|
|
43
|
+
status: ScanStatus;
|
|
44
|
+
activeTasksCount: number;
|
|
45
|
+
pagesScanned: number;
|
|
46
|
+
pagesSkipped: number;
|
|
47
|
+
skipped: SkippedEntry[];
|
|
48
|
+
siteChrome: SiteChromeEntry;
|
|
49
|
+
createdAt: Date;
|
|
50
|
+
updatedAt: Date;
|
|
51
|
+
};
|
|
52
|
+
|
|
53
|
+
export type ScanDoc = WithId<Scan>;
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
/** Label used when a ticket has no resolvable department/subject. */
|
|
2
|
-
export declare const UNCLASSIFIED = "\u05DC\u05DC\u05D0 \u05DE\u05D7\u05DC\u05E7\u05D4";
|
|
3
|
-
/** Max execution time (ms) for ticket statistics aggregations. */
|
|
4
|
-
export declare const STATS_MAX_TIME_MS = 30000;
|
|
5
|
-
/** Default look-back window (days) for ticket statistics date ranges. */
|
|
6
|
-
export declare const DEFAULT_LOOKBACK_DAYS = 30;
|
|
7
|
-
//# sourceMappingURL=tickets.constants.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tickets.constants.d.ts","sourceRoot":"","sources":["../../../src/municipal/tickets/tickets.constants.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,eAAO,MAAM,YAAY,sDAAc,CAAC;AAExC,kEAAkE;AAClE,eAAO,MAAM,iBAAiB,QAAS,CAAC;AAExC,yEAAyE;AACzE,eAAO,MAAM,qBAAqB,KAAK,CAAC"}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DEFAULT_LOOKBACK_DAYS = exports.STATS_MAX_TIME_MS = exports.UNCLASSIFIED = void 0;
|
|
4
|
-
/** Label used when a ticket has no resolvable department/subject. */
|
|
5
|
-
exports.UNCLASSIFIED = "ללא מחלקה";
|
|
6
|
-
/** Max execution time (ms) for ticket statistics aggregations. */
|
|
7
|
-
exports.STATS_MAX_TIME_MS = 30_000;
|
|
8
|
-
/** Default look-back window (days) for ticket statistics date ranges. */
|
|
9
|
-
exports.DEFAULT_LOOKBACK_DAYS = 30;
|
|
10
|
-
//# sourceMappingURL=tickets.constants.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tickets.constants.js","sourceRoot":"","sources":["../../../src/municipal/tickets/tickets.constants.ts"],"names":[],"mappings":";;;AAAA,qEAAqE;AACxD,QAAA,YAAY,GAAG,WAAW,CAAC;AAExC,kEAAkE;AACrD,QAAA,iBAAiB,GAAG,MAAM,CAAC;AAExC,yEAAyE;AAC5D,QAAA,qBAAqB,GAAG,EAAE,CAAC"}
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import type { SubjectStatsItem } from "./tickets.types";
|
|
2
|
-
/**
|
|
3
|
-
* @deprecated Use `findCallSidsWithTicketsByCity` with `ticketStatsDateScopeFromYmd` instead.
|
|
4
|
-
* Will be removed in 3.0.0.
|
|
5
|
-
*/
|
|
6
|
-
export declare function getTicketsCountByCityAndDateRange(cityName: string, startStr: string, endStr: string, timezone: string): Promise<number>;
|
|
7
|
-
/**
|
|
8
|
-
* @deprecated Use `findFilteredCallSids` + `findSubjectsByCallSids` instead.
|
|
9
|
-
* Will be removed in 3.0.0.
|
|
10
|
-
*/
|
|
11
|
-
export declare function getTicketsSubjectStats(cityName: string, startStr: string, endStr: string, timezone: string): Promise<SubjectStatsItem[]>;
|
|
12
|
-
//# sourceMappingURL=tickets.deprecated.getters.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tickets.deprecated.getters.d.ts","sourceRoot":"","sources":["../../../src/municipal/tickets/tickets.deprecated.getters.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD;;;GAGG;AACH,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAoG7B"}
|
|
@@ -1,131 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getTicketsCountByCityAndDateRange = getTicketsCountByCityAndDateRange;
|
|
4
|
-
exports.getTicketsSubjectStats = getTicketsSubjectStats;
|
|
5
|
-
const tickets_getters_1 = require("./tickets.getters");
|
|
6
|
-
/**
|
|
7
|
-
* @deprecated Use `findCallSidsWithTicketsByCity` with `ticketStatsDateScopeFromYmd` instead.
|
|
8
|
-
* Will be removed in 3.0.0.
|
|
9
|
-
*/
|
|
10
|
-
async function getTicketsCountByCityAndDateRange(cityName, startStr, endStr, timezone) {
|
|
11
|
-
const doc = await (0, tickets_getters_1.getTicketsCollection)()
|
|
12
|
-
.aggregate([
|
|
13
|
-
{ $match: { cityName, callSid: { $exists: true, $nin: [null, ""] } } },
|
|
14
|
-
{
|
|
15
|
-
$addFields: {
|
|
16
|
-
dateLocal: {
|
|
17
|
-
$dateToString: { format: "%Y-%m-%d", date: "$createdAt", timezone },
|
|
18
|
-
},
|
|
19
|
-
},
|
|
20
|
-
},
|
|
21
|
-
{ $match: { dateLocal: { $gte: startStr, $lte: endStr } } },
|
|
22
|
-
{ $count: "n" },
|
|
23
|
-
])
|
|
24
|
-
.next();
|
|
25
|
-
return doc?.n ?? 0;
|
|
26
|
-
}
|
|
27
|
-
/**
|
|
28
|
-
* @deprecated Use `findFilteredCallSids` + `findSubjectsByCallSids` instead.
|
|
29
|
-
* Will be removed in 3.0.0.
|
|
30
|
-
*/
|
|
31
|
-
async function getTicketsSubjectStats(cityName, startStr, endStr, timezone) {
|
|
32
|
-
const rows = await (0, tickets_getters_1.getTicketsCollection)()
|
|
33
|
-
.aggregate([
|
|
34
|
-
{ $match: { cityName } },
|
|
35
|
-
{
|
|
36
|
-
$addFields: {
|
|
37
|
-
dateLocal: {
|
|
38
|
-
$dateToString: { format: "%Y-%m-%d", date: "$createdAt", timezone },
|
|
39
|
-
},
|
|
40
|
-
},
|
|
41
|
-
},
|
|
42
|
-
{ $match: { dateLocal: { $gte: startStr, $lte: endStr } } },
|
|
43
|
-
{
|
|
44
|
-
$addFields: {
|
|
45
|
-
effectiveSubjectId: {
|
|
46
|
-
$ifNull: [
|
|
47
|
-
"$externalCallFields.event_subject_id",
|
|
48
|
-
{
|
|
49
|
-
$ifNull: [
|
|
50
|
-
"$externalCallFields.event_sub_subject_id",
|
|
51
|
-
"$externalCallFields.event_sub_subject_id2",
|
|
52
|
-
],
|
|
53
|
-
},
|
|
54
|
-
],
|
|
55
|
-
},
|
|
56
|
-
},
|
|
57
|
-
},
|
|
58
|
-
{
|
|
59
|
-
$lookup: {
|
|
60
|
-
from: "departmentsSubjects",
|
|
61
|
-
let: { sid: "$effectiveSubjectId", c: cityName },
|
|
62
|
-
pipeline: [
|
|
63
|
-
{
|
|
64
|
-
$match: {
|
|
65
|
-
$expr: {
|
|
66
|
-
$and: [
|
|
67
|
-
{ $eq: ["$cityName", "$$c"] },
|
|
68
|
-
{
|
|
69
|
-
$or: [
|
|
70
|
-
{ $eq: ["$subject_id", { $ifNull: ["$$sid", ""] }] },
|
|
71
|
-
{
|
|
72
|
-
$eq: ["$sub_subject_id", { $ifNull: ["$$sid", ""] }],
|
|
73
|
-
},
|
|
74
|
-
{
|
|
75
|
-
$eq: ["$sub_subject_id2", { $ifNull: ["$$sid", ""] }],
|
|
76
|
-
},
|
|
77
|
-
],
|
|
78
|
-
},
|
|
79
|
-
],
|
|
80
|
-
},
|
|
81
|
-
},
|
|
82
|
-
},
|
|
83
|
-
{ $limit: 1 },
|
|
84
|
-
],
|
|
85
|
-
as: "subj",
|
|
86
|
-
},
|
|
87
|
-
},
|
|
88
|
-
{
|
|
89
|
-
$addFields: {
|
|
90
|
-
subject_id: {
|
|
91
|
-
$cond: {
|
|
92
|
-
if: { $gt: [{ $size: "$subj" }, 0] },
|
|
93
|
-
then: {
|
|
94
|
-
$ifNull: [{ $arrayElemAt: ["$subj.subject_id", 0] }, ""],
|
|
95
|
-
},
|
|
96
|
-
else: "",
|
|
97
|
-
},
|
|
98
|
-
},
|
|
99
|
-
subject: {
|
|
100
|
-
$cond: {
|
|
101
|
-
if: { $gt: [{ $size: "$subj" }, 0] },
|
|
102
|
-
then: {
|
|
103
|
-
$ifNull: [
|
|
104
|
-
{ $arrayElemAt: ["$subj.subjectName", 0] },
|
|
105
|
-
"Unclassified",
|
|
106
|
-
],
|
|
107
|
-
},
|
|
108
|
-
else: "Unclassified",
|
|
109
|
-
},
|
|
110
|
-
},
|
|
111
|
-
},
|
|
112
|
-
},
|
|
113
|
-
{
|
|
114
|
-
$group: {
|
|
115
|
-
_id: "$subject_id",
|
|
116
|
-
subject: { $first: "$subject" },
|
|
117
|
-
count: { $sum: 1 },
|
|
118
|
-
},
|
|
119
|
-
},
|
|
120
|
-
{ $sort: { count: -1 } },
|
|
121
|
-
])
|
|
122
|
-
.toArray();
|
|
123
|
-
const total = rows.reduce((sum, row) => sum + row.count, 0);
|
|
124
|
-
return rows.map((row) => ({
|
|
125
|
-
subject_name: row.subject,
|
|
126
|
-
subject_id: row._id,
|
|
127
|
-
count: row.count,
|
|
128
|
-
percentage: total > 0 ? Math.round((row.count / total) * 100) : 0,
|
|
129
|
-
}));
|
|
130
|
-
}
|
|
131
|
-
//# sourceMappingURL=tickets.deprecated.getters.js.map
|