Extend accounts endpoint by accounts, assetClasses and tags filters

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

@@ -118,10 +118,12 @@ describe('PortfolioService', () => {
   describe('getAccounts', () => {
     const tagId = 'd6bf8b4a-8ef9-4b3f-9e2c-0a1b2c3d4e5f';
 
+    const whereTagsOfActivity = { some: { OR: [{ id: tagId }] } };
+
     const whereActivityOfTag = {
       OR: [
-        { tags: { some: { OR: [{ id: tagId }] } } },
+        { account: { tags: { some: { OR: [{ tagId }] } } } },
-        { account: { tags: { some: { OR: [{ tagId }] } } } }
+        { tags: whereTagsOfActivity }
       ]
     };
 
@@ -184,8 +186,8 @@ describe('PortfolioService', () => {
       expect(where.AND).toEqual([
         {
           OR: [
-            { tags: { some: { OR: [{ tagId }] } } },
+            { activities: { some: { tags: whereTagsOfActivity } } },
-            { activities: { some: whereActivityOfTag } }
+            { tags: { some: { OR: [{ tagId }] } } }
           ]
         }
       ]);
@@ -234,8 +236,8 @@ describe('PortfolioService', () => {
         { activities: { some: whereActivityOfAssetClass } },
         {
           OR: [
-            { tags: { some: { OR: [{ tagId }] } } },
+            { activities: { some: { tags: whereTagsOfActivity } } },
-            { activities: { some: whereActivityOfTag } }
+            { tags: { some: { OR: [{ tagId }] } } }
           ]
         }
       ]);

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

@@ -143,7 +143,7 @@ export class PortfolioService {
     const where: Prisma.AccountWhereInput = { userId };
 
     const {
-      ACCOUNT: [filterByAccount] = [],
+      ACCOUNT: filtersByAccount = [],
       ASSET_CLASS: filtersByAssetClass = [],
       DATA_SOURCE: [filterByDataSource] = [],
       SYMBOL: [filterBySymbol] = [],
@@ -152,24 +152,28 @@ export class PortfolioService {
       return type;
     });
 
-    if (filterByAccount) {
+    if (filtersByAccount.length > 0) {
-      where.id = filterByAccount.id;
+      where.id = {
+        in: filtersByAccount.map(({ id }) => {
+          return id;
+        })
+      };
     }
 
     const whereAccountConditions: Prisma.AccountWhereInput[] = [];
     const whereActivityConditions: Prisma.OrderWhereInput[] = [];
 
     if (filtersByAssetClass.length > 0) {
+      const whereAssetClassConditions = filtersByAssetClass.map(({ id }) => {
+        return { assetClass: AssetClass[id] };
+      });
+
       const whereActivityOfAssetClass: Prisma.OrderWhereInput = {
         SymbolProfile: {
           OR: [
             {
               AND: [
-                {
+                { OR: whereAssetClassConditions },
-                  OR: filtersByAssetClass.map(({ id }) => {
-                    return { assetClass: AssetClass[id] };
-                  })
-                },
                 {
                   OR: [
                     { assetProfileOverrides: { is: null } },
@@ -179,11 +183,7 @@ export class PortfolioService {
               ]
             },
             {
-              assetProfileOverrides: {
+              assetProfileOverrides: { OR: whereAssetClassConditions }
-                OR: filtersByAssetClass.map(({ id }) => {
-                  return { assetClass: AssetClass[id] };
-                })
-              }
             }
           ]
         }
@@ -222,25 +222,25 @@ export class PortfolioService {
         }
       };
 
+      const whereTagsOfActivity: Prisma.TagListRelationFilter = {
+        some: {
+          OR: filtersByTag.map(({ id }) => {
+            return { id };
+          })
+        }
+      };
+
       const whereActivityOfTag: Prisma.OrderWhereInput = {
         OR: [
-          {
+          { account: { tags: whereTagsOfAccount } },
-            tags: {
+          { tags: whereTagsOfActivity }
-              some: {
-                OR: filtersByTag.map(({ id }) => {
-                  return { id };
-                })
-              }
-            }
-          },
-          { account: { tags: whereTagsOfAccount } }
         ]
       };
 
       whereAccountConditions.push({
         OR: [
-          { tags: whereTagsOfAccount },
+          { activities: { some: { tags: whereTagsOfActivity } } },
-          { activities: { some: whereActivityOfTag } }
+          { tags: whereTagsOfAccount }
         ]
       });