From db06626675a93b2da808c92f36e4dcc9c0ae14ec Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 29 Jun 2020 14:26:27 +0200
Subject: [PATCH] refactor

---
 db/Dockerfile                                  |  4 ++--
 db/docker.js                                   |  5 ++---
 modules/item/back/models/item.json             |  3 ---
 .../methods/sale/specs/updatePrice.spec.js     |  5 +++++
 .../worker-mana/getCurrentWorkerMana.js        | 18 +++++++++---------
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/db/Dockerfile b/db/Dockerfile
index c376e6893b..60e25319f3 100644
--- a/db/Dockerfile
+++ b/db/Dockerfile
@@ -35,5 +35,5 @@ ENTRYPOINT ["docker-start.sh"]
 
 CMD ["mysqld"]
 
-#HEALTHCHECK --interval=5s --timeout=10s --retries=200 \
-#    CMD mysqladmin ping -h 127.0.0.1 -u root || exit 1
+HEALTHCHECK --interval=5s --timeout=10s --retries=200 \
+    CMD mysqladmin ping -h 127.0.0.1 -u root || exit 1
diff --git a/db/docker.js b/db/docker.js
index 0a221a0be0..0cb912be65 100644
--- a/db/docker.js
+++ b/db/docker.js
@@ -39,8 +39,7 @@ module.exports = class Docker {
 
         let runChown = process.platform != 'linux';
 
-        const healthCheck = `--health-cmd='mysqladmin ping --silent'`;
-        const container = await this.execP(`docker run ${healthCheck} --env RUN_CHOWN=${runChown} -d ${dockerArgs} salix-db`);
+        const container = await this.execP(`docker run --env RUN_CHOWN=${runChown} -d ${dockerArgs} salix-db`);
         this.id = container.stdout;
 
         try {
@@ -54,7 +53,7 @@ module.exports = class Docker {
                 this.dbConf.port = netSettings.Ports['3306/tcp'][0]['HostPort'];
             }
 
-            if (runChown) await this.wait();
+            await this.waitForHealthy();
         } catch (err) {
             if (this.isRandom)
                 await this.rm();
diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json
index 6198fe7026..5d2e47d2a3 100644
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@@ -122,9 +122,6 @@
             "mysql": {
                 "columnName": "expenceFk"
             }
-        },
-        "compression": {
-            "type": "Number"
         }
     },
     "relations": {
diff --git a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
index 2ca2667693..c4a0127ac2 100644
--- a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
+++ b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
@@ -66,6 +66,11 @@ describe('sale updatePrice()', () => {
         let saleUpdated = await app.models.Sale.findById(saleId);
         createdSaleComponent = await app.models.SaleComponent.findOne({where: {saleFk: saleId, componentFk: manaComponentId}});
 
+        console.log(manaComponentId);
+        console.log(saleId);
+        console.log(saleUpdated);
+        console.log(createdSaleComponent);
+
         expect(saleUpdated.price).toBe(price);
         expect(createdSaleComponent.value).toEqual(-2.04);
     });
diff --git a/modules/worker/back/methods/worker-mana/getCurrentWorkerMana.js b/modules/worker/back/methods/worker-mana/getCurrentWorkerMana.js
index 7be2312e60..03973057d6 100644
--- a/modules/worker/back/methods/worker-mana/getCurrentWorkerMana.js
+++ b/modules/worker/back/methods/worker-mana/getCurrentWorkerMana.js
@@ -14,16 +14,16 @@ module.exports = Self => {
     });
 
     Self.getCurrentWorkerMana = async ctx => {
-        let currentClientId = ctx.req.accessToken.userId;
-        let currentWorker = await Self.app.models.Worker.findOne({
-            where: {userFk: currentClientId},
-            fields: 'id'
-        });
-        let currentWorkerMana = await Self.app.models.WorkerMana.findOne({
-            where: {workerFk: currentWorker.id},
+        let userId = ctx.req.accessToken.userId;
+
+        console.log(userId);
+        let workerMana = await Self.app.models.WorkerMana.findOne({
+            where: {workerFk: userId},
             fields: 'amount'
         });
-
-        return currentWorkerMana ? currentWorkerMana.amount : 0;
+        let workerMana1 = await Self.app.models.WorkerMana.find();
+        console.log(workerMana);
+        console.log(workerMana1);
+        return workerMana ? workerMana.amount : 0;
     };
 };