Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Bugfix/fix query to filter activities of excluded accounts (#3059)

Thomas Kauld3679d41b31c
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73683ccbf6..2020f58d05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
+- Fixed the query to filter activities of excluded accounts
- Improved the asset profile validation in the activities import
## 2.57.0 - 2024-02-25
diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts
index e603098562..a88aa44628 100644
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@@ -292,19 +292,14 @@ export class OrderService {
}
if (types) {
- where.OR = types.map((type) => {
- return {
- type: {
- equals: type
- }
- };
- });
+ where.type = { in: types };
}
if (withExcludedAccounts === false) {
- where.Account = {
- NOT: { isExcluded: true }
- };
+ where.OR = [
+ { Account: null },
+ { Account: { NOT: { isExcluded: true } } }
+ ];
}
const [orders, count] = await Promise.all([