Merge pull request #4112 from luisramos0/convert_shipments_rabl

Convert spree/api/shipments views from rabl to ams

app/controllers/api/shipments_controller.rb

@@ -0,0 +1,105 @@
+require 'open_food_network/scope_variant_to_hub'
+
+module Api
+  class ShipmentsController < Api::BaseController
+    respond_to :json
+
+    before_filter :find_order
+    before_filter :find_and_update_shipment, only: [:ship, :ready, :add, :remove]
+
+    def create
+      variant = scoped_variant(params[:variant_id])
+      quantity = params[:quantity].to_i
+      @shipment = get_or_create_shipment(params[:stock_location_id])
+
+      @order.contents.add(variant, quantity, nil, @shipment)
+
+      @shipment.refresh_rates
+      @shipment.save!
+
+      render json: @shipment.reload, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    def update
+      authorize! :read, Spree::Shipment
+      @shipment = @order.shipments.find_by_number!(params[:id])
+      params[:shipment] ||= []
+      unlock = params[:shipment].delete(:unlock)
+
+      if unlock == 'yes'
+        @shipment.adjustment.open
+      end
+
+      @shipment.update_attributes(params[:shipment])
+
+      if unlock == 'yes'
+        @shipment.adjustment.close
+      end
+
+      render json: @shipment.reload, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    def ready
+      authorize! :read, Spree::Shipment
+      unless @shipment.ready?
+        if @shipment.can_ready?
+          @shipment.ready!
+        else
+          render(json: { error: I18n.t(:cannot_ready, scope: "spree.api.shipment") },
+                 status: :unprocessable_entity) && return
+        end
+      end
+      render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    def ship
+      authorize! :read, Spree::Shipment
+      unless @shipment.shipped?
+        @shipment.ship!
+      end
+      render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    def add
+      variant = scoped_variant(params[:variant_id])
+      quantity = params[:quantity].to_i
+
+      @order.contents.add(variant, quantity, nil, @shipment)
+
+      render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    def remove
+      variant = scoped_variant(params[:variant_id])
+      quantity = params[:quantity].to_i
+
+      @order.contents.remove(variant, quantity, @shipment)
+      @shipment.reload if @shipment.persisted?
+
+      render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    private
+
+    def find_order
+      @order = Spree::Order.find_by_number!(params[:order_id])
+      authorize! :read, @order
+    end
+
+    def find_and_update_shipment
+      @shipment = @order.shipments.find_by_number!(params[:id])
+      @shipment.update_attributes(params[:shipment])
+      @shipment.reload
+    end
+
+    def scoped_variant(variant_id)
+      variant = Spree::Variant.find(variant_id)
+      OpenFoodNetwork::ScopeVariantToHub.new(@order.distributor).scope(variant)
+      variant
+    end
+
+    def get_or_create_shipment(stock_location_id)
+      @order.shipment || @order.shipments.create(stock_location_id: stock_location_id)
+    end
+  end
+end

app/controllers/spree/api/shipments_controller.rb

