@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
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.CompanyInvoiceItemEntity = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
14
|
const invoice_entity_1 = require("./invoice.entity");
|
|
15
|
+
const shared_1 = require("@driveup/shared");
|
|
15
16
|
const common_1 = require("@driveup/common");
|
|
16
17
|
const trackable_1 = require("../../../../utils/trackable");
|
|
17
18
|
const activity_helper_1 = require("../../../../utils/activity.helper");
|
|
@@ -36,10 +37,10 @@ let CompanyInvoiceItemEntity = class CompanyInvoiceItemEntity extends trackable_
|
|
|
36
37
|
}
|
|
37
38
|
async getActivities() {
|
|
38
39
|
const activities = [];
|
|
39
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
40
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
41
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
42
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
40
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
41
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
42
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
43
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
43
44
|
return activities.filter(a => a);
|
|
44
45
|
}
|
|
45
46
|
};
|
|
@@ -109,8 +110,8 @@ __decorate([
|
|
|
109
110
|
__decorate([
|
|
110
111
|
(0, typeorm_1.Column)({
|
|
111
112
|
type: 'enum',
|
|
112
|
-
enum:
|
|
113
|
-
default:
|
|
113
|
+
enum: shared_1.ProductType,
|
|
114
|
+
default: shared_1.ProductType.DrivingCar,
|
|
114
115
|
nullable: true,
|
|
115
116
|
}),
|
|
116
117
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"item.entity.js","sourceRoot":"","sources":["../../../../../src/profile/company/finances/invoice/item.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoD;AACpD,qDAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"item.entity.js","sourceRoot":"","sources":["../../../../../src/profile/company/finances/invoice/item.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.CompanyPaymentMethodEntity = 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 company_entity_1 = require("../../company.entity");
|
|
16
17
|
const transaction_entity_1 = require("../billing/transaction.entity");
|
|
@@ -41,16 +42,16 @@ let CompanyPaymentMethodEntity = class CompanyPaymentMethodEntity extends tracka
|
|
|
41
42
|
.createQueryBuilder('t')
|
|
42
43
|
.leftJoinAndSelect('t.bill', 'bill')
|
|
43
44
|
.where('t.paymentMethodId = :id', { id: this.id })
|
|
44
|
-
.andWhere('t.status = :status', { status:
|
|
45
|
-
.andWhere('bill.status = :billStatus', { billStatus:
|
|
45
|
+
.andWhere('t.status = :status', { status: shared_1.StatusType.Failed })
|
|
46
|
+
.andWhere('bill.status = :billStatus', { billStatus: shared_1.BillStatus.Unpaid })
|
|
46
47
|
.getMany();
|
|
47
48
|
}
|
|
48
49
|
async getActivities() {
|
|
49
50
|
const activities = [];
|
|
50
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
51
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
52
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
53
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
51
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, shared_1.ActivityType.createdBy));
|
|
52
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn, shared_1.ActivityType.createdOn));
|
|
53
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, shared_1.ActivityType.updatedBy));
|
|
54
|
+
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn, shared_1.ActivityType.updatedOn));
|
|
54
55
|
return activities.filter(a => a);
|
|
55
56
|
}
|
|
56
57
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method.entity.js","sourceRoot":"","sources":["../../../../../src/profile/company/finances/payment/method.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"method.entity.js","sourceRoot":"","sources":["../../../../../src/profile/company/finances/payment/method.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { CompanyInstructorEntity } from "./instructor.entity";
|
|
2
|
+
export declare class CompanyInstructorActivityEntity {
|
|
3
|
+
/**
|
|
4
|
+
* Primary key - auto-generated sequential ID
|
|
5
|
+
*/
|
|
6
|
+
id: number;
|
|
7
|
+
/**
|
|
8
|
+
* The date when the entry was created
|
|
9
|
+
*/
|
|
10
|
+
createdOn: Date;
|
|
11
|
+
/**
|
|
12
|
+
* Company instructor id related to the activity
|
|
13
|
+
*/
|
|
14
|
+
instructorId: number;
|
|
15
|
+
/**
|
|
16
|
+
* Business event associated with the activity.
|
|
17
|
+
* - Use with the related enums (InstructorAccountEvents, InstructorProfileEvents, etc.)
|
|
18
|
+
*/
|
|
19
|
+
event: string;
|
|
20
|
+
/**
|
|
21
|
+
* The date of the activity
|
|
22
|
+
*/
|
|
23
|
+
date: Date;
|
|
24
|
+
/**
|
|
25
|
+
* ID of the company instructor who submitted the activity
|
|
26
|
+
*/
|
|
27
|
+
submittedBy: number;
|
|
28
|
+
/**
|
|
29
|
+
* Related company instructor of the activity
|
|
30
|
+
*/
|
|
31
|
+
instructor: Promise<CompanyInstructorEntity>;
|
|
32
|
+
constructor(props?: Partial<CompanyInstructorActivityEntity>);
|
|
33
|
+
}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.CompanyInstructorActivityEntity = void 0;
|
|
13
|
+
const typeorm_1 = require("typeorm");
|
|
14
|
+
const instructor_entity_1 = require("./instructor.entity");
|
|
15
|
+
let CompanyInstructorActivityEntity = class CompanyInstructorActivityEntity {
|
|
16
|
+
constructor(props) {
|
|
17
|
+
Object.assign(this, props);
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
exports.CompanyInstructorActivityEntity = CompanyInstructorActivityEntity;
|
|
21
|
+
__decorate([
|
|
22
|
+
(0, typeorm_1.PrimaryGeneratedColumn)(),
|
|
23
|
+
__metadata("design:type", Number)
|
|
24
|
+
], CompanyInstructorActivityEntity.prototype, "id", void 0);
|
|
25
|
+
__decorate([
|
|
26
|
+
(0, typeorm_1.CreateDateColumn)(),
|
|
27
|
+
__metadata("design:type", Date)
|
|
28
|
+
], CompanyInstructorActivityEntity.prototype, "createdOn", void 0);
|
|
29
|
+
__decorate([
|
|
30
|
+
(0, typeorm_1.Column)(),
|
|
31
|
+
__metadata("design:type", Number)
|
|
32
|
+
], CompanyInstructorActivityEntity.prototype, "instructorId", void 0);
|
|
33
|
+
__decorate([
|
|
34
|
+
(0, typeorm_1.Column)(),
|
|
35
|
+
__metadata("design:type", String)
|
|
36
|
+
], CompanyInstructorActivityEntity.prototype, "event", void 0);
|
|
37
|
+
__decorate([
|
|
38
|
+
(0, typeorm_1.Column)(),
|
|
39
|
+
__metadata("design:type", Date)
|
|
40
|
+
], CompanyInstructorActivityEntity.prototype, "date", void 0);
|
|
41
|
+
__decorate([
|
|
42
|
+
(0, typeorm_1.Column)(),
|
|
43
|
+
__metadata("design:type", Number)
|
|
44
|
+
], CompanyInstructorActivityEntity.prototype, "submittedBy", void 0);
|
|
45
|
+
__decorate([
|
|
46
|
+
(0, typeorm_1.ManyToOne)(() => instructor_entity_1.CompanyInstructorEntity, instructor => instructor.activities),
|
|
47
|
+
__metadata("design:type", Promise)
|
|
48
|
+
], CompanyInstructorActivityEntity.prototype, "instructor", void 0);
|
|
49
|
+
exports.CompanyInstructorActivityEntity = CompanyInstructorActivityEntity = __decorate([
|
|
50
|
+
(0, typeorm_1.Entity)('companyInstructorActivities'),
|
|
51
|
+
__metadata("design:paramtypes", [Object])
|
|
52
|
+
], CompanyInstructorActivityEntity);
|
|
53
|
+
//# sourceMappingURL=activity.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"activity.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/instructor/activity.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA8F;AAC9F,2DAA8D;AAGvD,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IA6C3C,YAAY,KAAgD;QAC3D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACD,CAAA;AAhDY,0EAA+B;AAM3C;IADC,IAAA,gCAAsB,GAAE;;2DACd;AAMX;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;kEAAC;AAMhB;IADC,IAAA,gBAAM,GAAE;;qEACY;AAOrB;IADC,IAAA,gBAAM,GAAE;;8DACK;AAMd;IADC,IAAA,gBAAM,GAAE;8BACH,IAAI;6DAAC;AAMX;IADC,IAAA,gBAAM,GAAE;;oEACW;AAMpB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,2CAAuB,EAAE,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;;mEACjC;0CA3CjC,+BAA+B;IAD3C,IAAA,gBAAM,EAAC,6BAA6B,CAAC;;GACzB,+BAA+B,CAgD3C"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { CompanyInstructorEntity } from './instructor.entity';
|
|
2
|
+
/**
|
|
3
|
+
* Instructor Shared Calendar State Entity
|
|
4
|
+
* - Represents the state of an instructor's shared calendar (busy/public)
|
|
5
|
+
* - Contains information about which appointments are active and which have been canceled
|
|
6
|
+
*/
|
|
7
|
+
export declare class InstructorSharedCalendarStateEntity {
|
|
8
|
+
/**
|
|
9
|
+
* Primary key - auto-generated sequential ID
|
|
10
|
+
*/
|
|
11
|
+
id: number;
|
|
12
|
+
/**
|
|
13
|
+
* Timestamp when the entity was created
|
|
14
|
+
* Automatically set by TypeORM
|
|
15
|
+
*/
|
|
16
|
+
createdOn: Date;
|
|
17
|
+
/**
|
|
18
|
+
* Timestamp when the entity was last updated
|
|
19
|
+
* Automatically updated by TypeORM
|
|
20
|
+
*/
|
|
21
|
+
updatedOn: Date;
|
|
22
|
+
/**
|
|
23
|
+
* Timestamp when the entity was soft-deleted
|
|
24
|
+
* When set, the entity is excluded from normal queries
|
|
25
|
+
*/
|
|
26
|
+
deletedOn: Date;
|
|
27
|
+
/**
|
|
28
|
+
* Unique identifier for this calendar state entry
|
|
29
|
+
* - generated as a UUID
|
|
30
|
+
* - Is used in the calendar sharing URLs to identify the specific calendar state (calendar link : `api.com/shared/calendar/instructor/{this.uid}`)
|
|
31
|
+
*/
|
|
32
|
+
uid: string;
|
|
33
|
+
/**
|
|
34
|
+
* Whether or not the titles and details of appointments are visible to the public
|
|
35
|
+
* - true: titles and details are visible
|
|
36
|
+
* - false: titles and details are hidden
|
|
37
|
+
*/
|
|
38
|
+
public: boolean;
|
|
39
|
+
/**
|
|
40
|
+
* Instructor ID
|
|
41
|
+
* - references UserEntity.id
|
|
42
|
+
* - Each will have two entries, one for busy state and one for public state
|
|
43
|
+
*/
|
|
44
|
+
instructorId: number;
|
|
45
|
+
/**
|
|
46
|
+
* UIDs of appointments currently considered ACTIVE
|
|
47
|
+
* - the keys are the UIDs, the values are objects with startDate and endDate as ISO strings
|
|
48
|
+
*/
|
|
49
|
+
activeUids: Record<string, {
|
|
50
|
+
startDate: string;
|
|
51
|
+
endDate: string;
|
|
52
|
+
}>;
|
|
53
|
+
/**
|
|
54
|
+
* Tombstones: uid -> ISO timestamp when cancelled
|
|
55
|
+
* - the keys are the UIDs of cancelled appointments
|
|
56
|
+
* - the startDate and endDate fields are ISO strings representing the original start and end dates of the cancelled appointment
|
|
57
|
+
*/
|
|
58
|
+
canceledUids: Record<string, {
|
|
59
|
+
startDate: string;
|
|
60
|
+
endDate: string;
|
|
61
|
+
canceledOn: string;
|
|
62
|
+
}>;
|
|
63
|
+
/************************* Relations *************************/
|
|
64
|
+
instructor: Promise<CompanyInstructorEntity>;
|
|
65
|
+
/************************* Methods *************************/
|
|
66
|
+
constructor(props?: Partial<InstructorSharedCalendarStateEntity>);
|
|
67
|
+
}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.InstructorSharedCalendarStateEntity = void 0;
|
|
13
|
+
const typeorm_1 = require("typeorm");
|
|
14
|
+
const typeorm_2 = require("typeorm");
|
|
15
|
+
const instructor_entity_1 = require("./instructor.entity");
|
|
16
|
+
/**
|
|
17
|
+
* Instructor Shared Calendar State Entity
|
|
18
|
+
* - Represents the state of an instructor's shared calendar (busy/public)
|
|
19
|
+
* - Contains information about which appointments are active and which have been canceled
|
|
20
|
+
*/
|
|
21
|
+
let InstructorSharedCalendarStateEntity = class InstructorSharedCalendarStateEntity {
|
|
22
|
+
/************************* Methods *************************/
|
|
23
|
+
constructor(props) {
|
|
24
|
+
Object.assign(this, props);
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
exports.InstructorSharedCalendarStateEntity = InstructorSharedCalendarStateEntity;
|
|
28
|
+
__decorate([
|
|
29
|
+
(0, typeorm_1.PrimaryGeneratedColumn)(),
|
|
30
|
+
__metadata("design:type", Number)
|
|
31
|
+
], InstructorSharedCalendarStateEntity.prototype, "id", void 0);
|
|
32
|
+
__decorate([
|
|
33
|
+
(0, typeorm_2.CreateDateColumn)({ nullable: true, default: null }),
|
|
34
|
+
__metadata("design:type", Date)
|
|
35
|
+
], InstructorSharedCalendarStateEntity.prototype, "createdOn", void 0);
|
|
36
|
+
__decorate([
|
|
37
|
+
(0, typeorm_2.UpdateDateColumn)({ nullable: true, default: null }),
|
|
38
|
+
__metadata("design:type", Date)
|
|
39
|
+
], InstructorSharedCalendarStateEntity.prototype, "updatedOn", void 0);
|
|
40
|
+
__decorate([
|
|
41
|
+
(0, typeorm_2.DeleteDateColumn)({ nullable: true, default: null }),
|
|
42
|
+
__metadata("design:type", Date)
|
|
43
|
+
], InstructorSharedCalendarStateEntity.prototype, "deletedOn", void 0);
|
|
44
|
+
__decorate([
|
|
45
|
+
(0, typeorm_1.Column)(),
|
|
46
|
+
(0, typeorm_1.Generated)('uuid'),
|
|
47
|
+
__metadata("design:type", String)
|
|
48
|
+
], InstructorSharedCalendarStateEntity.prototype, "uid", void 0);
|
|
49
|
+
__decorate([
|
|
50
|
+
(0, typeorm_1.Column)({ nullable: false }),
|
|
51
|
+
__metadata("design:type", Boolean)
|
|
52
|
+
], InstructorSharedCalendarStateEntity.prototype, "public", void 0);
|
|
53
|
+
__decorate([
|
|
54
|
+
(0, typeorm_1.Column)({
|
|
55
|
+
nullable: false
|
|
56
|
+
}),
|
|
57
|
+
__metadata("design:type", Number)
|
|
58
|
+
], InstructorSharedCalendarStateEntity.prototype, "instructorId", void 0);
|
|
59
|
+
__decorate([
|
|
60
|
+
(0, typeorm_1.Column)({ type: 'json' }),
|
|
61
|
+
__metadata("design:type", Object)
|
|
62
|
+
], InstructorSharedCalendarStateEntity.prototype, "activeUids", void 0);
|
|
63
|
+
__decorate([
|
|
64
|
+
(0, typeorm_1.Column)({ type: 'json' }),
|
|
65
|
+
__metadata("design:type", Object)
|
|
66
|
+
], InstructorSharedCalendarStateEntity.prototype, "canceledUids", void 0);
|
|
67
|
+
__decorate([
|
|
68
|
+
(0, typeorm_1.ManyToOne)(() => instructor_entity_1.CompanyInstructorEntity, instructor => instructor.sharedCalendarStates),
|
|
69
|
+
__metadata("design:type", Promise)
|
|
70
|
+
], InstructorSharedCalendarStateEntity.prototype, "instructor", void 0);
|
|
71
|
+
exports.InstructorSharedCalendarStateEntity = InstructorSharedCalendarStateEntity = __decorate([
|
|
72
|
+
(0, typeorm_1.Entity)('instructorSharedCalendarStates'),
|
|
73
|
+
__metadata("design:paramtypes", [Object])
|
|
74
|
+
], InstructorSharedCalendarStateEntity);
|
|
75
|
+
//# sourceMappingURL=calendar-state.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"calendar-state.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/instructor/calendar-state.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAwF;AACxF,qCAA+E;AAC/E,2DAA8D;AAE9D;;;;GAIG;AAEI,IAAM,mCAAmC,GAAzC,MAAM,mCAAmC;IA2E/C,6DAA6D;IAE7D,YAAY,KAAoD;QAC/D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACD,CAAA;AAhFY,kFAAmC;AAK/C;IADC,IAAA,gCAAsB,GAAE;;+DACd;AAOX;IADC,IAAA,0BAAgB,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;8BACzC,IAAI;sEAAC;AAOhB;IADC,IAAA,0BAAgB,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;8BACzC,IAAI;sEAAC;AAOhB;IADC,IAAA,0BAAgB,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;8BACzC,IAAI;sEAAC;AAShB;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,mBAAS,EAAC,MAAM,CAAC;;gEACN;AAQZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;mEACZ;AAUhB;IAHC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,KAAK;KACf,CAAC;;yEACmB;AAOrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;uEAC0C;AAQnE;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;yEACgE;AAKzF;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,2CAAuB,EAAE,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC;;uEAC3C;8CAzEjC,mCAAmC;IAD/C,IAAA,gBAAM,EAAC,gCAAgC,CAAC;;GAC5B,mCAAmC,CAgF/C"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { AccountStatus,
|
|
2
|
-
import { WorkingHours, Holiday, Preference
|
|
1
|
+
import { AccountStatus, Language, Role } from '@driveup/shared';
|
|
2
|
+
import { Activity, Instructor, Link, Metadata, WorkingHours, Holiday, Preference } from '@driveup/common';
|
|
3
3
|
import { CompanyEntity } from '../company.entity';
|
|
4
4
|
import { CompanyInstructorTaskEntity } from './task.entity';
|
|
5
5
|
import { InstructorEntity } from '../../instructor/instructor.entity';
|
|
@@ -11,11 +11,14 @@ import { StudentTrainingAppointmentEntity } from '../../student/program/training
|
|
|
11
11
|
import { CompanyCourseAppointmentEntity } from '../course/appointment.entity';
|
|
12
12
|
import { StudentTrainingLessonEntity } from '../../student/program/training/lesson.entity';
|
|
13
13
|
import { TrackableEntity } from '../../../utils/trackable';
|
|
14
|
+
import { CompanyInstructorActivityEntity } from './activity.entity';
|
|
15
|
+
import { InstructorSharedCalendarStateEntity } from './calendar-state.entity';
|
|
16
|
+
import { UserEntity } from '../../../user/user.entity';
|
|
14
17
|
export declare class CompanyInstructorEntity extends TrackableEntity<Instructor> {
|
|
15
18
|
instructorId: number;
|
|
16
19
|
companyId: number;
|
|
17
20
|
status: AccountStatus;
|
|
18
|
-
role:
|
|
21
|
+
role: Role;
|
|
19
22
|
/**
|
|
20
23
|
* Preferred language for the instructor interface
|
|
21
24
|
* Currently in sync with UserEntity.language not offered separately
|
|
@@ -36,6 +39,8 @@ export declare class CompanyInstructorEntity extends TrackableEntity<Instructor>
|
|
|
36
39
|
* Notification preferences stored as JSON
|
|
37
40
|
*/
|
|
38
41
|
preferences: Preference[];
|
|
42
|
+
metadata: Metadata[];
|
|
43
|
+
calendarLinks: Link[];
|
|
39
44
|
startedOn: Date;
|
|
40
45
|
invitedBy: number;
|
|
41
46
|
invitedOn: Date;
|
|
@@ -81,10 +86,19 @@ export declare class CompanyInstructorEntity extends TrackableEntity<Instructor>
|
|
|
81
86
|
* Tasks assigned to the instructors
|
|
82
87
|
*/
|
|
83
88
|
tasks: Promise<CompanyInstructorTaskEntity[]>;
|
|
89
|
+
/**
|
|
90
|
+
* History of the profile activities (profile events)
|
|
91
|
+
*/
|
|
92
|
+
activities: Promise<CompanyInstructorActivityEntity[]>;
|
|
93
|
+
/**
|
|
94
|
+
* Shared calendar states for the instructor
|
|
95
|
+
*/
|
|
96
|
+
sharedCalendarStates: Promise<InstructorSharedCalendarStateEntity[]>;
|
|
84
97
|
constructor(props?: Partial<CompanyInstructorEntity>);
|
|
85
98
|
toModel(): Promise<Instructor>;
|
|
86
99
|
toSummary(): Promise<Instructor>;
|
|
87
100
|
toPerson(): Promise<import("@driveup/common").Person>;
|
|
101
|
+
getUser(): Promise<UserEntity>;
|
|
88
102
|
getInstructor(): Promise<InstructorEntity>;
|
|
89
103
|
canReinstate(): Promise<boolean>;
|
|
90
104
|
getActivities(): Promise<Activity[]>;
|
|
@@ -108,10 +122,4 @@ export declare class CompanyInstructorEntity extends TrackableEntity<Instructor>
|
|
|
108
122
|
* @returns Array of Preference objects or undefined if not set
|
|
109
123
|
*/
|
|
110
124
|
getPreferences(): Preference<boolean>[];
|
|
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: string): boolean;
|
|
117
125
|
}
|
|
@@ -11,8 +11,8 @@ 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 common_2 = require("@driveup/common");
|
|
16
16
|
const log_entity_1 = require("../../../system/event/log.entity");
|
|
17
17
|
const company_entity_1 = require("../company.entity");
|
|
18
18
|
const task_entity_1 = require("./task.entity");
|
|
@@ -26,6 +26,8 @@ const appointment_entity_2 = require("../course/appointment.entity");
|
|
|
26
26
|
const lesson_entity_2 = require("../../student/program/training/lesson.entity");
|
|
27
27
|
const trackable_1 = require("../../../utils/trackable");
|
|
28
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");
|
|
29
31
|
let CompanyInstructorEntity = class CompanyInstructorEntity extends trackable_1.TrackableEntity {
|
|
30
32
|
constructor(props) {
|
|
31
33
|
super();
|
|
@@ -38,9 +40,9 @@ let CompanyInstructorEntity = class CompanyInstructorEntity extends trackable_1.
|
|
|
38
40
|
instructor.status = this.status;
|
|
39
41
|
instructor.role = this.role;
|
|
40
42
|
instructor.startedOn = this.startedOn;
|
|
41
|
-
instructor.workingHours = this.workingHours?.map(
|
|
42
|
-
instructor.holidays = this.holidays?.map(
|
|
43
|
-
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);
|
|
44
46
|
return instructor;
|
|
45
47
|
}
|
|
46
48
|
async toSummary() {
|
|
@@ -55,23 +57,27 @@ let CompanyInstructorEntity = class CompanyInstructorEntity extends trackable_1.
|
|
|
55
57
|
const instructor = await this.instructor;
|
|
56
58
|
return await instructor.toPerson();
|
|
57
59
|
}
|
|
60
|
+
async getUser() {
|
|
61
|
+
const instructor = await this.getInstructor();
|
|
62
|
+
return await instructor.user;
|
|
63
|
+
}
|
|
58
64
|
async getInstructor() {
|
|
59
65
|
return await this.instructor;
|
|
60
66
|
}
|
|
61
67
|
async canReinstate() {
|
|
62
68
|
const instructor = await this.getInstructor();
|
|
63
|
-
return this.status ===
|
|
69
|
+
return this.status === shared_1.AccountStatus.Closed && instructor.status === shared_1.AccountStatus.Active;
|
|
64
70
|
}
|
|
65
71
|
async getActivities() {
|
|
66
72
|
const activities = [];
|
|
67
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy,
|
|
68
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.createdOn,
|
|
69
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy,
|
|
70
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.updatedOn,
|
|
71
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.closedBy,
|
|
72
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.closedOn,
|
|
73
|
-
activities.push(await (0, activity_helper_1.toActivity)(this.invitedBy,
|
|
74
|
-
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));
|
|
75
81
|
return activities.filter(a => a);
|
|
76
82
|
}
|
|
77
83
|
/**
|
|
@@ -84,10 +90,10 @@ let CompanyInstructorEntity = class CompanyInstructorEntity extends trackable_1.
|
|
|
84
90
|
if (!this.id)
|
|
85
91
|
return;
|
|
86
92
|
await log_entity_1.LogEntity.from({
|
|
87
|
-
type:
|
|
93
|
+
type: shared_1.LogType.Instructor,
|
|
88
94
|
event: event,
|
|
89
95
|
entityId: entityId,
|
|
90
|
-
profile: { type:
|
|
96
|
+
profile: { type: shared_1.ProfileType.Company, id: this.id },
|
|
91
97
|
content: log_entity_1.LogEntity.toInstructorContent(event, this.language, metadata)
|
|
92
98
|
});
|
|
93
99
|
}
|
|
@@ -102,10 +108,10 @@ let CompanyInstructorEntity = class CompanyInstructorEntity extends trackable_1.
|
|
|
102
108
|
if (!this.id)
|
|
103
109
|
return;
|
|
104
110
|
await log_entity_1.LogEntity.from({
|
|
105
|
-
type:
|
|
111
|
+
type: shared_1.LogType.Instructor,
|
|
106
112
|
event: event,
|
|
107
113
|
entityId: entityId,
|
|
108
|
-
profile: { type:
|
|
114
|
+
profile: { type: shared_1.ProfileType.Company, id: this.id },
|
|
109
115
|
content: log_entity_1.LogEntity.toAuthorContent(event, this.language, metadata)
|
|
110
116
|
});
|
|
111
117
|
}
|
|
@@ -116,19 +122,7 @@ let CompanyInstructorEntity = class CompanyInstructorEntity extends trackable_1.
|
|
|
116
122
|
getPreferences() {
|
|
117
123
|
if (!this.preferences)
|
|
118
124
|
return;
|
|
119
|
-
return this.preferences.map(
|
|
120
|
-
}
|
|
121
|
-
/**
|
|
122
|
-
* Checks if notifications are enabled for a specific event
|
|
123
|
-
* @param event Event name to check
|
|
124
|
-
* @returns True if notifications are enabled, false otherwise
|
|
125
|
-
*/
|
|
126
|
-
isNotificationEnabled(event) {
|
|
127
|
-
const preferences = this.getPreferences();
|
|
128
|
-
if (!preferences)
|
|
129
|
-
return true;
|
|
130
|
-
const eventPref = preferences.find(p => p.name === event && p.scope === common_1.PreferenceScope.Notification);
|
|
131
|
-
return eventPref.value === true;
|
|
125
|
+
return this.preferences.map(common_1.Preference.toInstance);
|
|
132
126
|
}
|
|
133
127
|
};
|
|
134
128
|
exports.CompanyInstructorEntity = CompanyInstructorEntity;
|
|
@@ -143,8 +137,8 @@ __decorate([
|
|
|
143
137
|
__decorate([
|
|
144
138
|
(0, typeorm_1.Column)({
|
|
145
139
|
type: 'enum',
|
|
146
|
-
enum:
|
|
147
|
-
default:
|
|
140
|
+
enum: shared_1.AccountStatus,
|
|
141
|
+
default: shared_1.AccountStatus.Invited,
|
|
148
142
|
nullable: false
|
|
149
143
|
}),
|
|
150
144
|
__metadata("design:type", String)
|
|
@@ -152,8 +146,8 @@ __decorate([
|
|
|
152
146
|
__decorate([
|
|
153
147
|
(0, typeorm_1.Column)({
|
|
154
148
|
type: 'enum',
|
|
155
|
-
enum:
|
|
156
|
-
default:
|
|
149
|
+
enum: shared_1.Role,
|
|
150
|
+
default: shared_1.Role.Instructor,
|
|
157
151
|
nullable: false
|
|
158
152
|
}),
|
|
159
153
|
__metadata("design:type", String)
|
|
@@ -161,8 +155,8 @@ __decorate([
|
|
|
161
155
|
__decorate([
|
|
162
156
|
(0, typeorm_1.Column)({
|
|
163
157
|
type: 'enum',
|
|
164
|
-
enum:
|
|
165
|
-
default:
|
|
158
|
+
enum: shared_1.Language,
|
|
159
|
+
default: shared_1.Language.En,
|
|
166
160
|
nullable: true
|
|
167
161
|
}),
|
|
168
162
|
__metadata("design:type", String)
|
|
@@ -191,6 +185,21 @@ __decorate([
|
|
|
191
185
|
}),
|
|
192
186
|
__metadata("design:type", Array)
|
|
193
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);
|
|
194
203
|
__decorate([
|
|
195
204
|
(0, typeorm_1.Column)({ nullable: true, default: null }),
|
|
196
205
|
__metadata("design:type", Date)
|
|
@@ -251,6 +260,14 @@ __decorate([
|
|
|
251
260
|
(0, typeorm_1.OneToMany)(() => task_entity_1.CompanyInstructorTaskEntity, task => task.instructor),
|
|
252
261
|
__metadata("design:type", Promise)
|
|
253
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);
|
|
254
271
|
exports.CompanyInstructorEntity = CompanyInstructorEntity = __decorate([
|
|
255
272
|
(0, typeorm_1.Entity)('companyInstructors'),
|
|
256
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
|
};
|