@fdm-monster/server 1.8.3 → 1.9.0-rc1

package/dist/services/mongoose/floor.service.js

@@ -14,10 +14,8 @@ const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 const _floorservicevalidation = require("../validators/floor-service.validation");
 class FloorService {
     printerCache;
-    logger;
-    constructor({ printerCache, loggerFactory }){
+    constructor(printerCache){
         this.printerCache = printerCache;
-        this.logger = loggerFactory(FloorService.name);
     }
     toDto(floor) {
         return {
@@ -27,23 +25,19 @@ class FloorService {
             printers: floor.printers?.map((p)=>({
                     x: p.x,
                     y: p.y,
-                    printerId: p.printerId.toString(),
+                    printerId: p.printerId,
                     floorId: floor.id
                 }))
         };
     }
-    async list(patchPositions = true) {
-        const floors = await _Floor.Floor.find({});
-        if (!patchPositions) {
-            return floors;
-        }
-        return floors;
+    async list() {
+        return _Floor.Floor.find({});
     }
-    async get(floorId, throwError = true) {
+    async get(floorId) {
         const floor = await _Floor.Floor.findOne({
             _id: floorId
         });
-        if (!floor && throwError) {
+        if (!floor) {
             throw new _runtimeexceptions.NotFoundException(`Floor with provided id does not exist`);
         }
         return floor;
@@ -51,34 +45,46 @@ class FloorService {
     async createDefaultFloor() {
         return await this.create({
             name: "Default Floor",
-            floor: 1
+            floor: 1,
+            printers: []
         });
     }
     async create(floor) {
-        const validatedInput = await (0, _validators.validateInput)(floor, _floorservicevalidation.createFloorRules);
+        const validatedInput = await (0, _validators.validateInput)(floor, (0, _floorservicevalidation.createOrUpdateFloorSchema)(false));
         return _Floor.Floor.create(validatedInput);
     }
-    async update(floorId, input) {
+    async update(floorId, update) {
         const existingFloor = await this.get(floorId);
-        const { name, floor, printers } = await (0, _validators.validateInput)(input, _floorservicevalidation.updateFloorRules);
-        existingFloor.name = name;
-        existingFloor.floor = floor;
-        existingFloor.printers = printers;
+        if (update.printers) {
+            for (const position of update.printers){
+                position.floorId = existingFloor.id;
+            }
+        }
+        const floorUpdate = {
+            ...existingFloor,
+            name: update.name,
+            printers: update.printers,
+            floor: update.floor
+        };
+        const input = await (0, _validators.validateInput)(floorUpdate, (0, _floorservicevalidation.createOrUpdateFloorSchema)(false));
+        existingFloor.name = input.name;
+        existingFloor.floor = input.floor;
+        existingFloor.printers = input.printers;
         return await existingFloor.save();
     }
     async updateName(floorId, floorName) {
-        const floor = await this.get(floorId);
         const { name } = await (0, _validators.validateInput)({
             name: floorName
-        }, _floorservicevalidation.updateFloorNameRules);
+        }, _floorservicevalidation.updateFloorNameSchema);
+        const floor = await this.get(floorId);
         floor.name = name;
         return await floor.save();
     }
     async updateLevel(floorId, level) {
-        const floor = await this.get(floorId);
         const { floor: validLevel } = await (0, _validators.validateInput)({
             floor: level
-        }, _floorservicevalidation.updateFloorNumberRules);
+        }, _floorservicevalidation.updateFloorLevelSchema);
+        const floor = await this.get(floorId);
         floor.floor = validLevel;
         return await floor.save();
     }
@@ -96,10 +102,11 @@ class FloorService {
         });
     }
     async addOrUpdatePrinter(floorId, updatedPosition) {
-        const floor = await this.get(floorId, true);
-        const validInput = await (0, _validators.validateInput)(updatedPosition, (0, _floorservicevalidation.printerInFloorRules)(false));
+        const floor = await this.get(floorId);
+        updatedPosition.floorId = floor.id;
+        const validInput = await (0, _validators.validateInput)(updatedPosition, (0, _floorservicevalidation.printerInFloorSchema)(false));
         await this.printerCache.getCachedPrinterOrThrowAsync(validInput.printerId);
-        floor.printers = floor.printers.filter((position)=>!(position.x === updatedPosition.x && position.y === updatedPosition.y));
+        floor.printers = floor.printers.filter((position)=>!(position.x === validInput.x && position.y === validInput.y));
         const positionIndex = floor.printers.findIndex((position)=>position.printerId.toString() === validInput.printerId.toString());
         if (positionIndex !== -1) {
             floor.printers[positionIndex] = validInput;
@@ -110,19 +117,19 @@ class FloorService {
         return floor;
     }
     async removePrinter(floorId, printerId) {
-        const floor = await this.get(floorId, true);
+        const floor = await this.get(floorId);
         const validInput = await (0, _validators.validateInput)({
             printerId
-        }, (0, _floorservicevalidation.removePrinterInFloorRules)(false));
+        }, (0, _floorservicevalidation.removePrinterInFloorSchema)(false));
         await this.printerCache.getCachedPrinterOrThrowAsync(validInput.printerId);
-        const foundPrinterInFloorIndex = floor.printers.findIndex((pif)=>pif.printerId.toString() === validInput.printerId);
+        const foundPrinterInFloorIndex = floor.printers.findIndex((pif)=>pif.printerId.toString() === validInput.printerId.toString());
         if (foundPrinterInFloorIndex === -1) return floor;
         floor.printers.splice(foundPrinterInFloorIndex, 1);
         await floor.save();
         return floor;
     }
     async delete(floorId) {
-        await this.get(floorId, true);
+        await this.get(floorId);
         await _Floor.Floor.deleteOne({
             _id: floorId
         });

package/dist/services/mongoose/floor.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/floor.service.ts"],"names":["FloorService","printerCache","logger","constructor","loggerFactory","name","toDto","floor","id","printers","map","p","x","y","printerId","toString","floorId","list","patchPositions","floors","Floor","find","get","throwError","findOne","_id","NotFoundException","createDefaultFloor","create","validatedInput","validateInput","createFloorRules","update","input","existingFloor","updateFloorRules","save","updateName","floorName","updateFloorNameRules","updateLevel","level","validLevel","updateFloorNumberRules","deletePrinterFromAnyFloor","updateMany","$pull","$in","addOrUpdatePrinter","updatedPosition","validInput","printerInFloorRules","getCachedPrinterOrThrowAsync","filter","position","positionIndex","findIndex","push","removePrinter","removePrinterInFloorRules","foundPrinterInFloorIndex","pif","splice","delete","deleteOne"],"mappings":";;;;+BAwBaA;;;eAAAA;;;uBAxBiB;4BACA;mCACI;wCAQ3B;AAcA,MAAMA;IACXC,aAA2B;IAC3BC,OAAsB;IAEtBC,YAAY,EAAEF,YAAY,EAAEG,aAAa,EAAiE,CAAE;QAC1G,IAAI,CAACH,YAAY,GAAGA;QACpB,IAAI,CAACC,MAAM,GAAGE,cAAcJ,aAAaK,IAAI;IAC/C;IAEAC,MAAMC,KAAa,EAAyB;QAC1C,OAAO;YACLC,IAAID,MAAMC,EAAE;YACZH,MAAME,MAAMF,IAAI;YAChBE,OAAOA,MAAMA,KAAK;YAClBE,UAAUF,MAAME,QAAQ,EAAEC,IAAI,CAACC,IAAO,CAAA;oBACpCC,GAAGD,EAAEC,CAAC;oBACNC,GAAGF,EAAEE,CAAC;oBACNC,WAAWH,EAAEG,SAAS,CAACC,QAAQ;oBAC/BC,SAAST,MAAMC,EAAE;gBACnB,CAAA;QACF;IACF;IAEA,MAAMS,KAAKC,iBAAiB,IAAI,EAAE;QAChC,MAAMC,SAAS,MAAMC,YAAK,CAACC,IAAI,CAAC,CAAC;QACjC,IAAI,CAACH,gBAAgB;YACnB,OAAOC;QACT;QAEA,OAAOA;IACT;IAEA,MAAMG,IAAIN,OAAoB,EAAEO,aAAa,IAAI,EAAE;QACjD,MAAMhB,QAAQ,MAAMa,YAAK,CAACI,OAAO,CAAC;YAAEC,KAAKT;QAAQ;QACjD,IAAI,CAACT,SAASgB,YAAY;YACxB,MAAM,IAAIG,oCAAiB,CAAC,CAAC,qCAAqC,CAAC;QACrE;QAEA,OAAOnB;IACT;IAEA,MAAMoB,qBAAqB;QACzB,OAAO,MAAM,IAAI,CAACC,MAAM,CAAC;YACvBvB,MAAM;YACNE,OAAO;QACT;IACF;IAKA,MAAMqB,OAAOrB,KAAkC,EAAE;QAC/C,MAAMsB,iBAAiB,MAAMC,IAAAA,yBAAa,EAACvB,OAAOwB,wCAAgB;QAClE,OAAOX,YAAK,CAACQ,MAAM,CAACC;IACtB;IAEA,MAAMG,OAAOhB,OAAoB,EAAEiB,KAAkC,EAAE;QACrE,MAAMC,gBAAgB,MAAM,IAAI,CAACZ,GAAG,CAACN;QACrC,MAAM,EAAEX,IAAI,EAAEE,KAAK,EAAEE,QAAQ,EAAE,GAAG,MAAMqB,IAAAA,yBAAa,EAACG,OAAOE,wCAAgB;QAC7ED,cAAc7B,IAAI,GAAGA;QACrB6B,cAAc3B,KAAK,GAAGA;QACtB2B,cAAczB,QAAQ,GAAGA;QACzB,OAAO,MAAMyB,cAAcE,IAAI;IACjC;IAEA,MAAMC,WAAWrB,OAAoB,EAAEsB,SAAiB,EAAE;QACxD,MAAM/B,QAAQ,MAAM,IAAI,CAACe,GAAG,CAACN;QAC7B,MAAM,EAAEX,IAAI,EAAE,GAAG,MAAMyB,IAAAA,yBAAa,EAAC;YAAEzB,MAAMiC;QAAU,GAAGC,4CAAoB;QAC9EhC,MAAMF,IAAI,GAAGA;QACb,OAAO,MAAME,MAAM6B,IAAI;IACzB;IAEA,MAAMI,YAAYxB,OAAoB,EAAEyB,KAAa,EAAE;QACrD,MAAMlC,QAAQ,MAAM,IAAI,CAACe,GAAG,CAACN;QAC7B,MAAM,EAAET,OAAOmC,UAAU,EAAE,GAAG,MAAMZ,IAAAA,yBAAa,EAAC;YAAEvB,OAAOkC;QAAM,GAAGE,8CAAsB;QAC1FpC,MAAMA,KAAK,GAAGmC;QACd,OAAO,MAAMnC,MAAM6B,IAAI;IACzB;IAEA,MAAMQ,0BAA0B9B,SAAsB,EAAE;QACtD,MAAMM,YAAK,CAACyB,UAAU,CACpB,CAAC,GACD;YACEC,OAAO;gBACLrC,UAAU;oBACRK,WAAW;wBACTiC,KAAK;4BAACjC;yBAAU;oBAClB;gBACF;YACF;QACF;IAEJ;IAEA,MAAMkC,mBAAmBhC,OAAoB,EAAEiC,eAAmD,EAAE;QAClG,MAAM1C,QAAQ,MAAM,IAAI,CAACe,GAAG,CAACN,SAAS;QACtC,MAAMkC,aAAa,MAAMpB,IAAAA,yBAAa,EAACmB,iBAAiBE,IAAAA,2CAAmB,EAAC;QAG5E,MAAM,IAAI,CAAClD,YAAY,CAACmD,4BAA4B,CAACF,WAAWpC,SAAS;QAGzEP,MAAME,QAAQ,GAAGF,MAAME,QAAQ,CAAC4C,MAAM,CACpC,CAACC,WAAgC,CAAEA,CAAAA,SAAS1C,CAAC,KAAKqC,gBAAgBrC,CAAC,IAAI0C,SAASzC,CAAC,KAAKoC,gBAAgBpC,CAAC,AAADA;QAGxG,MAAM0C,gBAAgBhD,MAAME,QAAQ,CAAC+C,SAAS,CAC5C,CAACF,WAAgCA,SAASxC,SAAS,CAACC,QAAQ,OAAOmC,WAAWpC,SAAS,CAACC,QAAQ;QAElG,IAAIwC,kBAAkB,CAAC,GAAG;YACxBhD,MAAME,QAAQ,CAAC8C,cAAc,GAAGL;QAClC,OAAO;YACL3C,MAAME,QAAQ,CAACgD,IAAI,CAACP;QACtB;QAEA,MAAM3C,MAAM6B,IAAI;QAChB,OAAO7B;IACT;IAEA,MAAMmD,cAAc1C,OAAoB,EAAEF,SAAsB,EAAE;QAChE,MAAMP,QAAQ,MAAM,IAAI,CAACe,GAAG,CAACN,SAAS;QACtC,MAAMkC,aAAa,MAAMpB,IAAAA,yBAAa,EAAC;YAAEhB;QAAU,GAAG6C,IAAAA,iDAAyB,EAAC;QAGhF,MAAM,IAAI,CAAC1D,YAAY,CAACmD,4BAA4B,CAACF,WAAWpC,SAAS;QAEzE,MAAM8C,2BAA2BrD,MAAME,QAAQ,CAAC+C,SAAS,CACvD,CAACK,MAA2BA,IAAI/C,SAAS,CAACC,QAAQ,OAAOmC,WAAWpC,SAAS;QAE/E,IAAI8C,6BAA6B,CAAC,GAAG,OAAOrD;QAC5CA,MAAME,QAAQ,CAACqD,MAAM,CAACF,0BAA0B;QAChD,MAAMrD,MAAM6B,IAAI;QAChB,OAAO7B;IACT;IAEA,MAAMwD,OAAO/C,OAAoB,EAAE;QACjC,MAAM,IAAI,CAACM,GAAG,CAACN,SAAS;QACxB,MAAMI,YAAK,CAAC4C,SAAS,CAAC;YAAEvC,KAAKT;QAAQ;IACvC;AACF"}
+{"version":3,"sources":["../../../src/services/mongoose/floor.service.ts"],"names":["FloorService","constructor","printerCache","toDto","floor","id","name","printers","map","p","x","y","printerId","floorId","list","Floor","find","get","findOne","_id","NotFoundException","createDefaultFloor","create","validatedInput","validateInput","createOrUpdateFloorSchema","update","existingFloor","position","floorUpdate","input","save","updateName","floorName","updateFloorNameSchema","updateLevel","level","validLevel","updateFloorLevelSchema","deletePrinterFromAnyFloor","updateMany","$pull","$in","addOrUpdatePrinter","updatedPosition","validInput","printerInFloorSchema","getCachedPrinterOrThrowAsync","filter","positionIndex","findIndex","toString","push","removePrinter","removePrinterInFloorSchema","foundPrinterInFloorIndex","pif","splice","delete","deleteOne"],"mappings":"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"}

package/dist/services/mongoose/permission.service.js

@@ -13,7 +13,7 @@ const _authorizationconstants = require("../../constants/authorization.constants
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 class PermissionService {
     logger;
-    constructor({ loggerFactory }){
+    constructor(loggerFactory){
         this.logger = loggerFactory(PermissionService.name);
     }
     _permissions = [];

package/dist/services/mongoose/permission.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/permission.service.ts"],"names":["PermissionService","logger","constructor","loggerFactory","name","_permissions","permissions","toDto","permission","id","authorizePermission","requiredPermission","assignedPermissions","find","assignedPermission","normalizePermission","getPermissionByName","permissionName","r","NotFoundException","getPermission","permissionId","syncPermissions","permissionDefinition","flattenPermissionDefinition","storedPermission","Permission","findOne","newPermission","create","push","permissionInstance","warn"],"mappings":";;;;+BASaA;;;eAAAA;;;wBATc;wCACiB;mCACV;AAO3B,MAAMA;IACHC,OAAsB;IAE9BC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcH,kBAAkBI,IAAI;IACpD;IAEQC,eAA8B,EAAE,CAAC;IAEzC,IAAIC,cAAc;QAChB,OAAO,IAAI,CAACD,YAAY;IAC1B;IAEAE,MAAMC,UAAuB,EAAE;QAC7B,OAAO;YACLC,IAAID,WAAWC,EAAE;YACjBL,MAAMI,WAAWJ,IAAI;QACvB;IACF;IAEAM,oBAAoBC,kBAA0B,EAAEC,mBAA6B,EAAE;QAC7E,OAAO,CAAC,CAACA,oBAAoBC,IAAI,CAAC,CAACC;YACjC,MAAMC,sBAAsB,IAAI,CAACA,mBAAmB,CAACD;YACrD,IAAI,CAACC,qBAAqB,OAAO;YACjC,OAAOA,wBAAwBJ;QACjC;IACF;IAEA,MAAMK,oBAAoBC,cAAsB,EAAE;QAChD,MAAMT,aAAa,IAAI,CAACF,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAEd,IAAI,KAAKa;QAC3D,IAAI,CAACT,YAAY,MAAM,IAAIW,oCAAiB,CAAC;QAC7C,OAAOX;IACT;IAEA,MAAMY,cAAcC,YAAyB,EAAE;QAC7C,MAAMb,aAAa,IAAI,CAACF,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAET,EAAE,KAAKY;QACzD,IAAI,CAACb,YAAY,MAAM,IAAIW,oCAAiB,CAAC,CAAC,mCAAmC,CAAC;QAElF,OAAOX;IACT;IAEA,MAAMc,kBAAkB;QACtB,IAAI,CAACjB,YAAY,GAAG,EAAE;QAEtB,MAAMkB,uBAAuBC,IAAAA,mDAA2B;QACxD,KAAK,IAAIhB,cAAce,qBAAsB;YAC3C,MAAME,mBAAmB,MAAMC,kBAAU,CAACC,OAAO,CAAC;gBAAEvB,MAAMI;YAAW;YACrE,IAAI,CAACiB,kBAAkB;gBACrB,MAAMG,gBAAgB,MAAMF,kBAAU,CAACG,MAAM,CAAC;oBAC5CzB,MAAMI;gBACR;gBACA,IAAI,CAACH,YAAY,CAACyB,IAAI,CAACF;YACzB,OAAO;gBACL,IAAI,CAACvB,YAAY,CAACyB,IAAI,CAACL;YACzB;QACF;IACF;IAEAV,oBAAoBD,kBAA0B,EAAE;QAC9C,MAAMiB,qBAAqB,IAAI,CAACzB,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAET,EAAE,KAAKK,sBAAsBI,EAAEd,IAAI,KAAKU;QAClG,IAAI,CAACiB,oBAAoB;YACvB,IAAI,CAAC9B,MAAM,CAAC+B,IAAI,CAAC;YACjB;QACF;QACA,OAAOD,mBAAmB3B,IAAI;IAChC;AACF"}
+{"version":3,"sources":["../../../src/services/mongoose/permission.service.ts"],"names":["PermissionService","logger","constructor","loggerFactory","name","_permissions","permissions","toDto","permission","id","authorizePermission","requiredPermission","assignedPermissions","find","assignedPermission","normalizePermission","getPermissionByName","permissionName","r","NotFoundException","getPermission","permissionId","syncPermissions","permissionDefinition","flattenPermissionDefinition","storedPermission","Permission","findOne","newPermission","create","push","permissionInstance","warn"],"mappings":";;;;+BASaA;;;eAAAA;;;wBATc;wCACiB;mCACV;AAO3B,MAAMA;IACMC,OAAsB;IAEvCC,YAAYC,aAA6B,CAAE;QACzC,IAAI,CAACF,MAAM,GAAGE,cAAcH,kBAAkBI,IAAI;IACpD;IAEQC,eAA8B,EAAE,CAAC;IAEzC,IAAIC,cAAc;QAChB,OAAO,IAAI,CAACD,YAAY;IAC1B;IAEAE,MAAMC,UAAuB,EAAE;QAC7B,OAAO;YACLC,IAAID,WAAWC,EAAE;YACjBL,MAAMI,WAAWJ,IAAI;QACvB;IACF;IAEAM,oBAAoBC,kBAA0B,EAAEC,mBAA6B,EAAE;QAC7E,OAAO,CAAC,CAACA,oBAAoBC,IAAI,CAAC,CAACC;YACjC,MAAMC,sBAAsB,IAAI,CAACA,mBAAmB,CAACD;YACrD,IAAI,CAACC,qBAAqB,OAAO;YACjC,OAAOA,wBAAwBJ;QACjC;IACF;IAEA,MAAMK,oBAAoBC,cAAsB,EAAE;QAChD,MAAMT,aAAa,IAAI,CAACF,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAEd,IAAI,KAAKa;QAC3D,IAAI,CAACT,YAAY,MAAM,IAAIW,oCAAiB,CAAC;QAC7C,OAAOX;IACT;IAEA,MAAMY,cAAcC,YAAyB,EAAE;QAC7C,MAAMb,aAAa,IAAI,CAACF,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAET,EAAE,KAAKY;QACzD,IAAI,CAACb,YAAY,MAAM,IAAIW,oCAAiB,CAAC,CAAC,mCAAmC,CAAC;QAElF,OAAOX;IACT;IAEA,MAAMc,kBAAkB;QACtB,IAAI,CAACjB,YAAY,GAAG,EAAE;QAEtB,MAAMkB,uBAAuBC,IAAAA,mDAA2B;QACxD,KAAK,IAAIhB,cAAce,qBAAsB;YAC3C,MAAME,mBAAmB,MAAMC,kBAAU,CAACC,OAAO,CAAC;gBAAEvB,MAAMI;YAAW;YACrE,IAAI,CAACiB,kBAAkB;gBACrB,MAAMG,gBAAgB,MAAMF,kBAAU,CAACG,MAAM,CAAC;oBAC5CzB,MAAMI;gBACR;gBACA,IAAI,CAACH,YAAY,CAACyB,IAAI,CAACF;YACzB,OAAO;gBACL,IAAI,CAACvB,YAAY,CAACyB,IAAI,CAACL;YACzB;QACF;IACF;IAEAV,oBAAoBD,kBAA0B,EAAE;QAC9C,MAAMiB,qBAAqB,IAAI,CAACzB,WAAW,CAACO,IAAI,CAC9C,CAACK,IAAMA,EAAET,EAAE,KAAKK,sBAAsBI,EAAEd,IAAI,KAAKU;QAEnD,IAAI,CAACiB,oBAAoB;YACvB,IAAI,CAAC9B,MAAM,CAAC+B,IAAI,CAAC;YACjB;QACF;QACA,OAAOD,mBAAmB3B,IAAI;IAChC;AACF"}

package/dist/services/mongoose/print-completion.service.js

@@ -15,7 +15,7 @@ const _octoprintwebsocketconstants = require("../octoprint/constants/octoprint-w
 const _printcompletionshared = require("./print-completion.shared");
 class PrintCompletionService {
     logger;
-    constructor({ loggerFactory }){
+    constructor(loggerFactory){
         this.logger = loggerFactory(PrintCompletionService.name);
     }
     toDto(entity) {
@@ -30,7 +30,7 @@ class PrintCompletionService {
         };
     }
     async create(input) {
-        const { printerId, fileName, completionLog, status, context } = await (0, _validators.validateInput)(input, _printcompletionservicevalidation.createPrintCompletionRules);
+        const { printerId, fileName, completionLog, status, context } = await (0, _validators.validateInput)(input, (0, _printcompletionservicevalidation.createPrintCompletionSchema)(false));
         return _models.PrintCompletion.create({
             printerId,
             fileName,

package/dist/services/mongoose/print-completion.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","status","printerId","toString","create","input","validateInput","createPrintCompletionRules","PrintCompletion","Date","now","list","find","findPrintCompletion","correlationId","updateContext","length","warn","completionEntry","findOne","EVENT_TYPES","PrintStarted","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","printEvents","$push","processCompletions"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/mongoose/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","status","printerId","toString","create","input","validateInput","createPrintCompletionSchema","PrintCompletion","Date","now","list","find","findPrintCompletion","correlationId","updateContext","length","warn","completionEntry","findOne","EVENT_TYPES","PrintStarted","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","printEvents","$push","processCompletions"],"mappings":"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"}

package/dist/services/mongoose/print-completion.shared.js

@@ -15,7 +15,7 @@ function processCompletions(completions) {
     return completions.map((pc)=>{
         pc.printerId = pc.printerId ?? pc._id;
         delete pc._id;
-        const jobs = (0, _arrayutil.groupArrayBy)(pc.printEvents, (e)=>e.context?.correlationId);
+        const jobs = (0, _arrayutil.groupArrayBy)(pc.printEvents.filter((e)=>e.context?.correlationId), (e)=>e.context?.correlationId);
         pc.printJobs = Object.entries(jobs).map(([id, events])=>{
             const eventMap = events.map(({ status, createdAt, fileName, completionLog })=>({
                     status,
@@ -51,7 +51,7 @@ function processCompletions(completions) {
         pc.successEventsLastWeek = successEvents.filter((e)=>e.createdAt > Date.now() - 7 * durationDayMSec)?.length;
         pc.successEventsLast48H = successEvents.filter((e)=>e.createdAt > Date.now() - 2 * durationDayMSec)?.length;
         pc.successEventsLast24H = successEvents.filter((e)=>e.createdAt > Date.now() - durationDayMSec)?.length;
-        delete pc.printEvents;
+        pc.printEvents = [];
         return pc;
     });
 }

package/dist/services/mongoose/print-completion.shared.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/print-completion.shared.ts"],"names":["processCompletions","durationDayMSec","completions","map","pc","printerId","_id","jobs","groupArrayBy","printEvents","e","context","correlationId","printJobs","Object","entries","id","events","eventMap","status","createdAt","fileName","completionLog","lastEvent","reduce","e1","e2","correlationIds","j","printCount","length","eventCount","mappedEvents","failureEvents","filter","EVENT_TYPES","PrintFailed","failureCount","lastFailure","j1","j2","failureEventsLastWeek","Date","now","failureEventsLast48H","failureEventsLast24H","successEvents","PrintDone","successCount","lastSuccess","successEventsLastWeek","successEventsLast48H","successEventsLast24H"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/mongoose/print-completion.shared.ts"],"names":["processCompletions","durationDayMSec","completions","map","pc","printerId","_id","jobs","groupArrayBy","printEvents","filter","e","context","correlationId","printJobs","Object","entries","id","events","eventMap","status","createdAt","fileName","completionLog","lastEvent","reduce","e1","e2","correlationIds","j","printCount","length","eventCount","mappedEvents","failureEvents","EVENT_TYPES","PrintFailed","failureCount","lastFailure","j1","j2","failureEventsLastWeek","Date","now","failureEventsLast48H","failureEventsLast24H","successEvents","PrintDone","successCount","lastSuccess","successEventsLastWeek","successEventsLast48H","successEventsLast24H"],"mappings":"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"}

package/dist/services/mongoose/printer.service.js

@@ -18,25 +18,22 @@ const _urlutils = require("../../utils/url.utils");
 class PrinterService {
     eventEmitter2;
     logger;
-    constructor({ eventEmitter2, loggerFactory }){
+    constructor(eventEmitter2, loggerFactory){
         this.eventEmitter2 = eventEmitter2;
         this.logger = loggerFactory(PrinterService.name);
     }
-    toUnsafeDto(entity) {
-        return {
-            ...this.toDto(entity),
-            apiKey: entity.apiKey,
-            printerURL: entity.printerURL,
-            printerType: entity.printerType
-        };
-    }
     toDto(entity) {
         return {
             id: entity.id,
             name: entity.name,
             enabled: entity.enabled,
             disabledReason: entity.disabledReason,
-            dateAdded: entity.dateAdded
+            dateAdded: entity.dateAdded,
+            apiKey: entity.apiKey,
+            username: entity.username,
+            password: entity.password,
+            printerURL: entity.printerURL,
+            printerType: entity.printerType
         };
     }
     async list() {
@@ -73,9 +70,11 @@ class PrinterService {
         updateData.printerURL = (0, _normalizeurl.normalizeUrl)(updateData.printerURL, {
             defaultProtocol: _urlutils.defaultHttpProtocol
         });
-        const { printerURL, apiKey, enabled, name, printerType } = await (0, _validators.validateInput)(updateData, _printerservicevalidation.createMongoPrinterRules);
+        const { printerURL, apiKey, username, password, enabled, name, printerType } = await (0, _validators.validateInput)(updateData, _printerservicevalidation.createPrinterSchema);
         printer.printerURL = printerURL;
         printer.apiKey = apiKey;
+        printer.username = username;
+        printer.password = password;
         if (enabled !== undefined) {
             printer.enabled = enabled;
         }
@@ -138,9 +137,11 @@ class PrinterService {
             new: true,
             useFindAndModify: false
         });
-        this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
-            printer
-        });
+        if (printer) {
+            this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
+                printer
+            });
+        }
         return printer;
     }
     async updateFeedRate(printerId, feedRate) {
@@ -152,28 +153,11 @@ class PrinterService {
             new: true,
             useFindAndModify: false
         });
-        this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
-            printer
-        });
-        return printer;
-    }
-    async updateConnectionSettings(printerId, { printerURL, apiKey, printerType }) {
-        const update = {
-            printerURL: (0, _normalizeurl.normalizeUrl)(printerURL, {
-                defaultProtocol: _urlutils.defaultHttpProtocol
-            }),
-            apiKey,
-            printerType
-        };
-        await (0, _validators.validateInput)(update, _printerservicevalidation.createMongoPrinterRules);
-        await this.get(printerId);
-        const printer = await _models.Printer.findByIdAndUpdate(printerId, update, {
-            new: true,
-            useFindAndModify: false
-        });
-        this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
-            printer
-        });
+        if (printer) {
+            this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
+                printer
+            });
+        }
         return printer;
     }
     async updateEnabled(printerId, enabled) {
@@ -183,15 +167,17 @@ class PrinterService {
         } : {
             enabled
         };
-        await (0, _validators.validateInput)(update, _printerservicevalidation.updatePrinterEnabledRule);
+        await (0, _validators.validateInput)(update, _printerservicevalidation.updatePrinterEnabledSchema);
         await this.get(printerId);
         const printer = await _models.Printer.findByIdAndUpdate(printerId, update, {
             new: true,
             useFindAndModify: false
         });
-        this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
-            printer
-        });
+        if (printer) {
+            this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
+                printer
+            });
+        }
         return printer;
     }
     async updateDisabledReason(printerId, disabledReason) {
@@ -200,15 +186,17 @@ class PrinterService {
             disabledReason,
             enabled
         };
-        await (0, _validators.validateInput)(update, _printerservicevalidation.updatePrinterDisabledReasonRule);
+        await (0, _validators.validateInput)(update, _printerservicevalidation.updatePrinterDisabledReasonSchema);
         await this.get(printerId);
         const printer = await _models.Printer.findByIdAndUpdate(printerId, update, {
             new: true,
             useFindAndModify: false
         });
-        this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
-            printer
-        });
+        if (printer) {
+            this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
+                printer
+            });
+        }
         return printer;
     }
     async validateAndDefault(printer) {
@@ -221,7 +209,7 @@ class PrinterService {
                 defaultProtocol: _urlutils.defaultHttpProtocol
             });
         }
