feat: add version number to docker image

Fix #81

.github/workflows/build-and-push-images.yml

@@ -61,4 +61,6 @@ jobs:
           file: ./docker/Dockerfile
           push: true
           tags: ${{ steps.extract-version.outputs.tags }}
+          build-args: |
+            VERSION=${{ github.ref_name }}
 

app/Models/CurrencyRate.php

@@ -134,9 +134,11 @@ class CurrencyRate extends Model
 
         if (is_array($currency)) {
 
+            $i = 1;
             foreach ($currency as $curr) {
 
-                dispatch(fn () => self::timeSeriesRates($curr, $start, $end));
+                dispatch(fn () => self::timeSeriesRates($curr, $start, $end))->delay(now()->addSeconds(30 * $i));
+                $i++;
             }
 
             return [];

app/Models/DailyChange.php

@@ -99,8 +99,11 @@ class DailyChange extends Model
                 'tx1.quantity',
             ])
             ->selectRaw("(CASE
-                WHEN tx1.transaction_type = 'BUY'
+                WHEN 
-                    THEN COALESCE(cr.rate, 1)
+                    tx1.transaction_type = 'BUY' 
+                    OR SUM(tx1.cost_basis_base) = 0
+                THEN 
+                    COALESCE(cr.rate, 1)
                 ELSE (
                     SELECT
                         SUM(COALESCE(cr2.rate, 1) * buy.cost_basis_base)

app/Models/Holding.php

@@ -302,8 +302,11 @@ class Holding extends Model
                             ])
                             ->selectRaw(
                                 "(CASE
-                                        WHEN transactions.transaction_type = 'BUY'
+                                        WHEN 
-                                            THEN COALESCE(cr.rate, 1)
+                                            transactions.transaction_type = 'BUY'
+                                            OR SUM(transactions.cost_basis_base) = 0
+                                        THEN 
+                                            COALESCE(cr.rate, 1)
                                         ELSE (
                                             SELECT
                                                 SUM(COALESCE(cr2.rate, 1) * buy.cost_basis_base)

app/Models/Portfolio.php

@@ -153,6 +153,7 @@ class Portfolio extends Model
         $total_performance = [];
 
         // get unique currencies for holdings
+        $currency_rates = [];
         foreach ($holdings->groupBy('market_data.currency')->keys() as $currency) {
             $currency_rates[$currency] = CurrencyRate::timeSeriesRates($currency, $holdings->min('first_transaction_date'), now());
         }

composer.json

@@ -24,7 +24,7 @@
         "openai-php/client": "^0.10.3",
         "predis/predis": "^2.2",
         "robsontenorio/mary": "^1.35",
-        "scheb/yahoo-finance-api": "^4.11",
+        "scheb/yahoo-finance-api": "^5.0",
         "staudenmeir/eloquent-has-many-deep": "^1.20",
         "tschucki/alphavantage-laravel": "^0.0"
     },

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "42c893f20ccd0482c1c5a18aa3790acc",
+    "content-hash": "13310769a8c74dcffeb66fc87ab4e371",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -6104,28 +6104,30 @@
         },
         {
             "name": "scheb/yahoo-finance-api",
-            "version": "v4.12.0",
+            "version": "v5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/scheb/yahoo-finance-api.git",
-                "reference": "08f47997d123389567e2c7fa7cafc94d4c4e2515"
+                "reference": "72561695bdccfb6318c985cf439254f646c3b127"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/scheb/yahoo-finance-api/zipball/08f47997d123389567e2c7fa7cafc94d4c4e2515",
+                "url": "https://api.github.com/repos/scheb/yahoo-finance-api/zipball/72561695bdccfb6318c985cf439254f646c3b127",
-                "reference": "08f47997d123389567e2c7fa7cafc94d4c4e2515",
+                "reference": "72561695bdccfb6318c985cf439254f646c3b127",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/guzzle": "^6.0|^7.0",
+                "guzzlehttp/guzzle": "^7",
-                "php": ">=7.1.3"
+                "php": ">=8.1",
+                "psr/cache": "^2|^3"
             },
             "require-dev": {
                 "escapestudios/symfony2-coding-standard": "^3.9",
-                "phpunit/phpunit": "^7.5 || ^8 || ^9",
+                "phpunit/phpunit": "^10.5|^11|^12",
                 "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^3.11|^4.0"
+                "symfony/cache": "^6|^7",
+                "vimeo/psalm": "^6.0"
             },
             "type": "library",
             "autoload": {
@@ -6153,9 +6155,9 @@
             ],
             "support": {
                 "issues": "https://github.com/scheb/yahoo-finance-api/issues",
-                "source": "https://github.com/scheb/yahoo-finance-api/tree/v4.12.0"
+                "source": "https://github.com/scheb/yahoo-finance-api/tree/v5.0.0"
             },
