Feature/automatic deletion of unused asset profiles (#3525)
* Automatic deletion of unused asset profiles * Update changelog
This commit is contained in:
parent
4d3dff3e5b
commit
8386fec98a
@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Added support for automatic deletion of unused asset profiles when deleting activities
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Fixed an issue with the all time high in the benchmarks of the markets overview
|
- Fixed an issue with the all time high in the benchmarks of the markets overview
|
||||||
|
@ -66,7 +66,6 @@ export class OrderController {
|
|||||||
|
|
||||||
return this.orderService.deleteOrders({
|
return this.orderService.deleteOrders({
|
||||||
filters,
|
filters,
|
||||||
userCurrency: this.request.user.Settings.settings.baseCurrency,
|
|
||||||
userId: this.request.user.id
|
userId: this.request.user.id
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -184,7 +184,15 @@ export class OrderService {
|
|||||||
where
|
where
|
||||||
});
|
});
|
||||||
|
|
||||||
if (['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(order.type)) {
|
const [symbolProfile] =
|
||||||
|
await this.symbolProfileService.getSymbolProfilesByIds([
|
||||||
|
order.symbolProfileId
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (
|
||||||
|
['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(order.type) ||
|
||||||
|
symbolProfile.activitiesCount === 0
|
||||||
|
) {
|
||||||
await this.symbolProfileService.deleteById(order.symbolProfileId);
|
await this.symbolProfileService.deleteById(order.symbolProfileId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -200,18 +208,16 @@ export class OrderService {
|
|||||||
|
|
||||||
public async deleteOrders({
|
public async deleteOrders({
|
||||||
filters,
|
filters,
|
||||||
userCurrency,
|
|
||||||
userId
|
userId
|
||||||
}: {
|
}: {
|
||||||
filters?: Filter[];
|
filters?: Filter[];
|
||||||
userCurrency: string;
|
|
||||||
userId: string;
|
userId: string;
|
||||||
}): Promise<number> {
|
}): Promise<number> {
|
||||||
const { activities } = await this.getOrders({
|
const { activities } = await this.getOrders({
|
||||||
filters,
|
filters,
|
||||||
userId,
|
userId,
|
||||||
userCurrency,
|
|
||||||
includeDrafts: true,
|
includeDrafts: true,
|
||||||
|
userCurrency: undefined,
|
||||||
withExcludedAccounts: true
|
withExcludedAccounts: true
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -225,6 +231,19 @@ export class OrderService {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const symbolProfiles =
|
||||||
|
await this.symbolProfileService.getSymbolProfilesByIds(
|
||||||
|
activities.map(({ symbolProfileId }) => {
|
||||||
|
return symbolProfileId;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
for (const { activitiesCount, id } of symbolProfiles) {
|
||||||
|
if (activitiesCount === 0) {
|
||||||
|
await this.symbolProfileService.deleteById(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this.eventEmitter.emit(
|
this.eventEmitter.emit(
|
||||||
PortfolioChangedEvent.getName(),
|
PortfolioChangedEvent.getName(),
|
||||||
new PortfolioChangedEvent({ userId })
|
new PortfolioChangedEvent({ userId })
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
import { OrderModule } from '@ghostfolio/api/app/order/order.module';
|
||||||
import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';
|
import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';
|
||||||
import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
|
import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
|
||||||
import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
|
import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
|
||||||
@ -19,6 +20,7 @@ import { UserService } from './user.service';
|
|||||||
secret: process.env.JWT_SECRET_KEY,
|
secret: process.env.JWT_SECRET_KEY,
|
||||||
signOptions: { expiresIn: '30 days' }
|
signOptions: { expiresIn: '30 days' }
|
||||||
}),
|
}),
|
||||||
|
OrderModule,
|
||||||
PrismaModule,
|
PrismaModule,
|
||||||
PropertyModule,
|
PropertyModule,
|
||||||
SubscriptionModule,
|
SubscriptionModule,
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
import { OrderService } from '@ghostfolio/api/app/order/order.service';
|
||||||
import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
|
import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
|
||||||
import { environment } from '@ghostfolio/api/environments/environment';
|
import { environment } from '@ghostfolio/api/environments/environment';
|
||||||
import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
|
import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
|
||||||
@ -40,6 +41,7 @@ export class UserService {
|
|||||||
public constructor(
|
public constructor(
|
||||||
private readonly configurationService: ConfigurationService,
|
private readonly configurationService: ConfigurationService,
|
||||||
private readonly eventEmitter: EventEmitter2,
|
private readonly eventEmitter: EventEmitter2,
|
||||||
|
private readonly orderService: OrderService,
|
||||||
private readonly prismaService: PrismaService,
|
private readonly prismaService: PrismaService,
|
||||||
private readonly propertyService: PropertyService,
|
private readonly propertyService: PropertyService,
|
||||||
private readonly subscriptionService: SubscriptionService,
|
private readonly subscriptionService: SubscriptionService,
|
||||||
@ -398,8 +400,8 @@ export class UserService {
|
|||||||
} catch {}
|
} catch {}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await this.prismaService.order.deleteMany({
|
await this.orderService.deleteOrders({
|
||||||
where: { userId: where.id }
|
userId: where.id
|
||||||
});
|
});
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user