-        return await (0, _validators.validateInput)(mergedPrinter, _printerservicevalidation.createMongoPrinterRules);
+        return await (0, _validators.validateInput)(mergedPrinter, _printerservicevalidation.createPrinterSchema);
     }
 }
 

package/dist/services/mongoose/printer.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/printer.service.ts"],"names":["PrinterService","eventEmitter2","logger","constructor","loggerFactory","name","toUnsafeDto","entity","toDto","apiKey","printerURL","printerType","id","enabled","disabledReason","dateAdded","list","Printer","find","sort","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","normalizeUrl","defaultProtocol","defaultHttpProtocol","validateInput","createMongoPrinterRules","undefined","save","printerUpdated","deleteMany","printerIds","$in","printersDeleted","delete","findOneAndDelete","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","updateFlowRate","flowRate","findByIdAndUpdate","new","useFindAndModify","updateFeedRate","feedRate","updateConnectionSettings","updateEnabled","updatePrinterEnabledRule","updateDisabledReason","updatePrinterDisabledReasonRule"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/mongoose/printer.service.ts"],"names":["PrinterService","logger","constructor","eventEmitter2","loggerFactory","name","toDto","entity","id","enabled","disabledReason","dateAdded","apiKey","username","password","printerURL","printerType","list","Printer","find","sort","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","normalizeUrl","defaultProtocol","defaultHttpProtocol","validateInput","createPrinterSchema","undefined","save","printerUpdated","deleteMany","printerIds","$in","printersDeleted","delete","findOneAndDelete","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","updateFlowRate","flowRate","findByIdAndUpdate","new","useFindAndModify","updateFeedRate","feedRate","updateEnabled","updatePrinterEnabledSchema","updateDisabledReason","updatePrinterDisabledReasonSchema"],"mappings":"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"}

