Removing opening balance

EventLedger · Aug 30, 2024 · c9410c2 · c9410c2
1 parent 13ccb22
commit c9410c2
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 18 deletions.
diff --git a/serverless.yml b/serverless.yml
@@ -57,7 +57,9 @@ resources:
           source:
             - 'accounts-service'
           detail-type:
-            - 'TransactionCreated'
+              - 'TransactionCreated'
+              - 'AccountCreated'
+              - 'AccountUpdated'
         Targets:
           - Arn:
               Fn::GetAtt:

diff --git a/src/events/accountEvent.mock.json b/src/events/accountEvent.mock.json
@@ -0,0 +1,20 @@
+{
+  "version": "0",
+  "id": "c0cfc740-a244-f569-5a34-e7784dc1f12c",
+  "detail-type": "AccountCreated",
+  "source": "accounts-service",
+  "accountId": "123456789012",
+  "time": "2024-08-29T07:35:00Z",
+  "date": "2024-08-29T07:35:00Z",
+  "region": "eu-north-1",
+  "resources": [],
+  "detail": {
+    "id": "66cbccb349f8791ba0cc98b8",
+    "currencies": ["USD", "BTC"],
+    "balances": {
+      "USD": 123,
+      "BTC": 12455
+    },
+    "date": "2024-08-29T07:35:00Z"
+  }
+}
diff --git a/src/events/mockEventBridge.json → src/events/transactionEvent.mock.json b/src/events/mockEventBridge.json → src/events/transactionEvent.mock.json
diff --git a/src/handlers/transactionEventListener.ts b/src/handlers/transactionEventListener.ts
@@ -13,7 +13,7 @@ export const handler = async (event: EventBridgeEvent): Promise<void> => {
   const reportingService = new ReportingService(Statement)
   const eventBridgeEvent = JSON.stringify(event, null, 2)
   const eventDetails = JSON.parse(eventBridgeEvent)['detail']
-
+  console.log({eventDetails})
   try {
     if (event['detail-type'] === Events.TransactionCreated) {
       await reportingService.processTransactionEvent(eventDetails)

diff --git a/src/models/statement.ts b/src/models/statement.ts
@@ -9,7 +9,6 @@ export interface ICurrencyStatement {
     amount: number
     date: Date
   }[]
-  openingBalance: number
   closingBalance: number
 }
 
@@ -33,7 +32,6 @@ const CurrencyStatementSchema = new Schema<ICurrencyStatement>({
       date: { type: Date, required: true },
     },
   ],
-  openingBalance: { type: Number, required: true },
   closingBalance: { type: Number, required: true },
 })
 

diff --git a/src/services/reportingService.ts b/src/services/reportingService.ts
@@ -36,19 +36,19 @@ export class ReportingService {
   async processAccountEvent(event: AccountEvent): Promise<void> {
     const { id: accountId, currencies, balances, date } = event
     const { month, year } = getMonthYearFromDate(date)
-
+    
     let statement = await this.getOrCreateStatement(accountId, month, year)
-
     currencies.forEach(currency => {
       let currencyStatement = this.getOrCreateCurrencyStatement(statement, currency)
-      currencyStatement.closingBalance = balances.get(currency) || 0
+      currencyStatement.closingBalance = balances[currency] || 0
 
       const currencyStatementIndex = statement.currencies.findIndex(
         (cs) => cs.currency === currency,
       )
+
       statement.currencies[currencyStatementIndex] = currencyStatement
     })
-
+    console.log("GO 10")
     await statement.save()
   }
 
@@ -99,7 +99,6 @@ export class ReportingService {
       currencyStatement = {
         currency,
         transactions: [],
-        openingBalance: 0,
         closingBalance: 0,
       }
       statement.currencies.push(currencyStatement)

diff --git a/tests/handlers/getMonthlyStatements.test.ts b/tests/handlers/getMonthlyStatements.test.ts
@@ -33,7 +33,6 @@ describe('getMonthlyStatementsHandler', () => {
         {
           currency: 'USD',
           transactions: [],
-          openingBalance: 0,
           closingBalance: 100,
         },
       ],

diff --git a/tests/models/statement.test.ts b/tests/models/statement.test.ts
@@ -31,7 +31,6 @@ describe('Statement Model Test', () => {
               date: new Date('2024-08-28T12:00:00Z'),
             },
           ],
-          openingBalance: 0,
           closingBalance: 100,
         },
       ],
@@ -71,7 +70,6 @@ describe('Statement Model Test', () => {
         {
           currency: 'USD',
           transactions: [],
-          openingBalance: 0,
           closingBalance: 0,
         },
       ],
@@ -81,7 +79,6 @@ describe('Statement Model Test', () => {
     statement.currencies.push({
       currency: 'EUR',
       transactions: [],
-      openingBalance: 0,
       closingBalance: 0,
     })
     const updatedStatement = await statement.save()
@@ -105,7 +102,6 @@ describe('Statement Model Test', () => {
               date: new Date('2024-08-28T12:00:00Z'),
             },
           ],
-          openingBalance: 0,
           closingBalance: 100,
         },
       ],

diff --git a/tests/services/reportingService.test.ts b/tests/services/reportingService.test.ts
@@ -64,7 +64,6 @@ describe('ReportingService', () => {
           {
             currency: 'USD',
             transactions: [],
-            openingBalance: 0,
             closingBalance: 50,
           },
         ],
@@ -103,7 +102,6 @@ describe('ReportingService', () => {
           {
             currency: 'EUR',
             transactions: [],
-            openingBalance: 0,
             closingBalance: 0,
           },
         ],
@@ -181,13 +179,11 @@ describe('ReportingService', () => {
           {
             currency: 'USD',
             transactions: [],
-            openingBalance: 0,
             closingBalance: 1000,
           },
           {
             currency: 'EUR',
             transactions: [],
-            openingBalance: 0,
             closingBalance: 2000,
           },
         ],