diff --git a/modules/ticket/back/methods/boxing/getVideo.js b/modules/ticket/back/methods/boxing/getVideo.js index 8cecbad4d3..cdd46b2574 100644 --- a/modules/ticket/back/methods/boxing/getVideo.js +++ b/modules/ticket/back/methods/boxing/getVideo.js @@ -1,4 +1,3 @@ -const axios = require('axios'); const https = require('https'); module.exports = Self => { @@ -39,7 +38,6 @@ module.exports = Self => { const models = Self.app.models; const myOptions = {}; - console.log('getFile', filename); if (typeof options == 'object') Object.assign(myOptions, options); @@ -55,8 +53,7 @@ module.exports = Self => { JOIN packingSite ps ON ps.hostFk = h.id WHERE e.id = ?;`; const [expedition] = await models.Expedition.rawSql(query, [id]); - - const monitorId = '6Ou0D1bhBw'; // expedition.monitorId + const monitorId = expedition.monitorId; const videoUrl = `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${monitorId}/${filename}`; @@ -70,21 +67,19 @@ module.exports = Self => { port: 443, headers }; - console.log('shinobi.verdnatura.es' + videoUrl); return new Promise((resolve, reject) => { const req = https.request(httpOptions, shinobiRes => { - console.log('entry'); shinobiRes.pause(); res.writeHeader(shinobiRes.statusCode, shinobiRes.headers); shinobiRes.pipe(res); }); - req.on('error', error => { - console.error(error); + req.on('error', () => { + reject(); }); - req.on('end', res => { + req.on('end', () => { resolve(); }); req.end(); diff --git a/modules/ticket/back/methods/boxing/getVideoList.js b/modules/ticket/back/methods/boxing/getVideoList.js index 4e74f76ecd..be6d48c46b 100644 --- a/modules/ticket/back/methods/boxing/getVideoList.js +++ b/modules/ticket/back/methods/boxing/getVideoList.js @@ -1,5 +1,4 @@ const axios = require('axios'); -const https = require('https'); const models = require('vn-loopback/server/server').models; module.exports = Self => { @@ -49,9 +48,7 @@ module.exports = Self => { JOIN packingSite ps ON ps.hostFk = h.id WHERE e.id = ?;`; const [expedition] = await models.PackingSiteConfig.rawSql(query, [id]); - - const monitorId = '6Ou0D1bhBw'; - console.log(id, expedition); + console.log(expedition); if (!from && !expedition) return []; let start = new Date(expedition.created); let end = new Date(start.getTime() + (packingSiteConfig.avgBoxingTime * 1000)); @@ -63,8 +60,9 @@ module.exports = Self => { const offset = start.getTimezoneOffset(); start = new Date(start.getTime() - (offset * 60 * 1000)); end = new Date(end.getTime() - (offset * 60 * 1000)); - console.log(start, end); - const videoUrl = `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${monitorId}`; + + const videoUrl = + `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${expedition.monitorId}`; const timeUrl = `?start=${start.toISOString().split('.')[0]}&end=${end.toISOString().split('.')[0]}`; const url = `${packingSiteConfig.shinobiUrl}${videoUrl}${timeUrl}`; @@ -73,7 +71,6 @@ module.exports = Self => { try { response = await axios.get(url); } catch (e) { - console.log(e); return []; } return response.data.videos.map(video => video.filename); diff --git a/modules/ticket/front/boxing/index.html b/modules/ticket/front/boxing/index.html index 17b2b475ae..7fb3b870e0 100644 --- a/modules/ticket/front/boxing/index.html +++ b/modules/ticket/front/boxing/index.html @@ -1,5 +1,2 @@ -