emilsoftware-utilities 1.3.146 → 1.3.147

package/dist/accessi-module/Controllers/UserController.d.ts

@@ -11,7 +11,7 @@ export declare class UserController {
     private readonly logger;
     constructor(userService: UserService, emailService: EmailService, options: AccessiOptions);
     serveResetPasswordPage(res: Response, token: string): Promise<void>;
-    getUsers(res: Response, email?: string): Promise<Response<any, Record<string, any>>>;
+    getUsers(res: Response, email?: string, codiceUtente?: number, includeExtensionFields?: boolean, includeGrants?: boolean): Promise<Response<any, Record<string, any>>>;
     deleteUser(codiceUtente: number, res: Response): Promise<Response<any, Record<string, any>>>;
     register(request: Request, registrationData: RegisterRequest, res: Response): Promise<Response<any, Record<string, any>>>;
     updateUtente(codiceUtente: number, user: UserDto, res: Response): Promise<Response<any, Record<string, any>>>;

package/dist/accessi-module/Controllers/UserController.js

@@ -46,14 +46,16 @@ let UserController = UserController_1 = class UserController {
             return res.sendFile((0, path_1.join)(__dirname, '..', 'Views', 'reset-password.html'));
         });
     }
-    getUsers(res, email) {
+    getUsers(res, email, codiceUtente, includeExtensionFields, includeGrants) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const users = yield this.userService.getUsers(email);
+                let filters = { email, codiceUtente };
+                let options = { includeExtensionFields: includeExtensionFields !== null && includeExtensionFields !== void 0 ? includeExtensionFields : true, includeGrants: includeGrants !== null && includeGrants !== void 0 ? includeGrants : true };
+                const users = yield this.userService.getUsers(filters, options);
                 return Utilities_1.RestUtilities.sendBaseResponse(res, users);
             }
             catch (error) {
-                this.logger.error('Errore durante il recupero degli utenti', error);
+                this.logger.error('Errore durante il recupero degli utenti: ', error);
                 return Utilities_1.RestUtilities.sendErrorMessage(res, error, UserController_1.name);
             }
         });
