spree_cm_commissioner 2.7.1.pre.pre6 → 2.7.1.pre.pre8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/app/controllers/spree/api/v2/storefront/pricing_previews_controller.rb +16 -5
- data/app/controllers/spree/api/v2/tenant/pricing_previews_controller.rb +20 -6
- data/app/services/spree_cm_commissioner/pricing_models/activate.rb +3 -0
- data/lib/spree_cm_commissioner/pricing_models/order_context.rb +4 -1
- data/lib/spree_cm_commissioner/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: aead7dbe0a1723c8c08996fe74ba64198a19134aeac915fb77f45b96979ce9a8
|
|
4
|
+
data.tar.gz: c591f41addd0555cd853de9cd10a3326a72a23e1069429f20f4564582b5a4b6f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 608c9766931ce6858cacd8118d1c9c384f3a013724136226ef24d3b796b0bfd7890c72541c8716d500814226daedbe762bac6d2e20ca8c158b4e53c112fb9346
|
|
7
|
+
data.tar.gz: 3ca15cc172c6c7219eb56309fc7665fd8775692770e37dfec4325fdfe3c605fa7e2eca80dd5f6e8efcb6bb7ec2dcd02396a3ba629b776a38aafd7240267769c6
|
data/Gemfile.lock
CHANGED
|
@@ -14,14 +14,25 @@ module Spree
|
|
|
14
14
|
"#{Digest::SHA256.hexdigest(permitted_preview_params.to_json)}:" \
|
|
15
15
|
"#{pricing_models_updated_at.to_i}"
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
SpreeCmCommissioner::PricingModels::Preview.call(order_context: order_context)
|
|
17
|
+
cached_result = Rails.cache.fetch(cache_key, expires_in: 60.seconds) do
|
|
18
|
+
result = SpreeCmCommissioner::PricingModels::Preview.call(order_context: order_context)
|
|
19
|
+
if result.success?
|
|
20
|
+
{
|
|
21
|
+
success: true,
|
|
22
|
+
payload: serialize_resource(result.value[:pricing_preview]).as_json
|
|
23
|
+
}
|
|
24
|
+
else
|
|
25
|
+
{
|
|
26
|
+
success: false,
|
|
27
|
+
error: result.error.to_s
|
|
28
|
+
}
|
|
29
|
+
end
|
|
19
30
|
end
|
|
20
31
|
|
|
21
|
-
if
|
|
22
|
-
render_serialized_payload {
|
|
32
|
+
if cached_result[:success]
|
|
33
|
+
render_serialized_payload { cached_result[:payload] }
|
|
23
34
|
else
|
|
24
|
-
render_error_payload(
|
|
35
|
+
render_error_payload(cached_result[:error], 422)
|
|
25
36
|
end
|
|
26
37
|
rescue ArgumentError => e
|
|
27
38
|
render_error_payload(e.message, 422)
|
|
@@ -6,7 +6,10 @@ module Spree
|
|
|
6
6
|
# GET /api/v2/tenant/pricing_previews
|
|
7
7
|
def index
|
|
8
8
|
permitted_preview_params = params.permit(SpreeCmCommissioner::PricingModels::OrderContext::PREVIEW_PERMITTED_PARAMS)
|
|
9
|
-
order_context = SpreeCmCommissioner::PricingModels::OrderContext.load!(
|
|
9
|
+
order_context = SpreeCmCommissioner::PricingModels::OrderContext.load!(
|
|
10
|
+
permitted_preview_params[:order_context]&.merge(tenant_id: current_tenant.id)
|
|
11
|
+
)
|
|
12
|
+
|
|
10
13
|
pricing_models_updated_at = SpreeCmCommissioner::PricingModel.joins(:vendor)
|
|
11
14
|
.where(spree_vendors: { tenant_id: current_tenant.id })
|
|
12
15
|
.maximum(:updated_at)
|
|
@@ -14,14 +17,25 @@ module Spree
|
|
|
14
17
|
"#{Digest::SHA256.hexdigest(permitted_preview_params.to_json)}:" \
|
|
15
18
|
"#{pricing_models_updated_at.to_i}"
|
|
16
19
|
|
|
17
|
-
|
|
18
|
-
SpreeCmCommissioner::PricingModels::Preview.call(order_context: order_context)
|
|
20
|
+
cached_result = Rails.cache.fetch(cache_key, expires_in: 60.seconds) do
|
|
21
|
+
result = SpreeCmCommissioner::PricingModels::Preview.call(order_context: order_context)
|
|
22
|
+
if result.success?
|
|
23
|
+
{
|
|
24
|
+
success: true,
|
|
25
|
+
payload: serialize_resource(result.value[:pricing_preview]).as_json
|
|
26
|
+
}
|
|
27
|
+
else
|
|
28
|
+
{
|
|
29
|
+
success: false,
|
|
30
|
+
error: result.error.to_s
|
|
31
|
+
}
|
|
32
|
+
end
|
|
19
33
|
end
|
|
20
34
|
|
|
21
|
-
if
|
|
22
|
-
render_serialized_payload {
|
|
35
|
+
if cached_result[:success]
|
|
36
|
+
render_serialized_payload { cached_result[:payload] }
|
|
23
37
|
else
|
|
24
|
-
render_error_payload(
|
|
38
|
+
render_error_payload(cached_result[:error], 422)
|
|
25
39
|
end
|
|
26
40
|
rescue ArgumentError => e
|
|
27
41
|
render_error_payload(e.message, 422)
|
|
@@ -4,6 +4,9 @@ module SpreeCmCommissioner
|
|
|
4
4
|
prepend ::Spree::ServiceModule::Base
|
|
5
5
|
|
|
6
6
|
def call(order:)
|
|
7
|
+
return failure(:order_is_not_persisted) unless order.persisted?
|
|
8
|
+
return failure(:order_not_completed) unless order.completed?
|
|
9
|
+
|
|
7
10
|
order_context = OrderContext.build_from_context(fallback_order: order)
|
|
8
11
|
|
|
9
12
|
preview_result = Preview.call(order_context: order_context)
|
|
@@ -20,14 +20,17 @@ module SpreeCmCommissioner
|
|
|
20
20
|
end
|
|
21
21
|
|
|
22
22
|
def self.load!(params)
|
|
23
|
+
raise ArgumentError, 'order_context is required' if params.nil?
|
|
24
|
+
|
|
23
25
|
params = params.to_h.deep_symbolize_keys
|
|
24
26
|
number = params[:number].presence
|
|
25
27
|
token = params[:token].presence
|
|
28
|
+
tenant_id = params[:tenant_id].presence
|
|
26
29
|
|
|
27
30
|
raise ArgumentError, 'order_context.number is required' if number.blank?
|
|
28
31
|
raise ArgumentError, 'order_context.token is required' if token.blank?
|
|
29
32
|
|
|
30
|
-
order = Spree::Order.find_by(number: number, token: token)
|
|
33
|
+
order = Spree::Order.find_by(number: number, token: token, tenant_id: tenant_id)
|
|
31
34
|
raise ArgumentError, "order #{number} not found" if order.nil?
|
|
32
35
|
|
|
33
36
|
build_from_context(attributes: params, fallback_order: order)
|