@drax/crud-back 0.11.5 → 0.12.2

package/dist/controllers/AbstractFastifyController.js

@@ -1,6 +1,7 @@
-import { CommonConfig, DraxConfig, ValidationError } from "@drax/common-back";
+import { CommonConfig, DraxConfig, ForbiddenError, InternalServerError, InvalidIdError, LimitError, NotFoundError, ValidationError, SecuritySensitiveError, UploadFileError, BadRequestError } from "@drax/common-back";
 import { UnauthorizedError } from "@drax/common-back";
 import { join } from "path";
+import QueryFilterRegex from "../regexs/QueryFilterRegex.js";
 const BASE_FILE_DIR = DraxConfig.getOrLoad(CommonConfig.FileDir) || 'files';
 const BASE_URL = DraxConfig.getOrLoad(CommonConfig.BaseUrl) ? DraxConfig.get(CommonConfig.BaseUrl).replace(/\/$/, '') : '';
 class AbstractFastifyController {
@@ -13,6 +14,8 @@ class AbstractFastifyController {
         this.userSetter = false;
         this.tenantAssert = false;
         this.userAssert = false;
+        this.defaultLimit = 1000;
+        this.maximumLimit = 10000;
         this.service = service;
         this.permission = permission;
         console.log("AbstractFastifyController created. Permissions", this.permission);
@@ -22,6 +25,9 @@ class AbstractFastifyController {
             if (!stringFilters) {
                 return [];
             }
+            if (!QueryFilterRegex.test(stringFilters)) {
+                throw new BadRequestError("Invalid filters format");
+            }
             const filterArray = stringFilters.split("|");
             const filters = [];
             filterArray.forEach((filter) => {
@@ -31,7 +37,7 @@ class AbstractFastifyController {
             return filters;
         }
         catch (e) {
-            console.error(e);
+            console.error("parseFilters error", e);
             throw e;
         }
     }
@@ -43,6 +49,16 @@ class AbstractFastifyController {
             filters.push({ field: this.userField, operator: 'eq', value: rbac.userId });
         }
     }
+    assertUserAndTenant(item, rbac) {
+        if (this.tenantAssert) {
+            const itemTenantId = item[this.tenantField] && item[this.tenantField]._id ? item[this.tenantField]._id : null;
+            rbac.assertTenantId(itemTenantId);
+        }
+        if (this.userAssert) {
+            const itemUserId = item[this.userField] && item[this.userField]._id ? item[this.userField]._id : null;
+            rbac.assertUserId(itemUserId);
+        }
+    }
     applyUserAndTenantSetters(payload, rbac) {
         if (this.tenantSetter && rbac.tenantId) {
             payload[this.tenantField] = rbac.tenantId;
@@ -51,6 +67,25 @@ class AbstractFastifyController {
             payload[this.userField] = rbac.userId;
         }
     }
+    handleError(e, reply) {
+        console.error(e);
+        if (e instanceof ValidationError ||
+            e instanceof NotFoundError ||
+            e instanceof BadRequestError ||
+            e instanceof UnauthorizedError ||
+            e instanceof ForbiddenError ||
+            e instanceof InvalidIdError ||
+            e instanceof SecuritySensitiveError ||
+            e instanceof UploadFileError ||
+            e instanceof LimitError) {
+            reply.status(e.statusCode).send(e.body);
+        }
+        else {
+            const serverError = new InternalServerError();
+            reply.statusCode = serverError.statusCode;
+            reply.status(500).send(serverError.body);
+        }
+    }
     async create(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.Create);
@@ -60,19 +95,7 @@ class AbstractFastifyController {
             return item;
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
-            }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
-            }
+            this.handleError(e, reply);
         }
     }
     async update(request, reply) {
@@ -86,22 +109,33 @@ class AbstractFastifyController {
             const payload = request.body;
             //this.applyUserAndTenantSetters(payload, request.rbac)
             let item = await this.service.update(id, payload);
+            if (!item) {
+                throw new NotFoundError();
+            }
             return item;
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
+            this.handleError(e, reply);
+        }
+    }
+    async updatePartial(request, reply) {
+        try {
+            request.rbac.assertPermission(this.permission.Update);
+            if (!request.params.id) {
+                reply.statusCode = 400;
+                reply.send({ error: 'BAD REQUEST' });
             }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
+            const id = request.params.id;
+            const payload = request.body;
+            //this.applyUserAndTenantSetters(payload, request.rbac)
+            let item = await this.service.updatePartial(id, payload);
+            if (!item) {
+                throw new NotFoundError();
             }
+            return item;
+        }
+        catch (e) {
+            this.handleError(e, reply);
         }
     }
     async delete(request, reply) {
@@ -118,25 +152,19 @@ class AbstractFastifyController {
                 reply.send({ error: 'NOT_FOUND' });
             }
             if (this.tenantAssert) {
-                request.rbac.assertTenantId(item[this.tenantField].id);
+                const tenantId = item[this.tenantField] && item[this.tenantField]._id ? item[this.tenantField]._id : null;
+                request.rbac.assertTenantId(tenantId);
             }
             await this.service.delete(id);
-            reply.send({ message: 'Item deleted successfully' });
+            reply.send({
+                id: id,
+                message: 'Item deleted successfully',
+                deleted: true,
+                deletedAt: new Date(),
+            });
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
-            }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
-            }
+            this.handleError(e, reply);
         }
     }
     async findById(request, reply) {
@@ -148,25 +176,17 @@ class AbstractFastifyController {
             }
             const id = request.params.id;
             let item = await this.service.findById(id);
+            if (!item) {
+                throw new NotFoundError();
+            }
             if (this.tenantAssert) {
-                request.rbac.assertTenantId(item[this.tenantField].id);
+                const itemTenantId = item[this.tenantField] && item[this.tenantField]._id ? item[this.tenantField]._id : null;
+                request.rbac.assertTenantId(itemTenantId);
             }
             return item;
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
-            }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
-            }
+            this.handleError(e, reply);
         }
     }
     async findByIds(request, reply) {
@@ -178,51 +198,33 @@ class AbstractFastifyController {
             }
             const ids = request.params.ids.split(",");
             let items = await this.service.findByIds(ids);
+            if (!items || items.length === 0) {
+                throw new NotFoundError();
+            }
             return items;
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
-            }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
-            }
+            this.handleError(e, reply);
         }
     }
     async find(request, reply) {
         var _a;
         try {
             request.rbac.assertPermission(this.permission.View);
+            if (request.query.limit > this.maximumLimit) {
+                throw new LimitError(this.maximumLimit, request.query.limit);
+            }
+            const limit = request.query.limit ? request.query.limit : this.defaultLimit;
+            const orderBy = request.query.orderBy;
+            const order = request.query.order;
             const search = (_a = request.query).search ?? (_a.search = undefined);
             const filters = this.parseFilters(request.query.filters);
             this.applyUserAndTenantFilters(filters, request.rbac);
-            let items = await this.service.find({ search, filters });
-            if (this.tenantAssert) {
-                items = items.filter(item => request.rbac.tenantId === item[this.tenantField].id);
-            }
+            let items = await this.service.find({ search, filters, order, orderBy, limit });
             return items;
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
-            }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
-            }
+            this.handleError(e, reply);
         }
     }
     async findOne(request, reply) {
@@ -233,25 +235,10 @@ class AbstractFastifyController {
             const filters = this.parseFilters(request.query.filters);
             this.applyUserAndTenantFilters(filters, request.rbac);
             let item = await this.service.findOne({ search, filters });
-            if (this.tenantAssert) {
-                request.rbac.assertTenantId(item[this.tenantField].id);
-            }
             return item;
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
-            }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
-            }
+            this.handleError(e, reply);
         }
     }
     async findBy(request, reply) {
@@ -261,28 +248,17 @@ class AbstractFastifyController {
                 reply.statusCode = 400;
                 reply.send({ error: 'BAD REQUEST' });
             }
+            const limit = this.defaultLimit;
             const field = request.params.field;
             const value = request.params.value;
-            let items = await this.service.findBy(field, value);
-            if (this.tenantAssert) {
-                items = items.filter(item => request.rbac.tenantId === item[this.tenantField].id);
+            let items = await this.service.findBy(field, value, limit);
+            for (let item of items) {
+                this.assertUserAndTenant(item, request.rbac);
             }
             return items;
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
-            }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
-            }
+            this.handleError(e, reply);
         }
     }
     async findOneBy(request, reply) {
@@ -295,58 +271,35 @@ class AbstractFastifyController {
             const field = request.params.field;
             const value = request.params.value;
             let item = await this.service.findOneBy(field, value);
-            if (this.tenantAssert) {
-                request.rbac.assertTenantId(item[this.tenantField].id);
-            }
+            this.assertUserAndTenant(item, request.rbac);
             return item;
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
-            }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
-            }
+            this.handleError(e, reply);
         }
     }
     async search(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.View);
             const search = request.query.search;
