stripe-ruby-mock 2.5.8 → 4.0.0

data/lib/stripe_mock/request_handlers/charges.rb

@@ -5,14 +5,17 @@ module StripeMock
       def Charges.included(klass)
         klass.add_handler 'post /v1/charges',               :new_charge
         klass.add_handler 'get /v1/charges',                :get_charges
-        klass.add_handler 'get /v1/charges/(.*)',           :get_charge
+        klass.add_handler 'get /v1/charges/search',         :search_charges
+        klass.add_handler 'get /v1/charges/((?!search).*)', :get_charge
         klass.add_handler 'post /v1/charges/(.*)/capture',  :capture_charge
         klass.add_handler 'post /v1/charges/(.*)/refund',   :refund_charge
         klass.add_handler 'post /v1/charges/(.*)/refunds',  :refund_charge
         klass.add_handler 'post /v1/charges/(.*)',          :update_charge
       end
 
-      def new_charge(route, method_url, params, headers)
+      def new_charge(route, method_url, params, headers = {})
+        stripe_account = headers && headers[:stripe_account] || Stripe.api_key
+
         if headers && headers[:idempotency_key]
           params[:idempotency_key] = headers[:idempotency_key]
           if charges.any?
@@ -29,7 +32,7 @@ module StripeMock
             # card id, not a token. in this case we'll find the card in the customer
             # object and return that.
             if params[:customer]
-              params[:source] = get_card(customers[params[:customer]], params[:source])
+              params[:source] = get_card(customers[stripe_account][params[:customer]], params[:source])
             else
               params[:source] = get_card_or_bank_by_token(params[:source])
             end
@@ -37,7 +40,7 @@ module StripeMock
             raise Stripe::InvalidRequestError.new("Invalid token id: #{params[:source]}", 'card', http_status: 400)
           end
         elsif params[:customer]
-          customer = customers[params[:customer]]
+          customer = customers[stripe_account][params[:customer]]
           if customer && customer[:default_source]
             params[:source] = get_card(customer, customer[:default_source])
           end
@@ -88,6 +91,24 @@ module StripeMock
         Data.mock_list_object(clone.values, params)
       end
 
+      SEARCH_FIELDS = [
+        "amount",
+        "currency",
+        "customer",
+        "payment_method_details.card.brand",
+        "payment_method_details.card.exp_month",
+        "payment_method_details.card.exp_year",
+        "payment_method_details.card.fingerprint",
+        "payment_method_details.card.last4",
+        "status",
+      ].freeze
+      def search_charges(route, method_url, params, headers)
+        require_param(:query) unless params[:query]
+
+        results = search_results(charges.values, params[:query], fields: SEARCH_FIELDS, resource_name: "charges")
+        Data.mock_list_object(results, params)
+      end
+
       def get_charge(route, method_url, params, headers)
         route =~ method_url
         charge_id = $1 || params[:charge]
@@ -146,7 +167,7 @@ module StripeMock
         elsif non_positive_charge_amount?(params)
           raise Stripe::InvalidRequestError.new('Invalid positive integer', 'amount', http_status: 400)
         elsif params[:source].nil? && params[:customer].nil?
-          raise Stripe::InvalidRequestError.new('Must provide source or customer.', http_status: nil)
+          raise Stripe::InvalidRequestError.new('Must provide source or customer.', nil, http_status: nil)
         end
       end
 
@@ -169,6 +190,11 @@ module StripeMock
            params[:refunds].has_key?(:data) && params[:refunds][:data].nil?)
           allowed << :refunds
         end
+        if params.has_key?(:payment_method_details) && (params[:payment_method_details].empty? ||
+           params[:payment_method_details].has_key?(:card) && (params[:payment_method_details][:card].empty? ||
+           params[:payment_method_details][:card].has_key?(:checks) && params[:payment_method_details][:card][:checks].empty?))
+          allowed << :payment_method_details
+        end
 
         allowed
       end

data/lib/stripe_mock/request_handlers/checkout_session.rb

