refactor: file structure organization (#106)

Author: cshezi

__tests__/unit/app.eventFlow.test.ts

@@ -9,7 +9,7 @@ import {
   handleRefreshCache,
   handleUpdateExpiryDateForConditionsOfAccount,
   handleUpdateExpiryDateForConditionsOfEntity,
-} from '../../src/logic.service';
+} from '../../src/services/event-flow.logic.service';
 import {
   accountResponse,
   entityResponse,

__tests__/unit/app.report.test.ts

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { unwrap } from '@tazama-lf/frms-coe-lib/lib/helpers/unwrap';
 import { databaseManager, loggerService } from '../../src';
-import { handleGetReportRequestByMsgId } from '../../src/logic.service';
+import { handleGetReportRequestByMsgId } from '../../src/services/report.logic.service';
 
 jest.mock('@tazama-lf/frms-coe-lib', () => {
   const original = jest.requireActual('@tazama-lf/frms-coe-lib');

jest.config.ts

@@ -25,7 +25,7 @@ const config: Config.InitialOptions = {
 
   // An array of glob patterns indicating a set of files for which coverage information should be collected
   // collectCoverageFrom: ['src/app.controller.ts'],
-  collectCoverageFrom: ['src/logic.service.ts'],
+  collectCoverageFrom: ['src/services/**'],
 
   // The directory where Jest should output its coverage files
   coverageDirectory: '<rootDir>/coverage/',

src/app.controller.ts

@@ -1,20 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 
+import { type AccountCondition, type EntityCondition } from '@tazama-lf/frms-coe-lib/lib/interfaces';
+import { type FastifyReply, type FastifyRequest } from 'fastify';
+import { loggerService } from '.';
+import { configuration } from './config';
+import { type ConditionRequest } from './interface/query';
 import {
+  handleGetConditionsForAccount,
   handleGetConditionsForEntity,
-  handleGetReportRequestByMsgId,
-  handlePostConditionEntity,
   handlePostConditionAccount,
-  handleGetConditionsForAccount,
+  handlePostConditionEntity,
+  handleRefreshCache,
   handleUpdateExpiryDateForConditionsOfAccount,
   handleUpdateExpiryDateForConditionsOfEntity,
-  handleRefreshCache,
-} from './logic.service';
-import { type FastifyRequest, type FastifyReply } from 'fastify';
-import { loggerService } from '.';
-import { type ConditionRequest } from './interface/query';
-import { type AccountCondition, type EntityCondition } from '@tazama-lf/frms-coe-lib/lib/interfaces';
-import { configuration } from './config';
+} from './services/event-flow.logic.service';
+import { handleGetReportRequestByMsgId } from './services/report.logic.service';
 export const reportRequestHandler = async (req: FastifyRequest, reply: FastifyReply): Promise<void> => {
   loggerService.log('Start - Handle report request');
   try {

src/logic.service.ts src/services/event-flow.logic.service.ts

@@ -1,24 +1,23 @@
 // SPDX-License-Identifier: Apache-2.0
+import { createSimpleConditionsBuffer } from '@tazama-lf/frms-coe-lib/lib/helpers/protobuf';
 import { unwrap } from '@tazama-lf/frms-coe-lib/lib/helpers/unwrap';
 import { type AccountCondition, type ConditionEdge, type EntityCondition } from '@tazama-lf/frms-coe-lib/lib/interfaces';
 import {
   type AccountConditionResponse,
   type EntityConditionResponse,
 } from '@tazama-lf/frms-coe-lib/lib/interfaces/event-flow/ConditionDetails';
 import {
-  type Entity,
   type Account,
+  type Entity,
   type RawConditionResponse,
 } from '@tazama-lf/frms-coe-lib/lib/interfaces/event-flow/EntityConditionEdge';
-import { databaseManager, loggerService } from '.';
-import { configuration } from './config';
-import { type ConditionRequest } from './interface/query';
-import { type Report } from './interface/report.interface';
-import { checkConditionValidity, validateAndParseExpirationDate } from './utils/condition-validation';
-import { filterConditions } from './utils/filter-active-conditions';
-import { parseConditionAccount, parseConditionEntity } from './utils/parse-condition';
-import { updateCache } from './utils/update-cache';
-import { createSimpleConditionsBuffer } from '@tazama-lf/frms-coe-lib/lib/helpers/protobuf';
+import { databaseManager, loggerService } from '..';
+import { configuration } from '../config';
+import { type ConditionRequest } from '../interface/query';
+import { checkConditionValidity, validateAndParseExpirationDate } from '../utils/condition-validation';
+import { filterConditions } from '../utils/filter-active-conditions';
+import { parseConditionAccount, parseConditionEntity } from '../utils/parse-condition';
+import { updateCache } from '../utils/update-cache';
 
 const saveConditionEdges = async (
   perspective: string,
@@ -60,27 +59,6 @@ const saveConditionEdges = async (
   }
 };
 
-export const handleGetReportRequestByMsgId = async (msgid: string): Promise<Report | undefined> => {
-  let unWrappedReport;
-  try {
-    loggerService.log(`Started handling get request by message id the message id is ${msgid}`);
-
-    const report = (await databaseManager.getReportByMessageId('transactions', msgid)) as Report[][];
-
-    unWrappedReport = unwrap<Report>(report);
-  } catch (error) {
-    const errorMessage = error as { message: string };
-    loggerService.log(
-      `Failed fetching report from database service with error message: ${errorMessage.message}`,
-      'handleGetReportRequestByMsgId()',
-    );
-    throw new Error(errorMessage.message);
-  } finally {
-    loggerService.log('Completed handling get report by message id');
-  }
-  return unWrappedReport;
-};
-
 export const handlePostConditionEntity = async (
   condition: EntityCondition,
 ): Promise<{ message: string; result: EntityConditionResponse }> => {

src/services/report.logic.service.ts

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+import { unwrap } from '@tazama-lf/frms-coe-lib/lib/helpers/unwrap';
+import { databaseManager, loggerService } from '..';
+import { type Report } from '../interface/report.interface';
+
+export const handleGetReportRequestByMsgId = async (msgid: string): Promise<Report | undefined> => {
+  let unWrappedReport;
+  try {
+    loggerService.log(`Started handling get request by message id the message id is ${msgid}`);
+
+    const report = (await databaseManager.getReportByMessageId('transactions', msgid)) as Report[][];
+
+    unWrappedReport = unwrap<Report>(report);
+  } catch (error) {
+    const errorMessage = error as { message: string };
+    loggerService.log(
+      `Failed fetching report from database service with error message: ${errorMessage.message}`,
+      'handleGetReportRequestByMsgId()',
+    );
+    throw new Error(errorMessage.message);
+  } finally {
+    loggerService.log('Completed handling get report by message id');
+  }
+  return unWrappedReport;
+};