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

Merge pull request #4059 from luisramos0/kill_rabl

Browse Source 
Convert 2 rabl templates to AMS and remove a few unused ones
This commit is contained in:
Luis Ramos
2019-07-30 19:28:21 +01:00
committed by GitHub
parent 3fa9e857a8 a1e6e4c38f
commit 62eb2bba13
26 changed files with 22 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/api/enterprises_controller.rb
View File

@@ -5,12 +5,7 @@ module Api
before_filter :override_sells, only: [:create, :update]
before_filter :override_visible, only: [:create, :update]
respond_to :json
skip_authorization_check only: [:shopfront, :managed]
def managed
@enterprises = Enterprise.ransack(params[:q]).result.managed_by(current_api_user)
render params[:template] || :bulk_index
end
skip_authorization_check only: [:shopfront]
def create
authorize! :create, Enterprise

25
app/controllers/api/order_cycles_controller.rb
View File

@@ -1,25 +0,0 @@
module Api
class OrderCyclesController < Spree::Api::BaseController
respond_to :json
def managed
authorize! :admin, OrderCycle
authorize! :read, OrderCycle
@order_cycles = OrderCycle.ransack(params[:q]).result.managed_by(current_api_user)
render params[:template] || :bulk_index
end
def accessible
@order_cycles = if params[:as] == "distributor"
OrderCycle.ransack(params[:q]).result.
involving_managed_distributors_of(current_api_user).order('updated_at DESC')
elsif params[:as] == "producer"
OrderCycle.ransack(params[:q]).result.
involving_managed_producers_of(current_api_user).order('updated_at DESC')
else
OrderCycle.ransack(params[:q]).result.accessible_by(current_api_user)
end
render params[:template] || :bulk_index
end
end
end

8
app/helpers/injection_helper.rb
View File

@@ -111,8 +111,12 @@ module InjectionHelper
inject_json_ams "savedCreditCards", data, Api::CreditCardSerializer
end
def inject_json(name, partial, opts = {})
render partial: "json/injection", locals: { name: name, partial: partial }.merge(opts)
def inject_current_user
inject_json_ams "user", spree_current_user, Api::UserSerializer
end
def inject_rails_flash
inject_json_ams "railsFlash", OpenStruct.new(flash.to_hash), Api::RailsFlashSerializer
end
def inject_json_ams(name, data, serializer, opts = {})

7
app/serializers/api/rails_flash_serializer.rb Normal file
View File

@@ -0,0 +1,7 @@
module Api
class RailsFlashSerializer < ActiveModel::Serializer
attributes :info, :success, :error, :notice
delegate :info, :success, :error, :notice, to: :object
end
end

5
app/serializers/api/user_serializer.rb Normal file
View File

@@ -0,0 +1,5 @@
module Api
class UserSerializer < ActiveModel::Serializer
attributes :id, :email
end
end

3
app/views/admin/json/_enterprises.rabl
View File

@@ -1,3 +0,0 @@
collection @enterprises
attributes :id, :name

2
app/views/api/enterprises/bulk_index.v1.rabl
View File

@@ -1,2 +0,0 @@
collection @enterprises
extends "api/enterprises/bulk_show"

2
app/views/api/order_cycles/bulk_index.v1.rabl
View File

@@ -1,2 +0,0 @@
collection @order_cycles
extends "api/order_cycles/bulk_show"

11
app/views/api/order_cycles/bulk_show.v1.rabl
View File

@@ -1,11 +0,0 @@
object @order_cycle
attributes :id, :name
node( :first_order ) { |order| order.orders_open_at.strftime("%F") }
node( :last_order ) { |order| (order.orders_close_at + 1.day).strftime("%F") }
node( :suppliers ) do |oc|
partial 'api/enterprises/bulk_index', object: oc.suppliers
end
node( :distributors ) do |oc|
partial 'api/enterprises/bulk_index', object: oc.distributors
end

12
app/views/json/_current_order.rabl
View File

@@ -1,12 +0,0 @@
object current_order
attributes :id, :item_total
if current_order
child line_items: :line_items do
attributes :id, :variant_id, :quantity, :price
end
node :cart_count do
cart_count
end
end

2
app/views/json/_current_user.rabl
View File

@@ -1,2 +0,0 @@
object spree_current_user
attributes :email, :id

7
app/views/json/_enterprises.rabl
View File

@@ -1,7 +0,0 @@
# TODO: This should be moved into the controller
# RABL is tricky to pass variables into: so we do this as a workaround for now
# I noticed some vague comments on Rabl github about this, but haven't looked into
collection Enterprise.visible
extends 'json/partials/enterprise'
extends 'json/partials/producer'
extends 'json/partials/hub'

2
app/views/json/_flash.rabl
View File

@@ -1,2 +0,0 @@
object OpenStruct.new(flash.to_hash)
attributes :info, :success, :error, :notice

18
app/views/json/_groups.rabl
View File

