Fixed bug and added scenarior unit test which not covered in e2e

Author: rg911

src/model/receipt/ResolutionStatement.ts

@@ -102,38 +102,70 @@ export class ResolutionStatement {
         */
         const resolvedPrimaryId = this.getMaxAvailablePrimaryId(primaryId);
 
+        /*
+        If no primaryId found, it means there's no resolution entry available for the process. Invalid entry.
+
+        e.g. Given:
+        Entries: [{P:2, S:0}, {P5:, S:6}]
+        Transaction: [Inx:1(0+1), AggInx:0]
+        It should return Entry: undefined
+        */
         if (resolvedPrimaryId === 0) {
             return undefined;
         } else if (primaryId > resolvedPrimaryId) {
             /*
             If the transaction index is greater than the overall most recent source primary id.
             Use the most recent resolution entry (Max.PrimaryId + Max.SecondaryId)
+
+            e.g. Given:
+            Entries: [{P:1, S:0}, {P:2, S:0}, {P:4, S:2}, {P:4, S:4} {P7:, S:6}]
+            Transaction: [Inx:5(0+1), AggInx:0]
+            It should return Entry: {P:3, S:4}
+
+            e.g. Given:
+            Entries: [{P:1, S:0}, {P:2, S:0}, {P:4, S:2}, {P:4, S:4}, {P7:, S:6}]
+            Transaction: [Inx:3(2+1), AggInx:0]
+            It should return Entry: {P:2, S:0}
             */
             return this.resolutionEntries
                 .find((entry) => entry.source.primaryId === resolvedPrimaryId &&
                     entry.source.secondaryId === this.getMaxSecondaryIdByPrimaryId(resolvedPrimaryId));
         }
 
-        // When transaction index matches a primary id, get the most recent secondaryId
-        const resolvedSecondaryId = this.getMaxSecondaryIdByPrimaryId(resolvedPrimaryId);
+        // When transaction index matches a primary id, get the most recent secondaryId (resolvedPrimaryId can only <= primaryId)
+        const resolvedSecondaryId = this.getMaxSecondaryIdByPrimaryIdAndSecondaryId(resolvedPrimaryId, secondaryId);
 
-        if (resolvedSecondaryId === 0 && secondaryId !== resolvedSecondaryId) {
-            /*
-            If no most recent secondaryId matched transaction index, find previous resolution entry (most recent).
-            */
+        /*
+        If no most recent secondaryId matched transaction index, find previous resolution entry (most recent).
+        This means the resolution entry for the specific innter transaction (inside Aggregate) /
+        was generated previously outside the aggregate. It should return the previous entry (privious primarId)
+
+        e.g. Given:
+        Entries: [{P:1, S:0}, {P:2, S:0}, {P5:, S:6}]
+        Transaction: [Inx:5(4+1), AggInx:3(2+1)]
+        It should return Entry: {P:2, S:0}
+        */
+        if (resolvedSecondaryId === 0 && resolvedSecondaryId !== secondaryId) {
             const lastPrimaryId = this.getMaxAvailablePrimaryId(resolvedPrimaryId - 1);
-            return this.resolutionEntries
-                .find((entry) => entry.source.primaryId === lastPrimaryId &&
-                    entry.source.secondaryId === this.getMaxSecondaryIdByPrimaryId(lastPrimaryId));
+            return this.resolutionEntries.find((entry) => entry.source.primaryId === lastPrimaryId &&
+                entry.source.secondaryId === this.getMaxSecondaryIdByPrimaryId(lastPrimaryId));
         }
-        // All matched
+
+        /*
+        Found a matched resolution entry on both primaryId and secondaryId
+
+        e.g. Given:
+        Entries: [{P:1, S:0}, {P:2, S:0}, {P5:, S:6}]
+        Transaction: [Inx:5(4+1), AggInx:6(2+1)]
+        It should return Entry: {P:5, S:6}
+        */
         return this.resolutionEntries
             .find((entry) => entry.source.primaryId === resolvedPrimaryId && entry.source.secondaryId === resolvedSecondaryId);
     }
 
     /**
      * @internal
-     * Get most `recent` secondary id by a given primaryId
+     * Get max secondary id by a given primaryId
      * @param primaryId Primary source id
      * @returns {number}
      */
@@ -142,6 +174,17 @@ export class ResolutionStatement {
             .map((filtered) => filtered.source.secondaryId));
     }
 
