addded tips and deposits csv export

sashazykov · sashazykov · commit 05affae642a6 · 2014-08-16T13:48:39.000+07:00
diff --git a/Gemfile b/Gemfile
@@ -28,6 +28,7 @@ gem 'sdoc', group: :doc, require: false
 gem 'cancancan'
 gem "i18n-js"
 gem 'dusen'
+gem 'render_csv'
 
 group :development do
   gem 'capistrano',         '~> 3.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -228,6 +228,8 @@ GEM
     rdoc (4.1.1)
       json (~> 1.4)
     ref (1.0.5)
+    render_csv (2.0.0)
+      rails (>= 3.0)
     rspec-collection_matchers (0.0.2)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.0.0.beta1)
@@ -332,6 +334,7 @@ DEPENDENCIES
   omniauth (~> 1.1.4)
   omniauth-github!
   rails (= 4.0.2)
+  render_csv
   rspec-rails (~> 3.0.0.beta)
   sass-rails (~> 4.0.0)
   sawyer (~> 0.5.2)
diff --git a/app/controllers/deposits_controller.rb b/app/controllers/deposits_controller.rb
@@ -3,9 +3,16 @@ class DepositsController < ApplicationController
 
   def index
     if params[:project_id]
-      @deposits = @project.deposits.order(created_at: :desc).page(params[:page]).per(30)
+      @deposits = @project.deposits
     else
-      @deposits = Deposit.includes(:project).order(created_at: :desc).page(params[:page]).per(30)
+      @deposits = Deposit.includes(:project)
+    end
+    @deposits = @deposits.order(created_at: :desc).
+                          page(params[:page]).
+                          per(params[:per_page] || 30)
+    respond_to do |format|
+      format.html
+      format.csv  { render csv: @deposits, except: [:updated_at, :confirmations, :fee_size], add_methods: [:project_name, :fee, :confirmed?] }
     end
   end
 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -42,9 +42,7 @@ def blockchain_info_callback
           project_id: project.id,
           txid: params[:transaction_hash],
           confirmations: params[:confirmations],
-          amount: params[:value].to_i,
-          paid_out: 0,
-          paid_out_at: Time.now
+          amount: params[:value].to_i
         })
         project.update_cache
       end
diff --git a/app/controllers/tips_controller.rb b/app/controllers/tips_controller.rb
@@ -4,11 +4,16 @@ class TipsController < ApplicationController
 
   def index
     if params[:project_id]
-      @tips = @project.tips.includes(:user).order(created_at: :desc).page(params[:page]).per(30)
+      @tips = @project.tips.includes(:user)
     elsif params[:user_id] && @user = User.find(params[:user_id])
-      @tips = @user.tips.includes(:project).order(created_at: :desc).page(params[:page]).per(30)
+      @tips = @user.tips.includes(:project)
     else
-      @tips = Tip.includes(:user, :project).order(created_at: :desc).page(params[:page]).per(30)
+      @tips = Tip.includes(:user, :project)
+    end
+    @tips = @tips.order(created_at: :desc).page(params[:page]).per(30)
+    respond_to do |format|
+      format.html
+      format.csv  { render csv: @tips, except: [:updated_at, :commit, :commit_message, :refunded_at, :decided_at], add_methods: [:user_name, :project_name, :decided?, :claimed?, :paid?, :refunded?, :txid] }
     end
   end
 
diff --git a/app/models/deposit.rb b/app/models/deposit.rb
@@ -22,4 +22,8 @@ def available_amount
     self.fee_size = CONFIG["our_fee"]
   end
 
+  def project_name
+    project.full_name
+  end
+
 end
diff --git a/app/models/project.rb b/app/models/project.rb
@@ -1,5 +1,5 @@
 class Project < ActiveRecord::Base
-  has_many :deposits # todo: only confirmed deposits that have amount > paid_out
+  has_many :deposits # todo: only confirmed deposits
   has_many :tips, inverse_of: :project
   accepts_nested_attributes_for :tips
   has_many :collaborators, autosave: true
diff --git a/app/models/tip.rb b/app/models/tip.rb
@@ -54,6 +54,12 @@ def non_refunded?
   scope :unclaimed,     -> { joins(:user).
                              unpaid.
                              where('users.bitcoin_address' => ['', nil]) }
+  def claimed?
+    paid? || user.bitcoin_address.present?
+  end
+  def unclaimed?
+    !claimed?
+  end
 
   scope :with_address,  -> { joins(:user).where.not('users.bitcoin_address' => ['', nil]) }
   def with_address?
@@ -135,4 +141,17 @@ def check_amount_against_project
   def touch_decided_at_if_decided
     self.decided_at = Time.now if amount_changed? && decided?
   end
+
+  def project_name
+    project.full_name
+  end
+
+  def user_name
+    user.display_name
+  end
+
+  def txid
+    try(:sendmany).try(:txid)
+  end
+
 end
