@react-pakistan/util-functions 1.24.70 → 1.24.72

package/api/stellar-solutions/customer/index.js

@@ -46,39 +46,80 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteCustomer = exports.updateCustomer = exports.unitCustomerByPhone = exports.unitCustomerById = exports.listCustomer = void 0;
+var multi_part_search_1 = require("../../../general/multi-part-search");
 /**
  * Retrieves customers with pagination and filtering
  * @param {ListCustomerArgs} args - Object containing prisma client, pagination, and query options
  * @returns {Promise<[number, Array<CustomerBE>]>} Tuple containing total count and array of customers
  */
 var listCustomer = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var _c, count, customers;
+    var include, orderBy, idSearchQuery, firstNameSearchQuery, lastNameSearchQuery, emailSearchQuery, phoneSearchQuery, where, _c, count, items;
     var _d;
-    var currentPage = _b.currentPage, _e = _b.orderByColumn, orderByColumn = _e === void 0 ? 'createdAt' : _e, _f = _b.orderByDirection, orderByDirection = _f === void 0 ? 'desc' : _f, pageLimit = _b.pageLimit, prisma = _b.prisma;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _e = _b.currentPage, currentPage = _e === void 0 ? 1 : _e, _f = _b.includeQuotesInvoices, includeQuotesInvoices = _f === void 0 ? false : _f, _g = _b.orderByColumn, orderByColumn = _g === void 0 ? 'createdAt' : _g, _h = _b.orderByDirection, orderByDirection = _h === void 0 ? 'desc' : _h, _j = _b.pageLimit, pageLimit = _j === void 0 ? 5 : _j, prisma = _b.prisma, _k = _b.searchQuery, searchQuery = _k === void 0 ? '' : _k;
+    return __generator(this, function (_l) {
+        switch (_l.label) {
             case 0:
-                if (currentPage < 1) {
+                if (!currentPage || currentPage < 1) {
                     throw new Error('Valid current page is required');
                 }
-                if (pageLimit < 1) {
+                if (!pageLimit || pageLimit < 1) {
                     throw new Error('Valid page limit is required');
                 }
+                include = {
+                    quotesInvoices: includeQuotesInvoices,
+                };
+                orderBy = (_d = {},
+                    _d[orderByColumn] = orderByDirection,
+                    _d);
+                idSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'id',
+                    fullText: searchQuery,
+                });
+                firstNameSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'firstName',
+                    fullText: searchQuery,
+                });
+                lastNameSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'lastName',
+                    fullText: searchQuery,
+                });
+                emailSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'email',
+                    fullText: searchQuery,
+                });
+                phoneSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'phone',
+                    fullText: searchQuery,
+                });
+                where = {
+                    OR: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], idSearchQuery, true), firstNameSearchQuery, true), lastNameSearchQuery, true), emailSearchQuery, true), phoneSearchQuery, true),
+                };
                 return [4 /*yield*/, prisma.$transaction([
-                        prisma.customer.count(),
+                        prisma.customer.count({
+                            where: where,
+                        }),
                         prisma.customer.findMany({
-                            orderBy: (_d = {},
-                                _d[orderByColumn] = orderByDirection,
-                                _d),
-                            take: pageLimit,
+                            include: include,
+                            orderBy: orderBy,
                             skip: (currentPage - 1) * pageLimit,
+                            take: pageLimit,
+                            where: where,
                         }),
                     ])];
             case 1:
-                _c = _g.sent(), count = _c[0], customers = _c[1];
-                return [2 /*return*/, [count, customers]];
+                _c = _l.sent(), count = _c[0], items = _c[1];
+                return [2 /*return*/, [count, items]];
         }
     });
 }); };
@@ -89,18 +130,21 @@ exports.listCustomer = listCustomer;
  * @returns {Promise<CustomerBE | null>} Customer if found, null otherwise
  */
 var unitCustomerById = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var customer;
-    var id = _b.id, prisma = _b.prisma;
+    var include, where, customer;
+    var id = _b.id, prisma = _b.prisma, includeQuotesInvoices = _b.includeQuotesInvoices;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
                 if (!id) {
                     throw new Error('Customer ID is required');
                 }
