From dcbaad753b97ed54f8c71bb029e908ab20cd1dc1 Mon Sep 17 00:00:00 2001
From: Dan Gowans <dangowans@users.noreply.github.com>
Date: Wed, 23 Apr 2025 14:13:45 -0400
Subject: [PATCH] linting

---
 database/addContractComment.d.ts     |  2 +-
 database/addContractComment.ts       |  3 ++-
 database/addContractInterment.d.ts   | 14 +++++++-------
 database/addContractInterment.ts     | 20 +++++++++++++-------
 database/addContractTransaction.d.ts |  4 ++--
 database/addContractTransaction.ts   |  6 ++++--
 6 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/database/addContractComment.d.ts b/database/addContractComment.d.ts
index aba2b60b..f05b9934 100644
--- a/database/addContractComment.d.ts
+++ b/database/addContractComment.d.ts
@@ -1,8 +1,8 @@
 import { type DateString, type TimeString } from '@cityssm/utils-datetime';
 export interface AddContractCommentForm {
+    contractId: number | string;
     comment: string;
     commentDateString?: DateString;
     commentTimeString?: TimeString;
-    contractId: number | string;
 }
 export default function addContractComment(commentForm: AddContractCommentForm, user: User): Promise<number>;
diff --git a/database/addContractComment.ts b/database/addContractComment.ts
index c051b4fb..91b8e93a 100644
--- a/database/addContractComment.ts
+++ b/database/addContractComment.ts
@@ -10,10 +10,11 @@ import {
 import { acquireConnection } from './pool.js'
 
 export interface AddContractCommentForm {
+  contractId: number | string
+  
   comment: string
   commentDateString?: DateString
   commentTimeString?: TimeString
-  contractId: number | string
 }
 
 export default async function addContractComment(
diff --git a/database/addContractInterment.d.ts b/database/addContractInterment.d.ts
index 8eaf691f..811bf530 100644
--- a/database/addContractInterment.d.ts
+++ b/database/addContractInterment.d.ts
@@ -1,19 +1,19 @@
-import { type DateString } from '@cityssm/utils-datetime';
 import type { PoolConnection } from 'better-sqlite-pool';
+import { type DateString } from '@cityssm/utils-datetime';
 export interface AddForm {
-    contractId: string | number;
+    contractId: number | string;
     deceasedName: string;
     deceasedAddress1: string;
     deceasedAddress2: string;
     deceasedCity: string;
-    deceasedProvince: string;
     deceasedPostalCode: string;
-    birthDateString: DateString | '';
+    deceasedProvince: string;
+    birthDateString: '' | DateString;
     birthPlace: string;
-    deathDateString: DateString | '';
+    deathDateString: '' | DateString;
     deathPlace: string;
-    deathAge: string | number;
+    deathAge: number | string;
     deathAgePeriod: string;
-    intermentContainerTypeId: string | number;
+    intermentContainerTypeId: number | string;
 }
 export default function addContractInterment(contractForm: AddForm, user: User, connectedDatabase?: PoolConnection): Promise<number>;
diff --git a/database/addContractInterment.ts b/database/addContractInterment.ts
index b0355cf5..9baa1e28 100644
--- a/database/addContractInterment.ts
+++ b/database/addContractInterment.ts
@@ -1,23 +1,29 @@
-import { type DateString, dateStringToInteger } from '@cityssm/utils-datetime'
 import type { PoolConnection } from 'better-sqlite-pool'
 
+import { type DateString, dateStringToInteger } from '@cityssm/utils-datetime'
+
 import { acquireConnection } from './pool.js'
 
 export interface AddForm {
-  contractId: string | number
+  contractId: number | string
+
   deceasedName: string
+
   deceasedAddress1: string
   deceasedAddress2: string
   deceasedCity: string
-  deceasedProvince: string
   deceasedPostalCode: string
-  birthDateString: DateString | ''
+  deceasedProvince: string
+
+  birthDateString: '' | DateString
   birthPlace: string
-  deathDateString: DateString | ''
+  deathDateString: '' | DateString
   deathPlace: string
-  deathAge: string | number
+
+  deathAge: number | string
   deathAgePeriod: string
-  intermentContainerTypeId: string | number
+  
+  intermentContainerTypeId: number | string
 }
 
 export default async function addContractInterment(
diff --git a/database/addContractTransaction.d.ts b/database/addContractTransaction.d.ts
index fa255b88..a55f778d 100644
--- a/database/addContractTransaction.d.ts
+++ b/database/addContractTransaction.d.ts
@@ -1,9 +1,9 @@
 export interface AddTransactionForm {
-    contractId: string | number;
+    contractId: number | string;
     transactionDateString?: string;
     transactionTimeString?: string;
-    transactionAmount: string | number;
     externalReceiptNumber: string;
+    transactionAmount: number | string;
     transactionNote: string;
 }
 export default function addContractTransaction(contractTransactionForm: AddTransactionForm, user: User): Promise<number>;
diff --git a/database/addContractTransaction.ts b/database/addContractTransaction.ts
index 4ec27e45..48c51207 100644
--- a/database/addContractTransaction.ts
+++ b/database/addContractTransaction.ts
@@ -8,11 +8,13 @@ import {
 import { acquireConnection } from './pool.js'
 
 export interface AddTransactionForm {
-  contractId: string | number
+  contractId: number | string
+
   transactionDateString?: string
   transactionTimeString?: string
-  transactionAmount: string | number
+
   externalReceiptNumber: string
+  transactionAmount: number | string
   transactionNote: string
 }