@fdm-monster/server 1.5.1 → 1.5.3

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/floor.service.ts"],"names":["FloorService","printerCache","logger","constructor","loggerFactory","name","toDto","floor","id","printers","map","p","x","y","printerId","toString","floorId","list","patchPositions","listCachedPrinters","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","getFloorsOfPrinterId","$elemMatch","deletePrinterFromAnyFloor","updateMany","$pull","$in","addOrUpdatePrinter","printerInFloor","validInput","printerInFloorRules","getCachedPrinterOrThrowAsync","filter","pif","foundPrinterInFloorIndex","findIndex","push","removePrinter","removePrinterInFloorRules","splice","delete","deleteOne"],"mappings":";;;;+BAkBaA;;;eAAAA;;;uBAlBiB;4BACA;mCACI;wCAQ3B;AAQA,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,CAACC,GAAG,CAAC,CAACC,IAAO,CAAA;oBACnCC,GAAGD,EAAEC,CAAC;oBACNC,GAAGF,EAAEE,CAAC;oBACNC,WAAWH,EAAEG,SAAS,CAACC,QAAQ;oBAC/BC,SAAST,MAAMC,EAAE;gBACnB,CAAA;QACF;IACF;IAEA;;GAEC,GACD,MAAMS,KAAKC,iBAAiB,IAAI,EAAE;QAChC,MAAMT,WAAW,MAAM,IAAI,CAACR,YAAY,CAACkB,kBAAkB,CAAC;QAC5D,gDAAgD;QAEhD,MAAMC,SAAS,MAAMC,YAAK,CAACC,IAAI,CAAC,CAAC;QACjC,IAAI,CAACJ,gBAAgB;YACnB,OAAOE;QACT;QAEA,qCAAqC;QACrC,gCAAgC;QAChC,2CAA2C;QAE3C,uDAAuD;QAEvD,mCAAmC;QACnC,mDAAmD;QACnD,qCAAqC;QACrC,sBAAsB;QACtB,qDAAqD;QACrD,gEAAgE;QAChE,0BAA0B;QAC1B,uDAAuD;QACvD,gBAAgB;QAChB,MAAM;QACN,EAAE;QACF,6DAA6D;QAC7D,oDAAoD;QACpD,mBAAmB;QACnB,uDAAuD;QACvD,MAAM;QACN,EAAE;QACF,+BAA+B;QAC/B,2CAA2C;QAC3C,IAAI;QACJ,EAAE;QACF,2CAA2C;QAC3C,uGAAuG;QACvG,wBAAwB;QACxB,sBAAsB;QACtB,8IAA8I;QAC9I,OAAO;QACP,IAAI;QACJ,IAAI;QAEJ,OAAOA;IACT;IAEA,MAAMG,IAAIP,OAAoB,EAAEQ,aAAa,IAAI,EAAE;QACjD,MAAMjB,QAAQ,MAAMc,YAAK,CAACI,OAAO,CAAC;YAAEC,KAAKV;QAAQ;QACjD,IAAI,CAACT,SAASiB,YAAY;YACxB,MAAM,IAAIG,oCAAiB,CAAC,CAAC,cAAc,EAAEX,QAAQ,gBAAgB,CAAC;QACxE;QAEA,OAAOT;IACT;IAEA,MAAMqB,qBAAqB;QACzB,OAAO,MAAM,IAAI,CAACC,MAAM,CAAC;YACvBxB,MAAM;YACNE,OAAO;QACT;IACF;IAEA;;GAEC,GACD,MAAMsB,OAAOtB,KAAqB,EAAE;QAClC,MAAMuB,iBAAiB,MAAMC,IAAAA,yBAAa,EAACxB,OAAOyB,wCAAgB;QAClE,OAAOX,YAAK,CAACQ,MAAM,CAACC;IACtB;IAEA,MAAMG,OAAOjB,OAAoB,EAAEkB,KAAqB,EAAE;QACxD,MAAMC,gBAAgB,MAAM,IAAI,CAACZ,GAAG,CAACP;QACrC,MAAM,EAAEX,IAAI,EAAEE,KAAK,EAAEE,QAAQ,EAAE,GAAG,MAAMsB,IAAAA,yBAAa,EAACG,OAAOE,wCAAgB;QAC7ED,cAAc9B,IAAI,GAAGA;QACrB8B,cAAc5B,KAAK,GAAGA;QACtB4B,cAAc1B,QAAQ,GAAGA;QACzB,OAAO,MAAM0B,cAAcE,IAAI;IACjC;IAEA,MAAMC,WAAWtB,OAAoB,EAAEuB,SAAiB,EAAE;QACxD,MAAMhC,QAAQ,MAAM,IAAI,CAACgB,GAAG,CAACP;QAC7B,MAAM,EAAEX,IAAI,EAAE,GAAG,MAAM0B,IAAAA,yBAAa,EAAC;YAAE1B,MAAMkC;QAAU,GAAGC,4CAAoB;QAC9EjC,MAAMF,IAAI,GAAGA;QACb,OAAO,MAAME,MAAM8B,IAAI;IACzB;IAEA,MAAMI,YAAYzB,OAAoB,EAAE0B,KAAa,EAAE;QACrD,MAAMnC,QAAQ,MAAM,IAAI,CAACgB,GAAG,CAACP;QAC7B,MAAM,EAAET,OAAOoC,UAAU,EAAE,GAAG,MAAMZ,IAAAA,yBAAa,EAAC;YAAExB,OAAOmC;QAAM,GAAGE,8CAAsB;QAC1FrC,MAAMA,KAAK,GAAGoC;QACd,OAAO,MAAMpC,MAAM8B,IAAI;IACzB;IAEA,MAAMQ,qBAAqB/B,SAAsB,EAAE;QACjD,OAAOO,YAAK,CAACC,IAAI,CAAC;YAAEb,UAAU;gBAAEqC,YAAY;oBAAEhC;gBAAU;YAAE;QAAE;IAC9D;IAEA,MAAMiC,0BAA0BjC,SAAsB,EAAE;QACtD,MAAMO,YAAK,CAAC2B,UAAU,CACpB,CAAC,GACD;YACEC,OAAO;gBACLxC,UAAU;oBACRK,WAAW;wBACToC,KAAK;4BAACpC;yBAAU;oBAClB;gBACF;YACF;QACF;IAEJ;IAEA,MAAMqC,mBAAmBnC,OAAoB,EAAEoC,cAAiC,EAAE;QAChF,MAAM7C,QAAQ,MAAM,IAAI,CAACgB,GAAG,CAACP,SAAS;QACtC,MAAMqC,aAAa,MAAMtB,IAAAA,yBAAa,EAACqB,gBAAgBE,2CAAmB;QAE1E,wBAAwB;QACxB,MAAM,IAAI,CAACrD,YAAY,CAACsD,4BAA4B,CAACF,WAAWvC,SAAS;QAEzE,qCAAqC;QACrCP,MAAME,QAAQ,GAAGF,MAAME,QAAQ,CAAC+C,MAAM,CACpC,CAACC,MAA2B,CAAEA,CAAAA,IAAI7C,CAAC,KAAKwC,eAAexC,CAAC,IAAI6C,IAAI5C,CAAC,KAAKuC,eAAevC,CAAC,AAADA;QAGvF,MAAM6C,2BAA2BnD,MAAME,QAAQ,CAACkD,SAAS,CACvD,CAACF,MAA2BA,IAAI3C,SAAS,CAACC,QAAQ,OAAOsC,WAAWvC,SAAS;QAE/E,IAAI4C,6BAA6B,CAAC,GAAG;YACnCnD,MAAME,QAAQ,CAACiD,yBAAyB,GAAGL;QAC7C,OAAO;YACL9C,MAAME,QAAQ,CAACmD,IAAI,CAACP;QACtB;QAEA,MAAM9C,MAAM8B,IAAI;QAChB,OAAO9B;IACT;IAEA,MAAMsD,cAAc7C,OAAoB,EAAEF,SAAsB,EAAE;QAChE,MAAMP,QAAQ,MAAM,IAAI,CAACgB,GAAG,CAACP,SAAS;QACtC,MAAMqC,aAAa,MAAMtB,IAAAA,yBAAa,EAAC;YAAEjB;QAAU,GAAGgD,iDAAyB;QAE/E,wBAAwB;QACxB,MAAM,IAAI,CAAC7D,YAAY,CAACsD,4BAA4B,CAACF,WAAWvC,SAAS;QAEzE,MAAM4C,2BAA2BnD,MAAME,QAAQ,CAACkD,SAAS,CACvD,CAACF,MAA2BA,IAAI3C,SAAS,CAACC,QAAQ,OAAOsC,WAAWvC,SAAS;QAE/E,IAAI4C,6BAA6B,CAAC,GAAG,OAAOnD;QAC5CA,MAAME,QAAQ,CAACsD,MAAM,CAACL,0BAA0B;QAChD,MAAMnD,MAAM8B,IAAI;QAChB,OAAO9B;IACT;IAEA,MAAMyD,OAAOhD,OAAoB,EAAE;QACjC,MAAM,IAAI,CAACO,GAAG,CAACP,SAAS;QACxB,MAAMK,YAAK,CAAC4C,SAAS,CAAC;YAAEvC,KAAKV;QAAQ;IACvC;AACF"}
+{"version":3,"sources":["../../src/services/floor.service.ts"],"names":["FloorService","printerCache","logger","constructor","loggerFactory","name","toDto","floor","id","printers","map","p","x","y","printerId","toString","floorId","list","patchPositions","listCachedPrinters","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","getFloorsOfPrinterId","$elemMatch","deletePrinterFromAnyFloor","updateMany","$pull","$in","addOrUpdatePrinter","printerInFloor","validInput","printerInFloorRules","getCachedPrinterOrThrowAsync","filter","pif","foundPrinterInFloorIndex","findIndex","push","removePrinter","removePrinterInFloorRules","splice","delete","deleteOne"],"mappings":"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"}

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

