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

* Fix query to filter activities of excluded accounts

* Update changelog

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

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

@@ -292,19 +292,14 @@ export class OrderService {
     }
 
     if (types) {
-      where.OR = types.map((type) => {
+      where.type = { in: types };
-        return {
-          type: {
-            equals: type
-          }
-        };
-      });
     }
 
     if (withExcludedAccounts === false) {
-      where.Account = {
+      where.OR = [
-        NOT: { isExcluded: true }
+        { Account: null },
-      };
+        { Account: { NOT: { isExcluded: true } } }
+      ];
     }
 
     const [orders, count] = await Promise.all([