From aa4c50bc7cbe16cce9104aadd15be60eb062f8ee Mon Sep 17 00:00:00 2001 From: eithan Date: Thu, 14 Jan 2021 19:16:45 -0600 Subject: [PATCH] obtener carpetas, carpetas duplicadas y alumnos sin carpeta de la db --- package-lock.json | 12 ++++---- package.json | 2 +- server/db/carpetasDrive.js | 63 ++++++++++++++++++++++++++++++++++++++ server/helper/drive.js | 1 + 4 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 server/db/carpetasDrive.js diff --git a/package-lock.json b/package-lock.json index c29165f..2733baa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -205,9 +205,9 @@ "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==" }, "axios": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz", - "integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", "requires": { "follow-redirects": "^1.10.0" } @@ -828,9 +828,9 @@ } }, "follow-redirects": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz", - "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==" + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz", + "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==" }, "forwarded": { "version": "0.1.2", diff --git a/package.json b/package.json index 30a8c17..1d3d36a 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "author": "cidwa", "license": "ISC", "dependencies": { - "axios": "^0.21.0", + "axios": "^0.21.1", "bcrypt": "^5.0.0", "body-parser": "^1.19.0", "colors": "^1.4.0", diff --git a/server/db/carpetasDrive.js b/server/db/carpetasDrive.js new file mode 100644 index 0000000..0c61b83 --- /dev/null +++ b/server/db/carpetasDrive.js @@ -0,0 +1,63 @@ +const drive = require ("../helper/drive") +const Servicio = require('../db/tablas/Servicio'); +const Usuario = require('../db/tablas/Usuario'); + +const getCarpetas = async ()=>{ + let listado = await drive.list() + let carpetas =[] + let noBorrar ='Babyhelon' + + for(let i = 0 ; i < listado.length; i++){ + if (listado[i].mimeType == 'application/vnd.google-apps.folder') + carpetas.push( listado[i]) + } + carpetas = carpetas.filter(item => item.name !== noBorrar) + return carpetas +} + +const duplicados = () =>{ + getCarpetas().then((carpetas)=>{ + + const duplicados=[] + const tempArray = [...carpetas].sort(); + + for (let i = 0; i < tempArray.length -1; i++) { + if (tempArray[i + 1].name === tempArray[i].name) { + duplicados.push(tempArray[i]); + } + else{ + if(i!=0 && tempArray[i-1].name === tempArray[i].name){ + duplicados.push(tempArray[i]); + } + } + } + + console.log(duplicados) + return duplicados + + }) +} + + +const getAlumnosNull = async () => { + return Servicio.findAll({ + where:{carpeta:null}, + include: [ + { model: Usuario }, + ], + }) + .then((res)=>{ + const alumnosNull =[] + console.log("servicios con carpeta null = " + res.length ) + + for(let i= 0 ; i< res.length; i++){ + alumnosNull.push(res[i].Usuario.usuario) + } + return alumnosNull + }); +} + + +duplicados() +getAlumnosNull() + diff --git a/server/helper/drive.js b/server/helper/drive.js index d5519d8..e9baebc 100644 --- a/server/helper/drive.js +++ b/server/helper/drive.js @@ -151,4 +151,5 @@ const borrarTodo = () => { module.exports = { folder, uploadFile, + list };