@@ -28,6 +28,16 @@ _export(exports, {
         return UpdateFloorDto;
     }
 });
+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 PositionDto {
     x;
     y;
@@ -47,13 +57,41 @@ class FloorDto {
     printers;
 }
 class CreateFloorDto {
+    printers;
     name;
     floor;
 }
+_ts_decorate([
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Array)
+], CreateFloorDto.prototype, "printers", void 0);
+_ts_decorate([
+    (0, _classvalidator.IsNotEmpty)(),
+    _ts_metadata("design:type", String)
+], CreateFloorDto.prototype, "name", void 0);
+_ts_decorate([
+    (0, _classvalidator.IsDefined)(),
+    (0, _classvalidator.IsNumber)(),
+    _ts_metadata("design:type", Number)
+], CreateFloorDto.prototype, "floor", void 0);
 class UpdateFloorDto {
+    printers;
     name;
     floor;
 }
+_ts_decorate([
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Array)
+], UpdateFloorDto.prototype, "printers", void 0);
+_ts_decorate([
+    (0, _classvalidator.IsDefined)(),
+    _ts_metadata("design:type", String)
+], UpdateFloorDto.prototype, "name", void 0);
+_ts_decorate([
+    (0, _classvalidator.IsDefined)(),
+    (0, _classvalidator.IsNumber)(),
+    _ts_metadata("design:type", Number)
+], UpdateFloorDto.prototype, "floor", void 0);
 class AddOrUpdatePrinterDto {
     printerId;
 }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/floor.dto.ts"],"names":["AddOrUpdatePrinterDto","CreateFloorDto","FloorDto","PositionDto","PrinterInFloorDto","UpdateFloorDto","x","y","printerId","floorId","id","name","floor","printers"],"mappings":";;;;;;;;;;;IAkCaA,qBAAqB;eAArBA;;IAVAC,cAAc;eAAdA;;IAPAC,QAAQ;eAARA;;IAfAC,WAAW;eAAXA;;IAQAC,iBAAiB;eAAjBA;;IAmBAC,cAAc;eAAdA;;;AA3BN,MAAMF;IACXG,EAAU;IACVC,EAAU;IACVC,UAAmB;IACnBC,QAAiB;AACnB;AAGO,MAAML;IACXM,GAAY;IACZJ,EAAU;IACVC,EAAU;IACVC,UAAkB;AACpB;AAEO,MAAMN;IACXQ,GAAY;IACZC,KAAa;IACbC,MAAc;IACdC,SAAwB;AAC1B;AAEO,MAAMZ;IACXU,KAAa;IACbC,MAAc;AAChB;AAEO,MAAMP;IACXM,KAAc;IACdC,MAAe;AACjB;AAEO,MAAMZ;IACXQ,UAAmB;AACrB"}
