mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-24 20:36:49 +00:00
Update CompleteVisibleOrdersQuery
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class CompleteVisibleOrders
|
||||
class CompleteVisibleOrdersQuery
|
||||
def initialize(order_permissions)
|
||||
@order_permissions = order_permissions
|
||||
end
|
||||
|
||||
def query
|
||||
def call
|
||||
order_permissions.visible_orders.complete
|
||||
end
|
||||
|
||||
@@ -7,7 +7,7 @@ module Reporting
|
||||
@order_permissions = order_permissions
|
||||
@params = params
|
||||
complete_not_canceled_visible_orders =
|
||||
CompleteVisibleOrders.new(order_permissions).query.not_state(:canceled)
|
||||
CompleteVisibleOrdersQuery.new(order_permissions).call.not_state(:canceled)
|
||||
@orders_relation = orders_relation || complete_not_canceled_visible_orders
|
||||
end
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ module Reporting
|
||||
@report_line_items ||= Reporting::LineItems.new(
|
||||
order_permissions,
|
||||
@params,
|
||||
CompleteVisibleOrders.new(order_permissions).query
|
||||
CompleteVisibleOrdersQuery.new(order_permissions).call
|
||||
)
|
||||
end
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
require 'spec_helper'
|
||||
|
||||
describe CompleteVisibleOrders do
|
||||
subject(:complete_visible_orders) { described_class.new(order_permissions) }
|
||||
describe CompleteVisibleOrdersQuery do
|
||||
subject(:result) { described_class.new(order_permissions).call }
|
||||
let(:filter_canceled) { false }
|
||||
|
||||
describe '#query' do
|
||||
describe '#call' do
|
||||
let(:user) { create(:user) }
|
||||
let(:enterprise) { create(:enterprise) }
|
||||
let(:order_permissions) { Permissions::Order.new(user, filter_canceled) }
|
||||
@@ -20,7 +20,7 @@ describe CompleteVisibleOrders do
|
||||
let(:cart_order) { create(:order, distributor: enterprise) }
|
||||
|
||||
it 'does not return it' do
|
||||
expect(complete_visible_orders.query).not_to include(cart_order)
|
||||
expect(result).not_to include(cart_order)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -28,13 +28,13 @@ describe CompleteVisibleOrders do
|
||||
let(:complete_order) { create(:order, completed_at: 1.day.ago, distributor: enterprise) }
|
||||
|
||||
it 'does not return it' do
|
||||
expect(complete_visible_orders.query).to include(complete_order)
|
||||
expect(result).to include(complete_order)
|
||||
end
|
||||
end
|
||||
|
||||
it 'calls #visible_orders' do
|
||||
expect(order_permissions).to receive(:visible_orders).and_call_original
|
||||
complete_visible_orders.query
|
||||
result
|
||||
end
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user