Browse Source

Refactoring

pull/1635/head
Thomas 3 years ago
parent
commit
0770b9923d
  1. 2
      apps/api/src/app/account/create-account.dto.ts
  2. 6
      apps/api/src/app/import/import.controller.ts
  3. 16
      apps/api/src/app/import/import.service.ts

2
apps/api/src/app/account/create-account.dto.ts

@ -19,7 +19,7 @@ export class CreateAccountDto {
@IsOptional() @IsOptional()
@IsString() @IsString()
id: string; id?: string;
@IsBoolean() @IsBoolean()
@IsOptional() @IsOptional()

6
apps/api/src/app/import/import.controller.ts

@ -41,11 +41,7 @@ export class ImportController {
): Promise<ImportResponse> { ): Promise<ImportResponse> {
if ( if (
!this.configurationService.get('ENABLE_FEATURE_IMPORT') || !this.configurationService.get('ENABLE_FEATURE_IMPORT') ||
(importData.accounts?.length > 0 && !hasPermission(this.request.user.permissions, permissions.createAccount)
!hasPermission(
this.request.user.permissions,
permissions.createAccount
))
) { ) {
throw new HttpException( throw new HttpException(
getReasonPhrase(StatusCodes.FORBIDDEN), getReasonPhrase(StatusCodes.FORBIDDEN),

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

@ -200,9 +200,9 @@ export class ImportService {
); );
if (isDryRun) { if (isDryRun) {
accountsDto.forEach((accountsDto) => accountsDto.forEach(({ id, name }) => {
accounts.push({ id: accountsDto.id, name: accountsDto.name }) accounts.push({ id, name });
); });
} }
const activities: Activity[] = []; const activities: Activity[] = [];
@ -220,9 +220,9 @@ export class ImportService {
unitPrice unitPrice
} of activitiesDto) { } of activitiesDto) {
const date = parseISO(<string>(<unknown>dateString)); const date = parseISO(<string>(<unknown>dateString));
const validatedAccount = accounts.find( const validatedAccount = accounts.find(({ id }) => {
(account) => account.id === accountId return id === accountId;
); });
let order: let order:
| OrderWithAccount | OrderWithAccount
@ -239,7 +239,7 @@ export class ImportService {
type, type,
unitPrice, unitPrice,
userId, userId,
accountId: validatedAccount.id, accountId: validatedAccount?.id,
accountUserId: undefined, accountUserId: undefined,
createdAt: new Date(), createdAt: new Date(),
id: uuidv4(), id: uuidv4(),
@ -275,7 +275,7 @@ export class ImportService {
type, type,
unitPrice, unitPrice,
userId, userId,
accountId: validatedAccount.id, accountId: validatedAccount?.id,
SymbolProfile: { SymbolProfile: {
connectOrCreate: { connectOrCreate: {
create: { create: {

Loading…
Cancel
Save