diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index 549a6aade..24530ee56 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -40,7 +40,7 @@ export class OrderService { private readonly exchangeRateDataService: ExchangeRateDataService, private readonly prismaService: PrismaService, private readonly symbolProfileService: SymbolProfileService - ) { } + ) {} public async createOrder( data: Prisma.OrderCreateInput & { @@ -201,13 +201,19 @@ export class OrderService { const orderIds = activities.map(order => order.id); const { count } = await this.prismaService.order.deleteMany({ where: { - id: { in: orderIds } + id: { + in: activities.map(({ id }) => { + return id; + }) + } } }); this.eventEmitter.emit( PortfolioChangedEvent.getName(), - new PortfolioChangedEvent({ userId: where.userId as string }) + new PortfolioChangedEvent({ + userId: where.userId + }) ); return count; diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts index 2c8966549..ee1ded5f1 100644 --- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts +++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts @@ -401,7 +401,6 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit { hasPermission(this.user.permissions, permissions.createOrder); this.hasPermissionToDeleteActivity = !this.hasImpersonationId && - hasPermission(this.user.permissions, permissions.deleteOrder) && - !this.userService.hasFilters(); + hasPermission(this.user.permissions, permissions.deleteOrder); } } diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts index ee76f5167..b906484a8 100644 --- a/apps/client/src/app/services/data.service.ts +++ b/apps/client/src/app/services/data.service.ts @@ -260,13 +260,6 @@ export class DataService { return this.http.delete(`/api/v1/order/${aId}`); } - public deleteAllOrders({ - filters - }) { - let params = this.buildFiltersAsQueryParams({ filters }); - return this.http.delete(`/api/v1/order`, { params }); - } - public deleteAllActivities({ filters }) {