@driveup/schema 0.3.33 → 0.3.35

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

@@ -43,12 +43,12 @@ export declare class StudentTrainingTransactionEntity extends TrackableEntity<Tr
      */
     description: string;
     /**
-     * Reference to a related transaction (typically used for cancellations).
+     * Reference to this transaction's cancellation item
      * When an approved transaction is canceled, a new cancellation transaction is created,
      * and this field points to that cancellation transaction.
      * The original approved transaction's status remains Approved.
      */
-    refTransactionId: number;
+    cancellationItemId: number;
     /**
      * Bank account information used for this transaction
      */
@@ -94,16 +94,16 @@ export declare class StudentTrainingTransactionEntity extends TrackableEntity<Tr
     toSummary(): Transaction;
     getTraining(): Promise<StudentTrainingEntity>;
     /**
-     * Retrieves the referenced transaction (typically a cancellation transaction)
-     * @returns The related transaction entity or undefined if no reference exists
+     * Retrieves the cancellation item for this transaction (if registered)
+     * @returns The related cancellation transaction entity or undefined if no reference exists
      */
-    getRefTransaction(): Promise<StudentTrainingTransactionEntity>;
+    getCancellationItem(): Promise<StudentTrainingTransactionEntity>;
     /**
      * Retrieves the original transaction that was canceled by this cancellation transaction
      * Only applicable if this is a cancellation transaction
      * @returns The original transaction entity that was canceled
      */
-    getByRefTransaction(): Promise<StudentTrainingTransactionEntity>;
+    getOriginalTransaction(): Promise<StudentTrainingTransactionEntity>;
     getRegisteredBy(): Promise<CompanyInstructorEntity>;
     getApprovedBy(): Promise<CompanyInstructorEntity>;
     getCanceledBy(): Promise<CompanyInstructorEntity>;

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

@@ -59,14 +59,14 @@ let StudentTrainingTransactionEntity = StudentTrainingTransactionEntity_1 = clas
         return await this.training;
     }
     /**
-     * Retrieves the referenced transaction (typically a cancellation transaction)
-     * @returns The related transaction entity or undefined if no reference exists
+     * Retrieves the cancellation item for this transaction (if registered)
+     * @returns The related cancellation transaction entity or undefined if no reference exists
      */
-    async getRefTransaction() {
-        if (!this.refTransactionId)
+    async getCancellationItem() {
+        if (!this.cancellationItemId)
             return;
         return await StudentTrainingTransactionEntity_1.findOneBy({
-            id: this.refTransactionId
+            id: this.cancellationItemId
         });
     }
     /**
@@ -74,9 +74,9 @@ let StudentTrainingTransactionEntity = StudentTrainingTransactionEntity_1 = clas
      * Only applicable if this is a cancellation transaction
      * @returns The original transaction entity that was canceled
      */
-    async getByRefTransaction() {
+    async getOriginalTransaction() {
         return await StudentTrainingTransactionEntity_1.findOneBy({
-            refTransactionId: this.id
+            cancellationItemId: this.id
         });
     }
     async getRegisteredBy() {
@@ -193,7 +193,7 @@ __decorate([
         default: null
     }),
     __metadata("design:type", Number)
-], StudentTrainingTransactionEntity.prototype, "refTransactionId", void 0);
+], StudentTrainingTransactionEntity.prototype, "cancellationItemId", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: 'simple-json',

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

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

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

@@ -1,12 +1,12 @@
 import { Activity, Student } from '@driveup/common';
 import { AccountStatus, Language, Person, Preference, PreferenceScope, ProductType, ProgramType } from '@driveup/shared';
+import { UserEntity } from '../../user/user.entity';
+import { TrackableEntity } from '../../utils/trackable';
+import { CompanyEntity } from '../company/company.entity';
+import { StudentLicenceEntity } from './program/licence/licence.entity';
 import { StudentMedicalCertificateEntity } from './program/medical/certificate.entity';
 import { StudentMedicalExaminationEntity } from './program/medical/examination.entity';
