From 5ef548cb9a24006cbdfc49ac370907a919c58779 Mon Sep 17 00:00:00 2001
From: Tihomir Surdilovic <tihomir@temporal.io>
Date: Sat, 26 Jun 2021 15:22:19 -0400
Subject: [PATCH] update to completion type

Signed-off-by: Tihomir Surdilovic <tihomir@temporal.io>
---
 api/src/main/resources/schema/states/parallelstate.json | 8 ++++----
 api/src/test/resources/examples/parallel.json           | 2 +-
 api/src/test/resources/examples/parallel.yml            | 2 +-
 diagram/src/test/resources/examples/parallel.json       | 2 +-
 diagram/src/test/resources/examples/parallel.yml        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/src/main/resources/schema/states/parallelstate.json b/api/src/main/resources/schema/states/parallelstate.json
index 824f3ff5..919c472f 100644
--- a/api/src/main/resources/schema/states/parallelstate.json
+++ b/api/src/main/resources/schema/states/parallelstate.json
@@ -19,14 +19,14 @@
     },
     "completionType": {
       "type" : "string",
-      "enum": ["and", "xor", "n_of_m"],
+      "enum": ["allOf", "atLeast"],
       "description": "Option types on how to complete branch execution.",
-      "default": "and"
+      "default": "allOf"
     },
-    "n": {
+    "numCompleted": {
       "type": "string",
       "default": "0",
-      "description": "Used when completionType is set to 'n_of_m' to specify the 'N' value"
+      "description": "Used when completionType is set to 'atLeast' to specify the minimum number of branches that must complete before the state will transition."
     },
     "usedForCompensation": {
       "type": "boolean",
diff --git a/api/src/test/resources/examples/parallel.json b/api/src/test/resources/examples/parallel.json
index cb50c8fc..0189453e 100644
--- a/api/src/test/resources/examples/parallel.json
+++ b/api/src/test/resources/examples/parallel.json
@@ -8,7 +8,7 @@
     {
       "name": "ParallelExec",
       "type": "parallel",
-      "completionType": "and",
+      "completionType": "allOf",
       "branches": [
         {
           "name": "ShortDelayBranch",
diff --git a/api/src/test/resources/examples/parallel.yml b/api/src/test/resources/examples/parallel.yml
index 49536973..75ca0e83 100644
--- a/api/src/test/resources/examples/parallel.yml
+++ b/api/src/test/resources/examples/parallel.yml
@@ -6,7 +6,7 @@ start: ParallelExec
 states:
   - name: ParallelExec
     type: parallel
-    completionType: and
+    completionType: allOf
     branches:
       - name: ShortDelayBranch
         workflowId: shortdelayworkflowid
diff --git a/diagram/src/test/resources/examples/parallel.json b/diagram/src/test/resources/examples/parallel.json
index cb50c8fc..0189453e 100644
--- a/diagram/src/test/resources/examples/parallel.json
+++ b/diagram/src/test/resources/examples/parallel.json
@@ -8,7 +8,7 @@
     {
       "name": "ParallelExec",
       "type": "parallel",
-      "completionType": "and",
+      "completionType": "allOf",
       "branches": [
         {
           "name": "ShortDelayBranch",
diff --git a/diagram/src/test/resources/examples/parallel.yml b/diagram/src/test/resources/examples/parallel.yml
index 49536973..75ca0e83 100644
--- a/diagram/src/test/resources/examples/parallel.yml
+++ b/diagram/src/test/resources/examples/parallel.yml
@@ -6,7 +6,7 @@ start: ParallelExec
 states:
   - name: ParallelExec
     type: parallel
-    completionType: and
+    completionType: allOf
     branches:
       - name: ShortDelayBranch
         workflowId: shortdelayworkflowid