@driveup/schema 0.2.2 → 0.2.4
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 +17 -21
- package/lib/catalog/addon/addon.entity.js.map +1 -1
- package/lib/catalog/addon/country.entity.d.ts +4 -3
- package/lib/catalog/addon/country.entity.js +7 -10
- 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 +8 -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 +37 -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 +7 -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 +33 -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 +16 -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 +24 -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 +7 -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 +8 -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 +8 -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 +6 -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 +6 -12
- package/lib/profile/agent/agent.entity.js +23 -34
- 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 +7 -9
- package/lib/profile/agent/payout.entity.js.map +1 -1
- package/lib/profile/agent/promotion.entity.js +3 -4
- package/lib/profile/agent/promotion.entity.js.map +1 -1
- package/lib/profile/company/company.entity.d.ts +8 -6
- package/lib/profile/company/company.entity.js +38 -33
- package/lib/profile/company/company.entity.js.map +1 -1
- package/lib/profile/company/course/appointment.entity.d.ts +11 -6
- package/lib/profile/company/course/appointment.entity.js +42 -28
- package/lib/profile/company/course/appointment.entity.js.map +1 -1
- package/lib/profile/company/course/course.entity.d.ts +22 -4
- package/lib/profile/company/course/course.entity.js +55 -17
- package/lib/profile/company/course/course.entity.js.map +1 -1
- package/lib/profile/company/course/lesson.entity.d.ts +13 -3
- package/lib/profile/company/course/lesson.entity.js +42 -10
- package/lib/profile/company/course/lesson.entity.js.map +1 -1
- package/lib/profile/company/course/topic.entity.d.ts +7 -0
- package/lib/profile/company/course/topic.entity.js +36 -6
- 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 +5 -6
- package/lib/profile/company/finances/billing/bill.entity.js.map +1 -1
- package/lib/profile/company/finances/billing/item.entity.d.ts +2 -2
- package/lib/profile/company/finances/billing/item.entity.js +4 -5
- 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 +3 -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 +9 -12
- package/lib/profile/company/finances/expense/expense.entity.js.map +1 -1
- package/lib/profile/company/finances/handover/handover.entity.js +5 -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 +21 -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 +5 -6
- package/lib/profile/company/finances/invoice/item.entity.js.map +1 -1
- package/lib/profile/company/finances/payment/method.entity.js +5 -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 +23 -16
- package/lib/profile/company/instructor/instructor.entity.js +69 -46
- package/lib/profile/company/instructor/instructor.entity.js.map +1 -1
- package/lib/profile/company/instructor/task.entity.js +3 -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 +3 -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 +6 -7
- package/lib/profile/company/medical/product.entity.js.map +1 -1
- package/lib/profile/company/product/addon.entity.d.ts +7 -8
- package/lib/profile/company/product/addon.entity.js +42 -38
- 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 +10 -5
- package/lib/profile/company/product/priceplan.entity.js.map +1 -1
- package/lib/profile/company/product/product.entity.d.ts +19 -6
- package/lib/profile/company/product/product.entity.js +42 -19
- 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 +5 -6
- package/lib/profile/company/product/vehicle.entity.js.map +1 -1
- package/lib/profile/instructor/instructor.entity.d.ts +4 -12
- package/lib/profile/instructor/instructor.entity.js +15 -31
- 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 +7 -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 +9 -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 +14 -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 +7 -8
- package/lib/profile/student/program/program.entity.js.map +1 -1
- package/lib/profile/student/program/training/appointment.entity.d.ts +6 -8
- package/lib/profile/student/program/training/appointment.entity.js +12 -13
- 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 +10 -12
- package/lib/profile/student/program/training/exam.entity.js.map +1 -1
- package/lib/profile/student/program/training/lesson.entity.js +3 -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 +11 -14
- package/lib/profile/student/program/training/request.entity.js.map +1 -1
- package/lib/profile/student/program/training/topic.entity.js +6 -8
- package/lib/profile/student/program/training/topic.entity.js.map +1 -1
- package/lib/profile/student/program/training/training.entity.d.ts +3 -4
- package/lib/profile/student/program/training/training.entity.js +26 -31
- 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 +12 -14
- package/lib/profile/student/program/training/transaction.entity.js.map +1 -1
- package/lib/profile/student/student.entity.d.ts +4 -11
- package/lib/profile/student/student.entity.js +15 -30
- 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 +7 -9
- package/lib/system/campaign/campaign.entity.js.map +1 -1
- package/lib/system/campaign/gifcode.entity.d.ts +3 -2
- package/lib/system/campaign/gifcode.entity.js +7 -8
- 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 +8 -11
- package/lib/system/country/country.entity.js.map +1 -1
- package/lib/system/currency/currency.entity.js +3 -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 +10 -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 +5 -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 +10 -10
- package/lib/system/event/event.entity.js.map +1 -1
- package/lib/system/event/log.entity.d.ts +13 -12
- package/lib/system/event/log.entity.js +22 -21
- 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 +14 -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 +9 -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 +29 -11
- package/lib/user/alert.entity.js.map +1 -1
- package/lib/user/blocked.entity.js +2 -5
- package/lib/user/blocked.entity.js.map +1 -1
- package/lib/user/device.entity.js +3 -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 +11 -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 +16 -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 +94 -50
- package/lib/user/user.entity.js.map +1 -1
- package/lib/user/verification.entity.js +3 -5
- package/lib/user/verification.entity.js.map +1 -1
- package/lib/utils/activity.helper.d.ts +3 -2
- package/lib/utils/activity.helper.js +9 -9
- 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 +6 -5
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Language, PolicyType, SelectedProfile, StatusType } from '@driveup/shared';
|
|
2
|
+
import { Activity, Alert, Metadata } from '@driveup/common';
|
|
2
3
|
import { UserEntity } from './user.entity';
|
|
3
4
|
import { PolicyEntity } from '../system/policy/policy.entity';
|
|
4
5
|
import { TrackableEntity } from '../utils/trackable';
|
|
@@ -43,7 +44,12 @@ export declare class UserAlertEntity extends TrackableEntity<Alert> {
|
|
|
43
44
|
*/
|
|
44
45
|
profile: SelectedProfile;
|
|
45
46
|
/**
|
|
46
|
-
*
|
|
47
|
+
* Additional metadata related to the alert
|
|
48
|
+
* @example { trainingId: 123, catalogType: 'driving' }
|
|
49
|
+
*/
|
|
50
|
+
metadata: Metadata[];
|
|
51
|
+
/**
|
|
52
|
+
* The date after which the alert must be shown to the user
|
|
47
53
|
*/
|
|
48
54
|
dueDate: Date;
|
|
49
55
|
/**
|
|
@@ -87,6 +93,11 @@ export declare class UserAlertEntity extends TrackableEntity<Alert> {
|
|
|
87
93
|
* @returns Policy model or undefined if no policy is associated
|
|
88
94
|
*/
|
|
89
95
|
toPolicy(lang: Language): Promise<import("@driveup/common").Policy>;
|
|
96
|
+
/**
|
|
97
|
+
* Retrieves the type of the associated policy
|
|
98
|
+
* @returns PolicyType or null if no policy is associated
|
|
99
|
+
*/
|
|
100
|
+
getPolicyType(): Promise<PolicyType>;
|
|
90
101
|
/**
|
|
91
102
|
* Retrieves all activity records for this alert
|
|
92
103
|
* @returns Array of Activity objects
|
package/lib/user/alert.entity.js
CHANGED
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.UserAlertEntity = 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.entity");
|
|
16
17
|
const policy_entity_1 = require("../system/policy/policy.entity");
|
|
@@ -73,17 +74,26 @@ let UserAlertEntity = class UserAlertEntity extends trackable_1.TrackableEntity
|
|
|
73
74
|
return;
|
|
74
75
|
return (await this.policy).toModel(lang);
|
|
75
76
|
}
|
|
77
|
+
/**
|
|
78
|
+
* Retrieves the type of the associated policy
|
|
79
|
+
* @returns PolicyType or null if no policy is associated
|
|
80
|
+
*/
|
|
81
|
+
async getPolicyType() {
|
|
82
|
+
if (!this.policyId)
|
|
83
|
+
return null;
|
|
84
|
+
const policy = await this.policy;
|
|
85
|
+
return policy.type;
|
|
86
|
+
}
|
|
76
87
|
/**
|
|
77
88
|
* Retrieves all activity records for this alert
|
|
78
89
|
* @returns Array of Activity objects
|
|
79
90
|
*/
|
|
80
91
|
async getActivities() {
|
|
81
92
|
const activities = [];
|
|
82
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.
|
|
83
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.
|
|
84
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.
|
|
85
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.
|
|
86
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.approvedOn, common_1.ActivityType.approvedOn));
|
|
93
|
+
activities.push(await (0, activity_helper_1.toActivity)(null, this.createdOn, shared_1.ActivityType.created, staff_entity_1.StaffEntity));
|
|
94
|
+
activities.push(await (0, activity_helper_1.toActivity)(null, this.completedOn, shared_1.ActivityType.completed));
|
|
95
|
+
activities.push(await (0, activity_helper_1.toActivity)(null, this.skippedOn, shared_1.ActivityType.skipped));
|
|
96
|
+
activities.push(await (0, activity_helper_1.toActivity)(null, this.approvedOn, shared_1.ActivityType.approved));
|
|
87
97
|
return activities.filter(a => a);
|
|
88
98
|
}
|
|
89
99
|
};
|
|
@@ -103,13 +113,13 @@ __decorate([
|
|
|
103
113
|
(0, typeorm_1.Column)({
|
|
104
114
|
type: 'enum',
|
|
105
115
|
enum: [
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
116
|
+
shared_1.StatusType.Pending,
|
|
117
|
+
shared_1.StatusType.Completed,
|
|
118
|
+
shared_1.StatusType.Approved,
|
|
119
|
+
shared_1.StatusType.Skipped,
|
|
120
|
+
shared_1.StatusType.Overdate,
|
|
111
121
|
],
|
|
112
|
-
default:
|
|
122
|
+
default: shared_1.StatusType.Pending,
|
|
113
123
|
nullable: false
|
|
114
124
|
}),
|
|
115
125
|
__metadata("design:type", String)
|
|
@@ -137,6 +147,14 @@ __decorate([
|
|
|
137
147
|
}),
|
|
138
148
|
__metadata("design:type", Object)
|
|
139
149
|
], UserAlertEntity.prototype, "profile", void 0);
|
|
150
|
+
__decorate([
|
|
151
|
+
(0, typeorm_1.Column)({
|
|
152
|
+
type: 'simple-json',
|
|
153
|
+
nullable: true,
|
|
154
|
+
default: null
|
|
155
|
+
}),
|
|
156
|
+
__metadata("design:type", Array)
|
|
157
|
+
], UserAlertEntity.prototype, "metadata", void 0);
|
|
140
158
|
__decorate([
|
|
141
159
|
(0, typeorm_1.Column)({ nullable: true, default: null }),
|
|
142
160
|
__metadata("design:type", Date)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alert.entity.js","sourceRoot":"","sources":["../../src/user/alert.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"alert.entity.js","sourceRoot":"","sources":["../../src/user/alert.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.UserBlockedPhoneNumberEntity = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
|
-
const
|
|
14
|
+
const shared_1 = require("@driveup/shared");
|
|
15
15
|
const trackable_1 = require("../utils/trackable");
|
|
16
16
|
const activity_helper_1 = require("../utils/activity.helper");
|
|
17
17
|
/**
|
|
@@ -49,10 +49,7 @@ let UserBlockedPhoneNumberEntity = class UserBlockedPhoneNumberEntity extends tr
|
|
|
49
49
|
*/
|
|
50
50
|
async getActivities() {
|
|
51
51
|
const activities = [];
|
|
52
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.
|
|
53
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, common_1.ActivityType.createdOn));
|
|
54
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, common_1.ActivityType.updatedBy));
|
|
55
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, common_1.ActivityType.updatedOn));
|
|
52
|
+
activities.push(await (0, activity_helper_1.toActivity)(null, this.createdOn, shared_1.ActivityType.created));
|
|
56
53
|
return activities.filter(a => a);
|
|
57
54
|
}
|
|
58
55
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocked.entity.js","sourceRoot":"","sources":["../../src/user/blocked.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"blocked.entity.js","sourceRoot":"","sources":["../../src/user/blocked.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,4CAA+C;AAE/C,kDAAqD;AACrD,8DAAsD;AAEtD;;;;;;GAMG;AAEI,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,2BAAe;IAkBhE;;;OAGG;IACH,YAAY,KAA6C;QACxD,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO;QACN,OAAO;YACN,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;SACjB,CAAA;IACF,CAAC;IAED;;;OAGG;IACH,SAAS;QACR,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,aAAa;QAClB,MAAM,UAAU,GAAe,EAAE,CAAC;QAClC,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,qBAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9E,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACD,CAAA;AAnDY,oEAA4B;AAMxC;IADC,IAAA,gBAAM,GAAE;;2DACK;AAUd;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;8BACK,IAAI;2DAAC;uCAhBA,4BAA4B;IADxC,IAAA,gBAAM,EAAC,yBAAyB,CAAC;;GACrB,4BAA4B,CAmDxC"}
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.UserDeviceEntity = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
14
|
;
|
|
15
|
+
const shared_1 = require("@driveup/shared");
|
|
15
16
|
const common_1 = require("@driveup/common");
|
|
16
17
|
const user_entity_1 = require("./user.entity");
|
|
17
18
|
const trackable_1 = require("../utils/trackable");
|
|
@@ -67,10 +68,8 @@ let UserDeviceEntity = class UserDeviceEntity extends trackable_1.TrackableEntit
|
|
|
67
68
|
*/
|
|
68
69
|
async getActivities() {
|
|
69
70
|
const activities = [];
|
|
70
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
71
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.
|
|
72
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, common_1.ActivityType.updatedBy));
|
|
73
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, common_1.ActivityType.updatedOn));
|
|
71
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, this.createdOn, shared_1.ActivityType.created));
|
|
72
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, this.updatedOn, shared_1.ActivityType.updated));
|
|
74
73
|
return activities.filter(a => a);
|
|
75
74
|
}
|
|
76
75
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.entity.js","sourceRoot":"","sources":["../../src/user/device.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoD;AAAA,CAAC;AACrD,
|
|
1
|
+
{"version":3,"file":"device.entity.js","sourceRoot":"","sources":["../../src/user/device.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoD;AAAA,CAAC;AACrD,4CAA+C;AAC/C,4CAAmD;AACnD,+CAA0C;AAC1C,kDAAqD;AACrD,8DAAsD;AAEtD;;;;;;GAMG;AAEI,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,2BAAuB;IAqF5D;;;OAGG;IACH,YAAY,KAAiC;QAC5C,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,OAAO;QACN,OAAO,IAAI,eAAM,CAAC;YACjB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,WAAW,EAAE,IAAI,CAAC,WAAW;SAC7B,CAAC,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,SAAS;QACR,OAAO,IAAI,eAAM,CAAC;YACjB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;SACzB,CAAC,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,aAAa;QAClB,MAAM,UAAU,GAAe,EAAE,CAAC;QAClC,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,qBAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACxF,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,qBAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACxF,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACD,CAAA;AAvIY,4CAAgB;AAM5B;IADC,IAAA,gBAAM,GAAE;;gDACM;AASf;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;8CACW;AASb;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;mDACgB;AASlB;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;+CACY;AAQd;IAHC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,KAAK;KACf,CAAC;;8CACW;AASb;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;+CACY;AASd;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;4CACS;AASX;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;kDACe;AASjB;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;qDACkB;AAMpB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,wBAAU,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;;8CACxB;2BAnFd,gBAAgB;IAD5B,IAAA,gBAAM,EAAC,aAAa,CAAC;;GACT,gBAAgB,CAuI5B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ColorContext,
|
|
2
|
-
import { Activity,
|
|
1
|
+
import { ColorContext, NotificationChannel, SelectedProfile } from '@driveup/shared';
|
|
2
|
+
import { Activity, Notification, Person } from '@driveup/common';
|
|
3
3
|
import { UserEntity } from './user.entity';
|
|
4
4
|
import { TrackableEntity } from '../utils/trackable';
|
|
5
5
|
/**
|
|
@@ -11,8 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.UserNotificationEntity = 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
16
|
const user_entity_1 = require("./user.entity");
|
|
17
17
|
const trackable_1 = require("../utils/trackable");
|
|
18
18
|
const activity_helper_1 = require("../utils/activity.helper");
|
|
@@ -45,8 +45,8 @@ let UserNotificationEntity = class UserNotificationEntity extends trackable_1.Tr
|
|
|
45
45
|
channel: this.channel,
|
|
46
46
|
seen: this.seen,
|
|
47
47
|
link: this.link,
|
|
48
|
-
author: this.author ?
|
|
49
|
-
target: this.target ?
|
|
48
|
+
author: this.author ? common_1.Person.toInstance(this.author) : null,
|
|
49
|
+
target: this.target ? common_1.Person.toInstance(this.target) : null,
|
|
50
50
|
createdOn: this.createdOn,
|
|
51
51
|
});
|
|
52
52
|
}
|
|
@@ -59,10 +59,8 @@ let UserNotificationEntity = class UserNotificationEntity extends trackable_1.Tr
|
|
|
59
59
|
}
|
|
60
60
|
async getActivities() {
|
|
61
61
|
const activities = [];
|
|
62
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
63
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.
|
|
64
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, common_2.ActivityType.updatedBy));
|
|
65
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, common_2.ActivityType.updatedOn));
|
|
62
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, this.createdOn, shared_1.ActivityType.created));
|
|
63
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, this.updatedOn, shared_1.ActivityType.updated));
|
|
66
64
|
return activities.filter(a => a);
|
|
67
65
|
}
|
|
68
66
|
};
|
|
@@ -88,8 +86,8 @@ __decorate([
|
|
|
88
86
|
__decorate([
|
|
89
87
|
(0, typeorm_1.Column)({
|
|
90
88
|
type: 'enum',
|
|
91
|
-
enum:
|
|
92
|
-
default:
|
|
89
|
+
enum: shared_1.ColorContext,
|
|
90
|
+
default: shared_1.ColorContext.Info,
|
|
93
91
|
nullable: false
|
|
94
92
|
}),
|
|
95
93
|
__metadata("design:type", String)
|
|
@@ -97,8 +95,8 @@ __decorate([
|
|
|
97
95
|
__decorate([
|
|
98
96
|
(0, typeorm_1.Column)({
|
|
99
97
|
type: 'enum',
|
|
100
|
-
enum:
|
|
101
|
-
default:
|
|
98
|
+
enum: shared_1.NotificationChannel,
|
|
99
|
+
default: shared_1.NotificationChannel.App
|
|
102
100
|
}),
|
|
103
101
|
__metadata("design:type", String)
|
|
104
102
|
], UserNotificationEntity.prototype, "channel", void 0);
|
|
@@ -141,7 +139,7 @@ __decorate([
|
|
|
141
139
|
nullable: true,
|
|
142
140
|
default: null
|
|
143
141
|
}),
|
|
144
|
-
__metadata("design:type",
|
|
142
|
+
__metadata("design:type", common_1.Person)
|
|
145
143
|
], UserNotificationEntity.prototype, "author", void 0);
|
|
146
144
|
__decorate([
|
|
147
145
|
(0, typeorm_1.Column)({
|
|
@@ -149,7 +147,7 @@ __decorate([
|
|
|
149
147
|
nullable: true,
|
|
150
148
|
default: null
|
|
151
149
|
}),
|
|
152
|
-
__metadata("design:type",
|
|
150
|
+
__metadata("design:type", common_1.Person)
|
|
153
151
|
], UserNotificationEntity.prototype, "target", void 0);
|
|
154
152
|
__decorate([
|
|
155
153
|
(0, typeorm_1.ManyToOne)(() => user_entity_1.UserEntity, user => user.notifications),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.entity.js","sourceRoot":"","sources":["../../src/user/notification.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"notification.entity.js","sourceRoot":"","sources":["../../src/user/notification.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { PriorityType, TicketType, StatusType } from '@driveup/shared';
|
|
2
|
+
import { Asset, Person, Activity, Ticket } from '@driveup/common';
|
|
3
3
|
import { UserEntity } from './user.entity';
|
|
4
4
|
import { TrackableEntity } from '../utils/trackable';
|
|
5
5
|
/**
|
|
@@ -11,8 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.UserTicketEntity = 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
16
|
const user_entity_1 = require("./user.entity");
|
|
17
17
|
const staff_entity_1 = require("../system/staff/staff.entity");
|
|
18
18
|
const trackable_1 = require("../utils/trackable");
|
|
@@ -40,7 +40,7 @@ let UserTicketEntity = class UserTicketEntity extends trackable_1.TrackableEntit
|
|
|
40
40
|
async toModel() {
|
|
41
41
|
const person = this.userId ? (await user_entity_1.UserEntity.findOneBy({ id: this.userId })).toPerson() : new common_1.Person(this.person);
|
|
42
42
|
const attachments = this.attachments ? this.attachments.map(common_1.Asset.toInstance) : [];
|
|
43
|
-
return new
|
|
43
|
+
return new common_1.Ticket({
|
|
44
44
|
type: this.type,
|
|
45
45
|
status: this.status,
|
|
46
46
|
priority: this.priority,
|
|
@@ -56,7 +56,7 @@ let UserTicketEntity = class UserTicketEntity extends trackable_1.TrackableEntit
|
|
|
56
56
|
*/
|
|
57
57
|
async toSummary() {
|
|
58
58
|
const person = this.userId ? (await user_entity_1.UserEntity.findOneBy({ id: this.userId })).toPerson() : new common_1.Person(this.person);
|
|
59
|
-
return new
|
|
59
|
+
return new common_1.Ticket({
|
|
60
60
|
type: this.type,
|
|
61
61
|
status: this.status,
|
|
62
62
|
priority: this.priority,
|
|
@@ -66,14 +66,10 @@ let UserTicketEntity = class UserTicketEntity extends trackable_1.TrackableEntit
|
|
|
66
66
|
}
|
|
67
67
|
async getActivities() {
|
|
68
68
|
const activities = [];
|
|
69
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
70
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.
|
|
71
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.
|
|
72
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.
|
|
73
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.completedBy, common_2.ActivityType.completedBy, staff_entity_1.StaffEntity));
|
|
74
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.completedOn, common_2.ActivityType.completedOn));
|
|
75
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.canceledBy, common_2.ActivityType.canceledBy, staff_entity_1.StaffEntity));
|
|
76
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.canceledOn, common_2.ActivityType.canceledOn));
|
|
69
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, this.createdOn, shared_1.ActivityType.created));
|
|
70
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, this.updatedOn, shared_1.ActivityType.updated, staff_entity_1.StaffEntity));
|
|
71
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.completedBy, this.completedOn, shared_1.ActivityType.completed, staff_entity_1.StaffEntity));
|
|
72
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.canceledBy, this.canceledOn, shared_1.ActivityType.canceled, staff_entity_1.StaffEntity));
|
|
77
73
|
return activities.filter(a => a);
|
|
78
74
|
}
|
|
79
75
|
};
|
|
@@ -89,8 +85,8 @@ __decorate([
|
|
|
89
85
|
(0, typeorm_1.Column)({
|
|
90
86
|
type: 'enum',
|
|
91
87
|
name: 'ticketType',
|
|
92
|
-
enum:
|
|
93
|
-
default:
|
|
88
|
+
enum: shared_1.TicketType,
|
|
89
|
+
default: shared_1.TicketType.Recovery,
|
|
94
90
|
nullable: false
|
|
95
91
|
}),
|
|
96
92
|
__metadata("design:type", String)
|
|
@@ -98,8 +94,8 @@ __decorate([
|
|
|
98
94
|
__decorate([
|
|
99
95
|
(0, typeorm_1.Column)({
|
|
100
96
|
type: 'enum',
|
|
101
|
-
enum:
|
|
102
|
-
default:
|
|
97
|
+
enum: shared_1.PriorityType,
|
|
98
|
+
default: shared_1.PriorityType.Low,
|
|
103
99
|
nullable: false
|
|
104
100
|
}),
|
|
105
101
|
__metadata("design:type", String)
|
|
@@ -108,12 +104,12 @@ __decorate([
|
|
|
108
104
|
(0, typeorm_1.Column)({
|
|
109
105
|
type: 'enum',
|
|
110
106
|
enum: [
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
107
|
+
shared_1.StatusType.Pending,
|
|
108
|
+
shared_1.StatusType.Progress,
|
|
109
|
+
shared_1.StatusType.Completed,
|
|
110
|
+
shared_1.StatusType.Canceled,
|
|
115
111
|
],
|
|
116
|
-
default:
|
|
112
|
+
default: shared_1.StatusType.Pending,
|
|
117
113
|
nullable: false
|
|
118
114
|
}),
|
|
119
115
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ticket.entity.js","sourceRoot":"","sources":["../../src/user/ticket.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"ticket.entity.js","sourceRoot":"","sources":["../../src/user/ticket.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { EntityManager } from 'typeorm';
|
|
2
|
+
import { AccountStatus, Language, ProfileType, SelectedProfile } from '@driveup/shared';
|
|
3
|
+
import { User, Activity, Address, Person } from '@driveup/common';
|
|
3
4
|
import { CountryEntity } from '../system/country/country.entity';
|
|
4
5
|
import { CompanyEntity } from '../profile/company/company.entity';
|
|
5
6
|
import { InstructorEntity } from '../profile/instructor/instructor.entity';
|
|
@@ -133,6 +134,11 @@ export declare class UserEntity extends TrackableEntity<User> {
|
|
|
133
134
|
* @returns The updated user entity
|
|
134
135
|
*/
|
|
135
136
|
updateActivity(): Promise<UserEntity>;
|
|
137
|
+
/**
|
|
138
|
+
* Check if user last activity is overdated
|
|
139
|
+
* @returns
|
|
140
|
+
*/
|
|
141
|
+
isActivityOverdated(now: Date): boolean;
|
|
136
142
|
/**
|
|
137
143
|
* Retrieves the user's student profile if it exists, excluding closed profiles
|
|
138
144
|
* @returns The student profile or null if not found
|
|
@@ -164,7 +170,7 @@ export declare class UserEntity extends TrackableEntity<User> {
|
|
|
164
170
|
* Checks if the user has at least one active profile (student, agent, or instructor)
|
|
165
171
|
* @returns True if the user has an active profile, false otherwise
|
|
166
172
|
*/
|
|
167
|
-
hasActiveProfile(): Promise<boolean>;
|
|
173
|
+
hasActiveProfile(manager?: EntityManager): Promise<boolean>;
|
|
168
174
|
/**
|
|
169
175
|
* Retrieves the next active profile based on priority (Company > Agent > Student)
|
|
170
176
|
* Used when the user removes their currently selected profile
|
|
@@ -218,16 +224,20 @@ export declare class UserEntity extends TrackableEntity<User> {
|
|
|
218
224
|
/**
|
|
219
225
|
* Get the pending company profile for the user
|
|
220
226
|
*/
|
|
221
|
-
getPendingCompany(): Promise<CompanyEntity>;
|
|
227
|
+
getPendingCompany(manager?: EntityManager): Promise<CompanyEntity>;
|
|
222
228
|
/**
|
|
223
229
|
* Get the pending student profile for the user
|
|
224
230
|
* @param manager EntityManager - optional transaction manager to use in a transaction
|
|
225
231
|
*/
|
|
226
|
-
getPendingStudent(): Promise<StudentEntity>;
|
|
232
|
+
getPendingStudent(manager?: EntityManager): Promise<StudentEntity>;
|
|
227
233
|
/**
|
|
228
234
|
* Get the pending agent profile for the user
|
|
229
235
|
*/
|
|
230
|
-
getPendingAgent(): Promise<AgentEntity>;
|
|
236
|
+
getPendingAgent(manager?: EntityManager): Promise<AgentEntity>;
|
|
237
|
+
/**
|
|
238
|
+
* Delete any pending profiles of the account
|
|
239
|
+
*/
|
|
240
|
+
deletePendingProfiles(): Promise<void>;
|
|
231
241
|
/**
|
|
232
242
|
* Retrieves all tracked activities for this user (creation and update timestamps)
|
|
233
243
|
* @returns Array of Activity objects filtered to exclude null values
|