diff --git a/apps/api/src/app/activities/activities.service.ts b/apps/api/src/app/activities/activities.service.ts index 3627de912..a40f6f952 100644 --- a/apps/api/src/app/activities/activities.service.ts +++ b/apps/api/src/app/activities/activities.service.ts @@ -1031,8 +1031,8 @@ export class ActivitiesService { }, { OR: [ - { assetProfileOverrides: { is: null } }, - { assetProfileOverrides: { assetClass: null } } + { assetProfileOverrides: { assetClass: null } }, + { assetProfileOverrides: { is: null } } ] } ] diff --git a/apps/api/src/app/portfolio/portfolio.service.spec.ts b/apps/api/src/app/portfolio/portfolio.service.spec.ts index a50d8ad93..227262c40 100644 --- a/apps/api/src/app/portfolio/portfolio.service.spec.ts +++ b/apps/api/src/app/portfolio/portfolio.service.spec.ts @@ -135,8 +135,8 @@ describe('PortfolioService', () => { { OR: [{ assetClass: AssetClass.EQUITY }] }, { OR: [ - { assetProfileOverrides: { is: null } }, - { assetProfileOverrides: { assetClass: null } } + { assetProfileOverrides: { assetClass: null } }, + { assetProfileOverrides: { is: null } } ] } ] diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 5e1736dbe..5075f00e7 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -176,8 +176,8 @@ export class PortfolioService { { OR: whereAssetClassConditions }, { OR: [ - { assetProfileOverrides: { is: null } }, - { assetProfileOverrides: { assetClass: null } } + { assetProfileOverrides: { assetClass: null } }, + { assetProfileOverrides: { is: null } } ] } ]