package/dist/services/mongoose/refresh-token.service.js

@@ -16,9 +16,9 @@ const _authorizationconstants = require("../../constants/authorization.constants
 class RefreshTokenService {
     settingsStore;
     logger;
-    constructor({ loggerFactory, settingsStore }){
-        this.logger = loggerFactory(RefreshTokenService.name);
+    constructor(loggerFactory, settingsStore){
         this.settingsStore = settingsStore;
+        this.logger = loggerFactory(RefreshTokenService.name);
     }
     toDto(entity) {
         return {
@@ -28,15 +28,12 @@ class RefreshTokenService {
             refreshAttemptsUsed: entity.refreshAttemptsUsed
         };
     }
-    async getRefreshToken(refreshToken, throwNotFoundError = true) {
+    async getRefreshToken(refreshToken) {
         const userRefreshToken = await _models.RefreshToken.findOne({
             refreshToken
         });
         if (!userRefreshToken) {
-            if (throwNotFoundError) {
-                throw new _runtimeexceptions.AuthenticationError("The refresh token was not found", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
-            }
-            return null;
+            throw new _runtimeexceptions.AuthenticationError("The refresh token was not found", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
         }
         return userRefreshToken;
     }
@@ -56,7 +53,7 @@ class RefreshTokenService {
         return refreshToken;
     }
     async updateRefreshTokenAttempts(refreshToken, refreshAttemptsUsed) {
-        await this.getRefreshToken(refreshToken, true);
+        await this.getRefreshToken(refreshToken);
         await _models.RefreshToken.updateOne({
             refreshToken
         }, {

package/dist/services/mongoose/refresh-token.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/refresh-token.service.ts"],"names":["RefreshTokenService","settingsStore","logger","constructor","loggerFactory","name","toDto","entity","id","userId","toString","expiresAt","refreshAttemptsUsed","getRefreshToken","refreshToken","throwNotFoundError","userRefreshToken","RefreshToken","findOne","AuthenticationError","AUTH_ERROR_REASON","InvalidOrExpiredRefreshToken","createRefreshTokenForUserId","refreshTokenExpiry","getCredentialSettings","uuidv4","timespan","AppConstants","DEFAULT_REFRESH_TOKEN_EXPIRY","warn","create","Date","now","updateRefreshTokenAttempts","updateOne","new","purgeOutdatedRefreshTokensByUserId","result","deleteMany","$lt","deletedCount","debug","purgeAllOutdatedRefreshTokens","deleteRefreshTokenByUserId","deleteRefreshToken","deleteOne"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/mongoose/refresh-token.service.ts"],"names":["RefreshTokenService","logger","constructor","loggerFactory","settingsStore","name","toDto","entity","id","userId","toString","expiresAt","refreshAttemptsUsed","getRefreshToken","refreshToken","userRefreshToken","RefreshToken","findOne","AuthenticationError","AUTH_ERROR_REASON","InvalidOrExpiredRefreshToken","createRefreshTokenForUserId","refreshTokenExpiry","getCredentialSettings","uuidv4","timespan","AppConstants","DEFAULT_REFRESH_TOKEN_EXPIRY","warn","create","Date","now","updateRefreshTokenAttempts","updateOne","new","purgeOutdatedRefreshTokensByUserId","result","deleteMany","$lt","deletedCount","debug","purgeAllOutdatedRefreshTokens","deleteRefreshTokenByUserId","deleteRefreshToken","deleteOne"],"mappings":"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"}

package/dist/services/mongoose/role.service.js

@@ -13,15 +13,18 @@ const _authorizationconstants = require("../../constants/authorization.constants
 const _models = require("../../models");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 class RoleService {
-    settingsStore;
     appDefaultRole;
     appDefaultRoleNoLogin;
-    constructor({ appDefaultRole, appDefaultRoleNoLogin, settingsStore }){
-        this.settingsStore = settingsStore;
+    settingsStore;
+    logger;
+    constructor(loggerFactory, appDefaultRole, appDefaultRoleNoLogin, settingsStore){
         this.appDefaultRole = appDefaultRole;
         this.appDefaultRoleNoLogin = appDefaultRoleNoLogin;
+        this.settingsStore = settingsStore;
+        this._roles = [];
+        this.logger = loggerFactory(RoleService.name);
     }
-    _roles = [];
+    _roles;
     get roles() {
         return this._roles;
     }
@@ -48,7 +51,13 @@ class RoleService {
         return permissions;
     }
     getRolePermissions(role) {
+        if (!role?.length) {
+            return [];
+        }
         const normalizedRole = this.normalizeRoleIdOrName(role);
+        if (!normalizedRole?.length) {
+            return [];
+        }
         return _authorizationconstants.ROLE_PERMS[normalizedRole];
     }
     async getAppDefaultRoleIds() {
@@ -114,7 +123,7 @@ class RoleService {
     normalizeRoleIdOrName(assignedRole) {
         const roleInstance = this.roles.find((r)=>r.id === assignedRole || r.name === assignedRole);
         if (!roleInstance) {
-            console.warn(`The role by provided id did not exist in definition. Skipping`);
+            this.logger.warn(`The role by provided id was not found. Skipping.`);
             return;
         }
         return roleInstance.name;

package/dist/services/mongoose/role.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/role.service.ts"],"names":["RoleService","settingsStore","appDefaultRole","appDefaultRoleNoLogin","constructor","_roles","roles","toDto","role","id","name","getAppDefaultRole","getLoginRequired","getRolesPermissions","permissions","length","normalizedRole","normalizeRoleIdOrName","rolePermissions","getRolePermissions","union","ROLE_PERMS","getAppDefaultRoleIds","syncRoles","guestRole","getRoleByName","getSynchronizedRoleByName","roleName","authorizeRole","requiredRole","assignedRoles","find","ar","authorizeRoles","requiredRoles","subset","isAuthorized","forEach","rr","result","r","NotFoundException","getManyRoles","roleIds","map","roleId","getRole","Object","values","ROLES","storedRole","Role","findOne","newRole","create","push","assignedRole","roleInstance","console","warn"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/mongoose/role.service.ts"],"names":["RoleService","logger","constructor","loggerFactory","appDefaultRole","appDefaultRoleNoLogin","settingsStore","_roles","name","roles","toDto","role","id","getAppDefaultRole","getLoginRequired","getRolesPermissions","permissions","length","normalizedRole","normalizeRoleIdOrName","rolePermissions","getRolePermissions","union","ROLE_PERMS","getAppDefaultRoleIds","syncRoles","guestRole","getRoleByName","getSynchronizedRoleByName","roleName","authorizeRole","requiredRole","assignedRoles","find","ar","authorizeRoles","requiredRoles","subset","isAuthorized","forEach","rr","result","r","NotFoundException","getManyRoles","roleIds","map","roleId","getRole","Object","values","ROLES","storedRole","Role","findOne","newRole","create","push","assignedRole","roleInstance","warn"],"mappings":"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"}