@@ -0,0 +1,179 @@
+module StripeMock
+  module RequestHandlers
+    module Checkout
+      module Session
+        def Session.included(klass)
+          klass.add_handler 'post /v1/checkout/sessions', :new_session
+          klass.add_handler 'get /v1/checkout/sessions', :list_checkout_sessions
+          klass.add_handler 'get /v1/checkout/sessions/([^/]*)', :get_checkout_session
+          klass.add_handler 'get /v1/checkout/sessions/([^/]*)/line_items', :list_line_items
+        end
+
+        def new_session(route, method_url, params, headers)
+          id = params[:id] || new_id('cs')
+
+          [:cancel_url, :success_url].each do |p|
+            require_param(p) if params[p].nil? || params[p].empty?
+          end
+
+          line_items = nil
+          if params[:line_items]
+            line_items = params[:line_items].each_with_index.map do |line_item, i|
+              throw Stripe::InvalidRequestError("Quantity is required. Add `quantity` to `line_items[#{i}]`") unless line_item[:quantity]
+              unless line_item[:price] || line_item[:price_data] || (line_item[:amount] && line_item[:currency] && line_item[:name])
+                throw Stripe::InvalidRequestError("Price or amount and currency is required. Add `price`, `price_data`, or `amount`, `currency` and `name` to `line_items[#{i}]`")
+              end
+              {
+                id: new_id("li"),
+                price: if line_item[:price]
+                  line_item[:price]
+                elsif line_item[:price_data]
+                  new_price(nil, nil, line_item[:price_data], nil)[:id]
+                else
+                  new_price(nil, nil, {
+                    unit_amount: line_item[:amount],
+                    currency: line_item[:currency],
+                    product_data: {
+                      name: line_item[:name]
+                    }
+                  }, nil)[:id]
+                end,
+                quantity: line_item[:quantity]
+              }
+            end
+          end
+
+          amount = nil
+          currency = nil
+          if line_items
+            amount = 0
+
+            line_items.each do |line_item| 
+              price = prices[line_item[:price]]
+
+              if price.nil?
+                raise StripeMock::StripeMockError.new("Price not found for ID: #{line_item[:price]}")
+              end
+
+              amount += (price[:unit_amount] * line_item[:quantity])
+            end
+
+            currency = prices[line_items.first[:price]][:currency]
+          end
+
+          payment_status = "unpaid"
+          payment_intent = nil
+          setup_intent = nil
+          case params[:mode]
+          when nil, "payment"
+            params[:customer] ||= new_customer(nil, nil, {email: params[:customer_email]}, nil)[:id]
+            require_param(:line_items) if params[:line_items].nil? || params[:line_items].empty?
+            payment_intent = new_payment_intent(nil, nil, {
+              amount: amount,
+              currency: currency,
+              customer: params[:customer],
+              payment_method_options: params[:payment_method_options],
+              payment_method_types: params[:payment_method_types]
+            }.merge(params[:payment_intent_data] || {}), nil)[:id]
+            checkout_session_line_items[id] = line_items
+          when "setup"
+            if !params[:line_items].nil? && !params[:line_items].empty?
+              throw Stripe::InvalidRequestError.new("You cannot pass `line_items` in `setup` mode", :line_items, http_status: 400)
+            end
+            setup_intent = new_setup_intent(nil, nil, {
+              customer: params[:customer],
+              payment_method_options: params[:payment_method_options],
+              payment_method_types: params[:payment_method_types]
+            }.merge(params[:setup_intent_data] || {}), nil)[:id]
+            payment_status = "no_payment_required"
+          when "subscription"
+            params[:customer] ||= new_customer(nil, nil, {email: params[:customer_email]}, nil)[:id]
+            require_param(:line_items) if params[:line_items].nil? || params[:line_items].empty?
+            checkout_session_line_items[id] = line_items
+          else
+            throw Stripe::InvalidRequestError.new("Invalid mode: must be one of payment, setup, or subscription", :mode, http_status: 400)
+          end
+
+          checkout_sessions[id] = {
+            id: id,
+            object: "checkout.session",
+            allow_promotion_codes: nil,
+            amount_subtotal: amount,
+            amount_total: amount,
+            automatic_tax: {
+              enabled: false,
+              status: nil
+            },
+            billing_address_collection: nil,
+            cancel_url: params[:cancel_url],
+            client_reference_id: nil,
+            currency: currency,
+            customer: params[:customer],
+            customer_details: nil,
+            customer_email: params[:customer_email],
+            livemode: false,
+            locale: nil,
+            metadata: params[:metadata],
+            mode: params[:mode],
+            payment_intent: payment_intent,
+            payment_method_options: params[:payment_method_options],
+            payment_method_types: params[:payment_method_types],
+            payment_status: payment_status,
+            setup_intent: setup_intent,
+            shipping: nil,
+            shipping_address_collection: nil,
+            submit_type: nil,
+            subscription: nil,
+            success_url: params[:success_url],
+            total_details: nil,
+            url: URI.join(StripeMock.checkout_base, id).to_s
+          }
+        end
+
+        def list_checkout_sessions(route, method_url, params, headers)
+          Data.mock_list_object(checkout_sessions.values)
+        end
+
+        def get_checkout_session(route, method_url, params, headers)
+          route =~ method_url
+          checkout_session = assert_existence :checkout_session, $1, checkout_sessions[$1]
+
+          checkout_session = checkout_session.clone
+          if params[:expand]&.include?('setup_intent') && checkout_session[:setup_intent]
+            checkout_session[:setup_intent] = setup_intents[checkout_session[:setup_intent]]
+          end
+          checkout_session
+        end
+
+        def list_line_items(route, method_url, params, headers)
+          route =~ method_url
+          checkout_session = assert_existence :checkout_session, $1, checkout_sessions[$1]
+
+          case checkout_session[:mode]
+          when "payment", "subscription"
+            line_items = assert_existence :checkout_session_line_items, $1, checkout_session_line_items[$1]
+            line_items.map do |line_item|
+              price = prices[line_item[:price]].clone
+
+              if price.nil?
+                raise StripeMock::StripeMockError.new("Price not found for ID: #{line_item[:price]}")
+              end
+
+              {
+                id: line_item[:id],
+                object: "item",
+                amount_subtotal: price[:unit_amount] * line_item[:quantity],
+                amount_total: price[:unit_amount] * line_item[:quantity],
+                currency: price[:currency],
+                price: price.clone,
+                quantity: line_item[:quantity]
+              }
+            end
+          else
+            throw Stripe::InvalidRequestError("Only payment and subscription sessions have line items")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/stripe_mock/request_handlers/customers.rb

