refactor: update imports to use centralized database module and clean up unused imports in auth and song services

Author: tomast1337

packages/backend/src/auth/auth.service.spec.ts

@@ -1,11 +1,9 @@
+import type { UserDocument } from '@nbw/database';
 import { JwtService } from '@nestjs/jwt';
 import { Test, TestingModule } from '@nestjs/testing';
+import { UserService } from '@server/user/user.service';
 import { beforeEach, describe, expect, it, jest, mock, spyOn } from 'bun:test';
 import type { Request, Response } from 'express';
-
-import type { UserDocument } from '@server/user/entity/user.entity';
-import { UserService } from '@server/user/user.service';
-
 import { AuthService } from './auth.service';
 import { Profile } from './types/profile';
 

packages/backend/src/auth/auth.service.ts

@@ -1,12 +1,10 @@
+import type { UserDocument } from '@nbw/database';
+import { CreateUser } from '@nbw/database';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import { CreateUser } from '@nbw/database';
+import { UserService } from '@server/user/user.service';
 import axios from 'axios';
 import type { Request, Response } from 'express';
-
-import type { UserDocument } from '@server/user/entity/user.entity';
-import { UserService } from '@server/user/user.service';
-
 import { DiscordUser } from './types/discordProfile';
 import { GithubAccessToken, GithubEmailList } from './types/githubProfile';
 import { GoogleProfile } from './types/googleProfile';

packages/backend/src/song/my-songs/my-songs.controller.spec.ts

@@ -1,11 +1,8 @@
+import type { UserDocument } from '@nbw/database';
+import { PageQueryDTO, SongPageDto } from '@nbw/database';
 import { HttpException } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { Test, TestingModule } from '@nestjs/testing';
-import { PageQueryDTO } from '@nbw/database';
-import { SongPageDto } from '@nbw/database';
-
-import type { UserDocument } from '@server/user/entity/user.entity';
-
 import { SongService } from '../song.service';
 import { MySongsController } from './my-songs.controller';
 

packages/backend/src/song/my-songs/my-songs.controller.ts

@@ -1,10 +1,9 @@
+import type { UserDocument } from '@nbw/database';
+import { PageQueryDTO, SongPageDto } from '@nbw/database';
 import { Controller, Get, Query, UseGuards } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { PageQueryDTO, SongPageDto } from '@nbw/database';
-
 import { GetRequestToken, validateUser } from '@server/lib/GetRequestUser';
-import type { UserDocument } from '@server/user/entity/user.entity';
 
 import { SongService } from '../song.service';
 

packages/backend/src/song/song-webhook/song-webhook.service.spec.ts

@@ -1,12 +1,11 @@
+import { Song as SongEntity, SongWithUser } from '@nbw/database';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { getModelToken } from '@nestjs/mongoose';
 import { Test, TestingModule } from '@nestjs/testing';
 import { beforeEach, describe, expect, it, jest, mock, spyOn } from 'bun:test';
 import { Model } from 'mongoose';
-
-import { SongWebhookService } from './song-webhook.service';
-import { Song as SongEntity, SongWithUser } from '../entity/song.entity';
 import { getUploadDiscordEmbed } from '../song.util';
+import { SongWebhookService } from './song-webhook.service';
 
 mock.module('../song.util', () => ({
   getUploadDiscordEmbed: jest.fn(),

packages/backend/src/song/song.controller.spec.ts

@@ -1,18 +1,16 @@
-import { HttpStatus, UnauthorizedException } from '@nestjs/common';
-import { AuthGuard } from '@nestjs/passport';
-import { Test, TestingModule } from '@nestjs/testing';
+import type { UserDocument } from '@nbw/database';
 import {
   PageQueryDTO,
   SongPreviewDto,
   SongViewDto,
   UploadSongDto,
   UploadSongResponseDto,
 } from '@nbw/database';
-import { Response } from 'express';
-
+import { HttpStatus, UnauthorizedException } from '@nestjs/common';
+import { AuthGuard } from '@nestjs/passport';
+import { Test, TestingModule } from '@nestjs/testing';
 import { FileService } from '@server/file/file.service';
-import type { UserDocument } from '@server/user/entity/user.entity';
-
+import { Response } from 'express';
 import { SongController } from './song.controller';
 import { SongService } from './song.service';
 

packages/backend/src/song/song.controller.ts

@@ -1,3 +1,13 @@
+import type { UserDocument } from '@nbw/database';
+import {
+  PageQueryDTO,
+  SongPreviewDto,
+  SongViewDto,
+  UploadConst,
+  UploadSongDto,
+  UploadSongResponseDto,
+} from '@nbw/database';
+import type { RawBodyRequest } from '@nestjs/common';
 import {
   Body,
   Controller,
@@ -16,7 +26,6 @@ import {
   UseGuards,
   UseInterceptors,
 } from '@nestjs/common';
-import type { RawBodyRequest } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { MulterOptions } from '@nestjs/platform-express/multer/interfaces/multer-options.interface';
@@ -27,20 +36,9 @@ import {
   ApiOperation,
   ApiTags,
 } from '@nestjs/swagger';
-import {
-  PageQueryDTO,
-  SongPreviewDto,
-  SongViewDto,
-  UploadSongDto,
-  UploadSongResponseDto,
-  UploadConst,
-} from '@nbw/database';
-import type { Response } from 'express';
-
 import { FileService } from '@server/file/file.service';
 import { GetRequestToken, validateUser } from '@server/lib/GetRequestUser';
-import type { UserDocument } from '@server/user/entity/user.entity';
-
+import type { Response } from 'express';
 import { SongService } from './song.service';
 
 // Handles public-facing song routes.

packages/backend/src/song/song.service.spec.ts

@@ -1,24 +1,20 @@
-import { HttpException } from '@nestjs/common';
-import { getModelToken } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
+import type { UserDocument } from '@nbw/database';
 import {
+  SongDocument,
+  Song as SongEntity,
   SongPreviewDto,
+  SongSchema,
   SongStats,
   SongViewDto,
+  SongWithUser,
   UploadSongDto,
   UploadSongResponseDto,
 } from '@nbw/database';
-import mongoose, { Model } from 'mongoose';
-
+import { HttpException } from '@nestjs/common';
+import { getModelToken } from '@nestjs/mongoose';
+import { Test, TestingModule } from '@nestjs/testing';
 import { FileService } from '@server/file/file.service';
-import type { UserDocument } from '@server/user/entity/user.entity';
-
-import {
-  SongDocument,
-  Song as SongEntity,
-  SongSchema,
-  SongWithUser,
-} from './entity/song.entity';
+import mongoose, { Model } from 'mongoose';
 import { SongUploadService } from './song-upload/song-upload.service';
 import { SongWebhookService } from './song-webhook/song-webhook.service';
 import { SongService } from './song.service';