Add required (#245)

* fix postal address * change name * adding required * fix merge * Update credential/exchange/builder_test.go Co-authored-by: Gabe <gcohen@squareup.com> * AdditionalProperties * Update credential/exchange/builder_test.go * merge fix Co-authored-by: Gabe <gcohen@squareup.com>
TBD54566975 · Oct 27, 2022 · 39fefd7 · 39fefd7
1 parent 50f3596
commit 39fefd7
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 15 deletions.
diff --git a/credential/exchange/builder_test.go b/credential/exchange/builder_test.go
@@ -143,8 +143,63 @@ func TestInputDescriptorBuilderProperties(t *testing.T) {
 
 	assert.NoError(t, err)
 	definition, err := builder.Build()
+	assert.NotEmpty(t, definition)
 	assert.NoError(t, err)
+}
+
+func TestInputDescriptorBuilderRequired(t *testing.T) {
+	builder := NewPresentationDefinitionBuilder()
+
+	b := []byte(
+		`{
+		   "addressCountry":{
+			  "type":"string"
+		   },
+		   "addressLocality":{
+			  "type":"string"
+		   },
+		   "addressRegion":{
+			  "type":"string"
+		   },
+		   "postalCode":{
+			  "type":"string"
+		   },
+		   "streetAddress":{
+			  "type":"string"
+		   }
+		}`)
+
+	var props interface{}
+	err := json.Unmarshal(b, &props)
+	assert.NoError(t, err)
+
+	err = builder.SetInputDescriptors([]InputDescriptor{
+		{
+			ID:   uuid.NewString(),
+			Name: "children-info",
+			Constraints: &Constraints{
+				Fields: []Field{
+					{
+						Path: []string{"$.vc.credentialSubject.children[*].firstName", "$.credentialSubject.children[*].firstName"},
+						ID:   "children-info-first-name",
+						Filter: &Filter{
+							Type:                 "string",
+							MinLength:            1,
+							Properties:           props,
+							Required:             []string{"postalCode, streetAddress"},
+							AdditionalProperties: true,
+						},
+					},
+				},
+			},
+		},
+	})
+
+	assert.NoError(t, err)
+	definition, err := builder.Build()
 	assert.NotEmpty(t, definition)
+	assert.NoError(t, err)
+
 }
 
 func TestInputDescriptorBuilder(t *testing.T) {

diff --git a/credential/exchange/model.go b/credential/exchange/model.go
@@ -285,21 +285,23 @@ type RelationalConstraint struct {
 }
 
 type Filter struct {
-	Type             string        `json:"type,omitempty"`
-	Format           string        `json:"format,omitempty"`
-	Properties       interface{}   `json:"properties,omitempty"`
-	Pattern          string        `json:"pattern,omitempty"`
-	Minimum          interface{}   `json:"minimum,omitempty"`
-	Maximum          interface{}   `json:"maximum,omitempty"`
-	MinLength        int           `json:"minLength,omitempty"`
-	MaxLength        int           `json:"maxLength,omitempty"`
-	ExclusiveMinimum interface{}   `json:"exclusiveMinimum,omitempty"`
-	ExclusiveMaximum interface{}   `json:"exclusiveMaximum,omitempty"`
-	Const            interface{}   `json:"const,omitempty"`
-	Enum             []interface{} `json:"enum,omitempty"`
-	Not              interface{}   `json:"not,omitempty"`
-	AllOf            interface{}   `json:"allOf,omitempty"`
-	OneOf            interface{}   `json:"oneOf,omitempty"`
+	Type                 string        `json:"type,omitempty"`
+	Format               string        `json:"format,omitempty"`
+	Properties           interface{}   `json:"properties,omitempty"`
+	Required             []string      `json:"required,omitempty"`
+	AdditionalProperties bool          `json:"additionalProperties,omitempty"`
+	Pattern              string        `json:"pattern,omitempty"`
+	Minimum              interface{}   `json:"minimum,omitempty"`
+	Maximum              interface{}   `json:"maximum,omitempty"`
+	MinLength            int           `json:"minLength,omitempty"`
+	MaxLength            int           `json:"maxLength,omitempty"`
+	ExclusiveMinimum     interface{}   `json:"exclusiveMinimum,omitempty"`
+	ExclusiveMaximum     interface{}   `json:"exclusiveMaximum,omitempty"`
+	Const                interface{}   `json:"const,omitempty"`
+	Enum                 []interface{} `json:"enum,omitempty"`
+	Not                  interface{}   `json:"not,omitempty"`
+	AllOf                interface{}   `json:"allOf,omitempty"`
+	OneOf                interface{}   `json:"oneOf,omitempty"`
 }
 
 // CredentialStatus https://identity.foundation/presentation-exchange/#credential-status-constraint-feature