+{"version":3,"sources":["../../../src/services/interfaces/floor.dto.ts"],"names":["AddOrUpdatePrinterDto","CreateFloorDto","FloorDto","PositionDto","PrinterInFloorDto","UpdateFloorDto","x","y","printerId","floorId","id","name","floor","printers","IsOptional","IsNotEmpty","IsDefined","IsNumber"],"mappings":";;;;;;;;;;;IA6CaA,qBAAqB;eAArBA;;IApBAC,cAAc;eAAdA;;IAPAC,QAAQ;eAARA;;IAfAC,WAAW;eAAXA;;IAQAC,iBAAiB;eAAjBA;;IAwBAC,cAAc;eAAdA;;;gCAlC+C;;;;;;;;;;AAErD,MAAMF;IACXG,EAAU;IACVC,EAAU;IACVC,UAAmB;IACnBC,QAAiB;AACnB;AAGO,MAAML;IACXM,GAAY;IACZJ,EAAU;IACVC,EAAU;IACVC,UAAkB;AACpB;AAEO,MAAMN;IACXQ,GAAY;IACZC,KAAa;IACbC,MAAc;IACdC,SAAiC;AACnC;AAEO,MAAMZ;IAEXY,SAAkC;IAElCF,KAAa;IAGbC,MAAc;AAChB;;IAPGE,IAAAA,0BAAU;;GADAb;;IAGVc,IAAAA,0BAAU;;GAHAd;;IAKVe,IAAAA,yBAAS;IACTC,IAAAA,wBAAQ;;GANEhB;AAUN,MAAMI;IAEXQ,SAAkC;IAElCF,KAAc;IAGdC,MAAe;AACjB;;IAPGE,IAAAA,0BAAU;;GADAT;;IAGVW,IAAAA,yBAAS;;GAHCX;;IAKVW,IAAAA,yBAAS;IACTC,IAAAA,wBAAQ;;GANEZ;AAUN,MAAML;IACXQ,UAAmB;AACrB"}

package/dist/services/interfaces/print-completion-context.dto.js

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

package/dist/services/interfaces/print-completion-context.dto.js.map

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

package/dist/services/interfaces/print-completion.dto.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    CreatePrintCompletionDto: function() {
+        return CreatePrintCompletionDto;
+    },
+    PrintCompletionDto: function() {
+        return PrintCompletionDto;
+    }
+});
+class CreatePrintCompletionDto {
+    fileName;
+    status;
+    printerId;
+    printerReference;
+    completionLog;
+    correlationId;
+    context;
+}
+class PrintCompletionDto {
+    id;
+    fileName;
+    createdAt;
+    status;
+    printerId;
+    printerReference;
+    completionLog;
+    correlationId;
+    context;
+}
+
+//# sourceMappingURL=print-completion.dto.js.map

package/dist/services/interfaces/print-completion.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/interfaces/print-completion.dto.ts"],"names":["CreatePrintCompletionDto","PrintCompletionDto","fileName","status","printerId","printerReference","completionLog","correlationId","context","id","createdAt"],"mappings":";;;;;;;;;;;IAMaA,wBAAwB;eAAxBA;;IAUAC,kBAAkB;eAAlBA;;;AAVN,MAAMD;IACXE,SAAiB;IACjBC,OAAe;IACfC,UAAmB;IACnBC,iBAA0B;IAC1BC,cAAsB;IACtBC,cAAsB;IACtBC,QAAgC;AAClC;AAEO,MAAMP;IACXQ,GAAa;IACbP,SAAiB;IACjBQ,UAAkB;IAClBP,OAAe;IACfC,UAAmB;IACnBC,iBAA0B;IAC1BC,cAAsB;IACtBC,cAAsB;IACtBC,QAAgC;AAClC"}

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

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

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

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

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

