@kipicore/dbcore 1.1.2 → 1.1.4

package/dist/helpers/utils.d.ts

@@ -21,7 +21,7 @@ export declare function groupByFieldOrFields<T>(array: T[], fields: keyof T | (k
 export declare const isTimeWithinRange: (time: Date, rangeStart: Date, rangeEnd: Date) => boolean;
 export declare const isDateWithinRange: (date: Date | string, rangeStart: Date | string, rangeEnd: Date | string) => boolean;
 export declare const startOfDay: (date: string | Date) => Date;
-export declare const generateUuidToNumber: (uuid?: string) => string;
+export declare const generateUuidToNumber: (uuid1?: string) => string;
 export declare const endOfDay: (date: string | Date) => Date;
 type GroupByFields<T> = (array: T[], fields: keyof T | (keyof T)[]) => Record<string, T[]>;
 export declare const groupByFields: GroupByFields<any>;

package/dist/helpers/utils.js

@@ -48,7 +48,7 @@ const fs_1 = __importDefault(require("fs"));
 const dateFunction = __importStar(require("date-fns"));
 const app_js_1 = require("../constants/app.js");
 const joi_1 = __importDefault(require("joi"));
-const uuid_1 = require("uuid");
+const uuid_1 = __importDefault(require("uuid"));
 const crypto_1 = __importDefault(require("crypto"));
 const sequelize_1 = require("sequelize");
 const axios_1 = __importDefault(require("axios"));
@@ -230,11 +230,11 @@ const startOfDay = (date) => {
     return dateFunction.startOfDay(dateFunction.parseISO(new Date(date).toISOString()));
 };
 exports.startOfDay = startOfDay;
-const generateUuidToNumber = (uuid) => {
-    if (!uuid)
-        uuid = (0, uuid_1.v4)();
+const generateUuidToNumber = (uuid1) => {
+    if (!uuid1)
+        uuid1 = uuid_1.default.v4();
     // Remove dashes from the UUID
-    let numericId = uuid.replace(/-/g, '');
+    let numericId = uuid1.replace(/-/g, '');
     // Convert hex characters to numbers (keeping only digits)
     numericId = BigInt('0x' + numericId).toString();
     return numericId;
@@ -470,9 +470,9 @@ const removeFalsyValues = (obj) => {
 };
 exports.removeFalsyValues = removeFalsyValues;
 const isValidUUID = (id, expectedVersion) => {
-    if (!(0, uuid_1.validate)(id))
+    if (!uuid_1.default.validate(id))
         return false;
-    if (expectedVersion && (0, uuid_1.version)(id) !== expectedVersion)
+    if (expectedVersion && uuid_1.default.version(id) !== expectedVersion)
         return false;
     return true;
 };

package/dist/models/mongodb/subjectIndexModel.js

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const mongoose_1 = __importStar(require("mongoose"));
 const app_js_1 = require("../../constants/app.js");
-const uuid_1 = require("uuid");
+const uuid_1 = __importDefault(require("uuid"));
 const utils_js_1 = require("../../helpers/utils.js");
 const sequelize_1 = require("sequelize");
 const env_js_1 = require("../../configs/env.js");
@@ -351,7 +351,7 @@ const creatOrUpdateHook = async (subjectIndex) => {
             }
             for (const chapterIndex of subjectIndex.chapterIndex) {
                 if (!chapterIndex.id)
-                    chapterIndex.id = (0, uuid_1.v4)();
+                    chapterIndex.id = uuid_1.default.v4();
                 if (chapterIndex.type !== app_js_1.CHAPTER_INDEX_TYPE.CHAPTER) {
                     const parentChapterIndex = subjectIndex.chapterIndex.find((index) => index.id === chapterIndex.parentId);
                     if (!parentChapterIndex)
@@ -373,7 +373,7 @@ const creatOrUpdateHook = async (subjectIndex) => {
                     // }
                     chapterIndex.files = chapterIndex.files.map((file) => {
                         if (!file.id)
-                            file.id = (0, uuid_1.v4)();
+                            file.id = uuid_1.default.v4();
                         return file;
                     });
                 }

package/dist/models/mongodb/subscriptionPlanModel.d.ts

@@ -1,4 +1,4 @@
-import { Model } from 'mongoose';
-import { ISubscriptionPlanModelAttributes } from '../../interfaces/subscriptionPlanInterface.js';
+import { Model } from "mongoose";
+import { ISubscriptionPlanModelAttributes } from "../../interfaces/subscriptionPlanInterface.js";
 declare const SubscriptionPlanModel: Model<ISubscriptionPlanModelAttributes>;
 export default SubscriptionPlanModel;

package/dist/models/mongodb/subscriptionPlanModel.js

@@ -32,9 +32,12 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importStar(require("mongoose"));
-const uuid_1 = require("uuid");
+const uuid_1 = __importDefault(require("uuid"));
 const app_js_1 = require("../../constants/app.js");
 const subscriptionPlanFilesSchema = new mongoose_1.Schema({
     type: {
@@ -55,7 +58,7 @@ const subscriptionPlanModelSchema = new mongoose_1.Schema({
     uuid: {
         type: String,
         required: true,
-        default: uuid_1.v4,
+        default: uuid_1.default.v4(),
     },
     title: {
         type: String,
@@ -129,5 +132,5 @@ const subscriptionPlanModelSchema = new mongoose_1.Schema({
     timestamps: true,
     versionKey: false,
 });
-const SubscriptionPlanModel = mongoose_1.default.model('subscription_plans', subscriptionPlanModelSchema);
+const SubscriptionPlanModel = mongoose_1.default.model("subscription_plans", subscriptionPlanModelSchema);
 exports.default = SubscriptionPlanModel;

package/dist/models/mongodb/taskManagementModel.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importStar(require("mongoose"));
-const uuid_1 = require("uuid");
+const uuid_1 = __importDefault(require("uuid"));
 const app_js_1 = require("../../constants/app.js");
 const sequelize_1 = require("sequelize");
 const errorMessages_js_1 = require("../../constants/errorMessages.js");
@@ -46,7 +46,7 @@ const userModel_js_1 = __importDefault(require("../psql/userModel.js"));
 const TaskConversationsSchema = new mongoose_1.Schema({
     messageId: {
         type: String,
-        default: uuid_1.v4,
+        default: uuid_1.default.v4(),
     },
     userId: {
         type: String,

package/dist/models/psql/userModel.js

@@ -10,11 +10,13 @@ const countryModel_js_1 = __importDefault(require("./countryModel.js"));
 const stateModel_js_1 = __importDefault(require("./stateModel.js"));
 const cityModel_js_1 = __importDefault(require("./cityModel.js"));
 const tokenModel_js_1 = __importDefault(require("./tokenModel.js"));
-const uuid_1 = require("uuid");
+const uuid_1 = __importDefault(require("uuid"));
 const areaModel_js_1 = __importDefault(require("./areaModel.js"));
 const utils_js_1 = require("../../helpers/utils.js");
 const uniqueNumberCounterModel_js_1 = __importDefault(require("../mongodb/uniqueNumberCounterModel.js"));
 class UserModel extends sequelize_1.Model {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    static updateById;
     // declare addParent: BelongsToManyAddAssociationMixin<UserModel, string>;
     // declare getParents: BelongsToManyGetAssociationsMixin<UserModel>;
     static associate() { }
@@ -359,7 +361,7 @@ const userBeforeCreateHook = async (user) => {
     if (user.type) {
         user.globalId = await generateGlobalUniqueNumber(app_js_1.TYPE_OF_USER.USER, user.type);
     }
-    user.uuid = (0, uuid_1.v4)();
+    user.uuid = uuid_1.default.v4();
     const where = {
         email: user.email,
         uuid: { [sequelize_1.Op.ne]: null }, // uuid must not be null

package/dist/services/Concrete/mongooseCommonService.js

@@ -3,55 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongooseCommonService = void 0;
 const app_js_1 = require("../../constants/app.js");
 class MongooseCommonService {
+    model;
     constructor(model) {
-        this.findAllWithPagination = async (filter, options = {}, populate) => {
-            try {
-                const convertOrderToSort = (order) => {
-                    const sort = {};
-                    for (const [key, direction] of order) {
-                        sort[key] = direction.toUpperCase() === "DESC" ? -1 : 1;
-                    }
-                    return sort;
-                };
-                const { order, projection, ...restOptions } = options;
-                let { page, limit } = options;
-                const sort = convertOrderToSort(order || app_js_1.PAGINATION_ORDER);
-                // Ensure page and limit are positive integers
-                page = Math.max(1, page || app_js_1.PAGINATION.PAGE);
-                limit = Math.max(1, limit || app_js_1.PAGINATION.LIMIT);
-                // Calculate offset
-                const skip = (page - 1) * limit;
-                // Count total records
-                const totalRecords = await this.model.countDocuments(filter).exec();
-                const totalPages = Math.ceil(totalRecords / limit);
-                // Query the records
-                const query = this.model.find(filter, projection, {
-                    ...restOptions,
-                    limit,
-                    skip,
-                    sort,
-                });
-                // Apply populate if necessary
-                if (populate) {
-                    query.populate(populate);
-                }
-                const recordList = await query.exec();
-                // Construct the pagination result
-                const paginationOptions = {
-                    limit,
-                    totalRecords,
-                    totalPages,
-                    hasPreviousPage: page > 1,
-                    currentPage: Math.min(page, totalPages),
-                    hasNextPage: page < totalPages,
-                    recordList,
-                };
-                return paginationOptions;
-            }
-            catch (err) {
-                throw err;
-            }
-        };
         this.model = model;
     }
     async findAll(filter, options = {}, populate) {
@@ -72,6 +25,54 @@ class MongooseCommonService {
             query.populate(populate);
         return query.exec();
     }
+    findAllWithPagination = async (filter, options = {}, populate) => {
+        try {
+            const convertOrderToSort = (order) => {
+                const sort = {};
+                for (const [key, direction] of order) {
+                    sort[key] = direction.toUpperCase() === "DESC" ? -1 : 1;
+                }
+                return sort;
+            };
+            const { order, projection, ...restOptions } = options;
+            let { page, limit } = options;
+            const sort = convertOrderToSort(order || app_js_1.PAGINATION_ORDER);
+            // Ensure page and limit are positive integers
+            page = Math.max(1, page || app_js_1.PAGINATION.PAGE);
+            limit = Math.max(1, limit || app_js_1.PAGINATION.LIMIT);
+            // Calculate offset
+            const skip = (page - 1) * limit;
+            // Count total records
+            const totalRecords = await this.model.countDocuments(filter).exec();
+            const totalPages = Math.ceil(totalRecords / limit);
+            // Query the records
+            const query = this.model.find(filter, projection, {
+                ...restOptions,
+                limit,
+                skip,
+                sort,
+            });
+            // Apply populate if necessary
+            if (populate) {
+                query.populate(populate);
+            }
+            const recordList = await query.exec();
+            // Construct the pagination result
+            const paginationOptions = {
+                limit,
+                totalRecords,
+                totalPages,
+                hasPreviousPage: page > 1,
+                currentPage: Math.min(page, totalPages),
+                hasNextPage: page < totalPages,
+                recordList,
+            };
+            return paginationOptions;
+        }
+        catch (err) {
+            throw err;
+        }
+    };
     async count(filter) {
         return this.model.countDocuments(filter).exec();
     }

package/dist/services/Concrete/sequelizeCommanService.js

@@ -2,113 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const app_js_1 = require("../../constants/app.js");
 class SequelizeCommonService {
+    model;
     constructor(model) {
-        this.findAll = (where, options) => {
-            try {
-                const finalOptions = {
-                    ...(options || {}),
-                    order: options?.order || app_js_1.PAGINATION_ORDER,
-                };
-                return this.model.findAll({ where, ...finalOptions });
-            }
-            catch (err) {
-                throw err;
-            }
-        };
-        this.findAllWithPagination = async (where, options) => {
-            try {
-                if (!options)
-                    options = {};
-                const limit = options.limit || app_js_1.PAGINATION.LIMIT;
-                const currentPage = options.page || app_js_1.PAGINATION.PAGE;
-                // Clean options for count()
-                const countOptions = { ...options };
-                // options.subQuery = false;
-                delete countOptions.order;
-                delete countOptions.limit;
-                delete countOptions.offset;
-                const totalRecords = await this.model.count({
-                    where,
-                    include: options.include,
-                    distinct: true,
-                });
-                const totalPages = Math.ceil(totalRecords / limit);
-                // Apply pagination + order for findAll
-                options.limit = limit;
-                options.offset = (currentPage - 1) * limit;
-                options.order = options.order || app_js_1.PAGINATION_ORDER;
-                const listOfRecords = await this.findAll(where, options);
-                const paginationOptions = {
-                    limit,
-                    totalRecords,
-                    totalPages,
-                    hasPreviousPage: currentPage - 1 > 0 ? true : false,
-                    currentPage: currentPage > totalPages ? totalPages : currentPage,
-                    hasNextPage: currentPage < totalPages,
-                    recordList: listOfRecords,
-                };
-                return paginationOptions;
-            }
-            catch (err) {
-                throw err;
-            }
-        };
-        this.findOne = async (where, options) => {
-            try {
-                return this.model.findOne({ where, ...options });
-            }
-            catch (err) {
-                throw err;
-            }
-        };
-        this.update = async (where, updateData, options) => {
-            try {
-                return this.model.update(updateData, { where, ...options });
-            }
-            catch (err) {
-                throw err;
-            }
-        };
-        this.upsert = async (conflictWhere, updateData, options) => {
-            try {
-                return this.model.upsert(updateData, { conflictWhere, ...options });
-            }
-            catch (err) {
-                throw err;
-            }
-        };
-        this.create = async (createData, options) => {
-            try {
-                return this.model.create(createData, options);
-            }
-            catch (err) {
-                throw err;
-            }
-        };
-        this.bulkCreate = async (createData, options) => {
-            try {
-                return this.model.bulkCreate(createData, options);
-            }
-            catch (err) {
-                throw err;
-            }
-        };
-        this.delete = async (where, options) => {
-            try {
-                return this.model.destroy({ where, ...options });
-            }
-            catch (err) {
-                throw err;
-            }
-        };
-        this.count = (where, options) => {
-            try {
-                return this.model.count({ where, ...options });
-            }
-            catch (err) {
-                throw err;
-            }
-        };
         this.model = model;
     }
     findByPk(identifier, options) {
@@ -119,5 +14,111 @@ class SequelizeCommonService {
             throw err;
         }
     }
+    findAll = (where, options) => {
+        try {
+            const finalOptions = {
+                ...(options || {}),
+                order: options?.order || app_js_1.PAGINATION_ORDER,
+            };
+            return this.model.findAll({ where, ...finalOptions });
+        }
+        catch (err) {
+            throw err;
+        }
+    };
+    findAllWithPagination = async (where, options) => {
+        try {
+            if (!options)
+                options = {};
+            const limit = options.limit || app_js_1.PAGINATION.LIMIT;
+            const currentPage = options.page || app_js_1.PAGINATION.PAGE;
+            // Clean options for count()
+            const countOptions = { ...options };
+            // options.subQuery = false;
+            delete countOptions.order;
+            delete countOptions.limit;
+            delete countOptions.offset;
+            const totalRecords = await this.model.count({
+                where,
+                include: options.include,
+                distinct: true,
+            });
+            const totalPages = Math.ceil(totalRecords / limit);
+            // Apply pagination + order for findAll
+            options.limit = limit;
+            options.offset = (currentPage - 1) * limit;
+            options.order = options.order || app_js_1.PAGINATION_ORDER;
+            const listOfRecords = await this.findAll(where, options);
+            const paginationOptions = {
+                limit,
+                totalRecords,
+                totalPages,
+                hasPreviousPage: currentPage - 1 > 0 ? true : false,
+                currentPage: currentPage > totalPages ? totalPages : currentPage,
+                hasNextPage: currentPage < totalPages,
+                recordList: listOfRecords,
+            };
+            return paginationOptions;
+        }
+        catch (err) {
+            throw err;
+        }
+    };
+    findOne = async (where, options) => {
+        try {
+            return this.model.findOne({ where, ...options });
+        }
+        catch (err) {
+            throw err;
+        }
+    };
+    update = async (where, updateData, options) => {
+        try {
+            return this.model.update(updateData, { where, ...options });
+        }
+        catch (err) {
+            throw err;
+        }
+    };
+    upsert = async (conflictWhere, updateData, options) => {
+        try {
+            return this.model.upsert(updateData, { conflictWhere, ...options });
+        }
+        catch (err) {
+            throw err;
+        }
+    };
+    create = async (createData, options) => {
+        try {
+            return this.model.create(createData, options);
+        }
+        catch (err) {
+            throw err;
+        }
+    };
+    bulkCreate = async (createData, options) => {
+        try {
+            return this.model.bulkCreate(createData, options);
+        }
+        catch (err) {
+            throw err;
+        }
+    };
+    delete = async (where, options) => {
+        try {
+            return this.model.destroy({ where, ...options });
+        }
+        catch (err) {
+            throw err;
+        }
+    };
+    count = (where, options) => {
+        try {
+            return this.model.count({ where, ...options });
+        }
+        catch (err) {
+            throw err;
+        }
+    };
 }
 exports.default = SequelizeCommonService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kipicore/dbcore",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Reusable DB core package with Postgres, MongoDB, models, services, interfaces, and types",
   "type": "commonjs",
   "main": "dist/index.js",