speed-dreams/sdwebserver
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

The fastest laps for each track and category are now stored in a separate table.

Browse source 
To create the new table, as well as to populate it, you have to run the SQL script export_best_laps.sql
This commit is contained in:
Alfonso Saavedra "Son Link" 2024-11-30 10:57:59 +01:00
parent 98a0c5472d
commit 199639a2f1
No known key found for this signature in database
GPG key ID: D3594BCF897F74D8
6 changed files with 150 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Config/Routes.php
View file

@ -13,7 +13,6 @@ $routes->get('track/(:any)', 'Tracks::index/$1');
$routes->get('race/(:num)', 'Races::index/$1');
$routes->get('users', 'Users::index');
$routes->get('login', 'Users::login');
$routes->get('register', 'Register::index');
$routes->post('webserver', 'Webserver::index');
$routes->group('dashboard', static function ($routes) {
@ -23,4 +22,11 @@ $routes->group('dashboard', static function ($routes) {
$routes->post('login', 'Dashboard::login');
$routes->post('update_user', 'Dashboard::updateUser', ['filter' => 'userSession']);
$routes->post('change_passwd', 'Dashboard::changePasswd', ['filter' => 'userSession']);
});
$routes->group('register', static function ($routes) {
$routes->get('/', 'Register::index');
$routes->post('newuser', 'Register::newuser');
$routes->get('new_captcha', 'Register::newCaptcha');
$routes->get('ok', 'Register::ok');
});

12
app/Controllers/Home.php
View file

@ -125,6 +125,7 @@ class Home extends BaseController
################################
*/
/*
$builder = $this->db->table('laps l');
$builder->select('l.race_id, r.track_id, r.car_id, r.user_id, r.timestamp, l.wettness, min(l.laptime) as bestlap, c.name AS car_name, t.name AS track_name, u.username');
$builder->join('races r', 'l.race_id = r.id');
@ -134,6 +135,17 @@ class Home extends BaseController
$builder->where('UNIX_TIMESTAMP(r.timestamp) >', $backto);
$builder->whereIn('r.car_id', $carsCatIds);
$builder->groupBy(['r.track_id', 'l.wettness']);
*/
$builder = $this->db->table('bests_laps bl');
$builder->join('laps l', 'l.id = bl.lap_id');
$builder->select('l.race_id, r.track_id, r.car_id, r.user_id, r.timestamp, l.wettness, bl.laptime AS bestlap, c.name AS car_name, t.name AS track_name, u.username');
$builder->join('races r', 'r.id = bl.race_id');
$builder->join('cars c', 'c.id = bl.car_id');
$builder->join('tracks t', 't.id = bl.track_id');
$builder->join('users u', 'u.id = bl.user_id');
$builder->where('UNIX_TIMESTAMP(r.timestamp) >', $backto);
$builder->where('bl.car_cat', $carCatId);
$builder->groupBy(['r.track_id', 'l.wettness']);
$tplData['mylaps'] = [];

129
app/Controllers/Webserver.php
View file

@ -3,6 +3,7 @@
namespace App\Controllers;
use CodeIgniter\API\ResponseTrait;
use App\Models\BestLapsModel;
class Webserver extends BaseController
{
@ -12,14 +13,16 @@ class Webserver extends BaseController
const HASH = PASSWORD_DEFAULT;
const COST = 16;
private BestLapsModel $bestLapsModel;
public function index()
{
// Log connection
log_message('debug', 'New connection');
$so = getOS();
$this->bestLapsModel = new BestLapsModel;
$data = $this->request->getPost('data');
if (!$data) return $this->failValidationErrors('No data received');
//log_message('debug', $data);
$xml = xmlObj($data);
@ -41,7 +44,6 @@ class Webserver extends BaseController
$requestid->addAttribute('name','request_id');
$requestid->addAttribute('val',$xml->request_id);
$version = $content->addChild('attnum');
$version->addAttribute('name','webServerVersion');
$version->addAttribute('val',$webserverversion);
@ -66,7 +68,6 @@ class Webserver extends BaseController
$myDb = $this->db->table($requestype);
$update = $myDb->where('id', $requestdata->id)->update((array) $requestdata);
//$myDb->update($requestdata, $requestype, $conditions);
//xml
$races = $this->reply->addChild('section');
@ -127,30 +128,17 @@ class Webserver extends BaseController
$id->addAttribute('name', 'id');
$id->addAttribute('val', $this->db->insertID());
//select the best lap for this car/track combo
// Select the best lap for this user's car/track combo
$myDb = $this->db->table('laps A');
$myDb->select('min(A.laptime) as bestlap');
$myDb->join('races B', 'A.race_id = B.id');
$myDb->where([
'B.car_id' => $requestdata->car_id,
'B.track_id' => $requestdata->track_id
'B.track_id' => $requestdata->track_id,
'B.user_id' => $requestdata->user_id,
]);
/*$query="
SELECT min(A.laptime) as bestlap
FROM laps A
INNER
JOIN races B
ON A.race_id = B.id
WHERE
B.car_id = '".$requestdata->car_id."'
AND B.track_id = '".$requestdata->track_id."'
";
$bestlap = $myDb->customSelect($query);*/
//$query = $myDb->getResult();
//if (!$query) return;
$results = $myDb->get(1);
if (!$results || $results->getNumRows() == 0) return;
@ -172,7 +160,10 @@ class Webserver extends BaseController
private function laps($requestdata)
{
$myDb = $this->db->table('laps');
$myDb->insert((array) $requestdata);
$insert = $myDb->insert((array) $requestdata);
$lap_id = $this->db->insertID();
log_message('debug', "Insert: $insert. Lap ID: $lap_id");
//xml
$laps = $this->reply->addChild('section');
@ -182,16 +173,8 @@ class Webserver extends BaseController
$id->addAttribute('name', 'id');
$id->addAttribute('val', $this->db->insertID());
//select the car and track id for this race
/*$query="
SELECT track_id, car_id
FROM races
WHERE
id =".$requestdata->race_id."
";*/
$myDb = $this->db->table('races');
$myDb->select('track_id, car_id');
$myDb->select('track_id, car_id, user_id');
$myDb->where('id', $requestdata->race_id);
$results = $myDb->get(1);
@ -199,20 +182,7 @@ class Webserver extends BaseController
$racedata = $results->getRow();
//$racedata = $myDb->customSelect($query);
//select the best lap for this car/track combo
/*$query="
SELECT min(A.laptime) as bestlap
FROM laps A
INNER
JOIN races B
ON A.race_id = B.id
WHERE
B.car_id = '".$racedata[0]['car_id']."'
AND B.track_id = '".$racedata[0]['track_id']."'
";*/
/*
$myDb = $this->db->table('laps A');
$myDb->select('min(A.laptime) as bestlap');
$myDb->join('races B', 'A.race_id = B.id');
@ -220,11 +190,64 @@ class Webserver extends BaseController
'B.car_id' => $racedata->car_id,
'B.track_id' => $racedata->track_id
]);
*/
// Get the car category
$bestlap = 0.000;
$car_cat = null;
$query = $this->db->query('SELECT id FROM cars_cats WHERE carID = ?', [$racedata->car_id]);
if ($query && $query->getNumRows() == 1)
{
$car_cat = $query->getRow()->id;
$query = $this->bestLapsModel->select('laptime')->where([
'track_id' => $racedata->track_id,
'car_cat' => $car_cat
])->get(1);
$results = $myDb->get(1);
if (!$results || $results->getNumRows() == 0) return;
$bestlap = $results->getRow();
//$results = $myDb->get(1);
if ($query && $query->getNumRows() == 1) $bestlap = $query->getRow()->laptime;
// If the lap time is less the current best lap, or don't have a best lap (0.000),
// set this is the best lap
if ($bestlap == 0.000 || $requestdata->laptime < $bestlap)
{
// Get the setup of teh race
$query = $this->db->query('SELECT setup FROM races WHERE id = ?', [$requestdata->race_id]);
if ($query && $query->getNumRows() == 1)
{
$setup = $query->getRow()->setup;
if ($bestlap == 0.000)
{
$this->bestLapsModel->insert([
'race_id' => $requestdata->race_id,
'lap_id' => $lap_id,
'track_id' => $racedata->track_id,
'car_cat' => $car_cat,
'car_id' => $racedata->car_id,
'laptime' => $requestdata->laptime,
'user_id' => $racedata->user_id,
'setup' => $setup,
]);
}
else if ($requestdata->laptime < $bestlap)
{
$this->bestLapsModel
->where([
'track_id' => $racedata->track_id,
'car_cat' => $car_cat,
])
->set([
'race_id' => $requestdata->race_id,
'lap_id' => $lap_id,
'car_id' => $racedata->car_id,
'laptime' => $requestdata->laptime,
'user_id' => $racedata->user_id,
'setup' => $setup,
])->update();
}
}
}
}
//xml messages
$messagges = $this->reply->addChild('section');
@ -236,7 +259,7 @@ class Webserver extends BaseController
$msg0 = $messagges->addChild('attstr');
$msg0->addAttribute('name','message0');
$msg0->addAttribute('val',"Position:".$requestdata->position."\nFuel:".$requestdata->fuel."\nLap:Best: ".formatLaptime($bestlap->bestlap)."\nLast: ".formatLaptime($requestdata->laptime)."\n Diff: ".formatLaptime($requestdata->laptime-$bestlap->bestlap));
$msg0->addAttribute('val',"Position:".$requestdata->position."\nFuel:".$requestdata->fuel."\nLap:Best: ".formatLaptime($bestlap)."\nLast: ".formatLaptime($requestdata->laptime)."\n Diff: ".formatLaptime($requestdata->laptime - $bestlap));
}
private function login($requestdata)
@ -269,6 +292,9 @@ class Webserver extends BaseController
$id->addAttribute('name', 'id');
$id->addAttribute('val', $user->id);
// Save user id in the session
$this->session->set('user_id', $user->id);
//xml messages
$messagges = $this->reply->addChild('section');
$messagges->addAttribute('name','messages');
@ -297,9 +323,8 @@ class Webserver extends BaseController
$msg0 = $messagges->addChild('attstr');
$msg0->addAttribute('name','message0');
$msg0->addAttribute('val',"FAILED to login in as\n\n".$requestdata->username."\n\nWrong username or password");
$msg0->addAttribute('val', "FAILED to login in as\n\n{$requestdata->username}\n\nWrong username or password");
}
}
else
{
@ -317,7 +342,7 @@ class Webserver extends BaseController
$msg0 = $messagges->addChild('attstr');
$msg0->addAttribute('name','message0');
$msg0->addAttribute('val',"FAILED to login in as\n\n".$requestdata->username."\n\nWrong username or password");
$msg0->addAttribute('val',"FAILED to login in as\n\n{$requestdata->username}\n\nWrong username or password");
}
}
}

