Refactoring

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

@@ -63,13 +63,11 @@ export class OrderController {
       filterByAssetClasses,
       filterByTags
     });
-    const where: Prisma.OrderWhereInput = {
+
-      userId: this.request.user.id,
-      currency: this.request.user.Settings.settings.baseCurrency
-    };
     return this.orderService.deleteOrders({
       filters,
-      where
+      userCurrency: this.request.user.Settings.settings.baseCurrency,
+      userId: this.request.user.id
     });
   }
 

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

@@ -196,19 +196,19 @@ export class OrderService {
 
   public async deleteOrders({
     filters,
-    where
+    userCurrency,
+    userId
   }: {
     filters?: Filter[];
-    where: Prisma.OrderWhereInput;
+    userCurrency: string;
+    userId: string;
   }): Promise<number> {
-    const userId = where.userId as string;
-    const userCurrency = where.currency as string;
     const { activities } = await this.getOrders({
       filters,
       userId,
       userCurrency
     });
-    const orderIds = activities.map((order) => order.id);
+
     const { count } = await this.prismaService.order.deleteMany({
       where: {
         id: {
@@ -221,9 +221,7 @@ export class OrderService {
 
     this.eventEmitter.emit(
       PortfolioChangedEvent.getName(),
-      new PortfolioChangedEvent({
+      new PortfolioChangedEvent({ userId })
-        userId: <string>where.userId
-      })
     );
 
     return count;

apps/client/src/app/services/data.service.ts

@@ -262,6 +262,7 @@ export class DataService {
 
   public deleteAllActivities({ filters }) {
     let params = this.buildFiltersAsQueryParams({ filters });
+
     return this.http.delete<any>(`/api/v1/order`, { params });
   }