@boarteam/boar-pack-users-backend 5.2.1 → 5.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boarteam/boar-pack-users-backend",
-  "version": "5.2.1",
+  "version": "5.3.1",
   "description": "NestJS Users module including permissions system, authentication strategies etc",
   "main": "src/index",
   "files": [
@@ -60,5 +60,5 @@
     "yalc:push": "yalc push",
     "gen-types": "SWAGGER=true JWT_SECRET=swagger nest start"
   },
-  "gitHead": "5375680e9ca5595408afe3c2e902620717182f85"
+  "gitHead": "00a92888f2e0604ff6806655523913426657e72f"
 }

package/src/event-logs/event-logs.interceptor.ts

@@ -57,17 +57,13 @@ export class EventLogInterceptor implements NestInterceptor {
         logEntry.duration = Date.now() - now;
         logEntry.statusCode = response.statusCode;
         logEntry.logLevel = response.statusCode >= 500 ? LogLevel.ERROR : (response.statusCode >= 400 ? LogLevel.WARNING : LogLevel.INFO);
-        this.eventLogService.audit(logEntry, request).catch((error) => {
-          this.logger.error(`Failed to log event: ${error.message}`);
-        });
+        this.eventLogService.audit(logEntry, request);
       }),
       catchError((error: HttpException) => {
         logEntry.duration = Date.now() - now;
         logEntry.statusCode = error?.getStatus?.() || 500;
         logEntry.logLevel = logEntry.statusCode >= 500 ? LogLevel.ERROR : LogLevel.WARNING;
-        this.eventLogService.audit(logEntry, request).catch((error) => {
-          this.logger.error(`Failed to log event: ${error.message}`);
-        });
+        this.eventLogService.audit(logEntry, request);
         return throwError(() => error);
       }),
     );

package/src/event-logs/event-logs.middleware.ts

@@ -50,9 +50,7 @@ export class EventLogMiddleware implements NestMiddleware {
             ? LogLevel.WARNING
             : LogLevel.INFO;
 
-      this.eventLogService.audit(logEntry, req).catch((error) => {
-        this.logger.error(`Failed to log event: ${error.message}`);
-      });
+      this.eventLogService.audit(logEntry, req);
     });
 
     next();

package/src/event-logs/event-logs.module.ts

@@ -12,6 +12,7 @@ import { CONFIGURE_EVENTS_MIDDLEWARE, SERVICE_CONFIG_TOKEN } from "./event-logs.
 import { TEventLogServiceConfig } from "./event-logs.types";
 import { EventLogsLogger } from "./event-logs.logger";
 import { EventLogMiddleware } from "./event-logs.middleware";
+import { ScheduleModule } from "@nestjs/schedule";
 
 @Module({})
 export class EventLogsModule implements NestModule {
@@ -49,6 +50,7 @@ export class EventLogsModule implements NestModule {
       module: EventLogsModule,
       imports: [
         CaslModule.forFeature(),
+        ScheduleModule.forRoot(),
         TypeOrmModule.forFeature([EventLog], config.dataSourceName),
       ],
       providers: [

package/src/event-logs/event-logs.service.ts

@@ -5,6 +5,7 @@ import { DataSource, Repository } from 'typeorm';
 import { Request } from 'express';
 import { Roles } from "../users";
 import { EventLogTimelineDto } from "./dto/event-log-timeline.dto";
+import { Cron, CronExpression } from "@nestjs/schedule";
 import moment from "moment";
 import 'moment-timezone';
 
@@ -13,6 +14,7 @@ type TInterval = 'second' | 'minute' | 'hour' | 'day' | 'week';
 @Injectable()
 export class EventLogsService extends TypeOrmCrudService<EventLog> {
   private static requestHandled = Symbol('requestHandled');
+  private logsStore: Partial<EventLog>[] = [];
 
   private readonly logger = new Logger(EventLogsService.name);
 
@@ -28,7 +30,37 @@ export class EventLogsService extends TypeOrmCrudService<EventLog> {
     super(repo);
   }
 
-  async audit(eventLog: Partial<EventLog>, request?: Request): Promise<void> {
+  @Cron(CronExpression.EVERY_10_SECONDS)
+  private async saveAccumulatedLogs(): Promise<void> {
+    if (this.logsStore.length > 0) {
+      const logs = [...this.logsStore];
+      this.logger.verbose('Reset event logs store variable');
+      this.logsStore = [];
+
+      await this.repo.save(logs).catch(e => {
+        // DO NOT USE LOGGER HERE - it will cause infinite loop
+        console.error('Error while saving logs');
+        console.error(e);
+      });
+    }
+  }
+
+  @Cron(CronExpression.EVERY_WEEK)
+  private async deleteOldEventLogs() {
+    const threeMonthsAgo = new Date();
+    threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 2);
+
+    const result = await this.repo
+      .createQueryBuilder()
+      .delete()
+      .from(EventLog)
+      .where('created_at <= :threeMonthsAgo', { threeMonthsAgo })
+      .execute();
+
+    this.logger.debug(`Removed ${result.affected} expired records from event_logs table.`);
+  }
+
+  audit(eventLog: Partial<EventLog>, request?: Request): void {
     // @ts-ignore
     if (request?.[EventLogsService.requestHandled]) {
       this.logger.debug('Request already handled');
@@ -54,7 +86,7 @@ export class EventLogsService extends TypeOrmCrudService<EventLog> {
       request[EventLogsService.requestHandled] = true;
     }
 
-    await this.repo.save({
+    this.logsStore.push({
       ...logPartial,
       ...eventLog,
       logType: LogType.AUDIT,
@@ -66,8 +98,9 @@ export class EventLogsService extends TypeOrmCrudService<EventLog> {
     return request?.[EventLogsService.requestHandled];
   }
 
+  // TODO: Remove async in the next major version (breaking change)
   async operationalLog(eventLog: Partial<EventLog>): Promise<void> {
-    await this.repo.save({
+    this.logsStore.push({
       logLevel: LogLevel.INFO,
       userRole: UserRole.SYSTEM,
       ...eventLog,
@@ -76,15 +109,11 @@ export class EventLogsService extends TypeOrmCrudService<EventLog> {
   }
 
   public applicationLog(eventLog: Partial<EventLog>): void {
-    this.repo.save({
+    this.logsStore.push({
       logLevel: LogLevel.INFO,
       userRole: UserRole.SYSTEM,
       ...eventLog,
       logType: LogType.APPLICATION,
-    }).catch(e => {
-      // DO NOT USE LOGGER HERE - it will cause infinite loop
-      console.error('Error while saving application log');
-      console.error(e);
     });
   }