Skip to content
Open
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 { AppLogger } from './core/logging/app-logger.service';

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

@Injectable({ scope: Scope.TRANSIENT })
export class AppLogger extends ConsoleLogger {
constructor(context?: string) {
super(context);
}
}
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 {}
5 changes: 3 additions & 2 deletions server/src/system.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ import {
import { promises as fs } from 'fs';
import { join, resolve } from 'path';
import { existsSync } from 'fs';
import { AppLogger } from './core/logging/app-logger.service';

@Injectable()
export class SystemService {
private readonly uploadsDir = join(process.cwd(), 'uploads');

constructor() {
constructor(private readonly logger: AppLogger) {
this.findOrCreateUserDirectory(this.uploadsDir);
console.log('uploadsDir', this.uploadsDir);
Comment thread
frattezi marked this conversation as resolved.
this.logger.log('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 {}
31 changes: 23 additions & 8 deletions server/src/users/users.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,35 @@ 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();
const users = await this.prisma.user.findMany();
this.logger.log(`Users fetched successfully. Total users:${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.log(`Upserting user with email ${user.email}`);
try {
const result = await this.prisma.user.upsert({
where: { email: user.email },
update: user,
create: user,
});
this.logger.log(`User upserted successfully with email ${user.email}`);
return result;
} catch (error) {
this.logger.error(`Failed to upsert user with email ${user.email}`);
throw error;
}
}
}
3 changes: 2 additions & 1 deletion server/src/videos/videos.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import { Module } from '@nestjs/common';
import { VideosService } from './videos.service';
import { VideosController } from './videos.controller';
import { SystemService } from 'src/system.service';
import { AppLogger } from 'src/core/logging/app-logger.service';

@Module({
imports: [],
controllers: [VideosController],
providers: [VideosService, SystemService],
providers: [VideosService, SystemService, AppLogger],
})
export class VideosModule {}