@@ -5,13 +5,15 @@ module StripeMock
       def Customers.included(klass)
         klass.add_handler 'post /v1/customers',                     :new_customer
         klass.add_handler 'post /v1/customers/([^/]*)',             :update_customer
-        klass.add_handler 'get /v1/customers/([^/]*)',              :get_customer
+        klass.add_handler 'get /v1/customers/((?!search)[^/]*)',    :get_customer
         klass.add_handler 'delete /v1/customers/([^/]*)',           :delete_customer
         klass.add_handler 'get /v1/customers',                      :list_customers
+        klass.add_handler 'get /v1/customers/search',               :search_customers
         klass.add_handler 'delete /v1/customers/([^/]*)/discount',  :delete_customer_discount
       end
 
       def new_customer(route, method_url, params, headers)
+        stripe_account = headers && headers[:stripe_account] || Stripe.api_key
         params[:id] ||= new_id('cus')
         sources = []
 
@@ -29,7 +31,8 @@ module StripeMock
           params[:default_source] = sources.first[:id]
         end
 
-        customers[ params[:id] ] = Data.mock_customer(sources, params)
+        customers[stripe_account] ||= {}
+        customers[stripe_account][params[:id]] = Data.mock_customer(sources, params)
 
         if params[:plan]
           plan_id = params[:plan].to_s