+                include = {
+                    quotesInvoices: includeQuotesInvoices,
+                };
+                where = { id: id };
                 return [4 /*yield*/, prisma.customer.findUnique({
-                        where: {
-                            id: id,
-                        },
+                        include: include,
+                        where: where,
                     })];
             case 1:
                 customer = _c.sent();
@@ -115,21 +159,24 @@ exports.unitCustomerById = unitCustomerById;
  * @returns {Promise<CustomerBE | null>} Customer if found, null otherwise
  */
 var unitCustomerByPhone = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var customer;
-    var phone = _b.phone, prisma = _b.prisma;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var include, where, customer;
+    var _c = _b.includeQuotesInvoices, includeQuotesInvoices = _c === void 0 ? false : _c, phone = _b.phone, prisma = _b.prisma;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 if (!phone) {
                     throw new Error('Phone number is required');
                 }
+                include = {
+                    quotesInvoices: includeQuotesInvoices,
+                };
+                where = { phone: phone };
                 return [4 /*yield*/, prisma.customer.findUnique({
-                        where: {
-                            phone: phone,
-                        },
+                        include: include,
+                        where: where,
                     })];
             case 1:
-                customer = _c.sent();
+                customer = _d.sent();
                 return [2 /*return*/, customer];
         }
     });
@@ -141,7 +188,7 @@ exports.unitCustomerByPhone = unitCustomerByPhone;
  * @returns {Promise<CustomerBE>} Created or updated customer
  */
 var updateCustomer = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var customerData, customer;
