javier/investbrain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix alphavantage filter dividends and splits

Browse Source
This commit is contained in:
hackerESQ
2024-09-15 20:39:14 -05:00
parent 9696339828
commit b5988e2f01
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Interfaces/MarketData/AlphaVantageMarketData.php
+10 -5
View File
@@ -52,10 +52,13 @@ class AlphaVantageMarketData implements MarketDataInterface
public function dividends(String $symbol, $startDate, $endDate): Collection public function dividends(String $symbol, $startDate, $endDate): Collection
{ {
$dividends = Alphavantage::fundamentals()->dividends($symbol); $dividends = Alphavantage::fundamentals()->dividends($symbol);
$dividends = Arr::get($dividends, 'data', []);
return collect($dividends) return collect($dividends)
->where('ex_dividend_date', '>=', $startDate) ->filter(function($dividend) use ($startDate, $endDate) {
->where('ex_dividend_date', '<', $endDate)
return Carbon::parse(Arr::get($dividend, 'ex_dividend_date'))->between($startDate, $endDate);
})
->map(function($dividend) use ($symbol) { ->map(function($dividend) use ($symbol) {
return [ return [
@@ -69,12 +72,14 @@ class AlphaVantageMarketData implements MarketDataInterface
public function splits(String $symbol, $startDate, $endDate): Collection public function splits(String $symbol, $startDate, $endDate): Collection
{ {
$splits = Alphavantage::fundamentals()->splits($symbol); $splits = Alphavantage::fundamentals()->splits($symbol);
$splits = Arr::get($splits, 'data', []);
return collect($splits) return collect($splits)
->where('effective_date', '>=', $startDate) ->filter(function($split) use ($startDate, $endDate) {
->where('effective_date', '<', $endDate)
return Carbon::parse(Arr::get($split, 'effective_date'))->between($startDate, $endDate);
})
->map(function($split) use ($symbol) { ->map(function($split) use ($symbol) {
return [ return [
app/Models/Dividend.php
+1 -1
View File
@@ -90,7 +90,7 @@ class Dividend extends Model
self::syncHoldings($dividend_data); self::syncHoldings($dividend_data);
// sync last dividend amount to market data table // sync last dividend amount to market data table
$market_data = MarketData::symbol($symbol)->first(); $market_data = MarketData::firstOrNew(['symbol' => $symbol]);
$market_data->last_dividend_amount = $dividend_data->sortByDesc('date')->first()['dividend_amount']; $market_data->last_dividend_amount = $dividend_data->sortByDesc('date')->first()['dividend_amount'];
$market_data->save(); $market_data->save();
} }