@driveup/schema 0.2.7 → 0.3.0

package/lib/profile/student/program/training/lesson.entity.d.ts

@@ -1,12 +1,12 @@
 import { Activity, Lesson } from '@driveup/common';
-import { TrackableEntity } from '../../../../utils/trackable';
+import { CompanyInstructorEntity } from '../../../company/instructor/instructor.entity';
 import { CompanyCourseEntity } from '../../../company/course/course.entity';
 import { CompanyCourseLessonEntity } from '../../../company/course/lesson.entity';
-import { CompanyInstructorEntity } from '../../../company/instructor/instructor.entity';
+import { TrackableEntity } from '../../../../utils/trackable';
 import { StudentEntity } from '../../student.entity';
 import { StudentTrainingAppointmentEntity } from './appointment.entity';
-import { StudentTrainingTopicEntity } from './topic.entity';
 import { StudentTrainingEntity } from './training.entity';
+import { StudentTrainingTopicEntity } from './topic.entity';
 export declare class StudentTrainingLessonEntity extends TrackableEntity<Lesson> {
     /**
      * Student training

package/lib/profile/student/program/training/lesson.entity.js

@@ -13,15 +13,15 @@ exports.StudentTrainingLessonEntity = void 0;
 const common_1 = require("@driveup/common");
 const shared_1 = require("@driveup/shared");
 const typeorm_1 = require("typeorm");
-const activity_helper_1 = require("../../../../utils/activity.helper");
-const trackable_1 = require("../../../../utils/trackable");
+const instructor_entity_1 = require("../../../company/instructor/instructor.entity");
 const course_entity_1 = require("../../../company/course/course.entity");
 const lesson_entity_1 = require("../../../company/course/lesson.entity");
-const instructor_entity_1 = require("../../../company/instructor/instructor.entity");
+const activity_helper_1 = require("../../../../utils/activity.helper");
+const trackable_1 = require("../../../../utils/trackable");
 const student_entity_1 = require("../../student.entity");
 const appointment_entity_1 = require("./appointment.entity");
-const topic_entity_1 = require("./topic.entity");
 const training_entity_1 = require("./training.entity");
+const topic_entity_1 = require("./topic.entity");
 let StudentTrainingLessonEntity = class StudentTrainingLessonEntity extends trackable_1.TrackableEntity {
     constructor(props) {
         super();

package/lib/profile/student/program/training/lesson.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"lesson.entity.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/lesson.entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lesson.entity.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/lesson.entity.ts"],"names":[],"mappings":"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"}

package/lib/profile/student/program/training/topic.entity.d.ts

@@ -1,11 +1,12 @@
-import { Activity, Skill, Topic } from '@driveup/common';
-import { StatusType } from '@driveup/shared';
-import { TrackableEntity } from '../../../../utils/trackable';
+import { Activity, Topic } from '@driveup/common';
+import { Skill, StatusType } from '@driveup/shared';
+import { EntityManager } from 'typeorm';
 import { CompanyCourseTopicEntity } from '../../../company/course/topic.entity';
+import { TrackableEntity } from '../../../../utils/trackable';
 import { StudentEntity } from '../../student.entity';
 import { StudentTrainingAppointmentEntity } from './appointment.entity';
-import { StudentTrainingLessonEntity } from './lesson.entity';
 import { StudentTrainingEntity } from './training.entity';
+import { StudentTrainingLessonEntity } from './lesson.entity';
 /**
  * Student training topic entity representing topics within a training lesson.
  * Topics are copied from company course topics and tracked individually per student.
@@ -110,7 +111,7 @@ export declare class StudentTrainingTopicEntity extends TrackableEntity<Topic> {
      * Counts how many times this topic has been assessed across all appointments
      * @returns The number of appointments where this topic received an assessment
      */
-    getRepetition(): Promise<number>;
+    getRepetition(manager?: EntityManager): Promise<number>;
     /**
      * Retrieves all tracked activities for this topic
      * Includes creation, update, and completion timestamps and associated users

package/lib/profile/student/program/training/topic.entity.js

@@ -13,13 +13,13 @@ exports.StudentTrainingTopicEntity = void 0;
 const common_1 = require("@driveup/common");
 const shared_1 = require("@driveup/shared");
 const typeorm_1 = require("typeorm");
+const topic_entity_1 = require("../../../company/course/topic.entity");
 const activity_helper_1 = require("../../../../utils/activity.helper");
 const trackable_1 = require("../../../../utils/trackable");
-const topic_entity_1 = require("../../../company/course/topic.entity");
 const student_entity_1 = require("../../student.entity");
 const appointment_entity_1 = require("./appointment.entity");
-const lesson_entity_1 = require("./lesson.entity");
 const training_entity_1 = require("./training.entity");
+const lesson_entity_1 = require("./lesson.entity");
 /**
  * Student training topic entity representing topics within a training lesson.
  * Topics are copied from company course topics and tracked individually per student.
@@ -47,7 +47,7 @@ let StudentTrainingTopicEntity = class StudentTrainingTopicEntity extends tracka
             imageUrl: this.imageUrl,
             sort: this.sort,
             done: this.done,
-            skills: this.skills?.map(common_1.Skill.toInstance) || []
+            skills: this.skills?.map(shared_1.Skill.toInstance) || []
         });
     }
     /**
@@ -113,6 +113,7 @@ let StudentTrainingTopicEntity = class StudentTrainingTopicEntity extends tracka
             .createQueryBuilder('sda')
             .where('sda.id = :id', { id: session.id })
             .andWhere('JSON_CONTAINS(sda.topics, JSON_OBJECT("id", :topicId))', { topicId: this.id })
+            // TODO: ask admir, the assessment doesn't mean "score", maybe the topic was marked as "done" in that session
             .andWhere('EXISTS (SELECT 1 FROM JSON_TABLE(sda.skills, "$[*]" COLUMNS(score INT PATH "$.score")) AS skill WHERE skill.score != :noScore)', { noScore: shared_1.Score.NoScoreSubmitted })
             .getCount();
         return count > 0;
@@ -121,9 +122,11 @@ let StudentTrainingTopicEntity = class StudentTrainingTopicEntity extends tracka
      * Counts how many times this topic has been assessed across all appointments
      * @returns The number of appointments where this topic received an assessment
      */
-    async getRepetition() {
-        const count = await appointment_entity_1.StudentTrainingAppointmentEntity
-            .createQueryBuilder('sda')
+    async getRepetition(manager) {
+        const entityManager = manager ?? appointment_entity_1.StudentTrainingAppointmentEntity.getRepository().manager;
+        // TODO: ask admir, the repetition doesn't mean "score", maybe the topic was marked as "done" in that session
+        const count = await entityManager
+            .createQueryBuilder(appointment_entity_1.StudentTrainingAppointmentEntity, 'sda')
             .where('JSON_CONTAINS(sda.topics, JSON_OBJECT("id", :topicId))', { topicId: this.id })
             .andWhere('EXISTS (SELECT 1 FROM JSON_TABLE(sda.skills, "$[*]" COLUMNS(score INT PATH "$.score")) AS skill WHERE skill.score != :noScore)', { noScore: shared_1.Score.NoScoreSubmitted })
             .getCount();

package/lib/profile/student/program/training/topic.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"topic.entity.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/topic.entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"topic.entity.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/topic.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAkD;AAClD,4CAAyE;AACzE,qCAAmE;AAEnE,uEAAgF;AAChF,uEAA+D;AAC/D,2DAA8D;AAC9D,yDAAqD;AACrD,6DAAwE;AACxE,uDAA0D;AAC1D,mDAA8D;AAE9D;;;;;GAKG;AAEI,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,2BAAsB;IA6GrE;;;OAGG;IACH,YAAY,KAA2C;QACtD,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,OAAO;QACN,OAAO,IAAI,cAAK,CAAC;YAChB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,cAAK,CAAC,UAAU,CAAC,IAAI,EAAE;SAChD,CAAC,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,SAAS;QACR,OAAO,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,UAAU;QACf,OAAO,MAAM,8BAAa,CAAC,kBAAkB,CAAC,SAAS,CAAC;aACtD,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC;aAC1C,SAAS,CAAC,uBAAuB,EAAE,aAAa,CAAC;aACjD,KAAK,CAAC,iCAAiC,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;aACpE,MAAM,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,WAAW;QAChB,OAAO,MAAM,uCAAqB,CAAC,kBAAkB,CAAC,UAAU,CAAC;aAC/D,SAAS,CAAC,uBAAuB,EAAE,aAAa,CAAC;aACjD,KAAK,CAAC,iCAAiC,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;aACpE,MAAM,EAAE,CAAC;IACZ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,QAAQ;QAEb,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;QACjC,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC;QACvC,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC;QAEjD,IAAI,CAAC,YAAY;YAAE,OAAO,CAAC,CAAC;QAE5B,MAAM,MAAM,GAAG,YAAY;aACzB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;aACzD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,EAAE,MAAM;YAAE,OAAO,CAAC,CAAC;QAE9B,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;YACtF,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,SAAS;QACd,MAAM,KAAK,GAAG,MAAM,qDAAgC;aAClD,kBAAkB,CAAC,KAAK,CAAC;aACzB,KAAK,CAAC,wDAAwD,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;aACrF,QAAQ,EAAE,CAAC;QAEb,OAAO,KAAK,GAAG,CAAC,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,aAAa,CAAC,OAAyC;QAE5D,MAAM,KAAK,GAAG,MAAM,qDAAgC;aAClD,kBAAkB,CAAC,KAAK,CAAC;aACzB,KAAK,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;aACzC,QAAQ,CAAC,wDAAwD,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;YACzF,6GAA6G;aAC5G,QAAQ,CACR,gIAAgI,EAChI,EAAE,OAAO,EAAE,cAAK,CAAC,gBAAgB,EAAE,CACnC;aACA,QAAQ,EAAE,CAAC;QAEb,OAAO,KAAK,GAAG,CAAC,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,aAAa,CAAC,OAAuB;QAC1C,MAAM,aAAa,GAAG,OAAO,IAAI,qDAAgC,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC;QAC1F,6GAA6G;QAC7G,MAAM,KAAK,GAAG,MAAM,aAAa;aAC/B,kBAAkB,CAAC,qDAAgC,EAAE,KAAK,CAAC;aAC3D,KAAK,CAAC,wDAAwD,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;aACrF,QAAQ,CACR,gIAAgI,EAChI,EAAE,OAAO,EAAE,cAAK,CAAC,gBAAgB,EAAE,CACnC;aACA,QAAQ,EAAE,CAAC;QAEb,OAAO,KAAK,CAAC;IACd,CAAC;IAED;;;;OAIG;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,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,qBAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QAC9F,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACD,CAAA;AAzPY,gEAA0B;AAMtC;IADC,IAAA,gBAAM,GAAE;;4DACQ;AAQjB;IADC,IAAA,gBAAM,GAAE;;2DACO;AAOhB;IADC,IAAA,gBAAM,GAAE;;yDACK;AAUd;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;+DACkB;AAUpB;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;4DACe;AASjB;IAJC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,KAAK;KACf,CAAC;;wDACW;AASb;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,KAAK;KACd,CAAC;;wDACY;AAYd;IANC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,CAAC,mBAAU,CAAC,OAAO,EAAE,mBAAU,CAAC,QAAQ,EAAE,mBAAU,CAAC,SAAS,EAAE,mBAAU,CAAC,OAAO,EAAE,mBAAU,CAAC,MAAM,CAAC;QAC5G,OAAO,EAAE,mBAAU,CAAC,OAAO;QAC3B,QAAQ,EAAE,KAAK;KACf,CAAC;;0DACiB;AAWnB;IALC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;0DACc;AAMhB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;+DACtB;AAMpB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;8BAC7B,IAAI;+DAAC;AAMlB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,2CAA2B,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;;0DACzB;AAO7C;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uCAAwB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC;;yDAC/B;qCA3G7B,0BAA0B;IADtC,IAAA,gBAAM,EAAC,uBAAuB,CAAC;;GACnB,0BAA0B,CAyPtC"}

package/lib/profile/student/program/training/training-balance.view.d.ts

@@ -0,0 +1,4 @@
+export declare class TrainingBalanceView {
+    trainingId: number;
+    balance: number;
+}

package/lib/profile/student/program/training/training-balance.view.js

@@ -0,0 +1,37 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrainingBalanceView = void 0;
+const typeorm_1 = require("typeorm");
+let TrainingBalanceView = class TrainingBalanceView {
+};
+exports.TrainingBalanceView = TrainingBalanceView;
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], TrainingBalanceView.prototype, "trainingId", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], TrainingBalanceView.prototype, "balance", void 0);
+exports.TrainingBalanceView = TrainingBalanceView = __decorate([
+    (0, typeorm_1.ViewEntity)({
+        name: 'training_balance_view',
+        dependsOn: ['training_sessions_view'],
+        expression: `
+	SELECT
+
+	FROM studentTrainings t
+	INNER JOIN 
+	`
+    })
+], TrainingBalanceView);
+//# sourceMappingURL=training-balance.view.js.map

