@fdm-monster/server 1.8.2 → 1.9.0-rc1

package/dist/services/octoprint/utils/octoprint-http-client.builder.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "OctoprintHttpClientBuilder", {
+    enumerable: true,
+    get: function() {
+        return OctoprintHttpClientBuilder;
+    }
+});
+const _defaulthttpclientbuilder = require("../../../shared/default-http-client.builder");
+const _octoprintserviceconstants = require("../constants/octoprint-service.constants");
+class OctoprintHttpClientBuilder extends _defaulthttpclientbuilder.DefaultHttpClientBuilder {
+    build() {
+        if (!this.axiosOptions.baseURL) {
+            throw new Error("Base URL is required");
+        }
+        return super.build();
+    }
+    withXApiKeyHeader(apiKey) {
+        if (!apiKey?.length) {
+            throw new Error("XApiKey header may not be an empty string");
+        }
+        this.withHeaders({
+            [_octoprintserviceconstants.apiKeyHeaderKey]: apiKey
+        });
+        return this;
+    }
+}
+
+//# sourceMappingURL=octoprint-http-client.builder.js.map

package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/octoprint/utils/octoprint-http-client.builder.ts"],"names":["OctoprintHttpClientBuilder","DefaultHttpClientBuilder","build","axiosOptions","baseURL","Error","withXApiKeyHeader","apiKey","length","withHeaders","apiKeyHeaderKey"],"mappings":";;;;+BAIaA;;;eAAAA;;;0CAJ4B;2CACT;AAGzB,MAAMA,mCAAmCC,kDAAwB;IACtDC,QAAgC;QAC9C,IAAI,CAAC,IAAI,CAACC,YAAY,CAACC,OAAO,EAAE;YAC9B,MAAM,IAAIC,MAAM;QAClB;QAEA,OAAO,KAAK,CAACH;IACf;IAEOI,kBAAkBC,MAAe,EAA8B;QACpE,IAAI,CAACA,QAAQC,QAAQ;YACnB,MAAM,IAAIH,MAAM;QAClB;QAEA,IAAI,CAACI,WAAW,CAAC;YAAE,CAACC,0CAAe,CAAC,EAAEH;QAAO;QAE7C,OAAO,IAAI;IACb;AACF"}

package/dist/services/octoprint.api.js

