fix(db): fix the triggers.sql, admin.sql, procedures.sql and correct …

…the sql to load debtors and cre

this commit fix the problem of joinning in the entity_map table

server/controllers/finance/creditors.js

@@ -28,7 +28,7 @@ function list(req, res, next) {
     FROM creditor AS c 
     JOIN creditor_group AS cg 
     JOIN account AS a ON c.group_uuid = cg.uuid AND cg.account_id = a.id 
-    LEFT JOIN entity_map map ON map.uuid = c.uuid;
+    JOIN entity_map map ON map.uuid = c.uuid;
   `;
 
   db.exec(sql)

server/controllers/finance/debtors/index.js

@@ -37,7 +37,7 @@ function list(req, res, next) {
     SELECT BUID(d.uuid) AS uuid, BUID(d.group_uuid) AS group_uuid,
       d.text, map.text as hr_entity
     FROM debtor d 
-    LEFT JOIN entity_map map ON map.uuid = d.uuid;
+    JOIN entity_map map ON map.uuid = d.uuid;
   `;
 
   db.exec(sql)

server/models/admin.sql

@@ -9,11 +9,7 @@ DELIMITER $$
 CREATE PROCEDURE zRecomputeEntityMap()
 BEGIN
   DELETE FROM entity_map;
-
-  -- employee
-  INSERT INTO entity_map
-    SELECT employee.debtor_uuid, CONCAT_WS('.', 'EM', employee.id) FROM employee;
-
+
   -- patient
   INSERT INTO entity_map
     SELECT patient.uuid, CONCAT_WS('.', 'PA', project.abbr, patient.reference)

server/models/procedures.sql

@@ -1218,8 +1218,6 @@ CREATE PROCEDURE MergeLocations(
 
   UPDATE debtor_group SET location_id = afterUuid WHERE location_id = beforeUuid;
 
-  UPDATE employee SET location_id = afterUuid WHERE location_id = beforeUuid;
-
   UPDATE enterprise SET location_id = afterUuid WHERE location_id = beforeUuid;
 
   -- delete the beforeUuid village and leave the afterUuid village.

server/models/triggers.sql

@@ -13,7 +13,7 @@ FOR EACH ROW BEGIN
   INSERT INTO entity_map
     SELECT new.uuid, CONCAT_WS('.', 'PA', project.abbr, new.reference) FROM project where project.id = new.project_id;
 
-  -- debtor entity reference removed to allow for reverse lookups - if debot
+  -- debtor entity reference removed to allow for reverse lookups - if debit
   -- entity is refined this can point directly to the debtor
 
   -- this writes a debtor entity into the entity_map table
@@ -80,7 +80,7 @@ FOR EACH ROW BEGIN
 
   -- Since employees do not have UUIDs or project associations, we create their mapping by simply concatenating
   -- the id with a prefix like this: E.{{employee.id}}.
-  INSERT INTO entity_map SELECT new.debtor_uuid, CONCAT_WS('.', 'EM', new.id);
+  INSERT INTO entity_map SELECT new.creditor_uuid, CONCAT_WS('.', 'EM', new.id);
 END$$
 
 

test/integration/debtors.js

@@ -52,7 +52,7 @@ describe('(/debtors) The /debtors API', function () {
   it('GET /debtors should return a list of all debtors', function () {
     return agent.get('/debtors')
       .then(function (res) {
-        helpers.api.listed(res, 3);
+        helpers.api.listed(res, 2);
       })
       .catch(helpers.handler);
   });