From 666bb9292379a755ae80b71b0f5e8d32d4892c15 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Mon, 5 Oct 2026 16:22:10 +0200
Subject: [PATCH] Fix market price fallback

---
 apps/api/src/app/activities/activities.service.spec.ts | 7 ++++---
 apps/api/src/app/activities/activities.service.ts      | 9 ++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/api/src/app/activities/activities.service.spec.ts b/apps/api/src/app/activities/activities.service.spec.ts
index 8382888fcf..09aa64b0e2 100644
--- a/apps/api/src/app/activities/activities.service.spec.ts
+++ b/apps/api/src/app/activities/activities.service.spec.ts
@@ -388,7 +388,7 @@ describe('ActivitiesService', () => {
   });
 
   describe('getLatestActivity', () => {
-    it('filters by type and excludes draft activities', async () => {
+    it('filters by type and unit price and excludes draft activities', async () => {
       const findFirst = jest.fn().mockResolvedValue(null);
 
       const service = new ActivitiesService(
@@ -413,11 +413,12 @@ describe('ActivitiesService', () => {
       });
 
       expect(findFirst).toHaveBeenCalledWith({
-        orderBy: { date: 'desc' },
+        orderBy: [{ date: 'desc' }, { createdAt: 'desc' }],
         where: {
           ...WHERE_ACTIVITY_NOT_DRAFT,
           SymbolProfile: { dataSource: DataSource.YAHOO, symbol: 'AAPL' },
-          type: { in: [ActivityType.BUY, ActivityType.SELL] }
+          type: { in: [ActivityType.BUY, ActivityType.SELL] },
+          unitPrice: { gt: 0 }
         }
       });
     });
diff --git a/apps/api/src/app/activities/activities.service.ts b/apps/api/src/app/activities/activities.service.ts
index 99aaff40ba..1c933956a8 100644
--- a/apps/api/src/app/activities/activities.service.ts
+++ b/apps/api/src/app/activities/activities.service.ts
@@ -583,15 +583,14 @@ export class ActivitiesService {
     dataSource,
     symbol,
     types
-  }: AssetProfileIdentifier & { types?: ActivityType[] }) {
+  }: AssetProfileIdentifier & { types: ActivityType[] }) {
     return this.prismaService.order.findFirst({
-      orderBy: {
-        date: 'desc'
-      },
+      orderBy: [{ date: 'desc' }, { createdAt: 'desc' }],
       where: {
         ...WHERE_ACTIVITY_NOT_DRAFT,
         SymbolProfile: { dataSource, symbol },
-        ...(types?.length > 0 && { type: { in: types } })
+        type: { in: types },
+        unitPrice: { gt: 0 }
       }
     });
   }