dancingCycle
/
pg-rest-api
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: update

This commit is contained in:
dancingCycle 2023-11-08 00:00:26 +01:00
parent 4ae1fa270a
commit 2995cbfdc3
5 changed files with 60 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/route/routes-by-agency-id.js
View File

@ -1,14 +1,14 @@
const debug=require('debug')('debug');
const express = require('express');
const router = express.Router();
const routeCount = require('../service/routes-by-agency-id');
const routesByAgencyId = require('../service/routes-by-agency-id');
const utils=require('../utils');
router.get('/', async function(req, res, next) {
//debug('routes-by-agency-id start...');
try {
res.json(await routeCount.get(req.query.agencyid));
res.json(await routesByAgencyId.get(req.query.agencyid));
} catch (err) {
console.error(`Error while getting route count, msg: `, err.message);
console.error(`Error while getting routes-by-agency-id, msg: `, err.message);
res.status(err.statusCode || 500).json(utils.MSGS.error);
}
//debug('routes-by-agency-id done.');

2
app/route/trip-count.js
View File

@ -11,7 +11,7 @@ ROUTER.get('/', async function(req, res, next) {
try {
res.json(await TRIPCOUNT.getTripCount(req.query.agencyid));
} catch (err) {
console.error(`Error while getting route count, msg: `, err.message);
console.error(`Error while getting trip count, msg: `, err.message);
res.status(err.statusCode || 500).json(UTILS.MSGS.error);
}
});

20
app/service/agency-all.js
View File

@ -1,13 +1,21 @@
const debug=require('debug')('debug');
const db = require('./db');
const helper = require('../helper');
const config = require('../config');
require('dotenv').config();
async function get() {
//debug('agency-all start...');
const DATA = await db.query(
'SELECT * FROM agency');
//debug('DATA length: '+DATA.length);
//debug('agency-all done.');
debug('agency-all start...');
const schema = process.env.DB_SCHEMA || 'schema';
debug('agency-all schema: ' + schema );
const query = 'SELECT * FROM ' + schema + '.agency';
debug('agency-all query: ' + query );
const DATA = await db.query( query );
debug('DATA length: '+DATA.length);
debug('agency-all done.');
return DATA;
}
module.exports = {

24
app/service/route-count.js
View File

@ -1,14 +1,22 @@
const debug=require('debug')('debug');
const db = require('./db');
require('dotenv').config();
async function get(agencyId = 0) {
//debug('route-count start...');
//debug('agencyId: '+agencyId);
const QUERY=`SELECT routes.route_id FROM routes WHERE agency_id='${agencyId}';`
//debug('QUERY: '+QUERY);
const res=await db.query(QUERY);
const len=res.length
//debug('route-count len: '+len);
//debug('route-count done.');
debug('route-count start...');
debug('agencyId: '+agencyId);
const schema = process.env.DB_SCHEMA || 'schema';
debug('agency-all schema: ' + schema );
const query=`SELECT routes.route_id FROM ` + schema + `.routes WHERE agency_id='${agencyId}';`
debug('query: '+query);
const res = await db.query( query );
const len = res.length
debug('route-count len: ' + len );
debug('route-count done.');
return len;
}

43
app/service/trip-count.js
View File

@ -1,47 +1,56 @@
const DEBUG=require('debug')('trip-count');
DEBUG('trip-count start...');
const debug=require('debug')('trip-count');
const db = require('./db');
require('dotenv').config();
async function getTripCount(agencyid = 0) {
DEBUG('agencyid: '+agencyid);
const QUERY=`SELECT route_id FROM routes WHERE agency_id='${agencyid}';`
//DEBUG('QUERY: '+QUERY);
debug('trip-count start...');
debug('agencyid: '+agencyid);
const schema = process.env.DB_SCHEMA || 'schema';
debug('agency-all schema: ' + schema );
const QUERY=`SELECT route_id FROM ` + schema + `.routes WHERE agency_id='${agencyid}';`
debug('QUERY: '+QUERY);
const res=await db.query(QUERY);
let tripsCount=0;
if(res){
const len=res.length
//DEBUG('len: '+len);
debug('len: '+len);
for(var i=0;i<len;i++){
//DEBUG('i: '+i);
debug('i: '+i);
const objRouteId=res[i];
//DEBUG('objRouteId: '+JSON.stringify(objRouteId));
debug('objRouteId: '+JSON.stringify(objRouteId));
const routeId=objRouteId.route_id;
//DEBUG('routeId: '+routeId);
const QUERY_TRIPS=`SELECT trip_id FROM trips WHERE route_id='${routeId}';`
//DEBUG('QUERY_TRIPS: '+QUERY_TRIPS);
debug('routeId: '+routeId);
const QUERY_TRIPS=`SELECT trip_id FROM ` + schema + `.trips WHERE route_id='${routeId}';`
debug('QUERY_TRIPS: '+QUERY_TRIPS);
const resTrips=await db.query(QUERY_TRIPS);
if(resTrips){
const lenTrips=resTrips.length;
//DEBUG('lenTrips: '+lenTrips);
debug('lenTrips: '+lenTrips);
tripsCount+=lenTrips;
//DEBUG('tripsCount: '+tripsCount);
debug('tripsCount: '+tripsCount);
}else{
//DEBUG('resTrips NOT available');
debug('resTrips NOT available');
}
};
}else{
//DEBUG('res NOT available');
debug('res NOT available');
}
/*TODO Does it matter if you return a variable or object?
let objLen={};
objLen["len"]=len;
return objLen;
*/
debug('trip-count done.');
return tripsCount;
}
module.exports = {
getTripCount
}
DEBUG('trip-count done.');