@@ -2,17 +2,30 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "PrinterDto", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    PrinterDto: function() {
         return PrinterDto;
+    },
+    PrinterUnsafeDto: function() {
+        return PrinterUnsafeDto;
     }
 });
 const _sharedconstants = require("../../shared.constants");
 class PrinterDto extends _sharedconstants.IdDto {
     name;
+    enabled;
     disabledReason;
     dateAdded;
 }
+class PrinterUnsafeDto extends PrinterDto {
+    apiKey;
+    printerURL;
+}
 
 //# sourceMappingURL=printer.dto.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/printer.dto.ts"],"names":["PrinterDto","IdDto","name","disabledReason","dateAdded"],"mappings":";;;;+BAEaA;;;eAAAA;;;iCAFS;AAEf,MAAMA,mBAA4BC,sBAAK;IAC5CC,KAAa;IACbC,eAAuB;IACvBC,UAAkB;AACpB"}
+{"version":3,"sources":["../../../src/services/interfaces/printer.dto.ts"],"names":["PrinterDto","PrinterUnsafeDto","IdDto","name","enabled","disabledReason","dateAdded","apiKey","printerURL"],"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;AACrB"}

package/dist/services/interfaces/user-role.dto.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "UserRoleDto", {
+    enumerable: true,
+    get: function() {
+        return UserRoleDto;
+    }
+});
+class UserRoleDto {
+    id;
+    userId;
+    roleId;
+    createdAt;
+}
+
+//# sourceMappingURL=user-role.dto.js.map

package/dist/services/interfaces/user-role.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/interfaces/user-role.dto.ts"],"names":["UserRoleDto","id","userId","roleId","createdAt"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IACXC,GAAW;IACXC,OAAe;IACfC,OAAe;IACfC,UAAgB;AAClB"}

package/dist/services/octoprint/octoprint-api.routes.js

@@ -106,10 +106,10 @@ class OctoPrintRoutes {
             destination
         };
     }
-    printerNameSetting(printerName) {
+    printerNameSetting(name) {
         return {
             appearance: {
-                name: printerName
+                name: name
             }
         };
     }

package/dist/services/octoprint/octoprint-api.routes.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoPrintRoutes","octoPrintBase","apiBase","apiSettingsPart","apiFiles","apiFilesLocation","apiConnection","apiJob","apiPrinterOperations","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiSystemRestartCommand","apiUsers","apiLogin","apiPluginPiSupport","apiProfiles","apiTimelapse","apiPlugin","apiPluginManager","pluginsBase","pluginSoftwareUpdate","pluginSoftwareUpdateCheck","pluginSoftwareUpdateUpdate","pluginFirmwareUpdater","pluginFirmwareUpdaterStatus","pluginFirmwareUpdaterFlash","pluginBackupIndex","pluginBackupEndpoint","pluginBackupFile","filename","pluginBackupFileDownload","pluginBackupFileRestore","pluginManager","pluginManagerPlugins","pluginManagerExport","pluginManagerOrphans","_settingsStore","_timeouts","constructor","settingsStore","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","pluginManagerPlugin","pluginName","pluginManagerRepository","refresh","apiFile","path","apiGetFiles","recursive","apiSoftwareUpdateCheck","force","selectCommand","print","moveFileCommand","destination","printerNameSetting","printerName","appearance","name","gcodeAnalysisSetting","enabled","gcodeAnalysis","runAt","pluginFirmwareUpdaterSettings","subsettings","plugins","firmwareupdater","pluginManagerCommand","url","_ensureTimeoutSettingsLoaded","serverSettings","getSettings","timeoutSettingKey","Error","_prepareRequest","login","timeoutOverride","contentType","jsonContentType","apiKey","printerURL","validateLogin","headers","constructHeaders","timeout","apiTimeout","getDefaultTimeout","URL","normalizeUrl","href","options","_prepareAnonymousRequest","contentTypeHeaderKey","_prepareJsonRequest","data","serializedData","JSON","stringify","undefined"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoPrintRoutes","octoPrintBase","apiBase","apiSettingsPart","apiFiles","apiFilesLocation","apiConnection","apiJob","apiPrinterOperations","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiSystemRestartCommand","apiUsers","apiLogin","apiPluginPiSupport","apiProfiles","apiTimelapse","apiPlugin","apiPluginManager","pluginsBase","pluginSoftwareUpdate","pluginSoftwareUpdateCheck","pluginSoftwareUpdateUpdate","pluginFirmwareUpdater","pluginFirmwareUpdaterStatus","pluginFirmwareUpdaterFlash","pluginBackupIndex","pluginBackupEndpoint","pluginBackupFile","filename","pluginBackupFileDownload","pluginBackupFileRestore","pluginManager","pluginManagerPlugins","pluginManagerExport","pluginManagerOrphans","_settingsStore","_timeouts","constructor","settingsStore","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","pluginManagerPlugin","pluginName","pluginManagerRepository","refresh","apiFile","path","apiGetFiles","recursive","apiSoftwareUpdateCheck","force","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance","gcodeAnalysisSetting","enabled","gcodeAnalysis","runAt","pluginFirmwareUpdaterSettings","subsettings","plugins","firmwareupdater","pluginManagerCommand","url","_ensureTimeoutSettingsLoaded","serverSettings","getSettings","timeoutSettingKey","Error","_prepareRequest","login","timeoutOverride","contentType","jsonContentType","apiKey","printerURL","validateLogin","headers","constructHeaders","timeout","apiTimeout","getDefaultTimeout","URL","normalizeUrl","href","options","_prepareAnonymousRequest","contentTypeHeaderKey","_prepareJsonRequest","data","serializedData","JSON","stringify","undefined"],"mappings":"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"}

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