+    var customerData, where, customer;
     var address = _b.address, city = _b.city, country = _b.country, email = _b.email, firstName = _b.firstName, id = _b.id, lastName = _b.lastName, phone = _b.phone, prisma = _b.prisma;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -161,12 +208,11 @@ var updateCustomer = function (_a) { return __awaiter(void 0, [_a], void 0, func
                     lastName: lastName,
                     phone: phone,
                 };
+                where = { id: id };
                 return [4 /*yield*/, prisma.customer.upsert({
-                        where: {
-                            id: id,
-                        },
-                        update: customerData,
                         create: __assign({ id: id }, customerData),
+                        update: customerData,
+                        where: where,
                     })];
             case 1:
                 customer = _c.sent();
@@ -182,7 +228,7 @@ exports.updateCustomer = updateCustomer;
  * @throws {Error} If customer ID is not provided or customer not found
  */
 var deleteCustomer = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var customer;
+    var where, customer;
     var id = _b.id, prisma = _b.prisma;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -190,10 +236,9 @@ var deleteCustomer = function (_a) { return __awaiter(void 0, [_a], void 0, func
                 if (!id) {
                     throw new Error('Customer ID is required');
                 }
+                where = { id: id };
                 return [4 /*yield*/, prisma.customer.delete({
-                        where: {
-                            id: id,
-                        },
+                        where: where,
                     })];
             case 1:
                 customer = _c.sent();

package/api/stellar-solutions/expense/index.d.ts

@@ -1,19 +1,20 @@
 import { ExpenseBE } from '../type';
 type PrismaClient = any;
-interface ListExpenseArgs {
-    currentPage: number;
+export interface ListExpenseArgs {
+    currentPage?: number;
     includeExpenseCategory?: boolean;
     orderByColumn?: string;
     orderByDirection?: 'asc' | 'desc';
-    pageLimit: number;
+    pageLimit?: number;
     prisma: PrismaClient;
+    searchQuery?: string;
 }
-interface UnitExpenseByIdArgs {
+export interface UnitExpenseByIdArgs {
     id: string;
     includeExpenseCategory?: boolean;
     prisma: PrismaClient;
 }
-interface UpdateExpenseArgs {
+export interface UpdateExpenseArgs {
     currency: string;
     description: string;
     expenseCategoryId: string;
@@ -24,7 +25,7 @@ interface UpdateExpenseArgs {
     ref?: string;
     total: string;
 }
-interface DeleteExpenseArgs {
+export interface DeleteExpenseArgs {
     id: string;
     includeExpenseCategory?: boolean;
     prisma: PrismaClient;
@@ -34,7 +35,7 @@ interface DeleteExpenseArgs {
  * @param {ListExpenseArgs} args - Object containing prisma client, pagination, and query options
  * @returns {Promise<[number, Array<ExpenseBE>]>} Tuple containing total count and array of expenses
  */
-export declare const listExpense: ({ currentPage, includeExpenseCategory, orderByColumn, orderByDirection, pageLimit, prisma, }: ListExpenseArgs) => Promise<[number, Array<ExpenseBE>]>;
+export declare const listExpense: ({ currentPage, includeExpenseCategory, orderByColumn, orderByDirection, pageLimit, prisma, searchQuery, }: ListExpenseArgs) => Promise<[number, Array<ExpenseBE>]>;
 /**
  * Retrieves a single expense by ID
  * @param {UnitExpenseByIdArgs} args - Object containing prisma client, expense id, and optional query parameters

package/api/stellar-solutions/expense/index.js

@@ -46,40 +46,76 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteExpense = exports.updateExpense = exports.unitExpenseById = exports.listExpense = void 0;
+var multi_part_search_1 = require("../../../general/multi-part-search");
 /**
  * Retrieves expenses with pagination and filtering
  * @param {ListExpenseArgs} args - Object containing prisma client, pagination, and query options
  * @returns {Promise<[number, Array<ExpenseBE>]>} Tuple containing total count and array of expenses
  */
 var listExpense = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var _c, count, expenses;
+    var include, orderBy, idSearchQuery, nameSearchQuery, descriptionSearchQuery, refSearchQuery, where, _c, count, items;
     var _d;
-    var currentPage = _b.currentPage, _e = _b.includeExpenseCategory, includeExpenseCategory = _e === void 0 ? false : _e, _f = _b.orderByColumn, orderByColumn = _f === void 0 ? 'createdAt' : _f, _g = _b.orderByDirection, orderByDirection = _g === void 0 ? 'desc' : _g, pageLimit = _b.pageLimit, prisma = _b.prisma;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var currentPage = _b.currentPage, _e = _b.includeExpenseCategory, includeExpenseCategory = _e === void 0 ? false : _e, _f = _b.orderByColumn, orderByColumn = _f === void 0 ? 'createdAt' : _f, _g = _b.orderByDirection, orderByDirection = _g === void 0 ? 'desc' : _g, pageLimit = _b.pageLimit, prisma = _b.prisma, _h = _b.searchQuery, searchQuery = _h === void 0 ? '' : _h;
+    return __generator(this, function (_j) {
+        switch (_j.label) {
             case 0:
-                if (currentPage < 1) {
+                if (!currentPage || currentPage < 1) {
                     throw new Error('Current page must be greater than or equal to 1');
                 }
-                if (pageLimit < 1) {
+                if (!pageLimit || pageLimit < 1) {
                     throw new Error('Page limit must be greater than or equal to 1');
                 }
+                include = {
+                    expenseCategory: includeExpenseCategory,
+                };
+                orderBy = (_d = {},
+                    _d[orderByColumn] = orderByDirection,
+                    _d);
+                idSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'id',
+                    fullText: searchQuery,
+                });
+                nameSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'name',
+                    fullText: searchQuery,
+                });
+                descriptionSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'description',
+                    fullText: searchQuery,
+                });
+                refSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'ref',
+                    fullText: searchQuery,
+                });
+                where = {
+                    OR: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], idSearchQuery, true), nameSearchQuery, true), descriptionSearchQuery, true), refSearchQuery, true),
+                };
                 return [4 /*yield*/, prisma.$transaction([
-                        prisma.expense.count(),
+                        prisma.expense.count({
+                            where: where,
+                        }),
                         prisma.expense.findMany({
-                            orderBy: (_d = {},
-                                _d[orderByColumn] = orderByDirection,
-                                _d),
-                            include: includeExpenseCategory ? { expenseCategory: true } : undefined,
+                            include: include,
+                            orderBy: orderBy,
                             take: pageLimit,
                             skip: (currentPage - 1) * pageLimit,
+                            where: where,
                         }),
                     ])];
             case 1:
-                _c = _h.sent(), count = _c[0], expenses = _c[1];
-                return [2 /*return*/, [count, expenses]];
+                _c = _j.sent(), count = _c[0], items = _c[1];
+                return [2 /*return*/, [count, items]];
         }
     });
 }); };
@@ -90,7 +126,7 @@ exports.listExpense = listExpense;
  * @returns {Promise<ExpenseBE | null>} Expense with optional relations if found, null otherwise
  */
 var unitExpenseById = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var expense;
