@kipicore/dbcore 1.1.368 → 1.1.369
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/db/psql/migrations/20260401061046-update_pdc.d.ts +2 -0
- package/dist/db/psql/migrations/20260401061046-update_pdc.js +35 -0
- package/dist/db/psql/migrations/20260401063714-update_pdc_histroy.d.ts +2 -0
- package/dist/db/psql/migrations/20260401063714-update_pdc_histroy.js +45 -0
- package/dist/interfaces/index.d.ts +0 -11
- package/dist/interfaces/index.js +0 -11
- package/dist/interfaces/pdcChequeInterface.d.ts +1 -3
- package/dist/interfaces/pdcHistoryInterface.d.ts +4 -4
- package/dist/models/mongodb/index.d.ts +0 -1
- package/dist/models/mongodb/index.js +2 -4
- package/dist/models/psql/index.d.ts +0 -10
- package/dist/models/psql/index.js +3 -23
- package/dist/models/psql/pdcChequeModel.d.ts +1 -3
- package/dist/models/psql/pdcChequeModel.js +17 -31
- package/dist/models/psql/pdcHistoryModel.d.ts +3 -3
- package/dist/models/psql/pdcHistoryModel.js +30 -14
- package/dist/types/index.d.ts +0 -11
- package/dist/types/index.js +0 -11
- package/package.json +1 -1
- package/dist/interfaces/feeHistoryDetailsInterface.d.ts +0 -17
- package/dist/interfaces/feeHistoryDetailsInterface.js +0 -2
- package/dist/interfaces/feeHistoryInterface.d.ts +0 -22
- package/dist/interfaces/feeHistoryInterface.js +0 -2
- package/dist/interfaces/feeTypeHasTermsInterface.d.ts +0 -12
- package/dist/interfaces/feeTypeHasTermsInterface.js +0 -2
- package/dist/interfaces/feeTypeInterface.d.ts +0 -14
- package/dist/interfaces/feeTypeInterface.js +0 -4
- package/dist/interfaces/feesCollectionInterface.d.ts +0 -19
- package/dist/interfaces/feesCollectionInterface.js +0 -2
- package/dist/interfaces/paymentTermsInterface.d.ts +0 -16
- package/dist/interfaces/paymentTermsInterface.js +0 -2
- package/dist/interfaces/schoolFeeCollectionInterface.d.ts +0 -13
- package/dist/interfaces/schoolFeeCollectionInterface.js +0 -2
- package/dist/interfaces/schoolFeeInterface.d.ts +0 -22
- package/dist/interfaces/schoolFeeInterface.js +0 -2
- package/dist/interfaces/userFeeTypeByAccountInterface.d.ts +0 -19
- package/dist/interfaces/userFeeTypeByAccountInterface.js +0 -2
- package/dist/interfaces/userFeeTypeInterface.d.ts +0 -17
- package/dist/interfaces/userFeeTypeInterface.js +0 -2
- package/dist/interfaces/userHasFeeTermsInterface.d.ts +0 -37
- package/dist/interfaces/userHasFeeTermsInterface.js +0 -2
- package/dist/models/mongodb/schoolFeeModel.d.ts +0 -4
- package/dist/models/mongodb/schoolFeeModel.js +0 -182
- package/dist/models/psql/feeHistoryDetailsModel.d.ts +0 -27
- package/dist/models/psql/feeHistoryDetailsModel.js +0 -145
- package/dist/models/psql/feeHistoryModel.d.ts +0 -33
- package/dist/models/psql/feeHistoryModel.js +0 -189
- package/dist/models/psql/feeTypeHasTermsModel.d.ts +0 -22
- package/dist/models/psql/feeTypeHasTermsModel.js +0 -99
- package/dist/models/psql/feeTypeModel.d.ts +0 -24
- package/dist/models/psql/feeTypeModel.js +0 -110
- package/dist/models/psql/feesCollectionModel.d.ts +0 -30
- package/dist/models/psql/feesCollectionModel.js +0 -200
- package/dist/models/psql/paymentTermsModel.d.ts +0 -19
- package/dist/models/psql/paymentTermsModel.js +0 -125
- package/dist/models/psql/schoolFeeCollectionModel.d.ts +0 -23
- package/dist/models/psql/schoolFeeCollectionModel.js +0 -109
- package/dist/models/psql/userFeeTypeByAccountModel.d.ts +0 -23
- package/dist/models/psql/userFeeTypeByAccountModel.js +0 -179
- package/dist/models/psql/userFeeTypeModel.d.ts +0 -26
- package/dist/models/psql/userFeeTypeModel.js +0 -180
- package/dist/models/psql/userHasFeeTermsModel.d.ts +0 -28
- package/dist/models/psql/userHasFeeTermsModel.js +0 -136
- package/dist/types/feeHistoryDetailsType.d.ts +0 -6
- package/dist/types/feeHistoryDetailsType.js +0 -2
- package/dist/types/feeHistoryType.d.ts +0 -18
- package/dist/types/feeHistoryType.js +0 -2
- package/dist/types/feeTypeHasTermsType.d.ts +0 -3
- package/dist/types/feeTypeHasTermsType.js +0 -2
- package/dist/types/feeTypeType.d.ts +0 -3
- package/dist/types/feeTypeType.js +0 -2
- package/dist/types/feesCollectionType.d.ts +0 -3
- package/dist/types/feesCollectionType.js +0 -2
- package/dist/types/paymentTermsType.d.ts +0 -3
- package/dist/types/paymentTermsType.js +0 -3
- package/dist/types/schoolFeeCollectionType.d.ts +0 -3
- package/dist/types/schoolFeeCollectionType.js +0 -2
- package/dist/types/schoolFeeType.d.ts +0 -3
- package/dist/types/schoolFeeType.js +0 -2
- package/dist/types/userFeeTypeByAccountType.d.ts +0 -3
- package/dist/types/userFeeTypeByAccountType.js +0 -2
- package/dist/types/userFeeTypeType.d.ts +0 -6
- package/dist/types/userFeeTypeType.js +0 -2
- package/dist/types/userHasFeeTermsType.d.ts +0 -3
- package/dist/types/userHasFeeTermsType.js +0 -2
|
@@ -1,145 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FeeHistoryDetailsModel = void 0;
|
|
4
|
-
const sequelize_1 = require("sequelize");
|
|
5
|
-
const index_1 = require("./index");
|
|
6
|
-
class FeeHistoryDetailsModel extends sequelize_1.Model {
|
|
7
|
-
static associate(models) {
|
|
8
|
-
const { UserModel, InstituteModel, SchoolFeeCollectionModel, UserFeeTypeByAccountModel, FeeHistoryModel, FeeTypeModel, } = models;
|
|
9
|
-
FeeHistoryDetailsModel.belongsTo(UserModel, {
|
|
10
|
-
foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
|
|
11
|
-
as: 'createdByUser',
|
|
12
|
-
});
|
|
13
|
-
FeeHistoryDetailsModel.belongsTo(UserModel, {
|
|
14
|
-
foreignKey: { name: 'updatedBy', allowNull: true, field: 'updated_by' },
|
|
15
|
-
as: 'updatedByUser',
|
|
16
|
-
});
|
|
17
|
-
FeeHistoryDetailsModel.belongsTo(UserModel, {
|
|
18
|
-
foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
|
|
19
|
-
as: 'deletedByUser',
|
|
20
|
-
});
|
|
21
|
-
FeeHistoryDetailsModel.belongsTo(InstituteModel, {
|
|
22
|
-
foreignKey: 'instituteId',
|
|
23
|
-
as: 'feeHistoryDetailsInstitute',
|
|
24
|
-
});
|
|
25
|
-
InstituteModel.hasMany(FeeHistoryDetailsModel, {
|
|
26
|
-
foreignKey: 'instituteId',
|
|
27
|
-
as: 'instituteHasFeeHistoryDetails',
|
|
28
|
-
});
|
|
29
|
-
FeeHistoryDetailsModel.belongsTo(UserModel, {
|
|
30
|
-
foreignKey: 'userId',
|
|
31
|
-
as: 'feeHistoryDetailsUser',
|
|
32
|
-
});
|
|
33
|
-
UserModel.hasMany(FeeHistoryDetailsModel, {
|
|
34
|
-
foreignKey: 'userId',
|
|
35
|
-
as: 'userHasFeeHistoryDetails',
|
|
36
|
-
});
|
|
37
|
-
FeeHistoryDetailsModel.belongsTo(SchoolFeeCollectionModel, {
|
|
38
|
-
foreignKey: { name: 'schoolFeeCollectionId', field: 'school_fee_collection_id', allowNull: true },
|
|
39
|
-
as: 'feeHistoryDetailsSchool',
|
|
40
|
-
});
|
|
41
|
-
SchoolFeeCollectionModel.hasMany(FeeHistoryDetailsModel, {
|
|
42
|
-
foreignKey: { name: 'schoolFeeCollectionId', field: 'school_fee_collection_id', allowNull: true },
|
|
43
|
-
as: 'feeHistoryDetailsHasSchool',
|
|
44
|
-
});
|
|
45
|
-
FeeHistoryDetailsModel.belongsTo(UserFeeTypeByAccountModel, {
|
|
46
|
-
foreignKey: 'userFeeTypeByAccountId',
|
|
47
|
-
as: 'feeHistoryDetailsFeeType',
|
|
48
|
-
});
|
|
49
|
-
UserFeeTypeByAccountModel.hasMany(FeeHistoryDetailsModel, {
|
|
50
|
-
foreignKey: 'userFeeTypeByAccountId',
|
|
51
|
-
as: 'userFeeTypeFeeHistoryDetails',
|
|
52
|
-
});
|
|
53
|
-
FeeHistoryDetailsModel.belongsTo(FeeHistoryModel, {
|
|
54
|
-
foreignKey: { name: 'feeHistoryId', field: 'fee_history_id', allowNull: true },
|
|
55
|
-
as: 'detailsFeeHistory',
|
|
56
|
-
});
|
|
57
|
-
FeeHistoryModel.hasMany(FeeHistoryDetailsModel, {
|
|
58
|
-
foreignKey: { name: 'feeHistoryId', field: 'fee_history_id', allowNull: true },
|
|
59
|
-
as: 'feeHistoryHasDetails',
|
|
60
|
-
});
|
|
61
|
-
FeeHistoryDetailsModel.belongsTo(FeeTypeModel, {
|
|
62
|
-
foreignKey: { name: 'feeTypeId', field: 'fee_type_id', allowNull: true },
|
|
63
|
-
as: 'feeHistoryDetailsType',
|
|
64
|
-
});
|
|
65
|
-
FeeTypeModel.hasMany(FeeHistoryDetailsModel, {
|
|
66
|
-
foreignKey: { name: 'feeTypeId', field: 'fee_type_id', allowNull: true },
|
|
67
|
-
as: 'feeHistoryDetailsHasType',
|
|
68
|
-
});
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
exports.FeeHistoryDetailsModel = FeeHistoryDetailsModel;
|
|
72
|
-
FeeHistoryDetailsModel.init({
|
|
73
|
-
id: {
|
|
74
|
-
type: sequelize_1.DataTypes.UUID,
|
|
75
|
-
defaultValue: sequelize_1.DataTypes.UUIDV4,
|
|
76
|
-
allowNull: false,
|
|
77
|
-
primaryKey: true,
|
|
78
|
-
},
|
|
79
|
-
instituteId: {
|
|
80
|
-
type: sequelize_1.DataTypes.UUID,
|
|
81
|
-
allowNull: true,
|
|
82
|
-
field: 'institute_id',
|
|
83
|
-
},
|
|
84
|
-
userFeeTypeByAccountId: {
|
|
85
|
-
type: sequelize_1.DataTypes.UUID,
|
|
86
|
-
allowNull: true,
|
|
87
|
-
field: 'user_fee_type_by_account_id',
|
|
88
|
-
},
|
|
89
|
-
schoolFeeCollectionId: {
|
|
90
|
-
type: sequelize_1.DataTypes.UUID,
|
|
91
|
-
allowNull: true,
|
|
92
|
-
field: 'school_fee_collection_id',
|
|
93
|
-
},
|
|
94
|
-
userId: {
|
|
95
|
-
type: sequelize_1.DataTypes.UUID,
|
|
96
|
-
allowNull: true,
|
|
97
|
-
field: 'user_id',
|
|
98
|
-
},
|
|
99
|
-
academicCalendarId: {
|
|
100
|
-
type: sequelize_1.DataTypes.UUID,
|
|
101
|
-
allowNull: true,
|
|
102
|
-
field: 'academic_calendar_id',
|
|
103
|
-
},
|
|
104
|
-
feeHistoryId: {
|
|
105
|
-
type: sequelize_1.DataTypes.UUID,
|
|
106
|
-
allowNull: true,
|
|
107
|
-
field: 'fee_history_id',
|
|
108
|
-
},
|
|
109
|
-
feeTypeId: {
|
|
110
|
-
type: sequelize_1.DataTypes.UUID,
|
|
111
|
-
allowNull: true,
|
|
112
|
-
field: 'fee_type_id',
|
|
113
|
-
},
|
|
114
|
-
paidFee: {
|
|
115
|
-
type: sequelize_1.DataTypes.INTEGER,
|
|
116
|
-
allowNull: true,
|
|
117
|
-
field: 'paid_fee',
|
|
118
|
-
},
|
|
119
|
-
upiId: {
|
|
120
|
-
type: sequelize_1.DataTypes.STRING,
|
|
121
|
-
allowNull: true,
|
|
122
|
-
field: 'upi_id',
|
|
123
|
-
},
|
|
124
|
-
paymentType: {
|
|
125
|
-
type: sequelize_1.DataTypes.STRING,
|
|
126
|
-
allowNull: true,
|
|
127
|
-
field: 'payment_type',
|
|
128
|
-
},
|
|
129
|
-
chequeNo: {
|
|
130
|
-
type: sequelize_1.DataTypes.STRING,
|
|
131
|
-
allowNull: true,
|
|
132
|
-
field: 'cheque_no',
|
|
133
|
-
},
|
|
134
|
-
bankName: {
|
|
135
|
-
type: sequelize_1.DataTypes.STRING,
|
|
136
|
-
allowNull: true,
|
|
137
|
-
field: 'bank_name',
|
|
138
|
-
},
|
|
139
|
-
}, {
|
|
140
|
-
modelName: 'FeeHistoryDetailsModel',
|
|
141
|
-
tableName: 'fee_history_details',
|
|
142
|
-
timestamps: true,
|
|
143
|
-
sequelize: index_1.sequelize,
|
|
144
|
-
});
|
|
145
|
-
exports.default = FeeHistoryDetailsModel;
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
import { Model } from 'sequelize';
|
|
2
|
-
import { IFeeHistoryModelAttributes } from '../../interfaces/feeHistoryInterface';
|
|
3
|
-
import { TFeeHistoryModelCreationAttributes } from '../../types/feeHistoryType';
|
|
4
|
-
import { FEE_HISTORY_STATUS, PAYMENT_TYPE } from '../../constants/app';
|
|
5
|
-
export declare class FeeHistoryModel extends Model<IFeeHistoryModelAttributes, TFeeHistoryModelCreationAttributes> {
|
|
6
|
-
id: string;
|
|
7
|
-
instituteId: string;
|
|
8
|
-
userId: string;
|
|
9
|
-
feeCollectionId?: string;
|
|
10
|
-
paidFee: number;
|
|
11
|
-
paidDate: Date;
|
|
12
|
-
pdfId: string | null;
|
|
13
|
-
invoiceId: number | null;
|
|
14
|
-
status: FEE_HISTORY_STATUS;
|
|
15
|
-
upiId?: string | null;
|
|
16
|
-
paymentType?: PAYMENT_TYPE;
|
|
17
|
-
bankName?: string | null;
|
|
18
|
-
chequeNo?: string | null;
|
|
19
|
-
feeTypeId?: string[] | null;
|
|
20
|
-
bankAccountId?: string | null;
|
|
21
|
-
parentHistoryId?: string | null;
|
|
22
|
-
schoolFeeCollectionId?: string | null;
|
|
23
|
-
academicCalendarId: string;
|
|
24
|
-
createdBy: string;
|
|
25
|
-
updatedBy: string;
|
|
26
|
-
deletedBy: string;
|
|
27
|
-
readonly createdAt: Date;
|
|
28
|
-
readonly updatedAt: Date;
|
|
29
|
-
readonly deletedAt: string;
|
|
30
|
-
static associate(models: any): void;
|
|
31
|
-
static addHooks(models: any): void;
|
|
32
|
-
}
|
|
33
|
-
export default FeeHistoryModel;
|
|
@@ -1,189 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.FeeHistoryModel = void 0;
|
|
7
|
-
const sequelize_1 = require("sequelize");
|
|
8
|
-
const index_1 = require("./index");
|
|
9
|
-
const app_1 = require("../../constants/app");
|
|
10
|
-
const errorMessages_1 = require("../../constants/errorMessages");
|
|
11
|
-
const userInstituteMetaModel_1 = __importDefault(require("../mongodb/userInstituteMetaModel"));
|
|
12
|
-
class FeeHistoryModel extends sequelize_1.Model {
|
|
13
|
-
static associate(models) {
|
|
14
|
-
const { UserModel, InstituteModel, SchoolFeeCollectionModel, FeesCollectionModel, FileStorageModel, BankAccountDetailsModel, AcademicCalendarModel, } = models;
|
|
15
|
-
FeeHistoryModel.belongsTo(FeesCollectionModel, {
|
|
16
|
-
foreignKey: { name: 'feeCollectionId', field: 'fee_collection_id', allowNull: true },
|
|
17
|
-
as: 'feeHistoryFeeCollection',
|
|
18
|
-
});
|
|
19
|
-
FeesCollectionModel.hasMany(FeeHistoryModel, {
|
|
20
|
-
foreignKey: { name: 'feeCollectionId', field: 'fee_collection_id', allowNull: true },
|
|
21
|
-
as: 'feeCollectionHasFeeHistory',
|
|
22
|
-
});
|
|
23
|
-
FeeHistoryModel.belongsTo(FileStorageModel, {
|
|
24
|
-
foreignKey: { name: 'pdfId', field: 'pdf_id', allowNull: true },
|
|
25
|
-
as: 'feeHistoryFile',
|
|
26
|
-
});
|
|
27
|
-
FileStorageModel.hasMany(FeeHistoryModel, {
|
|
28
|
-
foreignKey: { name: 'pdfId', field: 'pdf_id', allowNull: true },
|
|
29
|
-
as: 'filesHasFeeHistory',
|
|
30
|
-
});
|
|
31
|
-
FeeHistoryModel.belongsTo(BankAccountDetailsModel, {
|
|
32
|
-
foreignKey: { name: 'bankAccountId', field: 'bank_account_id', allowNull: true },
|
|
33
|
-
as: 'feeHistoryAccount',
|
|
34
|
-
});
|
|
35
|
-
BankAccountDetailsModel.hasMany(FeeHistoryModel, {
|
|
36
|
-
foreignKey: { name: 'bankAccountId', field: 'bank_account_id', allowNull: true },
|
|
37
|
-
as: 'feeHistoryHasAccount',
|
|
38
|
-
});
|
|
39
|
-
FeeHistoryModel.belongsTo(FeeHistoryModel, {
|
|
40
|
-
foreignKey: { name: 'parentHistoryId', field: 'parent_history_id', allowNull: true },
|
|
41
|
-
as: 'feeHistory',
|
|
42
|
-
});
|
|
43
|
-
FeeHistoryModel.hasMany(FeeHistoryModel, {
|
|
44
|
-
foreignKey: { name: 'parentHistoryId', field: 'parent_history_id', allowNull: true },
|
|
45
|
-
as: 'feeHistoryHas',
|
|
46
|
-
});
|
|
47
|
-
FeeHistoryModel.belongsTo(SchoolFeeCollectionModel, {
|
|
48
|
-
foreignKey: { name: 'schoolFeeCollectionId', field: 'school_fee_collection_id', allowNull: true },
|
|
49
|
-
as: 'feeHistorySchool',
|
|
50
|
-
});
|
|
51
|
-
SchoolFeeCollectionModel.hasMany(FeeHistoryModel, {
|
|
52
|
-
foreignKey: { name: 'schoolFeeCollectionId', field: 'school_fee_collection_id', allowNull: true },
|
|
53
|
-
as: 'feeHistoryHasSchool',
|
|
54
|
-
});
|
|
55
|
-
FeeHistoryModel.belongsTo(InstituteModel, {
|
|
56
|
-
foreignKey: { name: 'instituteId', field: 'institute_id' },
|
|
57
|
-
as: 'feeHistoryInstitute',
|
|
58
|
-
});
|
|
59
|
-
InstituteModel.hasMany(FeeHistoryModel, {
|
|
60
|
-
foreignKey: 'instituteId',
|
|
61
|
-
as: 'instituteHasFeeHistory',
|
|
62
|
-
});
|
|
63
|
-
FeeHistoryModel.belongsTo(UserModel, {
|
|
64
|
-
foreignKey: { name: 'userId', field: 'user_id' },
|
|
65
|
-
as: 'feeHistoryUser',
|
|
66
|
-
});
|
|
67
|
-
UserModel.hasMany(FeeHistoryModel, {
|
|
68
|
-
foreignKey: 'userId',
|
|
69
|
-
as: 'userHasFeeHistory',
|
|
70
|
-
});
|
|
71
|
-
FeeHistoryModel.belongsTo(AcademicCalendarModel, {
|
|
72
|
-
foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
|
|
73
|
-
as: 'feeHistoryAcaCal',
|
|
74
|
-
});
|
|
75
|
-
AcademicCalendarModel.hasMany(FeeHistoryModel, {
|
|
76
|
-
foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
|
|
77
|
-
as: 'acaCalFeeHistory',
|
|
78
|
-
});
|
|
79
|
-
FeeHistoryModel.belongsTo(UserModel, {
|
|
80
|
-
foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
|
|
81
|
-
as: 'createdByUser',
|
|
82
|
-
});
|
|
83
|
-
FeeHistoryModel.belongsTo(UserModel, {
|
|
84
|
-
foreignKey: { name: 'updatedBy', allowNull: true, field: 'updated_by' },
|
|
85
|
-
as: 'updatedByUser',
|
|
86
|
-
});
|
|
87
|
-
FeeHistoryModel.belongsTo(UserModel, {
|
|
88
|
-
foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
|
|
89
|
-
as: 'deletedByUser',
|
|
90
|
-
});
|
|
91
|
-
}
|
|
92
|
-
static addHooks(models) {
|
|
93
|
-
const { FileStorageModel } = models;
|
|
94
|
-
const subjectWiserFeePay = async (instituteId, feeCollectionId, paidFee, userId, academicCalendarId) => {
|
|
95
|
-
const { InstituteEntityModel, UserHasSubjectFeeModel, FeesCollectionModel, SubjectHasPayFeeHistory } = models;
|
|
96
|
-
const userInstituteMeta = await userInstituteMetaModel_1.default.findOne({
|
|
97
|
-
userId,
|
|
98
|
-
instituteId,
|
|
99
|
-
academicCalendarId,
|
|
100
|
-
status: app_1.USER_INSTITUTE_META_STATUS.ACCEPTED,
|
|
101
|
-
});
|
|
102
|
-
if (!userInstituteMeta)
|
|
103
|
-
throw new Error(errorMessages_1.USER_INSTITUTE_META_ERROR_MESSAGES.NOT_FOUND);
|
|
104
|
-
const subjects = await InstituteEntityModel.findAll({
|
|
105
|
-
where: { id: { [sequelize_1.Op.in]: userInstituteMeta.entities } },
|
|
106
|
-
include: [{ association: 'entityType', where: { sequence: app_1.INSTITUTE_ENTITY_TYPE_SEQUENCE.LAST } }],
|
|
107
|
-
});
|
|
108
|
-
const subjectIds = subjects.map((subject) => subject.id);
|
|
109
|
-
const fees = await UserHasSubjectFeeModel.findAll({
|
|
110
|
-
where: { subjectId: { [sequelize_1.Op.in]: subjectIds }, instituteId, academicCalendarId },
|
|
111
|
-
});
|
|
112
|
-
const feeCollection = await FeesCollectionModel.findByPk(feeCollectionId);
|
|
113
|
-
if (!feeCollection)
|
|
114
|
-
throw new Error(errorMessages_1.FEESCOLLECTION_ERROR_MESSAGES.NOT_FOUND);
|
|
115
|
-
const feeDistribution = fees.map((fee) => ({
|
|
116
|
-
subjectId: fee.subjectId,
|
|
117
|
-
amount: parseFloat(((fee.fee / (feeCollection.feeAmount || 0)) * paidFee).toFixed(2)),
|
|
118
|
-
}));
|
|
119
|
-
return Promise.all(feeDistribution.map((distribution) => SubjectHasPayFeeHistory.create({
|
|
120
|
-
instituteId,
|
|
121
|
-
userId,
|
|
122
|
-
subjectId: distribution.subjectId,
|
|
123
|
-
feeCollectionId,
|
|
124
|
-
academicCalendarId,
|
|
125
|
-
amount: distribution.amount,
|
|
126
|
-
})));
|
|
127
|
-
};
|
|
128
|
-
FeeHistoryModel.beforeCreate(async (feeCollection) => {
|
|
129
|
-
if (feeCollection.paidFee) {
|
|
130
|
-
if (feeCollection.paymentType === app_1.PAYMENT_TYPE.CHEQUE) {
|
|
131
|
-
feeCollection.upiId = null;
|
|
132
|
-
if (!feeCollection.chequeNo || !feeCollection.bankName) {
|
|
133
|
-
throw new Error(errorMessages_1.FEESCOLLECTION_ERROR_MESSAGES.FEE_PAID_BY_CHQUE);
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
else if (feeCollection.paymentType === app_1.PAYMENT_TYPE.UPI) {
|
|
137
|
-
feeCollection.chequeNo = null;
|
|
138
|
-
feeCollection.bankName = null;
|
|
139
|
-
if (!feeCollection.upiId) {
|
|
140
|
-
throw new Error(errorMessages_1.FEESCOLLECTION_ERROR_MESSAGES.FEE_PAID_BY_UPI);
|
|
141
|
-
}
|
|
142
|
-
}
|
|
143
|
-
else if (feeCollection.paymentType === app_1.PAYMENT_TYPE.CASH) {
|
|
144
|
-
feeCollection.bankName = null;
|
|
145
|
-
feeCollection.chequeNo = null;
|
|
146
|
-
feeCollection.upiId = null;
|
|
147
|
-
}
|
|
148
|
-
else {
|
|
149
|
-
throw new Error(errorMessages_1.FEESCOLLECTION_ERROR_MESSAGES.PAYMENT_TYPE_REQUIRED);
|
|
150
|
-
}
|
|
151
|
-
if (feeCollection.pdfId) {
|
|
152
|
-
const pdfUrl = await FileStorageModel.findByPk(feeCollection.pdfId);
|
|
153
|
-
if (!pdfUrl)
|
|
154
|
-
throw new Error(errorMessages_1.FILE_STORAGE_ERROR_MESSAGES.NOT_FOUND);
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
if ((!feeCollection.feeTypeId || feeCollection.feeTypeId.length === 0) && !feeCollection.bankAccountId) {
|
|
158
|
-
await subjectWiserFeePay(feeCollection.instituteId, feeCollection.feeCollectionId, feeCollection.paidFee, feeCollection.userId, feeCollection.academicCalendarId);
|
|
159
|
-
}
|
|
160
|
-
});
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
exports.FeeHistoryModel = FeeHistoryModel;
|
|
164
|
-
FeeHistoryModel.init({
|
|
165
|
-
id: { type: sequelize_1.DataTypes.UUID, defaultValue: sequelize_1.DataTypes.UUIDV4, allowNull: false, primaryKey: true },
|
|
166
|
-
instituteId: { type: sequelize_1.DataTypes.UUID, field: 'institute_id', allowNull: false },
|
|
167
|
-
pdfId: { type: sequelize_1.DataTypes.UUID, field: 'pdf_id', allowNull: true },
|
|
168
|
-
invoiceId: { type: sequelize_1.DataTypes.INTEGER, field: 'invoice_id', allowNull: true, defaultValue: null },
|
|
169
|
-
userId: { type: sequelize_1.DataTypes.UUID, field: 'user_id', allowNull: false },
|
|
170
|
-
feeCollectionId: { type: sequelize_1.DataTypes.UUID, field: 'fee_collection_id', allowNull: true },
|
|
171
|
-
parentHistoryId: { type: sequelize_1.DataTypes.UUID, field: 'parent_history_id', allowNull: true },
|
|
172
|
-
bankAccountId: { type: sequelize_1.DataTypes.UUID, field: 'bank_account_id', allowNull: true },
|
|
173
|
-
feeTypeId: { type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.STRING), field: 'fee_type_id', allowNull: true, defaultValue: [] },
|
|
174
|
-
schoolFeeCollectionId: { type: sequelize_1.DataTypes.UUID, field: 'school_fee_collection_id', allowNull: true },
|
|
175
|
-
paidDate: { type: sequelize_1.DataTypes.DATE, defaultValue: sequelize_1.DataTypes.NOW, allowNull: false },
|
|
176
|
-
paidFee: { type: sequelize_1.DataTypes.INTEGER, allowNull: false },
|
|
177
|
-
paymentType: { type: sequelize_1.DataTypes.ENUM, values: Object.values(app_1.PAYMENT_TYPE), allowNull: true },
|
|
178
|
-
status: { type: sequelize_1.DataTypes.ENUM, values: Object.values(app_1.FEE_HISTORY_STATUS), allowNull: true, defaultValue: app_1.FEE_HISTORY_STATUS.PENDING },
|
|
179
|
-
bankName: { type: sequelize_1.DataTypes.STRING, allowNull: true },
|
|
180
|
-
chequeNo: { type: sequelize_1.DataTypes.STRING, allowNull: true },
|
|
181
|
-
upiId: { type: sequelize_1.DataTypes.STRING, allowNull: true },
|
|
182
|
-
academicCalendarId: { type: sequelize_1.DataTypes.UUID, field: 'academic_calendar_id', allowNull: true },
|
|
183
|
-
}, {
|
|
184
|
-
modelName: 'FeeHistoryModel',
|
|
185
|
-
tableName: 'fee_history',
|
|
186
|
-
timestamps: true,
|
|
187
|
-
sequelize: index_1.sequelize,
|
|
188
|
-
});
|
|
189
|
-
exports.default = FeeHistoryModel;
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
import { Model } from 'sequelize';
|
|
2
|
-
import { IFeeTypeHasTermsModelAttributes } from '../../interfaces/feeTypeHasTermsInterface';
|
|
3
|
-
import { TFeeTypeHasTermsModelCreationAttributes } from '../../types/feeTypeHasTermsType';
|
|
4
|
-
import { PAYMENT_TERMS_TYPE } from '../../constants/app';
|
|
5
|
-
declare class FeeTypeHasTermsModel extends Model<IFeeTypeHasTermsModelAttributes, TFeeTypeHasTermsModelCreationAttributes> {
|
|
6
|
-
id: string;
|
|
7
|
-
stdId: string;
|
|
8
|
-
feeTypeId: string;
|
|
9
|
-
frequency: PAYMENT_TERMS_TYPE;
|
|
10
|
-
amount: number;
|
|
11
|
-
date: Date;
|
|
12
|
-
instituteId: string;
|
|
13
|
-
academicCalendarId: string;
|
|
14
|
-
createdBy: string;
|
|
15
|
-
updatedBy: string;
|
|
16
|
-
deletedBy: string;
|
|
17
|
-
readonly createdAt: Date;
|
|
18
|
-
readonly deletedAt: string;
|
|
19
|
-
readonly updatedAt: Date;
|
|
20
|
-
static associate(models: any): void;
|
|
21
|
-
}
|
|
22
|
-
export default FeeTypeHasTermsModel;
|
|
@@ -1,99 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const sequelize_1 = require("sequelize");
|
|
4
|
-
const index_1 = require("./index");
|
|
5
|
-
const app_1 = require("../../constants/app");
|
|
6
|
-
class FeeTypeHasTermsModel extends sequelize_1.Model {
|
|
7
|
-
static associate(models) {
|
|
8
|
-
const { FeeTypeModel, InstituteModel, UserModel } = models;
|
|
9
|
-
FeeTypeHasTermsModel.belongsTo(FeeTypeModel, {
|
|
10
|
-
foreignKey: {
|
|
11
|
-
name: 'feeTypeId',
|
|
12
|
-
},
|
|
13
|
-
as: 'termsFeeType',
|
|
14
|
-
});
|
|
15
|
-
FeeTypeModel.hasMany(FeeTypeHasTermsModel, {
|
|
16
|
-
foreignKey: 'feeTypeId',
|
|
17
|
-
as: 'feeTypeHasTerms',
|
|
18
|
-
});
|
|
19
|
-
FeeTypeHasTermsModel.belongsTo(InstituteModel, {
|
|
20
|
-
foreignKey: {
|
|
21
|
-
name: 'instituteId',
|
|
22
|
-
field: 'institute_id',
|
|
23
|
-
},
|
|
24
|
-
as: 'instituteFeeTypeTerms',
|
|
25
|
-
});
|
|
26
|
-
InstituteModel.hasMany(FeeTypeHasTermsModel, {
|
|
27
|
-
foreignKey: 'instituteId',
|
|
28
|
-
as: 'feeTypeHasTermsInstitute',
|
|
29
|
-
});
|
|
30
|
-
FeeTypeHasTermsModel.belongsTo(UserModel, {
|
|
31
|
-
foreignKey: {
|
|
32
|
-
name: 'createdBy',
|
|
33
|
-
allowNull: true,
|
|
34
|
-
field: 'created_by',
|
|
35
|
-
},
|
|
36
|
-
as: 'createdByUser',
|
|
37
|
-
});
|
|
38
|
-
FeeTypeHasTermsModel.belongsTo(UserModel, {
|
|
39
|
-
foreignKey: {
|
|
40
|
-
name: 'updatedBy',
|
|
41
|
-
allowNull: true,
|
|
42
|
-
field: 'updated_by',
|
|
43
|
-
},
|
|
44
|
-
as: 'updatedByUser',
|
|
45
|
-
});
|
|
46
|
-
FeeTypeHasTermsModel.belongsTo(UserModel, {
|
|
47
|
-
foreignKey: {
|
|
48
|
-
name: 'deletedBy',
|
|
49
|
-
allowNull: true,
|
|
50
|
-
field: 'deleted_by',
|
|
51
|
-
},
|
|
52
|
-
as: 'deletedByUser',
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
FeeTypeHasTermsModel.init({
|
|
57
|
-
id: {
|
|
58
|
-
type: sequelize_1.DataTypes.UUID,
|
|
59
|
-
defaultValue: sequelize_1.DataTypes.UUIDV4,
|
|
60
|
-
allowNull: false,
|
|
61
|
-
primaryKey: true,
|
|
62
|
-
},
|
|
63
|
-
instituteId: {
|
|
64
|
-
type: sequelize_1.DataTypes.UUID,
|
|
65
|
-
field: 'institute_id',
|
|
66
|
-
allowNull: false,
|
|
67
|
-
},
|
|
68
|
-
stdId: {
|
|
69
|
-
type: sequelize_1.DataTypes.UUID,
|
|
70
|
-
allowNull: false,
|
|
71
|
-
},
|
|
72
|
-
feeTypeId: {
|
|
73
|
-
type: sequelize_1.DataTypes.UUID,
|
|
74
|
-
allowNull: false,
|
|
75
|
-
},
|
|
76
|
-
academicCalendarId: {
|
|
77
|
-
type: sequelize_1.DataTypes.UUID,
|
|
78
|
-
allowNull: true,
|
|
79
|
-
},
|
|
80
|
-
amount: {
|
|
81
|
-
type: sequelize_1.DataTypes.INTEGER,
|
|
82
|
-
allowNull: false,
|
|
83
|
-
},
|
|
84
|
-
date: {
|
|
85
|
-
type: sequelize_1.DataTypes.DATE,
|
|
86
|
-
allowNull: false,
|
|
87
|
-
},
|
|
88
|
-
frequency: {
|
|
89
|
-
type: sequelize_1.DataTypes.ENUM,
|
|
90
|
-
values: Object.values(app_1.PAYMENT_TERMS_TYPE),
|
|
91
|
-
allowNull: false,
|
|
92
|
-
},
|
|
93
|
-
}, {
|
|
94
|
-
modelName: 'FeeTypeHasTermsModel',
|
|
95
|
-
tableName: 'fee_type_has_terms',
|
|
96
|
-
timestamps: true,
|
|
97
|
-
sequelize: index_1.sequelize,
|
|
98
|
-
});
|
|
99
|
-
exports.default = FeeTypeHasTermsModel;
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
import { Model } from 'sequelize';
|
|
2
|
-
import { IFeeTypeModelAttributes } from '../../interfaces/feeTypeInterface';
|
|
3
|
-
import { TFeeTypeModelCreationAttributes } from '../../types/feeTypeType';
|
|
4
|
-
import { BOOLEAN_STATUS, COMMAN_STATUS, FEE_TYPE, FEE_TYPE_FREQUENCY } from '../../constants/app';
|
|
5
|
-
declare class FeeTypeModel extends Model<IFeeTypeModelAttributes, TFeeTypeModelCreationAttributes> {
|
|
6
|
-
id: string;
|
|
7
|
-
instituteId: string;
|
|
8
|
-
typeManagementId: string;
|
|
9
|
-
frequency: FEE_TYPE_FREQUENCY;
|
|
10
|
-
feeType: FEE_TYPE;
|
|
11
|
-
module: COMMAN_STATUS;
|
|
12
|
-
status: COMMAN_STATUS;
|
|
13
|
-
account: string;
|
|
14
|
-
isDefault: BOOLEAN_STATUS;
|
|
15
|
-
academicCalendarId: string;
|
|
16
|
-
createdBy: string;
|
|
17
|
-
updatedBy: string;
|
|
18
|
-
deletedBy: string;
|
|
19
|
-
readonly createdAt: Date;
|
|
20
|
-
readonly deletedAt: string;
|
|
21
|
-
readonly updatedAt: Date;
|
|
22
|
-
static associate(models: any): void;
|
|
23
|
-
}
|
|
24
|
-
export default FeeTypeModel;
|
|
@@ -1,110 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const sequelize_1 = require("sequelize");
|
|
4
|
-
const index_1 = require("./index");
|
|
5
|
-
const app_1 = require("../../constants/app");
|
|
6
|
-
class FeeTypeModel extends sequelize_1.Model {
|
|
7
|
-
static associate(models) {
|
|
8
|
-
const { BankAccountDetailsModel, TypeManagementModel, InstituteModel, UserModel, AcademicCalendarModel } = models;
|
|
9
|
-
FeeTypeModel.belongsTo(BankAccountDetailsModel, {
|
|
10
|
-
foreignKey: { name: 'account' },
|
|
11
|
-
as: 'accountFeeType',
|
|
12
|
-
});
|
|
13
|
-
BankAccountDetailsModel.hasMany(FeeTypeModel, {
|
|
14
|
-
foreignKey: 'account',
|
|
15
|
-
as: 'feeTypeHasAccount',
|
|
16
|
-
});
|
|
17
|
-
TypeManagementModel.hasMany(FeeTypeModel, {
|
|
18
|
-
foreignKey: 'typeManagementId',
|
|
19
|
-
as: 'feeTypeTypeManagement',
|
|
20
|
-
});
|
|
21
|
-
FeeTypeModel.belongsTo(TypeManagementModel, {
|
|
22
|
-
foreignKey: { name: 'typeManagementId' },
|
|
23
|
-
as: 'typeManagementType',
|
|
24
|
-
});
|
|
25
|
-
FeeTypeModel.belongsTo(InstituteModel, {
|
|
26
|
-
foreignKey: { name: 'instituteId', field: 'institute_id' },
|
|
27
|
-
as: 'instituteFeeType',
|
|
28
|
-
});
|
|
29
|
-
InstituteModel.hasMany(FeeTypeModel, {
|
|
30
|
-
foreignKey: 'instituteId',
|
|
31
|
-
as: 'feeTypeInstitute',
|
|
32
|
-
});
|
|
33
|
-
FeeTypeModel.belongsTo(UserModel, {
|
|
34
|
-
foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
|
|
35
|
-
as: 'createdByUser',
|
|
36
|
-
});
|
|
37
|
-
FeeTypeModel.belongsTo(UserModel, {
|
|
38
|
-
foreignKey: { name: 'updatedBy', allowNull: true, field: 'updated_by' },
|
|
39
|
-
as: 'updatedByUser',
|
|
40
|
-
});
|
|
41
|
-
FeeTypeModel.belongsTo(UserModel, {
|
|
42
|
-
foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
|
|
43
|
-
as: 'deletedByUser',
|
|
44
|
-
});
|
|
45
|
-
FeeTypeModel.belongsTo(AcademicCalendarModel, {
|
|
46
|
-
foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
|
|
47
|
-
as: 'feeTypeAcademicCalendar',
|
|
48
|
-
});
|
|
49
|
-
AcademicCalendarModel.hasMany(FeeTypeModel, {
|
|
50
|
-
foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
|
|
51
|
-
as: 'academicCalendarFeeType',
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
FeeTypeModel.init({
|
|
56
|
-
id: {
|
|
57
|
-
type: sequelize_1.DataTypes.UUID,
|
|
58
|
-
defaultValue: sequelize_1.DataTypes.UUIDV4,
|
|
59
|
-
allowNull: false,
|
|
60
|
-
primaryKey: true,
|
|
61
|
-
},
|
|
62
|
-
typeManagementId: {
|
|
63
|
-
type: sequelize_1.DataTypes.UUID,
|
|
64
|
-
field: 'type_management_id',
|
|
65
|
-
allowNull: false,
|
|
66
|
-
},
|
|
67
|
-
instituteId: {
|
|
68
|
-
type: sequelize_1.DataTypes.UUID,
|
|
69
|
-
field: 'institute_id',
|
|
70
|
-
allowNull: false,
|
|
71
|
-
},
|
|
72
|
-
account: {
|
|
73
|
-
type: sequelize_1.DataTypes.UUID,
|
|
74
|
-
allowNull: false,
|
|
75
|
-
},
|
|
76
|
-
status: {
|
|
77
|
-
type: sequelize_1.DataTypes.ENUM(...Object.values(app_1.COMMAN_STATUS)),
|
|
78
|
-
defaultValue: app_1.COMMAN_STATUS.ACTIVE,
|
|
79
|
-
allowNull: false,
|
|
80
|
-
},
|
|
81
|
-
module: {
|
|
82
|
-
type: sequelize_1.DataTypes.ENUM(...Object.values(app_1.COMMAN_STATUS)),
|
|
83
|
-
defaultValue: app_1.COMMAN_STATUS.INACTIVE,
|
|
84
|
-
allowNull: false,
|
|
85
|
-
},
|
|
86
|
-
isDefault: {
|
|
87
|
-
type: sequelize_1.DataTypes.ENUM(...Object.values(app_1.BOOLEAN_STATUS)),
|
|
88
|
-
allowNull: false,
|
|
89
|
-
defaultValue: app_1.BOOLEAN_STATUS.NO,
|
|
90
|
-
},
|
|
91
|
-
feeType: {
|
|
92
|
-
type: sequelize_1.DataTypes.ENUM(...Object.values(app_1.FEE_TYPE)),
|
|
93
|
-
allowNull: false,
|
|
94
|
-
},
|
|
95
|
-
frequency: {
|
|
96
|
-
type: sequelize_1.DataTypes.ENUM(...Object.values(app_1.FEE_TYPE_FREQUENCY)),
|
|
97
|
-
allowNull: false,
|
|
98
|
-
},
|
|
99
|
-
academicCalendarId: {
|
|
100
|
-
type: sequelize_1.DataTypes.UUID,
|
|
101
|
-
field: 'academic_calendar_id',
|
|
102
|
-
allowNull: true,
|
|
103
|
-
},
|
|
104
|
-
}, {
|
|
105
|
-
modelName: 'FeeTypeModel',
|
|
106
|
-
tableName: 'fee_type',
|
|
107
|
-
timestamps: true,
|
|
108
|
-
sequelize: index_1.sequelize,
|
|
109
|
-
});
|
|
110
|
-
exports.default = FeeTypeModel;
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import { Model } from 'sequelize';
|
|
2
|
-
import { IFeesCollectionModelAttributes } from '../../interfaces/feesCollectionInterface';
|
|
3
|
-
import { TFeesCollectionModelCreationAttributes } from '../../types/feesCollectionType';
|
|
4
|
-
import { FEE_PAYMENT_STATUS, PAYMENT_TYPE } from '../../constants/app';
|
|
5
|
-
declare class FeesCollectionModel extends Model<IFeesCollectionModelAttributes, TFeesCollectionModelCreationAttributes> {
|
|
6
|
-
id: string;
|
|
7
|
-
date: Date;
|
|
8
|
-
dueDate?: Date;
|
|
9
|
-
feeAmount?: number;
|
|
10
|
-
paidFee?: number;
|
|
11
|
-
discount?: number;
|
|
12
|
-
paymentType?: PAYMENT_TYPE;
|
|
13
|
-
bankName?: string | null;
|
|
14
|
-
chequeNo?: string | null;
|
|
15
|
-
userId: string;
|
|
16
|
-
instituteId: string;
|
|
17
|
-
upiId?: string | null;
|
|
18
|
-
status: FEE_PAYMENT_STATUS;
|
|
19
|
-
academicCalendarId: string;
|
|
20
|
-
isLeft?: boolean;
|
|
21
|
-
createdBy: string;
|
|
22
|
-
updatedBy: string;
|
|
23
|
-
deletedBy: string;
|
|
24
|
-
readonly createdAt: Date;
|
|
25
|
-
readonly deletedAt: string;
|
|
26
|
-
readonly updatedAt: Date;
|
|
27
|
-
static addHooks(models: any): void;
|
|
28
|
-
static associate(models: any): void;
|
|
29
|
-
}
|
|
30
|
-
export default FeesCollectionModel;
|