-            "time": "2025-03-27T15:44:16+00:00"
+            "time": "2025-07-05T20:58:45+00:00"
         },
         {
             "name": "spatie/laravel-package-tools",

database/migrations/2025_12_28_000001_add_multi_currency_support.php

@@ -8,6 +8,7 @@ use App\Models\Transaction;
 use Database\Seeders\CurrencySeeder;
 use Database\Seeders\MarketDataSeeder;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
@@ -24,10 +25,15 @@ return new class extends Migration
          * Add options column to users table
          */
         Schema::table('users', function (Blueprint $table) {
-            $table->json('options')->default(json_encode([
+
-                'locale' => config('app.locale', 'en'),
+            $locale = config('app.locale', 'en');
-                'display_currency' => config('investbrain.base_currency', 'USD'),
+            $currency = config('investbrain.base_currency', 'USD');
-            ]))->after('profile_photo_path');
+
+            $default = config('database.default') === 'mysql'
+                ? new Expression("(JSON_OBJECT('locale', '{$locale}', 'display_currency', '{$currency}'))")
+                : json_encode(['locale' => $locale, 'display_currency' => $currency]);
+
+            $table->json('options')->default($default)->after('profile_photo_path');
         });
 
         /**

docker-compose.yml

@@ -11,9 +11,9 @@ services:
       - 8000:80
     environment: # You can either use these properties OR an .env file. Do not use both!
       APP_URL: "http://localhost:8000"
-      DB_CONNECTION: mysql
+      DB_CONNECTION: pgsql
-      DB_HOST: investbrain-mysql
+      DB_HOST: investbrain-pgsql
-      DB_PORT: 3306
+      DB_PORT: 5432
       DB_DATABASE: investbrain
       DB_USERNAME: investbrain
       DB_PASSWORD: investbrain
@@ -25,7 +25,7 @@ services:
       - investbrain-storage:/var/app/storage # You can use a volume... 
       # - /path/to/storage:/var/app/storage:delegated # ...or you can use a path on host
     depends_on:
-      - mysql
+      - pgsql
       - redis
     networks:
       - investbrain-network
@@ -40,22 +40,22 @@ services:
       - investbrain-redis:/data
     networks:
       - investbrain-network
-  mysql:
+  pgsql:
-    image: mysql:8.0
+    image: postgres:15-alpine
-    container_name: investbrain-mysql
+    container_name: investbrain-pgsql
     restart: unless-stopped
+    ports:
+      - "5432:5432"
     environment:
-      MYSQL_DATABASE: ${DB_DATABASE:-investbrain}
+      POSTGRES_DB: ${DB_DATABASE:-investbrain}
-      MYSQL_USER: ${DB_USERNAME:-investbrain}
+      POSTGRES_USER: ${DB_USERNAME:-investbrain}
-      MYSQL_PASSWORD: ${DB_PASSWORD:-investbrain}
+      POSTGRES_PASSWORD: ${DB_PASSWORD:-investbrain}
-      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-investbrain}
+    command: postgres -c log_min_messages=error
-    command: 
-      - --cte-max-recursion-depth=25000
     volumes:
-      - investbrain-mysql:/var/lib/mysql
+      - investbrain-pgsql:/var/lib/postgresql/data
     networks:
       - investbrain-network
 volumes:
   investbrain-storage:
   investbrain-redis:
-  investbrain-mysql:
+  investbrain-pgsql:

docker/Dockerfile

@@ -44,6 +44,9 @@ FROM php:8.3-fpm-alpine
 # Set the working directory
 WORKDIR /var/app
 
+ARG VERSION=dev
+ENV VERSION=$VERSION
+
 # Copy necessary files from the builder stage
 COPY --from=builder /var/app /var/app
 COPY --from=builder /usr/local/etc/php/conf.d /usr/local/etc/php/conf.d
@@ -62,7 +65,7 @@ RUN apk add --no-cache \
         bash \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install -j$(nproc) \
-        gd pgsql zip pdo_mysql mysqli intl 
+        gd pgsql zip pdo_mysql pdo_pgsql mysqli intl 
 
 # Remove default nginx config
 RUN rm -rf /var/www/html \

docker/entrypoint.sh

@@ -3,7 +3,8 @@
 cd /var/app
 
 # Starting Investbrain
-echo "CiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKICAqICBJSUkgICBOICAgTiAgViAgIFYgIEVFRUVFICBTU1NTICBUVFRUVCAgQkJCQkIgICBSUlJSICAgIEFBQUFBICBJSUkgICBOICAgTiAgKgogICogICBJICAgIE5OICBOICBWICAgViAgRSAgICAgIFMgICAgICAgVCAgICBCICAgIEIgIFIgICBSICAgQSAgIEEgICBJICAgIE5OICBOICAqCiAgKiAgIEkgICAgTiBOIE4gIFYgICBWICBFRUVFICAgU1NTUyAgICBUICAgIEJCQkJCICAgUlJSUiAgICBBQUFBQSAgIEkgICAgTiBOIE4gICoKICAqICAgSSAgICBOICBOTiAgViAgIFYgIEUgICAgICAgICAgUyAgIFQgICAgQiAgICBCICBSICBSICAgIEEgICBBICAgSSAgICBOICBOTiAgKgogICogIElJSSAgIE4gICBOICAgVlZWICAgRUVFRUUgIFNTU1MgICAgVCAgICBCQkJCQiAgIFIgICBSICAgQSAgIEEgIElJSSAgIE4gICBOICAqCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKICA=" | base64 -d
+echo "CuKWhOKWliAgICAgICAg4paXIOKWjCAgICAg4paYICAK4paQIOKWm+KWjOKWjOKWjOKWiOKWjOKWm+KWmOKWnOKWmOKWm+KWjOKWm+KWmOKWgOKWjOKWjOKWm+KWjArilp/ilpbilozilozilprilpjilpnilpbiloTilozilpDilpbilpnilozilowg4paI4paM4paM4paM4paMCg==" | base64 -d
+printf "%15s$VERSION\n"
 
 echo -e "\n====================== Validating environment...  ====================== "
 
@@ -54,7 +55,6 @@ RETRIES=12
 DELAY=5
 run_migrations() {
     sleep $DELAY
-    # php artisan migrate --force
     output=$(php artisan migrate --force 2>/dev/null)
     if [[ $? -eq 0 ]]; then
         echo "$output"
@@ -72,7 +72,18 @@ until run_migrations; do
   echo -e "\n > Waiting for database to be ready... retrying in $DELAY seconds. \n"
 done
 
+echo -e "\n====================== Cleaning up...  ====================== \n"
+
+# Clear caches
+echo $(php artisan cache:clear)
+echo $(php artisan view:clear)
+echo $(php artisan route:clear)
+echo $(php artisan event:clear)
+
+# Re-create caches
+echo $(php artisan route:cache)
+echo $(php artisan event:cache)
+
 echo -e "\n====================== Spinning up Supervisor daemon...  ====================== \n"
 
 exec supervisord -c /etc/supervisor/conf.d/supervisord.conf
-

resources/views/transaction/transactions-list.blade.php

@@ -97,7 +97,7 @@ new class extends Component
                     $transaction->transaction_type == 'BUY' 
                         ? $transaction->cost_basis
                         : $transaction->sale_price,
-                    $transaction->market_data->currency
+                    $transaction->market_data?->currency
                 ) }})
 
                 <x-loading x-show="loading" x-cloak class="text-gray-400 ml-2" />

tests/DailyChangeTest.php

@@ -221,7 +221,7 @@ class DailyChangeTest extends TestCase
         $second_transaction = Transaction::create([
             'symbol' => 'AAPL',
             'portfolio_id' => $portfolio->id,
-            'date' => now()->subYears(3),
+            'date' => now()->subDays(1080), // 3 years
             'quantity' => 1,
             'cost_basis' => 39.89,
             'transaction_type' => 'BUY',