sudacode/ghostfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Feature/extend supported date formats in activities import (#2362)

Browse Source 
* Extend supported date formats in activities import

* Update changelog
This commit is contained in:
Frane Caleta
2023-09-23 16:14:54 +02:00
committed by GitHub
parent 6d9191a46f
commit eb63802d01
4 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/client/src/app/services/import-activities.service.ts
View File

@@ -3,8 +3,8 @@ import { Injectable } from '@angular/core';
import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto';
import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
import { parseDate as parseDateHelper } from '@ghostfolio/common/helper';
import { Account, DataSource, Type } from '@prisma/client';
import { isMatch, parse, parseISO } from 'date-fns';
import { isFinite } from 'lodash';
import { parse as csvToJson } from 'papaparse';
import { EMPTY } from 'rxjs';
@@ -219,31 +219,12 @@ export class ImportActivitiesService {
item: any;
}) {
item = this.lowercaseKeys(item);
let date: string;
for (const key of ImportActivitiesService.DATE_KEYS) {
if (item[key]) {
if (isMatch(item[key], 'dd-MM-yyyy') && item[key].length === 10) {
// Check length to only match yyyy (and not yy)
date = parse(item[key], 'dd-MM-yyyy', new Date()).toISOString();
} else if (
isMatch(item[key], 'dd/MM/yyyy') &&
item[key].length === 10
) {
// Check length to only match yyyy (and not yy)
date = parse(item[key], 'dd/MM/yyyy', new Date()).toISOString();
} else if (isMatch(item[key], 'yyyyMMdd') && item[key].length === 8) {
// Check length to only match yyyy (and not yy)
date = parse(item[key], 'yyyyMMdd', new Date()).toISOString();
} else {
try {
date = parseISO(item[key]).toISOString();
} catch {}
}
if (date) {
return date;
}
try {
return parseDateHelper(item[key].toString()).toISOString();
} catch {}
}
}