Null check selection piles (#278)

* null check * cleaning --------- Co-authored-by: Mads Christiansen <madc@assemblyvoting.com>
aion-dk · Nov 28, 2023 · 3011b11 · 3011b11
1 parent b6a5050
commit 3011b11
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/av_client/validate_selections.ts b/lib/av_client/validate_selections.ts
@@ -55,15 +55,18 @@ function validateSelectionPile(pile: SelectionPile, markingType: MarkingType, op
     throw new CorruptSelectionError('Blank submissions are not allowed in this contest')
   }
 
-  // Validate that mark count is within bounds
-  const calculatedMinMarks = !isBlank && getOption(pile.optionSelections[0]).exclusive ? 1 : markingType.minMarks;
-  if( !isBlank && !withinBounds(calculatedMinMarks, pile.optionSelections.length, markingType.maxMarks) ){
-    throw new CorruptSelectionError('Contest selection does not contain a valid amount of option selections')
-  }
-
   pile.optionSelections.forEach(optionSelection => {
     const option = getOption(optionSelection)
 
+    // Validate that mark count is within bounds
+
+    const isExlusive = pile.optionSelections?.length && option?.exclusive
+    const calculatedMinMarks = !isBlank && isExlusive ? 1 : markingType.minMarks;
+
+    if( !isBlank && !withinBounds(calculatedMinMarks, pile.optionSelections.length, markingType.maxMarks) ){
+      throw new CorruptSelectionError('Contest selection does not contain a valid amount of option selections')
+    }
+
     if( option.writeIn ){
       if( !optionSelection.text ){
         throw new CorruptSelectionError('Expected write in text missing for option selection')

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.16",
+  "version": "3.1.17",
   "name": "@aion-dk/js-client",
   "license": "MIT",
   "description": "Assembly Voting JS client",