[Fix] Issue with deep entity normilization

Fixed a bug where only the top level of an exported entity would be
normalized.
References #59, #60, #61 and #62.

server/services/core/@types/global.d.ts

@@ -404,7 +404,7 @@ export interface QueueMessage {
 export interface DatabaseClient {
   query<R extends QueryResultRow = any, I extends any[] = any[]>(
     queryTextOrConfig: string | QueryConfig<I>,
-    values?: I,
+    values?: any[],
   ): Promise<QueryResult<R>>;
 }
 

server/services/core/entities/utilities.ts

@@ -20,8 +20,8 @@ export function exportToNormalEntity<T extends Object, U extends Object>(
         // Checking whether there is a nested object within the value. If there
         // is, this function is run on it. Otherwise only the result from the
         // getter is stored.
-        typeof entry[1] === 'object' ? exportToNormalEntity(entry[1]()) :
-                                       entry[1](),
+        typeof entry[1]() === 'object' ? exportToNormalEntity(entry[1]()) :
+                                         entry[1](),
       ] : []),
   );
 }

server/services/order-service/src/entities/order/index.ts

@@ -3,7 +3,6 @@ import ipRegex from 'ip-regex';
 import buildMakeOrder from './order';
 import validator from '../../../../core/entities/validator';
 import buildSource from '../../../../core/entities/source';
-import decompressOrder from './order-decompress';
 
 const makeSource = buildSource({isValidIp});
 const makeOrder = buildMakeOrder({
@@ -23,4 +22,3 @@ function isValidIp(ip: string): boolean {
 }
 
 export default makeOrder;
-export {decompressOrder};

server/services/order-service/src/interfaces/orders-database/orders-database.spec.ts

@@ -1,13 +1,20 @@
 import makeOrdersDatabase from './orders-database';
 import makeFakeOrder from '../../../test/fixtures/order';
-import makeOrder, {decompressOrder} from '../../entities/order';
+import makeOrder from '../../entities/order';
 import makeFakeDatabaseClient from '../../../test/fixtures/database-client';
-import {OrderDatabaseController} from '../../../../core/@types/global';
+import {
+  Order,
+  OrderDatabaseController,
+  OrderExport,
+} from '../../../../core/@types/global';
+import {exportToNormalEntity} from '../../../../core/entities/utilities';
 
 
 describe('order-database', () => {
   let ordersDatabase: OrderDatabaseController;
-  const order = decompressOrder(makeOrder(makeFakeOrder()));
+  const order = exportToNormalEntity<OrderExport, Order>(
+      makeOrder(makeFakeOrder()),
+  );
   const databaseClient = makeFakeDatabaseClient(order);
 
   beforeEach(async () => {