+    /**
+     * Get most `recent` available secondary id by a given primaryId
+     * @param primaryId Primary source id
+     * @param secondaryId Secondary source id
+     * @returns {number}
+     */
+    private getMaxSecondaryIdByPrimaryIdAndSecondaryId(primaryId: number, secondaryId: number): number {
+        return Math.max(...this.resolutionEntries.filter((entry) => entry.source.primaryId === primaryId)
+            .map((filtered) => secondaryId >= filtered.source.secondaryId ? filtered.source.secondaryId : 0));
+    }
+
     /**
      * @internal
      * Get most `recent` primary source id by a given id (transaction index) as PrimaryId might not be the same as block transaction index.

test/model/receipt/ResolutionStatement.spec.ts

@@ -105,6 +105,42 @@ describe('ResolutionStatement', () => {
                     ],
                 },
             },
+            {
+                statement: {
+                    height: '1500',
+                    unresolved: '85BBEA6CC462B244',
+                    resolutionEntries: [
+                    {
+                        source: {
+                        primaryId: 1,
+                        secondaryId: 1,
+                        },
+                        resolved: '0DC67FBE1CAD29E5',
+                    },
+                    {
+                        source: {
+                        primaryId: 1,
+                        secondaryId: 4,
+                        },
+                        resolved: '7CDF3B117A3C40CC',
+                    },
+                    {
+                        source: {
+                        primaryId: 1,
+                        secondaryId: 7,
+                        },
+                        resolved: '0DC67FBE1CAD29E5',
+                    },
+                    {
+                        source: {
+                        primaryId: 2,
+                        secondaryId: 4,
+                        },
+                        resolved: '7CDF3B117A3C40CC',
+                    },
+                    ],
+                },
+            },
         ];
 
         statementDTO = {
@@ -164,4 +200,20 @@ describe('ResolutionStatement', () => {
         expect(entry).to.be.undefined;
     });
 
+    it('resolution change in the block (more than one AGGREGATE)', () => {
+        const statement = CreateStatementFromDTO(statementDTO, NetworkType.MIJIN_TEST);
+        const resolution = statement.mosaicResolutionStatements[2];
+        expect((resolution.getResolutionEntryById(1, 1)!.resolved as MosaicId).toHex()).to.be.equal('0DC67FBE1CAD29E5');
+        expect((resolution.getResolutionEntryById(1, 4)!.resolved as MosaicId).toHex()).to.be.equal('7CDF3B117A3C40CC');
+        expect((resolution.getResolutionEntryById(1, 7)!.resolved as MosaicId).toHex()).to.be.equal('0DC67FBE1CAD29E5');
+        expect((resolution.getResolutionEntryById(2, 1)!.resolved as MosaicId).toHex()).to.be.equal('0DC67FBE1CAD29E5');
+        expect((resolution.getResolutionEntryById(2, 4)!.resolved as MosaicId).toHex()).to.be.equal('7CDF3B117A3C40CC');
+
+        expect((resolution.getResolutionEntryById(3, 0)!.resolved as MosaicId).toHex()).to.be.equal('7CDF3B117A3C40CC');
+        expect((resolution.getResolutionEntryById(2, 2)!.resolved as MosaicId).toHex()).to.be.equal('0DC67FBE1CAD29E5');
+        expect(resolution.getResolutionEntryById(1, 0)).to.be.undefined;
+        expect((resolution.getResolutionEntryById(1, 6)!.resolved as MosaicId).toHex()).to.be.equal('7CDF3B117A3C40CC');
+        expect((resolution.getResolutionEntryById(1, 2)!.resolved as MosaicId).toHex()).to.be.equal('0DC67FBE1CAD29E5');
+    });
+
 });