Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

back/methods/edi/updateData.js

@@ -20,7 +20,11 @@ module.exports = Self => {
         const models = Self.app.models;
 
         // Get files checksum
-        const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig');
+        const tx = await Self.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig', null, options);
 
             const updatableFiles = [];
             for (const file of files) {
@@ -51,13 +55,11 @@ module.exports = Self => {
             const tables = await Self.rawSql(`
                 SELECT fileName, toTable, file
                     FROM edi.tableConfig
-            WHERE file IN (?)`, [fileNames]);
+                WHERE file IN (?)`, [fileNames], options);
 
             for (const table of tables) {
                 const fileName = table.file;
 
-            console.debug(`Downloading file ${fileName}...`);
-
                 remoteFile = `codes/${fileName}.ZIP`;
                 tempDir = `${tempPath}/${fileName}`;
                 tempFile = `${tempPath}/${fileName}.zip`;
@@ -66,30 +68,34 @@ module.exports = Self => {
                     await fs.readFile(tempFile);
                 } catch (error) {
                     if (error.code === 'ENOENT') {
+                        console.debug(`Downloading file ${fileName}...`);
                         const downloadOutput = await downloadFile(remoteFile, tempFile);
                         if (downloadOutput.error)
                             continue;
                     }
                 }
 
-            console.debug(`Extracting file ${fileName}...`);
+                await extractFile(fileName, tempFile, tempDir);
-            await extractFile(tempFile, tempDir);
 
                 console.debug(`Updating table ${table.toTable}...`);
-            await dumpData(tempDir, table);
+                await dumpData(tempDir, table, options);
             }
 
             // Update files checksum
             for (const file of updatableFiles) {
+                console.log(`Updating file ${file.name} checksum...`);
                 await Self.rawSql(`
                         UPDATE edi.fileConfig
                             SET checksum = ?
                         WHERE name = ?`,
-            [file.checksum, file.name]);
+                [file.checksum, file.name], options);
             }
 
+            await tx.commit();
+
             // Clean files
             try {
+                console.debug(`Cleaning files...`);
                 await fs.remove(tempPath);
             } catch (error) {
                 if (error.code !== 'ENOENT')
@@ -97,6 +103,10 @@ module.exports = Self => {
             }
 
             return true;
+        } catch (error) {
+            await tx.rollback();
+            throw error;
+        }
     };
 
     let ftpClient;
@@ -126,9 +136,9 @@ module.exports = Self => {
 
         const response = await new Promise((resolve, reject) => {
             ftpClient.exec((err, response) => {
-                if (response.error) {
+                if (err || response.error) {
                     console.debug(`Error downloading checksum file... ${response.error}`);
-                    reject(err);
+                    return reject(err);
                 }
 
                 resolve(response);
@@ -159,9 +169,9 @@ module.exports = Self => {
 
         return new Promise((resolve, reject) => {
             ftpClient.exec((err, response) => {
-                if (response.error) {
+                if (err || response.error) {
                     console.debug(`Error downloading file... ${response.error}`);
-                    reject(err);
+                    return reject(err);
                 }
 
                 resolve(response);
@@ -169,11 +179,12 @@ module.exports = Self => {
         });
     }
 
-    async function extractFile(tempFile, tempDir) {
+    async function extractFile(fileName, tempFile, tempDir) {
         const JSZip = require('jszip');
 
         try {
             await fs.mkdir(tempDir);
+            console.debug(`Extracting file ${fileName}...`);
         } catch (error) {
             if (error.code !== 'EEXIST')
                 throw e;
@@ -196,42 +207,13 @@ module.exports = Self => {
         }
     }
 
-    async function dumpData(tempDir, table) {
+    async function dumpData(tempDir, table, options) {
         const toTable = table.toTable;
         const baseName = table.fileName;
 
-        const firstEntry = entries[0];
+        console.log(`Emptying table ${toTable}...`);
-        const entryName = firstEntry.entryName;
-        const startIndex = (entryName.length - 10);
-        const endIndex = (entryName.length - 4);
-        const dateString = entryName.substring(startIndex, endIndex);
-
-        const lastUpdated = new Date();
-
-        let updated = null;
-        if (file.updated) {
-            updated = new Date(file.updated);
-            updated.setHours(0, 0, 0, 0);
-        }
-
-        // Format string date to a date object
-        lastUpdated.setFullYear(`20${dateString.substring(4, 6)}`);
-        lastUpdated.setMonth(parseInt(dateString.substring(2, 4)) - 1);
-        lastUpdated.setDate(dateString.substring(0, 2));
-        lastUpdated.setHours(0, 0, 0, 0);
-
-        if (updated && lastUpdated <= updated) {
-            console.debug(`Table ${toTable} already updated, skipping...`);
-            return;
-        }
-
-        const tx = await Self.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
-
         const tableName = `edi.${toTable}`;
-            await Self.rawSql(`DELETE FROM ??`, [tableName], options);
+        await Self.rawSql(`DELETE FROM ??`, [tableName]);
 
         const dirFiles = await fs.readdir(tempDir);
         const files = dirFiles.filter(file => file.startsWith(baseName));
@@ -251,11 +233,6 @@ module.exports = Self => {
                 `, [new Date(), baseName], options);
         }
 
-            tx.commit();
-        } catch (error) {
-            tx.rollback();
-            throw error;
-        }
         console.log(`Updated table ${toTable}\n`);
     }
 };

