Feature/refactor query to filter activities of excluded accounts (#3016)

* Refactor query to filter activities of excluded accounts

* Update changelog

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Improved the usability of the holdings table
+- Refactored the query to filter activities of excluded accounts
 - Improved the language localization for German (`de`)
 - Upgraded `ng-extract-i18n-merge` from version `2.9.1` to `2.10.0`
 

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

@@ -301,6 +301,12 @@ export class OrderService {
       });
     }
 
+    if (withExcludedAccounts === false) {
+      where.Account = {
+        NOT: { isExcluded: true }
+      };
+    }
+
     const [orders, count] = await Promise.all([
       this.orders({
         orderBy,
@@ -322,15 +328,7 @@ export class OrderService {
       this.prismaService.order.count({ where })
     ]);
 
-    const activities = orders
+    const activities = orders.map((order) => {
-      .filter((order) => {
-        return (
-          withExcludedAccounts ||
-          !order.Account ||
-          order.Account?.isExcluded === false
-        );
-      })
-      .map((order) => {
       const value = new Big(order.quantity).mul(order.unitPrice).toNumber();
 
       return {