Merge pull request #3348 from energywebfoundation/fix/irec-issues

fix: IREC integration issues
energywebfoundation · Apr 21, 2022 · 4403871 · 4403871
2 parents 000a6a4 + e823505
commit 4403871
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 50 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/...zations/origin-organization-irec-api/src/connection/handlers/create-connection.handler.ts b/...zations/origin-organization-irec-api/src/connection/handlers/create-connection.handler.ts
@@ -3,6 +3,7 @@ import { CommandHandler, EventBus, ICommandHandler } from '@nestjs/cqrs';
 import { InjectRepository } from '@nestjs/typeorm';
 import { BadRequestException, Inject } from '@nestjs/common';
 import { Organization, OrganizationService } from '@energyweb/origin-backend';
+import { randomBytes } from 'crypto';
 
 import { RegistrationService } from '../../registration';
 import { IREC_SERVICE, IrecService } from '../../irec';
@@ -129,8 +130,11 @@ export class CreateConnectionHandler implements ICommandHandler<CreateConnection
 
         for (const account of accounts) {
             if (!irecAccounts.some((a) => a.type === account)) {
+                const numberOfChars = 4;
+                const randomCode = randomBytes(numberOfChars / 2).toString('hex'); // 1 byte is 2 characters
+
                 await this.irecService.createAccountByTokens(clientId, clientSecret, tokens, {
-                    code: `${account}-account`,
+                    code: `${account}-${randomCode}`,
                     type: account,
                     name: `origin ${account} account`,
                     private: false,

diff --git a/packages/organizations/origin-organization-irec-api/src/irec/irec.service.ts b/packages/organizations/origin-organization-irec-api/src/irec/irec.service.ts
@@ -56,6 +56,9 @@ export type IClaimData = {
     periodStartDate: string;
     periodEndDate: string;
     purpose: string;
+
+    /** Amount in Wh */
+    amount?: string;
 };
 
 export interface IIrecService {
@@ -405,7 +408,8 @@ export class IrecService implements IIrecService {
         fromUser: UserIdentifier,
         toTradeAccount: string,
         assetId: string,
-        fromTradeAccount?: string
+        fromTradeAccount?: string,
+        amount?: string
     ): Promise<TransactionResult> {
         const fromUserClient = await this.getIrecClient(fromUser);
         const fromUserConnectionInfo = await this.getConnectionInfo(fromUser);
@@ -420,7 +424,9 @@ export class IrecService implements IIrecService {
 
         const transferItem = new ReservationItem();
         transferItem.code = item.code;
-        transferItem.amount = item.volume;
+
+        // Optionally convert Wh to MWh
+        transferItem.amount = amount ? Number(amount) / 1_000_000 : item.volume;
 
         return fromUserClient.transfer({
             sender: fromUserTradeAccount,
@@ -456,7 +462,9 @@ export class IrecService implements IIrecService {
 
         const claimItem = new ReservationItem();
         claimItem.code = item.code;
-        claimItem.amount = item.volume;
+
+        // Optionally convert Wh to MWh
+        claimItem.amount = claimData.amount ? Number(claimData.amount) / 1_000_000 : item.volume;
 
         return userClient.redeem({
             sender: userTradeAccount,

diff --git a/packages/trade/exchange-irec/src/export/handler/export-asset.handler.ts b/packages/trade/exchange-irec/src/export/handler/export-asset.handler.ts
@@ -85,7 +85,8 @@ export class ExportAssetHandler implements ICommandHandler<ExportAssetCommand>,
             platformOrganization.id,
             recipientTradeAccount,
             irecCertificate.asset,
-            fromTradeAccount
+            fromTradeAccount,
+            amount
         );
 
         if (!result) {