From d4f37a3daabd88a01780b4c5331226dcbb0b7389 Mon Sep 17 00:00:00 2001 From: Feruz Oripov Date: Mon, 26 Feb 2024 23:08:21 +0500 Subject: [PATCH] Update CompleteVisibleOrdersQuery --- ...le_orders.rb => complete_visible_orders_query.rb} | 4 ++-- lib/reporting/line_items.rb | 2 +- lib/reporting/reports/bulk_coop/base.rb | 2 +- ...spec.rb => complete_visible_orders_query_spec.rb} | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) rename app/queries/{complete_visible_orders.rb => complete_visible_orders_query.rb} (83%) rename spec/queries/{complete_visible_orders_spec.rb => complete_visible_orders_query_spec.rb} (72%) diff --git a/app/queries/complete_visible_orders.rb b/app/queries/complete_visible_orders_query.rb similarity index 83% rename from app/queries/complete_visible_orders.rb rename to app/queries/complete_visible_orders_query.rb index 10eabe4f6d..22e427fec6 100644 --- a/app/queries/complete_visible_orders.rb +++ b/app/queries/complete_visible_orders_query.rb @@ -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 diff --git a/lib/reporting/line_items.rb b/lib/reporting/line_items.rb index a949e02dce..fe56194417 100644 --- a/lib/reporting/line_items.rb +++ b/lib/reporting/line_items.rb @@ -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 diff --git a/lib/reporting/reports/bulk_coop/base.rb b/lib/reporting/reports/bulk_coop/base.rb index bf48a6a9d8..5bb079d923 100644 --- a/lib/reporting/reports/bulk_coop/base.rb +++ b/lib/reporting/reports/bulk_coop/base.rb @@ -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 diff --git a/spec/queries/complete_visible_orders_spec.rb b/spec/queries/complete_visible_orders_query_spec.rb similarity index 72% rename from spec/queries/complete_visible_orders_spec.rb rename to spec/queries/complete_visible_orders_query_spec.rb index 2018674338..982c567e1f 100644 --- a/spec/queries/complete_visible_orders_spec.rb +++ b/spec/queries/complete_visible_orders_query_spec.rb @@ -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