User profiles

.eslintrc.js

@@ -2,10 +2,11 @@ module.exports = {
   ignorePatterns: ['.eslintrc.js'],
   parserOptions: {
     parser: '@typescript-eslint/parser',
-    project: './tsconfig.json',
+    project: ['./tsconfig.json', './*/tsconfig.json'],
     tsconfigRootDir: __dirname,
     sourceType: 'module',
     ecmaVersion: 2021,
+    createDefaultProgram: false,
   },
   plugins: ['@typescript-eslint', 'prettier', 'import', 'unused-imports'], // Merged plugins from both files
   extends: [
@@ -36,8 +37,13 @@ module.exports = {
     ],
     '@typescript-eslint/lines-between-class-members': [
       'warn',
-      'always',
-      { exceptAfterSingleLine: true },
+      {
+        enforce: [
+          { blankLine: 'any', prev: '*', next: 'field' },
+          { blankLine: 'any', prev: 'field', next: '*' },
+          { blankLine: 'always', prev: '*', next: 'method' },
+        ],
+      },
     ],
     'padding-line-between-statements': 'off',
     '@typescript-eslint/padding-line-between-statements': [

.git-blame-ignore-revs

@@ -3,3 +3,5 @@
 
 # Linting commits
 6efc953b9f7f648f2be59295a78ce1180f12b32d
+f52bdcb555ffa1ed02ae8918b04500c9cee52bfd
+23b7f2d5ca99b69ea1e50667fdb9c9795d55195f

NoteBlockWorld.code-workspace

@@ -1,36 +1,46 @@
 {
-  "folders": [
-    {
-      "path": ".",
-      "name": "Root"
-    },
-    {
-      "path": "./server",
-      "name": "Backend"
-    },
-    {
-      "path": "./shared",
-      "name": "Shared"
-    },
-    {
-      "path": "./web",
-      "name": "Frontend"
+    "folders": [
+        {
+            "path": ".",
+            "name": "Root"
+        },
+        {
+            "path": "./server",
+            "name": "Backend"
+        },
+        {
+            "path": "./shared",
+            "name": "Shared"
+        },
+        {
+            "path": "./web",
+            "name": "Frontend"
+        }
+    ],
+    "settings": {
+        "window.title": "${dirty}${rootName}",
+        "editor.formatOnSave": true,
+        "eslint.validate": [
+            "typescript"
+        ],
+        "eslint.run": "onType",
+        "eslint.format.enable": true,
+        "mdx.server.enable": true,
+        "editor.codeActionsOnSave": {
+            "source.fixAll": "explicit"
+        },
+        "jest.disabledWorkspaceFolders": [
+            "Root",
+            "Frontend"
+        ],
+        "search.exclude": {
+            "**/.git": true,
+            "**/node_modules": true,
+            "**/dist": true,
+        },
+        "cSpell.words": [
+            "Bentroen",
+            "Tomast"
+        ]
     }
-  ],
-  "settings": {
-    "editor.formatOnSave": true,
-    "eslint.validate": ["typescript"],
-    "eslint.run": "onType",
-    "eslint.format.enable": true,
-    "mdx.server.enable": true,
-    "editor.codeActionsOnSave": {
-      "source.fixAll": "explicit"
-    },
-    "jest.disabledWorkspaceFolders": ["Root", "Frontend"],
-    "search.exclude": {
-      "**/.git": true,
-      "**/node_modules": true,
-      "**/dist": true,
-    }
-  }
-}
+}

server/src/auth/auth.controller.ts

@@ -22,6 +22,7 @@ import { MagicLinkEmailStrategy } from './strategies/magicLinkEmail.strategy';
 @ApiTags('auth')
 export class AuthController {
   private readonly logger = new Logger(AuthController.name);
+
   constructor(
     @Inject(AuthService)
     private readonly authService: AuthService,

server/src/auth/auth.service.ts

@@ -16,6 +16,7 @@ import { TokenPayload, Tokens } from './types/token';
 @Injectable()
 export class AuthService {
   private readonly logger = new Logger(AuthService.name);
+
   constructor(
     @Inject(UserService)
     private readonly userService: UserService,

server/src/auth/strategies/JWT.strategy.ts

@@ -7,6 +7,7 @@ import { ExtractJwt, Strategy } from 'passport-jwt';
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy, 'jwt-refresh') {
   private static logger = new Logger(JwtStrategy.name);
+
   constructor(@Inject(ConfigService) config: ConfigService) {
     const JWT_SECRET = config.getOrThrow('JWT_SECRET');
 

server/src/auth/strategies/discord.strategy/Strategy.ts

@@ -35,6 +35,7 @@ export default class Strategy extends OAuth2Strategy {
   private fetchScopeEnabled: boolean;
   public override name = 'discord';
   prompt?: string;
+
   public constructor(options: DiscordStrategyConfig, verify: VerifyFunction) {
     super(
       {

server/src/auth/strategies/discord.strategy/index.ts

@@ -8,6 +8,7 @@ import { DiscordPermissionScope } from './types';
 @Injectable()
 export class DiscordStrategy extends PassportStrategy(strategy, 'discord') {
   private static logger = new Logger(DiscordStrategy.name);
+
   constructor(
     @Inject(ConfigService)
     configService: ConfigService,

server/src/auth/strategies/github.strategy.ts

@@ -6,6 +6,7 @@ import strategy from 'passport-github';
 @Injectable()
 export class GithubStrategy extends PassportStrategy(strategy, 'github') {
   private static logger = new Logger(GithubStrategy.name);
+
   constructor(
     @Inject(ConfigService)
     configService: ConfigService,

server/src/auth/strategies/google.strategy.ts

@@ -6,6 +6,7 @@ import { Strategy, VerifyCallback } from 'passport-google-oauth20';
 @Injectable()
 export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
   private static logger = new Logger(GoogleStrategy.name);
+
   constructor(
     @Inject(ConfigService)
     configService: ConfigService,

server/src/song/entity/song.entity.ts

@@ -24,10 +24,10 @@ export class Song {
   publicId: string;
 
   @Prop({ type: MongooseSchema.Types.Date, required: true, default: Date.now })
-  createdAt: Date;
+  createdAt: Date; // Added automatically by Mongoose: https://mongoosejs.com/docs/timestamps.html
 
   @Prop({ type: MongooseSchema.Types.Date, required: true, default: Date.now })
-  updatedAt: Date;
+  updatedAt: Date; // Added automatically by Mongoose: https://mongoosejs.com/docs/timestamps.html
 
   @Prop({ type: MongooseSchema.Types.ObjectId, required: true, ref: 'User' })
   uploader: Types.ObjectId;
@@ -57,7 +57,7 @@ export class Song {
   @Prop({ type: ThumbnailData, required: true })
   thumbnailData: ThumbnailData;
 
-  @Prop({ type: String, required: true })
+  @Prop({ type: String, required: true, index: true })
   category: CategoryType;
 
   @Prop({ type: String, required: true })
@@ -72,13 +72,13 @@ export class Song {
   @Prop({ type: Boolean, required: true, default: true })
   allowDownload: boolean;
 
-  @Prop({ type: String, required: true })
+  @Prop({ type: String, required: true, index: true })
   title: string;
 
-  @Prop({ type: String, required: false })
+  @Prop({ type: String, required: false, index: true })
   originalAuthor: string;
 
-  @Prop({ type: String, required: false })
+  @Prop({ type: String, required: false, index: true })
   description: string;
 
   // SONG FILE ATTRIBUTES (Populated from NBS file - immutable)

server/src/song/song.service.spec.ts

@@ -10,6 +10,7 @@ import mongoose, { Model } from 'mongoose';
 
 import { FileService } from '@server/file/file.service';
 import { UserDocument } from '@server/user/entity/user.entity';
+import { UserService } from '@server/user/user.service';
 
 import {
   SongDocument,
@@ -39,10 +40,17 @@ const mockSongWebhookService = {
   syncSongWebhook: jest.fn(),
 };
 
+const mockUserService = {
+  getUserByEmailOrId: jest.fn(),
+  getUserPaginated: jest.fn(),
+  getSelfUserData: jest.fn(),
+};
+
 describe('SongService', () => {
   let service: SongService;
   let fileService: FileService;
   let songUploadService: SongUploadService;
+  let userService: UserService;
   let songModel: Model<SongEntity>;
 
   beforeEach(async () => {
@@ -65,12 +73,17 @@ describe('SongService', () => {
           provide: SongUploadService,
           useValue: mockSongUploadService,
         },
+        {
+          provide: UserService,
+          useValue: mockUserService,
+        },
       ],
     }).compile();
 
     service = module.get<SongService>(SongService);
     fileService = module.get<FileService>(FileService);
     songUploadService = module.get<SongUploadService>(SongUploadService);
+    userService = module.get<UserService>(UserService);
     songModel = module.get<Model<SongEntity>>(getModelToken(SongEntity.name));
   });