@@ -11,21 +11,21 @@ Object.defineProperty(exports, "OctoprintApi", {
 const _printerapiinterface = require("./printer-api.interface");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 class OctoprintApi {
-    client;
     printerLogin;
-    constructor({ octoprintClient, printerLogin }){
-        this.client = octoprintClient;
+    client;
+    constructor(octoprintClient, printerLogin){
         this.printerLogin = printerLogin;
+        this.client = octoprintClient;
     }
     get type() {
         return _printerapiinterface.OctoprintType;
     }
-    set login(login) {
-        this.printerLogin = login;
-    }
     get login() {
         return this.printerLogin;
     }
+    set login(login) {
+        this.printerLogin = login;
+    }
     async getVersion() {
         const result = await this.client.getApiVersion(this.login);
         return result.data?.server;
@@ -70,12 +70,7 @@ class OctoprintApi {
         await this.client.sendPrintHeadHomeCommand(this.login, axes);
     }
     async getFile(path) {
-        const file = await this.client.getFile(this.login, path);
-        return {
-            path: file.path,
-            size: file.size,
-            date: file.date
-        };
+        return this.client.getFile(this.login, path);
     }
     async getFiles() {
         const files = await this.client.getLocalFiles(this.login, false);
@@ -104,14 +99,16 @@ class OctoprintApi {
         await this.client.deleteFileOrFolder(this.login, path);
     }
     async getSettings() {
-        return await this.client.getSettings(this.login);
+        const response = await this.client.getSettings(this.login);
+        return response.data;
     }
     async getReprintState() {
-        const connected = await this.client.getConnection(this.login);
-        const connectionState = connected.current?.state;
-        const selectedJob = await this.client.getJob(this.login);
+        const connectedResponse = await this.client.getConnection(this.login);
+        const connectionState = connectedResponse.data.current?.state;
+        const selectedJobResponse = await this.client.getJob(this.login);
+        const selectedJob = selectedJobResponse.data;
         const currentJobFile = selectedJob?.job?.file;
-        if (!currentJobFile?.name) {
+        if (!currentJobFile?.path) {
             return {
                 connectionState,
                 reprintState: _printerapiinterface.ReprintState.NoLastPrint
@@ -123,7 +120,6 @@ class OctoprintApi {
             reprintState: _printerapiinterface.ReprintState.LastPrintReady
         };
     }
-    async getThumbnail() {}
 }
 
 //# sourceMappingURL=octoprint.api.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","printerLogin","constructor","octoprintClient","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","file","size","date","getFiles","files","getLocalFiles","map","f","downloadFile","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","select","print","deleteFile","deleteFileOrFolder","deleteFolder","getSettings","getReprintState","connected","getConnection","connectionState","current","state","selectedJob","getJob","currentJobFile","job","name","reprintState","ReprintState","NoLastPrint","LastPrintReady","getThumbnail"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","constructor","octoprintClient","printerLogin","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","getFiles","files","getLocalFiles","map","f","size","date","downloadFile","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","select","print","deleteFile","deleteFileOrFolder","deleteFolder","getSettings","response","getReprintState","connectedResponse","getConnection","connectionState","current","state","selectedJobResponse","getJob","selectedJob","currentJobFile","job","file","reprintState","ReprintState","NoLastPrint","LastPrintReady"],"mappings":"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"}

package/dist/services/orm/base.service.js

@@ -16,11 +16,11 @@ function BaseService(entity, dto, createDTO, updateDto) {
     class BaseServiceHost {
         typeormService;
         repository;
-        constructor({ typeormService }){
+        constructor(typeormService){
             this.typeormService = typeormService;
             this.repository = typeormService.getDataSource().getRepository(entity);
         }
-        async get(id, throwIfNotFound = true, options) {
+        async get(id, options) {
             try {
                 if (id === null || id === undefined) {
                     throw new _typeorm.EntityNotFoundError(entity, "Id was not provided");
@@ -32,10 +32,10 @@ function BaseService(entity, dto, createDTO, updateDto) {
                     }
                 });
             } catch (e) {
-                if (throwIfNotFound && e instanceof _typeorm.EntityNotFoundError) {
+                if (e instanceof _typeorm.EntityNotFoundError) {
                     throw new _runtimeexceptions.NotFoundException(`The entity ${entity} with the provided id was not found`);
                 }
-                return undefined;
+                throw e;
             }
         }
         async list(options) {
@@ -56,20 +56,19 @@ function BaseService(entity, dto, createDTO, updateDto) {
             return await this.get(id);
         }
         async create(dto) {
-            if (dto.id) {
-                delete dto.id;
+            if ("id" in dto && dto.id !== undefined && dto.id !== null) {
+                throw new Error("Cannot create entity with an existing ID. Use update method instead.");
             }
-            await (0, _classvalidator.validate)(dto);
             const entity = this.repository.create(dto);
             await (0, _classvalidator.validate)(entity);
             return await this.repository.save(entity);
         }
-        async delete(id, throwIfNotFound = true) {
-            const entity = await this.get(id, throwIfNotFound);
-            return await this.repository.delete(entity.id);
+        async delete(id) {
+            const entity = await this.get(id);
+            await this.repository.delete(entity.id);
         }
-        async deleteMany(ids, emitEvent = true) {
-            return await this.repository.delete(ids);
+        async deleteMany(ids) {
+            await this.repository.delete(ids);
         }
     }
     return BaseServiceHost;

package/dist/services/orm/base.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","typeormService","repository","constructor","getDataSource","getRepository","get","id","throwIfNotFound","options","undefined","EntityNotFoundError","findOneOrFail","where","e","NotFoundException","list","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","save","delete","deleteMany","ids","emitEvent"],"mappings":";;;;+BAkBgBA;;;eAAAA;;;yBAPT;gCACkB;mCAGS;+BACQ;AAEnC,SAASA,YAKdC,MAAuB,EAAEC,GAAc,EAAEC,SAA2B,EAAEC,SAA2B;IACjG,MAAeC;QACbC,eAA+B;QAC/BC,WAA0B;QAE1BC,YAAY,EAAEF,cAAc,EAAsC,CAAE;YAClE,IAAI,CAACA,cAAc,GAAGA;YACtB,IAAI,CAACC,UAAU,GAAGD,eAAeG,aAAa,GAAGC,aAAa,CAACT;QACjE;QAIA,MAAMU,IAAIC,EAAgB,EAAEC,kBAAkB,IAAI,EAAEC,OAA2B,EAAE;YAC/E,IAAI;gBACF,IAAIF,OAAO,QAAQA,OAAOG,WAAW;oBACnC,MAAM,IAAIC,4BAAmB,CAACf,QAAQ;gBACxC;gBACA,OAAO,IAAI,CAACM,UAAU,CAACU,aAAa,CAAC;oBAAE,GAAGH,OAAO;oBAAEI,OAAO;wBAAEN;oBAAG;gBAAE;YACnE,EAAE,OAAOO,GAAG;gBACV,IAAIN,mBAAmBM,aAAaH,4BAAmB,EAAE;oBACvD,MAAM,IAAII,oCAAiB,CAAC,CAAC,WAAW,EAAEnB,OAAO,mCAAmC,CAAC;gBACvF;gBACA,OAAOc;YACT;QACF;QAEA,MAAMM,KAAKP,OAA4B,EAAE;YACvC,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAACR;QAC9B;QAEA,MAAMS,UAAUC,OAAoBC,2BAAY,EAAEX,OAA4B,EAAE;YAC9E,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAAC;gBAAEI,MAAMF,KAAKG,QAAQ;gBAAEC,MAAMJ,KAAKG,QAAQ,GAAGH,KAAKA,IAAI;gBAAE,GAAGV,OAAO;YAAC;QACjG;QAEA,MAAMe,OAAOjB,EAAgB,EAAER,SAAoB,EAAE;YACnD,MAAMH,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAMkB,IAAAA,wBAAQ,EAAC1B;YACf,MAAM0B,IAAAA,wBAAQ,EAACC,OAAOC,MAAM,CAAC/B,QAAQG;YACrC,MAAM,IAAI,CAACG,UAAU,CAACsB,MAAM,CAAC5B,OAAOW,EAAE,EAAER;YACxC,OAAO,MAAM,IAAI,CAACO,GAAG,CAACC;QACxB;QAEA,MAAMqB,OAAO/B,GAAc,EAAE;YAE3B,IAAIA,IAAIU,EAAE,EAAE;gBACV,OAAOV,IAAIU,EAAE;YACf;YACA,MAAMkB,IAAAA,wBAAQ,EAAC5B;YACf,MAAMD,SAAS,IAAI,CAACM,UAAU,CAAC0B,MAAM,CAAC/B;YACtC,MAAM4B,IAAAA,wBAAQ,EAAC7B;YAEf,OAAO,MAAM,IAAI,CAACM,UAAU,CAAC2B,IAAI,CAACjC;QACpC;QAEA,MAAMkC,OAAOvB,EAAgB,EAAEC,kBAAkB,IAAI,EAAE;YACrD,MAAMZ,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC,IAAIC;YAClC,OAAO,MAAM,IAAI,CAACN,UAAU,CAAC4B,MAAM,CAAClC,OAAOW,EAAE;QAC/C;QAEA,MAAMwB,WAAWC,GAAmB,EAAEC,YAAY,IAAI,EAAyB;YAC7E,OAAO,MAAM,IAAI,CAAC/B,UAAU,CAAC4B,MAAM,CAACE;QACtC;IACF;IAEA,OAAOhC;AACT"}
+{"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","repository","constructor","typeormService","getDataSource","getRepository","get","id","options","undefined","EntityNotFoundError","findOneOrFail","where","e","NotFoundException","list","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","Error","save","delete","deleteMany","ids"],"mappings":";;;;+BASgBA;;;eAAAA;;;yBAN4F;gCACnF;mCAES;+BACQ;AAEnC,SAASA,YAKdC,MAAuB,EAAEC,GAAc,EAAEC,SAA2B,EAAEC,SAA2B;IACjG,MAAeC;;QACbC,WAA0B;QAE1BC,YAAY,AAAmBC,cAA8B,CAAE;iBAAhCA,iBAAAA;YAC7B,IAAI,CAACF,UAAU,GAAGE,eAAeC,aAAa,GAAGC,aAAa,CAACT;QACjE;QAIA,MAAMU,IAAIC,EAAgB,EAAEC,OAA2B,EAAE;YACvD,IAAI;gBACF,IAAID,OAAO,QAAQA,OAAOE,WAAW;oBACnC,MAAM,IAAIC,4BAAmB,CAACd,QAAQ;gBACxC;gBACA,OAAO,IAAI,CAACK,UAAU,CAACU,aAAa,CAAC;oBAAE,GAAGH,OAAO;oBAAEI,OAAO;wBAAEL;oBAAG;gBAAE;YACnE,EAAE,OAAOM,GAAG;gBACV,IAAIA,aAAaH,4BAAmB,EAAE;oBACpC,MAAM,IAAII,oCAAiB,CAAC,CAAC,WAAW,EAAElB,OAAO,mCAAmC,CAAC;gBACvF;gBACA,MAAMiB;YACR;QACF;QAEA,MAAME,KAAKP,OAA4B,EAAE;YACvC,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAACR;QAC9B;QAEA,MAAMS,UAAUC,OAAoBC,2BAAY,EAAEX,OAA4B,EAAE;YAC9E,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAAC;gBAAEI,MAAMF,KAAKG,QAAQ;gBAAEC,MAAMJ,KAAKG,QAAQ,GAAGH,KAAKA,IAAI;gBAAE,GAAGV,OAAO;YAAC;QACjG;QAEA,MAAMe,OAAOhB,EAAgB,EAAER,SAAoB,EAAE;YACnD,MAAMH,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAMiB,IAAAA,wBAAQ,EAACzB;YACf,MAAMyB,IAAAA,wBAAQ,EAACC,OAAOC,MAAM,CAAC9B,QAAQG;YACrC,MAAM,IAAI,CAACE,UAAU,CAACsB,MAAM,CAAC3B,OAAOW,EAAE,EAAER;YACxC,OAAO,MAAM,IAAI,CAACO,GAAG,CAACC;QACxB;QAEA,MAAMoB,OAAO9B,GAAc,EAAE;YAE3B,IAAI,QAAQA,OAAOA,IAAIU,EAAE,KAAKE,aAAaZ,IAAIU,EAAE,KAAK,MAAM;gBAC1D,MAAM,IAAIqB,MAAM;YAClB;YAEA,MAAMhC,SAAS,IAAI,CAACK,UAAU,CAAC0B,MAAM,CAAC9B;YACtC,MAAM2B,IAAAA,wBAAQ,EAAC5B;YAEf,OAAO,MAAM,IAAI,CAACK,UAAU,CAAC4B,IAAI,CAACjC;QACpC;QAEA,MAAMkC,OAAOvB,EAAgB,EAAE;YAC7B,MAAMX,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAM,IAAI,CAACN,UAAU,CAAC6B,MAAM,CAAClC,OAAOW,EAAE;QACxC;QAEA,MAAMwB,WAAWC,GAAmB,EAAE;YACpC,MAAM,IAAI,CAAC/B,UAAU,CAAC6B,MAAM,CAACE;QAC/B;IACF;IAEA,OAAOhC;AACT"}

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

@@ -17,7 +17,11 @@ class CameraStreamService extends (0, _baseservice.BaseService)(_entities.Camera
             id: entity.id,
             streamURL: entity.streamURL,
             name: entity.name,
-            printerId: entity.printerId
+            printerId: entity.printerId,
+            aspectRatio: entity.aspectRatio,
+            rotationClockwise: entity.rotationClockwise,
+            flipHorizontal: entity.flipHorizontal,
+            flipVertical: entity.flipVertical
         };
     }
 }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/camera-stream.service.ts"],"names":["CameraStreamService","BaseService","CameraStream","CameraStreamDto","CreateCameraStreamDto","toDto","entity","id","streamURL","name","printerId"],"mappings":";;;;+BAMaA;;;eAAAA;;;6BANe;0BACC;iCAC0B;AAIhD,MAAMA,4BACHC,IAAAA,wBAAW,EAACC,sBAAY,EAAEC,gCAAe,EAAEC,sCAAqB;IAGxEC,MAAMC,MAAoB,EAAiC;QAEzD,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,WAAWF,OAAOE,SAAS;YAC3BC,MAAMH,OAAOG,IAAI;YACjBC,WAAWJ,OAAOI,SAAS;QAO7B;IACF;AACF"}
+{"version":3,"sources":["../../../src/services/orm/camera-stream.service.ts"],"names":["CameraStreamService","BaseService","CameraStream","CameraStreamDto","CreateCameraStreamDto","toDto","entity","id","streamURL","name","printerId","aspectRatio","rotationClockwise","flipHorizontal","flipVertical"],"mappings":";;;;+BAMaA;;;eAAAA;;;6BANe;0BACC;iCAC0B;AAIhD,MAAMA,4BACHC,IAAAA,wBAAW,EAACC,sBAAY,EAAEC,gCAAe,EAAEC,sCAAqB;IAGxEC,MAAMC,MAAoB,EAAiC;QAEzD,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,WAAWF,OAAOE,SAAS;YAC3BC,MAAMH,OAAOG,IAAI;YACjBC,WAAWJ,OAAOI,SAAS;YAC3BC,aAAaL,OAAOK,WAAW;YAC/BC,mBAAmBN,OAAOM,iBAAiB;YAC3CC,gBAAgBP,OAAOO,cAAc;YACrCC,cAAcR,OAAOQ,YAAY;QACnC;IACF;AACF"}

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

@@ -25,8 +25,8 @@ class CustomGcodeService extends (0, _baseservice.BaseService)(_entities.CustomG
     async create(gcodeScript) {
         return await super.create(gcodeScript);
     }
-    async delete(gcodeScriptId, throwIfNotFound) {
-        return await super.delete(gcodeScriptId, throwIfNotFound);
+    async delete(gcodeScriptId) {
+        await super.delete(gcodeScriptId);
     }
     async get(gcodeScriptId) {
         return await super.get(gcodeScriptId);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/custom-gcode.service.ts"],"names":["CustomGcodeService","BaseService","CustomGcode","CustomGcodeDto","toDto","entity","id","name","description","gcode","create","gcodeScript","delete","gcodeScriptId","throwIfNotFound","get","list","update","updatedData"],"mappings":";;;;+BAMaA;;;eAAAA;;;0BALe;gCAEG;6BACH;AAErB,MAAMA,2BACHC,IAAAA,wBAAW,EAACC,qBAAW,EAAEC,8BAAc,EAAgBA,8BAAc;IAG7EC,MAAMC,MAAmB,EAAkB;QACzC,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,MAAMF,OAAOE,IAAI;YACjBC,aAAaH,OAAOG,WAAW;YAC/BC,OAAO;mBAAIJ,OAAOI,KAAK;aAAC;QAC1B;IACF;IAEA,MAAMC,OAAOC,WAAyC,EAAwB;QAC5E,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,OAAOC,aAA2B,EAAEC,eAAyB,EAAE;QACnE,OAAO,MAAM,KAAK,CAACF,OAAOC,eAAeC;IAC3C;IAEA,MAAMC,IAAIF,aAA2B,EAAwB;QAC3D,OAAO,MAAM,KAAK,CAACE,IAAIF;IACzB;IAEA,MAAMG,OAA+B;QACnC,OAAO,MAAM,KAAK,CAACA;IACrB;IAEA,MAAMC,OAAOJ,aAA2B,EAAEK,WAAyC,EAAwB;QACzG,OAAO,MAAM,KAAK,CAACD,OAAOJ,eAAeK;IAC3C;AACF"}
+{"version":3,"sources":["../../../src/services/orm/custom-gcode.service.ts"],"names":["CustomGcodeService","BaseService","CustomGcode","CustomGcodeDto","toDto","entity","id","name","description","gcode","create","gcodeScript","delete","gcodeScriptId","get","list","update","updatedData"],"mappings":";;;;+BAMaA;;;eAAAA;;;0BALe;gCAEG;6BACH;AAErB,MAAMA,2BACHC,IAAAA,wBAAW,EAACC,qBAAW,EAAEC,8BAAc,EAAgBA,8BAAc;IAG7EC,MAAMC,MAAmB,EAAgC;QACvD,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,MAAMF,OAAOE,IAAI;YACjBC,aAAaH,OAAOG,WAAW;YAC/BC,OAAO;mBAAIJ,OAAOI,KAAK;aAAC;QAC1B;IACF;IAEA,MAAMC,OAAOC,WAAyC,EAAwB;QAC5E,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,OAAOC,aAA2B,EAAE;QACxC,MAAM,KAAK,CAACD,OAAOC;IACrB;IAEA,MAAMC,IAAID,aAA2B,EAAwB;QAC3D,OAAO,MAAM,KAAK,CAACC,IAAID;IACzB;IAEA,MAAME,OAA+B;QACnC,OAAO,MAAM,KAAK,CAACA;IACrB;IAEA,MAAMC,OAAOH,aAA2B,EAAEI,WAAyC,EAAwB;QACzG,OAAO,MAAM,KAAK,CAACD,OAAOH,eAAeI;IAC3C;AACF"}

package/dist/services/orm/floor-position.service.js

@@ -12,11 +12,6 @@ const _floorpositionentity = require("../../entities/floor-position.entity");
 const _baseservice = require("./base.service");
 const _floordto = require("../interfaces/floor.dto");
 class FloorPositionService extends (0, _baseservice.BaseService)(_floorpositionentity.FloorPosition, _floordto.PositionDto) {
-    constructor({ typeormService }){
-        super({
-            typeormService
-        });
-    }
     async create(dto) {
         return super.create(dto);
     }

package/dist/services/orm/floor-position.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","constructor","typeormService","create","dto","findPosition","floorId","x","y","repository","findOneBy","findPrinterPosition","printerId","deletePrinterPositionsByPrinterId","delete","findPrinterPositionOnFloor","toDto","entity"],"mappings":";;;;+BAMaA;;;eAAAA;;;qCANiB;6BACF;0BAGA;AAErB,MAAMA,6BAA6BC,IAAAA,wBAAW,EAACC,kCAAa,EAAEC,qBAAW;IAC9EC,YAAY,EAAEC,cAAc,EAAsC,CAAE;QAClE,KAAK,CAAC;YAAEA;QAAe;IACzB;IAEA,MAAMC,OAAOC,GAA8B,EAA0B;QACnE,OAAO,KAAK,CAACD,OAAOC;IACtB;IAEAC,aAAaC,OAAqB,EAAEC,CAAS,EAAEC,CAAS,EAAE;QACxD,OAAO,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASC;YAAGC;QAAE;IACnD;IAMAG,oBAAoBC,SAAuB,EAAE;QAC3C,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEE;QAAU;IAC/C;IAEAC,kCAAkCD,SAAuB,EAAE;QACzD,OAAO,IAAI,CAACH,UAAU,CAACK,MAAM,CAAC;YAAEF;QAAU;IAC5C;IAEAG,2BAA2BT,OAAqB,EAAEM,SAAuB,EAAE;QACzE,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASM;QAAU;IACxD;IAEAI,MAAMC,MAAqB,EAA6B;QACtD,OAAO;YACLV,GAAGU,OAAOV,CAAC;YACXC,GAAGS,OAAOT,CAAC;YACXI,WAAWK,OAAOL,SAAS;YAC3BN,SAASW,OAAOX,OAAO;QACzB;IACF;AACF"}
+{"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","create","dto","findPosition","floorId","x","y","repository","findOneBy","findPrinterPosition","printerId","deletePrinterPositionsByPrinterId","delete","findPrinterPositionOnFloor","toDto","entity"],"mappings":";;;;+BAKaA;;;eAAAA;;;qCALiB;6BACF;0BAEA;AAErB,MAAMA,6BAA6BC,IAAAA,wBAAW,EAACC,kCAAa,EAAEC,qBAAW;IAC9E,MAAMC,OAAOC,GAA8B,EAA0B;QACnE,OAAO,KAAK,CAACD,OAAOC;IACtB;IAEAC,aAAaC,OAAqB,EAAEC,CAAS,EAAEC,CAAS,EAAE;QACxD,OAAO,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASC;YAAGC;QAAE;IACnD;IAMAG,oBAAoBC,SAAuB,EAAE;QAC3C,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEE;QAAU;IAC/C;IAEAC,kCAAkCD,SAAuB,EAAE;QACzD,OAAO,IAAI,CAACH,UAAU,CAACK,MAAM,CAAC;YAAEF;QAAU;IAC5C;IAEAG,2BAA2BT,OAAqB,EAAEM,SAAuB,EAAE;QACzE,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASM;QAAU;IACxD;IAEAI,MAAMC,MAAqB,EAA6B;QACtD,OAAO;YACLV,GAAGU,OAAOV,CAAC;YACXC,GAAGS,OAAOT,CAAC;YACXI,WAAWK,OAAOL,SAAS;YAC3BN,SAASW,OAAOX,OAAO;QACzB;IACF;AACF"}

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

@@ -15,12 +15,10 @@ const _validators = require("../../handlers/validators");
 const _floorservicevalidation = require("../validators/floor-service.validation");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floordto.FloorDto, _floordto.CreateFloorDto, _floordto.UpdateFloorDto) {
+    typeormService;
     floorPositionService;
-    constructor({ floorPositionService, typeormService }){
-        super({
-            typeormService
-        });
-        this.floorPositionService = floorPositionService;
+    constructor(typeormService, floorPositionService){
+        super(typeormService), this.typeormService = typeormService, this.floorPositionService = floorPositionService;
     }
     async list(options) {
         return super.list(Object.assign(options || {}, {
@@ -29,23 +27,23 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
             ]
         }));
     }
-    async get(id, throwIfNotFound = true, options) {
-        return super.get(id, throwIfNotFound, Object.assign(options || {}, {
+    async get(id, options) {
+        return super.get(id, Object.assign(options || {}, {
             relations: [
                 "printers"
             ]
         }));
     }
     async create(dto) {
-        await (0, _validators.validateInput)(dto, _floorservicevalidation.createFloorRules);
+        const outcome = await (0, _validators.validateInput)(dto, (0, _floorservicevalidation.createOrUpdateFloorSchema)(true));
         const floor = await super.create({
-            name: dto.name,
-            floor: dto.floor,
+            name: outcome.name,
+            floor: outcome.floor,
             printers: []
         });
-        if (dto.printers?.length) {
-            for (const printer of dto.printers){
-                await this.addOrUpdatePrinter(floor.id, printer);
+        if (outcome.printers?.length) {
+            for (const position of outcome.printers){
+                await this.addOrUpdatePrinter(floor.id, position);
             }
         }
         return this.get(floor.id);
@@ -71,58 +69,64 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
         return await this.get(floor.id);
     }
     async update(floorId, update) {
-        const floor = await this.get(floorId);
+        const existingFloor = await this.get(floorId);
         const floorUpdate = {
-            ...floor,
+            ...existingFloor,
             name: update.name,
             printers: update.printers,
             floor: update.floor
         };
-        await (0, _validators.validateInput)(floorUpdate, _floorservicevalidation.updateFloorRules);
-        const desiredPositions = floorUpdate.printers;
+        const validatedFloor = await (0, _validators.validateInput)(floorUpdate, (0, _floorservicevalidation.createOrUpdateFloorSchema)(true));
+        const desiredPositions = validatedFloor.printers;
         if (desiredPositions?.length) {
-            for (let printer of desiredPositions){
-                await this.addOrUpdatePrinter(floor.id, printer);
+            for (const printer of desiredPositions){
+                await this.addOrUpdatePrinter(existingFloor.id, printer);
+            }
+            const undesiredPositions = existingFloor.printers.filter((pos)=>!desiredPositions.find((dp)=>dp.printerId === pos.printerId));
+            if (undesiredPositions?.length) {
+                await this.floorPositionService.deleteMany(undesiredPositions.map((pos)=>pos.id));
             }
-        }
-        const undesiredPositions = floor.printers.filter((pos)=>!desiredPositions.find((dp)=>dp.printerId === pos.printerId));
-        if (undesiredPositions?.length) {
-            await this.floorPositionService.deleteMany(undesiredPositions.map((pos)=>pos.id));
         }
         delete floorUpdate.printers;
         return super.update(floorId, floorUpdate);
     }
-    async updateName(floorId, name) {
-        let floor = await this.get(floorId);
+    async updateName(floorId, floorName) {
+        const { name } = await (0, _validators.validateInput)({
+            name: floorName
+        }, _floorservicevalidation.updateFloorNameSchema);
+        const floor = await this.get(floorId);
         floor.name = name;
-        floor = await this.update(floorId, floor);
-        return floor;
+        return this.update(floorId, floor);
     }
     async updateLevel(floorId, level) {
-        let floor = await this.get(floorId);
-        floor.floor = level;
-        floor = await this.update(floorId, floor);
-        return floor;
+        const { floor: validLevel } = await (0, _validators.validateInput)({
+            floor: level
+        }, _floorservicevalidation.updateFloorLevelSchema);
+        const floor = await this.get(floorId);
+        floor.floor = validLevel;
+        return await this.update(floorId, floor);
     }
     async addOrUpdatePrinter(floorId, positionDto) {
-        await this.get(floorId, true);
-        const position = await this.floorPositionService.findPrinterPosition(positionDto.printerId);
-        if (position && position.floorId === floorId && position.x === positionDto.x && position.x === positionDto.y && position.printerId === positionDto.printerId) {
+        await this.get(floorId);
+        positionDto.floorId = floorId;
+        const validInput = await (0, _validators.validateInput)(positionDto, (0, _floorservicevalidation.printerInFloorSchema)(true));
+        const position = await this.floorPositionService.findPrinterPosition(validInput.printerId);
+        if (position && position.floorId === floorId && position.x === validInput.x && position.x === validInput.y && position.printerId === validInput.printerId) {
             return this.get(floorId);
         }
         if (position) {
             await this.floorPositionService.delete(position.id);
         }
-        const xyPosition = await this.floorPositionService.findPosition(floorId, positionDto.x, positionDto.y);
+        const xyPosition = await this.floorPositionService.findPosition(floorId, validInput.x, validInput.y);
         if (xyPosition) {
             await this.floorPositionService.delete(xyPosition.id);
         }
         const newPosition = new _entities.FloorPosition();
         Object.assign(newPosition, {
-            x: positionDto.x,
-            y: positionDto.y,
-            printerId: positionDto.printerId,
-            floorId: floorId
+            x: validInput.x,
+            y: validInput.y,
+            printerId: validInput.printerId,
+            floorId
         });
         await this.floorPositionService.create(newPosition);
         return this.get(floorId);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/floor.service.ts"],"names":["FloorService","BaseService","Floor","FloorDto","CreateFloorDto","UpdateFloorDto","floorPositionService","constructor","typeormService","list","options","Object","assign","relations","get","id","throwIfNotFound","create","dto","validateInput","createFloorRules","floor","name","printers","length","printer","addOrUpdatePrinter","toDto","map","p","printerId","floorId","x","y","createDefaultFloor","update","floorUpdate","updateFloorRules","desiredPositions","undesiredPositions","filter","pos","find","dp","deleteMany","updateName","updateLevel","level","positionDto","position","findPrinterPosition","delete","xyPosition","findPosition","newPosition","FloorPosition","removePrinter","findPrinterPositionOnFloor","NotFoundException","deletePrinterFromAnyFloor","deletePrinterPositionsByPrinterId"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/floor.service.ts"],"names":["FloorService","BaseService","Floor","FloorDto","CreateFloorDto","UpdateFloorDto","constructor","typeormService","floorPositionService","list","options","Object","assign","relations","get","id","create","dto","outcome","validateInput","createOrUpdateFloorSchema","floor","name","printers","length","position","addOrUpdatePrinter","toDto","map","p","printerId","floorId","x","y","createDefaultFloor","update","existingFloor","floorUpdate","validatedFloor","desiredPositions","printer","undesiredPositions","filter","pos","find","dp","deleteMany","updateName","floorName","updateFloorNameSchema","updateLevel","level","validLevel","updateFloorLevelSchema","positionDto","validInput","printerInFloorSchema","findPrinterPosition","delete","xyPosition","findPosition","newPosition","FloorPosition","removePrinter","findPrinterPositionOnFloor","NotFoundException","deletePrinterFromAnyFloor","deletePrinterPositionsByPrinterId"],"mappings":"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"}

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

@@ -16,10 +16,9 @@ const _authorizationconstants = require("../../constants/authorization.constants
 class PermissionService extends (0, _baseservice.BaseService)(_entities.Permission, _permissiondto.PermissionDto) {
     logger;
     _permissions = [];
-    constructor({ loggerFactory, typeormService }){
-        super({
-            typeormService
-        });
+    constructor(loggerFactory, typeormService){
+        super(typeormService);
+        this.logger = loggerFactory(PermissionService.name);
     }
     get permissions() {
         return this._permissions;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/permission.service.ts"],"names":["PermissionService","BaseService","Permission","PermissionDto","logger","_permissions","constructor","loggerFactory","typeormService","permissions","toDto","permission","id","name","authorizePermission","requiredPermission","assignedPermissions","find","assignedPermission","normalizePermission","getPermissionByName","permissionName","r","NotFoundException","getPermission","permissionId","syncPermissions","permissionDefinition","flattenPermissionDefinition","storedPermission","repository","findOneBy","newPermission","create","push","permissionInstance","warn"],"mappings":";;;;+BAWaA;;;eAAAA;;;6BATe;0BACD;+BACG;mCACI;wCAIU;AAErC,MAAMA,0BACHC,IAAAA,wBAAW,EAACC,oBAAU,EAAEC,4BAAa;IAGrCC,OAAsB;IACtBC,eAA6B,EAAE,CAAC;IAExCC,YAAY,EAAEC,aAAa,EAAEC,cAAc,EAAqE,CAAE;QAChH,KAAK,CAAC;YAAEA;QAAe;IACzB;IACA,IAAIC,cAAc;QAChB,OAAO,IAAI,CAACJ,YAAY;IAC1B;IAEAK,MAAMC,UAAsB,EAA+B;QACzD,OAAO;YACLC,IAAID,WAAWC,EAAE;YACjBC,MAAMF,WAAWE,IAAI;QACvB;IACF;IAEAC,oBAAoBC,kBAA0B,EAAEC,mBAA6B,EAAW;QACtF,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,EAAuB;QACrE,MAAMV,aAAa,IAAI,CAACF,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAET,IAAI,KAAKQ;QAC3D,IAAI,CAACV,YAAY,MAAM,IAAIY,oCAAiB,CAAC;QAC7C,OAAOZ;IACT;IAEA,MAAMa,cAAcC,YAA0B,EAAuB;QACnE,MAAMd,aAAa,IAAI,CAACF,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAEV,EAAE,KAAKa;QACzD,IAAI,CAACd,YAAY,MAAM,IAAIY,oCAAiB,CAAC,CAAC,sCAAsC,CAAC;QAErF,OAAOZ;IACT;IAEA,MAAMe,kBAAiC;QACrC,IAAI,CAACrB,YAAY,GAAG,EAAE;QAEtB,MAAMsB,uBAAuBC,IAAAA,mDAA2B;QACxD,KAAK,IAAIjB,cAAcgB,qBAAsB;YAC3C,MAAME,mBAAmB,MAAM,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;gBAAElB,MAAMF;YAAW;YAC5E,IAAI,CAACkB,kBAAkB;gBACrB,MAAMG,gBAAgB,MAAM,IAAI,CAACC,MAAM,CAAC;oBACtCpB,MAAMF;gBACR;gBACA,IAAI,CAACN,YAAY,CAAC6B,IAAI,CAACF;YACzB,OAAO;gBACL,IAAI,CAAC3B,YAAY,CAAC6B,IAAI,CAACL;YACzB;QACF;IACF;IAEAV,oBAAoBD,kBAAmC,EAAU;QAC/D,MAAMiB,qBAAqB,IAAI,CAAC1B,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAEV,EAAE,KAAKM,sBAAsBI,EAAET,IAAI,KAAKK;QAClG,IAAI,CAACiB,oBAAoB;YACvB,IAAI,CAAC/B,MAAM,CAACgC,IAAI,CAAC,CAAC,oDAAoD,CAAC;YACvE;QACF;QACA,OAAOD,mBAAmBtB,IAAI;IAChC;AACF"}
+{"version":3,"sources":["../../../src/services/orm/permission.service.ts"],"names":["PermissionService","BaseService","Permission","PermissionDto","logger","_permissions","constructor","loggerFactory","typeormService","name","permissions","toDto","permission","id","authorizePermission","requiredPermission","assignedPermissions","find","assignedPermission","normalizePermission","getPermissionByName","permissionName","r","NotFoundException","getPermission","permissionId","syncPermissions","permissionDefinition","flattenPermissionDefinition","storedPermission","repository","findOneBy","newPermission","create","push","permissionInstance","warn"],"mappings":";;;;+BAWaA;;;eAAAA;;;6BATe;0BACD;+BACG;mCACI;wCAIU;AAErC,MAAMA,0BACHC,IAAAA,wBAAW,EAACC,oBAAU,EAAEC,4BAAa;IAG5BC,OAAsB;IAC/BC,eAA6B,EAAE,CAAC;IAExCC,YAAYC,aAA6B,EAAEC,cAA8B,CAAE;QACzE,KAAK,CAACA;QACN,IAAI,CAACJ,MAAM,GAAGG,cAAcP,kBAAkBS,IAAI;IACpD;IAEA,IAAIC,cAAc;QAChB,OAAO,IAAI,CAACL,YAAY;IAC1B;IAEAM,MAAMC,UAAsB,EAA+B;QACzD,OAAO;YACLC,IAAID,WAAWC,EAAE;YACjBJ,MAAMG,WAAWH,IAAI;QACvB;IACF;IAEAK,oBAAoBC,kBAA0B,EAAEC,mBAA6B,EAAW;QACtF,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,EAAuB;QACrE,MAAMT,aAAa,IAAI,CAACF,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAEb,IAAI,KAAKY;QAC3D,IAAI,CAACT,YAAY,MAAM,IAAIW,oCAAiB,CAAC;QAC7C,OAAOX;IACT;IAEA,MAAMY,cAAcC,YAA0B,EAAuB;QACnE,MAAMb,aAAa,IAAI,CAACF,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAET,EAAE,KAAKY;QACzD,IAAI,CAACb,YAAY,MAAM,IAAIW,oCAAiB,CAAC,CAAC,sCAAsC,CAAC;QAErF,OAAOX;IACT;IAEA,MAAMc,kBAAiC;QACrC,IAAI,CAACrB,YAAY,GAAG,EAAE;QAEtB,MAAMsB,uBAAuBC,IAAAA,mDAA2B;QACxD,KAAK,IAAIhB,cAAce,qBAAsB;YAC3C,MAAME,mBAAmB,MAAM,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;gBAAEtB,MAAMG;YAAW;YAC5E,IAAI,CAACiB,kBAAkB;gBACrB,MAAMG,gBAAgB,MAAM,IAAI,CAACC,MAAM,CAAC;oBACtCxB,MAAMG;gBACR;gBACA,IAAI,CAACP,YAAY,CAAC6B,IAAI,CAACF;YACzB,OAAO;gBACL,IAAI,CAAC3B,YAAY,CAAC6B,IAAI,CAACL;YACzB;QACF;IACF;IAEAV,oBAAoBD,kBAAmC,EAAE;QACvD,MAAMiB,qBAAqB,IAAI,CAACzB,WAAW,CAACO,IAAI,CAC9C,CAACK,IAAMA,EAAET,EAAE,KAAKK,sBAAsBI,EAAEb,IAAI,KAAKS;QAEnD,IAAI,CAACiB,oBAAoB;YACvB,IAAI,CAAC/B,MAAM,CAACgC,IAAI,CAAC,CAAC,oDAAoD,CAAC;YACvE;QACF;QACA,OAAOD,mBAAmB1B,IAAI;IAChC;AACF"}

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

@@ -17,10 +17,8 @@ const _arrayutil = require("../../utils/array.util");
 const _printcompletionshared = require("../mongoose/print-completion.shared");
 class PrintCompletionService extends (0, _baseservice.BaseService)(_entities.PrintCompletion, _printcompletiondto.PrintCompletionDto) {
     logger;
-    constructor({ typeormService, loggerFactory }){
-        super({
-            typeormService
-        });
+    constructor(typeormService, loggerFactory){
+        super(typeormService);
         this.logger = loggerFactory(PrintCompletionService.name);
     }
     toDto(entity) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/print-completion.service.ts"],"names":["PrintCompletionService","BaseService","PrintCompletion","PrintCompletionDto","logger","constructor","typeormService","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","printerReference","status","printerId","create","input","findPrintCompletion","correlationId","completions","repository","findBy","filter","c","updateContext","length","warn","completionEntry","findOneBy","EVENT_TYPES","PrintStarted","update","listGroupByPrinterStatus","limitedCompletions","listPaged","printCompletionsAggr","groupArrayBy","val","toString","Object","entries","map","pc","parseInt","printEvents","processCompletions","loadPrintContexts","find","where","Not","In","PrintDone","PrintFailed","order"],"mappings":";;;;+BAaaA;;;eAAAA;;;6BAbe;0BACI;oCACqD;yBAG7D;6CACI;2BACC;uCAI2B;AAEjD,MAAMA,+BACHC,IAAAA,wBAAW,EAACC,yBAAe,EAAEC,sCAAkB;IAGvDC,OAAsB;IAEtBC,YAAY,EAAEC,cAAc,EAAEC,aAAa,EAAqE,CAAE;QAChH,KAAK,CAAC;YAAED;QAAe;QACvB,IAAI,CAACF,MAAM,GAAGG,cAAcP,uBAAuBQ,IAAI;IACzD;IAEAC,MAAMC,MAAuB,EAAoC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,kBAAkBN,OAAOM,gBAAgB;YACzCC,QAAQP,OAAOO,MAAM;YACrBC,WAAWR,OAAOQ,SAAS;QAC7B;IACF;IAEA,MAAMC,OAAOC,KAA6C,EAAE;QAC1D,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,oBAAoBC,aAAqB,EAAE;QAC/C,MAAMC,cAAc,MAAM,IAAI,CAACC,UAAU,CAACC,MAAM,CAAC,CAAC;QAClD,OAAOF,YAAYG,MAAM,CAAC,CAACC,IAAMA,EAAEd,OAAO,EAAES,kBAAkBA;IAChE;IAEA,MAAMM,cAAcN,aAAqB,EAAET,OAA+B,EAAiB;QACzF,IAAI,CAACS,eAAeO,QAAQ;YAC1B,IAAI,CAACzB,MAAM,CAAC0B,IAAI,CAAC;YACjB;QACF;QAEA,MAAMC,kBAAkB,MAAM,IAAI,CAACP,UAAU,CAACQ,SAAS,CAAC;YACtDnB,SAAS;gBAAES;YAAc;YACzBL,QAAQgB,wCAAW,CAACC,YAAY;QAClC;QACA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC3B,MAAM,CAAC0B,IAAI,CAAC,CAAC,yBAAyB,EAAER,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAS,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAM,IAAI,CAACsB,MAAM,CAACJ,gBAAgBpB,EAAE,EAAEoB;IACxC;IAEA,MAAMK,2BAA2D;QAC/D,MAAMC,qBAAqB,MAAM,IAAI,CAACC,SAAS;QAC/C,MAAMC,uBAAuBC,IAAAA,uBAAY,EAACH,oBAAoB,CAACI,MAAQA,IAAIvB,SAAS,CAACwB,QAAQ;QAC7F,MAAMnB,cAAcoB,OAAOC,OAAO,CAACL,sBAAsBM,GAAG,CAAC,CAAC,CAACC,IAAIL,IAAI,GAAM,CAAA;gBAC3EvB,WAAW6B,SAASD;gBACpBE,aAAaP;YACf,CAAA;QACA,OAAOQ,IAAAA,yCAAkB,EAAC1B;IAC5B;IAEA,MAAM2B,oBAAgE;QACpE,MAAM3B,cAAc,MAAM,IAAI,CAACC,UAAU,CAAC2B,IAAI,CAAC;YAC7CC,OAAO;gBACLnC,QAAQoC,IAAAA,YAAG,EAACC,IAAAA,WAAE,EAAC;oBAACrB,wCAAW,CAACsB,SAAS;oBAAEtB,wCAAW,CAACuB,WAAW;iBAAC;YACjE;YACAC,OAAO;gBACLvC,WAAW;gBACXH,WAAW,CAAC;YACd;QACF;QAEA,OAAOyB,IAAAA,uBAAY,EAACjB,aAAa,CAACkB,MAAQA,IAAI9B,EAAE,CAAC+B,QAAQ;IAC3D;AACF"}
+{"version":3,"sources":["../../../src/services/orm/print-completion.service.ts"],"names":["PrintCompletionService","BaseService","PrintCompletion","PrintCompletionDto","logger","constructor","typeormService","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","printerReference","status","printerId","create","input","findPrintCompletion","correlationId","completions","repository","findBy","filter","c","updateContext","length","warn","completionEntry","findOneBy","EVENT_TYPES","PrintStarted","update","listGroupByPrinterStatus","limitedCompletions","listPaged","printCompletionsAggr","groupArrayBy","val","toString","Object","entries","map","pc","parseInt","printEvents","processCompletions","loadPrintContexts","find","where","Not","In","PrintDone","PrintFailed","order"],"mappings":";;;;+BAkBaA;;;eAAAA;;;6BAlBe;0BACI;oCAKzB;yBAGiB;6CACI;2BACC;uCAI2B;AAGjD,MAAMA,+BACHC,IAAAA,wBAAW,EAACC,yBAAe,EAAEC,sCAAkB;IAGtCC,OAAsB;IAEvCC,YAAYC,cAA8B,EAAEC,aAA6B,CAAE;QACzE,KAAK,CAACD;QACN,IAAI,CAACF,MAAM,GAAGG,cAAcP,uBAAuBQ,IAAI;IACzD;IAEAC,MAAMC,MAAuB,EAAoC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,kBAAkBN,OAAOM,gBAAgB;YACzCC,QAAQP,OAAOO,MAAM;YACrBC,WAAWR,OAAOQ,SAAS;QAC7B;IACF;IAEA,MAAMC,OAAOC,KAA6C,EAAE;QAC1D,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,oBAAoBC,aAAqB,EAAE;QAC/C,MAAMC,cAAc,MAAM,IAAI,CAACC,UAAU,CAACC,MAAM,CAAC,CAAC;QAClD,OAAOF,YAAYG,MAAM,CAAC,CAACC,IAAMA,EAAEd,OAAO,EAAES,kBAAkBA;IAChE;IAEA,MAAMM,cAAcN,aAAiC,EAAET,OAA+B,EAAiB;QACrG,IAAI,CAACS,eAAeO,QAAQ;YAC1B,IAAI,CAACzB,MAAM,CAAC0B,IAAI,CAAC;YACjB;QACF;QAEA,MAAMC,kBAAkB,MAAM,IAAI,CAACP,UAAU,CAACQ,SAAS,CAAC;YACtDnB,SAAS;gBAAES;YAAc;YACzBL,QAAQgB,wCAAW,CAACC,YAAY;QAClC;QACA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC3B,MAAM,CAAC0B,IAAI,CACd,CAAC,yBAAyB,EAAER,cAAc,0DAA0D,CAAC;YAEvG;QACF;QACAS,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAM,IAAI,CAACsB,MAAM,CAACJ,gBAAgBpB,EAAE,EAAEoB;IACxC;IAEA,MAAMK,2BAA2D;QAC/D,MAAMC,qBAAqB,MAAM,IAAI,CAACC,SAAS;QAC/C,MAAMC,uBAAuBC,IAAAA,uBAAY,EAACH,oBAAoB,CAACI,MAAQA,IAAIvB,SAAS,CAACwB,QAAQ;QAC7F,MAAMnB,cAAcoB,OAAOC,OAAO,CAACL,sBAAsBM,GAAG,CAAC,CAAC,CAACC,IAAIL,IAAI,GAAM,CAAA;gBAC3EvB,WAAW6B,SAASD;gBACpBE,aAAaP;YACf,CAAA;QACA,OAAOQ,IAAAA,yCAAkB,EAAC1B;IAC5B;IAEA,MAAM2B,oBAAiF;QACrF,MAAM3B,cAAc,MAAM,IAAI,CAACC,UAAU,CAAC2B,IAAI,CAAC;YAC7CC,OAAO;gBACLnC,QAAQoC,IAAAA,YAAG,EAACC,IAAAA,WAAE,EAAC;oBAACrB,wCAAW,CAACsB,SAAS;oBAAEtB,wCAAW,CAACuB,WAAW;iBAAC;YACjE;YACAC,OAAO;gBACLvC,WAAW;gBACXH,WAAW,CAAC;YACd;QACF;QAEA,OAAOyB,IAAAA,uBAAY,EAACjB,aAAa,CAACkB,MAAQA,IAAI9B,EAAE,CAAC+B,QAAQ;IAC3D;AACF"}

package/dist/services/orm/printer-group.service.js

@@ -16,10 +16,8 @@ const _classvalidator = require("class-validator");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 class PrinterGroupService extends (0, _baseservice.BaseService)(_printergroupentity.PrinterGroup, _printergroupdto.PrinterGroupDto) {
     groupRepository;
-    constructor({ typeormService }){
-        super({
-            typeormService
-        });
+    constructor(typeormService){
+        super(typeormService);
         this.groupRepository = typeormService.getDataSource().getRepository(_groupentity.Group);
     }
     async listGroups() {
@@ -60,9 +58,6 @@ class PrinterGroupService extends (0, _baseservice.BaseService)(_printergroupent
         };
     }
     async createGroup(dto) {
-        if (dto.id) {
-            delete dto.id;
-        }
         await (0, _classvalidator.validate)(dto);
         const entity = this.groupRepository.create(dto);
         await (0, _classvalidator.validate)(entity);

package/dist/services/orm/printer-group.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/printer-group.service.ts"],"names":["PrinterGroupService","BaseService","PrinterGroup","PrinterGroupDto","groupRepository","constructor","typeormService","getDataSource","getRepository","Group","listGroups","groups","find","groupListing","group","id","name","printers","repository","findBy","groupId","Object","values","getGroup","findOneBy","NotFoundException","getGroupWithPrinters","printerGroups","createGroup","dto","validate","entity","create","save","updateGroupName","updateDto","assign","update","deleteGroup","delete","addPrinterToGroup","printerId","alreadyExisting","removePrinterFromGroup","toDto"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/printer-group.service.ts"],"names":["PrinterGroupService","BaseService","PrinterGroup","PrinterGroupDto","groupRepository","constructor","typeormService","getDataSource","getRepository","Group","listGroups","groups","find","groupListing","group","id","name","printers","repository","findBy","groupId","Object","values","getGroup","findOneBy","NotFoundException","getGroupWithPrinters","printerGroups","createGroup","dto","validate","entity","create","save","updateGroupName","updateDto","assign","update","deleteGroup","delete","addPrinterToGroup","printerId","alreadyExisting","removePrinterFromGroup","toDto"],"mappings":"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"}