@@ -1,18 +0,0 @@
collection @groups
attributes :id, :permalink, :name, :position, :description, :long_description, :email, :website, :facebook, :instagram, :linkedin, :twitter
child enterprises: :enterprises do
attributes :id
end
node :logo do |group|
group.logo(:medium) if group.logo?
end
node :promo_image do |group|
group.promo_image(:large) if group.promo_image?
end
node :state do |group|
group.state.andand.abbr
end

3
app/views/json/_hubs.rabl
View File

@@ -1,3 +0,0 @@
collection Enterprise.is_distributor.visible
extends 'json/partials/enterprise'
extends 'json/partials/hub'

2
app/views/json/_injection.html.haml
View File

@@ -1,2 +0,0 @@
:javascript
angular.module('Darkswarm').value("#{name.to_s}", #{render partial: "json/#{partial.to_s}"})

14
app/views/json/_producer.rabl
View File

@@ -1,14 +0,0 @@
attributes :id, :name, :description, :long_description, :website, :instagram, :facebook, :linkedin, :twitter
node :promo_image do |producer|
producer.promo_image(:large)
end
node :logo do |producer|
producer.logo(:medium)
end
node :path do |producer|
main_app.producer_path(producer)
end
node :hash, &:to_param

3
app/views/json/_producers.rabl
View File

@@ -1,3 +0,0 @@
collection Enterprise.is_primary_producer.visible
extends 'json/partials/enterprise'
extends 'json/partials/producer'

5
app/views/json/_taxon.rabl
View File

@@ -1,5 +0,0 @@
attributes :name, :id, :permalink
node :icon do |taxon|
taxon.icon(:original)
end

4
app/views/json/partials/_address.rabl
View File

@@ -1,4 +0,0 @@
attributes :city, :zipcode, :phone
node :state_name do |address|
address.state.abbr
end

29
app/views/json/partials/_enterprise.rabl
View File

@@ -1,29 +0,0 @@
attributes :name, :id, :description, :latitude, :longitude, :long_description, :website, :instagram, :linkedin, :twitter, :facebook, :is_primary_producer, :is_distributor, :phone
node :email_address do |enterprise|
enterprise.email_address.to_s.reverse
end
child :address do
extends "json/partials/address"
end
node :hash, &:to_param
node :logo do |enterprise|
enterprise.logo(:medium) if enterprise.logo?
end
node :promo_image do |enterprise|
enterprise.promo_image(:large) if enterprise.promo_image?
end
node :icon do |e|
if e.is_primary_producer && e.is_distributor
image_path "map_003-producer-shop.svg"
elsif e.is_primary_producer
image_path "map_001-producer-only.svg"
else
image_path "map_005-hub.svg"
end
end

23
app/views/json/partials/_hub.rabl
View File

@@ -1,23 +0,0 @@
child distributed_taxons: :taxons do
extends "json/taxon"
end
child suppliers: :producers do
attributes :id
end
node :path do |enterprise|
main_app.enterprise_shop_path(enterprise)
end
node :pickup do |hub|
hub.shipping_methods.where(require_ship_address: false).present?
end
node :delivery do |hub|
hub.shipping_methods.where(require_ship_address: true).present?
end
if @active_distributors
node :active do |hub|
@active_distributors.include?(hub)
end
end
node :orders_close_at do |hub|
OrderCycle.first_closing_for(hub).andand.orders_close_at
end

10
app/views/json/partials/_producer.rabl
View File

@@ -1,10 +0,0 @@
child distributors: :hubs do
attributes :id
end
node :path do |producer|
main_app.producer_path(producer)
end
child supplied_taxons: :supplied_taxons do
extends 'json/taxon'
end

4
app/views/layouts/darkswarm.html.haml
View File

@@ -45,8 +45,8 @@
= yield :scripts
= inject_current_hub
= inject_json "user", "current_user"
= inject_json "railsFlash", "flash"
= inject_current_user
= inject_rails_flash
= inject_taxons
= inject_properties
= inject_current_order

2
app/views/layouts/registration.html.haml
View File

@@ -31,7 +31,7 @@
= javascript_include_tag "darkswarm/all"
= yield :scripts
= inject_json "user", "current_user"
= inject_current_user
= yield :injection_data
= render "layouts/i18n_script"

199
spec/controllers/api/order_cycles_controller_spec.rb
View File

@@ -1,199 +0,0 @@
require 'spec_helper'
require 'spree/api/testing_support/helpers'
module Api
describe OrderCyclesController, type: :controller do
include Spree::Api::TestingSupport::Helpers
include AuthenticationWorkflow
render_views
describe "managed" do
let!(:oc1) { FactoryBot.create(:simple_order_cycle) }
let!(:oc2) { FactoryBot.create(:simple_order_cycle) }
let(:coordinator) { oc1.coordinator }
let(:attributes) { [:id, :name, :suppliers, :distributors] }
before do
allow(controller).to receive(:spree_current_user) { current_api_user }
end
context "as a normal user" do
sign_in_as_user!
it "should deny me access to managed order cycles" do
spree_get :managed, format: :json
assert_unauthorized!
end
end
context "as an enterprise user" do
sign_in_as_enterprise_user! [:coordinator]
it "retrieves a list of variants with appropriate attributes" do
get :managed, format: :json
keys = json_response.first.keys.map(&:to_sym)
expect(attributes.all?{ |attr| keys.include? attr }).to eq(true)
end
end
context "as an administrator" do
sign_in_as_admin!
it "retrieves a list of variants with appropriate attributes" do
get :managed, format: :json
keys = json_response.first.keys.map(&:to_sym)
expect(attributes.all?{ |attr| keys.include? attr }).to eq(true)
end
end
end
describe "accessible" do
context "without :as parameter" do
let(:oc_supplier) { create(:supplier_enterprise) }
let(:oc_distributor) { create(:distributor_enterprise) }
let(:other_supplier) { create(:supplier_enterprise) }
let(:oc_supplier_user) do
user = create(:user)
user.spree_roles = []
user.enterprise_roles.create(enterprise: oc_supplier)
user.save!
user
end
let(:oc_distributor_user) do
user = create(:user)
user.spree_roles = []
user.enterprise_roles.create(enterprise: oc_distributor)
user.save!
user
end
let(:other_supplier_user) do
user = create(:user)
user.spree_roles = []
user.enterprise_roles.create(enterprise: other_supplier)
user.save!
user
end
let!(:order_cycle) { create(:simple_order_cycle, suppliers: [oc_supplier], distributors: [oc_distributor]) }
context "as the user of a supplier to an order cycle" do
before do
allow(controller).to receive(:spree_current_user) { oc_supplier_user }
end
it "gives me access" do
spree_get :accessible, template: 'bulk_index', format: :json
expect(json_response.length).to eq(1)
expect(json_response[0]['id']).to eq(order_cycle.id)
end
end
context "as the user of some other supplier" do
before do
allow(controller).to receive(:spree_current_user) { other_supplier_user }
end
it "does not give me access" do
spree_get :accessible, template: 'bulk_index', format: :json
expect(json_response.length).to eq(0)
end
end
context "as the user of a hub for the order cycle" do
before do
allow(controller).to receive(:spree_current_user) { oc_distributor_user }
end
it "gives me access" do
spree_get :accessible, template: 'bulk_index', format: :json
expect(json_response.length).to eq(1)
expect(json_response[0]['id']).to eq(order_cycle.id)
end
end
end
context "when the :as parameter is set to 'distributor'" do
let(:user) { create_enterprise_user }
let(:distributor) { create(:distributor_enterprise) }
let(:producer) { create(:supplier_enterprise) }
let(:coordinator) { create(:distributor_enterprise) }
let!(:oc) { create(:simple_order_cycle, coordinator: coordinator, distributors: [distributor], suppliers: [producer]) }
let(:params) { { format: :json, as: 'distributor' } }
before do
allow(controller).to receive(:spree_current_user) { user }
end
context "as the manager of a supplier in an order cycle" do
before { user.enterprise_roles.create(enterprise: producer) }
it "does not return the order cycle" do
spree_get :accessible, params
expect(assigns(:order_cycles)).to_not include oc
end
end
context "as the manager of a distributor in an order cycle" do
before { user.enterprise_roles.create(enterprise: distributor) }
it "returns the order cycle" do
spree_get :accessible, params
expect(assigns(:order_cycles)).to include oc
end
end
context "as the manager of the coordinator of an order cycle" do
before { user.enterprise_roles.create(enterprise: coordinator) }
it "returns the order cycle" do
spree_get :accessible, params
expect(assigns(:order_cycles)).to include oc
end
end
end
context "when the :as parameter is set to 'producer'" do
let(:user) { create_enterprise_user }
let(:distributor) { create(:distributor_enterprise) }
let(:producer) { create(:supplier_enterprise) }
let(:coordinator) { create(:distributor_enterprise) }
let!(:oc) { create(:simple_order_cycle, coordinator: coordinator, distributors: [distributor], suppliers: [producer]) }
let(:params) { { format: :json, as: 'producer' } }
before do
allow(controller).to receive(:spree_current_user) { user }
end
context "as the manager of a producer in an order cycle" do
before { user.enterprise_roles.create(enterprise: producer) }
it "returns the order cycle" do
spree_get :accessible, params
expect(assigns(:order_cycles)).to include oc
end
end
context "as the manager of a distributor in an order cycle" do
before { user.enterprise_roles.create(enterprise: distributor) }
it "does not return the order cycle" do
spree_get :accessible, params
expect(assigns(:order_cycles)).to_not include oc
end
end
context "as the manager of the coordinator of an order cycle" do
before { user.enterprise_roles.create(enterprise: coordinator) }
it "returns the order cycle" do
spree_get :accessible, params
expect(assigns(:order_cycles)).to include oc
end
end
end
end
end
end