Fixed wrong success messages when pushing of OCPI CDRs failed

Added more error handling
sap-labs-france · May 11, 2022 · 21b4037 · 21b4037
1 parent 89970c8
commit 21b4037
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 46 deletions.
diff --git a/src/client/ocpi/CpoOCPIClient.ts b/src/client/ocpi/CpoOCPIClient.ts
@@ -6,7 +6,6 @@ import { OCPIAllowed, OCPIAuthorizationInfo } from '../../types/ocpi/OCPIAuthori
 import { OCPIAuthMethod, OCPISession, OCPISessionStatus } from '../../types/ocpi/OCPISession';
 import { OCPICapability, OCPIEvse, OCPIEvseStatus } from '../../types/ocpi/OCPIEvse';
 import { OCPILocation, OCPILocationOptions, OCPILocationReference, OCPILocationType } from '../../types/ocpi/OCPILocation';
-import User, { UserRole, UserStatus } from '../../types/User';
 
 import { AxiosResponse } from 'axios';
 import BackendError from '../../exception/BackendError';
@@ -38,6 +37,7 @@ import TagStorage from '../../storage/mongodb/TagStorage';
 import Tenant from '../../types/Tenant';
 import Transaction from '../../types/Transaction';
 import TransactionStorage from '../../storage/mongodb/TransactionStorage';
+import User from '../../types/User';
 import UserStorage from '../../storage/mongodb/UserStorage';
 import Utils from '../../utils/Utils';
 import _ from 'lodash';
@@ -370,7 +370,7 @@ export default class CpoOCPIClient extends OCPIClient {
         module: MODULE_NAME, method: 'postCdr',
       });
     }
-    if (!transaction.ocpiData?.session) {
+    if (!transaction.ocpiData?.session?.id) {
       throw new BackendError({
         ...LoggingHelper.getTransactionProperties(transaction),
         action: ServerAction.OCPI_CPO_PUSH_CDRS,

diff --git a/src/server/ocpi/OCPIFacade.ts b/src/server/ocpi/OCPIFacade.ts
@@ -77,10 +77,10 @@ export default class OCPIFacade {
   }
 
   public static async processEndTransaction(tenant: Tenant, transaction: Transaction, chargingStation: ChargingStation,
-      siteArea: SiteArea, user: User, action: ServerAction): Promise<void> {
+      siteArea: SiteArea, user: User, action: ServerAction): Promise<boolean> {
     if (!Utils.isTenantComponentActive(tenant, TenantComponents.OCPI) ||
         !chargingStation.issuer || !chargingStation.public || !siteArea.accessControl || user.issuer) {
-      return;
+      return false;
     }
     // Get OCPI CPO client
     const ocpiClient = await OCPIFacade.checkAndGetOcpiCpoClient(
@@ -100,8 +100,8 @@ export default class OCPIFacade {
       if (ocpiLock) {
         try {
           // Roaming
-          ocpiCdrSent = true;
-          await OCPIFacade.processEndTransaction(tenant, transaction, chargingStation, siteArea, transaction.user, action);
+          ocpiCdrSent = await OCPIFacade.processEndTransaction(
+            tenant, transaction, chargingStation, siteArea, transaction.user, action);
         } finally {
           // Release the lock
           await LockingManager.release(ocpiLock);

diff --git a/src/server/oicp/OICPFacade.ts b/src/server/oicp/OICPFacade.ts
@@ -83,10 +83,10 @@ export default class OICPFacade {
   }
 
   public static async processEndTransaction(tenant: Tenant, transaction: Transaction, chargingStation: ChargingStation,
-      siteArea: SiteArea, user: User, action: ServerAction): Promise<void> {
+      siteArea: SiteArea, user: User, action: ServerAction): Promise<boolean> {
     if (!Utils.isTenantComponentActive(tenant, TenantComponents.OICP) ||
         !chargingStation.issuer || !chargingStation.public || !siteArea.accessControl) {
-      return;
+      return false;
     }
     // Get OICP CPO client
     const oicpClient = await OICPFacade.checkAndGetOICPCpoClient(
@@ -97,7 +97,7 @@ export default class OICPFacade {
 
   public static async checkAndSendTransactionCdr(tenant: Tenant, transaction: Transaction,
       chargingStation: ChargingStation, siteArea: SiteArea, action: ServerAction): Promise<boolean> {
-    let OICPCdrSent = false;
+    let oicpCdrSent = false;
     // CDR not already pushed
     if (Utils.isTenantComponentActive(tenant, TenantComponents.OICP) &&
         transaction.oicpData?.session && !transaction.oicpData.cdr?.SessionID) {
@@ -106,15 +106,15 @@ export default class OICPFacade {
       if (OICPLock) {
         try {
           // Roaming
-          OICPCdrSent = true;
-          await OICPFacade.processEndTransaction(tenant, transaction, chargingStation, siteArea, transaction.user, action);
+          oicpCdrSent = await OICPFacade.processEndTransaction(
+            tenant, transaction, chargingStation, siteArea, transaction.user, action);
         } finally {
           // Release the lock
           await LockingManager.release(OICPLock);
         }
       }
     }
-    return OICPCdrSent;
+    return oicpCdrSent;
   }
 
   public static async updateConnectorStatus(tenant: Tenant, chargingStation: ChargingStation, connector: Connector): Promise<void> {