front/core/components/smart-table/index.html

@@ -40,7 +40,8 @@
                 </vn-button>
             </div>
             <vn-button icon="refresh"
-                ng-click="$ctrl.model.refresh()"
+                ng-click="$ctrl.refresh()"
+                disabled="$ctrl.isRefreshing"
                 vn-tooltip="Refresh">
             </vn-button>
         </div>

front/core/components/smart-table/index.js

@@ -511,6 +511,12 @@ export default class SmartTable extends Component {
         return this.model.save()
             .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
     }
+
+    refresh() {
+        this.isRefreshing = true;
+        this.model.refresh()
+            .then(() => this.isRefreshing = false);
+    }
 }
 
 SmartTable.$inject = ['$element', '$scope', '$transclude'];

modules/monitor/back/methods/sales-monitor/salesFilter.js

@@ -164,6 +164,10 @@ module.exports = Self => {
         let stmt;
 
         stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.filter');
+
+        stmts.push(`SET @_optimizer_search_depth = @@optimizer_search_depth`);
+        stmts.push(`SET SESSION optimizer_search_depth = 0`);
+
         stmt = new ParameterizedSQL(
             `CREATE TEMPORARY TABLE tmp.filter
                 (PRIMARY KEY (id))
@@ -207,7 +211,7 @@ module.exports = Self => {
                         LEFT JOIN province p ON p.id = a.provinceFk
                         LEFT JOIN warehouse w ON w.id = t.warehouseFk
                         LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
-                        LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+                        STRAIGHT_JOIN ticketState ts ON ts.ticketFk = t.id
                         LEFT JOIN state st ON st.id = ts.stateFk
                         LEFT JOIN client c ON c.id = t.clientFk
                         LEFT JOIN worker wk ON wk.id = c.salesPersonFk
@@ -224,6 +228,8 @@ module.exports = Self => {
         stmt.merge(conn.makeWhere(filter.where));
         stmts.push(stmt);
 
+        stmts.push(`SET SESSION optimizer_search_depth = @_optimizer_search_depth`);
+
         // Get client debt balance
         stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt');
         stmts.push(`

modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js

@@ -147,16 +147,12 @@ describe('SalesMonitor salesFilter()', () => {
             const options = {transaction: tx};
 
             const ctx = {req: {accessToken: {userId: 9}}, args: {pending: false}};
-            const filter = {};
+            const filter = {order: 'alertLevel ASC'};
             const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
             const firstRow = result[0];
-            const secondRow = result[1];
-            const thirdRow = result[2];
 
             expect(result.length).toEqual(12);
-            expect(firstRow.state).toEqual('Entregado');
+            expect(firstRow.alertLevel).not.toEqual(0);
-            expect(secondRow.state).toEqual('Entregado');
-            expect(thirdRow.state).toEqual('Entregado');
 
             await tx.rollback();
         } catch (e) {

print/templates/reports/invoice/sql/taxes.sql

@@ -7,6 +7,5 @@ SELECT
         JOIN pgc ON pgc.code = iot.pgcFk
         LEFT JOIN pgcEqu pe ON pe.equFk = pgc.code
         JOIN invoiceOut io ON io.id = iot.invoiceOutFk
-        LEFT JOIN ticket t ON t.refFk = io.ref
+    WHERE io.ref = ?
-    WHERE t.refFk = ?
     ORDER BY iot.id