@@ -11,13 +11,25 @@ Object.defineProperty(exports, "PrintCompletionService", {
 const _models = require("../models");
 const _printcompletionservicevalidation = require("./validators/print-completion-service.validation");
 const _validators = require("../handlers/validators");
-const _arrayutil = require("../utils/array.util");
 const _octoprintwebsocketconstants = require("./octoprint/constants/octoprint-websocket.constants");
+const _printcompletionshared = require("./print-completion.shared");
 class PrintCompletionService {
     logger;
     constructor({ loggerFactory }){
         this.logger = loggerFactory(PrintCompletionService.name);
     }
+    toDto(entity) {
+        return {
+            id: entity.id,
+            completionLog: entity.completionLog,
+            context: entity.context,
+            fileName: entity.fileName,
+            createdAt: entity.createdAt,
+            correlationId: entity.correlationId,
+            status: entity.status,
+            printerId: entity.printerId.toString()
+        };
+    }
     async create(input) {
         const { printerId, fileName, completionLog, status, context } = await (0, _validators.validateInput)(input, _printcompletionservicevalidation.createPrintCompletionRules);
         return _models.PrintCompletion.create({
@@ -99,9 +111,6 @@ class PrintCompletionService {
             {
                 $group: {
                     _id: "$printerId",
-                    eventCount: {
-                        $sum: 1
-                    },
                     printEvents: {
                         $push: {
                             printerId: "$printerId",
@@ -115,47 +124,7 @@ class PrintCompletionService {
                 }
             }
         ]);
-        const durationDayMSec = 24 * 60 * 60 * 1000;
-        return printCompletionsAggr.map((pc)=>{
-            const jobs = (0, _arrayutil.groupArrayBy)(pc.printEvents, (e)=>e.context?.correlationId);
-            pc.printJobs = Object.entries(jobs).map(([id, events])=>{
-                const eventMap = events.map(({ status, createdAt, fileName, completionLog })=>({
-                        status,
-                        createdAt,
-                        fileName,
-                        completionLog
-                    }));
-                return {
-                    correlationId: id,
-                    events: eventMap,
-                    lastEvent: eventMap.reduce((e1, e2)=>e1.createdAt > e2.createdAt ? e1 : e2)
-                };
-            });
-            pc.correlationIds = pc.printJobs.map((j)=>j.correlationId);
-            pc.printCount = pc.correlationIds?.length;
-            const mappedEvents = pc.printEvents.map(({ status, createdAt, fileName, context, completionLog })=>({
-                    status,
-                    createdAt,
-                    fileName,
-                    context,
-                    completionLog
-                }));
-            const failureEvents = mappedEvents.filter((e)=>e.status === _octoprintwebsocketconstants.EVENT_TYPES.PrintFailed);
-            pc.failureCount = failureEvents?.length;
-            pc.lastFailure = failureEvents?.length ? failureEvents.reduce((j1, j2)=>j1.createdAt > j2.createdAt ? j1 : j2) : null;
-            pc.failureEventsLastWeek = failureEvents.filter((e)=>e.createdAt > Date.now() - 7 * durationDayMSec)?.length;
-            pc.failureEventsLast48H = failureEvents.filter((e)=>e.createdAt > Date.now() - 2 * durationDayMSec)?.length;
-            pc.failureEventsLast24H = failureEvents.filter((e)=>e.createdAt > Date.now() - durationDayMSec)?.length;
-            const successEvents = mappedEvents.filter((e)=>e.status === _octoprintwebsocketconstants.EVENT_TYPES.PrintDone);
-            pc.successCount = successEvents?.length;
-            pc.lastSuccess = successEvents?.length ? successEvents?.reduce((j1, j2)=>j1.createdAt > j2.createdAt ? j1 : j2) : null;
-            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;
-            // Explodes in size quickly, remove the event timeline
-            delete pc.printEvents;
-            return pc;
-        });
+        return (0, _printcompletionshared.processCompletions)(printCompletionsAggr);
     }
 }
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","create","input","printerId","fileName","completionLog","status","context","validateInput","createPrintCompletionRules","PrintCompletion","createdAt","Date","now","list","find","findPrintCompletion","correlationId","updateContext","completionEntry","findOne","EVENT_TYPES","PrintStarted","warn","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","eventCount","$sum","printEvents","$push","durationDayMSec","pc","jobs","groupArrayBy","e","printJobs","entries","id","events","eventMap","lastEvent","reduce","e1","e2","correlationIds","j","printCount","length","mappedEvents","failureEvents","filter","failureCount","lastFailure","j1","j2","failureEventsLastWeek","failureEventsLast48H","failureEventsLast24H","successEvents","successCount","lastSuccess","successEventsLastWeek","successEventsLast48H","successEventsLast24H"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","correlationId","status","printerId","toString","create","input","validateInput","createPrintCompletionRules","PrintCompletion","Date","now","list","find","findPrintCompletion","updateContext","completionEntry","findOne","EVENT_TYPES","PrintStarted","warn","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","printEvents","$push","processCompletions"],"mappings":";;;;+BAYaA;;;eAAAA;;;wBAZmB;kDACW;4BACb;6CACF;uCAOO;AAE5B,MAAMA;IACXC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcH,uBAAuBI,IAAI;IACzD;IAEAC,MAAMC,MAAwB,EAAmC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,eAAeN,OAAOM,aAAa;YACnCC,QAAQP,OAAOO,MAAM;YACrBC,WAAWR,OAAOQ,SAAS,CAACC,QAAQ;QACtC;IACF;IAEA,MAAMC,OAAOC,KAA4C,EAAE;QACzD,MAAM,EAAEH,SAAS,EAAEJ,QAAQ,EAAEF,aAAa,EAAEK,MAAM,EAAEJ,OAAO,EAAE,GAAG,MAAMS,IAAAA,yBAAa,EAACD,OAAOE,4DAA0B;QAErH,OAAOC,uBAAe,CAACJ,MAAM,CAAC;YAC5BF;YACAJ;YACAF;YACAK;YACAF,WAAWU,KAAKC,GAAG;YACnBb;QACF;IACF;IAEA,MAAMc,OAAO;QACX,OAAOH,uBAAe,CAACI,IAAI,CAAC,CAAC;IAC/B;IAEA,MAAMC,oBAAoBb,aAAqB,EAAE;QAC/C,OAAOQ,uBAAe,CAACI,IAAI,CAAC;YAC1B,yBAAyBZ;QAC3B;IACF;IAEA,MAAMc,cAAcd,aAAqB,EAAEH,OAA+B,EAAE;QAC1E,MAAMkB,kBAAkB,MAAMP,uBAAe,CAACQ,OAAO,CAAC;YACpD,yBAAyBhB;YACzBC,QAAQgB,wCAAW,CAACC,YAAY;QAClC;QAEA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC1B,MAAM,CAAC8B,IAAI,CAAC,CAAC,yBAAyB,EAAEnB,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAe,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAMkB,gBAAgBK,IAAI;IAC5B;IAEA,MAAMC,oBAAoB;QACxB,MAAMC,WAAW,MAAMd,uBAAe,CAACe,SAAS,CAAC;YAC/C;gBAAEC,OAAO;oBAAEtB,WAAW;oBAAGH,WAAW,CAAC;gBAAE;YAAE;YACzC;gBACE0B,QAAQ;oBACNC,KAAK;oBACL3B,WAAW;wBAAE4B,QAAQ;oBAAa;oBAClC9B,SAAS;wBAAE8B,QAAQ;oBAAW;oBAC9B1B,QAAQ;wBAAE0B,QAAQ;oBAAU;oBAC5B7B,UAAU;wBAAE6B,QAAQ;oBAAY;gBAClC;YACF;YACA;gBACEC,QAAQ;oBACN3B,QAAQ;wBACN4B,MAAM;4BAACZ,wCAAW,CAACa,SAAS;4BAAEb,wCAAW,CAACc,WAAW;yBAAC;oBACxD;gBACF;YACF;SACD;QAED,OAAOC,OAAOC,WAAW,CACvBX,SAASY,GAAG,CAAC,CAACC;YACZA,EAAEjC,SAAS,GAAGiC,EAAET,GAAG;YACnB,OAAOS,EAAET,GAAG;YACZ,OAAO;gBAACS,EAAEjC,SAAS;gBAAEiC;aAAE;QACzB;IAEJ;IAEA,MAAMC,2BAA2B;QAC/B,MAAMC,uBAAuB,MAAM7B,uBAAe,CAACe,SAAS,CAAC;YAC3D;gBACEE,QAAQ;oBACNC,KAAK;oBACLY,aAAa;wBACXC,OAAO;4BACLrC,WAAW;4BACXL,SAAS;4BACTD,eAAe;4BACfE,UAAU;4BACVG,QAAQ;4BACRF,WAAW;wBACb;oBACF;gBACF;YACF;SACD;QAED,OAAOyC,IAAAA,yCAAkB,EAACH;IAC5B;AACF"}

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

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "processCompletions", {
+    enumerable: true,
+    get: function() {
+        return processCompletions;
+    }
+});
+const _arrayutil = require("../utils/array.util");
+const _octoprintwebsocketconstants = require("./octoprint/constants/octoprint-websocket.constants");
+const durationDayMSec = 24 * 60 * 60 * 1000;
+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);
+        pc.printJobs = Object.entries(jobs).map(([id, events])=>{
+            const eventMap = events.map(({ status, createdAt, fileName, completionLog })=>({
+                    status,
+                    createdAt,
+                    fileName,
+                    completionLog
+                }));
+            return {
+                correlationId: id,
+                events: eventMap,
+                lastEvent: eventMap.reduce((e1, e2)=>e1.createdAt > e2.createdAt ? e1 : e2)
+            };
+        });
+        pc.correlationIds = pc.printJobs.map((j)=>j.correlationId);
+        pc.printCount = pc.correlationIds?.length;
+        pc.eventCount = pc.printEvents.length;
+        const mappedEvents = pc.printEvents.map(({ status, createdAt, fileName, context, completionLog })=>({
+                status,
+                createdAt,
+                fileName,
+                context,
+                completionLog
+            }));
+        const failureEvents = mappedEvents.filter((e)=>e.status === _octoprintwebsocketconstants.EVENT_TYPES.PrintFailed);
+        pc.failureCount = failureEvents?.length;
+        pc.lastFailure = failureEvents?.length ? failureEvents.reduce((j1, j2)=>j1.createdAt > j2.createdAt ? j1 : j2) : null;
+        pc.failureEventsLastWeek = failureEvents.filter((e)=>e.createdAt > Date.now() - 7 * durationDayMSec)?.length;
+        pc.failureEventsLast48H = failureEvents.filter((e)=>e.createdAt > Date.now() - 2 * durationDayMSec)?.length;
+        pc.failureEventsLast24H = failureEvents.filter((e)=>e.createdAt > Date.now() - durationDayMSec)?.length;
+        const successEvents = mappedEvents.filter((e)=>e.status === _octoprintwebsocketconstants.EVENT_TYPES.PrintDone);
+        pc.successCount = successEvents?.length;
+        pc.lastSuccess = successEvents?.length ? successEvents?.reduce((j1, j2)=>j1.createdAt > j2.createdAt ? j1 : j2) : null;
+        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;
+        // Explodes in size quickly, remove the event timeline
+        delete pc.printEvents;
+        return pc;
+    });
+}
+
+//# sourceMappingURL=print-completion.shared.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/services/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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"}

package/dist/services/printer-files.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/printer-files.service.ts"],"names":["PrinterFilesService","printerService","logger","constructor","loggerFactory","name","getPrinterFilesStorage","printerId","printer","get","fileList","storage","updateFiles","markModified","save","appendOrReplaceFile","addedFile","foundFileIndex","files","findIndex","f","path","push","lastPrintedFile","setPrinterLastPrintedFile","e","warn","fileName","editTimestamp","Date","now","updateLastPrintedFile","log","clearFiles","deleteFile","filePath","throwError","fileIndex","findFileIndex","NotFoundException","splice"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/printer-files.service.ts"],"names":["PrinterFilesService","printerService","logger","constructor","loggerFactory","name","getPrinterFilesStorage","printerId","printer","get","fileList","storage","updateFiles","markModified","save","appendOrReplaceFile","addedFile","foundFileIndex","files","findIndex","f","path","push","lastPrintedFile","setPrinterLastPrintedFile","e","warn","fileName","editTimestamp","Date","now","updateLastPrintedFile","log","clearFiles","deleteFile","filePath","throwError","fileIndex","findFileIndex","NotFoundException","splice"],"mappings":"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"}

package/dist/services/printer.service.js

@@ -22,6 +22,22 @@ class PrinterService {
         this.eventEmitter2 = eventEmitter2;
         this.logger = loggerFactory(PrinterService.name);
     }
