Be more relaxed about matching attempt-only Activities

Fixes thewca#680
gregorbg · Sep 1, 2021 · 83d99f8 · 83d99f8
1 parent ba75603
commit 83d99f8
Showing 1 changed file with 6 additions and 18 deletions.
diff --git a/...n/kotlin/org/worldcubeassociation/tnoodle/server/webscrambles/wcif/WCIFScrambleMatcher.kt b/...n/kotlin/org/worldcubeassociation/tnoodle/server/webscrambles/wcif/WCIFScrambleMatcher.kt
@@ -274,28 +274,16 @@ object WCIFScrambleMatcher {
 
         val actGroup = activity.activityCode.groupNumber
 
-        // uh oh. no child activities where there should be some.
+        // uh oh. no child activities where there should be some. Resort to creating them ourselves…
         if (actGroup == null) {
-            val actAttempt = activity.activityCode.attemptNumber
+            val inventedChildren = List(matchedRound.scrambleSetCount) {
+                val copiedActCode = activity.activityCode.copyParts(groupNumber = it)
+                val childSetId = matchedRound.scrambleSets[it].id
 
-            // resort to creating them ourselves…
-            if (actAttempt == null) {
-                val inventedChildren = List(matchedRound.scrambleSetCount) {
-                    val copiedActCode = activity.activityCode.copyParts(groupNumber = it)
-                    val childSetId = matchedRound.scrambleSets[it].id
-
-                    activity.copy(id = ID_PENDING, activityCode = copiedActCode, childActivities = listOf(), scrambleSetId = childSetId)
-                }
-
-                return activity.copy(childActivities = inventedChildren)
-            }
-
-            if (matchedRound.scrambleSetCount > 1) {
-                ScrambleMatchingException.error("Attempt-only specification ${activity.activityCode} for activity ${activity.id} is impossible to match")
+                activity.copy(id = ID_PENDING, activityCode = copiedActCode, childActivities = listOf(), scrambleSetId = childSetId)
             }
 
-            val onlyPossibleSet = matchedRound.scrambleSets.single()
-            return activity.copy(scrambleSetId = onlyPossibleSet.id)
+            return activity.copy(childActivities = inventedChildren)
         }
 
         // manually compensating for https://github.com/thewca/worldcubeassociation.org/issues/4653