Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module.exports = {
},
ignorePatterns: ['.eslintrc.js'],
rules: {
'no-console': 'error',
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
Expand Down
3 changes: 2 additions & 1 deletion server/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import { UsersModule } from './users/users.module';
import { VideosModule } from './videos/videos.module';
import { PrismaService } from './prisma.service';
import { SystemService } from './system.service';
import { LoggerModule } from './core/logging/logger.module';

@Module({
imports: [UsersModule, VideosModule],
imports: [UsersModule, VideosModule, LoggerModule],
providers: [SystemService, PrismaService], // Do I need PrismaService here?
})
export class AppModule {}
19 changes: 19 additions & 0 deletions server/src/core/logging/app-logger.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { Injectable, Scope, ConsoleLogger } from '@nestjs/common';

type LogMeta = Record<string, unknown>;

@Injectable({ scope: Scope.TRANSIENT })
export class AppLogger extends ConsoleLogger {
customLog(message: string, meta?: LogMeta): string {
if (!meta || Object.keys(meta).length === 0) return message;
return `${message} | meta=${this.safeStringify(meta)}`;
}

private safeStringify(value: unknown): string {
try {
return JSON.stringify(value);
} catch {
return '[unserializable-meta]';
}
}
}
8 changes: 8 additions & 0 deletions server/src/core/logging/logger.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { Module } from '@nestjs/common';
import { AppLogger } from './app-logger.service';

@Module({
providers: [AppLogger],
exports: [AppLogger],
})
export class LoggerModule {}
11 changes: 9 additions & 2 deletions server/src/system.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,21 @@ import {
import { promises as fs } from 'fs';
import { join, resolve } from 'path';
import { existsSync } from 'fs';
import { AppLogger } from 'src/core/logging/app-logger.service';

@Injectable()
export class SystemService {
private readonly uploadsDir = join(process.cwd(), 'uploads');
constructor(private readonly logger: AppLogger) {
this.logger.setContext(SystemService.name);

constructor() {
this.findOrCreateUserDirectory(this.uploadsDir);
console.log('uploadsDir', this.uploadsDir);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update this using your logger


this.logger.debug(
this.logger.customLog('uploadsDir', {
uploadsDir: this.uploadsDir,
}),
);
}

/**
Expand Down
2 changes: 2 additions & 0 deletions server/src/users/users.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ import { Module } from '@nestjs/common';
import { UsersService } from './users.service';
import { UsersController } from './users.controller';
import { PrismaService } from 'src/prisma.service';
import { LoggerModule } from 'src/core/logging/logger.module';

@Module({
controllers: [UsersController],
imports: [LoggerModule],
providers: [UsersService, PrismaService],
})
export class UsersModule {}
53 changes: 47 additions & 6 deletions server/src/users/users.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,61 @@ import { Injectable } from '@nestjs/common';
import { User } from 'generated/prisma';
import { PrismaService } from 'src/prisma.service';
import { CreateUserDto } from './users.dto';
import { AppLogger } from 'src/core/logging/app-logger.service';

@Injectable()
export class UsersService {
constructor(private readonly prisma: PrismaService) {}
constructor(
private readonly prisma: PrismaService,
private readonly logger: AppLogger,
) {
this.logger.setContext(UsersService.name);
}

async get(): Promise<User[]> {
return this.prisma.user.findMany();
this.logger.log(
this.logger.customLog('Listing users', {
feature: 'users',
action: 'list',
}),
);
const users = await this.prisma.user.findMany();
this.logger.log(
this.logger.customLog('Users listed', {
count: users.length,
}),
);
return users;
}

async upsert(user: CreateUserDto): Promise<User> {
return this.prisma.user.upsert({
where: { email: user.email },
update: user,
create: user,
this.logger.customLog('Upserting user', {
feature: 'users',
action: 'upsert',
email: user.email,
});

try {
const saved = await this.prisma.user.upsert({
where: { email: user.email },
update: user,
create: user,
});
this.logger.log(
this.logger.customLog('User upserted', {
id: saved.id,
email: saved.email,
}),
);
return saved;
} catch (err) {
const message = err instanceof Error ? err.message : 'Unknown error';
this.logger.error(
this.logger.customLog('Upsert failed', {
email: user.email,
error: message,
}),
);
}
}
}