feat(origin-247-certificate): Update issuer-api, make batch methods e…

…asier to use

BREAKING CHANGE: now batch methods (transfer and claim) accept array of transfers/claims

packages/origin-247-certificate/README.md

@@ -25,16 +25,13 @@ Which allows to run migration required by the module.
 ```ts
 import { entities as IssuerEntities } from '@energyweb/issuer-api';
 
-const [Certificate, , BlockchainProperties] = IssuerEntities;
-
 [...]
 
 TypeOrmModule.forRoot({
   ...
   entities: [
     ...,
-    Certificate,
-    BlockchainProperties,
+    ...IssuerEntities,
   ],
   ...
 });

packages/origin-247-certificate/package.json

@@ -28,10 +28,10 @@
         "typeorm": "0.2.34"
     },
     "devDependencies": {
-        "@energyweb/issuer": "3.2.1-alpha.1626693085.0",
-        "@energyweb/issuer-api": "0.2.1-alpha.1626693085.0",
-        "@energyweb/origin-backend-utils": "1.5.2-alpha.1626693085.0",
-        "@energyweb/utils-general": "11.0.3-alpha.1626693085.0",
+        "@energyweb/issuer": "3.2.1-alpha.1629812330.0",
+        "@energyweb/issuer-api": "0.2.1-alpha.1629812330.0",
+        "@energyweb/origin-backend-utils": "1.5.2-alpha.1629812330.0",
+        "@energyweb/utils-general": "11.0.3-alpha.1629812330.0",
         "@nestjs/passport": "7.1.5",
         "@nestjs/platform-express": "7.6.18",
         "@nestjs/testing": "7.6.18",
@@ -46,8 +46,8 @@
         "wait-on": "5.3.0"
     },
     "peerDependencies": {
-        "@energyweb/issuer": "3.2.1-alpha.1626693085.0",
-        "@energyweb/issuer-api": "0.2.1-alpha.1626693085.0"
+        "@energyweb/issuer": "3.2.1-alpha.1629812330.0",
+        "@energyweb/issuer-api": "0.2.1-alpha.1629812330.0"
     },
     "jest": {
         "moduleFileExtensions": [

packages/origin-247-certificate/src/blockchain-actions.processor.ts

@@ -3,6 +3,7 @@ import { Logger } from '@nestjs/common';
 import { Job } from 'bull';
 import { CommandBus } from '@nestjs/cqrs';
 import { BlockchainAction, BlockchainActionType } from './types';
+import { BigNumber } from 'ethers';
 import {
     ClaimCertificateCommand,
     IssueCertificateCommand,
@@ -110,12 +111,12 @@ export class BlockchainActionsProcessor {
 
                 return await this.commandBus.execute(
                     new BatchTransferCertificatesCommand(
-                        batchTransferParams.certificates.map((c) => ({
-                            id: c.certificateId,
-                            amount: c.energyValue
-                        })),
-                        batchTransferParams.toAddress,
-                        batchTransferParams.fromAddress
+                        batchTransferParams.transfers.map((t) => ({
+                            id: t.certificateId,
+                            to: t.toAddress,
+                            from: t.fromAddress,
+                            amount: t.energyValue ? BigNumber.from(t.energyValue) : undefined
+                        }))
                     )
                 );
 
@@ -127,12 +128,12 @@ export class BlockchainActionsProcessor {
 
                 return await this.commandBus.execute(
                     new BatchClaimCertificatesCommand(
-                        batchClaimParams.certificates.map((c) => ({
+                        batchClaimParams.claims.map((c) => ({
                             id: c.certificateId,
-                            amount: c.energyValue
-                        })),
-                        batchClaimParams.claimData,
-                        batchClaimParams.forAddress
+                            from: c.forAddress,
+                            amount: c.energyValue ? BigNumber.from(c.energyValue) : undefined,
+                            claimData: c.claimData
+                        }))
                     )
                 );
         }

packages/origin-247-certificate/src/certificate.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { BullModule } from '@nestjs/bull';
-import { CertificateModule as IssuerCertificateModule } from '@energyweb/issuer-api';
+import { IssuerModule } from '@energyweb/issuer-api';
 
 import { CertificateService } from './certificate.service';
 import { BlockchainActionsProcessor } from './blockchain-actions.processor';
@@ -16,7 +16,10 @@ const serviceProvider = {
     providers: [serviceProvider, BlockchainActionsProcessor],
     exports: [serviceProvider],
     imports: [
-        IssuerCertificateModule,
+        IssuerModule.register({
+            enableCertificationRequest: false,
+            enableTransactionLogging: true
+        }),
         CqrsModule,
         BullModule.registerQueue({
             name: 'blockchain-actions',

packages/origin-247-certificate/src/certificate.service.ts

@@ -13,9 +13,7 @@ import {
     BlockchainActionType,
     BlockchainAction,
     IIssuedCertificate,
-    IIssueCommandParams,
-    IBatchClaimCommand,
-    IBatchTransferCommand
+    IIssueCommandParams
 } from './types';
 
 const jobOptions = {
@@ -117,10 +115,12 @@ export class CertificateService<T = null> {
         return result;
     }
 
-    public async batchClaim(command: IBatchClaimCommand): Promise<ISuccessResponse> {
+    public async batchClaim(command: IClaimCommand[]): Promise<ISuccessResponse> {
         const job = await this.blockchainActionsQueue.add(
             {
-                payload: command,
+                payload: {
+                    claims: command
+                },
                 type: BlockchainActionType.BatchClaim
             },
             jobOptions
@@ -131,10 +131,12 @@ export class CertificateService<T = null> {
         return result;
     }
 
-    public async batchTransfer(command: IBatchTransferCommand): Promise<ISuccessResponse> {
+    public async batchTransfer(command: ITransferCommand[]): Promise<ISuccessResponse> {
         const job = await this.blockchainActionsQueue.add(
             {
-                payload: command,
+                payload: {
+                    transfers: command
+                },
                 type: BlockchainActionType.BatchTransfer
             },
             jobOptions

packages/origin-247-certificate/src/certificateForUnitTests.service.ts

@@ -129,32 +129,16 @@ export class CertificateForUnitTestsService<T> implements PublicPart<Certificate
         return result.map((r) => r.id);
     }
 
-    public async batchClaim(command: IBatchClaimCommand): Promise<ISuccessResponse> {
-        const result = await Promise.all(
-            command.certificates.map((certificate) =>
-                this.claim({
-                    ...certificate,
-                    forAddress: command.forAddress,
-                    claimData: command.claimData
-                })
-            )
-        );
+    public async batchClaim(command: IClaimCommand[]): Promise<ISuccessResponse> {
+        const result = await Promise.all(command.map((claim) => this.claim(claim)));
 
         return {
             success: result.every((r) => r.success)
         };
     }
 
-    public async batchTransfer(command: IBatchTransferCommand): Promise<ISuccessResponse> {
-        const result = await Promise.all(
-            command.certificates.map((certificate) =>
-                this.transfer({
-                    ...certificate,
-                    fromAddress: command.fromAddress,
-                    toAddress: command.toAddress
-                })
-            )
-        );
+    public async batchTransfer(command: ITransferCommand[]): Promise<ISuccessResponse> {
+        const result = await Promise.all(command.map((transfer) => this.transfer(transfer)));
 
         return {
             success: result.every((r) => r.success)

packages/origin-247-certificate/src/types.ts

@@ -1,4 +1,8 @@
 import { IClaimData, IClaim } from '@energyweb/issuer';
+import {
+    BatchCertificateClaim,
+    BatchCertificateTransfer
+} from '@energyweb/issuer/dist/js/src/blockchain-facade/CertificateBatchOperations';
 
 export type UnixTimestamp = number;
 
@@ -71,15 +75,11 @@ export interface IBatchIssueCommand<T> {
 }
 
 export interface IBatchClaimCommand {
-    certificates: { certificateId: number; energyValue: string }[];
-    claimData: IClaimData;
-    forAddress: string;
+    claims: IClaimCommand[];
 }
 
 export interface IBatchTransferCommand {
-    certificates: { certificateId: number; energyValue: string }[];
-    fromAddress: string;
-    toAddress: string;
+    transfers: ITransferCommand[];
 }
 
 export interface ISuccessResponse {

packages/origin-247-certificate/test/certificate.e2e-spec.ts

@@ -71,7 +71,14 @@ describe('Certificate service', () => {
 
         const result = await certificateService.claim({
             certificateId: certificate.id,
-            claimData: {},
+            claimData: {
+                beneficiary: '',
+                countryCode: '',
+                location: '',
+                periodEndDate: '',
+                periodStartDate: '',
+                purpose: ''
+            },
             forAddress: userWallet.address,
             energyValue: '50'
         });
@@ -131,6 +138,61 @@ describe('Certificate service', () => {
         });
     });
 
+    it.only('allows to batch issue, batch transfer, and batch claim certificate', async () => {
+        const [certificateId] = await certificateService.batchIssue([
+            {
+                deviceId: 'd1',
+                energyValue: '100',
+                fromTime: new Date(),
+                toTime: new Date(),
+                metadata: null,
+                toAddress: userWallet.address,
+                userId: userWallet.address
+            }
+        ]);
+
+        await transactionTime();
+
+        await certificateService.batchTransfer([
+            {
+                certificateId,
+                fromAddress: userWallet.address,
+                toAddress: user2Wallet.address,
+                energyValue: '50'
+            }
+        ]);
+
+        await transactionTime();
+
+        await certificateService.batchClaim([
+            {
+                certificateId,
+                claimData: {
+                    beneficiary: '',
+                    countryCode: '',
+                    location: '',
+                    periodEndDate: '',
+                    periodStartDate: '',
+                    purpose: ''
+                },
+                forAddress: user2Wallet.address,
+                energyValue: '50'
+            }
+        ]);
+
+        await transactionTime();
+
+        const certificate = await certificateService.getById(certificateId);
+
+        expect(certificate?.owners).toEqual({
+            [userWallet.address]: '50',
+            [user2Wallet.address]: '0'
+        });
+        expect(certificate?.claimers).toEqual({
+            [user2Wallet.address]: '50'
+        });
+    });
+
     it('Properly parses metadata', async () => {
         const certificateService2 = (certificateService as any) as CertificateService<{
             custom: string;