-import { StudentLicenceEntity } from './program/licence/licence.entity';
-import { CompanyEntity } from '../company/company.entity';
 import { StudentProgramEntity } from './program/program.entity';
-import { UserEntity } from '../../user/user.entity';
-import { TrackableEntity } from '../../utils/trackable';
 export declare class StudentEntity extends TrackableEntity<Student> {
     /**
      * Reference to the user account associated with this student profile
@@ -106,10 +106,11 @@ export declare class StudentEntity extends TrackableEntity<Student> {
     /**
      * Log student event
      * @param event Event type
-     * @param entityId The id of the entity associated with the log entry
-     * @param metadata Content render data (in student language)
+     * @param metadata Content render data
+     * @param author Log author of the event
+     * @param systemLog Whether to create an additional system log entry
      */
-    log(event: string, metadata?: any, entityId?: number): Promise<void>;
+    log(event: string, metadata?: any, author?: Person, systemLog?: boolean): Promise<void>;
     /**
      * Retrieves notification preferences as typed Preference instances
      * @returns Array of Preference objects or undefined if not set

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

@@ -14,16 +14,16 @@ exports.StudentEntity = void 0;
 const common_1 = require("@driveup/common");
 const shared_1 = require("@driveup/shared");
 const typeorm_1 = require("typeorm");
-const transaction_entity_1 = require("./program/training/transaction.entity");
-const certificate_entity_1 = require("./program/medical/certificate.entity");
-const examination_entity_1 = require("./program/medical/examination.entity");
-const training_entity_1 = require("./program/training/training.entity");
-const licence_entity_1 = require("./program/licence/licence.entity");
 const log_entity_1 = require("../../system/event/log.entity");
-const activity_helper_1 = require("../../utils/activity.helper");
-const program_entity_1 = require("./program/program.entity");
 const user_entity_1 = require("../../user/user.entity");
+const activity_helper_1 = require("../../utils/activity.helper");
 const trackable_1 = require("../../utils/trackable");
+const licence_entity_1 = require("./program/licence/licence.entity");
+const certificate_entity_1 = require("./program/medical/certificate.entity");
+const examination_entity_1 = require("./program/medical/examination.entity");
+const program_entity_1 = require("./program/program.entity");
+const training_entity_1 = require("./program/training/training.entity");
+const transaction_entity_1 = require("./program/training/transaction.entity");
 let StudentEntity = StudentEntity_1 = class StudentEntity extends trackable_1.TrackableEntity {
     /**
      * Creates an instance of StudentEntity
@@ -115,7 +115,7 @@ let StudentEntity = StudentEntity_1 = class StudentEntity extends trackable_1.Tr
             .andWhere('sp.studentId = :studentId', { studentId: this.id })
             .andWhere('tr.type = :paymentType', { paymentType: shared_1.TransactionType.Payment })
             .andWhere('tr.status != :canceledStatus', { canceledStatus: shared_1.StatusType.Canceled })
-            .andWhere('tr.refTransactionId is null')
+            .andWhere('tr.cancellationItemId is null')
             .select('SUM(COALESCE(tr.amount, 0))', 'total')
             .getRawOne();
         return Number(result?.total ?? 0);
@@ -134,19 +134,23 @@ let StudentEntity = StudentEntity_1 = class StudentEntity extends trackable_1.Tr
     /**
      * Log student event
      * @param event Event type
-     * @param entityId The id of the entity associated with the log entry
-     * @param metadata Content render data (in student language)
+     * @param metadata Content render data
+     * @param author Log author of the event
+     * @param systemLog Whether to create an additional system log entry
      */
-    async log(event, metadata, entityId) {
+    async log(event, metadata, author, systemLog) {
         if (!this.id)
             return;
+        author = author || await this.toPerson();
+        const systemContent = systemLog ? log_entity_1.LogEntity.toSystemContent(event, metadata) : null;
         await log_entity_1.LogEntity.from({
-            type: shared_1.LogType.Student,
+            feature: shared_1.Feature.Account,
             profile: { type: shared_1.ProfileType.Student, id: this.id },
+            author: author,
             event: event,
-            entityId: entityId,
+            entityId: this.id,
             content: log_entity_1.LogEntity.toStudentContent(event, this.language, metadata)
-        });
+        }, systemContent);
     }
     /**
      * Retrieves notification preferences as typed Preference instances

package/lib/profile/student/student.entity.js.map

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

package/lib/public/learning-hub.entity.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PublicLearningHubItemEntity = void 0;
 const shared_1 = require("@driveup/shared");
 const typeorm_1 = require("typeorm");
-// TODO: come up with better name (publicLearningResource?)
 let PublicLearningHubItemEntity = class PublicLearningHubItemEntity extends typeorm_1.BaseEntity {
     /************************* Methods *************************/
     constructor(props) {

package/lib/public/learning-hub.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"learning-hub.entity.js","sourceRoot":"","sources":["../../src/public/learning-hub.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAwD;AACxD,qCAA6E;AAE7E,2DAA2D;AAEpD,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,oBAAU;IA+D1D,6DAA6D;IAE7D,YAAY,KAA4C;QACvD,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACD,CAAA;AArEY,kEAA2B;AAMvC;IADC,IAAA,gCAAsB,GAAE;;uDACd;AAWX;IANC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,iBAAQ;QACd,OAAO,EAAE,iBAAQ,CAAC,EAAE;QACpB,QAAQ,EAAE,KAAK;KACf,CAAC;;6DACiB;AAQnB;IANC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,oBAAW;QACjB,OAAO,EAAE,oBAAW,CAAC,OAAO;QAC5B,QAAQ,EAAE,KAAK;KACf,CAAC;;4DACmB;AASrB;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;0DACY;AASd;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;gEACkB;AASpB;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,CAAC;KACV,CAAC;;yDACW;AASb;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;6DACe;sCA7DL,2BAA2B;IADvC,IAAA,gBAAM,EAAC,wBAAwB,CAAC;;GACpB,2BAA2B,CAqEvC"}
+{"version":3,"file":"learning-hub.entity.js","sourceRoot":"","sources":["../../src/public/learning-hub.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAwD;AACxD,qCAA6E;AAGtE,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,oBAAU;IA+D1D,6DAA6D;IAE7D,YAAY,KAA4C;QACvD,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACD,CAAA;AArEY,kEAA2B;AAMvC;IADC,IAAA,gCAAsB,GAAE;;uDACd;AAWX;IANC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,iBAAQ;QACd,OAAO,EAAE,iBAAQ,CAAC,EAAE;QACpB,QAAQ,EAAE,KAAK;KACf,CAAC;;6DACiB;AAQnB;IANC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,oBAAW;QACjB,OAAO,EAAE,oBAAW,CAAC,OAAO;QAC5B,QAAQ,EAAE,KAAK;KACf,CAAC;;4DACmB;AASrB;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;0DACY;AASd;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;gEACkB;AASpB;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,CAAC;KACV,CAAC;;yDACW;AASb;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;6DACe;sCA7DL,2BAA2B;IADvC,IAAA,gBAAM,EAAC,wBAAwB,CAAC;;GACpB,2BAA2B,CAqEvC"}

package/lib/system/event/log.entity.d.ts

@@ -1,12 +1,10 @@
-import { Activity, Log } from '@driveup/common';
-import { LogType, SelectedProfile } from '@driveup/shared';
+import { Log } from '@driveup/common';
+import { Feature, Person, SelectedProfile } from '@driveup/shared';
 import { BaseEntity } from 'typeorm';
 /**
- * Represents a system log entry for tracking events and activities.
+ * Represents a profile log entry for tracking events and activities.
  * Logs record important actions and changes across different entity types
  * (users, companies, agents, etc.) and can be localized for display.
- *
- * @extends TrackableEntity
  */
 export declare class LogEntity extends BaseEntity {
     /**
@@ -20,18 +18,24 @@ export declare class LogEntity extends BaseEntity {
      * @example 'user.identity.nameChanged'
      */
     event: string;
+    /**
+     * The feature associated with the log entry.
+     * This helps to identify the context of the log entry.
+     * @type {Feature}
+     */
+    feature: Feature;
     /**
      * The type of event that is being logged.
      * This can be used to categorize the log entry.
-     * @type {LogType}
+     * @type {ProfileType}
      */
-    type: LogType;
+    profile: SelectedProfile;
     /**
      * The profile selected when the log was created.
      * This helps to identify the context of the log entry.
      * @type {SelectedProfile}
      */
-    profile: SelectedProfile;
+    author: Person;
     /**
      * The id of the entity associated with the log entry.
      * In relation with logType, can be userId, trainingId, productId, etc.
@@ -60,18 +64,12 @@ export declare class LogEntity extends BaseEntity {
      * @returns Log model with type, event, content, and creation date
      */
     toModel(): Log;
-    /**
-     * Converts the entity to a Log model instance
-     * @returns Log model with type, event, content, and creation date
-     */
-    toSummary(): Log;
     /**
      * Creates and saves a new log entry
      * @param props - Properties for the new log entry
      * @returns Promise that resolves when the log is saved
      */
-    static from(props: Partial<LogEntity>): Promise<void>;
-    static system(event: string, metadata: any, entityId?: number): Promise<void>;
+    static from(props: Partial<LogEntity>, systemContent?: string): Promise<void>;
     /**
      * Generates localized content for user log entries
      * @param event - The event identifier
@@ -113,6 +111,22 @@ export declare class LogEntity extends BaseEntity {
      */
     static toCompanyContent(event: string, lang: string, metadata?: any): string;
     static toSystemContent(event: string, metadata?: any): string;
-    static toJobContent(event: string, metadata?: any): string;
-    getActivities(): Promise<Activity[]>;
+}
+export declare class SystemLogEntity extends LogEntity {
+    /**
+     * Creates a new LogEntity instance
+     * @param props - Partial properties to initialize the entity
+     */
+    constructor(props?: Partial<LogEntity>);
+    /**
+     * Converts the entity to a Log model instance
+     * @returns Log model with type, event, content, and creation date
+     */
+    toModel(): Log;
+    /**
+     * Creates and saves a new log entry
+     * @param props - Properties for the new log entry
+     * @returns Promise that resolves when the log is saved
+     */
+    static from(props: Partial<LogEntity>): Promise<void>;
 }

package/lib/system/event/log.entity.js

@@ -10,19 +10,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var LogEntity_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogEntity = void 0;
+exports.SystemLogEntity = exports.LogEntity = void 0;
 const common_1 = require("@driveup/common");
 const shared_1 = require("@driveup/shared");
 const nestjs_i18n_1 = require("nestjs-i18n");
 const typeorm_1 = require("typeorm");
-const activity_helper_1 = require("../../utils/activity.helper");
-const DELIMITER = '.log.';
 /**
- * Represents a system log entry for tracking events and activities.
+ * Represents a profile log entry for tracking events and activities.
  * Logs record important actions and changes across different entity types
  * (users, companies, agents, etc.) and can be localized for display.
- *
- * @extends TrackableEntity
  */
 let LogEntity = LogEntity_1 = class LogEntity extends typeorm_1.BaseEntity {
     /**
@@ -39,35 +35,29 @@ let LogEntity = LogEntity_1 = class LogEntity extends typeorm_1.BaseEntity {
      */
     toModel() {
         return new common_1.Log({
-            type: this.type,
+            author: this.author,
+            profile: this.profile,
             event: this.event,
             content: this.content,
             createdOn: this.createdOn
         });
     }
-    /**
-     * Converts the entity to a Log model instance
-     * @returns Log model with type, event, content, and creation date
-     */
-    toSummary() {
-        return this.toModel();
-    }
     /**
      * Creates and saves a new log entry
      * @param props - Properties for the new log entry
      * @returns Promise that resolves when the log is saved
      */
-    static async from(props) {
+    static async from(props, systemContent) {
+        if (!props?.content || props.content.length === 0)
+            return;
         const entity = new LogEntity_1(props);
         await entity.save();
-    }
-    static async system(event, metadata, entityId) {
-        await LogEntity_1.from({
-            type: shared_1.LogType.System,
-            event,
-            entityId: entityId,
-            content: LogEntity_1.toSystemContent(event, metadata)
-        });
+        if (systemContent) {
+            await SystemLogEntity.from({
+                ...props,
+                content: systemContent,
+            });
+        }
     }
     /**
      * Generates localized content for user log entries
@@ -77,9 +67,13 @@ let LogEntity = LogEntity_1 = class LogEntity extends typeorm_1.BaseEntity {
      * @returns Localized log content string, or empty string if translation not found
      */
     static toUserContent(event, lang, metadata) {
-        const key = event + DELIMITER + shared_1.LogType.User;
-        const content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
-        return content === key ? '' : content;
+        let key = `${event}.log.user`;
+        let content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
+        if (key === content) {
+            key = `${event}.log`;
+            content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
+        }
+        return content === key ? null : content;
     }
     /**
      * Generates localized content for student log entries
@@ -89,9 +83,13 @@ let LogEntity = LogEntity_1 = class LogEntity extends typeorm_1.BaseEntity {
      * @returns Localized log content string, or empty string if translation not found
      */
     static toStudentContent(event, lang, metadata) {
-        const key = event + DELIMITER + shared_1.LogType.Student;
-        const content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
-        return content === key ? '' : content;
+        let key = `${event}.log.${shared_1.ProfileType.Student}`;
+        let content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
+        if (key === content) {
+            key = `${event}.log`;
+            content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
+        }
+        return content === key ? null : content;
     }
     /**
      * Generates localized content for agent log entries
@@ -101,9 +99,13 @@ let LogEntity = LogEntity_1 = class LogEntity extends typeorm_1.BaseEntity {
      * @returns Localized log content string, or empty string if translation not found
      */
     static toAgentContent(event, lang, metadata) {
-        const key = event + DELIMITER + shared_1.LogType.Agent;
-        const content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
-        return content === key ? '' : content;
+        let key = `${event}.log.${shared_1.ProfileType.Agent}`;
+        let content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
+        if (key === content) {
+            key = `${event}.log`;
+            content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
+        }
+        return content === key ? null : content;
     }
     /**
      * Generates localized content for instructor log entries
@@ -113,9 +115,13 @@ let LogEntity = LogEntity_1 = class LogEntity extends typeorm_1.BaseEntity {
      * @returns Localized log content string, or empty string if translation not found
      */
     static toInstructorContent(event, lang, metadata) {
-        const key = event + DELIMITER + shared_1.LogType.Instructor;
-        const content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
-        return content === key ? '' : content;
+        let key = `${event}.log.${shared_1.ProfileType.Instructor}`;
+        let content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
+        if (key === content) {
+            key = `${event}.log`;
+            content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
+        }
+        return content === key ? null : content;
     }
     /**
      * Generates localized content for company log entries
@@ -125,24 +131,22 @@ let LogEntity = LogEntity_1 = class LogEntity extends typeorm_1.BaseEntity {
      * @returns Localized log content string, or empty string if translation not found
      */
     static toCompanyContent(event, lang, metadata) {
-        const key = event + DELIMITER + shared_1.LogType.Company;
-        const content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
-        return content === key ? '' : content;
+        let key = `${event}.log.${shared_1.ProfileType.Company}`;
+        let content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
+        if (key === content) {
+            key = `${event}.log`;
+            content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang });
+        }
+        return content === key ? null : content;
     }
     static toSystemContent(event, metadata) {
-        const key = event + DELIMITER + shared_1.LogType.System;
-        const content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang: 'en' });
-        return content === key ? '' : content;
-    }
-    static toJobContent(event, metadata) {
-        const key = event + DELIMITER + shared_1.LogType.Job;
-        const content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang: 'en' });
-        return content === key ? '' : content;
-    }
-    async getActivities() {
-        const activities = [];
-        activities.push(await (0, activity_helper_1.toActivity)(null, this.createdOn, shared_1.ActivityType.created));
-        return activities.filter(a => a);
+        let key = `${event}.log.system`;
+        let content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang: 'en' });
+        if (key === content) {
+            key = `${event}.log`;
+            content = nestjs_i18n_1.I18nContext.current().t(key, { args: metadata, lang: 'en' });
+        }
+        return content === key ? null : content;
     }
 };
 exports.LogEntity = LogEntity;