package/lib/profile/student/program/training/training-balance.view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"training-balance.view.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/training-balance.view.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiD;AAY1C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;CAO/B,CAAA;AAPY,kDAAmB;AAG/B;IADC,IAAA,oBAAU,GAAE;;uDACM;AAGnB;IADC,IAAA,oBAAU,GAAE;;oDACG;8BANJ,mBAAmB;IAV/B,IAAA,oBAAU,EAAC;QACX,IAAI,EAAE,uBAAuB;QAC7B,SAAS,EAAE,CAAC,wBAAwB,CAAC;QACrC,UAAU,EAAE;;;;;EAKX;KACD,CAAC;GACW,mBAAmB,CAO/B"}

package/lib/profile/student/program/training/training-cost.view.d.ts

@@ -0,0 +1,4 @@
+export declare class TrainingCostView {
+    trainingId: number;
+    cost: number;
+}

package/lib/profile/student/program/training/training-cost.view.js

@@ -0,0 +1,45 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrainingCostView = void 0;
+const typeorm_1 = require("typeorm");
+let TrainingCostView = class TrainingCostView {
+};
+exports.TrainingCostView = TrainingCostView;
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], TrainingCostView.prototype, "trainingId", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], TrainingCostView.prototype, "cost", void 0);
+exports.TrainingCostView = TrainingCostView = __decorate([
+    (0, typeorm_1.ViewEntity)({
+        name: 'training_cost_view',
+        dependsOn: ['training_sessions_view'],
+        expression: `
+	SELECT
+		t.id AS trainingId,
+		(
+			COALESCE(tsv.totalSessionsFee, 0)
+			+ COALESCE(t.administrationFee, 0)
+			- COALESCE(t.discount, 0)
+		) AS cost
+	FROM 
+		studentTrainings t
+	LEFT JOIN 
+		training_sessions_view tsv 
+		ON t.id = tsv.trainingId
+	`
+    })
+], TrainingCostView);
+//# sourceMappingURL=training-cost.view.js.map

