add trade type to funding fee histories

brtr · Sep 23, 2023 · af11160 · af11160
1 parent 3de8696
commit af11160
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/jobs/get_funding_fee_histories_job.rb b/app/jobs/get_funding_fee_histories_job.rb
@@ -31,9 +31,10 @@ def perform(sync_ranking: false)
 
   def generate_history(up, date)
     rate = get_rate(up.origin_symbol, up.source, date)
-    ffh = FundingFeeHistory.where(origin_symbol: up.origin_symbol, event_date: date, source: up.source, user_id: up.user_id).first_or_initialize
-    snapshot = SnapshotPosition.joins(:snapshot_info).where(snapshot_info: { user_id: up.user_id }, event_date: ffh.event_date, origin_symbol: ffh.origin_symbol, source: ffh.source).take
-    ffh.update(rate: rate, amount: rate * up.amount * 3, snapshot_position_id: snapshot&.id)
+    SnapshotPosition.joins(:snapshot_info).where(snapshot_info: { user_id: up.user_id }, origin_symbol: up.origin_symbol, event_date: date, source: up.source).each do |snapshot|
+      ffh = FundingFeeHistory.where(origin_symbol: snapshot.origin_symbol, event_date: date, source: snapshot.source, user_id: up.user_id, trade_type: up.trade_type).first_or_initialize
+      ffh.update(rate: rate, amount: rate * up.amount * 3, snapshot_position_id: snapshot&.id)
+    end
   end
 
   def get_rate(symbol, source, date, get_latest: false)

diff --git a/db/migrate/20230923091722_add_trade_type_to_funding_fee_histories.rb b/db/migrate/20230923091722_add_trade_type_to_funding_fee_histories.rb
@@ -0,0 +1,5 @@
+class AddTradeTypeToFundingFeeHistories < ActiveRecord::Migration[6.1]
+  def change
+    add_column :funding_fee_histories, :trade_type, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb