Merge pull request #59 from sanger/development

from development (fixed sql queries)

app.rb

@@ -50,9 +50,12 @@ class SmWorkflowLims < Sinatra::Base
   end
 
   get '/assets' do
-    presenter = AssetsController.new(params).get_index
-    # A list of all in progress assets
-    erb :'assets/index', :locals=>{:presenter=>presenter}
+    if params[:state].nil? && params[:identifier].nil?
+      redirect to("/assets?state=in_progress")
+    else
+      presenter = AssetsController.new(params).get_index
+      erb :'assets/index', :locals=>{:presenter=>presenter}
+    end
   end
 
   put '/assets' do

app/models/asset.rb

@@ -29,8 +29,7 @@ def remove_comment
   def self.in_state(state)
     if state.present?
       joins(:events)
-        .where(events: {id: Event.latest_per_asset, state: state})
-        .includes(events: :state)
+        .merge(Event.with_last_state(state))
     else
       all
     end
@@ -58,7 +57,7 @@ def set_begun_at
   scope :reported,        -> { reportable.completed.where.not(reported_at:nil) }
   scope :latest_first,    -> { order('begun_at DESC') }
 
-  default_scope { includes(:workflow,:asset_type,:comment,:batch) }
+  default_scope { includes(:workflow,:asset_type,:comment,:batch, :pipeline_destination, events: :state) }
 
   def reportable?
     workflow.reportable?

app/models/event.rb

@@ -12,8 +12,12 @@ def state_name=(state_name)
     self.state = State.find_by(name: state_name)
   end
 
-  def self.latest_per_asset
-    Event.group(:asset_id).maximum(:id).values
+  def self.latest_event_per_asset
+    select("MAX(id)").group("asset_id")
+  end
+
+  def self.with_last_state(state)
+    where(id: latest_event_per_asset, state_id: state.id)
   end
 
 end

app/presenters/asset/index.rb

@@ -7,8 +7,8 @@ class Index < Presenter
     attr_reader :search, :assets, :total
 
     def initialize(found_assets,search=nil,state=nil)
-      @total  = found_assets.count
       @assets = found_assets.group_by {|a| a.asset_type.name}.tap {|h| h.default = [] }
+      @total  = found_assets.length
       @search = search
       @state  = state.name if state
     end

spec/models/event_spec.rb

@@ -14,12 +14,14 @@
     expect(event.valid?).to be true
   end
 
-  it 'should know ids for latest events per asset' do
+  it 'should find events with particular last state' do
     report_required = create :state, name: 'report_required'
     in_progress_event_first_asset = Event.create!(state: in_progress, asset: asset)
+    in_progress_event_second_asset = Event.create!(state: in_progress, asset: (create :asset))
     report_required_event_first_asset = Event.create!(state: report_required, asset: asset)
-    in_progress_event_second_asset = Event.create!(state: report_required, asset: (create :asset))
-    expect(Event.latest_per_asset).to eq [report_required_event_first_asset.id, in_progress_event_second_asset.id]
+    expect(Event.with_last_state(in_progress).to_a).to eq [in_progress_event_second_asset]
+    expect(Event.with_last_state(report_required).to_a).to eq [report_required_event_first_asset]
+
   end