@@ -1,108 +0,0 @@
-require 'open_food_network/scope_variant_to_hub'
-
-module Spree
-  module Api
-    class ShipmentsController < Spree::Api::BaseController
-      respond_to :json
-
-      before_filter :find_order
-      before_filter :find_and_update_shipment, only: [:ship, :ready, :add, :remove]
-
-      def create
-        variant = scoped_variant(params[:variant_id])
-        quantity = params[:quantity].to_i
-        @shipment = get_or_create_shipment(params[:stock_location_id])
-
-        @order.contents.add(variant, quantity, nil, @shipment)
-
-        @shipment.refresh_rates
-        @shipment.save!
-
-        respond_with(@shipment.reload, default_template: :show)
-      end
-
-      def update
-        authorize! :read, Shipment
-        @shipment = @order.shipments.find_by_number!(params[:id])
-        params[:shipment] ||= []
-        unlock = params[:shipment].delete(:unlock)
-
-        if unlock == 'yes'
-          @shipment.adjustment.open
-        end
-
-        @shipment.update_attributes(params[:shipment])
-
-        if unlock == 'yes'
-          @shipment.adjustment.close
-        end
-
-        @shipment.reload
-        respond_with(@shipment, default_template: :show)
-      end
-
-      def ready
-        authorize! :read, Shipment
-        unless @shipment.ready?
-          if @shipment.can_ready?
-            @shipment.ready!
-          else
-            render "spree/api/shipments/cannot_ready_shipment", status: :unprocessable_entity
-            return
-          end
-        end
-        respond_with(@shipment, default_template: :show)
-      end
-
-      def ship
-        authorize! :read, Shipment
-        unless @shipment.shipped?
-          @shipment.ship!
-        end
-        respond_with(@shipment, default_template: :show)
-      end
-
-      def add
-        variant = scoped_variant(params[:variant_id])
-        quantity = params[:quantity].to_i
-
-        @order.contents.add(variant, quantity, nil, @shipment)
-
-        respond_with(@shipment, default_template: :show)
-      end
-
-      def remove
-        variant = scoped_variant(params[:variant_id])
-        quantity = params[:quantity].to_i
-
-        @order.contents.remove(variant, quantity, @shipment)
-        @shipment.reload if @shipment.persisted?
-
-        respond_with(@shipment, default_template: :show)
-      end
-
-      private
-
-      def find_order
-        @order = Spree::Order.find_by_number!(params[:order_id])
-        authorize! :read, @order
-      end
-
-      def find_and_update_shipment
-        @shipment = @order.shipments.find_by_number!(params[:id])
-        @shipment.update_attributes(params[:shipment])
-        @shipment.reload
-      end
-
-      def scoped_variant(variant_id)
-        variant = Spree::Variant.find(variant_id)
-        OpenFoodNetwork::ScopeVariantToHub.new(@order.distributor).scope(variant)
-        variant
-      end
-
-      def get_or_create_shipment(stock_location_id)
-        @order.shipment || @order.shipments.create(stock_location_id: stock_location_id)
-      end
-    end
-  end
-end

app/serializers/api/shipment_serializer.rb

@@ -0,0 +1,13 @@
+module Api
+  class ShipmentSerializer < ActiveModel::Serializer
+    attributes :id, :tracking, :number, :order_id, :cost, :shipped_at, :stock_location_name, :state
+
+    def order_id
+      object.order.number
+    end
+
+    def stock_location_name
+      object.stock_location.name
+    end
+  end
+end

config/routes/api.rb

@@ -15,6 +15,19 @@ Openfoodnetwork::Application.routes.draw do
 
     resources :variants, :only => [:index]
 
+    resources :orders, only: [:index] do
+      get :managed, on: :collection
+
+      resources :shipments, :only => [:create, :update] do
+        member do
+          put :ready
+          put :ship
+          put :add
+          put :remove
+        end
+      end
+    end
+
     resources :enterprises do
       post :update_image, on: :member
       get :managed, on: :collection
@@ -33,8 +46,6 @@ Openfoodnetwork::Application.routes.draw do
       get :accessible, on: :collection
     end
 
-    resources :orders, only: [:index]
-
     resource :status do
       get :job_queue
     end

config/routes/spree.rb

@@ -61,19 +61,6 @@ Spree::Core::Engine.routes.prepend do
     resources :users do
       get :authorise_api, on: :collection
     end
-
-    resources :orders do
-      get :managed, on: :collection
-
-      resources :shipments, :only => [:create, :update] do
-        member do
-          put :ready
-          put :ship
-          put :add
-          put :remove
-        end
-      end
-    end
   end
 
   namespace :admin do

spec/controllers/api/shipments_controller_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Spree::Api::ShipmentsController, type: :controller do
+describe Api::ShipmentsController, type: :controller do
   render_views
 
   let!(:shipment) { create(:shipment) }
-  let!(:attributes) { [:id, :tracking, :number, :cost, :shipped_at, :stock_location_name, :order_id, :shipping_rates, :shipping_method, :inventory_units] }
+  let!(:attributes) { [:id, :tracking, :number, :cost, :shipped_at, :stock_location_name, :order_id] }
   let!(:resource_scoping) { { order_id: shipment.order.to_param, id: shipment.to_param } }
   let(:current_api_user) { build(:user) }
 
@@ -53,7 +53,7 @@ describe Spree::Api::ShipmentsController, type: :controller do
         spree_post :create, params
 
         expect_valid_response
-        expect(json_response["inventory_units"].size).to eq 2
+        expect(order.shipment.reload.inventory_units.size).to eq 2
         expect(order.reload.line_items.first.variant.price).to eq(variant.price)
       end
 
@@ -64,7 +64,7 @@ describe Spree::Api::ShipmentsController, type: :controller do
 
         expect(json_response["id"]). to eq(original_shipment_id)
         expect_valid_response
