From 0770b9923df3428ecc1eb2cc61b8e170829ad56c Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Mon, 6 Feb 2023 21:42:23 +0100
Subject: [PATCH] Refactoring

---
 apps/api/src/app/account/create-account.dto.ts |  2 +-
 apps/api/src/app/import/import.controller.ts   |  6 +-----
 apps/api/src/app/import/import.service.ts      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/apps/api/src/app/account/create-account.dto.ts b/apps/api/src/app/account/create-account.dto.ts
index 43e2584b7..6495fa518 100644
--- a/apps/api/src/app/account/create-account.dto.ts
+++ b/apps/api/src/app/account/create-account.dto.ts
@@ -19,7 +19,7 @@ export class CreateAccountDto {
 
   @IsOptional()
   @IsString()
-  id: string;
+  id?: string;
 
   @IsBoolean()
   @IsOptional()
diff --git a/apps/api/src/app/import/import.controller.ts b/apps/api/src/app/import/import.controller.ts
index 06d9ad93d..93724bf02 100644
--- a/apps/api/src/app/import/import.controller.ts
+++ b/apps/api/src/app/import/import.controller.ts
@@ -41,11 +41,7 @@ export class ImportController {
   ): Promise<ImportResponse> {
     if (
       !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(
         getReasonPhrase(StatusCodes.FORBIDDEN),
diff --git a/apps/api/src/app/import/import.service.ts b/apps/api/src/app/import/import.service.ts
index b42fe8545..37693f160 100644
--- a/apps/api/src/app/import/import.service.ts
+++ b/apps/api/src/app/import/import.service.ts
@@ -200,9 +200,9 @@ export class ImportService {
     );
 
     if (isDryRun) {
-      accountsDto.forEach((accountsDto) =>
-        accounts.push({ id: accountsDto.id, name: accountsDto.name })
-      );
+      accountsDto.forEach(({ id, name }) => {
+        accounts.push({ id, name });
+      });
     }
 
     const activities: Activity[] = [];
@@ -220,9 +220,9 @@ export class ImportService {
       unitPrice
     } of activitiesDto) {
       const date = parseISO(<string>(<unknown>dateString));
-      const validatedAccount = accounts.find(
-        (account) => account.id === accountId
-      );
+      const validatedAccount = accounts.find(({ id }) => {
+        return id === accountId;
+      });
 
       let order:
         | OrderWithAccount
@@ -239,7 +239,7 @@ export class ImportService {
           type,
           unitPrice,
           userId,
-          accountId: validatedAccount.id,
+          accountId: validatedAccount?.id,
           accountUserId: undefined,
           createdAt: new Date(),
           id: uuidv4(),
@@ -275,7 +275,7 @@ export class ImportService {
           type,
           unitPrice,
           userId,
-          accountId: validatedAccount.id,
+          accountId: validatedAccount?.id,
           SymbolProfile: {
             connectOrCreate: {
               create: {