emilsoftware-utilities 1.6.0 → 1.6.1-dev.2

package/dist/accessi-module/AccessiModule.js

@@ -32,9 +32,16 @@ let AccessiModule = AccessiModule_1 = class AccessiModule {
                 UserService_1.UserService,
                 EmailService_1.EmailService,
                 PermissionService_1.PermissionService,
-                FiltriService_1.FiltriService
+                FiltriService_1.FiltriService,
+            ],
+            exports: [
+                'ACCESSI_OPTIONS',
+                AuthService_1.AuthService,
+                UserService_1.UserService,
+                EmailService_1.EmailService,
+                PermissionService_1.PermissionService,
+                FiltriService_1.FiltriService,
             ],
-            exports: ['ACCESSI_OPTIONS', AuthService_1.AuthService, UserService_1.UserService, EmailService_1.EmailService, PermissionService_1.PermissionService, FiltriService_1.FiltriService],
         };
     }
 };
@@ -42,7 +49,13 @@ exports.AccessiModule = AccessiModule;
 exports.AccessiModule = AccessiModule = AccessiModule_1 = __decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({
-        controllers: [EmailController_1.EmailController, AuthController_1.AuthController, PermissionController_1.PermissionController, UserController_1.UserController, FiltriController_1.FiltriController],
+        controllers: [
+            EmailController_1.EmailController,
+            AuthController_1.AuthController,
+            PermissionController_1.PermissionController,
+            UserController_1.UserController,
+            FiltriController_1.FiltriController,
+        ],
         providers: [AuthService_1.AuthService, UserService_1.UserService, EmailService_1.EmailService, PermissionService_1.PermissionService, FiltriService_1.FiltriService],
         exports: [AuthService_1.AuthService, UserService_1.UserService, EmailService_1.EmailService, PermissionService_1.PermissionService, FiltriService_1.FiltriService],
     })

package/dist/accessi-module/Dtos/FiltriUtente.d.ts

@@ -11,6 +11,7 @@ export declare class FiltriUtente {
     tipFil?: number;
     idxPos?: number;
     codDip?: number;
+    codVet?: number;
 }
 export declare class GetFiltriUtenteResponse extends BaseResponse {
     Result: FiltriUtente[];
@@ -59,4 +60,8 @@ export declare const FILTRI_UTENTE_DB_MAPPING: {
         readonly dbField: "CODDIP";
         readonly numeric: true;
     };
+    readonly codVet: {
+        readonly dbField: "CODVET";
+        readonly numeric: true;
+    };
 };

package/dist/accessi-module/Dtos/FiltriUtente.js

@@ -112,6 +112,13 @@ __decorate([
     (0, class_validator_1.IsOptional)(),
     __metadata("design:type", Number)
 ], FiltriUtente.prototype, "codDip", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({
+        description: 'Codice del vettore',
+        example: 12
+    }),
+    __metadata("design:type", Number)
+], FiltriUtente.prototype, "codVet", void 0);
 class GetFiltriUtenteResponse extends BaseResponse_1.BaseResponse {
 }
 exports.GetFiltriUtenteResponse = GetFiltriUtenteResponse;
@@ -143,4 +150,5 @@ exports.FILTRI_UTENTE_DB_MAPPING = {
     tipFil: { dbField: 'TIPFIL', numeric: true },
     idxPos: { dbField: 'IDXPOS', numeric: true },
     codDip: { dbField: 'CODDIP', numeric: true },
+    codVet: { dbField: 'CODVET', numeric: true },
 };

package/dist/accessi-module/Services/FiltriService/FiltriService.js

