PR feedback

vcr/pe/submission_requirement.go

@@ -48,6 +48,9 @@ func (submissionRequirement SubmissionRequirement) match(availableGroups map[str
 	if submissionRequirement.From != "" && len(submissionRequirement.FromNested) > 0 {
 		return nil, fmt.Errorf("submission requirement (%s) contains both 'from' and 'from_nested'", submissionRequirement.Name)
 	}
+	if submissionRequirement.From == "" && len(submissionRequirement.FromNested) == 0 {
+		return nil, fmt.Errorf("submission requirement (%s) is missing 'from' or 'from_nested'", submissionRequirement.Name)
+	}
 
 	if !(submissionRequirement.Rule == "all" || submissionRequirement.Rule == "pick") {
 		return nil, fmt.Errorf("submission requirement (%s) contains unknown rule (%s)", submissionRequirement.Name, submissionRequirement.Rule)

vcr/pe/submission_requirement_test.go

@@ -37,3 +37,40 @@ func Test_match(t *testing.T) {
 		assert.EqualError(t, err, "submission requirement (test) contains both 'from' and 'from_nested'")
 	})
 }
+
+func TestSubmissionRequirement_Groups(t *testing.T) {
+	t.Run("group from a single requirement", func(t *testing.T) {
+		requirement := SubmissionRequirement{
+			From: "A",
+		}
+
+		groups := requirement.Groups()
+
+		assert.Equal(t, []string{"A"}, groups)
+	})
+	t.Run("groups from nested requirements", func(t *testing.T) {
+		requirement := SubmissionRequirement{
+			From: "A",
+			FromNested: []*SubmissionRequirement{
+				{From: "B"},
+			},
+		}
+
+		groups := requirement.Groups()
+
+		assert.Equal(t, []string{"A", "B"}, groups)
+	})
+	t.Run("deduplicate groups", func(t *testing.T) {
+		requirement := SubmissionRequirement{
+			From: "A",
+			FromNested: []*SubmissionRequirement{
+				{From: "B"},
+				{From: "A"},
+			},
+		}
+
+		groups := requirement.Groups()
+
+		assert.Equal(t, []string{"A", "B"}, groups)
+	})
+}

vcr/pe/types.go

@@ -104,7 +104,7 @@ type Statuses struct {
 	Suspended *StatusDirective `json:"suspended,omitempty"`
 }
 
-// Field describes a field in a presentation submission, predicate feature is not implemented
+// Field describes a constraints field in a presentation definition's input descriptor.  The predicate feature is not implemented
 type Field struct {
 	Id             *string  `json:"id,omitempty"`
 	Optional       *bool    `json:"optional,omitempty"`
@@ -135,5 +135,5 @@ type SubmissionRequirement struct {
 	Max        *int                     `json:"max,omitempty"`
 	Min        *int                     `json:"min,omitempty"`
 	Name       string                   `json:"name,omitempty"`
-	Rule       string                   `json:"rule,omitempty"`
+	Rule       string                   `json:"rule"`
 }