10
app/Models/BaseModel.php
View file

@ -12,4 +12,14 @@ class BaseModel extends Model
protected $validationRules = [];
protected $validationMessages = [];
protected $skipValidation = false;
public function data($id)
{
$builder = $this->builder();
$builder->where('id', $id);
$query = $builder->get(1);
if ($query) return $query->getRow();
}
}

9
app/Models/BestLapsModel.php Normal file
View file

@ -0,0 +1,9 @@
<?php
namespace App\Models;
use App\Models\BaseModel;
class BestLapsModel extends BaseModel
{
protected $table = 'bests_laps';
protected $allowedFields = ['race_id', 'lap_id', 'track_id', 'car_cat', 'car_id', 'laptime', 'user_id', 'setup'];
}

35
export_best_laps.sql Normal file
View file

@ -0,0 +1,35 @@
CREATE TABLE `bests_laps` (
`race_id` INT(11) NOT NULL,
`lap_id` INT(11) NOT NULL,
`track_id` VARCHAR(20) NOT NULL,
`car_cat` VARCHAR(100) NOT NULL,
`car_id` VARCHAR(50) NOT NULL,
`laptime` DOUBLE NOT NULL,
`user_id` INT(11) NOT NULL,
`setup` TEXT NULL DEFAULT NULL
)
ENGINE=InnoDB;
INSERT INTO bests_laps
SELECT
r2.id AS race_id,
l.id AS lap_id,
r2.track_id AS track_id,
cc.id AS car_cat,
r2.car_id AS car_id,
l.laptime AS laptime,
r2.user_id AS user_id,
r2.setup AS setup
FROM laps l
INNER JOIN
(
SELECT l3.id, MIN(l3.laptime) AS bestlap
FROM laps l3
JOIN races r ON r.id = l3.race_id
GROUP BY l3.race_id
) l2
ON l2.id = l.id
INNER JOIN races r2 ON r2.id = l.race_id
INNER JOIN cars_cats cc ON cc.carID = r2.car_id
WHERE l2.bestlap = l.laptime
GROUP BY cc.id