diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.ts index d8eeb9df6..0dda6df20 100644 --- a/apps/api/src/app/order/order.controller.ts +++ b/apps/api/src/app/order/order.controller.ts @@ -11,7 +11,7 @@ import { DATA_GATHERING_QUEUE_PRIORITY_HIGH, HEADER_KEY_IMPERSONATION } from '@ghostfolio/common/config'; -import { hasPermission, permissions } from '@ghostfolio/common/permissions'; +import { permissions } from '@ghostfolio/common/permissions'; import type { DateRange, RequestWithUser } from '@ghostfolio/common/types'; import { @@ -31,7 +31,7 @@ import { } from '@nestjs/common'; import { REQUEST } from '@nestjs/core'; import { AuthGuard } from '@nestjs/passport'; -import { AssetClass, Order as OrderModel, Prisma } from '@prisma/client'; +import { Order as OrderModel, Prisma } from '@prisma/client'; import { parseISO } from 'date-fns'; import { StatusCodes, getReasonPhrase } from 'http-status-codes'; @@ -65,7 +65,7 @@ export class OrderController { }); const where: Prisma.OrderWhereInput = { userId: this.request.user.id, - currency: this.request.user.Settings.settings.baseCurrency, + currency: this.request.user.Settings.settings.baseCurrency }; return this.orderService.deleteOrders({ filters, diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index 24530ee56..b756cd0f9 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -194,11 +194,21 @@ export class OrderService { return order; } - public async deleteOrders({ filters, where }: { filters?: Filter[], where: Prisma.OrderWhereInput }): Promise { + public async deleteOrders({ + filters, + where + }: { + filters?: Filter[]; + where: Prisma.OrderWhereInput; + }): Promise { 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 { activities } = await this.getOrders({ + filters, + userId, + userCurrency + }); + const orderIds = activities.map((order) => order.id); const { count } = await this.prismaService.order.deleteMany({ where: { id: { @@ -219,7 +229,6 @@ export class OrderService { return count; } - public async getLatestOrder({ dataSource, symbol }: UniqueAsset) { return this.prismaService.order.findFirst({ orderBy: { 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 ee1ded5f1..69638e694 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 @@ -219,8 +219,9 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit { data.activities ), contentType: 'text/calendar', - fileName: `ghostfolio-draft${data.activities.length > 1 ? 's' : '' - }-${format(parseISO(data.meta.date), 'yyyyMMddHHmmss')}.ics`, + fileName: `ghostfolio-draft${ + data.activities.length > 1 ? 's' : '' + }-${format(parseISO(data.meta.date), 'yyyyMMddHHmmss')}.ics`, format: 'string' }); }); diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts index b906484a8..24df4a285 100644 --- a/apps/client/src/app/services/data.service.ts +++ b/apps/client/src/app/services/data.service.ts @@ -260,9 +260,7 @@ export class DataService { return this.http.delete(`/api/v1/order/${aId}`); } - public deleteAllActivities({ - filters - }) { + public deleteAllActivities({ filters }) { let params = this.buildFiltersAsQueryParams({ filters }); return this.http.delete(`/api/v1/order`, { params }); }