package/lib/profile/student/program/training/training-cost.view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"training-cost.view.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/training-cost.view.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiD;AAoB1C,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAO5B,CAAA;AAPY,4CAAgB;AAG5B;IADC,IAAA,oBAAU,GAAE;;oDACM;AAGnB;IADC,IAAA,oBAAU,GAAE;;8CACA;2BAND,gBAAgB;IAlB5B,IAAA,oBAAU,EAAC;QACX,IAAI,EAAE,oBAAoB;QAC1B,SAAS,EAAE,CAAC,wBAAwB,CAAC;QACrC,UAAU,EAAE;;;;;;;;;;;;;EAaX;KACD,CAAC;GACW,gBAAgB,CAO5B"}

package/lib/profile/student/program/training/training-sessions.view.d.ts

@@ -0,0 +1,8 @@
+/**
+ * This view calculates the total number of sessions and the total fee for student "driving" trainings.
+ */
+export declare class TrainingSessionsView {
+    trainingId: number;
+    totalSessions: number;
+    totalSessionsFee: number;
+}

package/lib/profile/student/program/training/training-sessions.view.js

@@ -0,0 +1,50 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrainingSessionsView = void 0;
+const typeorm_1 = require("typeorm");
+/**
+ * This view calculates the total number of sessions and the total fee for student "driving" trainings.
+ */
+let TrainingSessionsView = class TrainingSessionsView {
+};
+exports.TrainingSessionsView = TrainingSessionsView;
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], TrainingSessionsView.prototype, "trainingId", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], TrainingSessionsView.prototype, "totalSessions", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], TrainingSessionsView.prototype, "totalSessionsFee", void 0);
+exports.TrainingSessionsView = TrainingSessionsView = __decorate([
+    (0, typeorm_1.ViewEntity)({
+        name: 'training_sessions_view',
+        expression: `
+	SELECT
+		trainingId,
+		COUNT(id) AS totalSessions,
+		SUM(price) AS totalSessionsFee
+	FROM
+		studentTrainingAppointments
+	WHERE 
+		type = 'driving'
+		AND (DATE_ADD(startDate, INTERVAL duration MINUTE) <= NOW() OR status = 'canceled')
+		AND deletedOn IS NULL
+	GROUP BY trainingId
+	`
+    })
+], TrainingSessionsView);
+//# sourceMappingURL=training-sessions.view.js.map

