raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-26 01:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix EnterpriseRelationship

Browse Source
This commit is contained in:
Gaetan Craig-Riou
2024-02-27 15:52:17 +11:00
parent 02b9dfb517
commit d073a181e9
2 changed files with 37 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/enterprise_relationship.rb
View File

@@ -108,6 +108,6 @@ class EnterpriseRelationship < ApplicationRecord
def child_variant_overrides
VariantOverride.unscoped.for_hubs(child)
.joins(variant: :product).where(spree_products: { supplier_id: parent })
.joins(:variant).where(spree_variants: { supplier_id: parent } )
end
end

81
spec/models/enterprise_relationship_spec.rb
View File

@@ -164,36 +164,31 @@ RSpec.describe EnterpriseRelationship do
:create_variant_overrides] )
}
let!(:vo1) {
create(:variant_override, hub:,
variant: create(
:variant,
product: create(
:product, supplier: producer
)
))
create(
:variant_override,
hub:,
variant: create(:variant, product: create(:product), supplier: producer)
)
}
let!(:vo2) {
create(:variant_override, hub:,
variant: create(
:variant,
product: create(
:product, supplier: producer
)
))
create(
:variant_override,
hub:,
variant: create(:variant, product: create(:product), supplier: producer)
)
}
let!(:vo3) {
create(:variant_override, hub:,
variant: create(
:variant,
product: create(
:product, supplier: some_other_producer
)
))
create(
:variant_override,
hub:,
variant: create(:variant, product: create(:product), supplier: some_other_producer)
)
}
context "revoking variant override permissions" do
context "when the enterprise relationship is destroyed" do
before { er.destroy }
it "should set permission_revoked_at to the current time " \
"for all variant overrides of the relationship" do
expect(vo1.reload.permission_revoked_at).not_to be_nil
@@ -205,6 +200,7 @@ RSpec.describe EnterpriseRelationship do
context "and is then removed" do
before { er.permissions_list = [:add_to_order_cycles]; er.save! }
it "should set permission_revoked_at to the current time " \
"for all relevant variant overrides" do
expect(vo1.reload.permission_revoked_at).not_to be_nil
@@ -237,34 +233,28 @@ RSpec.describe EnterpriseRelationship do
permissions_list: [:add_to_order_cycles] )
}
let!(:vo1) {
create(:variant_override, hub:,
variant: create(
:variant,
product: create(
:product, supplier: producer
)
),
permission_revoked_at: Time.now.in_time_zone)
create(
:variant_override,
hub:,
variant: create(:variant, product: create(:product), supplier: producer),
permission_revoked_at: Time.now.in_time_zone
)
}
let!(:vo2) {
create(:variant_override, hub:,
variant: create(
:variant,
product: create(
:product, supplier: producer
)
),
permission_revoked_at: Time.now.in_time_zone)
create(
:variant_override,
hub:,
variant: create(:variant, product: create(:product), supplier: producer),
permission_revoked_at: Time.now.in_time_zone
)
}
let!(:vo3) {
create(:variant_override, hub:,
variant: create(
:variant,
product: create(
:product, supplier: some_other_producer
)
),
permission_revoked_at: Time.now.in_time_zone)
create(
:variant_override,
hub:,
variant: create(:variant, product: create(:product), supplier: some_other_producer),
permission_revoked_at: Time.now.in_time_zone
)
}
context "and is then added" do
@@ -292,6 +282,7 @@ RSpec.describe EnterpriseRelationship do
end
end
end
describe "updating order cycles" do
let(:hub) { create(:distributor_enterprise) }
let(:producer) { create(:supplier_enterprise) }