wip test

README.md

@@ -193,6 +193,7 @@ Just to be safe, we recommend backing up your portfolios before using these comm
 | refresh:market-data | Refreshes market data with your configured market data provider. |
 | refresh:dividend-data | Refreshes dividend data with your configured market data provider. Will also re-calculate your total dividends earned for each holding. |
 | refresh:split-data | Refreshes splits data with your configured market data provider. Will also create new transactions to account for any splits. |
+| refresh:currency-data | Grabs the latest daily currency exchange rate data and persists to the database. |
 | capture:daily-change | Captures a snapshot of each portfolio's daily performance. |
 | sync:daily-change | Re-calculates daily snapshots of your portfolio's daily performance. Useful to fill in gaps in your portfolio charts. (Note: this is an extremely resource intensive query.) |
 | sync:holdings | Re-calculates performance of holdings with related transactions (i.e. dividends, realized gains, etc). |

app/Actions/EnsureDailyChangeIsSynced.php

@@ -21,7 +21,7 @@ class EnsureDailyChangeIsSynced
                 ! Cache::has($cacheKey)
                 && $model->date->lessThan(now())
                 && ($model->date->lessThan($model->portfolio->daily_change()->min('date') ?? now())
-                    || $model->date->lessThan($model->portfolio->transactions()->where('id', '!=', $model->id)->min('date') ?? now())
+                    || $model->date->lessThan($model->portfolio->transactions()->where('id', '!=', $model->id)->max('date') ?? now())
                 )
             ) {
                 defer(fn () => $model->portfolio->syncDailyChanges());

app/Imports/Sheets/ConfigSheet.php

@@ -36,24 +36,22 @@ class ConfigSheet implements SkipsEmptyRows, ToCollection, WithEvents, WithHeadi
 
     public function collection(Collection $configs)
     {
-        $user = auth()->user();
-
         foreach ($configs as $config) {
 
             switch ($config['key']) {
                 case 'name':
-                    $user->name = $config['value'];
+                    $this->backupImport->user->setAttribute('name', $config['value']);
-                    $user->save();
+                    $this->backupImport->user->save();
                     break;
 
                 case 'locale':
-                    $user->setOption('locale', $config['value']);
+                    $this->backupImport->user->setOption('locale', $config['value']);
-                    $user->save();
+                    $this->backupImport->user->save();
                     break;
 
                 case 'display_currency':
-                    $user->setOption('display_currency', $config['value']);
+                    $this->backupImport->user->setOption('display_currency', $config['value']);
-                    $user->save();
+                    $this->backupImport->user->save();
                     break;
 
                 case 'reinvest_dividends':

app/Models/BackupImport.php

@@ -50,4 +50,9 @@ class BackupImport extends Model
             'completed_at' => 'datetime',
         ];
     }
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
 }

app/Models/CurrencyRate.php

@@ -119,58 +119,74 @@ class CurrencyRate extends Model
 
         $end = $end ?? now();
 
+        dump('Creating period');
+
         $period = CarbonPeriod::create($start, $end);
 
         // No need to send network request - just generate 1s
         if ($currency === config('investbrain.base_currency')) {
 
+            dump('same curr');
+
             $dateRange = [];
             foreach ($period as $date) {
+
                 $dateRange[$date->toDateString()] = 1;
             }
 
             return $dateRange;
         }
 
+        dump('diff curr');
+
         [$currency, $adjustment] = self::getCurrencyAliasAdjustments($currency);
 
         $currencies = Currency::all()->pluck('currency')->toArray();
 
+        dump('got currencies');
+
         // call api in chunks
-        $rates = [];
         foreach (collect($period)->chunk(500) as $chunk) {
 
+            dump('calling frankf time series');
+
             $chunkRates = Frankfurter::setSymbols($currencies)->timeSeries($chunk->min(), $chunk->max());
 
-            $rates = array_merge($rates, Arr::get($chunkRates, 'rates', []));
+            $rates = Arr::get($chunkRates, 'rates', []);
-        }
 
-        // loop through each date
+            // loop through each date
-        $updates = [];
+            $updates = [];
-        foreach ($period as $date) {
 
-            $lookupDate = self::getNearestPastDate($date, $rates);
+            foreach ($chunk as $date) {
 
-            if (is_null($lookupDate)) {
+                $lookupDate = self::getNearestPastDate($date, $rates);
-                continue;
-            }
 
-            // loop through each rate
+                if (is_null($lookupDate)) {
-            foreach ($rates[$lookupDate->toDateString()] as $curr => $rate) {
+                    continue;
+                }
+
+                // loop through each rate
+                foreach ($rates[$lookupDate->toDateString()] as $curr => $rate) {
+
+                    // add to updates
+                    $updates[] = [
+                        'currency' => $curr,
+                        'date' => $date->toDateString(),
+                        'rate' => $rate,
+                        'updated_at' => now()->toDateTimeString(),
+                        'created_at' => now()->toDateTimeString(),
+                    ];
+                }
+
+                dump('inserting');
+
+                // persist
+                self::chunkInsert($updates);
 
-                // add to updates
-                $updates[] = [
-                    'currency' => $curr,
-                    'date' => $date->toDateString(),
-                    'rate' => $rate,
-                    'updated_at' => now()->toDateTimeString(),
-                    'created_at' => now()->toDateTimeString(),
-                ];
             }
         }
 
-        // persist
+        dump('done');
-        self::chunkInsert($updates);
 
         return collect($updates)
             ->whereBetween('date', [$start, $end ?? now()])
@@ -183,6 +199,7 @@ class CurrencyRate extends Model
 
     private static function getNearestPastDate(CarbonInterface $date, array $rates): ?CarbonInterface
     {
+
         $datesWithRates = array_keys($rates);
         sort($datesWithRates);
 
@@ -248,7 +265,7 @@ class CurrencyRate extends Model
     public static function chunkInsert(array $updates): void
     {
 
-        $chunks = array_chunk($updates, 250);
+        $chunks = array_chunk($updates, 500);
 
         foreach ($chunks as $chunk) {
 

app/Models/Dividend.php

@@ -95,19 +95,36 @@ class Dividend extends Model
             return;
         }
 
-        // get some data
+        dump('1. getting div data for '.$symbol);
-        if ($dividend_data = collect() && $start_date && $end_date) {
+        try {
-            $dividend_data = app(MarketDataInterface::class)->dividends($symbol, $start_date, $end_date);
+
+            // get some data
+            if ($dividend_data = collect() && $start_date && $end_date) {
+                $dividend_data = app(MarketDataInterface::class)->dividends($symbol, $start_date, $end_date);
+            }
+        } catch (\Throwable $e) {
+            dump('exception: '.$e->getMessage());
         }
 
+        dump('2. got div data for '.$symbol);
+
         // ah, we found some dividends...
         if ($dividend_data->isNotEmpty()) {
 
+            $dividend_data = $dividend_data->sortBy('date');
+
+            dump('3. getting mkt data for '.$symbol);
+
             $market_data = MarketData::getMarketData($symbol);
 
-            // get historic conversion rates
+            dump('4. got market data for '.$symbol);
-            $rate_to_base = CurrencyRate::timeSeriesRates($market_data->currency, $start_date, $end_date);
 
+            // todo: use this for start_date - $dividend_data->first()->get('date')
+
+            // get historic conversion rates
+            $rate_to_base = CurrencyRate::timeSeriesRates($market_data->currency, $dividend_data->first()->get('date'), $end_date);
+
+            dump('5. got time series for '.$symbol);
             // create mass insert
             foreach ($dividend_data as $index => $dividend) {
                 $rate_to_base_date = 1 / Arr::get($rate_to_base, Carbon::parse(Arr::get($dividend, 'date'))->toDateString(), 1);
@@ -120,6 +137,7 @@ class Dividend extends Model
             // insert records
             (new self)->insertOrIgnore($dividend_data->toArray());
 
+            dump('6. inserted  for '.$symbol);
             // sync to holdings
             self::syncHoldings($symbol);
 
@@ -129,7 +147,9 @@ class Dividend extends Model
             // sync last dividend amount to market data table
             $market_data->last_dividend_amount = $dividend_data->sortByDesc('date')->first()['dividend_amount'];
             $market_data->save();
+
         }
+
     }
 
     public static function syncHoldings(string $symbol): void

app/Models/User.php

@@ -104,7 +104,7 @@ class User extends Authenticatable implements MustVerifyEmail
 
         $options = is_array($key) ? $key : [$key => $value];
 
-        $this->user->options = array_merge($this->user->options ?? [], $options);
+        $this->options = array_merge($this->options ?? [], $options);
 
         return $this;
     }