package/lib/profile/student/program/training/training-sessions.view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"training-sessions.view.js","sourceRoot":"","sources":["../../../../../src/profile/student/program/training/training-sessions.view.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiD;AAEjD;;GAEG;AAiBI,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;CAUhC,CAAA;AAVY,oDAAoB;AAGhC;IADC,IAAA,oBAAU,GAAE;;wDACM;AAGnB;IADC,IAAA,oBAAU,GAAE;;2DACS;AAGtB;IADC,IAAA,oBAAU,GAAE;;8DACY;+BATb,oBAAoB;IAhBhC,IAAA,oBAAU,EAAC;QACX,IAAI,EAAE,wBAAwB;QAC9B,UAAU,EAAE;;;;;;;;;;;;EAYX;KACD,CAAC;GACW,oBAAoB,CAUhC"}

package/lib/profile/student/program/training/training.entity.d.ts

@@ -1,4 +1,5 @@
-import { Activity, AddonUsage, Address, Note, Period, Person, Rating, Student, Training } from '@driveup/common';
+import { Activity, Student, Training } from '@driveup/common';
+import { AddonUsage, Address, Note, Period, Person, Rating } from '@driveup/shared';
 import { CarTransmission, StatusType, TrainingType } from '@driveup/shared';
 import { TrackableEntity } from '../../../../utils/trackable';
 import { CompanyCourseEntity } from '../../../company/course/course.entity';
@@ -161,6 +162,7 @@ export declare class StudentTrainingEntity extends TrackableEntity<Training> {
     toModel(): Promise<Training>;
     toSummary(): Promise<Training>;
     toModelWithDetails(): Promise<Training>;
+    isArchived(): boolean;
     /**
      * Gets the student profile related to this training
      * Loads the StudentEntity even if the training's program/student is soft-removed from db (withDeleted: true)
@@ -175,6 +177,7 @@ export declare class StudentTrainingEntity extends TrackableEntity<Training> {
      */
     getProgram(): Promise<StudentProgramEntity>;
     getCourse(): Promise<CompanyCourseEntity>;
+    getInstructor(): Promise<CompanyInstructorEntity>;
     getProduct(): Promise<import("../../../..").CompanyProductEntity>;
     getCompany(): Promise<import("../../../..").CompanyEntity>;
     getDrivingCategory(): Promise<import("../../../..").DrivingCategoryEntity>;

package/lib/profile/student/program/training/training.entity.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StudentTrainingEntity = void 0;
 const common_1 = require("@driveup/common");
 const shared_1 = require("@driveup/shared");
+const shared_2 = require("@driveup/shared");
 const luxon_1 = require("luxon");
 const typeorm_1 = require("typeorm");
 const activity_helper_1 = require("../../../../utils/activity.helper");
@@ -47,8 +48,8 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
             paid: this.paid,
             discount: this.discount,
             refund: this.refund,
-            location: this.location ? common_1.Address.toInstance(this.location) : null,
-            ratings: this.ratings ? this.ratings.map(common_1.Rating.toInstance) : null,
+            location: this.location ? shared_1.Address.toInstance(this.location) : null,
+            ratings: this.ratings ? this.ratings.map(shared_1.Rating.toInstance) : null,
             transmission: this.transmission
         });
     }
@@ -67,13 +68,16 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
         const training = await this.toModel();
         // get all apointments notes
         const appointtemnts = await this.appointments;
-        training.notes = appointtemnts?.map(a => a.note)?.map(common_1.Note.toInstance);
+        training.notes = appointtemnts?.map(a => a.note)?.map(shared_1.Note.toInstance);
         // get ratings
-        training.ratings = this.ratings?.map(common_1.Rating.toInstance) || null;
+        training.ratings = this.ratings?.map(shared_1.Rating.toInstance) || null;
         // get addons
-        training.addons = this.addons?.map(common_1.AddonUsage.toInstance) || null;
+        training.addons = this.addons?.map(shared_1.AddonUsage.toInstance) || null;
         return training;
     }
+    isArchived() {
+        return [shared_2.StatusType.Completed, shared_2.StatusType.Terminated].includes(this.status);
+    }
     /**
      * Gets the student profile related to this training
      * Loads the StudentEntity even if the training's program/student is soft-removed from db (withDeleted: true)
@@ -100,6 +104,9 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
     async getCourse() {
         return await this.course;
     }
+    async getInstructor() {
+        return await this.instructor;
+    }
     async getProduct() {
         const course = await this.getCourse();
         return await course.product;
@@ -120,8 +127,8 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
     async getPaymentTransactions() {
         const total = await transaction_entity_1.StudentTrainingTransactionEntity.sum('amount', {
             trainingId: this.id,
-            type: shared_1.TransactionType.Payment,
-            status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
+            type: shared_2.TransactionType.Payment,
+            status: (0, typeorm_1.Not)(shared_2.StatusType.Canceled),
             refTransactionId: (0, typeorm_1.IsNull)()
         });
         return total || 0;
@@ -133,9 +140,9 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
     async getCashTransactions() {
         const total = await transaction_entity_1.StudentTrainingTransactionEntity.sum('amount', {
             trainingId: this.id,
-            type: shared_1.TransactionType.Payment,
-            paymentType: shared_1.PaymentType.Cash,
-            status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
+            type: shared_2.TransactionType.Payment,
+            paymentType: shared_2.PaymentType.Cash,
+            status: (0, typeorm_1.Not)(shared_2.StatusType.Canceled),
             refTransactionId: (0, typeorm_1.IsNull)()
         });
         return total || 0;
@@ -147,8 +154,8 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
     async getDiscountTransactions() {
         const total = await transaction_entity_1.StudentTrainingTransactionEntity.sum('amount', {
             trainingId: this.id,
-            type: shared_1.TransactionType.Discount,
-            status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
+            type: shared_2.TransactionType.Discount,
+            status: (0, typeorm_1.Not)(shared_2.StatusType.Canceled),
             refTransactionId: (0, typeorm_1.IsNull)()
         });
         return total || 0;
@@ -160,8 +167,8 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
     async getRefundTransactions() {
         const total = await transaction_entity_1.StudentTrainingTransactionEntity.sum('amount', {
             trainingId: this.id,
-            type: shared_1.TransactionType.Refund,
-            status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
+            type: shared_2.TransactionType.Refund,
+            status: (0, typeorm_1.Not)(shared_2.StatusType.Canceled),
             refTransactionId: (0, typeorm_1.IsNull)()
         });
         return total || 0;
@@ -176,8 +183,8 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
             // TODO: ask admir about this. a cancelation item has type = TransactionType.Cancelation AND status = StatusType.Canceled
             // therefore the bellow condition is never met
             // or perhaps I'm wrong about my point
-            type: shared_1.TransactionType.Cancelation,
-            status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
+            type: shared_2.TransactionType.Cancelation,
+            status: (0, typeorm_1.Not)(shared_2.StatusType.Canceled),
         });
         return total || 0;
     }
@@ -195,7 +202,7 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
      */
     async getTrainingType() {
         const product = await this.getProduct();
-        const trainingType = product.catalogType === shared_1.CatalogType.Driving ? shared_1.TrainingType.Driving : shared_1.TrainingType.Course;
+        const trainingType = product.catalogType === shared_2.CatalogType.Driving ? shared_2.TrainingType.Driving : shared_2.TrainingType.Course;
         return trainingType;
     }
     async getTotalTopics() {
@@ -221,7 +228,7 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
             where: {
                 trainingId: this.id,
                 startDate: (0, typeorm_1.MoreThanOrEqual)(luxon_1.DateTime.now().toJSDate()),
-                status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled)
+                status: (0, typeorm_1.Not)(shared_2.StatusType.Canceled)
             },
             order: { startDate: 'ASC' }
         });
