@kipicore/dbcore 1.1.5 → 1.1.8
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/README.md +1 -1
- package/dist/constants/app.js +0 -1
- package/dist/db/mongodb.js +4 -4
- package/dist/db/postgres.d.ts +1 -1
- package/dist/db/postgres.js +5 -5
- package/dist/index.d.ts +419 -415
- package/dist/index.js +748 -428
- package/dist/models/mongodb/attendanceModel.d.ts +2 -2
- package/dist/models/mongodb/attendanceModel.js +7 -8
- package/dist/models/mongodb/eventModel.d.ts +2 -2
- package/dist/models/mongodb/eventModel.js +3 -3
- package/dist/models/mongodb/examGroupModel.d.ts +2 -2
- package/dist/models/mongodb/examGroupModel.js +22 -28
- package/dist/models/mongodb/examHasAnswerSheetModel.d.ts +2 -2
- package/dist/models/mongodb/examHasAnswerSheetModel.js +5 -6
- package/dist/models/mongodb/examModel.d.ts +2 -2
- package/dist/models/mongodb/examModel.js +7 -10
- package/dist/models/mongodb/holidayModel.d.ts +2 -2
- package/dist/models/mongodb/holidayModel.js +4 -6
- package/dist/models/mongodb/inquiryModel.d.ts +2 -2
- package/dist/models/mongodb/inquiryModel.js +3 -4
- package/dist/models/mongodb/plugin/transformIdInResponsePlugin.d.ts +1 -1
- package/dist/models/mongodb/plugin/transformIdInResponsePlugin.js +4 -6
- package/dist/models/mongodb/schoolFeeModel.d.ts +2 -2
- package/dist/models/mongodb/schoolFeeModel.js +3 -3
- package/dist/models/mongodb/subjectIndexModel.d.ts +2 -2
- package/dist/models/mongodb/subjectIndexModel.js +66 -108
- package/dist/models/mongodb/subscriptionPlanModel.d.ts +2 -2
- package/dist/models/mongodb/subscriptionPlanModel.js +1 -1
- package/dist/models/mongodb/taskManagementModel.d.ts +2 -2
- package/dist/models/mongodb/taskManagementModel.js +3 -3
- package/dist/models/mongodb/userDoc.d.ts +1 -1
- package/dist/models/mongodb/userDoc.js +1 -1
- package/dist/models/mongodb/userSchoolMetaModel.d.ts +1 -1
- package/dist/models/mongodb/userSchoolMetaModel.js +8 -8
- package/dist/models/psql/announcementModel.d.ts +4 -4
- package/dist/models/psql/announcementModel.js +25 -25
- package/dist/models/psql/batchModel.d.ts +4 -4
- package/dist/models/psql/batchModel.js +51 -51
- package/dist/models/psql/driverModel.d.ts +4 -4
- package/dist/models/psql/driverModel.js +28 -28
- package/dist/models/psql/facilityModel.d.ts +4 -4
- package/dist/models/psql/facilityModel.js +23 -23
- package/dist/models/psql/feeHistoryModel.d.ts +4 -4
- package/dist/models/psql/feeHistoryModel.js +64 -65
- package/dist/models/psql/feeReminderModel.d.ts +3 -3
- package/dist/models/psql/feeReminderModel.js +32 -32
- package/dist/models/psql/feesCollectionModel.d.ts +4 -4
- package/dist/models/psql/feesCollectionModel.js +36 -37
- package/dist/models/psql/index.d.ts +1 -1
- package/dist/models/psql/index.js +12 -12
- package/dist/models/psql/lectureModel.d.ts +4 -4
- package/dist/models/psql/lectureModel.js +75 -84
- package/dist/models/psql/masterLeaveModel.d.ts +4 -4
- package/dist/models/psql/masterLeaveModel.js +22 -23
- package/dist/models/psql/testimonialModel.d.ts +4 -4
- package/dist/models/psql/testimonialModel.js +25 -27
- package/dist/models/psql/toDoModel.d.ts +4 -4
- package/dist/models/psql/toDoModel.js +23 -23
- package/dist/models/psql/typeManagementModel.d.ts +4 -4
- package/dist/models/psql/typeManagementModel.js +19 -19
- package/dist/models/psql/userModel.d.ts +4 -4
- package/dist/models/psql/userModel.js +47 -48
- package/dist/models/psql/userPayoutModel.d.ts +4 -4
- package/dist/models/psql/userPayoutModel.js +55 -70
- package/dist/services/Concrete/mongooseCommonService.d.ts +4 -4
- package/dist/services/Concrete/mongooseCommonService.js +2 -4
- package/dist/services/Contracts/IMongooseCommonService.d.ts +2 -2
- package/dist/services/Contracts/ISequelizeCommonService.d.ts +12 -12
- package/dist/types/generateIdCardType.d.ts +2 -2
- package/package.json +49 -47
- /package/dist/services/Concrete/{sequelizeCommanService.d.ts → sequelizeCommonService.d.ts} +0 -0
- /package/dist/services/Concrete/{sequelizeCommanService.js → sequelizeCommonService.js} +0 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Model } from
|
|
2
|
-
import { ILectureModelAttributes } from
|
|
3
|
-
import { TLectureModelCreationAttributes } from
|
|
4
|
-
import { LECTURE_STATUS, LECTURE_TITLE, PLANNER_SYNC_STATUS } from
|
|
1
|
+
import { Model } from 'sequelize';
|
|
2
|
+
import { ILectureModelAttributes } from '../../interfaces/lectureInterface.js';
|
|
3
|
+
import { TLectureModelCreationAttributes } from '../../types/lectureType.js';
|
|
4
|
+
import { LECTURE_STATUS, LECTURE_TITLE, PLANNER_SYNC_STATUS } from '../../constants/app.js';
|
|
5
5
|
declare class LectureModel extends Model<ILectureModelAttributes, TLectureModelCreationAttributes> {
|
|
6
6
|
id: string;
|
|
7
7
|
title: LECTURE_TITLE;
|
|
@@ -43,7 +43,7 @@ LectureModel.init({
|
|
|
43
43
|
},
|
|
44
44
|
slotDuration: {
|
|
45
45
|
type: sequelize_1.DataTypes.INTEGER,
|
|
46
|
-
field:
|
|
46
|
+
field: 'slot_duration',
|
|
47
47
|
allowNull: false,
|
|
48
48
|
},
|
|
49
49
|
subject: {
|
|
@@ -52,47 +52,47 @@ LectureModel.init({
|
|
|
52
52
|
},
|
|
53
53
|
startTime: {
|
|
54
54
|
type: sequelize_1.DataTypes.DATE,
|
|
55
|
-
field:
|
|
55
|
+
field: 'start_time',
|
|
56
56
|
allowNull: false,
|
|
57
57
|
},
|
|
58
58
|
endTime: {
|
|
59
59
|
type: sequelize_1.DataTypes.DATE,
|
|
60
|
-
field:
|
|
60
|
+
field: 'end_time',
|
|
61
61
|
allowNull: false,
|
|
62
62
|
},
|
|
63
63
|
instituteId: {
|
|
64
64
|
type: sequelize_1.DataTypes.UUID,
|
|
65
|
-
field:
|
|
65
|
+
field: 'institute_id',
|
|
66
66
|
allowNull: true,
|
|
67
67
|
},
|
|
68
68
|
classRoomId: {
|
|
69
69
|
type: sequelize_1.DataTypes.UUID,
|
|
70
|
-
field:
|
|
70
|
+
field: 'class_room_id',
|
|
71
71
|
allowNull: true,
|
|
72
72
|
},
|
|
73
73
|
groupId: {
|
|
74
74
|
type: sequelize_1.DataTypes.UUID,
|
|
75
|
-
field:
|
|
75
|
+
field: 'group_id',
|
|
76
76
|
allowNull: true,
|
|
77
77
|
},
|
|
78
78
|
primaryUserId: {
|
|
79
79
|
type: sequelize_1.DataTypes.UUID,
|
|
80
|
-
field:
|
|
80
|
+
field: 'primary_user_id',
|
|
81
81
|
allowNull: true,
|
|
82
82
|
},
|
|
83
83
|
secondaryUserId: {
|
|
84
84
|
type: sequelize_1.DataTypes.UUID,
|
|
85
|
-
field:
|
|
85
|
+
field: 'secondary_user_id',
|
|
86
86
|
allowNull: true,
|
|
87
87
|
},
|
|
88
88
|
workingDayId: {
|
|
89
89
|
type: sequelize_1.DataTypes.UUID,
|
|
90
|
-
field:
|
|
90
|
+
field: 'working_day_id',
|
|
91
91
|
allowNull: false,
|
|
92
92
|
},
|
|
93
93
|
batchId: {
|
|
94
94
|
type: sequelize_1.DataTypes.UUID,
|
|
95
|
-
field:
|
|
95
|
+
field: 'batch_id',
|
|
96
96
|
allowNull: true,
|
|
97
97
|
},
|
|
98
98
|
status: {
|
|
@@ -103,12 +103,12 @@ LectureModel.init({
|
|
|
103
103
|
},
|
|
104
104
|
checkedInAt: {
|
|
105
105
|
type: sequelize_1.DataTypes.DATE,
|
|
106
|
-
field:
|
|
106
|
+
field: 'checked_in_at',
|
|
107
107
|
allowNull: true,
|
|
108
108
|
},
|
|
109
109
|
checkedOutAt: {
|
|
110
110
|
type: sequelize_1.DataTypes.DATE,
|
|
111
|
-
field:
|
|
111
|
+
field: 'checked_out_at',
|
|
112
112
|
allowNull: true,
|
|
113
113
|
},
|
|
114
114
|
color: {
|
|
@@ -117,142 +117,142 @@ LectureModel.init({
|
|
|
117
117
|
},
|
|
118
118
|
plannerSyncStatus: {
|
|
119
119
|
type: sequelize_1.DataTypes.STRING,
|
|
120
|
-
field:
|
|
120
|
+
field: 'planner_sync_status',
|
|
121
121
|
allowNull: true,
|
|
122
122
|
defaultValue: app_js_1.PLANNER_SYNC_STATUS.PENDING,
|
|
123
123
|
},
|
|
124
124
|
shiftId: {
|
|
125
125
|
type: sequelize_1.DataTypes.UUID,
|
|
126
|
-
field:
|
|
126
|
+
field: 'shift_id',
|
|
127
127
|
allowNull: true,
|
|
128
128
|
},
|
|
129
129
|
slotId: {
|
|
130
130
|
type: sequelize_1.DataTypes.UUID,
|
|
131
|
-
field:
|
|
131
|
+
field: 'slot_id',
|
|
132
132
|
allowNull: true,
|
|
133
133
|
},
|
|
134
134
|
}, {
|
|
135
|
-
modelName:
|
|
136
|
-
tableName:
|
|
135
|
+
modelName: 'LectureModel',
|
|
136
|
+
tableName: 'lectures',
|
|
137
137
|
timestamps: true,
|
|
138
138
|
sequelize: index_js_1.sequelize,
|
|
139
139
|
});
|
|
140
140
|
// Associations
|
|
141
141
|
LectureModel.belongsTo(userModel_js_1.default, {
|
|
142
142
|
foreignKey: {
|
|
143
|
-
name:
|
|
143
|
+
name: 'createdBy',
|
|
144
144
|
allowNull: true,
|
|
145
|
-
field:
|
|
145
|
+
field: 'created_by',
|
|
146
146
|
},
|
|
147
|
-
as:
|
|
147
|
+
as: 'createdByUser',
|
|
148
148
|
});
|
|
149
149
|
LectureModel.belongsTo(userModel_js_1.default, {
|
|
150
150
|
foreignKey: {
|
|
151
|
-
name:
|
|
151
|
+
name: 'updatedBy',
|
|
152
152
|
allowNull: true,
|
|
153
|
-
field:
|
|
153
|
+
field: 'updated_by',
|
|
154
154
|
},
|
|
155
|
-
as:
|
|
155
|
+
as: 'updatedByUser',
|
|
156
156
|
});
|
|
157
157
|
LectureModel.belongsTo(userModel_js_1.default, {
|
|
158
158
|
foreignKey: {
|
|
159
|
-
name:
|
|
159
|
+
name: 'deletedBy',
|
|
160
160
|
allowNull: true,
|
|
161
|
-
field:
|
|
161
|
+
field: 'deleted_by',
|
|
162
162
|
},
|
|
163
|
-
as:
|
|
163
|
+
as: 'deletedByUser',
|
|
164
164
|
});
|
|
165
165
|
LectureModel.belongsTo(typeManagementModel_js_1.default, {
|
|
166
|
-
foreignKey:
|
|
167
|
-
as:
|
|
166
|
+
foreignKey: 'type',
|
|
167
|
+
as: 'lectureType',
|
|
168
168
|
});
|
|
169
169
|
LectureModel.belongsTo(instituteModel_js_1.default, {
|
|
170
|
-
foreignKey:
|
|
171
|
-
as:
|
|
170
|
+
foreignKey: 'instituteId',
|
|
171
|
+
as: 'institute',
|
|
172
172
|
});
|
|
173
173
|
instituteModel_js_1.default.hasMany(LectureModel, {
|
|
174
|
-
foreignKey:
|
|
175
|
-
as:
|
|
174
|
+
foreignKey: 'instituteId',
|
|
175
|
+
as: 'instituteHasLectures',
|
|
176
176
|
});
|
|
177
177
|
LectureModel.belongsTo(workingDayModel_js_1.default, {
|
|
178
|
-
foreignKey:
|
|
179
|
-
as:
|
|
178
|
+
foreignKey: 'workingDayId',
|
|
179
|
+
as: 'workingDay',
|
|
180
180
|
});
|
|
181
181
|
workingDayModel_js_1.default.hasMany(LectureModel, {
|
|
182
|
-
foreignKey:
|
|
183
|
-
as:
|
|
182
|
+
foreignKey: 'workingDayId',
|
|
183
|
+
as: 'workingDayHasLectures',
|
|
184
184
|
});
|
|
185
185
|
LectureModel.belongsTo(slotModel_js_1.default, {
|
|
186
|
-
foreignKey:
|
|
187
|
-
as:
|
|
186
|
+
foreignKey: 'slotId',
|
|
187
|
+
as: 'lectureSlot',
|
|
188
188
|
});
|
|
189
189
|
slotModel_js_1.default.hasMany(LectureModel, {
|
|
190
|
-
foreignKey:
|
|
191
|
-
as:
|
|
190
|
+
foreignKey: 'slotId',
|
|
191
|
+
as: 'slotLectureList',
|
|
192
192
|
});
|
|
193
193
|
LectureModel.belongsTo(workingShiftModel_js_1.default, {
|
|
194
|
-
foreignKey:
|
|
195
|
-
as:
|
|
194
|
+
foreignKey: 'shiftId',
|
|
195
|
+
as: 'lectureShift',
|
|
196
196
|
});
|
|
197
197
|
workingShiftModel_js_1.default.hasMany(LectureModel, {
|
|
198
|
-
foreignKey:
|
|
199
|
-
as:
|
|
198
|
+
foreignKey: 'shiftId',
|
|
199
|
+
as: 'shiftLectureList',
|
|
200
200
|
});
|
|
201
201
|
LectureModel.belongsTo(userModel_js_1.default, {
|
|
202
202
|
foreignKey: {
|
|
203
|
-
name:
|
|
204
|
-
field:
|
|
203
|
+
name: 'primaryUserId',
|
|
204
|
+
field: 'primary_user_id',
|
|
205
205
|
allowNull: true,
|
|
206
206
|
},
|
|
207
|
-
as:
|
|
207
|
+
as: 'user',
|
|
208
208
|
});
|
|
209
209
|
userModel_js_1.default.hasMany(LectureModel, {
|
|
210
210
|
foreignKey: {
|
|
211
|
-
name:
|
|
212
|
-
field:
|
|
211
|
+
name: 'primaryUserId',
|
|
212
|
+
field: 'primary_user_id',
|
|
213
213
|
allowNull: true,
|
|
214
214
|
},
|
|
215
|
-
as:
|
|
215
|
+
as: 'userHasLectures',
|
|
216
216
|
});
|
|
217
217
|
LectureModel.belongsTo(userModel_js_1.default, {
|
|
218
218
|
foreignKey: {
|
|
219
|
-
name:
|
|
220
|
-
field:
|
|
219
|
+
name: 'secondaryUserId',
|
|
220
|
+
field: 'secondary_user_id',
|
|
221
221
|
allowNull: true,
|
|
222
222
|
},
|
|
223
|
-
as:
|
|
223
|
+
as: 'secondaryUser',
|
|
224
224
|
});
|
|
225
225
|
userModel_js_1.default.hasMany(LectureModel, {
|
|
226
226
|
foreignKey: {
|
|
227
|
-
name:
|
|
228
|
-
field:
|
|
227
|
+
name: 'secondaryUserId',
|
|
228
|
+
field: 'secondary_user_id',
|
|
229
229
|
allowNull: true,
|
|
230
230
|
},
|
|
231
|
-
as:
|
|
231
|
+
as: 'secondaryUserHasLectures',
|
|
232
232
|
});
|
|
233
233
|
LectureModel.belongsTo(classRoomModel_js_1.default, {
|
|
234
|
-
foreignKey:
|
|
235
|
-
as:
|
|
234
|
+
foreignKey: 'classRoomId',
|
|
235
|
+
as: 'classRoom',
|
|
236
236
|
});
|
|
237
237
|
classRoomModel_js_1.default.hasMany(LectureModel, {
|
|
238
|
-
foreignKey:
|
|
239
|
-
as:
|
|
238
|
+
foreignKey: 'classRoomId',
|
|
239
|
+
as: 'classRoomHasLectures',
|
|
240
240
|
});
|
|
241
241
|
LectureModel.belongsTo(batchModel_js_1.default, {
|
|
242
|
-
foreignKey:
|
|
243
|
-
as:
|
|
242
|
+
foreignKey: 'batchId',
|
|
243
|
+
as: 'batch',
|
|
244
244
|
});
|
|
245
245
|
batchModel_js_1.default.hasMany(LectureModel, {
|
|
246
|
-
foreignKey:
|
|
247
|
-
as:
|
|
246
|
+
foreignKey: 'batchId',
|
|
247
|
+
as: 'batchHasLectures',
|
|
248
248
|
});
|
|
249
249
|
LectureModel.belongsTo(instituteEntityModel_js_1.default, {
|
|
250
|
-
foreignKey:
|
|
251
|
-
as:
|
|
250
|
+
foreignKey: 'subject',
|
|
251
|
+
as: 'subjectDetails',
|
|
252
252
|
});
|
|
253
253
|
instituteEntityModel_js_1.default.hasMany(LectureModel, {
|
|
254
|
-
foreignKey:
|
|
255
|
-
as:
|
|
254
|
+
foreignKey: 'subject',
|
|
255
|
+
as: 'subjectHasLectures',
|
|
256
256
|
});
|
|
257
257
|
const beforeCreateOrUpdateHook = async (lecture, transaction = null) => {
|
|
258
258
|
const options = {};
|
|
@@ -270,9 +270,9 @@ const beforeCreateOrUpdateHook = async (lecture, transaction = null) => {
|
|
|
270
270
|
where: { id: lecture.workingDayId },
|
|
271
271
|
include: [
|
|
272
272
|
{
|
|
273
|
-
association:
|
|
273
|
+
association: 'workingDayShift',
|
|
274
274
|
required: false,
|
|
275
|
-
include: [{ association:
|
|
275
|
+
include: [{ association: 'shiftSlot', required: false }],
|
|
276
276
|
},
|
|
277
277
|
],
|
|
278
278
|
});
|
|
@@ -325,7 +325,7 @@ const beforeCreateOrUpdateHook = async (lecture, transaction = null) => {
|
|
|
325
325
|
const user = await userHasBatchModel_js_1.default.findOne({
|
|
326
326
|
where: batchWhere,
|
|
327
327
|
...options,
|
|
328
|
-
include: [{ association:
|
|
328
|
+
include: [{ association: 'user', where: { type: app_js_1.USER_TYPES.TEACHER } }],
|
|
329
329
|
});
|
|
330
330
|
if (!user) {
|
|
331
331
|
throw new Error(errorMessages_js_1.BATCH_ERROR_MESSAGES.INVALID_SELECTED);
|
|
@@ -348,22 +348,13 @@ const beforeCreateOrUpdateHook = async (lecture, transaction = null) => {
|
|
|
348
348
|
let where = {
|
|
349
349
|
[sequelize_1.Op.or]: [
|
|
350
350
|
{
|
|
351
|
-
[sequelize_1.Op.and]: [
|
|
352
|
-
{ startTime: { [sequelize_1.Op.lte]: lecture.startTime } },
|
|
353
|
-
{ endTime: { [sequelize_1.Op.gt]: lecture.startTime } },
|
|
354
|
-
],
|
|
351
|
+
[sequelize_1.Op.and]: [{ startTime: { [sequelize_1.Op.lte]: lecture.startTime } }, { endTime: { [sequelize_1.Op.gt]: lecture.startTime } }],
|
|
355
352
|
},
|
|
356
353
|
{
|
|
357
|
-
[sequelize_1.Op.and]: [
|
|
358
|
-
{ startTime: { [sequelize_1.Op.lt]: lecture.endTime } },
|
|
359
|
-
{ endTime: { [sequelize_1.Op.gte]: lecture.endTime } },
|
|
360
|
-
],
|
|
354
|
+
[sequelize_1.Op.and]: [{ startTime: { [sequelize_1.Op.lt]: lecture.endTime } }, { endTime: { [sequelize_1.Op.gte]: lecture.endTime } }],
|
|
361
355
|
},
|
|
362
356
|
{
|
|
363
|
-
[sequelize_1.Op.and]: [
|
|
364
|
-
{ startTime: { [sequelize_1.Op.gte]: lecture.startTime } },
|
|
365
|
-
{ endTime: { [sequelize_1.Op.lte]: lecture.endTime } },
|
|
366
|
-
],
|
|
357
|
+
[sequelize_1.Op.and]: [{ startTime: { [sequelize_1.Op.gte]: lecture.startTime } }, { endTime: { [sequelize_1.Op.lte]: lecture.endTime } }],
|
|
367
358
|
},
|
|
368
359
|
],
|
|
369
360
|
instituteId: lecture.instituteId,
|
|
@@ -452,7 +443,7 @@ const beforeCreateOrUpdateHook = async (lecture, transaction = null) => {
|
|
|
452
443
|
where: { id: lecture.subject },
|
|
453
444
|
include: [
|
|
454
445
|
{
|
|
455
|
-
association:
|
|
446
|
+
association: 'entityType',
|
|
456
447
|
where: { sequence: app_js_1.INSTITUTE_ENTITY_TYPE_SEQUENCE.LAST },
|
|
457
448
|
},
|
|
458
449
|
],
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Model } from
|
|
2
|
-
import { IMasterLeaveModelAttributes } from
|
|
3
|
-
import { TMasterLeaveModelCreationAttributes } from
|
|
4
|
-
import { COMMAN_STATUS, LEAVE, TERM_DURATION } from
|
|
1
|
+
import { Model } from 'sequelize';
|
|
2
|
+
import { IMasterLeaveModelAttributes } from '../../interfaces/masterLeaveInterface.js';
|
|
3
|
+
import { TMasterLeaveModelCreationAttributes } from '../../types/masterLeaveType.js';
|
|
4
|
+
import { COMMAN_STATUS, LEAVE, TERM_DURATION } from '../../constants/app.js';
|
|
5
5
|
declare class MasterLeaveModel extends Model<IMasterLeaveModelAttributes, TMasterLeaveModelCreationAttributes> {
|
|
6
6
|
id: string;
|
|
7
7
|
totalLeave: number;
|
|
@@ -58,8 +58,8 @@ MasterLeaveModel.init({
|
|
|
58
58
|
allowNull: true,
|
|
59
59
|
},
|
|
60
60
|
}, {
|
|
61
|
-
modelName:
|
|
62
|
-
tableName:
|
|
61
|
+
modelName: 'MasterLeaveModel',
|
|
62
|
+
tableName: 'master_leaves',
|
|
63
63
|
timestamps: true,
|
|
64
64
|
sequelize: index_js_1.sequelize,
|
|
65
65
|
});
|
|
@@ -67,8 +67,7 @@ const validateAndCalculate = async (instance) => {
|
|
|
67
67
|
try {
|
|
68
68
|
if (instance.typeManagementId) {
|
|
69
69
|
const typeManagement = await typeManagementModel_js_1.default.findByPk(instance.typeManagementId);
|
|
70
|
-
if (!typeManagement ||
|
|
71
|
-
typeManagement.type !== app_js_1.TYPE_MANAGEMENT_TYPE.LEAVE) {
|
|
70
|
+
if (!typeManagement || typeManagement.type !== app_js_1.TYPE_MANAGEMENT_TYPE.LEAVE) {
|
|
72
71
|
throw new Error(errorMessages_js_1.MASTER_LEAVE_ERROR_MESSAGES.INVALID_TYPE_MANAGEMENT_ID);
|
|
73
72
|
}
|
|
74
73
|
}
|
|
@@ -85,48 +84,48 @@ MasterLeaveModel.beforeBulkUpdate(async (instance) => {
|
|
|
85
84
|
});
|
|
86
85
|
MasterLeaveModel.belongsTo(instituteModel_js_1.default, {
|
|
87
86
|
foreignKey: {
|
|
88
|
-
name:
|
|
89
|
-
field:
|
|
87
|
+
name: 'instituteId',
|
|
88
|
+
field: 'institute_id',
|
|
90
89
|
},
|
|
91
|
-
as:
|
|
90
|
+
as: 'leaveInstitute',
|
|
92
91
|
});
|
|
93
92
|
instituteModel_js_1.default.hasMany(MasterLeaveModel, {
|
|
94
|
-
foreignKey:
|
|
95
|
-
as:
|
|
93
|
+
foreignKey: 'instituteId',
|
|
94
|
+
as: 'instituteHasLeaves',
|
|
96
95
|
});
|
|
97
96
|
MasterLeaveModel.belongsTo(typeManagementModel_js_1.default, {
|
|
98
97
|
foreignKey: {
|
|
99
|
-
name:
|
|
100
|
-
field:
|
|
98
|
+
name: 'typeManagementId',
|
|
99
|
+
field: 'type_management_id',
|
|
101
100
|
},
|
|
102
|
-
as:
|
|
101
|
+
as: 'leaveTypeManagement',
|
|
103
102
|
});
|
|
104
103
|
typeManagementModel_js_1.default.hasMany(MasterLeaveModel, {
|
|
105
|
-
foreignKey:
|
|
106
|
-
as:
|
|
104
|
+
foreignKey: 'typeManagementId',
|
|
105
|
+
as: 'typeManagementHasLeaves',
|
|
107
106
|
});
|
|
108
107
|
MasterLeaveModel.belongsTo(userModel_js_1.default, {
|
|
109
108
|
foreignKey: {
|
|
110
|
-
name:
|
|
109
|
+
name: 'createdBy',
|
|
111
110
|
allowNull: true,
|
|
112
|
-
field:
|
|
111
|
+
field: 'created_by',
|
|
113
112
|
},
|
|
114
|
-
as:
|
|
113
|
+
as: 'createdByUser',
|
|
115
114
|
});
|
|
116
115
|
MasterLeaveModel.belongsTo(userModel_js_1.default, {
|
|
117
116
|
foreignKey: {
|
|
118
|
-
name:
|
|
117
|
+
name: 'updatedBy',
|
|
119
118
|
allowNull: true,
|
|
120
|
-
field:
|
|
119
|
+
field: 'updated_by',
|
|
121
120
|
},
|
|
122
|
-
as:
|
|
121
|
+
as: 'updatedByUser',
|
|
123
122
|
});
|
|
124
123
|
MasterLeaveModel.belongsTo(userModel_js_1.default, {
|
|
125
124
|
foreignKey: {
|
|
126
|
-
name:
|
|
125
|
+
name: 'deletedBy',
|
|
127
126
|
allowNull: true,
|
|
128
|
-
field:
|
|
127
|
+
field: 'deleted_by',
|
|
129
128
|
},
|
|
130
|
-
as:
|
|
129
|
+
as: 'deletedByUser',
|
|
131
130
|
});
|
|
132
131
|
exports.default = MasterLeaveModel;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Model } from
|
|
2
|
-
import { ITestimonialModelAttributes } from
|
|
3
|
-
import { TTestimonialModelCreationAttributes } from
|
|
4
|
-
import { COMMAN_STATUS, USER_TYPES } from
|
|
1
|
+
import { Model } from 'sequelize';
|
|
2
|
+
import { ITestimonialModelAttributes } from '../../interfaces/testimonialInterface.js';
|
|
3
|
+
import { TTestimonialModelCreationAttributes } from '../../types/testimonialType.js';
|
|
4
|
+
import { COMMAN_STATUS, USER_TYPES } from '../../constants/app.js';
|
|
5
5
|
declare class TestimonialModel extends Model<ITestimonialModelAttributes, TTestimonialModelCreationAttributes> {
|
|
6
6
|
id: string;
|
|
7
7
|
instituteId: string;
|
|
@@ -55,51 +55,51 @@ TestimonialModel.init({
|
|
|
55
55
|
allowNull: true,
|
|
56
56
|
},
|
|
57
57
|
}, {
|
|
58
|
-
modelName:
|
|
59
|
-
tableName:
|
|
58
|
+
modelName: 'TestimonialModel',
|
|
59
|
+
tableName: 'testimonials',
|
|
60
60
|
timestamps: true,
|
|
61
61
|
sequelize: index_js_1.sequelize,
|
|
62
62
|
});
|
|
63
63
|
// Associations
|
|
64
64
|
TestimonialModel.belongsTo(userModel_js_1.default, {
|
|
65
65
|
foreignKey: {
|
|
66
|
-
name:
|
|
66
|
+
name: 'createdBy',
|
|
67
67
|
allowNull: true,
|
|
68
|
-
field:
|
|
68
|
+
field: 'created_by',
|
|
69
69
|
},
|
|
70
|
-
as:
|
|
70
|
+
as: 'createdByUser',
|
|
71
71
|
});
|
|
72
72
|
TestimonialModel.belongsTo(userModel_js_1.default, {
|
|
73
73
|
foreignKey: {
|
|
74
|
-
name:
|
|
74
|
+
name: 'updatedBy',
|
|
75
75
|
allowNull: true,
|
|
76
|
-
field:
|
|
76
|
+
field: 'updated_by',
|
|
77
77
|
},
|
|
78
|
-
as:
|
|
78
|
+
as: 'updatedByUser',
|
|
79
79
|
});
|
|
80
80
|
TestimonialModel.belongsTo(userModel_js_1.default, {
|
|
81
81
|
foreignKey: {
|
|
82
|
-
name:
|
|
82
|
+
name: 'deletedBy',
|
|
83
83
|
allowNull: true,
|
|
84
|
-
field:
|
|
84
|
+
field: 'deleted_by',
|
|
85
85
|
},
|
|
86
|
-
as:
|
|
86
|
+
as: 'deletedByUser',
|
|
87
87
|
});
|
|
88
88
|
TestimonialModel.belongsTo(instituteModel_js_1.default, {
|
|
89
|
-
foreignKey:
|
|
90
|
-
as:
|
|
89
|
+
foreignKey: 'instituteId',
|
|
90
|
+
as: 'testimonialInstitute',
|
|
91
91
|
});
|
|
92
92
|
instituteModel_js_1.default.hasMany(TestimonialModel, {
|
|
93
|
-
foreignKey:
|
|
94
|
-
as:
|
|
93
|
+
foreignKey: 'instituteId',
|
|
94
|
+
as: 'instituteHasTestimonials',
|
|
95
95
|
});
|
|
96
96
|
TestimonialModel.belongsTo(userModel_js_1.default, {
|
|
97
|
-
foreignKey:
|
|
98
|
-
as:
|
|
97
|
+
foreignKey: 'userId',
|
|
98
|
+
as: 'testimonialUser',
|
|
99
99
|
});
|
|
100
100
|
userModel_js_1.default.hasMany(TestimonialModel, {
|
|
101
|
-
foreignKey:
|
|
102
|
-
as:
|
|
101
|
+
foreignKey: 'userId',
|
|
102
|
+
as: 'userHasTestimonials',
|
|
103
103
|
});
|
|
104
104
|
const beforeCreateOrUpdateHook = async (testimonial) => {
|
|
105
105
|
if (testimonial.instituteId) {
|
|
@@ -117,9 +117,7 @@ const beforeCreateOrUpdateHook = async (testimonial) => {
|
|
|
117
117
|
testimonial.userType = user.type;
|
|
118
118
|
}
|
|
119
119
|
testimonial.class = `${(0, utils_js_1.fromSnakeCaseToNormalText)(testimonial.userType)}`;
|
|
120
|
-
if (testimonial.userId &&
|
|
121
|
-
testimonial.instituteId &&
|
|
122
|
-
testimonial.userType !== app_js_1.USER_TYPES.PARENTS) {
|
|
120
|
+
if (testimonial.userId && testimonial.instituteId && testimonial.userType !== app_js_1.USER_TYPES.PARENTS) {
|
|
123
121
|
const meta = await userInstituteMetaModel_js_1.default.findOne({
|
|
124
122
|
userId: testimonial.userId,
|
|
125
123
|
instituteId: testimonial.instituteId,
|
|
@@ -134,12 +132,12 @@ const beforeCreateOrUpdateHook = async (testimonial) => {
|
|
|
134
132
|
id: { [sequelize_1.Op.in]: meta.entities },
|
|
135
133
|
},
|
|
136
134
|
include: {
|
|
137
|
-
association:
|
|
135
|
+
association: 'entityType',
|
|
138
136
|
required: true,
|
|
139
137
|
where: {
|
|
140
138
|
[sequelize_1.Op.or]: [
|
|
141
|
-
{ title: { [sequelize_1.Op.iLike]:
|
|
142
|
-
{ title: { [sequelize_1.Op.iLike]:
|
|
139
|
+
{ title: { [sequelize_1.Op.iLike]: 'STANDARD' } },
|
|
140
|
+
{ title: { [sequelize_1.Op.iLike]: 'MEDIUM' } },
|
|
143
141
|
// { title: { [Op.iLike]: 'BOARD' } },
|
|
144
142
|
// { title: { [Op.iLike]: 'STREAM' } },
|
|
145
143
|
// { title: { [Op.iLike]: 'SUBJECT' } },
|
|
@@ -149,9 +147,9 @@ const beforeCreateOrUpdateHook = async (testimonial) => {
|
|
|
149
147
|
});
|
|
150
148
|
stdDataList = JSON.parse(JSON.stringify(stdDataList));
|
|
151
149
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
152
|
-
const className = stdDataList.find((item) => item.entityType?.title ===
|
|
150
|
+
const className = stdDataList.find((item) => item.entityType?.title === 'STANDARD')?.title || null;
|
|
153
151
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
154
|
-
const mediumName = stdDataList.find((item) => item.entityType?.title ===
|
|
152
|
+
const mediumName = stdDataList.find((item) => item.entityType?.title === 'MEDIUM')?.title || null;
|
|
155
153
|
testimonial.class = `${(0, utils_js_1.capitalizeFirst)(mediumName.substring(0, 3))} Medium ${(0, utils_js_1.capitalizeFirst)(className)}`;
|
|
156
154
|
}
|
|
157
155
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Model } from
|
|
2
|
-
import { IToDoModelAttributes } from
|
|
3
|
-
import { TToDoModelCreationAttributes } from
|
|
4
|
-
import { TO_DO_STATUS } from
|
|
1
|
+
import { Model } from 'sequelize';
|
|
2
|
+
import { IToDoModelAttributes } from '../../interfaces/toDoInterface.js';
|
|
3
|
+
import { TToDoModelCreationAttributes } from '../../types/toDoType.js';
|
|
4
|
+
import { TO_DO_STATUS } from '../../constants/app.js';
|
|
5
5
|
declare class ToDoModel extends Model<IToDoModelAttributes, TToDoModelCreationAttributes> {
|
|
6
6
|
id: string;
|
|
7
7
|
instituteId?: string;
|