diff --git a/app.rb b/app.rb index 6e5cf2a..2b0108c 100644 --- a/app.rb +++ b/app.rb @@ -32,16 +32,8 @@ post '/' do end get '/bossfight' do - puts "RAIDS FOR MAFIAMAN" user_raids = Raid.for_user('mafiaman') - puts "FIRST NEGATIVE" @first_negative = user_raids.first_negative - unless @first_negative == nil - puts "SOLDIERS LOST" - @soldiers_lost_to_date = user_raids.to_date(@first_negative.created_at).soldiers_lost - puts "SOLDIERS BY ATTACKER" - @soldiers_by_attacker = user_raids.to-date(@first_negative.created_at).by_attacker.soldiers_lost - end erb :bossfight end diff --git a/models/raid.rb b/models/raid.rb index 3ac8dd3..c6ad3cd 100644 --- a/models/raid.rb +++ b/models/raid.rb @@ -16,16 +16,4 @@ class Raid < ActiveRecord::Base def self.first_negative where('money < 0').order(:created_at).first end - - def self.to_date(date) - where('created_at < ?', date) - end - - def self.soldiers_lost - sum(:soldiers) - end - - def self.by_attacker - group(:attacker) - end end diff --git a/views/bossfight.erb b/views/bossfight.erb index fc06190..367f9d6 100644 --- a/views/bossfight.erb +++ b/views/bossfight.erb @@ -1,15 +1,3 @@ <% if @first_negative %> Raider who broke the walls: <%= @first_negative.attacker %>
<%end%> - -<% if @soldiers_lost_to_date %> - Soldiers defeated: <%= @soldiers_lost_to_date %>
-<%end%> - -<% require 'pp' %> -<% if @soldiers_by_attacker %> -Participants: -<% @soldiers_by_attacker.each do |raid| %> - <% pp raid %> -<%end%> - <%end%>