Intermediate commit for paymentmethod details contract

lib/aliquot/validator.rb

@@ -232,27 +232,28 @@ class EncryptedMessageContract < Dry::Validation::Contract
       rule(:messageExpiration).validate(:integer_string?)
       rule(:paymentMethodDetails) do
         contract = nil
-          if 'ECv1'.eql?(values[:protocolVersion])
-            if 'TOKENIZED_CARD'.eql?(values[:paymentMethod])
-              contract = ECv1_TokenizedPaymentMethodDetailsContract.new
-            else
-              contract =  ECv1_PaymentMethodDetailsContract.new
-            end
+        if 'ECv1'.eql?(values[:protocolVersion])
+          if 'TOKENIZED_CARD'.eql?(values[:paymentMethod])
+            contract = ECv1_TokenizedPaymentMethodDetailsContract.new
           else
-            if 'CRYPTOGRAM_3DS'.eql?(values[:authMethod])
-              contract = ECv2_TokenizedPaymentMethodDetailsContract.new
-            else
-              contract = ECv2_PaymentMethodDetailsContract.new
-            end
-        key.failure("test") unless
-          contract.(values)
+            contract =  ECv1_PaymentMethodDetailsContract.new
+          end
+        else
+          if 'CRYPTOGRAM_3DS'.eql?(values[:authMethod])
+            contract = ECv2_TokenizedPaymentMethodDetailsContract.new
+          else
+            contract = ECv2_PaymentMethodDetailsContract.new
+          end
         end
+        # contract.(values)
       end
       rule(:paymentMethod) do
-        if '3DS'.eql?(values[:paymentMethodDetails] && values[:paymentMethodDetails]['authMethod']) # Tokenized ECv1
-          key.failure('must be equal to TOKENIZED_CARD') unless 'TOKENIZED_CARD'.eql?(value)
-        else
-          key.failure('must be equal to CARD') unless 'CARD'.eql?(value)
+        if values[:paymentMethodDetails]
+          if '3DS'.eql?(values[:paymentMethodDetails] && values[:paymentMethodDetails]['authMethod']) # Tokenized ECv1
+            key.failure('must be equal to TOKENIZED_CARD') unless 'TOKENIZED_CARD'.eql?(value)
+          else
+            key.failure('must be equal to CARD') unless 'CARD'.eql?(value)
+          end
         end
       end
     end