Commit 71928513 authored by Michael Ngei's avatar Michael Ngei

updated

parent 76465b78
...@@ -21,3 +21,4 @@ supervisord.pid ...@@ -21,3 +21,4 @@ supervisord.pid
supervisord.log supervisord.log
worker.log worker.log
composer.lock composer.lock
/config
...@@ -104,13 +104,10 @@ class PaymentsAPI extends Controller ...@@ -104,13 +104,10 @@ class PaymentsAPI extends Controller
$consumer_name = str_replace( ' ', '_', strtoupper($contract->client->name_sh)); $consumer_name = str_replace( ' ', '_', strtoupper($contract->client->name_sh));
//$res=Redis::set('name', 'mikee'); //$res=Redis::set('name', 'mikee');
//$checkKey = Redis::get('search_quota:countsse:user23'); //$checkKey = Redis::get('search_quota:countsse:user23');
try{ try{
if (Redis::exists("search_quota:max:".$consumer_name)) { if (Redis::exists("search_quota:max:".$consumer_name)) {
$tokens = $validated['tokens']; $tokens = $validated['tokens'];
$maxToken = Redis::get("search_quota:max:".$consumer_name); $maxToken = Redis::get("search_quota:max:".$consumer_name);
// added tokens // added tokens
$newMax = $tokens + $maxToken; $newMax = $tokens + $maxToken;
//set tokens //set tokens
...@@ -126,11 +123,16 @@ class PaymentsAPI extends Controller ...@@ -126,11 +123,16 @@ class PaymentsAPI extends Controller
'contract_id' => $validated['contract_id'], 'contract_id' => $validated['contract_id'],
'USER_ID' => $validated['user_id'], 'USER_ID' => $validated['user_id'],
]); ]);
//update tokens
Tokens::where('contract_id', $validated['contract_id'])->update([
'total_tokens' => $newMax,
]);
// Return success JSON response // Return success JSON response
return response()->json([ return response()->json([
'success' => true, 'success' => true,
'message' => 'Payment created successfully', 'message' => 'Payment created successfully',
$this->jsonData,
], 201); ], 201);
} }
}else{ }else{
...@@ -148,7 +150,6 @@ class PaymentsAPI extends Controller ...@@ -148,7 +150,6 @@ class PaymentsAPI extends Controller
return response()->json([ return response()->json([
'success' => true, 'success' => true,
'message' => 'Payment created successfully', 'message' => 'Payment created successfully',
$this->jsonData,
], 201); ], 201);
} }
}catch (\Predis\Connection\ConnectionException $redisException) { }catch (\Predis\Connection\ConnectionException $redisException) {
...@@ -234,17 +235,16 @@ class PaymentsAPI extends Controller ...@@ -234,17 +235,16 @@ class PaymentsAPI extends Controller
] ]
]); ]);
if ($response->successful()) { if ($response->successful()) {
//save it locally $tokens = Tokens::create([
$tokens = Tokens::create([ 'TOTAL_TOKENS' => $tokens,
'TOTAL_TOKENS' => $tokens, 'contract_id' => $cid,
'contract_id' => $cid, ]);
]);
return ['status'=>$response->successful() ,'body'=>$response->body()]; return ['status'=>$response->successful() ,'body'=>$response->body()];
// return response()->json(["message" => "Consumer created successfully.", "data" => $response->json()]); // return response()->json(["message" => "Consumer created successfully.", "data" => $response->json()]);
} else { } else {
//return response()->json(["error" => "Failed to create consumer.", "details" => $response->body()], $response->status()); //return response()->json(["error" => "Failed to create consumer.", "details" => $response->body()], $response->status());
return ['status'=>false ,'body'=>'']; return ['status'=>false ,'body'=>''];
} }
} }
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Models\Client;
use App\Models\Contract;
use App\Models\Tokens; use App\Models\Tokens;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Redis; use Illuminate\Support\Facades\Redis;
...@@ -29,12 +31,27 @@ class TokensController extends Controller ...@@ -29,12 +31,27 @@ class TokensController extends Controller
} }
} while ($cursor !== '0'); } while ($cursor !== '0');
dd($searchQuotas); $counts = [];
foreach ($searchQuotas as $key => $value) {
if (str_contains($key, 'search_quota:count:')) {
$clientName = str_replace('search_quota:count:', '', $key);
$counts[$clientName] = $value;
}
}
// Update the Tokens table
foreach ($counts as $clientName => $usedTokens) {
$clients_found = Client::where('name_sh', $clientName)->first();
if($clients_found){
$contract = Contract::where('client_rid', $clients_found->rid)->first();
if ($contract) {
$updated = Tokens::where('CONTRACT_ID', $contract->rid)->update(['USED_TOKENS' => $usedTokens]);
}
}
}
$tokens = Tokens::with('contract.client')->get(); $tokens = Tokens::with('contract.client')->get();
return view('tokens.tokens', [ return view('tokens.tokens', [
'tokens' => $tokens, 'tokens' => $tokens,
'searchQuotas' => $searchQuotas
]); ]);
} }
/* public function index() /* public function index()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment