From 470b4485d59abf4ddcc216986ac233f97af5ebe8 Mon Sep 17 00:00:00 2001 From: Pau Navarro Date: Tue, 18 Oct 2022 12:58:44 +0200 Subject: [PATCH] Fixed test and DB structure --- .../00-defaultSupplierActivityFk_to_Null.sql | 1 - .../10491-august/00-supplierActivityFk_Allow_Null.sql | 2 +- modules/supplier/back/methods/supplier/newSupplier.js | 1 + .../back/methods/supplier/specs/newSupplier.spec.js | 9 +++++++++ 4 files changed, 11 insertions(+), 2 deletions(-) delete mode 100644 db/changes/10491-august/00-defaultSupplierActivityFk_to_Null.sql diff --git a/db/changes/10491-august/00-defaultSupplierActivityFk_to_Null.sql b/db/changes/10491-august/00-defaultSupplierActivityFk_to_Null.sql deleted file mode 100644 index 1fc4e29058..0000000000 --- a/db/changes/10491-august/00-defaultSupplierActivityFk_to_Null.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE vn.supplier MODIFY COLUMN supplierActivityFk varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL; diff --git a/db/changes/10491-august/00-supplierActivityFk_Allow_Null.sql b/db/changes/10491-august/00-supplierActivityFk_Allow_Null.sql index 6f4cdcc398..1fc4e29058 100644 --- a/db/changes/10491-august/00-supplierActivityFk_Allow_Null.sql +++ b/db/changes/10491-august/00-supplierActivityFk_Allow_Null.sql @@ -1 +1 @@ -ALTER TABLE vn.supplier MODIFY COLUMN supplierActivityFk varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT 'flowersPlants' NULL; +ALTER TABLE vn.supplier MODIFY COLUMN supplierActivityFk varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL; diff --git a/modules/supplier/back/methods/supplier/newSupplier.js b/modules/supplier/back/methods/supplier/newSupplier.js index 0395e982bf..6206eaf1c3 100644 --- a/modules/supplier/back/methods/supplier/newSupplier.js +++ b/modules/supplier/back/methods/supplier/newSupplier.js @@ -41,6 +41,7 @@ module.exports = Self => { }; } catch (e) { if (tx) await tx.rollback(); + return params; } }; }; diff --git a/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js b/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js index b252c4d60e..8bf2713487 100644 --- a/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js +++ b/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js @@ -1,11 +1,20 @@ const app = require('vn-loopback/server/server'); +const LoopBackContext = require('loopback-context'); describe('Supplier newSupplier()', () => { const newSupp = { name: 'TestSupplier-1' }; + const administrativeId = 5; it('should create a new supplier containing only the name', async() => { + const activeCtx = { + accessToken: {userId: administrativeId}, + }; + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx + }); + let result = await app.models.Supplier.newSupplier(JSON.stringify(newSupp)); result = result.supplier;