Removed all legacy SQL queries from api.js
parent
7a11f51cd8
commit
fae5da0623
|
@ -191,6 +191,13 @@ async function getDrives(dongleId, includeDeleted, includeMeta) {
|
||||||
return orm.models.drives.findAll(query);
|
return orm.models.drives.findAll(query);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function getDrive(dongleId, identifier) {
|
||||||
|
const drive = orm.models.drives.findOne({ where: { identifier, dongle_id: dongleId } });
|
||||||
|
|
||||||
|
if (drive.dataValues) return drive.dataValues;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
async function getDriveFromidentifier(dongleId, identifier) {
|
async function getDriveFromidentifier(dongleId, identifier) {
|
||||||
console.log('WAAAA', dongleId);
|
console.log('WAAAA', dongleId);
|
||||||
return orm.models.drives.findAll({ where: { dongle_id: dongleId, identifier } });
|
return orm.models.drives.findAll({ where: { dongle_id: dongleId, identifier } });
|
||||||
|
@ -335,6 +342,7 @@ module.exports = {
|
||||||
|
|
||||||
// drive stuff, move maybe?
|
// drive stuff, move maybe?
|
||||||
getDrives,
|
getDrives,
|
||||||
|
getDrive,
|
||||||
getBootlogs,
|
getBootlogs,
|
||||||
getCrashlogs,
|
getCrashlogs,
|
||||||
getDriveFromidentifier,
|
getDriveFromidentifier,
|
||||||
|
|
|
@ -19,15 +19,6 @@ function runAsyncWrapper(callback) {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
let models;
|
|
||||||
|
|
||||||
async function dbConnect() {
|
|
||||||
models = await require('../models/index')();
|
|
||||||
}
|
|
||||||
|
|
||||||
dbConnect();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// DRIVE & BOOT/CRASH LOG FILE UPLOAD HANDLING
|
// DRIVE & BOOT/CRASH LOG FILE UPLOAD HANDLING
|
||||||
router.put('/backend/post_upload', bodyParser.raw({
|
router.put('/backend/post_upload', bodyParser.raw({
|
||||||
|
@ -320,19 +311,6 @@ async function upload(req, res) {
|
||||||
|
|
||||||
const driveSegment = await driveController.getDriveSegment(dongleId, driveName, segment);
|
const driveSegment = await driveController.getDriveSegment(dongleId, driveName, segment);
|
||||||
if (driveSegment == null) {
|
if (driveSegment == null) {
|
||||||
await models.run(
|
|
||||||
'INSERT INTO drive_segments (segment_id, drive_identifier, dongle_id, duration, distance_meters, upload_complete, is_processed, is_stalled, created) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)',
|
|
||||||
segment,
|
|
||||||
driveName,
|
|
||||||
dongleId,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
false,
|
|
||||||
false,
|
|
||||||
false,
|
|
||||||
Date.now(),
|
|
||||||
).catch((err) => {logger.warn("344", err)})
|
|
||||||
|
|
||||||
await deviceController.updateOrCreateDriveSegment(dongleId, driveName, segment, {
|
await deviceController.updateOrCreateDriveSegment(dongleId, driveName, segment, {
|
||||||
duration: 0,
|
duration: 0,
|
||||||
distance_meters: 0,
|
distance_meters: 0,
|
||||||
|
@ -394,7 +372,7 @@ router.post('/v2/pilotauth/', bodyParser.urlencoded({ extended: true }), async (
|
||||||
// eslint-disable-next-line no-constant-condition
|
// eslint-disable-next-line no-constant-condition
|
||||||
while (true) {
|
while (true) {
|
||||||
const dongleId = crypto.randomBytes(4).toString('hex');
|
const dongleId = crypto.randomBytes(4).toString('hex');
|
||||||
const isDongleIdTaken = await models.get('SELECT * FROM devices WHERE serial = ?', serial);
|
const isDongleIdTaken = await deviceController.getDeviceFromDongle(dongleId);
|
||||||
if (isDongleIdTaken == null) {
|
if (isDongleIdTaken == null) {
|
||||||
await deviceController.createDongle(dongleId, 0, imei1, serial, publicKey)
|
await deviceController.createDongle(dongleId, 0, imei1, serial, publicKey)
|
||||||
|
|
||||||
|
@ -421,7 +399,8 @@ router.get('/useradmin/cabana_drive/:extendedRouteIdentifier', runAsyncWrapper(a
|
||||||
const driveIdentifier = params[2];
|
const driveIdentifier = params[2];
|
||||||
const driveIdentifierHashReq = params[3];
|
const driveIdentifierHashReq = params[3];
|
||||||
|
|
||||||
const drive = await models.get('SELECT * FROM drives WHERE identifier = ? AND dongle_id = ?', driveIdentifier, dongleId);
|
const drive = await deviceController.getDrive(dongleId, driveIdentifier)
|
||||||
|
|
||||||
if (!drive) {
|
if (!drive) {
|
||||||
return res.status(200).json({ status: 'drive not found' });
|
return res.status(200).json({ status: 'drive not found' });
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue