rl-core-api 0.8.0 → 0.10.0

package/dist/core/query/filterField.interface.d.ts

@@ -20,6 +20,7 @@ export interface FilterFieldDefinition {
     relation?: FilterRelation;
     permission?: string;
     sortable?: boolean;
+    sortColumn?: string;
     filterable?: boolean;
 }
 export type FilterCatalog = readonly FilterFieldDefinition[];

package/dist/core/query/filterSort.util.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveCatalogOrder = void 0;
 const resolveCatalogOrder = (sortBy, sortDir, catalog, alias, fallback) => {
     const chosen = catalog.find((field) => field.field === sortBy && field.sortable && !field.relation);
+    if (chosen?.sortColumn) {
+        return { column: chosen.sortColumn, direction: sortDir ?? "DESC" };
+    }
     const column = chosen?.column ??
         catalog.find((field) => field.field === fallback)?.column ??
         fallback;

package/dist/core/queue/queueAdmin.controller.d.ts

@@ -5,7 +5,7 @@ export declare class QueueAdminController {
     private readonly queues;
     constructor(queues: QueueAdminService);
     counts(): Promise<QueueCounts>;
-    jobs(state: string, page?: string, limit?: string): Promise<Paginated<QueueJobSummary>>;
+    jobs(state: string, page?: string, limit?: string, sortBy?: string, sortDir?: string): Promise<Paginated<QueueJobSummary>>;
     retry(id: string): Promise<void>;
     remove(id: string): Promise<void>;
 }

package/dist/core/queue/queueAdmin.controller.js

@@ -28,8 +28,8 @@ let QueueAdminController = class QueueAdminController {
     counts() {
         return this.queues.counts();
     }
-    jobs(state, page, limit) {
-        return this.queues.list(toState(state), toPositive(page, 1), Math.min(toPositive(limit, DEFAULT_LIMIT), MAX_LIMIT));
+    jobs(state, page, limit, sortBy, sortDir) {
+        return this.queues.list(toState(state), toPositive(page, 1), Math.min(toPositive(limit, DEFAULT_LIMIT), MAX_LIMIT), sortBy, sortDir === "ASC" ? "ASC" : "DESC");
     }
     retry(id) {
         return this.queues.retry(id);
@@ -51,12 +51,16 @@ __decorate([
     (0, common_1.Get)("jobs"),
     (0, requirePermission_decorator_1.RequirePermission)("queues:read:any"),
     (0, swagger_1.ApiQuery)({ name: "state", enum: queueAdmin_service_1.LISTABLE_STATES }),
+    (0, swagger_1.ApiQuery)({ name: "sortBy", enum: queueAdmin_service_1.SORTABLE_JOB_FIELDS, required: false }),
+    (0, swagger_1.ApiQuery)({ name: "sortDir", enum: ["ASC", "DESC"], required: false }),
     (0, swagger_1.ApiOkResponse)({ type: queueAdmin_response_1.PaginatedQueueJobsResponse }),
     __param(0, (0, common_1.Query)("state")),
     __param(1, (0, common_1.Query)("page")),
     __param(2, (0, common_1.Query)("limit")),
+    __param(3, (0, common_1.Query)("sortBy")),
+    __param(4, (0, common_1.Query)("sortDir")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, String, String]),
+    __metadata("design:paramtypes", [String, String, String, String, String]),
     __metadata("design:returntype", Promise)
 ], QueueAdminController.prototype, "jobs", null);
 __decorate([

package/dist/core/queue/queueAdmin.service.d.ts

@@ -1,13 +1,16 @@
 import { QueueCounts, QueueJobSummary } from "./job.interface";
 import { JobProducer } from "./job.producer";
-import { Paginated } from "../utils/pagination.util";
+import { Paginated, SortDir } from "../utils/pagination.util";
 export declare const LISTABLE_STATES: readonly ["waiting", "active", "completed", "failed", "delayed"];
 export type ListableState = (typeof LISTABLE_STATES)[number];
+export declare const SORTABLE_JOB_FIELDS: readonly ["name", "attemptsMade", "percent", "createdAt", "failedReason"];
+export type SortableJobField = (typeof SORTABLE_JOB_FIELDS)[number];
+export declare const SORT_SCAN_LIMIT = 1000;
 export declare class QueueAdminService {
     private readonly producer;
     constructor(producer: JobProducer);
     counts(): Promise<QueueCounts>;
-    list(state: ListableState, page: number, limit: number): Promise<Paginated<QueueJobSummary>>;
+    list(state: ListableState, page: number, limit: number, sortBy?: string, sortDir?: SortDir): Promise<Paginated<QueueJobSummary>>;
     retry(jobId: string): Promise<void>;
     remove(jobId: string): Promise<void>;
     private findJob;

package/dist/core/queue/queueAdmin.service.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueueAdminService = exports.LISTABLE_STATES = void 0;
+exports.QueueAdminService = exports.SORT_SCAN_LIMIT = exports.SORTABLE_JOB_FIELDS = exports.LISTABLE_STATES = void 0;
 const common_1 = require("@nestjs/common");
 const job_producer_1 = require("./job.producer");
 const pagination_util_1 = require("../utils/pagination.util");
@@ -20,6 +20,14 @@ exports.LISTABLE_STATES = [
     "failed",
     "delayed",
 ];
+exports.SORTABLE_JOB_FIELDS = [
+    "name",
+    "attemptsMade",
+    "percent",
+    "createdAt",
+    "failedReason",
+];
+exports.SORT_SCAN_LIMIT = 1000;
 let QueueAdminService = class QueueAdminService {
     constructor(producer) {
         this.producer = producer;
@@ -35,15 +43,24 @@ let QueueAdminService = class QueueAdminService {
             delayed: counts.delayed ?? 0,
         };
     }
-    async list(state, page, limit) {
+    async list(state, page, limit, sortBy, sortDir) {
         const queue = this.producer.requireQueue();
+        const field = exports.SORTABLE_JOB_FIELDS.find((name) => name === sortBy);
         const start = (page - 1) * limit;
+        const range = field
+            ? [0, exports.SORT_SCAN_LIMIT - 1]
+            : [start, start + limit - 1];
         const [jobs, counts] = await Promise.all([
-            queue.getJobs([state], start, start + limit - 1),
+            queue.getJobs([state], range[0], range[1]),
             queue.getJobCounts(state),
         ]);
         const items = jobs.filter(Boolean).map((job) => this.toSummary(job, state));
-        return new pagination_util_1.Paginated(items, counts[state] ?? 0, page, limit);
+        const total = counts[state] ?? 0;
+        if (!field) {
+            return new pagination_util_1.Paginated(items, total, page, limit);
+        }
+        const ordered = [...items].sort(compareBy(field, sortDir ?? "DESC"));
+        return new pagination_util_1.Paginated(ordered.slice(start, start + limit), total, page, limit);
     }
     async retry(jobId) {
         const job = await this.findJob(jobId);
@@ -83,3 +100,21 @@ exports.QueueAdminService = QueueAdminService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [job_producer_1.JobProducer])
 ], QueueAdminService);
+const compareBy = (field, direction) => (a, b) => {
+    const left = a[field];
+    const right = b[field];
+    if (left === right) {
+        return 0;
+    }
+    if (left === null) {
+        return 1;
+    }
+    if (right === null) {
+        return -1;
+    }
+    const factor = direction === "ASC" ? 1 : -1;
+    const diff = typeof left === "number" && typeof right === "number"
+        ? left - right
+        : String(left).localeCompare(String(right), "pt-BR");
+    return diff * factor;
+};

package/dist/features/audit/infra/repositories/auditDataChange.repository.js

@@ -20,7 +20,7 @@ let AuditDataChangeRepository = class AuditDataChangeRepository extends typeorm_
         super(auditDataChange_schema_1.AuditDataChange, dataSource.createEntityManager());
     }
     findPaginated(query) {
-        return (0, paginateWithFilter_util_1.paginateWithFilter)(this.createQueryBuilder("auditDataChange"), {
+        return (0, paginateWithFilter_util_1.paginateWithFilter)(this.createQueryBuilder("auditDataChange").leftJoin("users", "trailUser", "trailUser.id = auditDataChange.user_id"), {
             query,
             catalog: audit_filters_1.AUDIT_DATA_CHANGES_FILTER_CATALOG,
             defaultSort: "createdAt",

package/dist/features/audit/infra/repositories/requestLog.repository.js

@@ -20,7 +20,7 @@ let RequestLogRepository = class RequestLogRepository extends typeorm_1.Reposito
         super(requestLog_schema_1.RequestLog, dataSource.createEntityManager());
     }
     findPaginated(query) {
-        return (0, paginateWithFilter_util_1.paginateWithFilter)(this.createQueryBuilder("requestLog"), {
+        return (0, paginateWithFilter_util_1.paginateWithFilter)(this.createQueryBuilder("requestLog").leftJoin("users", "logUser", "logUser.id = requestLog.user_id"), {
             query,
             catalog: audit_filters_1.REQUEST_LOGS_FILTER_CATALOG,
             defaultSort: "createdAt",

package/dist/features/audit/presentation/filters/audit.filters.js

@@ -92,6 +92,7 @@ exports.REQUEST_LOGS_FILTER_CATALOG = [
         label: "Tipo do erro",
         type: filterFieldType_enum_1.FilterFieldType.Enum,
         options: optionsFromEnum(ERROR_TYPE_LABELS),
+        sortable: true,
     },
     {
         field: "errorCode",
@@ -111,6 +112,15 @@ exports.REQUEST_LOGS_FILTER_CATALOG = [
         label: "Usuário",
         type: filterFieldType_enum_1.FilterFieldType.Uuid,
     },
+    {
+        field: "user",
+        column: "userId",
+        label: "Usuário (nome)",
+        type: filterFieldType_enum_1.FilterFieldType.Text,
+        sortable: true,
+        filterable: false,
+        sortColumn: "logUser.name",
+    },
     {
         field: "requestId",
         column: "requestId",
@@ -154,11 +164,21 @@ exports.AUDIT_DATA_CHANGES_FILTER_CATALOG = [
         label: "Usuário",
         type: filterFieldType_enum_1.FilterFieldType.Uuid,
     },
+    {
+        field: "user",
+        column: "userId",
+        label: "Usuário (nome)",
+        type: filterFieldType_enum_1.FilterFieldType.Text,
+        sortable: true,
+        filterable: false,
+        sortColumn: "trailUser.name",
+    },
     {
         field: "ipAddress",
         column: "ipAddress",
         label: "IP",
         type: filterFieldType_enum_1.FilterFieldType.Text,
+        sortable: true,
     },
     {
         field: "createdAt",

package/dist/features/users/domain/users.service.js

@@ -228,7 +228,7 @@ let UsersService = class UsersService {
         Object.assign(user, {
             name: dto.name ?? user.name,
             lastName: dto.lastName ?? user.lastName,
-            phone: dto.phone ?? user.phone,
+            phone: dto.phone !== undefined ? dto.phone : user.phone,
         });
         await this.userRepo.save(user);
         return this.findById(userId);

package/dist/features/users/presentation/commands/updateProfile.command.d.ts

@@ -1,5 +1,5 @@
 export declare class UpdateProfileCommand {
     name?: string;
     lastName?: string;
-    phone?: string;
+    phone?: string | null;
 }

package/dist/features/users/presentation/commands/updateProfile.command.js

@@ -11,28 +11,33 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateProfileCommand = void 0;
 const swagger_1 = require("@nestjs/swagger");
+const class_transformer_1 = require("class-transformer");
 const class_validator_1 = require("class-validator");
+const emptyToNull = ({ value }) => typeof value === "string" && value.trim() === "" ? null : value;
 class UpdateProfileCommand {
 }
 exports.UpdateProfileCommand = UpdateProfileCommand;
 __decorate([
     (0, swagger_1.ApiProperty)({ required: false }),
     (0, class_validator_1.IsOptional)(),
-    (0, class_validator_1.IsString)(),
-    (0, class_validator_1.Length)(2, 100),
+    (0, class_validator_1.IsString)({ message: "Nome inválido" }),
+    (0, class_validator_1.Length)(2, 100, { message: "O nome precisa ter entre 2 e 100 caracteres" }),
     __metadata("design:type", String)
 ], UpdateProfileCommand.prototype, "name", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({ required: false }),
     (0, class_validator_1.IsOptional)(),
-    (0, class_validator_1.IsString)(),
-    (0, class_validator_1.Length)(2, 100),
+    (0, class_validator_1.IsString)({ message: "Sobrenome inválido" }),
+    (0, class_validator_1.Length)(2, 100, {
+        message: "O sobrenome precisa ter entre 2 e 100 caracteres",
+    }),
     __metadata("design:type", String)
 ], UpdateProfileCommand.prototype, "lastName", void 0);
 __decorate([
-    (0, swagger_1.ApiProperty)({ required: false }),
+    (0, swagger_1.ApiProperty)({ required: false, nullable: true }),
     (0, class_validator_1.IsOptional)(),
-    (0, class_validator_1.IsString)(),
-    (0, class_validator_1.Length)(8, 20),
-    __metadata("design:type", String)
+    (0, class_transformer_1.Transform)(emptyToNull),
+    (0, class_validator_1.IsString)({ message: "Telefone inválido" }),
+    (0, class_validator_1.Length)(8, 20, { message: "O telefone precisa ter entre 8 e 20 caracteres" }),
+    __metadata("design:type", Object)
 ], UpdateProfileCommand.prototype, "phone", void 0);

package/dist/features/users/presentation/filters/users.filters.js

@@ -37,11 +37,21 @@ exports.USERS_FILTER_CATALOG = [
         type: filterFieldType_enum_1.FilterFieldType.Boolean,
         sortable: true,
     },
+    {
+        field: "roles",
+        column: "id",
+        label: "Papéis",
+        type: filterFieldType_enum_1.FilterFieldType.Text,
+        sortable: true,
+        filterable: false,
+        sortColumn: "(SELECT MIN(r.name) FROM user_roles ur INNER JOIN roles r ON r.id = ur.role_id WHERE ur.user_id = user.id)",
+    },
     {
         field: "twoFactorEnabled",
         column: "twoFactorEnabled",
         label: "2FA configurado",
         type: filterFieldType_enum_1.FilterFieldType.Boolean,
+        sortable: true,
     },
     {
         field: "createdAt",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rl-core-api",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "Core NestJS: autenticação com 2FA, RBAC, auditoria, notificações e listagens com filtro dinâmico",
   "author": "Rodrigo Liberti",
   "license": "MIT",