From 0634a08842ea06790109eff1e9dd3b4fded9ec85 Mon Sep 17 00:00:00 2001
From: Michael Taylor <mtaylor@michaeltaylor.dev>
Date: Sun, 13 Mar 2022 09:02:03 -0400
Subject: [PATCH] fix: unit count

---
 src/models/units/units.model.js | 2 +-
 src/utils/data-assertions.js    | 9 ++++-----
 src/utils/helpers.js            | 2 +-
 tests/integration/unit.spec.js  | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/models/units/units.model.js b/src/models/units/units.model.js
index ca31cc56..acd3f0d2 100644
--- a/src/models/units/units.model.js
+++ b/src/models/units/units.model.js
@@ -69,7 +69,7 @@ const virtualFields = {
         serialNumberPattern,
       );
 
-      return unitCount + 1; // Unit blocks are inclusive bound;
+      return unitCount;
     },
   },
 };
diff --git a/src/utils/data-assertions.js b/src/utils/data-assertions.js
index a89b6bbd..808979df 100644
--- a/src/utils/data-assertions.js
+++ b/src/utils/data-assertions.js
@@ -186,11 +186,10 @@ export const assertSumOfSplitUnitsIsValid = (
   serialNumberPattern,
   splitRecords,
 ) => {
-  const sumOfSplitUnits =
-    splitRecords.reduce(
-      (previousValue, currentValue) =>
-        previousValue.unitCount + currentValue.unitCount,
-    ) + 1; // Add one to handle inclusiveness boundry
+  const sumOfSplitUnits = splitRecords.reduce(
+    (previousValue, currentValue) =>
+      previousValue.unitCount + currentValue.unitCount,
+  ); // Add one to handle inclusiveness boundry
 
   const [unitBlockStart, unitBlockEnd, unitCount] = transformSerialNumberBlock(
     serialNumberBlock,
diff --git a/src/utils/helpers.js b/src/utils/helpers.js
index a1121e15..48a24bc1 100644
--- a/src/utils/helpers.js
+++ b/src/utils/helpers.js
@@ -89,7 +89,7 @@ export const transformSerialNumberBlock = (
     return [null, null, null];
   }
 
-  const blockStart = Number(unitBlocks[1]);
+  const blockStart = Number(unitBlocks[1]) - 1; // Unit blocks are inclusive bound
   const blockEnd = Number(unitBlocks[2]);
   return [blockStart, blockEnd, blockEnd - blockStart];
 };
diff --git a/tests/integration/unit.spec.js b/tests/integration/unit.spec.js
index e5b1cf33..c822ebbc 100644
--- a/tests/integration/unit.spec.js
+++ b/tests/integration/unit.spec.js
@@ -209,7 +209,7 @@ describe('Unit Resource Integration Tests', function () {
     expect(splitRecord1.unitOwner).to.equal(newUnitOwner);
     expect(splitRecord2.unitOwner).to.equal(unitRecord.unitOwner);
 
-    expect(splitRecord1.unitCount).to.equal(9);
+    expect(splitRecord1.unitCount).to.equal(10);
     expect(splitRecord2.unitCount).to.equal(1);
 
     // Expect the split unitscounts to add up to the original unit count