tabletcommand-incident 0.6.7 → 0.6.9

package/src/rules/set-common-place-name.ts

@@ -4,7 +4,7 @@ import { CADIncident } from "tabletcommand-backend-models";
 import { IncidentRule, IncidentRuleChange } from ".";
 
 export class IncidentRuleSetCommonPlaceName implements IncidentRule {
-  name = "Set Common Place Name";
+  name = "Set Common Place Name Backup";
   matched = false;
   changed = false;
   changes: IncidentRuleChange[] = [];
@@ -15,10 +15,15 @@ export class IncidentRuleSetCommonPlaceName implements IncidentRule {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   apply(item: Partial<CADIncident>, _atDate: Date): Partial<CADIncident> {
-    if (_.isString(item.LocationComment) && _.trim(item.LocationComment) !== "" && !_.isString(item.CommonPlaceName)) {
-      item.CommonPlaceName = _.clone(item.LocationComment);
-      
-      delete item.LocationComment;
+    const commonPlaceName = _.isString(item.CommonPlaceName) ? item.CommonPlaceName?.trim() : "";
+    const locationComment = _.isString(item.LocationComment) ? item.LocationComment?.trim() : "";
+    item.CommonPlaceNameCopy = commonPlaceName;
+
+    // This module only copies the original commonPlaceName to CommonPlaceNameCopy
+    // A change in merge/flatten is required to accommodate for accounts where
+    // LocationComment and CommonPlaceName are not sent in the same request
+
+    if (commonPlaceName !== "") {
       this.matched = true;
       this.changed = true;
       this.changes.push({
@@ -26,8 +31,9 @@ export class IncidentRuleSetCommonPlaceName implements IncidentRule {
         matched: this.matched,
         changed: this.changed,
         change: {
-          CommonPlaceName: item.CommonPlaceName,
-          LocationComment: undefined,
+          CommonPlaceName: commonPlaceName,
+          CommonPlaceNameCopy: commonPlaceName,
+          LocationComment: locationComment,
         }
       });
     }

package/src/test/domain.ts

@@ -638,4 +638,51 @@ describe("mergeIncidents", function() {
     assert.equal(c?.CallerId, "(123) 456-789");
     assert.equal(c?.UncertaintyRadius, 401);
   });
+
+  it("merge CommonPlaceName", function() {
+    const item1: Partial<CADIncident> = {
+      IncidentNumber: "4000",
+    };
+
+    const item2: Partial<CADIncident> = {
+      IncidentNumber: "4000",
+      LocationComment: "100 Bono Dr",
+    };
+
+    const itemA = domain.mergeIncidentsV3([item1, item2], item1);
+    assert.equal(itemA.IncidentNumber, item1.IncidentNumber);
+    assert.equal(itemA.CommonPlaceName, "100 Bono Dr");
+
+    const item3: Partial<CADIncident> = {
+      IncidentNumber: "4000",
+      CommonPlaceName: "East House",
+      CommonPlaceNameCopy: "East House",
+    };
+    const itemB = domain.mergeIncidentsV3([item1, item2, item3], item1);
+    assert.equal(itemB.IncidentNumber, item1.IncidentNumber);
+    assert.equal(itemB.CommonPlaceNameCopy, item3.CommonPlaceNameCopy);
+    assert.equal(itemB.LocationComment, item2.LocationComment);
+    assert.equal(itemB.CommonPlaceName, "100 Bono Dr - East House");
+
+    const item4: Partial<CADIncident> = {
+      IncidentNumber: "4000",
+      LocationComment: "200 Bono Dr",
+    };
+    const itemC = domain.mergeIncidentsV3([item1, item2, item3, item4], item1);
+    assert.equal(itemC.IncidentNumber, item1.IncidentNumber);
+    assert.equal(itemC.CommonPlaceNameCopy, item3.CommonPlaceNameCopy);
+    assert.equal(itemC.LocationComment, item4.LocationComment);
+    assert.equal(itemC.CommonPlaceName, "200 Bono Dr - East House");
+
+    const item5: Partial<CADIncident> = {
+      IncidentNumber: "4000",
+      CommonPlaceName: "West House",
+      CommonPlaceNameCopy: "West House",
+    };
+    const itemD = domain.mergeIncidentsV3([item1, item2, item3, item4, item5], item1);
+    assert.equal(itemD.IncidentNumber, item1.IncidentNumber);
+    assert.equal(itemD.CommonPlaceNameCopy, item5.CommonPlaceNameCopy);
+    assert.equal(itemD.LocationComment, item4.LocationComment);
+    assert.equal(itemD.CommonPlaceName, "200 Bono Dr - West House");
+  });
 });

package/src/test/index.ts

@@ -63,7 +63,6 @@ describe("index", function() {
         assert.equal(incident?.CrossStreet1, undefined);
         assert.equal(incident?.CrossStreet2, undefined);
 
-        // expect CommonPlaceName to be copied from LocationComment
         assert.equal(incident?.CommonPlaceName, expectedCommonPlaceName);
 
         // copied here by the IncidentRuleCopyIncidentNumber rule
@@ -356,6 +355,36 @@ describe("index", function() {
     });
   });
 
+  context("Demo RTS - 0003 - LocationComment/CommonPlaceName changes", function() {
+    const atDate = new Date();
+    const sampleIncidentNumber = "DEMO-RTS-0003";
+
+    it("process stream through correction", async function() {
+      const department = mock.departmentDemoRTS;
+      const departmentId = department._id.toString();
+      const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
+      const streamItem = _.first(existingStreamItems);
+
+      if (!streamItem) {
+        assert.fail("Expecting a stream item");
+        return;
+      }
+
+      const sut1 = await incidentProcessor.handleProcessIncidentRequestCorrection(streamItem.incidentNumber, department, atDate);
+      if ("error" in sut1) {
+        assert.fail(sut1.error.toString());
+      } else {
+        const {
+          incident,
+        } = sut1;
+
+        assert.equal(incident?.CommonPlaceName, "200 Bono Dr - West Housing");
+      }
+
+      // validateRulesResult(sut);
+    });
+  });
+
   context("Jackson County - Testing", function() {
     const atDate = new Date();
     const sampleIncidentNumber = "Jackson-County-Test-0001";

package/src/test/mock.ts

@@ -1,5 +1,4 @@
 import _ from "lodash";
-import { Collection } from "mongodb";
 import {
   BackendModels,
   CADIncident,
@@ -411,6 +410,57 @@ export default function({
         "ClosedDateTime": "2022-10-26T17:19:49-04:00",
       }
     },
+    {
+      departmentId,
+      "incidentNumber": "DEMO-RTS-0003",
+      "createdAt": new Date("2022-10-26T22:03:10.101+0000"),
+      "payload": {
+        "AgencyID": "Demo RTS AgencyId",
+        "IncidentNumber": "DEMO-RTS-0003",
+        "AgencyIncidentCallTypeDescription": "Test Description 3",
+        "EntryDateTime": "2022-10-26T17:09:49-04:00",
+        "Longitude": "-115.355705",
+        "Latitude": "37.959790",
+        "ClosedDateTime": "",
+        "LocationComment": "100 Bono Dr",
+      }
+    },
+    {
+      departmentId,
+      "incidentNumber": "DEMO-RTS-0003",
+      "createdAt": new Date("2022-10-26T22:03:10.201+0000"),
+      "payload": {
+        "AgencyID": "Demo RTS AgencyId",
+        "IncidentNumber": "DEMO-RTS-0003",
+        "EntryDateTime": "2022-10-26T17:09:49-04:00",
+        "ClosedDateTime": "",
+        "CommonPlaceName": "East Housing",
+      }
+    },
+    {
+      departmentId,
+      "incidentNumber": "DEMO-RTS-0003",
+      "createdAt": new Date("2022-10-26T22:03:10.301+0000"),
+      "payload": {
+        "AgencyID": "Demo RTS AgencyId",
+        "IncidentNumber": "DEMO-RTS-0003",
+        "EntryDateTime": "2022-10-26T17:09:49-04:00",
+        "ClosedDateTime": "",
+        "LocationComment": "200 Bono Dr",
+      }
+    },
+    {
+      departmentId,
+      "incidentNumber": "DEMO-RTS-0003",
+      "createdAt": new Date("2022-10-26T22:03:10.401+0000"),
+      "payload": {
+        "AgencyID": "Demo RTS AgencyId",
+        "IncidentNumber": "DEMO-RTS-0003",
+        "EntryDateTime": "2022-10-26T17:09:49-04:00",
+        "ClosedDateTime": "",
+        "CommonPlaceName": "West Housing",
+      }
+    },
     // Jackson County
     {
       departmentId: departmentJacksonCountyTest._id.toString(),
@@ -840,6 +890,7 @@ export default function({
         }
       ],
       "closed_unix_date": 0,
+      is_closed: false,
       "start_unix_date": 1695905024,
       Comment: [
         {
@@ -875,27 +926,28 @@ export default function({
       process.exit(1);
     }
 
-    const items: Collection[] = await mongoose.connection.db.collections();
-    await flushCollections(items, 0);
+    await flushCollections();
     // await mongoose.connection.db.dropDatabase();
     await prepareTestData();
   }
 
-  async function flushCollections(items: Collection[], index: number) {
-    if (index >= items.length) {
-      return;
+  async function flushCollections() {
+    const modelNames = mongoose.modelNames();
+    for (const modelName of modelNames) {
+      // debug(`Model ${modelName}`);
+      const m = mongoose.model(modelName);
+      await m.deleteMany({});
+      try {
+        await m.syncIndexes();
+      } catch (error) {
+        console.log(`Failed to sync index ${modelName}`);
+        console.error(error);
+        process.exit(1);
+      }
     }
-
-    const collection = items[index];
-    // console.log(`Emptying ${collection.collectionName}.`);
-    await collection.deleteMany({});
-    await flushCollections(items, index + 1);
   }
 
   async function prepareTestData() {
-    // Create indexes
-    await models.CADIncident.createIndexes();
-
     for (const item of [
       departmentAlameda,
       departmentCalfireLNU,

package/src/test/rules/set-common-place-name.ts

@@ -6,12 +6,14 @@ import {
 } from "../../rules/set-common-place-name";
 
 describe("IncidentRuleSetCommonPlaceName", function describeFunc() {
-  it("sets common place name", function() {
+  it("if both are present, LocationComment - CommonPlaceName is copied to CommonPlaceName", function() {
     const LocationComment = "1700 Botelho Dr";
+    const CommonPlaceName = "SAC HOUSING";
     const testMatchIncidentWithAddress = {
       IncidentNumber: "i1238",
       departmentId: "515",
       LocationComment,
+      CommonPlaceName,
     };
 
     const dateStr = "2022-12-08T11:53:42.000Z";
@@ -20,6 +22,8 @@ describe("IncidentRuleSetCommonPlaceName", function describeFunc() {
     const result = rule.apply(testMatchIncidentWithAddress, atDate);
     assert.isTrue(rule.matched);
     assert.isTrue(rule.changed);
-    assert.equal(result.CommonPlaceName, LocationComment);
+    assert.equal(result.CommonPlaceName, CommonPlaceName);
+    assert.equal(result.CommonPlaceNameCopy, CommonPlaceName);
+    assert.equal(result.LocationComment, LocationComment);
   });
 });