lib/fawry/contracts/charge_request_contract.rb in fawry-0.3.0 vs lib/fawry/contracts/charge_request_contract.rb in fawry-1.0.0

@@ -4,23 +4,23 @@
 
 module Fawry
   module Contracts
     class ChargeRequestContract < Dry::Validation::Contract
       params do
-        required(:merchant_code).value(:string)
         required(:merchant_ref_num).value(:string)
         required(:customer_profile_id).value(:string)
         required(:amount).value(:decimal)
         required(:description).value(:string)
         required(:customer_mobile).value(:string)
-        required(:fawry_secure_key).value(:string)
         required(:charge_items).array(:hash) do
           required(:item_id).value(:string)
           required(:description).value(:string)
           required(:price).value(:decimal)
           required(:quantity).value(:integer)
         end
+        optional(:merchant_code).value(:string)
+        optional(:fawry_secure_key).value(:string)
         optional(:currency_code).value(:string)
         optional(:card_token).value(:string)
         optional(:customer_email).value(:string)
         optional(:payment_method).value(:string)
         optional(:payment_expiry).value(:integer)
@@ -33,9 +33,21 @@
       end
 
       rule(:payment_method) do
         if key? && value == 'CARD' && values[:card_token].nil?
           key.failure('card_token is required when payment_method is CARD')
+        end
+      end
+
+      rule(:fawry_secure_key) do
+        if ENV['FAWRY_SECURE_KEY'].nil? && value.nil?
+          key(:fawry_secure_key).failure('fawry secure key is required as a param or an env var')
+        end
+      end
+
+      rule(:merchant_code) do
+        if ENV['FAWRY_MERCHANT_CODE'].nil? && value.nil?
+          key(:merchant_code).failure('fawry merchant code is required as a param or an env var')
         end
       end
     end
   end
 end