Merge pull request #36 from rarimo/feat/ver-link-v2-sex

Update verification link v2 with sex field

Author: Dmytro-Hladkykh

docs/spec/components/schemas/AdvancedVerification.yaml

@@ -27,6 +27,15 @@ allOf:
             type: string
             example: "UKR"
             description: "User citezenship mask"
+          sex:
+            type: string
+            enum:
+              - "F"
+              - "M" 
+              - "O"
+              - ""
+            example: "F"
+            description: "User sex"
           expiration_lower_bound:
             type: boolean
             example: true

internal/service/handlers/verification_link_v2.go

@@ -113,6 +113,10 @@ func VerificationLinkV2(w http.ResponseWriter, r *http.Request) {
 		user.TimestampUpperBound = sql.NullTime{Time: time.Unix(*req.Data.Attributes.TimestampUpperBound, 0), Valid: true}
 	}
 
+	if req.Data.Attributes.Sex != nil {
+		user.Sex = *req.Data.Attributes.Sex
+	}
+
 	dbUser, err := ctx.VerifyUsersQ(r).Upsert(user)
 	if err != nil {
 		ctx.Log(r).WithError(err).WithField("user", user).Errorf("failed to upsert user with userID [%s]", user.UserIDHash)

internal/service/requests/verification_link_v2.go

@@ -28,8 +28,11 @@ func VerificationLinkV2(r *http.Request) (req resources.AdvancedVerificationRequ
 		),
 		"data/attributes/selector": val.Validate(req.Data.Attributes.Selector, val.Required),
 		// base v1
-		"data/attributes/age_lower_bound":        val.Validate(req.Data.Attributes.AgeLowerBound, val.NilOrNotEmpty),
-		"data/attributes/citizenship_mask":       val.Validate(req.Data.Attributes.CitizenshipMask, val.NilOrNotEmpty),
+		"data/attributes/age_lower_bound":  val.Validate(req.Data.Attributes.AgeLowerBound, val.NilOrNotEmpty),
+		"data/attributes/citizenship_mask": val.Validate(req.Data.Attributes.CitizenshipMask, val.NilOrNotEmpty),
+		"data/attributes/sex": val.Validate(req.Data.Attributes.Sex,
+			val.When(req.Data.Attributes.Sex != nil,
+				val.In("F", "M", "O", ""))),
 		"data/attributes/expiration_lower_bound": val.Validate(req.Data.Attributes.ExpirationLowerBound, val.NilOrNotEmpty),
 		// advanced v2
 		"data/attributes/identity_counter":             val.Validate(req.Data.Attributes.IdentityCounter, val.When(req.Data.Attributes.IdentityCounter != nil, val.Min(0))),

resources/model_advanced_verification_attributes.go

@@ -31,6 +31,8 @@ type AdvancedVerificationAttributes struct {
 	IdentityCounterUpperBound *int32 `json:"identity_counter_upper_bound,omitempty"`
 	// Selector value
 	Selector string `json:"selector"`
+	// User sex
+	Sex *string `json:"sex,omitempty"`
 	// Timestamp lower bound
 	TimestampLowerBound *int64 `json:"timestamp_lower_bound,omitempty"`
 	// Timestamp upper bound