-        expect(json_response["inventory_units"].size).to eq 2
+        expect(order.shipment.reload.inventory_units.size).to eq 2
         expect(order.reload.line_items.first.variant.price).to eq(variant.price)
       end
 
@@ -77,7 +77,7 @@ describe Spree::Api::ShipmentsController, type: :controller do
         spree_post :create, params
 
         expect_valid_response
-        expect(json_response["inventory_units"].size).to eq 2
+        expect(order.shipment.reload.inventory_units.size).to eq 2
         expect(order.reload.line_items.first.price).to eq(variant_override.price)
       end
 
@@ -113,16 +113,17 @@ describe Spree::Api::ShipmentsController, type: :controller do
 
       it 'adds a variant to a shipment' do
         api_put :add, variant_id: variant.to_param, quantity: 2
+
         expect(response.status).to eq(200)
-        expect(json_response['inventory_units'].select { |h| h['variant_id'] == variant.id }.size).to eq(2)
+        expect(order.shipment.reload.inventory_units.select { |h| h['variant_id'] == variant.id }.size).to eq 2
       end
 
       it 'removes a variant from a shipment' do
         order.contents.add(variant, 2)
-
         api_put :remove, variant_id: variant.to_param, quantity: 1
+
         expect(response.status).to eq(200)
-        expect(json_response['inventory_units'].select { |h| h['variant_id'] == variant.id }.size).to eq(1)
+        expect(order.shipment.reload.inventory_units.select { |h| h['variant_id'] == variant.id }.size).to eq(1)
       end
     end
 
@@ -156,7 +157,7 @@ describe Spree::Api::ShipmentsController, type: :controller do
           spree_put :add, params
 
           expect_valid_response
-          expect(inventory_units_for(json_response["inventory_units"], variant).size).to eq 2
+          expect(inventory_units_for(variant).size).to eq 2
         end
 
         it 'returns error code when adding to order contents fails' do
@@ -175,7 +176,7 @@ describe Spree::Api::ShipmentsController, type: :controller do
           spree_put :add, params
 
           expect_valid_response
-          expect(inventory_units_for(json_response["inventory_units"], variant).size).to eq 2
+          expect(inventory_units_for(variant).size).to eq 2
           expect(order.reload.line_items.last.price).to eq(variant_override.price)
         end
       end
@@ -190,7 +191,7 @@ describe Spree::Api::ShipmentsController, type: :controller do
           spree_put :remove, params
 
           expect_valid_response
-          expect(inventory_units_for(json_response["inventory_units"], variant).size).to eq 0
+          expect(inventory_units_for(variant).size).to eq 0
         end
 
         it 'returns error code when removing from order contents fails' do
@@ -203,14 +204,13 @@ describe Spree::Api::ShipmentsController, type: :controller do
       end
     end
 
-    def inventory_units_for(inventory_units, variant)
-      inventory_units.select { |unit| unit['variant_id'] == variant.id }
+    def inventory_units_for(variant)
+      order.shipment.reload.inventory_units.select { |unit| unit['variant_id'] == variant.id }
     end
 
     def expect_valid_response
       expect(response.status).to eq 200
       attributes.all?{ |attr| json_response.key? attr.to_s }
-      expect(json_response["shipping_method"]["name"]).to eq order.shipping_method.name
     end
 
     def make_order_contents_fail

spec/features/admin/enterprises/index_spec.rb

@@ -76,12 +76,20 @@ feature 'Enterprises Index' do
           visit admin_enterprises_path
         end
 
+        def enterprise_row_index(enterprise_name)
+          enterprise_row_number = all('tr').index { |tr| tr.text.include? enterprise_name }
+          enterprise_row_number - 1
+        end
+
         it "does not update the enterprises and displays errors" do
+          d_row_index = enterprise_row_index(d.name)
           within("tr.enterprise-#{d.id}") do
-            select d_manager.email, from: 'enterprise_set_collection_attributes_0_owner_id'
+            select d_manager.email, from: "enterprise_set_collection_attributes_#{d_row_index}_owner_id"
           end
+
+          second_distributor_row_index = enterprise_row_index(second_distributor.name)
           within("tr.enterprise-#{second_distributor.id}") do
-            select d_manager.email, from: 'enterprise_set_collection_attributes_1_owner_id'
+            select d_manager.email, from: "enterprise_set_collection_attributes_#{second_distributor_row_index}_owner_id"
           end
           click_button "Update"
           expect(flash_message).to eq('Update failed')