@driveup/schema 0.2.2 → 0.2.3
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/lib/catalog/addon/addon.entity.d.ts +2 -2
- package/lib/catalog/addon/addon.entity.js +21 -21
- package/lib/catalog/addon/addon.entity.js.map +1 -1
- package/lib/catalog/addon/country.entity.d.ts +2 -1
- package/lib/catalog/addon/country.entity.js +9 -8
- package/lib/catalog/addon/country.entity.js.map +1 -1
- package/lib/catalog/priceplan/priceplan.entity.d.ts +2 -3
- package/lib/catalog/priceplan/priceplan.entity.js +10 -11
- package/lib/catalog/priceplan/priceplan.entity.js.map +1 -1
- package/lib/catalog/product/country.entity.d.ts +10 -4
- package/lib/catalog/product/country.entity.js +41 -32
- package/lib/catalog/product/country.entity.js.map +1 -1
- package/lib/catalog/product/priceplan.entity.d.ts +4 -3
- package/lib/catalog/product/priceplan.entity.js +11 -11
- package/lib/catalog/product/priceplan.entity.js.map +1 -1
- package/lib/catalog/product/product.entity.d.ts +6 -6
- package/lib/catalog/product/product.entity.js +37 -34
- package/lib/catalog/product/product.entity.js.map +1 -1
- package/lib/catalog/program/program.entity.d.ts +2 -2
- package/lib/catalog/program/program.entity.js +20 -20
- package/lib/catalog/program/program.entity.js.map +1 -1
- package/lib/catalog/seed/assets/asset.entity.d.ts +6 -7
- package/lib/catalog/seed/assets/asset.entity.js +26 -23
- package/lib/catalog/seed/assets/asset.entity.js.map +1 -1
- package/lib/catalog/seed/courses/course.entity.d.ts +4 -3
- package/lib/catalog/seed/courses/course.entity.js +9 -8
- package/lib/catalog/seed/courses/course.entity.js.map +1 -1
- package/lib/catalog/seed/courses/lesson.entity.d.ts +2 -2
- package/lib/catalog/seed/courses/lesson.entity.js +10 -10
- package/lib/catalog/seed/courses/lesson.entity.js.map +1 -1
- package/lib/catalog/seed/courses/topic.entity.d.ts +2 -2
- package/lib/catalog/seed/courses/topic.entity.js +10 -10
- package/lib/catalog/seed/courses/topic.entity.js.map +1 -1
- package/lib/catalog/seed/expense/category.entity.d.ts +2 -1
- package/lib/catalog/seed/expense/category.entity.js +8 -7
- package/lib/catalog/seed/expense/category.entity.js.map +1 -1
- package/lib/index.d.ts +3 -0
- package/lib/index.js +3 -0
- package/lib/index.js.map +1 -1
- package/lib/profile/agent/agent.entity.d.ts +4 -8
- package/lib/profile/agent/agent.entity.js +21 -28
- package/lib/profile/agent/agent.entity.js.map +1 -1
- package/lib/profile/agent/asset.entity.d.ts +57 -0
- package/lib/profile/agent/asset.entity.js +95 -0
- package/lib/profile/agent/asset.entity.js.map +1 -0
- package/lib/profile/agent/payout.entity.d.ts +2 -2
- package/lib/profile/agent/payout.entity.js +9 -9
- package/lib/profile/agent/payout.entity.js.map +1 -1
- package/lib/profile/agent/promotion.entity.js +5 -4
- package/lib/profile/agent/promotion.entity.js.map +1 -1
- package/lib/profile/company/company.entity.d.ts +4 -4
- package/lib/profile/company/company.entity.js +28 -28
- package/lib/profile/company/company.entity.js.map +1 -1
- package/lib/profile/company/course/appointment.entity.d.ts +3 -2
- package/lib/profile/company/course/appointment.entity.js +5 -4
- package/lib/profile/company/course/appointment.entity.js.map +1 -1
- package/lib/profile/company/course/course.entity.d.ts +18 -4
- package/lib/profile/company/course/course.entity.js +42 -15
- package/lib/profile/company/course/course.entity.js.map +1 -1
- package/lib/profile/company/course/lesson.entity.d.ts +2 -0
- package/lib/profile/company/course/lesson.entity.js +7 -6
- package/lib/profile/company/course/lesson.entity.js.map +1 -1
- package/lib/profile/company/course/topic.entity.js +5 -4
- package/lib/profile/company/course/topic.entity.js.map +1 -1
- package/lib/profile/company/finances/billing/bill.entity.d.ts +2 -1
- package/lib/profile/company/finances/billing/bill.entity.js +7 -6
- package/lib/profile/company/finances/billing/bill.entity.js.map +1 -1
- package/lib/profile/company/finances/billing/item.entity.js +5 -4
- package/lib/profile/company/finances/billing/item.entity.js.map +1 -1
- package/lib/profile/company/finances/billing/transaction.entity.d.ts +2 -1
- package/lib/profile/company/finances/billing/transaction.entity.js +10 -9
- package/lib/profile/company/finances/billing/transaction.entity.js.map +1 -1
- package/lib/profile/company/finances/expense/category.entity.js +5 -4
- package/lib/profile/company/finances/expense/category.entity.js.map +1 -1
- package/lib/profile/company/finances/expense/expense.entity.d.ts +2 -1
- package/lib/profile/company/finances/expense/expense.entity.js +13 -12
- package/lib/profile/company/finances/expense/expense.entity.js.map +1 -1
- package/lib/profile/company/finances/handover/handover.entity.js +6 -5
- package/lib/profile/company/finances/handover/handover.entity.js.map +1 -1
- package/lib/profile/company/finances/invoice/invoice.entity.d.ts +2 -2
- package/lib/profile/company/finances/invoice/invoice.entity.js +26 -26
- package/lib/profile/company/finances/invoice/invoice.entity.js.map +1 -1
- package/lib/profile/company/finances/invoice/item.entity.d.ts +2 -1
- package/lib/profile/company/finances/invoice/item.entity.js +7 -6
- package/lib/profile/company/finances/invoice/item.entity.js.map +1 -1
- package/lib/profile/company/finances/payment/method.entity.js +7 -6
- package/lib/profile/company/finances/payment/method.entity.js.map +1 -1
- package/lib/profile/company/instructor/activity.entity.d.ts +33 -0
- package/lib/profile/company/instructor/activity.entity.js +53 -0
- package/lib/profile/company/instructor/activity.entity.js.map +1 -0
- package/lib/profile/company/instructor/calendar-state.entity.d.ts +67 -0
- package/lib/profile/company/instructor/calendar-state.entity.js +75 -0
- package/lib/profile/company/instructor/calendar-state.entity.js.map +1 -0
- package/lib/profile/company/instructor/instructor.entity.d.ts +17 -9
- package/lib/profile/company/instructor/instructor.entity.js +53 -36
- package/lib/profile/company/instructor/instructor.entity.js.map +1 -1
- package/lib/profile/company/instructor/task.entity.js +5 -4
- package/lib/profile/company/instructor/task.entity.js.map +1 -1
- package/lib/profile/company/medical/examination.entity.d.ts +2 -1
- package/lib/profile/company/medical/examination.entity.js +5 -4
- package/lib/profile/company/medical/examination.entity.js.map +1 -1
- package/lib/profile/company/medical/product.entity.d.ts +3 -2
- package/lib/profile/company/medical/product.entity.js +8 -7
- package/lib/profile/company/medical/product.entity.js.map +1 -1
- package/lib/profile/company/product/addon.entity.js +11 -10
- package/lib/profile/company/product/addon.entity.js.map +1 -1
- package/lib/profile/company/product/priceplan.entity.d.ts +7 -2
- package/lib/profile/company/product/priceplan.entity.js +12 -5
- package/lib/profile/company/product/priceplan.entity.js.map +1 -1
- package/lib/profile/company/product/product.entity.d.ts +11 -4
- package/lib/profile/company/product/product.entity.js +25 -18
- package/lib/profile/company/product/product.entity.js.map +1 -1
- package/lib/profile/company/product/vehicle.entity.d.ts +2 -1
- package/lib/profile/company/product/vehicle.entity.js +7 -6
- package/lib/profile/company/product/vehicle.entity.js.map +1 -1
- package/lib/profile/instructor/instructor.entity.d.ts +2 -8
- package/lib/profile/instructor/instructor.entity.js +13 -25
- package/lib/profile/instructor/instructor.entity.js.map +1 -1
- package/lib/profile/student/program/licence/licence.entity.d.ts +2 -1
- package/lib/profile/student/program/licence/licence.entity.js +9 -8
- package/lib/profile/student/program/licence/licence.entity.js.map +1 -1
- package/lib/profile/student/program/medical/certificate.entity.d.ts +2 -1
- package/lib/profile/student/program/medical/certificate.entity.js +11 -10
- package/lib/profile/student/program/medical/certificate.entity.js.map +1 -1
- package/lib/profile/student/program/medical/examination.entity.d.ts +2 -2
- package/lib/profile/student/program/medical/examination.entity.js +16 -16
- package/lib/profile/student/program/medical/examination.entity.js.map +1 -1
- package/lib/profile/student/program/program.entity.d.ts +2 -1
- package/lib/profile/student/program/program.entity.js +9 -8
- package/lib/profile/student/program/program.entity.js.map +1 -1
- package/lib/profile/student/program/training/appointment.entity.d.ts +2 -1
- package/lib/profile/student/program/training/appointment.entity.js +12 -11
- package/lib/profile/student/program/training/appointment.entity.js.map +1 -1
- package/lib/profile/student/program/training/exam.entity.d.ts +1 -2
- package/lib/profile/student/program/training/exam.entity.js +12 -12
- package/lib/profile/student/program/training/exam.entity.js.map +1 -1
- package/lib/profile/student/program/training/lesson.entity.js +5 -4
- package/lib/profile/student/program/training/lesson.entity.js.map +1 -1
- package/lib/profile/student/program/training/request.entity.d.ts +2 -1
- package/lib/profile/student/program/training/request.entity.js +15 -14
- package/lib/profile/student/program/training/request.entity.js.map +1 -1
- package/lib/profile/student/program/training/topic.entity.js +9 -8
- package/lib/profile/student/program/training/topic.entity.js.map +1 -1
- package/lib/profile/student/program/training/training.entity.d.ts +2 -3
- package/lib/profile/student/program/training/training.entity.js +28 -29
- package/lib/profile/student/program/training/training.entity.js.map +1 -1
- package/lib/profile/student/program/training/transaction.entity.d.ts +2 -2
- package/lib/profile/student/program/training/transaction.entity.js +14 -14
- package/lib/profile/student/student.entity.d.ts +2 -7
- package/lib/profile/student/student.entity.js +13 -24
- package/lib/profile/student/student.entity.js.map +1 -1
- package/lib/system/campaign/campaign.entity.d.ts +2 -2
- package/lib/system/campaign/campaign.entity.js +9 -9
- package/lib/system/campaign/campaign.entity.js.map +1 -1
- package/lib/system/campaign/gifcode.entity.d.ts +2 -1
- package/lib/system/campaign/gifcode.entity.js +7 -6
- package/lib/system/campaign/gifcode.entity.js.map +1 -1
- package/lib/system/country/country.entity.d.ts +4 -3
- package/lib/system/country/country.entity.js +12 -11
- package/lib/system/country/country.entity.js.map +1 -1
- package/lib/system/currency/currency.entity.js +5 -4
- package/lib/system/currency/currency.entity.js.map +1 -1
- package/lib/system/driving/category.entity.d.ts +2 -2
- package/lib/system/driving/category.entity.js +14 -14
- package/lib/system/driving/category.entity.js.map +1 -1
- package/lib/system/driving/vehicle.entity.d.ts +2 -1
- package/lib/system/driving/vehicle.entity.js +7 -6
- package/lib/system/driving/vehicle.entity.js.map +1 -1
- package/lib/system/event/event.entity.d.ts +2 -1
- package/lib/system/event/event.entity.js +11 -10
- package/lib/system/event/event.entity.js.map +1 -1
- package/lib/system/event/log.entity.d.ts +2 -1
- package/lib/system/event/log.entity.js +11 -10
- package/lib/system/event/log.entity.js.map +1 -1
- package/lib/system/policy/policy.entity.d.ts +2 -2
- package/lib/system/policy/policy.entity.js +18 -18
- package/lib/system/policy/policy.entity.js.map +1 -1
- package/lib/system/staff/staff.entity.d.ts +2 -1
- package/lib/system/staff/staff.entity.js +11 -10
- package/lib/system/staff/staff.entity.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/user/alert.entity.d.ts +13 -2
- package/lib/user/alert.entity.js +30 -11
- package/lib/user/alert.entity.js.map +1 -1
- package/lib/user/blocked.entity.js +5 -5
- package/lib/user/blocked.entity.js.map +1 -1
- package/lib/user/device.entity.js +5 -4
- package/lib/user/device.entity.js.map +1 -1
- package/lib/user/notification.entity.d.ts +2 -2
- package/lib/user/notification.entity.js +13 -13
- package/lib/user/notification.entity.js.map +1 -1
- package/lib/user/ticket.entity.d.ts +2 -2
- package/lib/user/ticket.entity.js +20 -20
- package/lib/user/ticket.entity.js.map +1 -1
- package/lib/user/user.entity.d.ts +16 -6
- package/lib/user/user.entity.js +96 -50
- package/lib/user/user.entity.js.map +1 -1
- package/lib/user/verification.entity.js +5 -5
- package/lib/user/verification.entity.js.map +1 -1
- package/lib/utils/activity.helper.d.ts +2 -1
- package/lib/utils/activity.helper.js.map +1 -1
- package/lib/utils/trackable.d.ts +2 -1
- package/lib/utils/trackable.js +4 -3
- package/lib/utils/trackable.js.map +1 -1
- package/package.json +3 -2
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.StudentTrainingRequestEntity = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
|
+
const shared_1 = require("@driveup/shared");
|
|
14
15
|
const common_1 = require("@driveup/common");
|
|
15
16
|
const program_entity_1 = require("../program.entity");
|
|
16
17
|
const course_entity_1 = require("../../../company/course/course.entity");
|
|
@@ -37,14 +38,14 @@ let StudentTrainingRequestEntity = class StudentTrainingRequestEntity extends tr
|
|
|
37
38
|
}
|
|
38
39
|
async getActivities() {
|
|
39
40
|
const activities = [];
|
|
40
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
41
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
42
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
43
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
44
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.acceptedBy,
|
|
45
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.acceptedOn,
|
|
46
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.rejectedBy,
|
|
47
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.rejectedOn,
|
|
41
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
42
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
43
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
44
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
45
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.acceptedBy, shared_1.ActivityType.acceptedBy));
|
|
46
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.acceptedOn, shared_1.ActivityType.acceptedOn));
|
|
47
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.rejectedBy, shared_1.ActivityType.rejectedBy));
|
|
48
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.rejectedOn, shared_1.ActivityType.rejectedOn));
|
|
48
49
|
return activities.filter(a => a);
|
|
49
50
|
}
|
|
50
51
|
};
|
|
@@ -61,11 +62,11 @@ __decorate([
|
|
|
61
62
|
(0, typeorm_1.Column)({
|
|
62
63
|
type: 'enum',
|
|
63
64
|
enum: [
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
65
|
+
shared_1.StatusType.Pending,
|
|
66
|
+
shared_1.StatusType.Approved,
|
|
67
|
+
shared_1.StatusType.Rejected
|
|
67
68
|
],
|
|
68
|
-
default:
|
|
69
|
+
default: shared_1.StatusType.Pending,
|
|
69
70
|
nullable: false
|
|
70
71
|
}),
|
|
71
72
|
__metadata("design:type", String)
|
|
@@ -77,8 +78,8 @@ __decorate([
|
|
|
77
78
|
__decorate([
|
|
78
79
|
(0, typeorm_1.Column)({
|
|
79
80
|
type: 'enum',
|
|
80
|
-
enum:
|
|
81
|
-
default:
|
|
81
|
+
enum: shared_1.CarTransmission,
|
|
82
|
+
default: shared_1.CarTransmission.Manual,
|
|
82
83
|
nullable: false
|
|
83
84
|
}),
|
|
84
85
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.entity.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/request.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"request.entity.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/request.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.StudentTrainingTopicEntity = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
|
+
const shared_1 = require("@driveup/shared");
|
|
14
15
|
const common_1 = require("@driveup/common");
|
|
15
16
|
const topic_entity_1 = require("../../../company/course/topic.entity");
|
|
16
17
|
const lesson_entity_1 = require("./lesson.entity");
|
|
@@ -97,7 +98,7 @@ let StudentTrainingTopicEntity = class StudentTrainingTopicEntity extends tracka
|
|
|
97
98
|
.createQueryBuilder('sda')
|
|
98
99
|
.where('sda.id = :id', { id: session.id })
|
|
99
100
|
.andWhere('JSON_CONTAINS(sda.topics, JSON_OBJECT("id", :topicId))', { topicId: this.id })
|
|
100
|
-
.andWhere('EXISTS (SELECT 1 FROM JSON_TABLE(sda.skills, "$[*]" COLUMNS(score INT PATH "$.score")) AS skill WHERE skill.score != :noScore)', { noScore:
|
|
101
|
+
.andWhere('EXISTS (SELECT 1 FROM JSON_TABLE(sda.skills, "$[*]" COLUMNS(score INT PATH "$.score")) AS skill WHERE skill.score != :noScore)', { noScore: shared_1.Score.NoScoreSubmitted })
|
|
101
102
|
.getCount();
|
|
102
103
|
return count > 0;
|
|
103
104
|
}
|
|
@@ -109,7 +110,7 @@ let StudentTrainingTopicEntity = class StudentTrainingTopicEntity extends tracka
|
|
|
109
110
|
const count = await appointment_entity_1.StudentTrainingAppointmentEntity
|
|
110
111
|
.createQueryBuilder('sda')
|
|
111
112
|
.where('JSON_CONTAINS(sda.topics, JSON_OBJECT("id", :topicId))', { topicId: this.id })
|
|
112
|
-
.andWhere('EXISTS (SELECT 1 FROM JSON_TABLE(sda.skills, "$[*]" COLUMNS(score INT PATH "$.score")) AS skill WHERE skill.score != :noScore)', { noScore:
|
|
113
|
+
.andWhere('EXISTS (SELECT 1 FROM JSON_TABLE(sda.skills, "$[*]" COLUMNS(score INT PATH "$.score")) AS skill WHERE skill.score != :noScore)', { noScore: shared_1.Score.NoScoreSubmitted })
|
|
113
114
|
.getCount();
|
|
114
115
|
return count;
|
|
115
116
|
}
|
|
@@ -120,12 +121,12 @@ let StudentTrainingTopicEntity = class StudentTrainingTopicEntity extends tracka
|
|
|
120
121
|
*/
|
|
121
122
|
async getActivities() {
|
|
122
123
|
const activities = [];
|
|
123
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
124
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
125
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
126
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
127
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.completedBy,
|
|
128
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.completedOn,
|
|
124
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
125
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
126
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
127
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
128
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.completedBy, shared_1.ActivityType.completedBy));
|
|
129
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.completedOn, shared_1.ActivityType.completedOn));
|
|
129
130
|
return activities.filter(a => a);
|
|
130
131
|
}
|
|
131
132
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"topic.entity.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/topic.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"topic.entity.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/topic.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { StatusType } from '@driveup/common';
|
|
1
|
+
import { StatusType, CarTransmission } from '@driveup/shared';
|
|
2
|
+
import { Training, Rating, AddonUsage, Student, Person, Activity, Address } from '@driveup/common';
|
|
4
3
|
import { CompanyInvoiceEntity } from '../../../company/finances/invoice/invoice.entity';
|
|
5
4
|
import { StudentTrainingTransactionEntity } from './transaction.entity';
|
|
6
5
|
import { CompanyInstructorEntity } from '../../../company/instructor/instructor.entity';
|
|
@@ -11,9 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.StudentTrainingEntity = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
|
+
const shared_1 = require("@driveup/shared");
|
|
14
15
|
const common_1 = require("@driveup/common");
|
|
15
|
-
const common_2 = require("@driveup/common");
|
|
16
|
-
const common_3 = require("@driveup/common");
|
|
17
16
|
const invoice_entity_1 = require("../../../company/finances/invoice/invoice.entity");
|
|
18
17
|
const transaction_entity_1 = require("./transaction.entity");
|
|
19
18
|
const instructor_entity_1 = require("../../../company/instructor/instructor.entity");
|
|
@@ -46,7 +45,7 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
|
|
|
46
45
|
paid: this.paid,
|
|
47
46
|
discount: this.discount,
|
|
48
47
|
refund: this.refund,
|
|
49
|
-
location: this.location ?
|
|
48
|
+
location: this.location ? common_1.Address.toInstance(this.location) : null,
|
|
50
49
|
ratings: this.ratings ? this.ratings.map(common_1.Rating.toInstance) : null,
|
|
51
50
|
transmission: this.transmission
|
|
52
51
|
});
|
|
@@ -93,8 +92,8 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
|
|
|
93
92
|
async getPaymentTransactions() {
|
|
94
93
|
const total = await transaction_entity_1.StudentTrainingTransactionEntity.sum('amount', {
|
|
95
94
|
trainingId: this.id,
|
|
96
|
-
type:
|
|
97
|
-
status: (0, typeorm_1.Not)(
|
|
95
|
+
type: shared_1.TransactionType.Payment,
|
|
96
|
+
status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
|
|
98
97
|
refTransactionId: (0, typeorm_1.IsNull)()
|
|
99
98
|
});
|
|
100
99
|
return total || 0;
|
|
@@ -102,9 +101,9 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
|
|
|
102
101
|
async getCashTransactions() {
|
|
103
102
|
const total = await transaction_entity_1.StudentTrainingTransactionEntity.sum('amount', {
|
|
104
103
|
trainingId: this.id,
|
|
105
|
-
type:
|
|
106
|
-
paymentType:
|
|
107
|
-
status: (0, typeorm_1.Not)(
|
|
104
|
+
type: shared_1.TransactionType.Payment,
|
|
105
|
+
paymentType: shared_1.PaymentType.Cash,
|
|
106
|
+
status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
|
|
108
107
|
refTransactionId: (0, typeorm_1.IsNull)()
|
|
109
108
|
});
|
|
110
109
|
return total || 0;
|
|
@@ -112,8 +111,8 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
|
|
|
112
111
|
async getDiscountTransactions() {
|
|
113
112
|
const total = await transaction_entity_1.StudentTrainingTransactionEntity.sum('amount', {
|
|
114
113
|
trainingId: this.id,
|
|
115
|
-
type:
|
|
116
|
-
status: (0, typeorm_1.Not)(
|
|
114
|
+
type: shared_1.TransactionType.Discount,
|
|
115
|
+
status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
|
|
117
116
|
refTransactionId: (0, typeorm_1.IsNull)()
|
|
118
117
|
});
|
|
119
118
|
return total || 0;
|
|
@@ -121,8 +120,8 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
|
|
|
121
120
|
async getRefundTransactions() {
|
|
122
121
|
const total = await transaction_entity_1.StudentTrainingTransactionEntity.sum('amount', {
|
|
123
122
|
trainingId: this.id,
|
|
124
|
-
type:
|
|
125
|
-
status: (0, typeorm_1.Not)(
|
|
123
|
+
type: shared_1.TransactionType.Refund,
|
|
124
|
+
status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
|
|
126
125
|
refTransactionId: (0, typeorm_1.IsNull)()
|
|
127
126
|
});
|
|
128
127
|
return total || 0;
|
|
@@ -130,21 +129,21 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
|
|
|
130
129
|
async getCanceledTransactions() {
|
|
131
130
|
const total = await transaction_entity_1.StudentTrainingTransactionEntity.sum('amount', {
|
|
132
131
|
trainingId: this.id,
|
|
133
|
-
type:
|
|
134
|
-
status: (0, typeorm_1.Not)(
|
|
132
|
+
type: shared_1.TransactionType.Cancelation,
|
|
133
|
+
status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
|
|
135
134
|
});
|
|
136
135
|
return total || 0;
|
|
137
136
|
}
|
|
138
137
|
async getActivities() {
|
|
139
138
|
const activities = [];
|
|
140
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
141
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
142
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
143
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
144
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.completedBy,
|
|
145
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.completedOn,
|
|
146
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.terminatedBy,
|
|
147
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.terminatedOn,
|
|
139
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
140
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
141
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
142
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
143
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.completedBy, shared_1.ActivityType.completedBy));
|
|
144
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.completedOn, shared_1.ActivityType.completedOn));
|
|
145
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.terminatedBy, shared_1.ActivityType.terminatedBy));
|
|
146
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.terminatedOn, shared_1.ActivityType.terminatedOn));
|
|
148
147
|
return activities.filter(a => a);
|
|
149
148
|
}
|
|
150
149
|
};
|
|
@@ -164,8 +163,8 @@ __decorate([
|
|
|
164
163
|
__decorate([
|
|
165
164
|
(0, typeorm_1.Column)({
|
|
166
165
|
type: 'enum',
|
|
167
|
-
enum:
|
|
168
|
-
default:
|
|
166
|
+
enum: shared_1.StatusType,
|
|
167
|
+
default: shared_1.StatusType.Progress,
|
|
169
168
|
nullable: false
|
|
170
169
|
}),
|
|
171
170
|
__metadata("design:type", String)
|
|
@@ -264,7 +263,7 @@ __decorate([
|
|
|
264
263
|
nullable: true,
|
|
265
264
|
default: null
|
|
266
265
|
}),
|
|
267
|
-
__metadata("design:type",
|
|
266
|
+
__metadata("design:type", common_1.Address)
|
|
268
267
|
], StudentTrainingEntity.prototype, "location", void 0);
|
|
269
268
|
__decorate([
|
|
270
269
|
(0, typeorm_1.Column)({
|
|
@@ -283,15 +282,15 @@ __decorate([
|
|
|
283
282
|
__decorate([
|
|
284
283
|
(0, typeorm_1.Column)({
|
|
285
284
|
type: 'enum',
|
|
286
|
-
enum:
|
|
287
|
-
default:
|
|
285
|
+
enum: shared_1.CarTransmission,
|
|
286
|
+
default: shared_1.CarTransmission.Manual,
|
|
288
287
|
nullable: false
|
|
289
288
|
}),
|
|
290
289
|
__metadata("design:type", String)
|
|
291
290
|
], StudentTrainingEntity.prototype, "transmission", void 0);
|
|
292
291
|
__decorate([
|
|
293
292
|
(0, typeorm_1.Column)({
|
|
294
|
-
type: '
|
|
293
|
+
type: 'json',
|
|
295
294
|
nullable: false
|
|
296
295
|
}),
|
|
297
296
|
__metadata("design:type", common_1.Person)
|
|
@@ -357,7 +356,7 @@ __decorate([
|
|
|
357
356
|
__metadata("design:type", Promise)
|
|
358
357
|
], StudentTrainingEntity.prototype, "invoices", void 0);
|
|
359
358
|
exports.StudentTrainingEntity = StudentTrainingEntity = __decorate([
|
|
360
|
-
(0, typeorm_1.Entity)('
|
|
359
|
+
(0, typeorm_1.Entity)('studentTrainings'),
|
|
361
360
|
__metadata("design:paramtypes", [Object])
|
|
362
361
|
], StudentTrainingEntity);
|
|
363
362
|
//# sourceMappingURL=training.entity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"training.entity.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/training.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAsF;AACtF,
|
|
1
|
+
{"version":3,"file":"training.entity.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/training.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PaymentType, TransactionType
|
|
2
|
-
import {
|
|
1
|
+
import { StatusType, PaymentType, TransactionType } from '@driveup/shared';
|
|
2
|
+
import { Transaction, BankAccount, Activity } from '@driveup/common';
|
|
3
3
|
import { CompanyInvoiceEntity } from '../../../company/finances/invoice/invoice.entity';
|
|
4
4
|
import { StudentTrainingEntity } from './training.entity';
|
|
5
5
|
import { TrackableEntity } from '../../../../utils/trackable';
|
|
@@ -12,8 +12,8 @@ var StudentTrainingTransactionEntity_1;
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.StudentTrainingTransactionEntity = void 0;
|
|
14
14
|
const typeorm_1 = require("typeorm");
|
|
15
|
+
const shared_1 = require("@driveup/shared");
|
|
15
16
|
const common_1 = require("@driveup/common");
|
|
16
|
-
const common_2 = require("@driveup/common");
|
|
17
17
|
const invoice_entity_1 = require("../../../company/finances/invoice/invoice.entity");
|
|
18
18
|
const training_entity_1 = require("./training.entity");
|
|
19
19
|
const trackable_1 = require("../../../../utils/trackable");
|
|
@@ -82,10 +82,10 @@ let StudentTrainingTransactionEntity = StudentTrainingTransactionEntity_1 = clas
|
|
|
82
82
|
*/
|
|
83
83
|
async getActivities() {
|
|
84
84
|
const activities = [];
|
|
85
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
86
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
87
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
88
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
85
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
86
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
87
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
88
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
89
89
|
return activities.filter(a => a);
|
|
90
90
|
}
|
|
91
91
|
};
|
|
@@ -98,8 +98,8 @@ __decorate([
|
|
|
98
98
|
(0, typeorm_1.Column)({
|
|
99
99
|
type: 'enum',
|
|
100
100
|
name: 'transactionType',
|
|
101
|
-
enum:
|
|
102
|
-
default:
|
|
101
|
+
enum: shared_1.TransactionType,
|
|
102
|
+
default: shared_1.TransactionType.Payment,
|
|
103
103
|
nullable: false
|
|
104
104
|
}),
|
|
105
105
|
__metadata("design:type", String)
|
|
@@ -107,8 +107,8 @@ __decorate([
|
|
|
107
107
|
__decorate([
|
|
108
108
|
(0, typeorm_1.Column)({
|
|
109
109
|
type: 'enum',
|
|
110
|
-
enum:
|
|
111
|
-
default:
|
|
110
|
+
enum: shared_1.PaymentType,
|
|
111
|
+
default: shared_1.PaymentType.Online,
|
|
112
112
|
nullable: true
|
|
113
113
|
}),
|
|
114
114
|
__metadata("design:type", String)
|
|
@@ -118,12 +118,12 @@ __decorate([
|
|
|
118
118
|
type: 'enum',
|
|
119
119
|
nullable: false,
|
|
120
120
|
enum: [
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
121
|
+
shared_1.StatusType.Pending,
|
|
122
|
+
shared_1.StatusType.Approved,
|
|
123
|
+
shared_1.StatusType.Rejected,
|
|
124
|
+
shared_1.StatusType.Canceled,
|
|
125
125
|
],
|
|
126
|
-
default:
|
|
126
|
+
default: shared_1.StatusType.Pending
|
|
127
127
|
}),
|
|
128
128
|
__metadata("design:type", String)
|
|
129
129
|
], StudentTrainingTransactionEntity.prototype, "status", void 0);
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { AccountStatus, Language
|
|
1
|
+
import { AccountStatus, Language } from '@driveup/shared';
|
|
2
|
+
import { Preference, Activity, Student } from '@driveup/common';
|
|
2
3
|
import { UserEntity } from '../../user/user.entity';
|
|
3
4
|
import { StudentLicenceEntity } from './program/licence/licence.entity';
|
|
4
5
|
import { StudentMedicalExaminationEntity } from './program/medical/examination.entity';
|
|
@@ -106,10 +107,4 @@ export declare class StudentEntity extends TrackableEntity<Student> {
|
|
|
106
107
|
* @returns Array of Preference objects or undefined if not set
|
|
107
108
|
*/
|
|
108
109
|
getPreferences(): Preference<boolean>[];
|
|
109
|
-
/**
|
|
110
|
-
* Checks if notifications are enabled for a specific event
|
|
111
|
-
* @param event Event name to check
|
|
112
|
-
* @returns True if notifications are enabled, false otherwise
|
|
113
|
-
*/
|
|
114
|
-
isNotificationEnabled(event: string): boolean;
|
|
115
110
|
}
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.StudentEntity = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
|
+
const shared_1 = require("@driveup/shared");
|
|
14
15
|
const common_1 = require("@driveup/common");
|
|
15
16
|
const user_entity_1 = require("../../user/user.entity");
|
|
16
17
|
const log_entity_1 = require("../../system/event/log.entity");
|
|
@@ -58,10 +59,10 @@ let StudentEntity = class StudentEntity extends trackable_1.TrackableEntity {
|
|
|
58
59
|
*/
|
|
59
60
|
async getActivities() {
|
|
60
61
|
const activities = [];
|
|
61
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
62
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
63
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
64
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
62
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
63
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
64
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
65
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
65
66
|
return activities.filter(a => a);
|
|
66
67
|
}
|
|
67
68
|
/**
|
|
@@ -74,10 +75,10 @@ let StudentEntity = class StudentEntity extends trackable_1.TrackableEntity {
|
|
|
74
75
|
if (!this.id)
|
|
75
76
|
return;
|
|
76
77
|
await log_entity_1.LogEntity.from({
|
|
77
|
-
type:
|
|
78
|
+
type: shared_1.LogType.Student,
|
|
78
79
|
event: event,
|
|
79
80
|
entityId: entityId,
|
|
80
|
-
profile: { type:
|
|
81
|
+
profile: { type: shared_1.ProfileType.Student, id: this.id },
|
|
81
82
|
content: log_entity_1.LogEntity.toStudentContent(event, this.language, metadata)
|
|
82
83
|
});
|
|
83
84
|
}
|
|
@@ -92,10 +93,10 @@ let StudentEntity = class StudentEntity extends trackable_1.TrackableEntity {
|
|
|
92
93
|
if (!this.id)
|
|
93
94
|
return;
|
|
94
95
|
await log_entity_1.LogEntity.from({
|
|
95
|
-
type:
|
|
96
|
+
type: shared_1.LogType.Student,
|
|
96
97
|
event: event,
|
|
97
98
|
entityId: entityId,
|
|
98
|
-
profile: { type:
|
|
99
|
+
profile: { type: shared_1.ProfileType.Student, id: this.id },
|
|
99
100
|
content: log_entity_1.LogEntity.toAuthorContent(event, this.language, metadata)
|
|
100
101
|
});
|
|
101
102
|
}
|
|
@@ -108,18 +109,6 @@ let StudentEntity = class StudentEntity extends trackable_1.TrackableEntity {
|
|
|
108
109
|
return;
|
|
109
110
|
return this.preferences.map(common_1.Preference.toInstance);
|
|
110
111
|
}
|
|
111
|
-
/**
|
|
112
|
-
* Checks if notifications are enabled for a specific event
|
|
113
|
-
* @param event Event name to check
|
|
114
|
-
* @returns True if notifications are enabled, false otherwise
|
|
115
|
-
*/
|
|
116
|
-
isNotificationEnabled(event) {
|
|
117
|
-
const preferences = this.getPreferences();
|
|
118
|
-
if (!preferences)
|
|
119
|
-
return true;
|
|
120
|
-
const eventPref = preferences.find(p => p.name === event && p.scope === common_1.PreferenceScope.Notification);
|
|
121
|
-
return eventPref ? eventPref.value : true;
|
|
122
|
-
}
|
|
123
112
|
};
|
|
124
113
|
exports.StudentEntity = StudentEntity;
|
|
125
114
|
__decorate([
|
|
@@ -133,8 +122,8 @@ __decorate([
|
|
|
133
122
|
__decorate([
|
|
134
123
|
(0, typeorm_1.Column)({
|
|
135
124
|
type: 'enum',
|
|
136
|
-
enum:
|
|
137
|
-
default:
|
|
125
|
+
enum: shared_1.Language,
|
|
126
|
+
default: shared_1.Language.En,
|
|
138
127
|
nullable: true
|
|
139
128
|
}),
|
|
140
129
|
__metadata("design:type", String)
|
|
@@ -142,8 +131,8 @@ __decorate([
|
|
|
142
131
|
__decorate([
|
|
143
132
|
(0, typeorm_1.Column)({
|
|
144
133
|
type: 'enum',
|
|
145
|
-
enum:
|
|
146
|
-
default:
|
|
134
|
+
enum: shared_1.AccountStatus,
|
|
135
|
+
default: shared_1.AccountStatus.Pending,
|
|
147
136
|
nullable: false
|
|
148
137
|
}),
|
|
149
138
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"student.entity.js","sourceRoot":"","sources":["../../../src/profile/student/student.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"student.entity.js","sourceRoot":"","sources":["../../../src/profile/student/student.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { ProductType, Language } from '@driveup/shared';
|
|
2
|
+
import { Activity, Campaigne, Content } from '@driveup/common';
|
|
3
3
|
import { CampaignGiftCodeEntity } from './gifcode.entity';
|
|
4
4
|
import { TrackableEntity } from '../../utils/trackable';
|
|
5
5
|
/**
|
|
@@ -12,8 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.CampaignEntity = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
14
|
const nestjs_i18n_1 = require("nestjs-i18n");
|
|
15
|
+
const shared_1 = require("@driveup/shared");
|
|
15
16
|
const common_1 = require("@driveup/common");
|
|
16
|
-
const common_2 = require("@driveup/common");
|
|
17
17
|
const gifcode_entity_1 = require("./gifcode.entity");
|
|
18
18
|
const staff_entity_1 = require("../staff/staff.entity");
|
|
19
19
|
const trackable_1 = require("../../utils/trackable");
|
|
@@ -47,7 +47,7 @@ let CampaignEntity = class CampaignEntity extends trackable_1.TrackableEntity {
|
|
|
47
47
|
title: transaltion.title,
|
|
48
48
|
description: transaltion.description,
|
|
49
49
|
giftAmount: this.giftAmount,
|
|
50
|
-
imageUrl: transaltion.
|
|
50
|
+
imageUrl: transaltion.url || this.imageUrl,
|
|
51
51
|
exipryDate: this.exipryDate,
|
|
52
52
|
});
|
|
53
53
|
}
|
|
@@ -73,7 +73,7 @@ let CampaignEntity = class CampaignEntity extends trackable_1.TrackableEntity {
|
|
|
73
73
|
title: translation?.title,
|
|
74
74
|
description: translation?.description,
|
|
75
75
|
content: translation?.content,
|
|
76
|
-
|
|
76
|
+
url: translation?.url,
|
|
77
77
|
link: translation?.link,
|
|
78
78
|
});
|
|
79
79
|
}
|
|
@@ -86,17 +86,17 @@ let CampaignEntity = class CampaignEntity extends trackable_1.TrackableEntity {
|
|
|
86
86
|
title: t.title,
|
|
87
87
|
description: t.description,
|
|
88
88
|
content: t.content,
|
|
89
|
-
|
|
89
|
+
url: t.url,
|
|
90
90
|
link: t.link,
|
|
91
91
|
language: t.language
|
|
92
92
|
}));
|
|
93
93
|
}
|
|
94
94
|
async getActivities() {
|
|
95
95
|
const activities = [];
|
|
96
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
97
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
98
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
99
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
96
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy, staff_entity_1.StaffEntity));
|
|
97
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
98
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy, staff_entity_1.StaffEntity));
|
|
99
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
100
100
|
return activities.filter(a => a);
|
|
101
101
|
}
|
|
102
102
|
};
|
|
@@ -104,7 +104,7 @@ exports.CampaignEntity = CampaignEntity;
|
|
|
104
104
|
__decorate([
|
|
105
105
|
(0, typeorm_1.Column)({
|
|
106
106
|
type: 'set',
|
|
107
|
-
enum:
|
|
107
|
+
enum: shared_1.ProductType,
|
|
108
108
|
default: [],
|
|
109
109
|
nullable: false
|
|
110
110
|
}),
|