@@ -234,7 +241,7 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
         const total = await appointment_entity_1.StudentTrainingAppointmentEntity.countBy({
             trainingId: this.id,
             startDate: (0, typeorm_1.MoreThanOrEqual)(luxon_1.DateTime.now().toJSDate()),
-            status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled)
+            status: (0, typeorm_1.Not)(shared_2.StatusType.Canceled)
         });
         return total || 0;
     }
@@ -257,7 +264,7 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
         const query = appointment_entity_1.StudentTrainingAppointmentEntity
             .createQueryBuilder('a')
             .where('a.trainingId = :trainingId', { trainingId: this.id })
-            .andWhere('a.status != :canceledStatus', { canceledStatus: shared_1.StatusType.Canceled })
+            .andWhere('a.status != :canceledStatus', { canceledStatus: shared_2.StatusType.Canceled })
             .andWhere(`
 				a.startDate < :endDate
 				AND 
@@ -279,27 +286,27 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
      */
     async getEstimatedExamDate() {
         // If the training is not in-progress, estimation isn't calculated
-        if (this.status !== shared_1.StatusType.Progress)
+        if (this.status !== shared_2.StatusType.Progress)
             return null;
         // If the training has had less than 10 appointments, estimation isn't calculated
         const totalPreviousAppointments = await appointment_entity_1.StudentTrainingAppointmentEntity.countBy({
             trainingId: this.id,
             startDate: (0, typeorm_1.LessThanOrEqual)(luxon_1.DateTime.now().toJSDate()),
-            status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
+            status: (0, typeorm_1.Not)(shared_2.StatusType.Canceled),
             isExam: false
         });
         if (totalPreviousAppointments < 10)
             return null;
         const firstAppointment = await appointment_entity_1.StudentTrainingAppointmentEntity.findOne({
             order: { startDate: 'ASC' },
-            where: { trainingId: this.id, status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled), isExam: false }
+            where: { trainingId: this.id, status: (0, typeorm_1.Not)(shared_2.StatusType.Canceled), isExam: false }
         });
         const latestAppointment = await appointment_entity_1.StudentTrainingAppointmentEntity.findOne({
             order: { startDate: 'DESC' },
             where: {
                 trainingId: this.id,
                 startDate: (0, typeorm_1.LessThanOrEqual)(luxon_1.DateTime.now().toJSDate()),
-                status: (0, typeorm_1.Not)(shared_1.StatusType.Canceled),
+                status: (0, typeorm_1.Not)(shared_2.StatusType.Canceled),
                 isExam: false
             }
         });
@@ -324,7 +331,7 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
     }
     async getTotalParts() {
         const trainingType = await this.getTrainingType();
-        if (trainingType !== shared_1.TrainingType.Course) {
+        if (trainingType !== shared_2.TrainingType.Course) {
             return null;
         }
         return await lesson_entity_1.StudentTrainingLessonEntity.countBy({
@@ -334,10 +341,10 @@ let StudentTrainingEntity = class StudentTrainingEntity extends trackable_1.Trac
     }
     async getActivities() {
         const activities = [];
-        activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, this.createdOn, shared_1.ActivityType.created));
-        activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, this.updatedOn, shared_1.ActivityType.updated));
-        activities.push(await (0, activity_helper_1.toActivity)(this.completedBy, this.completedOn, shared_1.ActivityType.completed));
-        activities.push(await (0, activity_helper_1.toActivity)(this.terminatedBy, this.terminatedOn, shared_1.ActivityType.terminated));
+        activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, this.createdOn, shared_2.ActivityType.created));
+        activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, this.updatedOn, shared_2.ActivityType.updated));
+        activities.push(await (0, activity_helper_1.toActivity)(this.completedBy, this.completedOn, shared_2.ActivityType.completed));
+        activities.push(await (0, activity_helper_1.toActivity)(this.terminatedBy, this.terminatedOn, shared_2.ActivityType.terminated));
         return activities.filter(a => a);
     }
     async getCreatedBy() {
@@ -378,8 +385,8 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({
         type: 'enum',
-        enum: shared_1.StatusType,
-        default: shared_1.StatusType.Progress,
+        enum: shared_2.StatusType,
+        default: shared_2.StatusType.Progress,
         nullable: false
     }),
     __metadata("design:type", String)
@@ -478,7 +485,7 @@ __decorate([
         nullable: true,
         default: null
     }),
-    __metadata("design:type", common_1.Address)
+    __metadata("design:type", shared_1.Address)
 ], StudentTrainingEntity.prototype, "location", void 0);
 __decorate([
     (0, typeorm_1.Column)({
@@ -497,8 +504,8 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({
         type: 'enum',
-        enum: shared_1.CarTransmission,
-        default: shared_1.CarTransmission.Manual,
+        enum: shared_2.CarTransmission,
+        default: shared_2.CarTransmission.Manual,
         nullable: false
     }),
     __metadata("design:type", String)
@@ -508,7 +515,7 @@ __decorate([
         type: 'json',
         nullable: false
     }),
-    __metadata("design:type", common_1.Person)
+    __metadata("design:type", shared_1.Person)
 ], StudentTrainingEntity.prototype, "studentSnapshot", void 0);
 __decorate([
     (0, typeorm_1.Column)({
@@ -524,7 +531,7 @@ __decorate([
         nullable: true,
         default: null
     }),
-    __metadata("design:type", common_1.Note)
+    __metadata("design:type", shared_1.Note)
 ], StudentTrainingEntity.prototype, "terminationNote", void 0);
 __decorate([
     (0, typeorm_1.Column)({