@@ -125,11 +127,18 @@ __decorate([
     (0, swagger_1.ApiOperation)({ summary: 'Recupera la lista degli utenti', operationId: "getUsers" }),
     (0, swagger_1.ApiResponse)({ status: 200, description: 'Lista utenti recuperata con successo', type: GetUsersResponse_1.GetUsersResponse }),
     (0, swagger_1.ApiResponse)({ status: 401, description: 'Credenziali non valide' }),
+    (0, swagger_1.ApiQuery)({ name: 'email', required: false, description: 'Email dell\'utente da cercare' }),
+    (0, swagger_1.ApiQuery)({ name: 'codiceUtente', required: false, description: "Codice dell'utente da cercare" }),
+    (0, swagger_1.ApiQuery)({ name: 'includeExtensionFields', required: false, description: "Includi extension fields (chiamata più pesante)" }),
+    (0, swagger_1.ApiQuery)({ name: 'includeGrants', required: false, description: "Includi Permessi (chiamata più pesante)" }),
     (0, common_1.Get)('get-users'),
     __param(0, (0, common_1.Res)()),
     __param(1, (0, common_1.Query)('email')),
+    __param(2, (0, common_1.Query)('codiceUtente')),
+    __param(3, (0, common_1.Query)('includeExtensionFields', new common_1.ParseBoolPipe({ optional: true }))),
+    __param(4, (0, common_1.Query)('includeGrants', new common_1.ParseBoolPipe({ optional: true }))),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, String]),
+    __metadata("design:paramtypes", [Object, String, Number, Boolean, Boolean]),
     __metadata("design:returntype", Promise)
 ], UserController.prototype, "getUsers", null);
 __decorate([

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

@@ -10,7 +10,13 @@ export declare class UserService {
     private readonly emailService;
     private readonly permissionService;
     constructor(accessiOptions: AccessiOptions, emailService: EmailService, permissionService: PermissionService);
-    getUsers(email?: string): Promise<GetUsersResult[]>;
+    getUsers(filters?: {
+        email?: string;
+        codiceUtente?: number;
+    }, options?: {
+        includeExtensionFields: boolean;
+        includeGrants: boolean;
+    }): Promise<GetUsersResult[]>;
     getCodiceUtenteByEmail(email: string): Promise<{
         codiceUtente: number;
     }>;

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

@@ -35,7 +35,7 @@ let UserService = class UserService {
         this.emailService = emailService;
         this.permissionService = permissionService;
     }
-    getUsers(email) {
+    getUsers(filters, options) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 let query = ` 
@@ -66,25 +66,34 @@ let UserService = class UserService {
                 F.CODCLIENTI AS codice_clienti,
                 F.TIPFIL AS tip_fil
             FROM UTENTI U 
+            INNER JOIN UTENTI_CONFIG G ON U.CODUTE = G.CODUTE
+            LEFT JOIN FILTRI F ON F.CODUTE = U.CODUTE
             WHERE 1=1
             `;
                 let queryParams = [];
-                if (email) {
+                if (filters.email) {
                     query += ` AND LOWER(U.USRNAME) = ? `;
-                    queryParams.push(email.trim().toLowerCase());
+                    queryParams.push(filters.email.trim().toLowerCase());
                 }
-                query += `INNER JOIN UTENTI_CONFIG G ON U.CODUTE = G.CODUTE
-            LEFT JOIN FILTRI F ON F.CODUTE = U.CODUTE
-            ORDER BY U.CODUTE`;
+                if (filters.codiceUtente) {
+                    query += ` AND U.CODUTE = ? `;
+                    queryParams.push(filters.codiceUtente);
+                }
+                query += ` ORDER BY U.CODUTE DESC `;
                 let users = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, queryParams);
                 users = users.map(Utilities_1.RestUtilities.convertKeysToCamelCase);
                 let usersResponse = [];
+                console.log("OPTIONS: ", options);
                 for (const user of users) {
-                    const userGrants = yield this.permissionService.getUserRolesAndGrants(user.codiceUtente);
-                    let extensionFields = {};
-                    for (const ext of this.accessiOptions.extensionFieldsOptions) {
-                        const values = (yield Orm_1.Orm.query(ext.databaseOptions, `SELECT ${ext.tableFields.join(",")} FROM ${ext.tableName} WHERE ${ext.tableJoinFieldName} = ?`, [user.codiceUtente])).map(Utilities_1.RestUtilities.convertKeysToCamelCase);
-                        extensionFields[ext.objectKey] = values;
+                    let userGrants = null;
+                    if (options.includeGrants)
+                        userGrants = yield this.permissionService.getUserRolesAndGrants(user.codiceUtente);
+                    let extensionFields = options.includeExtensionFields ? {} : null;
+                    if (options.includeExtensionFields) {
+                        for (const ext of this.accessiOptions.extensionFieldsOptions) {
+                            const values = (yield Orm_1.Orm.query(ext.databaseOptions, `SELECT ${ext.tableFields.join(",")} FROM ${ext.tableName} WHERE ${ext.tableJoinFieldName} = ?`, [user.codiceUtente])).map(Utilities_1.RestUtilities.convertKeysToCamelCase);
+                            extensionFields[ext.objectKey] = values;
+                        }
                     }
                     let userResult = {
                         utente: user,
@@ -93,6 +102,7 @@ let UserService = class UserService {
                     };
                     usersResponse.push(userResult);
                 }
+                console.log("OPTIONS: ", options);
                 return usersResponse;
             }
             catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emilsoftware-utilities",
-  "version": "1.3.146",
+  "version": "1.3.147",
   "description": "Utilities for EmilSoftware",
   "main": "dist/index.js",
   "module": "dist/index.js",