From 227248afe014fdaa738274260cbceb229a1d2c2f Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Fri, 13 Mar 2020 15:16:19 -0400
Subject: [PATCH] logic for anyRequired

---
 .../New/Rules/RuleAnyRequiredModel.swift      | 30 +++++++++++++++++--
 .../New/Rules/RulesProtocol.swift             | 13 ++++----
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/MVMCoreUI/FormUIHelpers/New/Rules/RuleAnyRequiredModel.swift b/MVMCoreUI/FormUIHelpers/New/Rules/RuleAnyRequiredModel.swift
index 0eab62a7..af6f9095 100644
--- a/MVMCoreUI/FormUIHelpers/New/Rules/RuleAnyRequiredModel.swift
+++ b/MVMCoreUI/FormUIHelpers/New/Rules/RuleAnyRequiredModel.swift
@@ -10,14 +10,40 @@ import UIKit
 
 
 public class RuleAnyRequiredModel: RulesProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
 
     public static var identifier: String = "anyRequired"
     public var type: String = RuleRequiredModel.identifier
     public var fields: [String]
-
+    
+    //--------------------------------------------------
+    // MARK: - Methods
+    //--------------------------------------------------
+    
     public func isValid(_ formField: FormFieldProtocol) -> Bool {
         guard let value = formField.formFieldValue() else { return false }
         
-        return true
+        if let valueString = value as? String {
+            return valueString.count > 0
+            
+        } else if let valueBool = value as? Bool {
+            return valueBool
+        }
+        
+        return false
+    }
+    
+    public func isValid(_ formValidator: FormValidator) -> Bool {
+        
+        for formKey in fields {
+            guard let formField = formValidator.formField(for: formKey) else { continue }
+            
+            if isValid(formField) {
+                return true
+            }
+        }
+        return false
     }
 }
diff --git a/MVMCoreUI/FormUIHelpers/New/Rules/RulesProtocol.swift b/MVMCoreUI/FormUIHelpers/New/Rules/RulesProtocol.swift
index 16fe77b3..b666b895 100644
--- a/MVMCoreUI/FormUIHelpers/New/Rules/RulesProtocol.swift
+++ b/MVMCoreUI/FormUIHelpers/New/Rules/RulesProtocol.swift
@@ -18,6 +18,7 @@ public protocol RulesProtocol: ModelProtocol {
     var fields: [String] { get set }
     func isValid(_ formValidator: FormValidator) -> Bool
     func isValid(_ formField: FormFieldProtocol) -> Bool
+//    func isValid(_ fieldMolecules: [String: FormFieldProtocol]) -> Bool
     func setValid(_ formField: FormFieldProtocol, _ isValid: Bool)
 }
 
@@ -36,22 +37,22 @@ public extension RulesProtocol {
     }
 
     func isValid(_ formValidator: FormValidator) -> Bool {
+        
         var valid = true
+        
         for formKey in fields {
-            guard let formField = formValidator.formField(for: formKey) else {
-                continue
-            }
+            guard let formField = formValidator.formField(for: formKey) else { continue }
             let fieldValidity = isValid(formField)
             setValid(formField, fieldValidity)
             valid = valid && fieldValidity
         }
+        
         return valid
     }
 
     func setValid(_ formField: FormFieldProtocol, _ isValid: Bool) {
-        guard let formFieldValid = formField as? ValidProtocol else {
-            return
-        }
+        guard let formFieldValid = formField as? ValidProtocol else { return }
+        
         formFieldValid.setValidity(isValid)
     }
 }