-            const limit = 1000;
-            const filters = this.parseFilters(request.query.filters);
+            const filters = [];
+            const limit = this.defaultLimit;
             this.applyUserAndTenantFilters(filters, request.rbac);
             let item = await this.service.search(search, limit, filters);
             return item;
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
-            }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
-            }
+            this.handleError(e, reply);
         }
     }
     async paginate(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.View);
-            const page = request.query.page;
-            const limit = request.query.limit;
+            if (request.query.limit > this.maximumLimit) {
+                throw new LimitError(this.maximumLimit, request.query.limit);
+            }
+            const page = request.query.page ? request.query.page : 1;
+            const limit = request.query.limit ? request.query.limit : 10;
             const orderBy = request.query.orderBy;
             const order = request.query.order;
             const search = request.query.search;
@@ -357,19 +310,7 @@ class AbstractFastifyController {
             return paginateResult;
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
-            }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
-            }
+            this.handleError(e, reply);
         }
     }
     async export(request, reply) {
@@ -407,19 +348,7 @@ class AbstractFastifyController {
             };
         }
         catch (e) {
-            console.error(e);
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message, inputErrors: e.errors });
-            }
-            else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode;
-                reply.send({ error: e.message });
-            }
-            else {
-                reply.statusCode = 500;
-                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
-            }
+            this.handleError(e, reply);
         }
     }
 }

package/dist/index.js

@@ -3,6 +3,20 @@ import AbstractMongoRepository from "./repository/AbstractMongoRepository.js";
 import AbstractSqliteRepository from "./repository/AbstractSqliteRepository.js";
 import AbstractService from "./services/AbstractService.js";
 import AbstractFastifyController from "./controllers/AbstractFastifyController.js";
+//schemas
+import { IdParamSchema } from "./schemas/IdParamSchema.js";
+import { DeleteBodyResponseSchema } from "./schemas/DeleteBodyResponseSchema.js";
+import { PaginateBodyResponseSchema, PaginateQuerySchema } from "./schemas/PaginateSchema.js";
+import { FindQuerySchema } from "./schemas/FindSchema.js";
+import { SearchQuerySchema } from "./schemas/SearchSchema.js";
+import { FindByParamSchema } from "./schemas/FindBySchema.js";
+import { ExportBodyResponseSchema } from "./schemas/ExportBodyResponseSchema.js";
+import { ErrorBodyResponseSchema, ValidationErrorBodyResponseSchema } from "./schemas/ErrorBodyResponseSchema.js";
+import { CrudSchemaBuilder } from "./builders/CrudSchemaBuilder.js";
 export { 
 //CRUD
-AbstractMongoRepository, AbstractSqliteRepository, AbstractService, AbstractFastifyController, };
+AbstractMongoRepository, AbstractSqliteRepository, AbstractService, AbstractFastifyController, 
+//Schemas
+IdParamSchema, DeleteBodyResponseSchema, PaginateBodyResponseSchema, PaginateQuerySchema, FindQuerySchema, SearchQuerySchema, FindByParamSchema, ErrorBodyResponseSchema, ValidationErrorBodyResponseSchema, ExportBodyResponseSchema, 
+//Builder
+CrudSchemaBuilder, };

package/dist/regexs/QueryFilterRegex.js

@@ -0,0 +1,3 @@
+const QueryFilterRegex = /^(?:[a-zA-Z0-9_]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte);[a-zA-Z0-9_]+)(?:\|[a-zA-Z0-9_]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte);[a-zA-Z0-9_]+)*$/;
+export default QueryFilterRegex;
+export { QueryFilterRegex };