@@ -40,26 +43,30 @@ module StripeMock
           end
 
           subscription = Data.mock_subscription({ id: new_id('su') })
-          subscription = resolve_subscription_changes(subscription, [plan], customers[ params[:id] ], params)
-          add_subscription_to_customer(customers[ params[:id] ], subscription)
+          subscription = resolve_subscription_changes(subscription, [plan], customers[stripe_account][params[:id]], params)
+          add_subscription_to_customer(customers[stripe_account][params[:id]], subscription)
           subscriptions[subscription[:id]] = subscription
         elsif params[:trial_end]
           raise Stripe::InvalidRequestError.new('Received unknown parameter: trial_end', nil, http_status: 400)
         end
 
         if params[:coupon]
-          coupon = coupons[ params[:coupon] ]
+          coupon = coupons[params[:coupon]]
           assert_existence :coupon, params[:coupon], coupon
-
-          add_coupon_to_object(customers[params[:id]], coupon)
+          add_coupon_to_object(customers[stripe_account][params[:id]], coupon)
         end
 
-        customers[ params[:id] ]
+        customers[stripe_account][params[:id]]
       end
 
       def update_customer(route, method_url, params, headers)
+        stripe_account = headers && headers[:stripe_account] || Stripe.api_key
         route =~ method_url
-        cus = assert_existence :customer, $1, customers[$1]
+        cus = assert_existence :customer, $1, customers[stripe_account][$1]
+
+        # get existing and pending metadata
+        metadata = cus.delete(:metadata) || {}
+        metadata_updates = params.delete(:metadata) || {}
 
         # Delete those params if their value is nil. Workaround of the problematic way Stripe serialize objects
         params.delete(:sources) if params[:sources] && params[:sources][:data].nil?
@@ -72,10 +79,13 @@ module StripeMock
           params.delete(:subscriptions) unless params[:subscriptions][:data].any?{ |v| !!v[:type]}
         end
         cus.merge!(params)
+        cus[:metadata] = {**metadata, **metadata_updates}
 
         if params[:source]
           if params[:source].is_a?(String)
             new_card = get_card_or_bank_by_token(params.delete(:source))
+          elsif params[:source].is_a?(Stripe::Token)
+            new_card = get_card_or_bank_by_token(params[:source][:id])
           elsif params[:source].is_a?(Hash)
             unless params[:source][:object] && params[:source][:number] && params[:source][:exp_month] && params[:source][:exp_year]
               raise Stripe::InvalidRequestError.new('You must supply a valid card', nil, http_status: 400)
@@ -87,31 +97,37 @@ module StripeMock
         end
 
         if params[:coupon]
-          coupon = coupons[ params[:coupon] ]
-          assert_existence :coupon, params[:coupon], coupon
+          if params[:coupon] == ''
+            delete_coupon_from_object(cus)
+          else
+            coupon = coupons[params[:coupon]]
+            assert_existence :coupon, params[:coupon], coupon
 
-          add_coupon_to_object(cus, coupon)
+            add_coupon_to_object(cus, coupon)
+          end
         end
 
         cus
       end
 
       def delete_customer(route, method_url, params, headers)
+        stripe_account = headers && headers[:stripe_account] || Stripe.api_key
         route =~ method_url
-        assert_existence :customer, $1, customers[$1]
+        assert_existence :customer, $1, customers[stripe_account][$1]
 
