Browse Source

Fix issue with activities for new accounts

pull/1635/head
yksolanki9 3 years ago
parent
commit
ef8b1e03d4
  1. 5
      apps/api/src/app/import/import.service.ts
  2. 3
      apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts

5
apps/api/src/app/import/import.service.ts

@ -117,7 +117,8 @@ export class ImportService {
}): Promise<Activity[]> { }): Promise<Activity[]> {
const accountIdMapping = {}; const accountIdMapping = {};
if (!isDryRun && accountsDto?.length) { //Create new accounts during dryRun so that new account Ids don't get invalidated
if (isDryRun && accountsDto?.length) {
for (let account of accountsDto) { for (let account of accountsDto) {
//Check if there is any existing account with the same id //Check if there is any existing account with the same id
const accountWithSameId = await this.accountService.getAccountById( const accountWithSameId = await this.accountService.getAccountById(
@ -169,7 +170,7 @@ export class ImportService {
} }
} }
if (!isDryRun) { if (isDryRun) {
//If a new account is created, then update the accountId in all activities //If a new account is created, then update the accountId in all activities
if (Object.keys(accountIdMapping).includes(activity.accountId)) { if (Object.keys(accountIdMapping).includes(activity.accountId)) {
activity.accountId = accountIdMapping[activity.accountId]; activity.accountId = accountIdMapping[activity.accountId];

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

@ -183,7 +183,8 @@ export class ImportActivitiesDialog implements OnDestroy {
this.accounts = content.accounts; this.accounts = content.accounts;
const data = await this.importActivitiesService.importJson({ const data = await this.importActivitiesService.importJson({
activities: content.activities, activities: content.activities,
isDryRun: true isDryRun: true,
accounts: this.accounts
}); });
this.activities = data.activities; this.activities = data.activities;
} catch (error) { } catch (error) {

Loading…
Cancel
Save