@@ -52,7 +52,7 @@ let FiltriService = FiltriService_1 = class FiltriService {
             try {
                 let params = [];
                 let getQuery = `SELECT CODUTE AS COD_UTE, PROG AS PROGRESSIVO, NUMREP AS NUM_REP, IDXPERS AS IDX_PERS, CODCLISUPER AS COD_CLI_SUPER, CODAGE AS COD_AGE, CODCLICOL AS COD_CLI_COL,
-        CODCLIENTI AS COD_CLIENTI, TIPFIL AS TIP_FIL, CODDIP AS COD_DIP, IDXPOS AS IDX_POS FROM FILTRI `;
+        CODCLIENTI AS COD_CLIENTI, TIPFIL AS TIP_FIL, CODDIP AS COD_DIP, IDXPOS AS IDX_POS, CODVET AS COD_VET FROM FILTRI `;
                 if (codUte === undefined) {
                     this.logger.log('Nessun utente passato, recupero i filtri di tutti gli utenti...');
                 }

package/dist/accessi-module/Services/PermissionService/PermissionService.js

@@ -51,11 +51,16 @@ let PermissionService = class PermissionService {
     }
     updateOrInsertRole(role_1) {
         return __awaiter(this, arguments, void 0, function* (role, codiceRuolo = null) {
+            var _a, _b, _c, _d, _e;
             // creazione nuovo ruolo
             if (!codiceRuolo) {
-                let createRoleQuery = `INSERT INTO RUOLI (DESRUO) VALUES (?) RETURNING CODRUO`;
-                let result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, createRoleQuery, [role.descrizioneRuolo]);
-                codiceRuolo = result[0].CODRUO;
+                const createRoleQuery = `INSERT INTO RUOLI (DESRUO) VALUES (?)`;
+                yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, createRoleQuery, [role.descrizioneRuolo]);
+                const createdRoleResult = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, 'SELECT FIRST 1 CODRUO FROM RUOLI WHERE DESRUO = ? ORDER BY CODRUO DESC', [role.descrizioneRuolo]);
+                codiceRuolo = (_c = (_b = (_a = createdRoleResult === null || createdRoleResult === void 0 ? void 0 : createdRoleResult[0]) === null || _a === void 0 ? void 0 : _a.CODRUO) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : (_e = (_d = createdRoleResult === null || createdRoleResult === void 0 ? void 0 : createdRoleResult[0]) === null || _d === void 0 ? void 0 : _d.codruo) === null || _e === void 0 ? void 0 : _e.toString();
+                if (!codiceRuolo) {
+                    throw new Error('Creazione ruolo non riuscita: impossibile recuperare CODRUO.');
+                }
             }
             else 
             // aggiornamento ruolo esistente

package/dist/accessi-module/Services/UserService/UserService.d.ts

@@ -25,7 +25,7 @@ export declare class UserService {
     getUserByEmail(email: string): Promise<UserDto | null>;
     insertUserFilters(codiceUtente: number, filterData: RegisterRequest): Promise<void>;
     private executeInTransaction;
-    register(registrationData: RegisterRequest): Promise<string>;
+    register(registrationData: RegisterRequest): Promise<number>;
     updateUser(codiceUtente: number, user: UserDto): Promise<void>;
     updateUserFilters(codiceUtente: number, user: UserDto): Promise<void>;
     deleteUser(codiceCliente: number): Promise<void>;

package/dist/accessi-module/Services/UserService/UserService.js

@@ -28,6 +28,7 @@ const Orm_1 = require("../../../Orm");
 const Utilities_1 = require("../../../Utilities");
 const StatoRegistrazione_1 = require("../../Dtos/StatoRegistrazione");
 const EmailService_1 = require("../EmailService/EmailService");
+const FiltriUtente_1 = require("../../Dtos/FiltriUtente");
 const PermissionService_1 = require("../PermissionService/PermissionService");
 const FiltriService_1 = require("../FiltriService/FiltriService");
 let UserService = class UserService {
@@ -130,6 +131,7 @@ let UserService = class UserService {
     }
     getUserByEmail(email) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const query = `
             SELECT 
                 U.CODUTE AS codice_utente, 
@@ -151,19 +153,33 @@ let UserService = class UserService {
             WHERE LOWER(U.USRNAME) = ?
         `;
             const utenti = (yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, [email]).then((results) => results.map(Utilities_1.RestUtilities.convertKeysToCamelCase)));
+            const filtriUtente = yield this.filtriService.getFiltriUser((_a = utenti[0]) === null || _a === void 0 ? void 0 : _a.codiceUtente);
+            if (utenti.length <= 0) {
+                return null;
+            }
+            if (utenti.length > 0 && filtriUtente.length > 0) {
+                const user = utenti[0];
+                const filtro = filtriUtente[0];
+                // Type-safe mapping using type assertion
+                Object.entries(FiltriUtente_1.FILTRI_UTENTE_DB_MAPPING).forEach(([key]) => {
+                    if (key in filtro) {
+                        user[key] = filtro[key];
+                    }
+                });
+            }
             return utenti.length > 0 ? utenti[0] : null;
         });
     }
     // async getUserFilters(codiceUtente: number): Promise<FiltriUtente[]> {
     //   const query = `
-    //           SELECT 
-    //               F.PROG AS progressivo, 
-    //               F.NUMREP AS numero_report, 
+    //           SELECT
+    //               F.PROG AS progressivo,
+    //               F.NUMREP AS numero_report,
     //               F.IDXPERS AS indice_personale,
-    //               F.CODCLISUPER AS codice_cliente_super, 
-    //               F.CODAGE AS cod_age, 
+    //               F.CODCLISUPER AS codice_cliente_super,
+    //               F.CODAGE AS cod_age,
     //               F.CODCLICOL AS codice_cliente_collegato,
-    //               F.CODCLIENTI AS codice_clienti, 
+    //               F.CODCLIENTI AS codice_clienti,
     //               F.TIPFIL AS tipo_filtro,
     //               F.IDXPOS AS idx_postazione
     //           FROM FILTRI F
@@ -228,14 +244,20 @@ let UserService = class UserService {
     }
     register(registrationData) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             try {
                 const existingUser = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, 'SELECT CODUTE FROM UTENTI WHERE USRNAME = ?', [registrationData.email]);
                 if (existingUser.length > 0) {
                     throw new Error('Questa e-mail è già stata utilizzata!');
                 }
-                const queryUtenti = `INSERT INTO UTENTI (USRNAME, STAREG) VALUES (?,?) RETURNING CODUTE`;
+                const queryUtenti = `INSERT INTO UTENTI (USRNAME, STAREG) VALUES (?,?)`;
                 const paramsUtenti = [registrationData.email, StatoRegistrazione_1.StatoRegistrazione.INVIO];
-                const codiceUtente = (yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, queryUtenti, paramsUtenti)).CODUTE;
+                yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, queryUtenti, paramsUtenti);
+                const codiceUtenteResult = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, 'SELECT FIRST 1 CODUTE FROM UTENTI WHERE USRNAME = ? ORDER BY CODUTE DESC', [registrationData.email]);
+                const codiceUtente = Number((_b = (_a = codiceUtenteResult === null || codiceUtenteResult === void 0 ? void 0 : codiceUtenteResult[0]) === null || _a === void 0 ? void 0 : _a.CODUTE) !== null && _b !== void 0 ? _b : (_c = codiceUtenteResult === null || codiceUtenteResult === void 0 ? void 0 : codiceUtenteResult[0]) === null || _c === void 0 ? void 0 : _c.codute);
+                if (!codiceUtente) {
+                    throw new Error('Creazione utente non riuscita: impossibile recuperare CODUTE.');
+                }
                 const utentiConfigFields = ['CODUTE', 'COGNOME', 'NOME'];
                 const utentiConfigPlaceholders = ['?', '?', '?'];
                 const utentiConfigParams = [codiceUtente, registrationData.cognome, registrationData.nome];
