@driveup/schema 0.2.1 → 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 +6 -3
- package/lib/index.js +6 -3
- package/lib/index.js.map +1 -1
- package/lib/profile/agent/agent.entity.d.ts +25 -2
- package/lib/profile/agent/agent.entity.js +64 -14
- 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 +11 -4
- package/lib/profile/company/company.entity.js +42 -26
- 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 +43 -3
- package/lib/profile/company/instructor/instructor.entity.js +100 -17
- 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 +23 -7
- package/lib/profile/instructor/instructor.entity.js +54 -18
- 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 +22 -1
- package/lib/profile/student/student.entity.js +54 -8
- package/lib/profile/student/student.entity.js.map +1 -1
- package/lib/system/campaign/campaign.entity.d.ts +69 -0
- package/lib/system/campaign/campaign.entity.js +153 -0
- package/lib/system/campaign/campaign.entity.js.map +1 -0
- package/lib/system/campaign/gifcode.entity.d.ts +55 -0
- package/lib/system/campaign/gifcode.entity.js +103 -0
- package/lib/system/campaign/gifcode.entity.js.map +1 -0
- 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 +84 -0
- package/lib/system/event/event.entity.js +137 -0
- package/lib/system/event/event.entity.js.map +1 -0
- package/lib/system/event/log.entity.d.ts +28 -5
- package/lib/system/event/log.entity.js +53 -15
- 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 +7 -5
- 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 +32 -6
- package/lib/user/user.entity.js +141 -47
- 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,8 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CompanyInstructorEntity = 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
|
|
16
|
+
const log_entity_1 = require("../../../system/event/log.entity");
|
|
16
17
|
const company_entity_1 = require("../company.entity");
|
|
17
18
|
const task_entity_1 = require("./task.entity");
|
|
18
19
|
const instructor_entity_1 = require("../../instructor/instructor.entity");
|
|
@@ -25,6 +26,8 @@ const appointment_entity_2 = require("../course/appointment.entity");
|
|
|
25
26
|
const lesson_entity_2 = require("../../student/program/training/lesson.entity");
|
|
26
27
|
const trackable_1 = require("../../../utils/trackable");
|
|
27
28
|
const activity_helper_1 = require("../../../utils/activity.helper");
|
|
29
|
+
const activity_entity_1 = require("./activity.entity");
|
|
30
|
+
const calendar_state_entity_1 = require("./calendar-state.entity");
|
|
28
31
|
let CompanyInstructorEntity = class CompanyInstructorEntity extends trackable_1.TrackableEntity {
|
|
29
32
|
constructor(props) {
|
|
30
33
|
super();
|
|
@@ -37,9 +40,9 @@ let CompanyInstructorEntity = class CompanyInstructorEntity extends trackable_1.
|
|
|
37
40
|
instructor.status = this.status;
|
|
38
41
|
instructor.role = this.role;
|
|
39
42
|
instructor.startedOn = this.startedOn;
|
|
40
|
-
instructor.workingHours = this.workingHours?.map(
|
|
41
|
-
instructor.holidays = this.holidays?.map(
|
|
42
|
-
instructor.preferences = this.preferences?.map(
|
|
43
|
+
instructor.workingHours = this.workingHours?.map(common_1.WorkingHours.toInstance);
|
|
44
|
+
instructor.holidays = this.holidays?.map(common_1.Holiday.toInstance);
|
|
45
|
+
instructor.preferences = this.preferences?.map(common_1.Preference.toInstance);
|
|
43
46
|
return instructor;
|
|
44
47
|
}
|
|
45
48
|
async toSummary() {
|
|
@@ -54,25 +57,73 @@ let CompanyInstructorEntity = class CompanyInstructorEntity extends trackable_1.
|
|
|
54
57
|
const instructor = await this.instructor;
|
|
55
58
|
return await instructor.toPerson();
|
|
56
59
|
}
|
|
60
|
+
async getUser() {
|
|
61
|
+
const instructor = await this.getInstructor();
|
|
62
|
+
return await instructor.user;
|
|
63
|
+
}
|
|
57
64
|
async getInstructor() {
|
|
58
65
|
return await this.instructor;
|
|
59
66
|
}
|
|
60
67
|
async canReinstate() {
|
|
61
68
|
const instructor = await this.getInstructor();
|
|
62
|
-
return this.status ===
|
|
69
|
+
return this.status === shared_1.AccountStatus.Closed && instructor.status === shared_1.AccountStatus.Active;
|
|
63
70
|
}
|
|
64
71
|
async getActivities() {
|
|
65
72
|
const activities = [];
|
|
66
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
67
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
68
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
69
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
70
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.closedBy,
|
|
71
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.closedOn,
|
|
72
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.invitedBy,
|
|
73
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.invitedOn,
|
|
73
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
74
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
75
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
76
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
77
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.closedBy, shared_1.ActivityType.closedBy));
|
|
78
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.closedOn, shared_1.ActivityType.closedOn));
|
|
79
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.invitedBy, shared_1.ActivityType.invitedBy));
|
|
80
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.invitedOn, shared_1.ActivityType.invitedOn));
|
|
74
81
|
return activities.filter(a => a);
|
|
75
82
|
}
|
|
83
|
+
/**
|
|
84
|
+
* Log instructor event
|
|
85
|
+
* @param event Event type
|
|
86
|
+
* @param metadata Content render data (in instructor language)
|
|
87
|
+
* @param entityId Optional related entity ID
|
|
88
|
+
*/
|
|
89
|
+
async log(event, metadata, entityId) {
|
|
90
|
+
if (!this.id)
|
|
91
|
+
return;
|
|
92
|
+
await log_entity_1.LogEntity.from({
|
|
93
|
+
type: shared_1.LogType.Instructor,
|
|
94
|
+
event: event,
|
|
95
|
+
entityId: entityId,
|
|
96
|
+
profile: { type: shared_1.ProfileType.Company, id: this.id },
|
|
97
|
+
content: log_entity_1.LogEntity.toInstructorContent(event, this.language, metadata)
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Log event from authoring perspective.
|
|
102
|
+
* Author logs are used to capture actions taken by the instructor themselves
|
|
103
|
+
* @param event Event type
|
|
104
|
+
* @param metadata Content render data (in instructor language)
|
|
105
|
+
* @param entityId Optional related entity ID
|
|
106
|
+
*/
|
|
107
|
+
async logAsAuthor(event, metadata, entityId) {
|
|
108
|
+
if (!this.id)
|
|
109
|
+
return;
|
|
110
|
+
await log_entity_1.LogEntity.from({
|
|
111
|
+
type: shared_1.LogType.Instructor,
|
|
112
|
+
event: event,
|
|
113
|
+
entityId: entityId,
|
|
114
|
+
profile: { type: shared_1.ProfileType.Company, id: this.id },
|
|
115
|
+
content: log_entity_1.LogEntity.toAuthorContent(event, this.language, metadata)
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* Retrieves notification preferences as typed Preference instances
|
|
120
|
+
* @returns Array of Preference objects or undefined if not set
|
|
121
|
+
*/
|
|
122
|
+
getPreferences() {
|
|
123
|
+
if (!this.preferences)
|
|
124
|
+
return;
|
|
125
|
+
return this.preferences.map(common_1.Preference.toInstance);
|
|
126
|
+
}
|
|
76
127
|
};
|
|
77
128
|
exports.CompanyInstructorEntity = CompanyInstructorEntity;
|
|
78
129
|
__decorate([
|
|
@@ -86,8 +137,8 @@ __decorate([
|
|
|
86
137
|
__decorate([
|
|
87
138
|
(0, typeorm_1.Column)({
|
|
88
139
|
type: 'enum',
|
|
89
|
-
enum:
|
|
90
|
-
default:
|
|
140
|
+
enum: shared_1.AccountStatus,
|
|
141
|
+
default: shared_1.AccountStatus.Invited,
|
|
91
142
|
nullable: false
|
|
92
143
|
}),
|
|
93
144
|
__metadata("design:type", String)
|
|
@@ -95,12 +146,21 @@ __decorate([
|
|
|
95
146
|
__decorate([
|
|
96
147
|
(0, typeorm_1.Column)({
|
|
97
148
|
type: 'enum',
|
|
98
|
-
enum:
|
|
99
|
-
default:
|
|
149
|
+
enum: shared_1.Role,
|
|
150
|
+
default: shared_1.Role.Instructor,
|
|
100
151
|
nullable: false
|
|
101
152
|
}),
|
|
102
153
|
__metadata("design:type", String)
|
|
103
154
|
], CompanyInstructorEntity.prototype, "role", void 0);
|
|
155
|
+
__decorate([
|
|
156
|
+
(0, typeorm_1.Column)({
|
|
157
|
+
type: 'enum',
|
|
158
|
+
enum: shared_1.Language,
|
|
159
|
+
default: shared_1.Language.En,
|
|
160
|
+
nullable: true
|
|
161
|
+
}),
|
|
162
|
+
__metadata("design:type", String)
|
|
163
|
+
], CompanyInstructorEntity.prototype, "language", void 0);
|
|
104
164
|
__decorate([
|
|
105
165
|
(0, typeorm_1.Column)({
|
|
106
166
|
type: 'simple-json',
|
|
@@ -125,6 +185,21 @@ __decorate([
|
|
|
125
185
|
}),
|
|
126
186
|
__metadata("design:type", Array)
|
|
127
187
|
], CompanyInstructorEntity.prototype, "preferences", void 0);
|
|
188
|
+
__decorate([
|
|
189
|
+
(0, typeorm_1.Column)({
|
|
190
|
+
type: 'json',
|
|
191
|
+
nullable: true,
|
|
192
|
+
default: null
|
|
193
|
+
}),
|
|
194
|
+
__metadata("design:type", Array)
|
|
195
|
+
], CompanyInstructorEntity.prototype, "metadata", void 0);
|
|
196
|
+
__decorate([
|
|
197
|
+
(0, typeorm_1.Column)({
|
|
198
|
+
type: 'json',
|
|
199
|
+
nullable: true
|
|
200
|
+
}),
|
|
201
|
+
__metadata("design:type", Array)
|
|
202
|
+
], CompanyInstructorEntity.prototype, "calendarLinks", void 0);
|
|
128
203
|
__decorate([
|
|
129
204
|
(0, typeorm_1.Column)({ nullable: true, default: null }),
|
|
130
205
|
__metadata("design:type", Date)
|
|
@@ -185,6 +260,14 @@ __decorate([
|
|
|
185
260
|
(0, typeorm_1.OneToMany)(() => task_entity_1.CompanyInstructorTaskEntity, task => task.instructor),
|
|
186
261
|
__metadata("design:type", Promise)
|
|
187
262
|
], CompanyInstructorEntity.prototype, "tasks", void 0);
|
|
263
|
+
__decorate([
|
|
264
|
+
(0, typeorm_1.OneToMany)(() => activity_entity_1.CompanyInstructorActivityEntity, activity => activity.instructor),
|
|
265
|
+
__metadata("design:type", Promise)
|
|
266
|
+
], CompanyInstructorEntity.prototype, "activities", void 0);
|
|
267
|
+
__decorate([
|
|
268
|
+
(0, typeorm_1.OneToMany)(() => calendar_state_entity_1.InstructorSharedCalendarStateEntity, state => state.instructor),
|
|
269
|
+
__metadata("design:type", Promise)
|
|
270
|
+
], CompanyInstructorEntity.prototype, "sharedCalendarStates", void 0);
|
|
188
271
|
exports.CompanyInstructorEntity = CompanyInstructorEntity = __decorate([
|
|
189
272
|
(0, typeorm_1.Entity)('companyInstructors'),
|
|
190
273
|
__metadata("design:paramtypes", [Object])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instructor.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/instructor/instructor.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"instructor.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/instructor/instructor.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.CompanyInstructorTaskEntity = 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 instructor_entity_1 = require("./instructor.entity");
|
|
16
17
|
const trackable_1 = require("../../../utils/trackable");
|
|
@@ -51,10 +52,10 @@ let CompanyInstructorTaskEntity = class CompanyInstructorTaskEntity extends trac
|
|
|
51
52
|
}
|
|
52
53
|
async getActivities() {
|
|
53
54
|
const activities = [];
|
|
54
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
55
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
56
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
57
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
55
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
56
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
57
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
58
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
58
59
|
return activities.filter(a => a);
|
|
59
60
|
}
|
|
60
61
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/instructor/task.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoD;AACpD,4CAA+
|
|
1
|
+
{"version":3,"file":"task.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/instructor/task.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoD;AACpD,4CAA+C;AAC/C,4CAAiD;AACjD,2DAA8D;AAC9D,wDAA2D;AAC3D,oEAA4D;AAE5D;;;;;;GAMG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,2BAAqB;IAsDrE;;;OAGG;IACH,YAAY,KAA4C;QACvD,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,OAAO;QACN,OAAO,IAAI,aAAI,CAAC;YACf,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SACf,CAAC,CAAC;IACJ,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,aAAa;QAClB,MAAM,UAAU,GAAe,EAAE,CAAC;QAClC,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,CAAC,SAAS,EAAE,qBAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1E,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,CAAC,SAAS,EAAE,qBAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1E,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,CAAC,SAAS,EAAE,qBAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1E,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,CAAC,SAAS,EAAE,qBAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1E,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACD,CAAA;AA3FY,kEAA2B;AAMvC;IADC,IAAA,gBAAM,GAAE;;iEACY;AAMrB;IADC,IAAA,gBAAM,GAAE;;0DACK;AAMd;IADC,IAAA,gBAAM,GAAE;8BACE,IAAI;8DAAC;AAMhB;IADC,IAAA,gBAAM,GAAE;8BACA,IAAI;4DAAC;AAOd;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;2DACX;AAQhB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;yDACZ;AAOd;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;yDACb;AAMd;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,2CAAuB,EAAE,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC;;+DAC5B;sCApDjC,2BAA2B;IADvC,IAAA,gBAAM,EAAC,wBAAwB,CAAC;;GACpB,2BAA2B,CA2FvC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { WeekDay } from '@driveup/shared';
|
|
2
|
+
import { Activity, MedicalExamination, Person } from '@driveup/common';
|
|
2
3
|
import { CompanyMedicalProductEntity } from './product.entity';
|
|
3
4
|
import { StudentMedicalExaminationEntity } from '../../student/program/medical/examination.entity';
|
|
4
5
|
import { TrackableEntity } from '../../../utils/trackable';
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CompanyMedicalExaminationEntity = 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 product_entity_1 = require("./product.entity");
|
|
16
17
|
const examination_entity_1 = require("../../student/program/medical/examination.entity");
|
|
@@ -40,10 +41,10 @@ let CompanyMedicalExaminationEntity = class CompanyMedicalExaminationEntity exte
|
|
|
40
41
|
}
|
|
41
42
|
async getActivities() {
|
|
42
43
|
const activities = [];
|
|
43
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
44
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
45
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
46
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
44
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
45
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
46
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
47
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
47
48
|
return activities.filter(a => a);
|
|
48
49
|
}
|
|
49
50
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examination.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/medical/examination.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"examination.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/medical/examination.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { AddonType, ProductStatus } from '@driveup/shared';
|
|
2
|
+
import { Activity, Address, AddonUsage } from '@driveup/common';
|
|
3
|
+
import { MedicalProduct, Picture, Person } from '@driveup/common';
|
|
3
4
|
import { CompanyProductEntity } from '../product/product.entity';
|
|
4
5
|
import { DrivingCategoryEntity } from '../../../system/driving/category.entity';
|
|
5
6
|
import { CompanyMedicalExaminationEntity } from './examination.entity';
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CompanyMedicalProductEntity = 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 common_2 = require("@driveup/common");
|
|
16
17
|
const product_entity_1 = require("../product/product.entity");
|
|
@@ -42,7 +43,7 @@ let CompanyMedicalProductEntity = class CompanyMedicalProductEntity extends trac
|
|
|
42
43
|
return this.toModel();
|
|
43
44
|
}
|
|
44
45
|
async canPurchase() {
|
|
45
|
-
if (this.status !==
|
|
46
|
+
if (this.status !== shared_1.ProductStatus.Active)
|
|
46
47
|
return;
|
|
47
48
|
const product = await this.product;
|
|
48
49
|
return product.canPurchase();
|
|
@@ -58,10 +59,10 @@ let CompanyMedicalProductEntity = class CompanyMedicalProductEntity extends trac
|
|
|
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
|
};
|
|
@@ -80,8 +81,8 @@ __decorate([
|
|
|
80
81
|
__decorate([
|
|
81
82
|
(0, typeorm_1.Column)({
|
|
82
83
|
type: 'enum',
|
|
83
|
-
enum:
|
|
84
|
-
default:
|
|
84
|
+
enum: shared_1.ProductStatus,
|
|
85
|
+
default: shared_1.ProductStatus.Inactive,
|
|
85
86
|
nullable: false
|
|
86
87
|
}),
|
|
87
88
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/medical/product.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"product.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/medical/product.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.CompanyProductAddonEntity = 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 staff_entity_1 = require("../../../system/staff/staff.entity");
|
|
16
17
|
const product_entity_1 = require("./product.entity");
|
|
@@ -43,16 +44,16 @@ let CompanyProductAddonEntity = class CompanyProductAddonEntity extends trackabl
|
|
|
43
44
|
}
|
|
44
45
|
async getActivities() {
|
|
45
46
|
const activities = [];
|
|
46
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
47
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
48
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
49
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
50
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.enabledBy,
|
|
51
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.enabledOn,
|
|
52
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.disabledBy,
|
|
53
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.disabledOn,
|
|
54
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.blockedBy,
|
|
55
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.blockedOn,
|
|
47
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
48
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
49
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
50
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
51
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.enabledBy, shared_1.ActivityType.enabledBy, staff_entity_1.StaffEntity));
|
|
52
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.enabledOn, shared_1.ActivityType.enabledOn));
|
|
53
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.disabledBy, shared_1.ActivityType.disabledBy, staff_entity_1.StaffEntity));
|
|
54
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.disabledOn, shared_1.ActivityType.disabledOn));
|
|
55
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.blockedBy, shared_1.ActivityType.blockedBy, staff_entity_1.StaffEntity));
|
|
56
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.blockedOn, shared_1.ActivityType.blockedOn));
|
|
56
57
|
return activities.filter(a => a);
|
|
57
58
|
}
|
|
58
59
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addon.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/product/addon.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"addon.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/product/addon.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Language } from '@driveup/shared';
|
|
2
|
+
import { Activity, PricePlan } from '@driveup/common';
|
|
2
3
|
import { CompanyProductEntity } from './product.entity';
|
|
3
4
|
import { ProductPricePlanEntity } from '../../../catalog/product/priceplan.entity';
|
|
4
5
|
import { CompanyPaymentMethodEntity } from '../finances/payment/method.entity';
|
|
@@ -13,6 +14,10 @@ export declare class CompanyProductPricePlanEntity extends TrackableEntity<Price
|
|
|
13
14
|
*/
|
|
14
15
|
pricePlanId: number;
|
|
15
16
|
paymentMethodId: number;
|
|
17
|
+
/**
|
|
18
|
+
* Weather or not this is the current price plan for the company product
|
|
19
|
+
*/
|
|
20
|
+
active: boolean;
|
|
16
21
|
/**
|
|
17
22
|
* Product price
|
|
18
23
|
* Can be managed by driveup console and customized per company
|
|
@@ -42,7 +47,7 @@ export declare class CompanyProductPricePlanEntity extends TrackableEntity<Price
|
|
|
42
47
|
*/
|
|
43
48
|
pricePlan: Promise<ProductPricePlanEntity>;
|
|
44
49
|
/**
|
|
45
|
-
* Current product price plan
|
|
50
|
+
* Current product price plan (the company product for which, THIS is the current price plan)
|
|
46
51
|
*/
|
|
47
52
|
currentPricePlan: Promise<CompanyProductEntity>;
|
|
48
53
|
/**
|
|
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CompanyProductPricePlanEntity = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
|
-
const
|
|
14
|
+
const shared_1 = require("@driveup/shared");
|
|
15
15
|
const product_entity_1 = require("./product.entity");
|
|
16
16
|
const priceplan_entity_1 = require("../../../catalog/product/priceplan.entity");
|
|
17
17
|
const method_entity_1 = require("../finances/payment/method.entity");
|
|
@@ -42,10 +42,10 @@ let CompanyProductPricePlanEntity = class CompanyProductPricePlanEntity extends
|
|
|
42
42
|
}
|
|
43
43
|
async getActivities() {
|
|
44
44
|
const activities = [];
|
|
45
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
46
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
47
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
48
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
45
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
46
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
47
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
48
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
49
49
|
return activities.filter(a => a);
|
|
50
50
|
}
|
|
51
51
|
};
|
|
@@ -65,6 +65,13 @@ __decorate([
|
|
|
65
65
|
}),
|
|
66
66
|
__metadata("design:type", Number)
|
|
67
67
|
], CompanyProductPricePlanEntity.prototype, "paymentMethodId", void 0);
|
|
68
|
+
__decorate([
|
|
69
|
+
(0, typeorm_1.Column)({
|
|
70
|
+
nullable: false,
|
|
71
|
+
default: false
|
|
72
|
+
}),
|
|
73
|
+
__metadata("design:type", Boolean)
|
|
74
|
+
], CompanyProductPricePlanEntity.prototype, "active", void 0);
|
|
68
75
|
__decorate([
|
|
69
76
|
(0, typeorm_1.Column)({
|
|
70
77
|
type: 'decimal',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"priceplan.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/product/priceplan.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"priceplan.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/product/priceplan.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { ProductStatus
|
|
1
|
+
import { ProductStatus } from '@driveup/shared';
|
|
2
|
+
import { Activity, Product } from '@driveup/common';
|
|
2
3
|
import { CompanyEntity } from '../company.entity';
|
|
3
|
-
import {
|
|
4
|
+
import { CountryProductEntity } from '../../../catalog/product/country.entity';
|
|
4
5
|
import { CompanyProductPricePlanEntity } from './priceplan.entity';
|
|
5
6
|
import { CompanyCourseEntity } from '../course/course.entity';
|
|
6
7
|
import { CompanyProductVehicleEntity } from './vehicle.entity';
|
|
@@ -16,6 +17,10 @@ export declare class CompanyProductEntity extends TrackableEntity<Product> {
|
|
|
16
17
|
* Driveup country product
|
|
17
18
|
*/
|
|
18
19
|
productId: number;
|
|
20
|
+
/**
|
|
21
|
+
* CompanyProductPricePlanEntity id of the currently active price plan for this product
|
|
22
|
+
*/
|
|
23
|
+
pricePlanId: number;
|
|
19
24
|
/**
|
|
20
25
|
* Company product status
|
|
21
26
|
* Examples: Active, Inactive, Suspended, Archived
|
|
@@ -23,6 +28,8 @@ export declare class CompanyProductEntity extends TrackableEntity<Product> {
|
|
|
23
28
|
status: ProductStatus;
|
|
24
29
|
/**
|
|
25
30
|
* Company product name
|
|
31
|
+
*
|
|
32
|
+
* @example "Car Driving" | "Eye Examination"
|
|
26
33
|
*/
|
|
27
34
|
title: string;
|
|
28
35
|
/**
|
|
@@ -38,7 +45,7 @@ export declare class CompanyProductEntity extends TrackableEntity<Product> {
|
|
|
38
45
|
*/
|
|
39
46
|
credit: number;
|
|
40
47
|
/**
|
|
41
|
-
* Indicates if start credit has been
|
|
48
|
+
* Indicates if start credit has been received by the company for this product
|
|
42
49
|
*/
|
|
43
50
|
startCreditUsed: boolean;
|
|
44
51
|
/**
|
|
@@ -120,7 +127,7 @@ export declare class CompanyProductEntity extends TrackableEntity<Product> {
|
|
|
120
127
|
/**
|
|
121
128
|
* Driveup product country relation
|
|
122
129
|
*/
|
|
123
|
-
product: Promise<
|
|
130
|
+
product: Promise<CountryProductEntity>;
|
|
124
131
|
/**
|
|
125
132
|
* All product price plans
|
|
126
133
|
* The company can switch any time between different price plans
|