Browse Source

fix: Now you can delete activties using filters in the client

pull/3394/head
gerardPolloRebozado 1 year ago
parent
commit
2b8cc3d04e
  1. 12
      apps/api/src/app/order/order.service.ts
  2. 3
      apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
  3. 7
      apps/client/src/app/services/data.service.ts

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

@ -40,7 +40,7 @@ export class OrderService {
private readonly exchangeRateDataService: ExchangeRateDataService, private readonly exchangeRateDataService: ExchangeRateDataService,
private readonly prismaService: PrismaService, private readonly prismaService: PrismaService,
private readonly symbolProfileService: SymbolProfileService private readonly symbolProfileService: SymbolProfileService
) { } ) {}
public async createOrder( public async createOrder(
data: Prisma.OrderCreateInput & { data: Prisma.OrderCreateInput & {
@ -201,13 +201,19 @@ export class OrderService {
const orderIds = activities.map(order => order.id); const orderIds = activities.map(order => order.id);
const { count } = await this.prismaService.order.deleteMany({ const { count } = await this.prismaService.order.deleteMany({
where: { where: {
id: { in: orderIds } id: {
in: activities.map(({ id }) => {
return id;
})
}
} }
}); });
this.eventEmitter.emit( this.eventEmitter.emit(
PortfolioChangedEvent.getName(), PortfolioChangedEvent.getName(),
new PortfolioChangedEvent({ userId: where.userId as string }) new PortfolioChangedEvent({
userId: <string>where.userId
})
); );
return count; return count;

3
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); hasPermission(this.user.permissions, permissions.createOrder);
this.hasPermissionToDeleteActivity = this.hasPermissionToDeleteActivity =
!this.hasImpersonationId && !this.hasImpersonationId &&
hasPermission(this.user.permissions, permissions.deleteOrder) && hasPermission(this.user.permissions, permissions.deleteOrder);
!this.userService.hasFilters();
} }
} }

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

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

Loading…
Cancel
Save