@kipicore/dbcore 1.1.273 → 1.1.275

package/dist/constants/app.js

@@ -787,7 +787,6 @@ exports.META_AUTH = {
     TOKEN_URL: 'https://graph.facebook.com/v21.0/oauth/access_token',
     USER_PROFILE_URL: 'https://graph.facebook.com/v21.0/me',
 };
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.APPLE_AUTH = {
     CLIENT_ID: env_1.ENV_VARIABLE.APPLE_CLIENT_ID,
     TEAM_ID: env_1.ENV_VARIABLE.APPLE_TEAM_ID,
@@ -874,7 +873,6 @@ exports.templateKeyWord = [
     {
         keyWord: '@studentName',
         name: '[student name]',
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         value: (data) => {
             return `${data.firstName} ${data.lastName}`;
         },
@@ -882,7 +880,6 @@ exports.templateKeyWord = [
     {
         name: '[amount]',
         keyWord: '@amount',
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         value: (data) => {
             return data.amount;
         },
@@ -890,7 +887,6 @@ exports.templateKeyWord = [
     {
         name: '[due date]',
         keyWord: '@dueDate',
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         value: (data) => {
             return data.dueDate;
         },

package/dist/helpers/utils.js

@@ -43,7 +43,6 @@ exports.assignNonNull = assignNonNull;
 exports.isUserSchoolInfoUpdate = isUserSchoolInfoUpdate;
 exports.chunkArray = chunkArray;
 exports.extractFromObject = extractFromObject;
-/* eslint-disable @typescript-eslint/no-explicit-any */
 const fs_1 = __importDefault(require("fs"));
 const dateFunction = __importStar(require("date-fns"));
 const app_1 = require("../constants/app");

package/dist/interfaces/userInstituteMetaInterface.d.ts

@@ -57,4 +57,5 @@ export interface IUserInstituteMetaAttributes extends IDefaultAttributes, Docume
     studentFeeType?: FEE_COLLECTION_TYPE;
     isSchoolMeta?: boolean;
     isFeeCarryForward: boolean;
+    isFeeCollectionCreated: boolean;
 }

package/dist/models/mongodb/examGroupModel.js

@@ -148,6 +148,7 @@ const examGroupModelSchema = new mongoose_1.Schema({
 });
 const createOrUpdateHook = async (examGroup) => {
     try {
+        await validateStandardDateConflict(examGroup);
         if (examGroup.instituteId) {
             const institute = await instituteModel_1.default.findOne({
                 where: {
@@ -267,10 +268,22 @@ const createOrUpdateHook = async (examGroup) => {
         throw err;
     }
 };
+const validateStandardDateConflict = async (examGroup) => {
+    const conflict = await ExamGroupModel.findOne({
+        instituteId: examGroup.instituteId,
+        ...(examGroup.id && { id: { $ne: examGroup.id } }),
+        standards: { $in: examGroup.standards },
+        startDate: { $lte: examGroup.endDate },
+        endDate: { $gte: examGroup.startDate },
+    }).lean();
+    if (conflict) {
+        throw new Error(`Another exam group "${conflict.title}" already exists for selected standard(s) in this date range`);
+    }
+};
 examGroupModelSchema.pre('save', async function (next) {
-    const subjectIndex = this;
+    const examGroup = this;
     try {
-        await createOrUpdateHook(subjectIndex);
+        await createOrUpdateHook(examGroup);
         next();
     }
     catch (error) {
@@ -278,9 +291,9 @@ examGroupModelSchema.pre('save', async function (next) {
     }
 });
 examGroupModelSchema.pre('updateMany', async function (next) {
-    const subjectIndex = this.getUpdate();
+    const examGroup = this.getUpdate();
     try {
-        await createOrUpdateHook(subjectIndex);
+        await createOrUpdateHook(examGroup);
         next();
     }
     catch (error) {

package/dist/models/mongodb/examHasAnswerSheetModel.js

@@ -118,8 +118,8 @@ const examHasAnswerSheetSchema = new mongoose_1.Schema({
     },
     academicCalendarId: {
         type: String,
-        required: false
-    }
+        required: false,
+    },
 }, {
     timestamps: true,
     versionKey: false,

package/dist/models/mongodb/index.js

@@ -20,6 +20,7 @@ const connectMongoDb = async () => {
         });
     }
     catch (err) {
+        // eslint-disable-next-line no-console
         console.log('error while connect monngodb : ' + err);
     }
 };

package/dist/models/mongodb/plugin/transformIdInResponsePlugin.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable @typescript-eslint/no-explicit-any */
 const mongoose_1 = __importDefault(require("mongoose"));
 const transformNestedDocs = (doc) => {
     if (!doc || typeof doc !== 'object') {

package/dist/models/mongodb/subjectIndexModel.js

@@ -36,7 +36,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable @typescript-eslint/no-explicit-any */
 const mongoose_1 = __importStar(require("mongoose"));
 const app_1 = require("../../constants/app");
 const utils_1 = require("../../helpers/utils");

package/dist/models/mongodb/userInstituteMetaModel.js

@@ -231,6 +231,10 @@ const userInstituteMetaSchema = new mongoose_1.Schema({
         type: Boolean,
         default: false,
     },
+    isFeeCollectionCreated: {
+        type: Boolean,
+        default: false,
+    },
 }, {
     timestamps: true,
     versionKey: false,

package/dist/models/psql/batchSubjectBookAssessmentModel.js

@@ -5,7 +5,7 @@ const sequelize_1 = require("sequelize");
 const index_1 = require("./index");
 class BatchSubjectBookAssessmentModel extends sequelize_1.Model {
     static associate(models) {
-        const { InstituteModel, UserModel, BatchModel, TypeManagementModel, InstituteEntityModel, AcademicCalendarModel, } = models;
+        const { InstituteModel, UserModel, BatchModel, TypeManagementModel, InstituteEntityModel, AcademicCalendarModel } = models;
         BatchSubjectBookAssessmentModel.belongsTo(InstituteModel, {
             foreignKey: { name: 'instituteId', field: 'institute_id' },
             as: 'subjectBookAssessmentInstitute',

package/dist/models/psql/feeHistoryModel.js

@@ -11,7 +11,7 @@ const errorMessages_1 = require("../../constants/errorMessages");
 const userInstituteMetaModel_1 = __importDefault(require("../mongodb/userInstituteMetaModel"));
 class FeeHistoryModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, SchoolFeeCollectionModel, FeesCollectionModel, FileStorageModel, BankAccountDetailsModel, SubjectHasPayFeeHistory, UserHasSubjectFeeModel, InstituteEntityModel, AcademicCalendarModel, } = models;
+        const { UserModel, InstituteModel, SchoolFeeCollectionModel, FeesCollectionModel, FileStorageModel, BankAccountDetailsModel, AcademicCalendarModel, } = models;
         FeeHistoryModel.belongsTo(FeesCollectionModel, {
             foreignKey: { name: 'feeCollectionId', field: 'fee_collection_id', allowNull: true },
             as: 'feeHistoryFeeCollection',
@@ -90,7 +90,7 @@ class FeeHistoryModel extends sequelize_1.Model {
         });
     }
     static addHooks(models) {
-        const { FileStorageModel, FeesCollectionModel, InstituteEntityModel, UserHasSubjectFeeModel, SubjectHasPayFeeHistory } = models;
+        const { FileStorageModel } = models;
         const subjectWiserFeePay = async (instituteId, feeCollectionId, paidFee, userId, academicCalendarId) => {
             const { InstituteEntityModel, UserHasSubjectFeeModel, FeesCollectionModel, SubjectHasPayFeeHistory } = models;
             const userInstituteMeta = await userInstituteMetaModel_1.default.findOne({

package/dist/models/psql/feesCollectionModel.js

@@ -5,6 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 const errorMessages_1 = require("../../constants/errorMessages");
 class FeesCollectionModel extends sequelize_1.Model {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     static addHooks(models) {
         const beforeCreateOrUpdateHook = async (feeCollection) => {
             let existingRecord = null;

package/dist/models/psql/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OfferModel = exports.ModuleModel = exports.ModuleFeatureModel = exports.MasterLeaveModel = exports.LectureModel = exports.LectureHistoryModel = exports.InventoryModel = exports.InventoryHistoryModel = exports.InstituteSubscriptionPlanModel = exports.InstituteModel = exports.InstituteEntityTypeModel = exports.InstituteEntityModel = exports.HomeWorkModel = exports.GreetingsModel = exports.FloorManagementModel = exports.FileStorageModel = exports.FeesCollectionModel = exports.FeeTypeModel = exports.FeeTypeHasTermsModel = exports.FeeReminderSettingModel = exports.FeeReminderModel = exports.FeeHistoryModel = exports.FeeHistoryDetailsModel = exports.FeatureActionModel = exports.FacilityModel = exports.EntityGroupModel = exports.DriverModel = exports.CourseModel = exports.CourseHasVisitorsModel = exports.CountryModel = exports.ContactFeedBackModel = exports.CoinPurchaseOfferModel = exports.CloudStorageModel = exports.ClassRoomModel = exports.CityModel = exports.CategoriesModel = exports.BookAssessmentDateModel = exports.BatchSubjectProjectAssessmentModel = exports.BatchSubjectBookAssessmentModel = exports.BatchModel = exports.BannerModel = exports.BankAccountDetailsModel = exports.AreaModel = exports.AnnouncementModel = exports.AccountHasReceiptDetailsModel = exports.AcademicCalendarModel = exports.SubCategoriesModel = exports.Sequelize = exports.db = exports.sequelize = void 0;
 exports.VendorManagementModel = exports.VehicleModel = exports.UserRequiredStepsModel = exports.UserProjectAssessmentOptionModel = exports.UserPayoutModel = exports.UserPayoutHistoryModel = exports.UserPayoutDetailsModel = exports.UserModel = exports.UserLeaveRequestModel = exports.UserHasSubjectFeeModel = exports.UserHasStorageModel = exports.UserHasRollNumberModel = exports.UserHasRoleModel = exports.UserHasParentModel = exports.UserHasOfferModel = exports.UserHasLeaveModel = exports.UserHasLeaveHistoryModel = exports.UserHasInventoryModel = exports.UserHasInventoryHistoryModel = exports.UserHasHomeWorkModel = exports.UserHasFileModel = exports.UserHasFeeTermsModel = exports.UserHasDeviceModel = exports.UserHasCourseModel = exports.UserHasBatchModel = exports.UserHasAnnouncementModel = exports.UserFeeTypeModel = exports.UserFeeTypeByAccountModel = exports.UserBookAssessmentModel = exports.TypeManagementModel = exports.TripModel = exports.TokenModel = exports.ToDoModel = exports.TestimonialModel = exports.SyllabusModel = exports.SubjectHasPayFeeHistoryModel = exports.SubjectHasFeeModel = exports.StateModel = exports.SlotModel = exports.SendNotificationModel = exports.SchoolOfferModel = exports.SchoolFeeCollectionModel = exports.RulesRegulationModel = exports.RoleModel = exports.ProjectAssessmentOptionModel = exports.ProductModel = exports.PincodeModel = exports.PdcHistoryModel = exports.PdcChequeModel = exports.PaymentTermsModel = void 0;
 exports.TermsAndConditionModel = exports.FeeType1Model = exports.StudentFeeTermsModel = exports.UserHasPenaltyModel = exports.PenaltyModel = exports.ClassRoomCollectionModel = exports.ClassRoomEventModel = exports.StudentFeeTypeCollectionModel = exports.SchoolFeeTermsModel = exports.StudentFeeHistoryModel = exports.StudentFeeCollectionModel = exports.UserDirectoryModel = exports.StudentLeaveRequestModel = exports.CloneListModel = exports.IncomeExpenseModel = exports.MaintenanceModel = exports.AdvertisementModel = exports.WorkOffDaysModel = exports.EntityWiseCalendarModel = exports.CampusModel = exports.LostFoundItemModel = exports.WorkingShiftModel = exports.WorkingDayModel = exports.WalletModel = exports.WalletHistoryModel = void 0;
-/* eslint-disable @typescript-eslint/no-explicit-any */
 const sequelize_1 = require("sequelize");
 Object.defineProperty(exports, "Sequelize", { enumerable: true, get: function () { return sequelize_1.Sequelize; } });
 const postgresConfig = require('../../configs/postgresConfig');

package/dist/models/psql/studentFeeHistoryModel.js

@@ -100,6 +100,7 @@ class StudentFeeHistoryModel extends sequelize_1.Model {
             as: 'batchStudentHistory',
         });
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     static addHooks(models) {
         StudentFeeHistoryModel.beforeCreate(async (feeCollection) => {
             if (feeCollection.paidFee) {

package/dist/models/psql/userHasHomeWorkModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class UserHasHomeWorkModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, BatchModel, HomeWorkModel, AcademicCalendarModel } = models;
+        const { UserModel, InstituteModel, HomeWorkModel, AcademicCalendarModel } = models;
         UserHasHomeWorkModel.belongsTo(InstituteModel, {
             foreignKey: { name: 'instituteId', field: 'institute_id' },
             as: 'homeWorkHasInstitute',

package/dist/models/psql/userHasParentModel.js

@@ -35,6 +35,7 @@ class UserHasParentModel extends sequelize_1.Model {
             as: 'deletedByUser',
         });
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     static addHooks(models) {
         UserHasParentModel.addHook('beforeFind', (options) => {
             if (!Object.prototype.hasOwnProperty.call(options.where, 'isDeleted')) {

package/dist/models/psql/userModel.js

@@ -10,7 +10,7 @@ const uniqueNumberCounterModel_1 = __importDefault(require("../mongodb/uniqueNum
 const utils_1 = require("../../helpers/utils");
 class UserModel extends sequelize_1.Model {
     static associate(models) {
-        const { CountryModel, StateModel, CityModel, TokenModel, UserModel, AreaModel } = models;
+        const { CountryModel, StateModel, CityModel, TokenModel, UserModel } = models;
         UserModel.belongsTo(CountryModel, { foreignKey: 'country' });
         UserModel.belongsTo(StateModel, { foreignKey: 'state' });
         UserModel.belongsTo(CityModel, { foreignKey: 'city' });

package/dist/models/psql/userPayoutModel.js

@@ -7,7 +7,7 @@ const date_fns_1 = require("date-fns");
 const utils_1 = require("../../helpers/utils");
 class UserPayoutModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, UserPayoutDetailsModel } = models;
+        const { UserModel, InstituteModel } = models;
         UserPayoutModel.belongsTo(UserModel, {
             foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
             as: 'createdByUser',
@@ -196,6 +196,7 @@ class UserPayoutModel extends sequelize_1.Model {
                 });
                 await transaction.commit();
                 return userPayoutList;
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
             }
             catch (err) {
                 await transaction.rollback();

package/dist/models/psql/walletModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class WalletModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, WalletHistoryModel } = models;
+        const { UserModel } = models;
         WalletModel.hasMany(UserModel, {
             foreignKey: 'uuid',
             sourceKey: 'uuid',
@@ -44,7 +44,7 @@ WalletModel.init({
         type: sequelize_1.DataTypes.UUID,
         primaryKey: true,
         allowNull: false,
-        defaultValue: sequelize_1.DataTypes.UUIDV4
+        defaultValue: sequelize_1.DataTypes.UUIDV4,
     },
     coin: {
         type: sequelize_1.DataTypes.FLOAT,

package/dist/services/Concrete/mongooseCommonService.js

@@ -89,9 +89,7 @@ class MongooseCommonService {
         return createdDoc;
     }
     async bulkCreate(createData, options = {}) {
-        return this.model.create(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        createData.map((data) => {
+        return this.model.create(createData.map((data) => {
             data.createdBy = options.userId;
             return data;
         }), { ...options, ordered: true });

package/package.json

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