Merge 38b084fd05 into 28713505fa

apps/api/src/app/import/import.service.spec.ts

@@ -508,6 +508,58 @@ describe('ImportService', () => {
         { dataSource: DataSource.YAHOO, symbol: 'AAPL' }
       ]);
     });
+
+    it('detects duplicate activities within the same import payload', async () => {
+      const activities = await importActivities({
+        activitiesDto: [
+          createActivityDto({
+            dataSource: DataSource.YAHOO,
+            date: '2024-01-01T00:00:00.000Z',
+            symbol: 'AAPL',
+            type: 'BUY'
+          }),
+          createActivityDto({
+            dataSource: DataSource.YAHOO,
+            date: '2024-01-01T00:00:00.000Z',
+            symbol: 'AAPL',
+            type: 'BUY'
+          })
+        ],
+        isDryRun: true
+      });
+
+      expect(activities[0].error).toBeUndefined();
+      expect(activities[1].error).toEqual({ code: 'IS_DUPLICATE' });
+    });
+
+    it('does not flag identical activities across different accounts as duplicates', async () => {
+      const activities = await importActivities({
+        activitiesDto: [
+          {
+            ...createActivityDto({
+              dataSource: DataSource.YAHOO,
+              date: '2024-01-01T00:00:00.000Z',
+              symbol: 'AAPL',
+              type: 'BUY'
+            }),
+            accountId: 'account-1'
+          },
+          {
+            ...createActivityDto({
+              dataSource: DataSource.YAHOO,
+              date: '2024-01-01T00:00:00.000Z',
+              symbol: 'AAPL',
+              type: 'BUY'
+            }),
+            accountId: 'account-2'
+          }
+        ],
+        isDryRun: true
+      });
+
+      expect(activities[0].error).toBeUndefined();
+      expect(activities[1].error).toBeUndefined();
+    });
   });
 
   function importActivities({

apps/api/src/app/import/import.service.ts

@@ -1049,6 +1049,9 @@ export class ImportService {
         withExcludedAccountsAndActivities: true
       });
 
+    const processedActivities: (Partial<Activity> &
+      Pick<Activity, 'assetProfile'>)[] = [];
+
     return activitiesDto.map(
       ({
         accountId,
@@ -1065,10 +1068,12 @@ export class ImportService {
       }) => {
         const date = parseISO(dateString);
 
-        const isDuplicate = existingActivities.some((activity) => {
+        const isDuplicate =
+          existingActivities.some((activity) => {
             return (
+              (!accountId || activity.accountId === accountId) &&
               (activity.comment || null) === (comment || null) &&
-            (activity.currency === currency ||
+              ((activity.currency || null) === (currency || null) ||
                 activity.assetProfile.currency === currency) &&
               activity.assetProfile.dataSource === dataSource &&
               isSameSecond(activity.date, date) &&
@@ -1078,13 +1083,27 @@ export class ImportService {
               activity.type === type &&
               activity.unitPrice === unitPrice
             );
+          }) ||
+          processedActivities.some((activity) => {
+            return (
+              (!accountId || activity.accountId === accountId) &&
+              (activity.comment || null) === (comment || null) &&
+              (activity.currency || null) === (currency || null) &&
+              activity.assetProfile.dataSource === dataSource &&
+              isSameSecond(activity.date, date) &&
+              activity.fee === fee &&
+              activity.quantity === quantity &&
+              activity.assetProfile.symbol === symbol &&
+              activity.type === type &&
+              activity.unitPrice === unitPrice
+            );
           });
 
         const error: ActivityError = isDuplicate
           ? { code: 'IS_DUPLICATE' }
           : undefined;
 
-        return {
+        const activityExtended = {
           accountId,
           comment,
           currency,
@@ -1111,6 +1130,12 @@ export class ImportService {
           },
           tagIds: tags
         };
+
+        if (!error) {
+          processedActivities.push(activityExtended);
+        }
+
+        return activityExtended;
       }
     );
   }