Skip to content

Commit b7dede8

Browse files
committed
Updates account number handling and API request logic
Replaces the use of `bank->getDataValue('buc')` with `accountNumber` for better consistency and clarity in statement-related operations. Refactors API request logic to use `ApiClient::getxRequestId()` directly, ensuring proper utilization of the API client. Improves filename generation and statement processing by switching to array-based access (`statement['key']`) instead of object-based access, enhancing compatibility with data formats. These changes aim to simplify handling, improve reliability, and align with updated data structures.
1 parent 3574152 commit b7dede8

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

.openapi-generator/templates/Statementor.mustache

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ class Statementor extends \Ease\Sand
102102
103103
do {
104104
$requestBody = new \VitexSoftware\Raiffeisenbank\Model\GetStatementsRequest([
105-
'accountNumber' => $this->bank->getDataValue('buc'),
105+
'accountNumber' => $this->accountNumber,
106106
'page' => ++$page,
107107
'size' => 60,
108108
'currency' => $currencyCode,
109109
'statementLine' => $statementLineFinal,
110110
'dateFrom' => $this->since->format(self::$dateFormat),
111111
'dateTo' => $this->until->format(self::$dateFormat)]);
112112
113-
$result = $apiInstance->getStatements($this->getxRequestId(), $requestBody, $page);
113+
$result = $apiInstance->getStatements(\VitexSoftware\Raiffeisenbank\ApiClient::getxRequestId(), $requestBody, $page);
114114
115115
$pageStatements = $result->getStatements();
116116
@@ -280,14 +280,14 @@ class Statementor extends \Ease\Sand
280280
$success = 0;
281281
282282
foreach ($statements as $statement) {
283-
$statementFilename = str_replace('/', '_', $statement->statementNumber).'_'.
284-
$statement->accountNumber.'_'.
285-
$statement->accountId.'_'.
286-
$statement->currency.'_'.$statement->dateFrom.'.'.$format;
283+
$statementFilename = str_replace('/', '_', $statement['statementNumber']).'_'.
284+
$this->accountNumber.'_'.
285+
$statement['accountId'].'_'.
286+
$statement['currency'].'_'.$statement['dateFrom'].'.'.$format;
287287
$requestBody = new \VitexSoftware\Raiffeisenbank\Model\DownloadStatementRequest([
288288
'accountNumber' => $this->accountNumber,
289289
'currency' => $currencyCode,
290-
'statementId' => $statement->statementId,
290+
'statementId' => $statement['statementId'],
291291
'statementFormat' => $format]);
292292
$pdfStatementRaw = $apiInstance->downloadStatement(ApiClient::getxRequestId(), 'cs', $requestBody);
293293
sleep(1);

lib/Statementor.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ public function getStatements($currencyCode = 'CZK', string $statementLine = '')
104104

105105
do {
106106
$requestBody = new \VitexSoftware\Raiffeisenbank\Model\GetStatementsRequest([
107-
'accountNumber' => $this->bank->getDataValue('buc'),
107+
'accountNumber' => $this->accountNumber,
108108
'page' => ++$page,
109109
'size' => 60,
110110
'currency' => $currencyCode,
111111
'statementLine' => $statementLineFinal,
112112
'dateFrom' => $this->since->format(self::$dateFormat),
113113
'dateTo' => $this->until->format(self::$dateFormat)]);
114114

115-
$result = $apiInstance->getStatements($this->getxRequestId(), $requestBody, $page);
115+
$result = $apiInstance->getStatements(\VitexSoftware\Raiffeisenbank\ApiClient::getxRequestId(), $requestBody, $page);
116116

117117
$pageStatements = $result->getStatements();
118118

@@ -281,14 +281,14 @@ public function download(string $saveTo, array $statements, string $format = 'pd
281281
$success = 0;
282282

283283
foreach ($statements as $statement) {
284-
$statementFilename = str_replace('/', '_', $statement->statementNumber).'_'.
285-
$statement->accountNumber.'_'.
286-
$statement->accountId.'_'.
287-
$statement->currency.'_'.$statement->dateFrom.'.'.$format;
284+
$statementFilename = str_replace('/', '_', $statement['statementNumber']).'_'.
285+
$this->accountNumber.'_'.
286+
$statement['accountId'].'_'.
287+
$statement['currency'].'_'.$statement['dateFrom'].'.'.$format;
288288
$requestBody = new \VitexSoftware\Raiffeisenbank\Model\DownloadStatementRequest([
289289
'accountNumber' => $this->accountNumber,
290290
'currency' => $currencyCode,
291-
'statementId' => $statement->statementId,
291+
'statementId' => $statement['statementId'],
292292
'statementFormat' => $format]);
293293
$pdfStatementRaw = $apiInstance->downloadStatement(ApiClient::getxRequestId(), 'cs', $requestBody);
294294
sleep(1);

0 commit comments

Comments
 (0)