+    toUnsafeDto(entity) {
+        return {
+            ...this.toDto(entity),
+            apiKey: entity.apiKey,
+            printerURL: entity.printerURL
+        };
+    }
+    toDto(entity) {
+        return {
+            id: entity.id,
+            name: entity.name,
+            enabled: entity.enabled,
+            disabledReason: entity.disabledReason,
+            dateAdded: entity.dateAdded
+        };
+    }
     async list() {
         return _models.Printer.find({}, null, {
             sort: {
@@ -64,13 +80,13 @@ class PrinterService {
    */ async update(printerId, updateData) {
         const printer = await this.get(printerId);
         updateData.printerURL = (0, _urlutils.normalizeURLWithProtocol)(updateData.printerURL);
-        const { printerURL, apiKey, enabled, settingsAppearance } = await (0, _validators.validateInput)(updateData, _printerservicevalidation.createMongoPrinterRules);
+        const { printerURL, apiKey, enabled, name } = await (0, _validators.validateInput)(updateData, _printerservicevalidation.createMongoPrinterRules);
         printer.printerURL = printerURL;
         printer.apiKey = apiKey;
         if (enabled !== undefined) {
             printer.enabled = enabled;
         }
-        printer.settingsAppearance.name = settingsAppearance.name;
+        printer.name = name;
         await printer.save();
         this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
             printer

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

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

package/dist/services/validators/floor-service.validation.js

@@ -29,14 +29,16 @@ _export(exports, {
     }
 });
 const _serviceconstants = require("../../constants/service.constants");
-const removePrinterInFloorRules = {
-    printerId: "required|mongoId"
-};
-const printerInFloorRules = {
-    printerId: "required|mongoId",
-    x: "required|integer|between:0,12",
-    y: "required|integer|between:0,12"
-};
+const _genericvalidation = require("../../controllers/validation/generic.validation");
+const removePrinterInFloorRules = (isSqlite)=>({
+        printerId: (0, _genericvalidation.idRuleV2)(isSqlite)
+    });
+const printerInFloorRules = (isSqlite)=>({
+        printerId: (0, _genericvalidation.idRuleV2)(isSqlite),
+        floorId: isSqlite ? (0, _genericvalidation.idRuleV2)(true) : "not",
+        x: "required|integer|between:0,12",
+        y: "required|integer|between:0,12"
+    });
 const updateFloorNameRules = {
     name: `required|minLength:${_serviceconstants.minPrinterFloorNameLength}`
 };

package/dist/services/validators/floor-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createFloorRules","printerInFloorRules","removePrinterInFloorRules","updateFloorNameRules","updateFloorNumberRules","updateFloorRules","printerId","x","y","name","minPrinterFloorNameLength","floor","printers"],"mappings":";;;;;;;;;;;IA6BaA,gBAAgB;eAAhBA;;IAvBAC,mBAAmB;eAAnBA;;IAJAC,yBAAyB;eAAzBA;;IAUAC,oBAAoB;eAApBA;;IAIAC,sBAAsB;eAAtBA;;IAIAC,gBAAgB;eAAhBA;;;kCApB6B;AAEnC,MAAMH,4BAA4B;IACvCI,WAAW;AACb;AAEO,MAAML,sBAAsB;IACjCK,WAAW;IACXC,GAAG;IACHC,GAAG;AACL;AAEO,MAAML,uBAAuB;IAClCM,MAAM,CAAC,mBAAmB,EAAEC,2CAAyB,CAAC,CAAC;AACzD;AAEO,MAAMN,yBAAyB;IACpCO,OAAO;AACT;AAEO,MAAMN,mBAAmB;IAC9BI,MAAM,CAAC,mBAAmB,EAAEC,2CAAyB,CAAC,CAAC;IACvDC,OAAO;IACPC,UAAU;IACV,uBAAuB;IACvB,eAAe;IACf,eAAe;AACjB;AAEO,MAAMZ,mBAAmB;IAC9BS,MAAM,CAAC,mBAAmB,EAAEC,2CAAyB,CAAC,CAAC;IACvDC,OAAO;IACPC,UAAU;AACZ"}
+{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createFloorRules","printerInFloorRules","removePrinterInFloorRules","updateFloorNameRules","updateFloorNumberRules","updateFloorRules","isSqlite","printerId","idRuleV2","floorId","x","y","name","minPrinterFloorNameLength","floor","printers"],"mappings":";;;;;;;;;;;IA+BaA,gBAAgB;eAAhBA;;IAxBAC,mBAAmB;eAAnBA;;IAJAC,yBAAyB;eAAzBA;;IAWAC,oBAAoB;eAApBA;;IAIAC,sBAAsB;eAAtBA;;IAIAC,gBAAgB;eAAhBA;;;kCAtB6B;mCACjB;AAElB,MAAMH,4BAA4B,CAACI,WAAuB,CAAA;QAC/DC,WAAWC,IAAAA,2BAAQ,EAACF;IACtB,CAAA;AAEO,MAAML,sBAAsB,CAACK,WAAuB,CAAA;QACzDC,WAAWC,IAAAA,2BAAQ,EAACF;QACpBG,SAASH,WAAWE,IAAAA,2BAAQ,EAAC,QAAQ;QACrCE,GAAG;QACHC,GAAG;IACL,CAAA;AAEO,MAAMR,uBAAuB;IAClCS,MAAM,CAAC,mBAAmB,EAAEC,2CAAyB,CAAC,CAAC;AACzD;AAEO,MAAMT,yBAAyB;IACpCU,OAAO;AACT;AAEO,MAAMT,mBAAmB;IAC9BO,MAAM,CAAC,mBAAmB,EAAEC,2CAAyB,CAAC,CAAC;IACvDC,OAAO;IACPC,UAAU;IACV,uBAAuB;IACvB,eAAe;IACf,eAAe;AACjB;AAEO,MAAMf,mBAAmB;IAC9BY,MAAM,CAAC,mBAAmB,EAAEC,2CAAyB,CAAC,CAAC;IACvDC,OAAO;IACPC,UAAU;AACZ"}

package/dist/services/validators/printer-service.validation.js

@@ -28,8 +28,7 @@ const createMongoPrinterRules = {
     apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
     printerURL: "required|httpurl",
     enabled: "boolean",
-    settingsAppearance: "object",
-    "settingsAppearance.name": "string"
+    name: "string"
 };
 const createPrinterRules = {
     apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,

package/dist/services/validators/printer-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","apiKey","UUID_LENGTH","printerURL","enabled","settingsAppearance","name","disabledReason"],"mappings":";;;;;;;;;;;IAEaA,uBAAuB;eAAvBA;;IASAC,kBAAkB;eAAlBA;;IAWAC,+BAA+B;eAA/BA;;IAJAC,wBAAwB;eAAxBA;;;kCAlBe;AAErB,MAAMH,0BAA0B;IACrCI,KAAK;IACLC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,SAAS;IACTC,oBAAoB;IACpB,2BAA2B;AAC7B;AAEO,MAAMR,qBAAqB;IAChCI,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,SAAS;IACTE,MAAM;AACR;AAEO,MAAMP,2BAA2B;IACtCK,SAAS;AACX;AAEO,MAAMN,kCAAkC;IAC7CS,gBAAgB;IAChBH,SAAS;AACX"}
+{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","apiKey","UUID_LENGTH","printerURL","enabled","name","disabledReason"],"mappings":";;;;;;;;;;;IAEaA,uBAAuB;eAAvBA;;IAQAC,kBAAkB;eAAlBA;;IAWAC,+BAA+B;eAA/BA;;IAJAC,wBAAwB;eAAxBA;;;kCAjBe;AAErB,MAAMH,0BAA0B;IACrCI,KAAK;IACLC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMR,qBAAqB;IAChCI,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMN,2BAA2B;IACtCK,SAAS;AACX;AAEO,MAAMN,kCAAkC;IAC7CQ,gBAAgB;IAChBF,SAAS;AACX"}