@fdm-monster/server 1.8.2 → 1.9.0-rc1

package/dist/services/interfaces/printer-group.dto.js

@@ -16,16 +16,6 @@ _export(exports, {
         return PrinterGroupDto;
     }
 });
-const _classvalidator = require("class-validator");
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-function _ts_metadata(k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-}
 class PrinterGroupDto {
     printerId;
     groupId;
@@ -33,9 +23,5 @@ class PrinterGroupDto {
 class CreateGroupDto {
     name;
 }
-_ts_decorate([
-    (0, _classvalidator.IsNotEmpty)(),
-    _ts_metadata("design:type", String)
-], CreateGroupDto.prototype, "name", void 0);
 
 //# sourceMappingURL=printer-group.dto.js.map

package/dist/services/interfaces/printer-group.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/printer-group.dto.ts"],"names":["CreateGroupDto","PrinterGroupDto","printerId","groupId","name"],"mappings":";;;;;;;;;;;IAOaA,cAAc;eAAdA;;IALAC,eAAe;eAAfA;;;gCAFc;;;;;;;;;;AAEpB,MAAMA;IACXC,UAAmB;IACnBC,QAAiB;AACnB;AAEO,MAAMH;IAEXI,KAAa;AACf"}
+{"version":3,"sources":["../../../src/services/interfaces/printer-group.dto.ts"],"names":["CreateGroupDto","PrinterGroupDto","printerId","groupId","name"],"mappings":";;;;;;;;;;;IAKaA,cAAc;eAAdA;;IALAC,eAAe;eAAfA;;;AAAN,MAAMA;IACXC,UAAmB;IACnBC,QAAiB;AACnB;AAEO,MAAMH;IACXI,KAAa;AACf"}

package/dist/services/interfaces/printer.dto.js

@@ -9,22 +9,28 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    CreatePrinterDto: function() {
+        return CreatePrinterDto;
+    },
     PrinterDto: function() {
         return PrinterDto;
-    },
-    PrinterUnsafeDto: function() {
-        return PrinterUnsafeDto;
     }
 });
 const _sharedconstants = require("../../shared.constants");
+class CreatePrinterDto {
+    name;
+    apiKey;
+    printerURL;
+    printerType;
+}
 class PrinterDto extends _sharedconstants.IdDto {
     name;
     enabled;
     disabledReason;
     dateAdded;
-}
-class PrinterUnsafeDto extends PrinterDto {
     apiKey;
+    username;
+    password;
     printerURL;
     printerType;
 }

package/dist/services/interfaces/printer.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/printer.dto.ts"],"names":["PrinterDto","PrinterUnsafeDto","IdDto","name","enabled","disabledReason","dateAdded","apiKey","printerURL","printerType"],"mappings":";;;;;;;;;;;IAEaA,UAAU;eAAVA;;IAOAC,gBAAgB;eAAhBA;;;iCATS;AAEf,MAAMD,mBAA4BE,sBAAK;IAC5CC,KAAa;IACbC,QAAiB;IACjBC,eAAuB;IACvBC,UAAkB;AACpB;AAEO,MAAML,yBAAkCD;IAC7CO,OAAe;IACfC,WAAmB;IACnBC,YAAoB;AACtB"}
+{"version":3,"sources":["../../../src/services/interfaces/printer.dto.ts"],"names":["CreatePrinterDto","PrinterDto","name","apiKey","printerURL","printerType","IdDto","enabled","disabledReason","dateAdded","username","password"],"mappings":";;;;;;;;;;;IAEaA,gBAAgB;eAAhBA;;IAOAC,UAAU;eAAVA;;;iCATS;AAEf,MAAMD;IACXE,KAAa;IACbC,OAAgB;IAChBC,WAAmB;IACnBC,YAAoB;AACtB;AAEO,MAAMJ,mBAA4BK,sBAAK;IAC5CJ,KAAa;IACbK,QAAiB;IACjBC,eAAwB;IACxBC,UAAmB;IACnBN,OAAgB;IAChBO,SAAkB;IAClBC,SAAkB;IAClBP,WAAmB;IACnBC,YAAoB;AACtB"}

