@kipicore/dbcore 1.1.5 → 1.1.6

package/dist/models/psql/userPayoutModel.js

@@ -26,30 +26,30 @@ UserPayoutModel.init({
     userId: {
         type: sequelize_1.DataTypes.UUID,
         allowNull: false,
-        field: "user_id",
+        field: 'user_id',
     },
     userType: {
         type: sequelize_1.DataTypes.ENUM,
         values: Object.values(app_js_1.USER_TYPES),
         allowNull: false,
-        field: "user_type",
+        field: 'user_type',
     },
     instituteId: {
         type: sequelize_1.DataTypes.UUID,
         allowNull: false,
-        field: "institute_id",
+        field: 'institute_id',
     },
     totalPayableAmount: {
         type: sequelize_1.DataTypes.FLOAT,
         allowNull: true,
         defaultValue: 0,
-        field: "total_payable_amount",
+        field: 'total_payable_amount',
     },
     totalPaidAmount: {
         type: sequelize_1.DataTypes.FLOAT,
         allowNull: true,
         defaultValue: 0,
-        field: "total_paid_amount",
+        field: 'total_paid_amount',
     },
     type: {
         type: sequelize_1.DataTypes.ENUM,
@@ -59,68 +59,67 @@ UserPayoutModel.init({
     lastCalculatedAt: {
         type: sequelize_1.DataTypes.DATE,
         defaultValue: (0, date_fns_1.startOfToday)(),
-        field: "last_calculated_at",
+        field: 'last_calculated_at',
     },
 }, {
-    modelName: "UserPayoutModel",
-    tableName: "user_payouts",
+    modelName: 'UserPayoutModel',
+    tableName: 'user_payouts',
     timestamps: true,
     sequelize: index_js_1.sequelize,
 });
 UserPayoutModel.belongsTo(userModel_js_1.default, {
     foreignKey: {
-        name: "createdBy",
+        name: 'createdBy',
         allowNull: true,
-        field: "created_by",
+        field: 'created_by',
     },
-    as: "createdByUser",
+    as: 'createdByUser',
 });
 UserPayoutModel.belongsTo(userModel_js_1.default, {
     foreignKey: {
-        name: "updatedBy",
+        name: 'updatedBy',
         allowNull: true,
-        field: "updated_by",
+        field: 'updated_by',
     },
-    as: "updatedByUser",
+    as: 'updatedByUser',
 });
 UserPayoutModel.belongsTo(userModel_js_1.default, {
     foreignKey: {
-        name: "deletedBy",
+        name: 'deletedBy',
         allowNull: true,
-        field: "deleted_by",
+        field: 'deleted_by',
     },
-    as: "deletedByUser",
+    as: 'deletedByUser',
 });
 UserPayoutModel.belongsTo(instituteModel_js_1.default, {
     foreignKey: {
-        name: "instituteId",
+        name: 'instituteId',
     },
-    as: "institute",
+    as: 'institute',
 });
 instituteModel_js_1.default.hasMany(UserPayoutModel, {
     foreignKey: {
-        name: "instituteId",
+        name: 'instituteId',
     },
-    as: "instituteHasPayoutList",
+    as: 'instituteHasPayoutList',
 });
 UserPayoutModel.belongsTo(userModel_js_1.default, {
     foreignKey: {
-        name: "userId",
+        name: 'userId',
     },
-    as: "user",
+    as: 'user',
 });
 userModel_js_1.default.hasMany(UserPayoutModel, {
     foreignKey: {
-        name: "userId",
+        name: 'userId',
     },
-    as: "userHasPayoutList",
+    as: 'userHasPayoutList',
 });
 const afterCreateOrUpdateHook = async (userPayout, user = null, transaction, filterOptions = {}) => {
     try {
-        if (!userPayout.userPayoutDetailsList ||
-            !userPayout.userPayoutDetailsList.length)
+        if (!userPayout.userPayoutDetailsList || !userPayout.userPayoutDetailsList.length)
             return userPayout;
-        userPayout.userPayoutDetailsList = (0, utils_js_1.getUniqueArrayByFields)(userPayout.userPayoutDetailsList, ["subjectId"]);
+        userPayout.userPayoutDetailsList = (0, utils_js_1.getUniqueArrayByFields)(userPayout.userPayoutDetailsList, ['subjectId']);
         const options = {
             transaction,
         };
@@ -131,14 +130,10 @@ const afterCreateOrUpdateHook = async (userPayout, user = null, transaction, fil
         let startOfPreviousMonth = (0, date_fns_1.startOfMonth)(previousMonthDate).toISOString();
         let endOfPreviousMonth = (0, date_fns_1.endOfMonth)(previousMonthDate).toISOString();
         if (filterOptions.include) {
-            filterOptions.include = !Array.isArray(filterOptions.include)
-                ? [filterOptions.include]
-                : filterOptions.include;
-            const historyListInclude = filterOptions.include.find((include) => include.as === "userPayoutHistoryList");
+            filterOptions.include = !Array.isArray(filterOptions.include) ? [filterOptions.include] : filterOptions.include;
+            const historyListInclude = filterOptions.include.find((include) => include.as === 'userPayoutHistoryList');
             let where = {};
-            if (historyListInclude &&
-                historyListInclude.where &&
-                historyListInclude.where[sequelize_1.Op.and]) {
+            if (historyListInclude && historyListInclude.where && historyListInclude.where[sequelize_1.Op.and]) {
                 where = historyListInclude.where[sequelize_1.Op.and].pop();
             }
             if (where.payout_start_time && where.payout_end_time) {
@@ -146,13 +141,10 @@ const afterCreateOrUpdateHook = async (userPayout, user = null, transaction, fil
                 endOfPreviousMonth = where.payout_end_time[sequelize_1.Op.lte];
             }
         }
-        const attendanceWhereAnd = [
-            { date: { $gte: startOfPreviousMonth } },
-            { date: { $lte: endOfPreviousMonth } },
-        ];
+        const attendanceWhereAnd = [{ date: { $gte: startOfPreviousMonth } }, { date: { $lte: endOfPreviousMonth } }];
         const exsitUserPayout = (await UserPayoutModel.findOne({
             where: { id: userPayout.id },
-            include: [{ association: "userPayoutDetailsList" }],
+            include: [{ association: 'userPayoutDetailsList' }],
             transaction,
         }));
         if (!exsitUserPayout)
@@ -162,24 +154,23 @@ const afterCreateOrUpdateHook = async (userPayout, user = null, transaction, fil
                 where: {
                     instituteId: exsitUserPayout.instituteId,
                     subjectId: {
-                        [sequelize_1.Op.in]: userPayout.userPayoutDetailsList.map((userPayoutDetails) => userPayoutDetails.subjectId),
+                        [sequelize_1.Op.in]: userPayout.userPayoutDetailsList.map(userPayoutDetails => userPayoutDetails.subjectId),
                     },
                 },
                 attributes: [
-                    ["subject_id", "subjectId"],
-                    [sequelize_1.Sequelize.fn("sum", sequelize_1.Sequelize.col("amount")), "amount"],
+                    ['subject_id', 'subjectId'],
+                    [sequelize_1.Sequelize.fn('sum', sequelize_1.Sequelize.col('amount')), 'amount'],
                 ],
-                group: ["subject_id", "created_at"],
+                group: ['subject_id', 'created_at'],
                 raw: true,
             });
             feeTotalBySubjectList = JSON.parse(JSON.stringify(feeTotalBySubjectList));
-            userPayout.userPayoutDetailsList = userPayout.userPayoutDetailsList.map((oneUserPayoutDetails) => {
+            userPayout.userPayoutDetailsList = userPayout.userPayoutDetailsList.map(oneUserPayoutDetails => {
                 oneUserPayoutDetails.payableAmount = feeTotalBySubjectList
-                    .filter((feeTotalBySubject) => feeTotalBySubject.subjectId === oneUserPayoutDetails.subjectId)
+                    .filter(feeTotalBySubject => feeTotalBySubject.subjectId === oneUserPayoutDetails.subjectId)
                     .reduce((sum, record) => {
                     if (oneUserPayoutDetails.percentage) {
-                        const amount = ((record.amount || 0) * oneUserPayoutDetails.percentage) /
-                            100;
+                        const amount = ((record.amount || 0) * oneUserPayoutDetails.percentage) / 100;
                         return sum + parseFloat(amount.toFixed(2)); // Add fixed precision and convert back to number
                     }
                     return sum;
@@ -192,29 +183,25 @@ const afterCreateOrUpdateHook = async (userPayout, user = null, transaction, fil
                 where: {
                     instituteId: exsitUserPayout.instituteId,
                     subject: {
-                        [sequelize_1.Op.in]: userPayout.userPayoutDetailsList.map((userPayoutDetails) => userPayoutDetails.subjectId),
+                        [sequelize_1.Op.in]: userPayout.userPayoutDetailsList.map(userPayoutDetails => userPayoutDetails.subjectId),
                     },
-                    [sequelize_1.Op.or]: [
-                        { primaryUserId: exsitUserPayout.userId },
-                        { secondaryUserId: exsitUserPayout.userId },
-                    ],
+                    [sequelize_1.Op.or]: [{ primaryUserId: exsitUserPayout.userId }, { secondaryUserId: exsitUserPayout.userId }],
                 },
-                include: [{ association: "workingDay" }],
+                include: [{ association: 'workingDay' }],
             }));
             lectureList = JSON.parse(JSON.stringify(lectureList));
             const currentMonthAttendenceList = await attendanceModel_js_1.default.find({
                 $and: attendanceWhereAnd,
                 userType: userPayout.userType,
-                "users.userId": userPayout.userId,
-                "users.status": { $ne: app_js_1.ATTENDANCE_STATUS.ABSENT },
+                'users.userId': userPayout.userId,
+                'users.status': { $ne: app_js_1.ATTENDANCE_STATUS.ABSENT },
             });
-            userPayout.userPayoutDetailsList = userPayout.userPayoutDetailsList.map((oneUserPayoutDetails) => {
+            userPayout.userPayoutDetailsList = userPayout.userPayoutDetailsList.map(oneUserPayoutDetails => {
                 let totalMinutes = 0;
-                currentMonthAttendenceList.forEach((attendance) => {
-                    const dayName = (0, date_fns_1.format)(attendance.date, "EEEE");
-                    const attendanceDayLectureBySubjectList = lectureList.filter((lecture) => {
-                        return (lecture.workingDay.dayName === dayName &&
-                            lecture.subject === oneUserPayoutDetails.subjectId);
+                currentMonthAttendenceList.forEach(attendance => {
+                    const dayName = (0, date_fns_1.format)(attendance.date, 'EEEE');
+                    const attendanceDayLectureBySubjectList = lectureList.filter(lecture => {
+                        return lecture.workingDay.dayName === dayName && lecture.subject === oneUserPayoutDetails.subjectId;
                     });
                     if (attendanceDayLectureBySubjectList.length) {
                         totalMinutes += attendanceDayLectureBySubjectList.reduce((sum, record) => {
@@ -222,8 +209,7 @@ const afterCreateOrUpdateHook = async (userPayout, user = null, transaction, fil
                         }, 0);
                     }
                 });
-                oneUserPayoutDetails.payableAmount =
-                    ((oneUserPayoutDetails.amountPerHour || 0) / app_js_1.SIXTY) * totalMinutes;
+                oneUserPayoutDetails.payableAmount = ((oneUserPayoutDetails.amountPerHour || 0) / app_js_1.SIXTY) * totalMinutes;
                 return oneUserPayoutDetails;
             });
         }
@@ -233,9 +219,8 @@ const afterCreateOrUpdateHook = async (userPayout, user = null, transaction, fil
             userPayoutDetails.userId = exsitUserPayout.userId;
             userPayoutDetails.instituteId = exsitUserPayout.instituteId;
             userPayoutDetails.type = exsitUserPayout.type;
-            const found = exsitUserPayout.userPayoutDetailsList.find((exsitUserPayoutDetails) => userPayoutDetails.userPayoutId === exsitUserPayout.id &&
-                userPayoutDetails.instituteId ===
-                    exsitUserPayoutDetails.instituteId &&
+            const found = exsitUserPayout.userPayoutDetailsList.find(exsitUserPayoutDetails => userPayoutDetails.userPayoutId === exsitUserPayout.id &&
+                userPayoutDetails.instituteId === exsitUserPayoutDetails.instituteId &&
                 userPayoutDetails.userId === exsitUserPayoutDetails.userId &&
                 userPayoutDetails.type === exsitUserPayoutDetails.type &&
                 userPayoutDetails.subjectId === exsitUserPayoutDetails.subjectId &&
@@ -255,7 +240,7 @@ const afterCreateOrUpdateHook = async (userPayout, user = null, transaction, fil
             await userPayoutDetailsModel_js_1.default.destroy({
                 where: {
                     id: {
-                        [sequelize_1.Op.notIn]: userPayoutDetailsList.map((userPayoutDetails) => userPayoutDetails.id),
+                        [sequelize_1.Op.notIn]: userPayoutDetailsList.map(userPayoutDetails => userPayoutDetails.id),
                     },
                     userPayoutId: exsitUserPayout.id,
                 },
@@ -289,7 +274,7 @@ const afterFindHook = async (userPayoutList, options = {}) => {
             updatedData.push(syncUserPayout);
         }
         userPayoutList = userPayoutList.map((userPayout) => {
-            const found = updatedData.find((one) => one.id === userPayout.id);
+            const found = updatedData.find(one => one.id === userPayout.id);
             if (found) {
                 userPayout.totalPayableAmount = found.totalPayableAmount;
                 userPayout.userPayoutDetailsList = found.userPayoutDetailsList;
@@ -305,7 +290,7 @@ const afterFindHook = async (userPayoutList, options = {}) => {
         return userPayoutList;
     }
 };
-UserPayoutModel.addHook("afterFind", async (result, options) => {
+UserPayoutModel.addHook('afterFind', async (result, options) => {
     if (options.syncUserPayoutLastCalculatedAt && Array.isArray(result)) {
         result = (await afterFindHook(result, options));
     }

package/dist/services/Concrete/mongooseCommonService.d.ts

@@ -1,7 +1,7 @@
-import { FilterQuery, UpdateQuery, Document, QueryOptions, Model as MongooseModel, PopulateOptions, MongooseUpdateQueryOptions, UpdateWriteOpResult, ClientSession, CreateOptions } from "mongoose";
-import { TPaginationOptions } from "../../types/commonType.js";
-import { IMongooseCommonService } from "../Contracts/IMongooseCommonService.js";
-import { PipelineStage } from "mongoose";
+import { FilterQuery, UpdateQuery, Document, QueryOptions, Model as MongooseModel, PopulateOptions, MongooseUpdateQueryOptions, UpdateWriteOpResult, ClientSession, CreateOptions } from 'mongoose';
+import { TPaginationOptions } from '../../types/commonType.js';
+import { IMongooseCommonService } from '../Contracts/IMongooseCommonService.js';
+import { PipelineStage } from 'mongoose';
 export declare class MongooseCommonService<T extends Document> implements IMongooseCommonService<T> {
     private model;
     constructor(model: MongooseModel<T>);

package/dist/services/Concrete/mongooseCommonService.js

@@ -30,7 +30,7 @@ class MongooseCommonService {
             const convertOrderToSort = (order) => {
                 const sort = {};
                 for (const [key, direction] of order) {
-                    sort[key] = direction.toUpperCase() === "DESC" ? -1 : 1;
+                    sort[key] = direction.toUpperCase() === 'DESC' ? -1 : 1;
                 }
                 return sort;
             };
@@ -98,9 +98,7 @@ class MongooseCommonService {
         }), options);
     }
     async delete(filter, options = {}) {
-        return this.model
-            .updateMany(filter, { deletedBy: options.userId, deletedAt: new Date() }, options)
-            .exec();
+        return this.model.updateMany(filter, { deletedBy: options.userId, deletedAt: new Date() }, options).exec();
     }
     async aggregate(pipeline) {
         return this.model.aggregate(pipeline).exec();

package/dist/services/Contracts/IMongooseCommonService.d.ts

@@ -1,5 +1,5 @@
-import { FilterQuery, UpdateQuery, Document, QueryOptions, PopulateOptions, MongooseUpdateQueryOptions, UpdateWriteOpResult, ClientSession, CreateOptions } from "mongoose";
-import { TPaginationOptions } from "../../types/commonType.js";
+import { FilterQuery, UpdateQuery, Document, QueryOptions, PopulateOptions, MongooseUpdateQueryOptions, UpdateWriteOpResult, ClientSession, CreateOptions } from 'mongoose';
+import { TPaginationOptions } from '../../types/commonType.js';
 interface IReadService<T extends Document> {
     findAll(filter: FilterQuery<T>, options?: QueryOptions, populate?: PopulateOptions | PopulateOptions[]): Promise<T[]>;
     findOne(filter: FilterQuery<T>, options?: QueryOptions, populate?: PopulateOptions | PopulateOptions[]): Promise<T | null>;

package/dist/services/Contracts/ISequelizeCommonService.d.ts

@@ -1,20 +1,20 @@
-import { FindOptions, WhereOptions, UpdateOptions, BulkCreateOptions, DestroyOptions, CreateOptions, Identifier, Model, UpsertOptions, CountOptions } from "sequelize";
-import { TPaginationOptions } from "../../types/commonType.js";
+import { FindOptions, WhereOptions, UpdateOptions, BulkCreateOptions, DestroyOptions, CreateOptions, Identifier, Model, UpsertOptions, CountOptions } from 'sequelize';
+import { TPaginationOptions } from '../../types/commonType.js';
 interface IReadService<T extends Model> {
-    findAll(where: WhereOptions<T["_attributes"]>, options?: FindOptions<T["_attributes"]>): Promise<T["_attributes"][]>;
-    findOne(where: WhereOptions<T["_attributes"]>, options?: FindOptions<T["_attributes"]>): Promise<T["_attributes"] | null>;
-    findByPk(identifier: Identifier, options?: FindOptions<T["_attributes"]>): Promise<T["_attributes"] | null>;
-    findAllWithPagination(where: WhereOptions<T["_attributes"]>, options?: FindOptions<T["_attributes"]>): Promise<TPaginationOptions<T["_attributes"]>>;
-    count(where: WhereOptions<T["_attributes"]>, options?: CountOptions<T["_attributes"]>): Promise<number>;
+    findAll(where: WhereOptions<T['_attributes']>, options?: FindOptions<T['_attributes']>): Promise<T['_attributes'][]>;
+    findOne(where: WhereOptions<T['_attributes']>, options?: FindOptions<T['_attributes']>): Promise<T['_attributes'] | null>;
+    findByPk(identifier: Identifier, options?: FindOptions<T['_attributes']>): Promise<T['_attributes'] | null>;
+    findAllWithPagination(where: WhereOptions<T['_attributes']>, options?: FindOptions<T['_attributes']>): Promise<TPaginationOptions<T['_attributes']>>;
+    count(where: WhereOptions<T['_attributes']>, options?: CountOptions<T['_attributes']>): Promise<number>;
 }
 interface IWriteService<T extends Model> {
-    update(where: WhereOptions<T["_attributes"]>, updateData: Partial<T["_attributes"]>, options?: Partial<UpdateOptions>): Promise<[number]>;
-    upsert(conflictWhere: WhereOptions<T["_attributes"]>, updateData: T["_creationAttributes"], options?: Partial<UpsertOptions>): Promise<[T["_attributes"], boolean | null]>;
-    create(createData: T["_creationAttributes"], options?: CreateOptions): Promise<T["_attributes"]>;
-    bulkCreate(createData: T["_creationAttributes"][], options?: BulkCreateOptions<T["_attributes"]>): Promise<T["_attributes"][]>;
+    update(where: WhereOptions<T['_attributes']>, updateData: Partial<T['_attributes']>, options?: Partial<UpdateOptions>): Promise<[number]>;
+    upsert(conflictWhere: WhereOptions<T['_attributes']>, updateData: T['_creationAttributes'], options?: Partial<UpsertOptions>): Promise<[T['_attributes'], boolean | null]>;
+    create(createData: T['_creationAttributes'], options?: CreateOptions): Promise<T['_attributes']>;
+    bulkCreate(createData: T['_creationAttributes'][], options?: BulkCreateOptions<T['_attributes']>): Promise<T['_attributes'][]>;
 }
 interface IDeleteService<T extends Model> {
-    delete(where: WhereOptions<T["_attributes"]>, options?: DestroyOptions<T["_attributes"]>): Promise<number>;
+    delete(where: WhereOptions<T['_attributes']>, options?: DestroyOptions<T['_attributes']>): Promise<number>;
 }
 export interface ISequelizeCommonService<T extends Model> extends IReadService<T>, IWriteService<T>, IDeleteService<T> {
 }

package/dist/types/generateIdCardType.d.ts

@@ -1,2 +1,2 @@
-import { IGenarateIdCardModelAttributes } from "../interfaces/generateIdCardInterface.js";
-export type TGenarateIdCardModelAttributes = Omit<IGenarateIdCardModelAttributes, "id">;
+import { IGenarateIdCardModelAttributes } from '../interfaces/generateIdCardInterface.js';
+export type TGenarateIdCardModelAttributes = Omit<IGenarateIdCardModelAttributes, 'id'>;

package/package.json

@@ -1,49 +1,51 @@
 {
-  "name": "@kipicore/dbcore",
-  "version": "1.1.5",
-  "description": "Reusable DB core package with Postgres, MongoDB, models, services, interfaces, and types",
-  "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "clean": "rm -rf dist",
-    "prebuild": "node scripts/generate-index.js",
-    "build": "npm run clean && tsc -p tsconfig.json"
-  },
-  "keywords": [
-    "postgres",
-    "mongodb",
-    "sequelize",
-    "mongoose",
-    "database",
-    "core",
-    "typescript"
-  ],
-  "author": "chetan godhani",
-  "license": "MIT",
-  "private": false,
-  "dependencies": {
-    "@aws-sdk/client-s3": "^3.895.0",
-    "@aws-sdk/s3-request-presigner": "^3.895.0",
-    "axios": "^1.12.2",
-    "date-fns": "^4.1.0",
-    "dotenv": "^17.2.2",
-    "joi": "^18.0.1",
-    "mongoose": "^8.5.2",
-    "pg": "^8.12.0",
-    "sequelize": "^6.37.3",
-    "uuid": "^8.3.2"
-  },
-  "devDependencies": {
-    "@types/mongoose": "^5.11.97",
-    "@types/node": "^24.5.2",
-    "@types/sequelize": "^4.28.14",
-    "typescript": "^5.5.4"
-  },
-  "files": [
-    "dist"
-  ],
-  "engines": {
-    "node": ">=20.16.0"
-  }
+    "name": "@kipicore/dbcore",
+    "version": "1.1.6",
+    "description": "Reusable DB core package with Postgres, MongoDB, models, services, interfaces, and types",
+    "type": "commonjs",
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "scripts": {
+        "clean": "rm -rf dist",
+        "format": "prettier . --write",
+        "prebuild": "node scripts/generate-index.js",
+        "build": "npm run clean && tsc -p tsconfig.json && npm run format"
+    },
+    "keywords": [
+        "postgres",
+        "mongodb",
+        "sequelize",
+        "mongoose",
+        "database",
+        "core",
+        "typescript"
+    ],
+    "author": "chetan godhani",
+    "license": "MIT",
+    "private": false,
+    "dependencies": {
+        "@aws-sdk/client-s3": "^3.895.0",
+        "@aws-sdk/s3-request-presigner": "^3.895.0",
+        "axios": "^1.12.2",
+        "date-fns": "^4.1.0",
+        "dotenv": "^17.2.2",
+        "joi": "^18.0.1",
+        "mongoose": "^8.5.2",
+        "pg": "^8.12.0",
+        "sequelize": "^6.37.3",
+        "uuid": "^8.3.2"
+    },
+    "devDependencies": {
+        "@types/mongoose": "^5.11.97",
+        "@types/node": "^24.5.2",
+        "@types/sequelize": "^4.28.14",
+        "typescript": "^5.5.4",
+        "prettier": "^3.3.3"
+    },
+    "files": [
+        "dist"
+    ],
+    "engines": {
+        "node": ">=20.16.0"
+    }
 }