@@ -253,7 +275,7 @@ let UserService = class UserService {
                     if (value !== undefined && value !== null) {
                         utentiConfigFields.push(dbField);
                         utentiConfigPlaceholders.push('?');
-                        utentiConfigParams.push(value);
+                        utentiConfigParams.push(Number(value));
                     }
                 }
                 const queryUtentiConfig = `INSERT INTO UTENTI_CONFIG (${utentiConfigFields.join(', ')}) VALUES (${utentiConfigPlaceholders.join(', ')})`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emilsoftware-utilities",
-  "version": "1.6.0",
+  "version": "1.6.1-dev.2",
   "description": "Utilities for EmilSoftware",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -18,14 +18,14 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/mttdev382/emilsoftware-utilities.git"
+    "url": "git+https://github.com/Emil-Software/emilsoftware-utilities.git"
   },
   "author": "",
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/mttdev382/emilsoftware-utilities/issues"
+    "url": "https://github.com/Emil-Software/emilsoftware-utilities/issues"
   },
-  "homepage": "https://github.com/mttdev382/emilsoftware-utilities#readme",
+  "homepage": "https://github.com/Emil-Software/emilsoftware-utilities#readme",
   "dependencies": {
     "@nestjs/common": "^11.0.11",
     "@nestjs/core": "^11.0.11",