fill missing lines of list gdt transactions

This commit is contained in:
Dario Rekowski on RockPI 2021-08-03 15:44:51 +00:00
parent fb22adf38c
commit c4a01aec73

View File

@ -424,21 +424,35 @@ class AppRequestsController extends AppController
if(!$user) { if(!$user) {
return $this->returnJson(['state' => 'error', 'msg' => 'user not found', 'details' => 'exist a valid session cookie?']); return $this->returnJson(['state' => 'error', 'msg' => 'user not found', 'details' => 'exist a valid session cookie?']);
} }
$gdtEntries = $this->JsonRequestClient->sendRequestGDT([ $gdtEntries = $this->JsonRequestClient->sendRequestGDT([
'email' => $user['email'], 'email' => $user['email'],
'page' => $page, 'page' => $page,
'count' => $count, 'count' => $count,
'orderDirection' => $orderDirection 'orderDirection' => $orderDirection
], 'GdtEntries' . DS . 'sumPerEmailApi'); ], 'GdtEntries' . DS . 'listPerEmailApi');
//var_dump($gdtEntries);
$transactions = []; $transactions = [];
$result = ['state' => 'success'];
if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) { if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) {
$gdtSum = intval($gdtEntries['data']['sum']); $gdtSum = 0;
if(isset($gdtEntries['data']['gdtSumPerEmail'])) {
foreach($gdtEntries['data']['gdtSumPerEmail'] as $email => $sum) {
$gdtSum += floatval($sum/100.0);
}
}
$result['sum'] = $gdtSum;
if(isset($gdtEntries['data']['count'])) { if(isset($gdtEntries['data']['count'])) {
$gdtCount = intval($gdtEntries['data']['count']); $result['count'] = intval($gdtEntries['data']['count']);
} }
if(isset($gdtEntries['data']['ownEntries'])) { if(isset($gdtEntries['data']['ownEntries'])) {
$transactions = $gdtEntries['data']['ownEntries']; $result['ownEntries'] = $gdtEntries['data']['ownEntries'];
}
if(isset($gdtEntries['data']['publisherPath'])) {
$result['publisherPath'] = $gdtEntries['data']['publisherPath'];
}
if(isset($gdtEntries['data']['connectEntrys'])) {
$result['connectEntrys'] = $gdtEntries['data']['connectEntrys'];
} }
} else { } else {
if($user) { if($user) {
@ -448,12 +462,9 @@ class AppRequestsController extends AppController
} }
} }
$timeEnd = microtime(true); $timeEnd = microtime(true);
return $this->returnJson([
'state' => 'success', $result['timeUsed'] = ($timeEnd - $timeBegin) . ' s';
'transactions' => $transactions, return $this->returnJson($result);
'count' => $gdtEntries['data']['count'],
'timeUsed' => ($timeEnd - $timeBegin) . ' s'
]);
} }
public function getDecayStartBlock() public function getDecayStartBlock()