Browse Source

Format code

pull/3394/head
Thomas Kaul 1 year ago
parent
commit
2ba0988c01
  1. 6
      apps/api/src/app/order/order.controller.ts
  2. 17
      apps/api/src/app/order/order.service.ts
  3. 3
      apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
  4. 4
      apps/client/src/app/services/data.service.ts

6
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,

17
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<number> {
public async deleteOrders({
filters,
where
}: {
filters?: Filter[];
where: Prisma.OrderWhereInput;
}): 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 { 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: {

3
apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@ -219,7 +219,8 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
data.activities
),
contentType: 'text/calendar',
fileName: `ghostfolio-draft${data.activities.length > 1 ? 's' : ''
fileName: `ghostfolio-draft${
data.activities.length > 1 ? 's' : ''
}-${format(parseISO(data.meta.date), 'yyyyMMddHHmmss')}.ics`,
format: 'string'
});

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

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

Loading…
Cancel
Save