linting

database/getContracts.d.ts

@@ -25,6 +25,6 @@ export interface GetContractsOptions {
     includeTransactions: boolean;
 }
 export default function getContracts(filters: GetContractsFilters, options: GetContractsOptions, connectedDatabase?: sqlite.Database): Promise<{
-    count: number;
     contracts: Contract[];
+    count: number;
 }>;

database/getContracts.js

@@ -11,7 +11,7 @@ export default async function getContracts(filters, options, connectedDatabase)
     const database = connectedDatabase ?? sqlite(sunriseDB);
     database.function('userFn_dateIntegerToString', dateIntegerToString);
     database.function('userFn_timeIntegerToString', timeIntegerToString);
-    const { sqlWhereClause, sqlParameters } = buildWhereClause(filters);
+    const { sqlParameters, sqlWhereClause } = buildWhereClause(filters);
     let count = typeof options.limit === 'string'
         ? Number.parseInt(options.limit, 10)
         : options.limit;
@@ -76,8 +76,8 @@ export default async function getContracts(filters, options, connectedDatabase)
         database.close();
     }
     return {
-        count,
+        contracts,
-        contracts
+        count
     };
 }
 async function addInclusions(contract, options, database) {

database/getContracts.ts

@@ -55,13 +55,13 @@ export default async function getContracts(
   filters: GetContractsFilters,
   options: GetContractsOptions,
   connectedDatabase?: sqlite.Database
-): Promise<{ count: number; contracts: Contract[] }> {
+): Promise<{ contracts: Contract[]; count: number }> {
   const database = connectedDatabase ?? sqlite(sunriseDB)
 
   database.function('userFn_dateIntegerToString', dateIntegerToString)
   database.function('userFn_timeIntegerToString', timeIntegerToString)
 
-  const { sqlWhereClause, sqlParameters } = buildWhereClause(filters)
+  const { sqlParameters, sqlWhereClause } = buildWhereClause(filters)
 
   let count =
     typeof options.limit === 'string'
@@ -148,8 +148,8 @@ export default async function getContracts(
   }
 
   return {
-    count,
+    contracts,
-    contracts
+    count
   }
 }
 

handlers/contracts-post/doSearchContracts.js

@@ -3,15 +3,15 @@ export default async function handler(request, response) {
     const result = await getContracts(request.body, {
         limit: request.body.limit,
         offset: request.body.offset,
-        includeInterments: true,
         includeFees: true,
+        includeInterments: true,
         includeTransactions: true
     });
     response.json({
+        contracts: result.contracts,
         count: result.count,
         offset: typeof request.body.offset === 'string'
             ? Number.parseInt(request.body.offset, 10)
-            : request.body.offset,
+            : request.body.offset
-        contracts: result.contracts
     });
 }

handlers/contracts-post/doSearchContracts.ts

@@ -6,27 +6,24 @@ import getContracts, {
 } from '../../database/getContracts.js'
 
 export default async function handler(
-  request: Request<
+  request: Request<unknown, unknown, GetContractsFilters & GetContractsOptions>,
-    unknown,
-    unknown,
-    GetContractsFilters & GetContractsOptions
-  >,
   response: Response
 ): Promise<void> {
   const result = await getContracts(request.body, {
     limit: request.body.limit,
     offset: request.body.offset,
-    includeInterments: true,
+
     includeFees: true,
+    includeInterments: true,
     includeTransactions: true
   })
 
   response.json({
+    contracts: result.contracts,
     count: result.count,
     offset:
       typeof request.body.offset === 'string'
         ? Number.parseInt(request.body.offset, 10)
-        : request.body.offset,
+        : request.body.offset
-    contracts: result.contracts
   })
 }

views/report-search.ejs

@@ -135,7 +135,7 @@
             </div>
             <div>
               <h2 class="title is-5 mb-0">
-                Current Contract By Cemetery
+                Current Contracts By Cemetery
               </h2>
               <div class="field has-addons mt-2">
                 <div class="control">