+    var include, where, expense;
     var id = _b.id, _c = _b.includeExpenseCategory, includeExpenseCategory = _c === void 0 ? false : _c, prisma = _b.prisma;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -98,11 +134,15 @@ var unitExpenseById = function (_a) { return __awaiter(void 0, [_a], void 0, fun
                 if (!id) {
                     throw new Error('Expense ID is required');
                 }
+                include = {
+                    expenseCategory: includeExpenseCategory,
+                };
+                where = {
+                    id: id,
+                };
                 return [4 /*yield*/, prisma.expense.findUnique({
-                        where: {
-                            id: id,
-                        },
-                        include: includeExpenseCategory ? { expenseCategory: true } : undefined,
+                        include: include,
+                        where: where,
                     })];
             case 1:
                 expense = _d.sent();
@@ -117,7 +157,7 @@ exports.unitExpenseById = unitExpenseById;
  * @returns {Promise<ExpenseBE>} Created or updated expense
  */
 var updateExpense = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var expenseData, expense;
+    var expenseData, include, where, expense;
     var currency = _b.currency, description = _b.description, expenseCategoryId = _b.expenseCategoryId, id = _b.id, _c = _b.includeExpenseCategory, includeExpenseCategory = _c === void 0 ? true : _c, name = _b.name, prisma = _b.prisma, ref = _b.ref, total = _b.total;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -136,13 +176,17 @@ var updateExpense = function (_a) { return __awaiter(void 0, [_a], void 0, funct
                     ref: ref || null,
                     total: total,
                 };
+                include = {
+                    expenseCategory: includeExpenseCategory,
+                };
+                where = {
+                    id: id,
+                };
                 return [4 /*yield*/, prisma.expense.upsert({
-                        where: {
-                            id: id,
-                        },
-                        update: expenseData,
+                        include: include,
                         create: __assign({ id: id }, expenseData),
-                        include: includeExpenseCategory ? { expenseCategory: true } : undefined,
+                        update: expenseData,
+                        where: where,
                     })];
             case 1:
                 expense = _d.sent();
@@ -158,7 +202,7 @@ exports.updateExpense = updateExpense;
  * @throws {Error} If expense ID is not provided or expense not found
  */
 var deleteExpense = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var expense;
+    var include, where, expense;
     var id = _b.id, _c = _b.includeExpenseCategory, includeExpenseCategory = _c === void 0 ? true : _c, prisma = _b.prisma;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -166,11 +210,15 @@ var deleteExpense = function (_a) { return __awaiter(void 0, [_a], void 0, funct
                 if (!id) {
                     throw new Error('Expense ID is required');
                 }
+                include = {
+                    expenseCategory: includeExpenseCategory,
+                };
+                where = {
+                    id: id,
+                };
                 return [4 /*yield*/, prisma.expense.delete({
-                        where: {
-                            id: id,
-                        },
-                        include: includeExpenseCategory ? { expenseCategory: true } : undefined,
+                        include: include,
+                        where: where,
                     })];
             case 1:
                 expense = _d.sent();

package/api/stellar-solutions/expense-category/index.d.ts

@@ -1,29 +1,28 @@
 import { ExpenseCategoryBE } from '../type';
 type PrismaClient = any;
-interface ListExpenseCategoryArgs {
+export interface ListExpenseCategoryArgs {
     currentPage?: number;
     includeExpenses?: boolean;
     orderByColumn?: string;
     orderByDirection?: 'asc' | 'desc';
     pageLimit?: number;
     prisma: PrismaClient;
+    searchQuery?: string;
 }
-interface UnitExpenseCategoryByIdArgs {
+export interface UnitExpenseCategoryByIdArgs {
     id: string;
     includeExpenses?: boolean;
     prisma: PrismaClient;
 }
-interface UpdateExpenseCategoryArgs {
+export interface UpdateExpenseCategoryArgs {
     color: string;
     description?: string;
     id: string;
-    includeExpenses?: boolean;
     name: string;
     prisma: PrismaClient;
 }
-interface DeleteExpenseCategoryArgs {
+export interface DeleteExpenseCategoryArgs {
     id: string;
-    includeExpenses?: boolean;
     prisma: PrismaClient;
 }
 /**
@@ -31,7 +30,7 @@ interface DeleteExpenseCategoryArgs {
  * @param {ListExpenseCategoryArgs} args - Object containing prisma client, pagination, and query options
  * @returns {Promise<[number, Array<ExpenseCategoryBE>]>} Tuple containing total count and array of expense categories
  */
-export declare const listExpenseCategory: ({ currentPage, includeExpenses, orderByColumn, orderByDirection, pageLimit, prisma, }: ListExpenseCategoryArgs) => Promise<[number, Array<ExpenseCategoryBE>]>;
+export declare const listExpenseCategory: ({ currentPage, includeExpenses, orderByColumn, orderByDirection, pageLimit, prisma, searchQuery, }: ListExpenseCategoryArgs) => Promise<[number, Array<ExpenseCategoryBE>]>;
 /**
  * Retrieves a single expense category by ID
  * @param {UnitExpenseCategoryByIdArgs} args - Object containing prisma client, expense category id, and optional query parameters
@@ -43,12 +42,12 @@ export declare const unitExpenseCategoryById: ({ id, includeExpenses, prisma, }:
  * @param {UpdateExpenseCategoryArgs} args - Object containing prisma client and expense category data
  * @returns {Promise<ExpenseCategoryBE>} Created or updated expense category
  */
-export declare const updateExpenseCategory: ({ color, description, id, includeExpenses, name, prisma, }: UpdateExpenseCategoryArgs) => Promise<ExpenseCategoryBE>;
+export declare const updateExpenseCategory: ({ color, description, id, name, prisma, }: UpdateExpenseCategoryArgs) => Promise<ExpenseCategoryBE>;
 /**
  * Deletes an expense category by ID
  * @param {DeleteExpenseCategoryArgs} args - Object containing prisma client, expense category id, and optional query parameters
  * @returns {Promise<ExpenseCategoryBE>} Deleted expense category
  * @throws {Error} If expense category ID is not provided or expense category not found
  */
-export declare const deleteExpenseCategory: ({ id, includeExpenses, prisma, }: DeleteExpenseCategoryArgs) => Promise<ExpenseCategoryBE>;
+export declare const deleteExpenseCategory: ({ id, prisma, }: DeleteExpenseCategoryArgs) => Promise<ExpenseCategoryBE>;
 export {};

package/api/stellar-solutions/expense-category/index.js

@@ -46,25 +46,35 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteExpenseCategory = exports.updateExpenseCategory = exports.unitExpenseCategoryById = exports.listExpenseCategory = void 0;
+var multi_part_search_1 = require("../../../general/multi-part-search");
 /**
  * Retrieves expense categories with pagination and filtering
  * @param {ListExpenseCategoryArgs} args - Object containing prisma client, pagination, and query options
  * @returns {Promise<[number, Array<ExpenseCategoryBE>]>} Tuple containing total count and array of expense categories
  */
 var listExpenseCategory = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var include, orderBy, skip, where, _c, count, items;
+    var include, orderBy, idSearchQuery, nameSearchQuery, descriptionSearchQuery, where, _c, count, items;
     var _d;
-    var _e = _b.currentPage, currentPage = _e === void 0 ? 1 : _e, _f = _b.includeExpenses, includeExpenses = _f === void 0 ? false : _f, _g = _b.orderByColumn, orderByColumn = _g === void 0 ? 'createdAt' : _g, _h = _b.orderByDirection, orderByDirection = _h === void 0 ? 'desc' : _h, _j = _b.pageLimit, pageLimit = _j === void 0 ? 10 : _j, prisma = _b.prisma;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var _e = _b.currentPage, currentPage = _e === void 0 ? 1 : _e, _f = _b.includeExpenses, includeExpenses = _f === void 0 ? false : _f, _g = _b.orderByColumn, orderByColumn = _g === void 0 ? 'createdAt' : _g, _h = _b.orderByDirection, orderByDirection = _h === void 0 ? 'desc' : _h, _j = _b.pageLimit, pageLimit = _j === void 0 ? 5 : _j, prisma = _b.prisma, _k = _b.searchQuery, searchQuery = _k === void 0 ? '' : _k;
+    return __generator(this, function (_l) {
+        switch (_l.label) {
             case 0:
-                if (currentPage < 1) {
-                    throw new Error('Current page must be greater than or equal to 1');
+                if (!currentPage || currentPage < 1) {
+                    throw new Error('Valid current page is required');
                 }
-                if (pageLimit < 1) {
-                    throw new Error('Page limit must be greater than or equal to 1');
+                if (!pageLimit || pageLimit < 1) {
+                    throw new Error('Valid page limit is required');
                 }
                 include = {
                     expenses: includeExpenses,
@@ -72,8 +82,21 @@ var listExpenseCategory = function (_a) { return __awaiter(void 0, [_a], void 0,
                 orderBy = (_d = {},
                     _d[orderByColumn] = orderByDirection,
                     _d);
-                skip = (currentPage - 1) * pageLimit;
-                where = {};
+                idSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'id',
+                    fullText: searchQuery,
+                });
+                nameSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'name',
+                    fullText: searchQuery,
+                });
+                descriptionSearchQuery = (0, multi_part_search_1.multiPartSearch)({
+                    columnName: 'description',
+                    fullText: searchQuery,
+                });
+                where = {
+                    OR: __spreadArray(__spreadArray(__spreadArray([], idSearchQuery, true), nameSearchQuery, true), descriptionSearchQuery, true),
+                };
                 return [4 /*yield*/, prisma.$transaction([
                         prisma.expenseCategory.count({
                             where: where,
@@ -81,13 +104,13 @@ var listExpenseCategory = function (_a) { return __awaiter(void 0, [_a], void 0,
                         prisma.expenseCategory.findMany({
                             include: include,
                             orderBy: orderBy,
-                            skip: skip,
+                            skip: (currentPage - 1) * pageLimit,
                             take: pageLimit,
                             where: where,
                         }),
                     ])];
             case 1:
-                _c = _k.sent(), count = _c[0], items = _c[1];
+                _c = _l.sent(), count = _c[0], items = _c[1];
                 return [2 /*return*/, [count, items]];
         }
     });
@@ -130,10 +153,10 @@ exports.unitExpenseCategoryById = unitExpenseCategoryById;
  * @returns {Promise<ExpenseCategoryBE>} Created or updated expense category
  */
 var updateExpenseCategory = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var expenseCategoryData, include, where, expenseCategory;
-    var color = _b.color, description = _b.description, id = _b.id, _c = _b.includeExpenses, includeExpenses = _c === void 0 ? true : _c, name = _b.name, prisma = _b.prisma;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var expenseCategoryData, where, expenseCategory;
+    var color = _b.color, description = _b.description, id = _b.id, name = _b.name, prisma = _b.prisma;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (!id) {
                     throw new Error('Expense category ID is required');
@@ -146,20 +169,16 @@ var updateExpenseCategory = function (_a) { return __awaiter(void 0, [_a], void
                     description: description || null,
                     name: name,
                 };
-                include = {
-                    expenses: includeExpenses,
-                };
                 where = {
                     id: id,
                 };
                 return [4 /*yield*/, prisma.expenseCategory.upsert({
                         create: __assign({ id: id }, expenseCategoryData),
-                        include: include,
                         update: expenseCategoryData,
                         where: where,
                     })];
             case 1:
-                expenseCategory = _d.sent();
+                expenseCategory = _c.sent();
                 return [2 /*return*/, expenseCategory];
         }
     });
@@ -172,26 +191,22 @@ exports.updateExpenseCategory = updateExpenseCategory;
  * @throws {Error} If expense category ID is not provided or expense category not found
  */
 var deleteExpenseCategory = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var include, where, expenseCategory;
-    var id = _b.id, _c = _b.includeExpenses, includeExpenses = _c === void 0 ? true : _c, prisma = _b.prisma;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var where, expenseCategory;
+    var id = _b.id, prisma = _b.prisma;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (!id) {
                     throw new Error('Expense category ID is required');
                 }
-                include = {
-                    expenses: includeExpenses,
-                };
                 where = {
                     id: id,
                 };
                 return [4 /*yield*/, prisma.expenseCategory.delete({
-                        include: include,
                         where: where,
                     })];
             case 1:
-                expenseCategory = _d.sent();
+                expenseCategory = _c.sent();
                 return [2 /*return*/, expenseCategory];
         }
     });