-        customers[$1] = {
-          id: customers[$1][:id],
+        customers[stripe_account][$1] = {
+          id: customers[stripe_account][$1][:id],
           deleted: true
         }
       end
 
       def get_customer(route, method_url, params, headers)
+        stripe_account = headers && headers[:stripe_account] || Stripe.api_key
         route =~ method_url
-        customer = assert_existence :customer, $1, customers[$1]
+        customer = assert_existence :customer, $1, customers[stripe_account][$1]
 
         customer = customer.clone
-        if params[:expand] == ['default_source']
+        if params[:expand] == ['default_source'] && customer[:sources][:data]
           customer[:default_source] = customer[:sources][:data].detect do |source|
             source[:id] == customer[:default_source]
           end
@@ -121,12 +137,24 @@ module StripeMock
       end
 
       def list_customers(route, method_url, params, headers)
-        Data.mock_list_object(customers.values, params)
+        stripe_account = headers && headers[:stripe_account] || Stripe.api_key
+        Data.mock_list_object(customers[stripe_account]&.values, params)
+      end
+
+      SEARCH_FIELDS = ["email", "name", "phone"].freeze
+      def search_customers(route, method_url, params, headers)
+        require_param(:query) unless params[:query]
+
+        stripe_account = headers && headers[:stripe_account] || Stripe.api_key
+        all_customers = customers[stripe_account]&.values
+        results = search_results(all_customers, params[:query], fields: SEARCH_FIELDS, resource_name: "customers")
+        Data.mock_list_object(results, params)
       end
 
       def delete_customer_discount(route, method_url, params, headers)
+        stripe_account = headers && headers[:stripe_account] || Stripe.api_key
         route =~ method_url
-        cus = assert_existence :customer, $1, customers[$1]
+        cus = assert_existence :customer, $1, customers[stripe_account][$1]
 
         cus[:discount] = nil
 

data/lib/stripe_mock/request_handlers/ephemeral_key.rb

@@ -6,7 +6,7 @@ module StripeMock
       end
 
       def create_ephemeral_key(route, method_url, params, headers)
-        Data.mock_ephemeral_key(params)
+        Data.mock_ephemeral_key(**params)
       end
     end
   end

data/lib/stripe_mock/request_handlers/events.rb

@@ -4,7 +4,7 @@ module StripeMock
 
       def Events.included(klass)
         klass.add_handler 'get /v1/events/(.*)', :retrieve_event
-        klass.add_handler 'get /v1/events',      :list_events 
+        klass.add_handler 'get /v1/events',      :list_events
       end
 
       def retrieve_event(route, method_url, params, headers)
@@ -13,9 +13,36 @@ module StripeMock
       end
 
       def list_events(route, method_url, params, headers)
-        Data.mock_list_object(events.values, params)
+        values = filter_by_created(events.values, params: params)
+        Data.mock_list_object(values, params)
       end
-      
+
+      private
+
+      def filter_by_created(event_list, params:)
+        if params[:created].nil?
+          return event_list
+        end
+
+        if params[:created].is_a?(Hash)
+          if params[:created][:gt]
+            event_list = event_list.select { |event| event[:created] > params[:created][:gt].to_i }
+          end
+          if params[:created][:gte]
+            event_list = event_list.select { |event| event[:created] >= params[:created][:gte].to_i }
+          end
+          if params[:created][:lt]
+            event_list = event_list.select { |event| event[:created] < params[:created][:lt].to_i }
+          end
+          if params[:created][:lte]
+            event_list = event_list.select { |event| event[:created] <= params[:created][:lte].to_i }
+          end
+        else
+          event_list = event_list.select { |event| event[:created] == params[:created].to_i }
+        end
+        event_list
+      end
+
     end
   end
 end

data/lib/stripe_mock/request_handlers/express_login_links.rb

@@ -0,0 +1,15 @@
+module StripeMock
+  module RequestHandlers
+    module ExpressLoginLinks
+
+      def ExpressLoginLinks.included(klass)
+        klass.add_handler 'post /v1/accounts/(.*)/login_links', :new_account_login_link
+      end
+
+      def new_account_login_link(route, method_url, params, headers)
+        route =~ method_url
+        Data.mock_express_login_link(params)
+      end
+    end
+  end
+end

data/lib/stripe_mock/request_handlers/helpers/coupon_helpers.rb

@@ -7,11 +7,17 @@ module StripeMock
           attrs[:coupon]                 = coupon
           attrs[:start]                  = Time.now.to_i
           attrs[:end]                    = (DateTime.now >> coupon[:duration_in_months].to_i).to_time.to_i if coupon[:duration] == 'repeating'
+          attrs[:id]                     = new_id("di")
         end
 
         object[:discount] = Stripe::Discount.construct_from(discount_attrs)
         object
       end
+
+      def delete_coupon_from_object(object)
+        object[:discount] = nil
+        object
+      end
     end
   end
 end

data/lib/stripe_mock/request_handlers/helpers/search_helpers.rb

@@ -0,0 +1,67 @@
+module StripeMock
+  module RequestHandlers
+    module Helpers
+      # Only supports exact matches on a single field, e.g.
+      # - 'amount:100'
+      # - 'email:"name@domain.com"'
+      # - 'name:"Foo Bar"'
+      # - 'metadata["foo"]:"bar"'
+      QUERYSTRING_PATTERN = /\A(?<field>[\w\.]+)(\[['"](?<metadata_key>[^'"]*)['"]\])?:['"]?(?<value>[^'"]*)['"]?\z/
+      def search_results(all_values, querystring, fields: [], resource_name:)
+        values = all_values.dup
+        query_match = QUERYSTRING_PATTERN.match(querystring)
+        raise Stripe::InvalidRequestError.new(
+          'We were unable to parse your search query.' \
+            ' Try using the format `metadata["key"]:"value"` to query for metadata or key:"value" to query for other fields.',
+          nil,
+          http_status: 400,
+        ) unless query_match
+
+        case query_match[:field]
+        when *fields
+          values = values.select { |resource|
+            exact_match?(actual: field_value(resource, field: query_match[:field]), expected: query_match[:value])
+          }
+        when "metadata"
+          values = values.select { |resource|
+            resource[:metadata] &&
+              exact_match?(actual: resource[:metadata][query_match[:metadata_key].to_sym], expected: query_match[:value])
+          }
+        else
+          raise Stripe::InvalidRequestError.new(
+            "Field `#{query_match[:field]}` is an unsupported search field for resource `#{resource_name}`." \
+              " See http://stripe.com/docs/search#query-fields-for-#{resource_name.gsub('_', '-')} for a list of supported fields.",
+            nil,
+            http_status: 400,
+          )
+        end
+
+        values
+      end
+
+      def exact_match?(actual:, expected:)
+        # allow comparisons of integers
+        if actual.respond_to?(:to_i) && actual.to_i == actual
+          expected = expected.to_i
+        end
+        # allow comparisons of boolean
+        case expected
+        when "true"
+          expected = true
+        when "false"
+          expected = false
+        end
+
+        actual == expected
+      end
+
+      def field_value(resource, field:)
+        value = resource
+        field.split('.').each do |segment|
+          value = value[segment.to_sym]
+        end
+        value
+      end
+    end
+  end
+end

data/lib/stripe_mock/request_handlers/helpers/subscription_helpers.rb

@@ -11,12 +11,17 @@ module StripeMock
         items = options[:items]
         items = items.values if items.respond_to?(:values)
         subscription[:items][:data] = plans.map do |plan|
-          if items && items.size == plans.size
-            quantity = items &&
-              items.detect { |item| item[:plan] == plan[:id] }[:quantity] || 1
-            Data.mock_subscription_item({ plan: plan, quantity: quantity })
+          matching_item = items && items.detect { |item| [item[:price], item[:plan]].include? plan[:id] }
+          if matching_item
+            matching_item[:quantity] ||= 1
+            matching_item[:id] ||= new_id('si')
+            params = matching_item.merge(plan: plan)
+            params[:price] = plan if plan[:object] == "price"
+            Data.mock_subscription_item(params)
           else
-            Data.mock_subscription_item({ plan: plan })
+            params = { plan: plan, id: new_id('si') }
+            params[:price] = plan if plan[:object] == "price"
+            Data.mock_subscription_item(params)
           end
         end
         subscription
@@ -32,7 +37,7 @@ module StripeMock
         start_time = options[:current_period_start] || now
         params = { customer: cus[:id], current_period_start: start_time, created: created_time }
         params.merge!({ :plan => (plans.size == 1 ? plans.first : nil) })
-        keys_to_merge = /application_fee_percent|quantity|metadata|tax_percent|billing|days_until_due/
+        keys_to_merge = /application_fee_percent|quantity|metadata|tax_percent|billing|days_until_due|default_tax_rates|pending_invoice_item_interval|default_payment_method|collection_method/
         params.merge! options.select {|k,v| k =~ keys_to_merge}
 
         if options[:cancel_at_period_end] == true
@@ -45,10 +50,10 @@ module StripeMock
 
         if (((plan && plan[:trial_period_days]) || 0) == 0 && options[:trial_end].nil?) || options[:trial_end] == "now"
           end_time = options[:billing_cycle_anchor] || get_ending_time(start_time, plan)
-          params.merge!({status: 'active', current_period_end: end_time, trial_start: nil, trial_end: nil, billing_cycle_anchor: options[:billing_cycle_anchor]})
+          params.merge!({status: 'active', current_period_end: end_time, trial_start: nil, trial_end: nil, billing_cycle_anchor: options[:billing_cycle_anchor] || created_time})
         else
           end_time = options[:trial_end] || (Time.now.utc.to_i + plan[:trial_period_days]*86400)
-          params.merge!({status: 'trialing', current_period_end: end_time, trial_start: start_time, trial_end: end_time, billing_cycle_anchor: nil})
+          params.merge!({status: 'trialing', current_period_end: end_time, trial_start: start_time, trial_end: end_time, billing_cycle_anchor: options[:billing_cycle_anchor] || created_time})
         end
 
         params
@@ -85,11 +90,13 @@ module StripeMock
       def get_ending_time(start_time, plan, intervals = 1)
         return start_time unless plan
 
-        case plan[:interval]
+        interval = plan[:interval] || plan.dig(:recurring, :interval)
+        interval_count = plan[:interval_count] || plan.dig(:recurring, :interval_count) || 1
+        case interval
         when "week"
-          start_time + (604800 * (plan[:interval_count] || 1) * intervals)
+          start_time + (604800 * (interval_count) * intervals)
         when "month"
-          (Time.at(start_time).to_datetime >> ((plan[:interval_count] || 1) * intervals)).to_time.to_i
+          (Time.at(start_time).to_datetime >> ((interval_count) * intervals)).to_time.to_i
         when "year"
           (Time.at(start_time).to_datetime >> (12 * intervals)).to_time.to_i # max period is 1 year
         else
@@ -111,9 +118,26 @@ module StripeMock
 
       def total_items_amount(items)
         total = 0
-        items.each { |i| total += (i[:quantity] || 1) * i[:plan][:amount] }
+        items.each do |item|
+          quantity = item[:quantity] || 1
+          amount = item[:plan][:unit_amount] || item[:plan][:amount]
+          total += quantity * amount
+        end
         total
       end
+
+      def filter_by_timestamp(subscriptions, field:, value:)
+        if value.is_a?(Hash)
+          operator_mapping = { gt: :>, gte: :>=, lt: :<, lte: :<= }
+          subscriptions.filter do |sub|
+            sub[field].public_send(operator_mapping[value.keys[0]], value.values[0])
+          end
+        else
+          subscriptions.filter do |sub|
+            sub[field] == value
+          end
+        end
+      end
     end
   end
 end

data/lib/stripe_mock/request_handlers/helpers/token_helpers.rb

@@ -36,7 +36,7 @@ module StripeMock
 
       def get_card_or_bank_by_token(token)
         token_id = token['id'] || token
-         @card_tokens[token_id] || @bank_tokens[token_id] || raise(Stripe::InvalidRequestError.new("Invalid token id: #{token_id}", 'tok', http_status: 404))
+        @card_tokens[token_id] || @bank_tokens[token_id] || raise(Stripe::InvalidRequestError.new("Invalid token id: #{token_id}", 'tok', http_status: 404))
       end
 
     end