package/dist/services/interfaces/settings.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["SettingsDto","serverSettingsKey","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;+BA0DaA;;;eAAAA;;;yCApDN;AAoDA,MAAMA;IACX,CAACC,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAE1C,CAACC,mDAA0B,CAAC,CAAuB;IACnD,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}
+{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["SettingsDto","serverSettingsKey","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;+BAqCaA;;;eAAAA;;;yCA/BN;AA+BA,MAAMA;IACX,CAACC,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAE1C,CAACC,mDAA0B,CAAC,CAAuB;IACnD,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}

package/dist/services/interfaces/task.interfaces.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+//# sourceMappingURL=task.interfaces.js.map

package/dist/services/interfaces/task.interfaces.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/interfaces/task.interfaces.ts"],"names":[],"mappings":""}

package/dist/services/mongoose/camera-stream.service.js

@@ -11,42 +11,40 @@ Object.defineProperty(exports, "CameraStreamService", {
 const _models = require("../../models");
 const _validators = require("../../handlers/validators");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
-const createCameraStreamRules = {
-    printerId: "mongoId",
-    streamURL: "required|httpurl",
-    name: "required|string"
-};
+const _cameraservicevalidation = require("../validators/camera-service.validation");
 class CameraStreamService {
-    model = _models.CameraStream;
     printerCache;
-    constructor({ printerCache }){
+    model;
+    constructor(printerCache){
         this.printerCache = printerCache;
+        this.model = _models.CameraStream;
     }
     async list() {
         return this.model.find();
     }
-    async get(id, throwError = true) {
+    async get(id) {
         const cameraStream = await this.model.findById(id);
-        if (!cameraStream && throwError) {
+        if (!cameraStream) {
             throw new _runtimeexceptions.NotFoundException(`Floor with provided id does not exist`, "CameraStream");
         }
         return cameraStream;
     }
     async create(data) {
-        const input = await (0, _validators.validateInput)(data, createCameraStreamRules);
+        const input = await (0, _validators.validateInput)(data, (0, _cameraservicevalidation.createCameraStreamSchema)(false));
         if (input.printerId) {
-            await this.printerCache.getCachedPrinterOrThrow(input.printerId);
+            this.printerCache.getCachedPrinterOrThrow(input.printerId);
         }
         return this.model.create(input);
     }
     async delete(id) {
+        await this.get(id);
         await this.model.findByIdAndDelete(id);
     }
     async update(id, input) {
         await this.get(id);
-        const updateInput = await (0, _validators.validateInput)(input, createCameraStreamRules);
+        const updateInput = await (0, _validators.validateInput)(input, (0, _cameraservicevalidation.createCameraStreamSchema)(false));
         if (input.printerId) {
-            await this.printerCache.getCachedPrinterOrThrow(input.printerId);
+            this.printerCache.getCachedPrinterOrThrow(input.printerId);
         }
         await this.model.updateOne({
             id
@@ -57,8 +55,12 @@ class CameraStreamService {
         return {
             id: entity.id,
             streamURL: entity.streamURL,
-            printerId: entity.printerId === null ? null : entity.printerId?.toString(),
-            name: entity.name
+            printerId: !entity?.printerId ? null : entity.printerId.toString(),
+            name: entity.name,
+            aspectRatio: entity.aspectRatio,
+            flipHorizontal: entity.flipHorizontal,
+            flipVertical: entity.flipVertical,
+            rotationClockwise: entity.rotationClockwise
         };
     }
 }

package/dist/services/mongoose/camera-stream.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/camera-stream.service.ts"],"names":["CameraStreamService","createCameraStreamRules","printerId","streamURL","name","model","CameraStream","printerCache","constructor","list","find","get","id","throwError","cameraStream","findById","NotFoundException","create","data","input","validateInput","getCachedPrinterOrThrow","delete","findByIdAndDelete","update","updateInput","updateOne","toDto","entity","toString"],"mappings":";;;;+BAgBaA;;;eAAAA;;;wBAhBgB;4BACC;mCACI;AAQlC,MAAMC,0BAA0B;IAC9BC,WAAW;IACXC,WAAW;IACXC,MAAM;AACR;AAEO,MAAMJ;IACXK,QAAQC,oBAAY,CAAC;IACrBC,aAA2B;IAE3BC,YAAY,EAAED,YAAY,EAAkC,CAAE;QAC5D,IAAI,CAACA,YAAY,GAAGA;IACtB;IAEA,MAAME,OAAO;QACX,OAAO,IAAI,CAACJ,KAAK,CAACK,IAAI;IACxB;IAEA,MAAMC,IAAIC,EAAe,EAAEC,aAAa,IAAI,EAAE;QAC5C,MAAMC,eAAe,MAAM,IAAI,CAACT,KAAK,CAACU,QAAQ,CAACH;QAC/C,IAAI,CAACE,gBAAgBD,YAAY;YAC/B,MAAM,IAAIG,oCAAiB,CAAC,CAAC,qCAAqC,CAAC,EAAE;QACvE;QAEA,OAAOF;IACT;IAEA,MAAMG,OAAOC,IAAwC,EAAE;QACrD,MAAMC,QAAQ,MAAMC,IAAAA,yBAAa,EAACF,MAAMjB;QACxC,IAAIkB,MAAMjB,SAAS,EAAE;YACnB,MAAM,IAAI,CAACK,YAAY,CAACc,uBAAuB,CAACF,MAAMjB,SAAS;QACjE;QACA,OAAO,IAAI,CAACG,KAAK,CAACY,MAAM,CAACE;IAC3B;IAEA,MAAMG,OAAOV,EAAe,EAAE;QAC5B,MAAM,IAAI,CAACP,KAAK,CAACkB,iBAAiB,CAACX;IACrC;IAEA,MAAMY,OAAOZ,EAAe,EAAEO,KAAyC,EAAE;QACvE,MAAM,IAAI,CAACR,GAAG,CAACC;QACf,MAAMa,cAAc,MAAML,IAAAA,yBAAa,EAACD,OAAOlB;QAC/C,IAAIkB,MAAMjB,SAAS,EAAE;YACnB,MAAM,IAAI,CAACK,YAAY,CAACc,uBAAuB,CAACF,MAAMjB,SAAS;QACjE;QACA,MAAM,IAAI,CAACG,KAAK,CAACqB,SAAS,CAAC;YAAEd;QAAG,GAAGa;QACnC,OAAO,IAAI,CAACd,GAAG,CAACC;IAClB;IAEAe,MAAMC,MAAqB,EAAgC;QACzD,OAAO;YACLhB,IAAIgB,OAAOhB,EAAE;YACbT,WAAWyB,OAAOzB,SAAS;YAC3BD,WAAW0B,OAAO1B,SAAS,KAAK,OAAO,OAAO0B,OAAO1B,SAAS,EAAE2B;YAChEzB,MAAMwB,OAAOxB,IAAI;QACnB;IACF;AACF"}
+{"version":3,"sources":["../../../src/services/mongoose/camera-stream.service.ts"],"names":["CameraStreamService","model","constructor","printerCache","CameraStream","list","find","get","id","cameraStream","findById","NotFoundException","create","data","input","validateInput","createCameraStreamSchema","printerId","getCachedPrinterOrThrow","delete","findByIdAndDelete","update","updateInput","updateOne","toDto","entity","streamURL","toString","name","aspectRatio","flipHorizontal","flipVertical","rotationClockwise"],"mappings":";;;;+BAUaA;;;eAAAA;;;wBAVgB;4BACC;mCACI;yCAMO;AAElC,MAAMA;;IACXC,MAAqB;IAErBC,YAAY,AAAiBC,YAA0B,CAAE;aAA5BA,eAAAA;aAF7BF,QAAQG,oBAAY;IAEsC;IAE1D,MAAMC,OAAO;QACX,OAAO,IAAI,CAACJ,KAAK,CAACK,IAAI;IACxB;IAEA,MAAMC,IAAIC,EAAe,EAAE;QACzB,MAAMC,eAAe,MAAM,IAAI,CAACR,KAAK,CAACS,QAAQ,CAACF;QAC/C,IAAI,CAACC,cAAc;YACjB,MAAM,IAAIE,oCAAiB,CAAC,CAAC,qCAAqC,CAAC,EAAE;QACvE;QAEA,OAAOF;IACT;IAEA,MAAMG,OAAOC,IAAwC,EAAE;QACrD,MAAMC,QAAQ,MAAMC,IAAAA,yBAAa,EAACF,MAAMG,IAAAA,iDAAwB,EAAC;QACjE,IAAIF,MAAMG,SAAS,EAAE;YACnB,IAAI,CAACd,YAAY,CAACe,uBAAuB,CAACJ,MAAMG,SAAS;QAC3D;QACA,OAAO,IAAI,CAAChB,KAAK,CAACW,MAAM,CAACE;IAC3B;IAEA,MAAMK,OAAOX,EAAe,EAAE;QAC5B,MAAM,IAAI,CAACD,GAAG,CAACC;QACf,MAAM,IAAI,CAACP,KAAK,CAACmB,iBAAiB,CAACZ;IACrC;IAEA,MAAMa,OAAOb,EAAe,EAAEM,KAAyC,EAAE;QACvE,MAAM,IAAI,CAACP,GAAG,CAACC;QAEf,MAAMc,cAAc,MAAMP,IAAAA,yBAAa,EAACD,OAAOE,IAAAA,iDAAwB,EAAC;QACxE,IAAIF,MAAMG,SAAS,EAAE;YACnB,IAAI,CAACd,YAAY,CAACe,uBAAuB,CAACJ,MAAMG,SAAS;QAC3D;QACA,MAAM,IAAI,CAAChB,KAAK,CAACsB,SAAS,CAAC;YAAEf;QAAG,GAAGc;QACnC,OAAO,IAAI,CAACf,GAAG,CAACC;IAClB;IAEAgB,MAAMC,MAAqB,EAAgC;QACzD,OAAO;YACLjB,IAAIiB,OAAOjB,EAAE;YACbkB,WAAWD,OAAOC,SAAS;YAC3BT,WAAW,CAACQ,QAAQR,YAAY,OAAOQ,OAAOR,SAAS,CAACU,QAAQ;YAChEC,MAAMH,OAAOG,IAAI;YACjBC,aAAaJ,OAAOI,WAAW;YAC/BC,gBAAgBL,OAAOK,cAAc;YACrCC,cAAcN,OAAOM,YAAY;YACjCC,mBAAmBP,OAAOO,iBAAiB;QAC7C;IACF;AACF"}

package/dist/services/mongoose/custom-gcode.service.js

@@ -23,7 +23,9 @@ class CustomGcodeService {
     }
     async get(gcodeScriptId) {
         const document = await _models.CustomGcode.findById(gcodeScriptId);
-        if (!document) throw new _runtimeexceptions.NotFoundException(`Custom GCode script with provided id does not exist`);
+        if (!document) {
+            throw new _runtimeexceptions.NotFoundException(`Custom GCode script with provided id does not exist`);
+        }
         return document;
     }
     async list() {
@@ -32,7 +34,7 @@ class CustomGcodeService {
     async create(gcodeScript) {
         return _models.CustomGcode.create(gcodeScript);
     }
-    async delete(gcodeScriptId, throwIfNotFound) {
+    async delete(gcodeScriptId) {
         const gcode = await this.get(gcodeScriptId);
         await _models.CustomGcode.findByIdAndDelete(gcode.id);
     }

package/dist/services/mongoose/custom-gcode.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/custom-gcode.service.ts"],"names":["CustomGcodeService","toDto","document","id","name","description","gcode","get","gcodeScriptId","CustomGcode","findById","NotFoundException","list","find","create","gcodeScript","delete","throwIfNotFound","findByIdAndDelete","update","updatedData","customGcode","save"],"mappings":";;;;+BAOaA;;;eAAAA;;;wBAPe;mCACM;AAM3B,MAAMA;IACXC,MAAMC,QAAsB,EAAkB;QAC5C,OAAO;YACLC,IAAID,SAASC,EAAE;YACfC,MAAMF,SAASE,IAAI;YACnBC,aAAaH,SAASG,WAAW;YACjCC,OAAO;mBAAIJ,SAASI,KAAK;aAAC;QAC5B;IACF;IACA,MAAMC,IAAIC,aAA0B,EAAE;QACpC,MAAMN,WAAW,MAAMO,mBAAW,CAACC,QAAQ,CAACF;QAC5C,IAAI,CAACN,UAAU,MAAM,IAAIS,oCAAiB,CAAC,CAAC,mDAAmD,CAAC;QAEhG,OAAOT;IACT;IAEA,MAAMU,OAAO;QACX,OAAOH,mBAAW,CAACI,IAAI;IACzB;IAEA,MAAMC,OAAOC,WAA2B,EAAE;QACxC,OAAON,mBAAW,CAACK,MAAM,CAACC;IAC5B;IAEA,MAAMC,OAAOR,aAA0B,EAAES,eAAyB,EAAE;QAClE,MAAMX,QAAQ,MAAM,IAAI,CAACC,GAAG,CAACC;QAC7B,MAAMC,mBAAW,CAACS,iBAAiB,CAACZ,MAAMH,EAAE;IAC9C;IAEA,MAAMgB,OAAOX,aAA0B,EAAEY,WAA2B,EAAE;QACpE,MAAMC,cAAc,MAAM,IAAI,CAACd,GAAG,CAACC;QACnCa,YAAYjB,IAAI,GAAGgB,YAAYhB,IAAI;QACnCiB,YAAYhB,WAAW,GAAGe,YAAYf,WAAW;QACjDgB,YAAYf,KAAK,GAAGc,YAAYd,KAAK;QACrC,OAAO,MAAMe,YAAYC,IAAI;IAC/B;AACF"}
+{"version":3,"sources":["../../../src/services/mongoose/custom-gcode.service.ts"],"names":["CustomGcodeService","toDto","document","id","name","description","gcode","get","gcodeScriptId","CustomGcode","findById","NotFoundException","list","find","create","gcodeScript","delete","findByIdAndDelete","update","updatedData","customGcode","save"],"mappings":";;;;+BAOaA;;;eAAAA;;;wBAPe;mCACM;AAM3B,MAAMA;IACXC,MAAMC,QAAsB,EAA+B;QACzD,OAAO;YACLC,IAAID,SAASC,EAAE;YACfC,MAAMF,SAASE,IAAI;YACnBC,aAAaH,SAASG,WAAW;YACjCC,OAAO;mBAAIJ,SAASI,KAAK;aAAC;QAC5B;IACF;IAEA,MAAMC,IAAIC,aAA0B,EAAE;QACpC,MAAMN,WAAW,MAAMO,mBAAW,CAACC,QAAQ,CAACF;QAC5C,IAAI,CAACN,UAAU;YACb,MAAM,IAAIS,oCAAiB,CAAC,CAAC,mDAAmD,CAAC;QACnF;QAEA,OAAOT;IACT;IAEA,MAAMU,OAAO;QACX,OAAOH,mBAAW,CAACI,IAAI;IACzB;IAEA,MAAMC,OAAOC,WAA2B,EAAE;QACxC,OAAON,mBAAW,CAACK,MAAM,CAACC;IAC5B;IAEA,MAAMC,OAAOR,aAA0B,EAAE;QACvC,MAAMF,QAAQ,MAAM,IAAI,CAACC,GAAG,CAACC;QAC7B,MAAMC,mBAAW,CAACQ,iBAAiB,CAACX,MAAMH,EAAE;IAC9C;IAEA,MAAMe,OAAOV,aAA0B,EAAEW,WAA2B,EAAE;QACpE,MAAMC,cAAc,MAAM,IAAI,CAACb,GAAG,CAACC;QACnCY,YAAYhB,IAAI,GAAGe,YAAYf,IAAI;QACnCgB,YAAYf,WAAW,GAAGc,YAAYd,WAAW;QACjDe,YAAYd,KAAK,GAAGa,YAAYb,KAAK;QACrC,OAAO,MAAMc,YAAYC,IAAI;IAC/B;AACF"}

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":"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"}
+{"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":";;;;+BAgBaA;;;eAAAA;;;uBAhBiB;4BACA;mCACI;wCAO3B;AAOA,MAAMA;;IACXC,YAAY,AAAiBC,YAA0B,CAAE;aAA5BA,eAAAA;IAA6B;IAE1DC,MAAMC,KAAa,EAAyB;QAC1C,OAAO;YACLC,IAAID,MAAMC,EAAE;YACZC,MAAMF,MAAME,IAAI;YAChBF,OAAOA,MAAMA,KAAK;YAClBG,UAAUH,MAAMG,QAAQ,EAAEC,IAAI,CAACC,IAAO,CAAA;oBACpCC,GAAGD,EAAEC,CAAC;oBACNC,GAAGF,EAAEE,CAAC;oBACNC,WAAWH,EAAEG,SAAS;oBACtBC,SAAST,MAAMC,EAAE;gBACnB,CAAA;QACF;IACF;IAEA,MAAMS,OAAO;QACX,OAAOC,YAAK,CAACC,IAAI,CAAC,CAAC;IACrB;IAEA,MAAMC,IAAIJ,OAAoB,EAAE;QAC9B,MAAMT,QAAQ,MAAMW,YAAK,CAACG,OAAO,CAAC;YAAEC,KAAKN;QAAQ;QACjD,IAAI,CAACT,OAAO;YACV,MAAM,IAAIgB,oCAAiB,CAAC,CAAC,qCAAqC,CAAC;QACrE;QAEA,OAAOhB;IACT;IAEA,MAAMiB,qBAAqB;QACzB,OAAO,MAAM,IAAI,CAACC,MAAM,CAAC;YACvBhB,MAAM;YACNF,OAAO;YACPG,UAAU,EAAE;QACd;IACF;IAEA,MAAMe,OAAOlB,KAAkC,EAAE;QAC/C,MAAMmB,iBAAiB,MAAMC,IAAAA,yBAAa,EAACpB,OAAOqB,IAAAA,iDAAyB,EAAC;QAE5E,OAAOV,YAAK,CAACO,MAAM,CAACC;IACtB;IAEA,MAAMG,OAAOb,OAAoB,EAAEa,MAAmC,EAAE;QACtE,MAAMC,gBAAgB,MAAM,IAAI,CAACV,GAAG,CAACJ;QAErC,IAAIa,OAAOnB,QAAQ,EAAE;YACnB,KAAK,MAAMqB,YAAYF,OAAOnB,QAAQ,CAAE;gBACtCqB,SAASf,OAAO,GAAGc,cAActB,EAAE;YACrC;QACF;QAEA,MAAMwB,cAAc;YAClB,GAAGF,aAAa;YAChBrB,MAAMoB,OAAOpB,IAAI;YACjBC,UAAUmB,OAAOnB,QAAQ;YACzBH,OAAOsB,OAAOtB,KAAK;QACrB;QACA,MAAM0B,QAAQ,MAAMN,IAAAA,yBAAa,EAACK,aAAaJ,IAAAA,iDAAyB,EAAC;QAEzEE,cAAcrB,IAAI,GAAGwB,MAAMxB,IAAI;QAC/BqB,cAAcvB,KAAK,GAAG0B,MAAM1B,KAAK;QACjCuB,cAAcpB,QAAQ,GAAGuB,MAAMvB,QAAQ;QACvC,OAAO,MAAMoB,cAAcI,IAAI;IACjC;IAEA,MAAMC,WAAWnB,OAAoB,EAAEoB,SAAiB,EAAE;QACxD,MAAM,EAAE3B,IAAI,EAAE,GAAG,MAAMkB,IAAAA,yBAAa,EAAC;YAAElB,MAAM2B;QAAU,GAAGC,6CAAqB;QAE/E,MAAM9B,QAAQ,MAAM,IAAI,CAACa,GAAG,CAACJ;QAC7BT,MAAME,IAAI,GAAGA;QACb,OAAO,MAAMF,MAAM2B,IAAI;IACzB;IAEA,MAAMI,YAAYtB,OAAoB,EAAEuB,KAAa,EAAE;QACrD,MAAM,EAAEhC,OAAOiC,UAAU,EAAE,GAAG,MAAMb,IAAAA,yBAAa,EAAC;YAAEpB,OAAOgC;QAAM,GAAGE,8CAAsB;QAE1F,MAAMlC,QAAQ,MAAM,IAAI,CAACa,GAAG,CAACJ;QAC7BT,MAAMA,KAAK,GAAGiC;QACd,OAAO,MAAMjC,MAAM2B,IAAI;IACzB;IAEA,MAAMQ,0BAA0B3B,SAAsB,EAAE;QACtD,MAAMG,YAAK,CAACyB,UAAU,CACpB,CAAC,GACD;YACEC,OAAO;gBACLlC,UAAU;oBACRK,WAAW;wBACT8B,KAAK;4BAAC9B;yBAAU;oBAClB;gBACF;YACF;QACF;IAEJ;IAEA,MAAM+B,mBAAmB9B,OAAoB,EAAE+B,eAAyC,EAAE;QACxF,MAAMxC,QAAQ,MAAM,IAAI,CAACa,GAAG,CAACJ;QAE7B+B,gBAAgB/B,OAAO,GAAGT,MAAMC,EAAE;QAClC,MAAMwC,aAAa,MAAMrB,IAAAA,yBAAa,EAACoB,iBAAiBE,IAAAA,4CAAoB,EAAC;QAG7E,MAAM,IAAI,CAAC5C,YAAY,CAAC6C,4BAA4B,CAACF,WAAWjC,SAAS;QAGzER,MAAMG,QAAQ,GAAGH,MAAMG,QAAQ,CAACyC,MAAM,CAAC,CAACpB,WAAa,CAAEA,CAAAA,SAASlB,CAAC,KAAKmC,WAAWnC,CAAC,IAAIkB,SAASjB,CAAC,KAAKkC,WAAWlC,CAAC,AAADA;QAEhH,MAAMsC,gBAAgB7C,MAAMG,QAAQ,CAAC2C,SAAS,CAC5C,CAACtB,WAAaA,SAAShB,SAAS,CAACuC,QAAQ,OAAON,WAAWjC,SAAS,CAACuC,QAAQ;QAE/E,IAAIF,kBAAkB,CAAC,GAAG;YACxB7C,MAAMG,QAAQ,CAAC0C,cAAc,GAAGJ;QAClC,OAAO;YACLzC,MAAMG,QAAQ,CAAC6C,IAAI,CAACP;QACtB;QAEA,MAAMzC,MAAM2B,IAAI;QAChB,OAAO3B;IACT;IAEA,MAAMiD,cAAcxC,OAAoB,EAAED,SAAsB,EAAE;QAChE,MAAMR,QAAQ,MAAM,IAAI,CAACa,GAAG,CAACJ;QAC7B,MAAMgC,aAAa,MAAMrB,IAAAA,yBAAa,EAAC;YAAEZ;QAAU,GAAG0C,IAAAA,kDAA0B,EAAC;QAGjF,MAAM,IAAI,CAACpD,YAAY,CAAC6C,4BAA4B,CAACF,WAAWjC,SAAS;QAEzE,MAAM2C,2BAA2BnD,MAAMG,QAAQ,CAAC2C,SAAS,CACvD,CAACM,MAAQA,IAAI5C,SAAS,CAACuC,QAAQ,OAAON,WAAWjC,SAAS,CAACuC,QAAQ;QAErE,IAAII,6BAA6B,CAAC,GAAG,OAAOnD;QAC5CA,MAAMG,QAAQ,CAACkD,MAAM,CAACF,0BAA0B;QAChD,MAAMnD,MAAM2B,IAAI;QAChB,OAAO3B;IACT;IAEA,MAAMsD,OAAO7C,OAAoB,EAAE;QACjC,MAAM,IAAI,CAACI,GAAG,CAACJ;QACf,MAAME,YAAK,CAAC4C,SAAS,CAAC;YAAExC,KAAKN;QAAQ;IACvC;AACF"}

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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"}