add comment when copying

cityssm · Jul 2, 2024 · 7f2d763 · 7f2d763
1 parent 169dc4b
commit 7f2d763
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/database/copyLotOccupancy.js b/database/copyLotOccupancy.js
@@ -1,11 +1,12 @@
 import { dateToString } from '@cityssm/utils-datetime';
 import addLotOccupancy from './addLotOccupancy.js';
+import addLotOccupancyComment from './addLotOccupancyComment.js';
 import addLotOccupancyOccupant from './addLotOccupancyOccupant.js';
 import getLotOccupancy from './getLotOccupancy.js';
 import { acquireConnection } from './pool.js';
 export default async function copyLotOccupancy(oldLotOccupancyId, user) {
     const database = await acquireConnection();
-    const oldLotOccupancy = (await getLotOccupancy(oldLotOccupancyId, database));
+    const oldLotOccupancy = await getLotOccupancy(oldLotOccupancyId, database);
     const newLotOccupancyId = await addLotOccupancy({
         lotId: oldLotOccupancy.lotId ?? '',
         occupancyTypeId: oldLotOccupancy.occupancyTypeId,
@@ -43,6 +44,13 @@ export default async function copyLotOccupancy(oldLotOccupancyId, user) {
             occupantEmailAddress: occupant.occupantEmailAddress
         }, user, database);
     }
+    /*
+     * Add Comment
+     */
+    await addLotOccupancyComment({
+        lotOccupancyId: newLotOccupancyId,
+        lotOccupancyComment: `New record copied from #${oldLotOccupancyId}.`
+    }, user);
     database.release();
     return newLotOccupancyId;
 }
diff --git a/database/copyLotOccupancy.ts b/database/copyLotOccupancy.ts
@@ -1,6 +1,9 @@
 import { dateToString } from '@cityssm/utils-datetime'
 
+import type { LotOccupancy } from '../types/recordTypes.js'
+
 import addLotOccupancy from './addLotOccupancy.js'
+import addLotOccupancyComment from './addLotOccupancyComment.js'
 import addLotOccupancyOccupant from './addLotOccupancyOccupant.js'
 import getLotOccupancy from './getLotOccupancy.js'
 import { acquireConnection } from './pool.js'
@@ -11,12 +14,12 @@ export default async function copyLotOccupancy(
 ): Promise<number> {
   const database = await acquireConnection()
 
-  const oldLotOccupancy = (await getLotOccupancy(oldLotOccupancyId, database))!
+  const oldLotOccupancy = await getLotOccupancy(oldLotOccupancyId, database) as LotOccupancy
 
   const newLotOccupancyId = await addLotOccupancy(
     {
       lotId: oldLotOccupancy.lotId ?? '',
-      occupancyTypeId: oldLotOccupancy.occupancyTypeId!,
+      occupancyTypeId: oldLotOccupancy.occupancyTypeId,
       occupancyStartDateString: dateToString(new Date()),
       occupancyEndDateString: ''
     },
@@ -74,6 +77,15 @@ export default async function copyLotOccupancy(
     )
   }
 
+  /*
+   * Add Comment
+   */
+
+  await addLotOccupancyComment({
+    lotOccupancyId: newLotOccupancyId,
+    lotOccupancyComment: `New record copied from #${oldLotOccupancyId}.`
+  }, user)
+
   database.release()
 
   return newLotOccupancyId