@@ -157,25 +161,28 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({
         type: 'enum',
-        enum: shared_1.LogType,
-        default: shared_1.LogType.User,
-        nullable: true
+        enum: shared_1.Feature,
+        default: shared_1.Feature.Account
     }),
     __metadata("design:type", String)
-], LogEntity.prototype, "type", void 0);
+], LogEntity.prototype, "feature", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: 'simple-json',
-        nullable: true,
-        default: null
+        nullable: true
     }),
     __metadata("design:type", Object)
 ], LogEntity.prototype, "profile", void 0);
 __decorate([
     (0, typeorm_1.Column)({
+        type: 'json',
         nullable: true,
         default: null
     }),
+    __metadata("design:type", shared_1.Person)
+], LogEntity.prototype, "author", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
     __metadata("design:type", Number)
 ], LogEntity.prototype, "entityId", void 0);
 __decorate([
@@ -190,7 +197,46 @@ __decorate([
     __metadata("design:type", Date)
 ], LogEntity.prototype, "createdOn", void 0);
 exports.LogEntity = LogEntity = LogEntity_1 = __decorate([
-    (0, typeorm_1.Entity)('systemLogs'),
+    (0, typeorm_1.Entity)('logs'),
     __metadata("design:paramtypes", [Object])
 ], LogEntity);
+let SystemLogEntity = class SystemLogEntity extends LogEntity {
+    /**
+     * Creates a new LogEntity instance
+     * @param props - Partial properties to initialize the entity
+     */
+    constructor(props) {
+        super();
+        Object.assign(this, props);
+    }
+    /**
+     * Converts the entity to a Log model instance
+     * @returns Log model with type, event, content, and creation date
+     */
+    toModel() {
+        return new common_1.Log({
+            author: this.author,
+            profile: this.profile,
+            event: this.event,
+            content: this.content,
+            createdOn: this.createdOn
+        });
+    }
+    /**
+     * Creates and saves a new log entry
+     * @param props - Properties for the new log entry
+     * @returns Promise that resolves when the log is saved
+     */
+    static async from(props) {
+        if (!props?.content || props.content.length === 0)
+            return;
+        const entity = new LogEntity(props);
+        await entity.save();
+    }
+};
+exports.SystemLogEntity = SystemLogEntity;
+exports.SystemLogEntity = SystemLogEntity = __decorate([
+    (0, typeorm_1.Entity)('systemLogs'),
+    __metadata("design:paramtypes", [Object])
+], SystemLogEntity);
 //# sourceMappingURL=log.entity.js.map

package/lib/system/event/log.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.entity.js","sourceRoot":"","sources":["../../../src/system/event/log.entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"log.entity.js","sourceRoot":"","sources":["../../../src/system/event/log.entity.ts"],"names":[],"mappings":"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"}