[Feature/Fix docker config]: Pull from bachelor (#58)

* Add tests for nordigen synchronization process * Composer update & change docker config * Update docker config * Fix docker config
michalmytych · Dec 31, 2023 · 4349ba7 · 4349ba7
1 parent 4fdaaef
commit 4349ba7
Show file tree

Hide file tree

Showing 33 changed files with 1,106 additions and 708 deletions.
diff --git a/app/Http/Client/Traits/DecodesHttpJsonResponse.php b/app/Http/Client/Traits/DecodesHttpJsonResponse.php
@@ -3,11 +3,11 @@
 namespace App\Http\Client\Traits;
 
 use Throwable;
-use GuzzleHttp\Psr7\Response;
+use Psr\Http\Message\ResponseInterface;
 
 trait DecodesHttpJsonResponse
 {
-    protected function decodedResponse(Response $response): array
+    protected function decodedResponse(ResponseInterface $response): array
     {
         $contents = $response
             ->getBody()

diff --git a/app/Http/Controllers/Web/Transaction/PersonalAccountController.php b/app/Http/Controllers/Web/Transaction/PersonalAccountController.php
@@ -7,9 +7,14 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
 use App\Models\Transaction\PersonalAccount;
+use App\Contracts\Infrastructure\Cache\CacheAdapterInterface;
 
 class PersonalAccountController extends Controller
 {
+    public function __construct(private readonly CacheAdapterInterface $cacheAdapter)
+    {
+    }
+
     public function index(Request $request): View
     {
         $personalAccounts = PersonalAccount::whereUser($request->user())
@@ -36,13 +41,17 @@ public function update(Request $request): RedirectResponse
     {
         // @todo - handle editing multiplte personal account saldos
         $personalAccount = $request->user()->personalAccounts()->first();
+
         $request->validate([
             'value' => 'numeric|gte:0'
         ]);
+
         $personalAccount->update([
             'value' => $request->input('value')
         ]);
 
+        $this->cacheAdapter->clearUserCache($request->user());
+
         return to_route('home');
     }
 }
diff --git a/app/Http/Requests/Web/File/FileUploadRequest.php b/app/Http/Requests/Web/File/FileUploadRequest.php
@@ -12,7 +12,7 @@ public function rules(): array
         return [
             'import_setting_id' => 'exists:import_settings,id|exclude_if:type,' . File::USER_AVATAR,
             'columns_mapping_id' => 'exists:columns_mappings,id|exclude_if:type,' . File::USER_AVATAR,
-            'file' => 'required|mimes:jpeg|max:6000',
+            'file' => 'required|max:6000',
             'type' => 'string'
         ];
     }

diff --git a/app/Models/File.php b/app/Models/File.php
@@ -22,6 +22,7 @@ class File extends Model
     use HasFactory, BelongsToUser;
 
     public const USER_AVATAR = 'USER_AVATAR';
+    public const TRANSACTIONS_IMPORT = 'TRANSACTIONS_IMPORT';
 
     protected $fillable = [
         'name',

diff --git a/app/Models/Nordigen/Requisition.php b/app/Models/Nordigen/Requisition.php
@@ -11,6 +11,7 @@
  * @method static latest()
  * @method static whereUser($user)
  * @property mixed $nordigen_requisition_id
+ * @property mixed $id
  */
 class Requisition extends Model
 {

diff --git a/app/Models/Synchronization/Account.php b/app/Models/Synchronization/Account.php
@@ -3,9 +3,11 @@
 namespace App\Models\Synchronization;
 
 use App\Models\Traits\BelongsToUser;
+use App\Models\Transaction\PersonalAccount;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
  * @method static create(array $array)
@@ -14,6 +16,7 @@
  * @method static whereUser(User $user)
  * @property int $id
  * @property string $nordigen_account_id
+ * @property PersonalAccount|null $personalAccount
  */
 class Account extends Model
 {
@@ -24,4 +27,9 @@ class Account extends Model
         'nordigen_account_id',
         'synchronization_id'
     ];
+
+    public function personalAccount(): HasOne
+    {
+        return $this->hasOne(PersonalAccount::class);
+    }
 }
diff --git a/app/Models/Transaction/PersonalAccount.php b/app/Models/Transaction/PersonalAccount.php
@@ -9,13 +9,17 @@
 
 /**
  * @property mixed $value
+ * @property int $id
  * @method static whereUser(mixed $user)
+ * @method static firstOrCreate(array $attributes, array $data)
  */
 class PersonalAccount extends Model
 {
     use HasFactory, BelongsToUser;
 
     protected $fillable = [
+        'external_reference',
+        'account_id',
         'user_id',
         'value',
         'name'

diff --git a/app/Services/File/FileUploadService.php b/app/Services/File/FileUploadService.php
@@ -31,10 +31,10 @@ public function upload(User $user, UploadedFile $file, array $data): void
 
         try {
             $this->transactionFileService->uploadTransactions(
-                $file,
-                $data['import_setting_id'],
-                $data['columns_mapping_id'],
-                $user
+                requestFile: $file,
+                importSettingId: $data['import_setting_id'],
+                columnMappingId: $data['columns_mapping_id'],
+                user: $user
             );
 
         } catch(\Throwable) {

diff --git a/app/Services/File/TransactionFileService.php b/app/Services/File/TransactionFileService.php
@@ -26,10 +26,10 @@ public function uploadTransactions(mixed $requestFile, mixed $importSettingId, m
 
         $fileModel = new File();
         $fileModel->user_id = $user->id;
-        $fileModel->name = $file->getClientOriginalName();
-        $fileModel->path = "uploads/{$fileName}";
         $fileModel->size = $file->getSize();
+        $fileModel->path = "uploads/{$fileName}";
         $fileModel->import_setting_id = $importSettingId;
+        $fileModel->name = $file->getClientOriginalName();
 
         $this->registerAndStoreFile($fileModel, $file, $fileName);
 

diff --git a/app/Services/Import/ImportService.php b/app/Services/Import/ImportService.php
@@ -36,16 +36,19 @@ public function importFromFile(int $fileId, int $importSettingId, int $columnsMa
 
         $import = new Import([
             'user_id' => $user->id,
+            'file_id' => $file->id,
             'status' => Import::STATUS_PROCESSING,
-            'columns_mapping_id' => $columnsMappingId,
             'import_setting_id' => $importSettingId,
-            'file_id' => $file->id,
+            'columns_mapping_id' => $columnsMappingId,
         ]);
 
         $import->save();
 
         DB::transaction(function () use ($file, $importSetting, $columnsMapping, $import, $user) {
-            Excel::import(new TransactionsImport($importSetting, $columnsMapping, $import, $user), $file->path);
+            Excel::queueImport(
+                new TransactionsImport($importSetting, $columnsMapping, $import, $user),
+                $file->path
+            );
         });
 
         $import->update(['status' => Import::STATUS_SAVED]);

diff --git a/app/Services/Nordigen/DataObjects/TransactionDataObject.php b/app/Services/Nordigen/DataObjects/TransactionDataObject.php
@@ -33,6 +33,9 @@ public function __construct(
 
         /** @var string|null $receiverAccountNumber Receiver IBAN Number */
         public ?string $receiverAccountNumber,
+
+        /** @var int $personalAccountId Personal account id. */
+        public int $personalAccountId,
     )
     {
     }
@@ -49,6 +52,7 @@ public static function make(mixed $data): self
             remittanceInformationUnstructured: data_get($data, 'remittanceInformationUnstructured'),
             senderAccountNumber: data_get($data, 'debtorAccount.iban'),
             receiverAccountNumber: data_get($data, 'creditorAccount.iban'),
+            personalAccountId: data_get($data, 'personalAccountId'),
         );
     }
 }
diff --git a/app/Services/Nordigen/NordigenClient.php b/app/Services/Nordigen/NordigenClient.php
@@ -3,8 +3,45 @@
 namespace App\Services\Nordigen;
 
 use App\Http\Client\Client;
+use Illuminate\Support\Facades\Log;
+use Psr\Http\Message\ResponseInterface;
 
-class NordigenClient extends Client
+class NordigenClient extends Client implements NordigenClientInterface
 {
-    //
+    public function request(string $method, $uri = '', array $options = []): ResponseInterface
+    {
+        $response = parent::request($method, $uri, $options);
+
+        $this->log(
+            [
+                'uri' => $uri,
+                'method' => $method,
+                'options' => $options
+            ],
+            $response
+        );
+
+        return $response;
+    }
+
+    public function log(array $clientParameters, ResponseInterface $response): void
+    {
+        $log = [
+            'type' => '[NordigenClient Requests Log]',
+            'time' => time(),
+            'meta' => [
+                'client_parameters' => $clientParameters,
+                'response' => [
+                    'status_code' => $response->getStatusCode(),
+                    'body' => $response->getBody(),
+                    'headers' => $response->getHeaders(),
+                    'protocol_version' => $response->getProtocolVersion()
+                ]
+            ]
+        ];
+
+        Log::debug(
+            json_encode($log)
+        );
+    }
 }
diff --git a/app/Services/Nordigen/NordigenClientInterface.php b/app/Services/Nordigen/NordigenClientInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Services\Nordigen;
+
+interface NordigenClientInterface
+{
+    //
+}
diff --git a/app/Services/Nordigen/NordigenService.php b/app/Services/Nordigen/NordigenService.php
@@ -2,6 +2,7 @@
 
 namespace App\Services\Nordigen;
 
+
 use Exception;
 use Throwable;
 use App\Models\User;
@@ -11,11 +12,12 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use App\Models\Nordigen\Requisition;
-use App\Models\Synchronization\Account;
 use GuzzleHttp\Exception\GuzzleException;
 use App\Models\Nordigen\EndUserAgreement;
+use App\Models\Transaction\PersonalAccount;
 use App\Models\Synchronization\Synchronization;
 use App\Http\Client\Traits\DecodesHttpJsonResponse;
+use App\Models\Synchronization\Account as NordigenAccount;
 use App\Services\Nordigen\DataObjects\InstitutionDataObject;
 use App\Services\Nordigen\DataObjects\TransactionDataObject;
 use App\Contracts\Infrastructure\Cache\CacheAdapterInterface;
@@ -43,7 +45,7 @@ class NordigenService implements TransactionSyncServiceInterface
     private const REQUISITION_CREATED_STATUS = 'CR';
 
     public function __construct(
-        private readonly NordigenClient                      $httpClient,
+        private readonly NordigenClientInterface             $httpClient,
         private readonly CacheAdapterInterface               $cacheAdapter,
         private readonly NordigenAccountService              $nordigenAccountService,
         private readonly NordigenTransactionServiceInterface $nordigenTransactionService
@@ -78,11 +80,33 @@ public function syncTransactions(mixed $requisitionId, mixed $synchronizationId,
         }
     }
 
+    /**
+     * @throws GuzzleException
+     */
+    public function getAccountBalance(NordigenAccount $account): int|float|null
+    {
+        $uri = self::ACCOUNTS_URI . $account->nordigen_account_id . '/balances/';
+
+        $response = $this->httpClient->get($uri, [
+            'headers' => $this->getAuthorizationHeader(),
+        ]);
+
+        $balancesData = $this->decodedResponse($response);
+        $balances = data_get($balancesData, 'balances');
+
+        $availableBalance = array_filter(
+            $balances,
+            fn(array $balance) => $balance['balanceType'] === 'forwardAvailable'
+        );
+
+        return data_get($availableBalance, 'balanceAmount.amount');
+    }
+
     /**
      * @throws GuzzleException
      * @throws Exception
      */
-    protected function syncTransactionsByAccount(Account $account, Import $import, User $user): void
+    protected function syncTransactionsByAccount(NordigenAccount $account, Import $import, User $user): void
     {
         $uri = self::ACCOUNTS_URI . $account->nordigen_account_id . '/transactions/';
 
@@ -91,6 +115,8 @@ protected function syncTransactionsByAccount(Account $account, Import $import, U
         ]);
 
         $transactionsData = $this->decodedResponse($response);
+        $personalAccountId = $account->refresh()->personalAccount?->id;
+        $transactionsData['personalAccountId'] = $personalAccountId;
 
         if (data_get($transactionsData, 'transactions')) {
             $booked = data_get($transactionsData, 'transactions.booked');
@@ -100,23 +126,14 @@ protected function syncTransactionsByAccount(Account $account, Import $import, U
 
             foreach ($all as $transactionData) {
                 $transactionDataObject = TransactionDataObject::make($transactionData);
-                $this->nordigenTransactionService->addNewSynchronizedTransaction(
-                    $transactionDataObject,
-                    $import,
-                    $user
-                );
+                $this->nordigenTransactionService->addNewSynchronizedTransaction($transactionDataObject, $import, $user);
             }
         } else {
             Log::debug(json_encode($transactionsData));
             throw new Exception('Invalid transaction data received. Response was logged to debug logs.');
         }
     }
 
-    public function getAccounts(User $user): Collection
-    {
-        return Account::whereUser($user)->latest()->get();
-    }
-
     /**
      * @throws GuzzleException
      * @throws Exception
@@ -134,15 +151,29 @@ public function syncAccounts(mixed $requisitionId, mixed $synchronizationId, Use
 
         if (is_array($accountsIds)) {
             foreach ($accountsIds as $accountId) {
-                // @todo add deleting non existing accounts
-                Account::firstOrCreate([
+                $account = NordigenAccount::firstOrCreate([
                     'user_id' => $user->id,
                     'nordigen_account_id' => $accountId,
                 ], [
                     'user_id' => $user->id,
                     'nordigen_account_id' => $accountId,
                     'synchronization_id' => $synchronizationId,
                 ]);
+
+                $institutionId = data_get($accountsData, 'institution_id');
+                $accountReference = data_get($accountsData, 'reference');
+
+                $accountBalance = $this->getAccountBalance($account);
+
+                PersonalAccount::firstOrCreate([
+                    'user_id' => $user->id,
+                    'external_reference' => $accountReference
+                ], [
+                    'user_id' => $user->id,
+                    'nordigen_account_id' => $account->id,
+                    'name' => $institutionId . ' ' . $accountReference,
+                    'value' => $accountBalance
+                ]);
             }
         }
     }

diff --git a/app/Services/Nordigen/Provider/NordigenServiceProvider.php b/app/Services/Nordigen/Provider/NordigenServiceProvider.php
@@ -3,6 +3,7 @@
 namespace App\Services\Nordigen\Provider;
 
 use App\Services\Nordigen\NordigenClient;
+use App\Services\Nordigen\NordigenClientInterface;
 use App\Services\Nordigen\Synchronization\NordigenTransactionServiceInterface;
 use App\Services\Transaction\TransactionSyncService;
 use Illuminate\Support\ServiceProvider;
@@ -11,7 +12,7 @@ class NordigenServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
-        $this->app->singleton(NordigenClient::class, function ($app) {
+        $this->app->singleton(NordigenClientInterface::class, function ($app) {
             return new NordigenClient([
                 'base_uri' => $app->config->get('nordigen.base_uri'),
                 'headers'  => $app->config->get('nordigen.headers'),