refactor: standardize import statements across multiple files and clean up unused imports in auth, song, and user modules

tomast1337 · tomast1337 · commit 0785bd53be97 · 2025-07-25T21:59:15.000-03:00
diff --git a/packages/backend/src/auth/auth.service.spec.ts b/packages/backend/src/auth/auth.service.spec.ts
@@ -1,9 +1,11 @@
 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 { UserService } from '@server/user/user.service';
+
 import { AuthService } from './auth.service';
 import { Profile } from './types/profile';
 
diff --git a/packages/backend/src/auth/auth.service.ts b/packages/backend/src/auth/auth.service.ts
@@ -2,9 +2,11 @@ import type { UserDocument } from '@nbw/database';
 import { CreateUser } from '@nbw/database';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import { UserService } from '@server/user/user.service';
 import axios from 'axios';
 import type { Request, Response } from 'express';
+
+import { UserService } from '@server/user/user.service';
+
 import { DiscordUser } from './types/discordProfile';
 import { GithubAccessToken, GithubEmailList } from './types/githubProfile';
 import { GoogleProfile } from './types/googleProfile';
diff --git a/packages/backend/src/email-login/email-login.controller.spec.ts b/packages/backend/src/email-login/email-login.controller.spec.ts
@@ -1,4 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
+
 import { EmailLoginController } from './email-login.controller';
 import { EmailLoginService } from './email-login.service';
 
diff --git a/packages/backend/src/lib/GetRequestUser.spec.ts b/packages/backend/src/lib/GetRequestUser.spec.ts
@@ -1,5 +1,6 @@
 import type { UserDocument } from '@nbw/database';
 import { ExecutionContext, HttpException, HttpStatus } from '@nestjs/common';
+
 import { GetRequestToken, validateUser } from './GetRequestUser';
 
 describe('GetRequestToken', () => {
diff --git a/packages/backend/src/lib/parseToken.spec.ts b/packages/backend/src/lib/parseToken.spec.ts
@@ -1,6 +1,8 @@
 import { ExecutionContext } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
+
 import { AuthService } from '@server/auth/auth.service';
+
 import { ParseTokenPipe } from './parseToken';
 
 describe('ParseTokenPipe', () => {
diff --git a/packages/backend/src/lib/parseToken.ts b/packages/backend/src/lib/parseToken.ts
@@ -5,6 +5,7 @@ import {
   Injectable,
   Logger,
 } from '@nestjs/common';
+
 import { AuthService } from '@server/auth/auth.service';
 
 @Injectable()
diff --git a/packages/backend/src/seed/seed.service.ts b/packages/backend/src/seed/seed.service.ts
@@ -16,6 +16,7 @@ import {
   Injectable,
   Logger,
 } from '@nestjs/common';
+
 import { SongService } from '@server/song/song.service';
 import { UserService } from '@server/user/user.service';
 
diff --git a/packages/backend/src/song-browser/song-browser.controller.spec.ts b/packages/backend/src/song-browser/song-browser.controller.spec.ts
@@ -1,5 +1,6 @@
 import { FeaturedSongsDto, PageQueryDTO, SongPreviewDto } from '@nbw/database';
 import { Test, TestingModule } from '@nestjs/testing';
+
 import { SongBrowserController } from './song-browser.controller';
 import { SongBrowserService } from './song-browser.service';
 
diff --git a/packages/backend/src/song-browser/song-browser.controller.ts b/packages/backend/src/song-browser/song-browser.controller.ts
@@ -7,6 +7,7 @@ import {
   Query,
 } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
+
 import { SongBrowserService } from './song-browser.service';
 
 @Controller('song-browser')
diff --git a/packages/backend/src/song-browser/song-browser.service.spec.ts b/packages/backend/src/song-browser/song-browser.service.spec.ts
@@ -1,7 +1,9 @@
 import { PageQueryDTO, SongPreviewDto, SongWithUser } from '@nbw/database';
 import { HttpException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
+
 import { SongService } from '@server/song/song.service';
+
 import { SongBrowserService } from './song-browser.service';
 
 const mockSongService = {
diff --git a/packages/backend/src/song-browser/song-browser.service.ts b/packages/backend/src/song-browser/song-browser.service.ts
@@ -7,6 +7,7 @@ import {
   TimespanType,
 } from '@nbw/database';
 import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
+
 import { SongService } from '@server/song/song.service';
 
 @Injectable()
diff --git a/packages/backend/src/song/my-songs/my-songs.controller.spec.ts b/packages/backend/src/song/my-songs/my-songs.controller.spec.ts
@@ -3,6 +3,7 @@ import { PageQueryDTO, SongPageDto } from '@nbw/database';
 import { HttpException } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { Test, TestingModule } from '@nestjs/testing';
+
 import { SongService } from '../song.service';
 import { MySongsController } from './my-songs.controller';
 
diff --git a/packages/backend/src/song/my-songs/my-songs.controller.ts b/packages/backend/src/song/my-songs/my-songs.controller.ts
@@ -3,6 +3,7 @@ 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 { GetRequestToken, validateUser } from '@server/lib/GetRequestUser';
 
 import { SongService } from '../song.service';
diff --git a/packages/backend/src/song/song-upload/song-upload.service.spec.ts b/packages/backend/src/song/song-upload/song-upload.service.spec.ts
@@ -8,10 +8,12 @@ import {
 } from '@nbw/database';
 import { HttpException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
-import { FileService } from '@server/file/file.service';
-import { UserService } from '@server/user/user.service';
 import { beforeEach, describe, expect, it, jest, mock, spyOn } from 'bun:test';
 import { Types } from 'mongoose';
+
+import { FileService } from '@server/file/file.service';
+import { UserService } from '@server/user/user.service';
+
 import { SongUploadService } from './song-upload.service';
 
 // mock drawToImage function
diff --git a/packages/backend/src/song/song-upload/song-upload.service.ts b/packages/backend/src/song/song-upload/song-upload.service.ts
@@ -21,9 +21,11 @@ import {
   Injectable,
   Logger,
 } from '@nestjs/common';
+import { Types } from 'mongoose';
+
 import { FileService } from '@server/file/file.service';
 import { UserService } from '@server/user/user.service';
-import { Types } from 'mongoose';
+
 import { generateSongId, removeExtraSpaces } from '../song.util';
 
 @Injectable()
diff --git a/packages/backend/src/song/song-webhook/song-webhook.service.spec.ts b/packages/backend/src/song/song-webhook/song-webhook.service.spec.ts
@@ -4,6 +4,7 @@ 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 { getUploadDiscordEmbed } from '../song.util';
 import { SongWebhookService } from './song-webhook.service';
 
diff --git a/packages/backend/src/song/song-webhook/song-webhook.service.ts b/packages/backend/src/song/song-webhook/song-webhook.service.ts
@@ -1,8 +1,8 @@
+import { Song as SongEntity, SongWithUser } from '@nbw/database';
 import { Inject, Injectable, Logger, OnModuleInit } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
-import { Song as SongEntity, SongWithUser } from '@nbw/database';
 import { getUploadDiscordEmbed } from '../song.util';
 
 @Injectable()
diff --git a/packages/backend/src/song/song.controller.spec.ts b/packages/backend/src/song/song.controller.spec.ts
@@ -9,8 +9,10 @@ import {
 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 { Response } from 'express';
+
+import { FileService } from '@server/file/file.service';
+
 import { SongController } from './song.controller';
 import { SongService } from './song.service';
 
diff --git a/packages/backend/src/song/song.controller.ts b/packages/backend/src/song/song.controller.ts
@@ -36,9 +36,11 @@ import {
   ApiOperation,
   ApiTags,
 } from '@nestjs/swagger';
+import type { Response } from 'express';
+
 import { FileService } from '@server/file/file.service';
 import { GetRequestToken, validateUser } from '@server/lib/GetRequestUser';
-import type { Response } from 'express';
+
 import { SongService } from './song.service';
 
 // Handles public-facing song routes.
diff --git a/packages/backend/src/song/song.module.ts b/packages/backend/src/song/song.module.ts
@@ -2,9 +2,11 @@ import { Song, SongSchema } from '@nbw/database';
 import { Module } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { MongooseModule } from '@nestjs/mongoose';
+
 import { AuthModule } from '@server/auth/auth.module';
 import { FileModule } from '@server/file/file.module';
 import { UserModule } from '@server/user/user.module';
+
 import { MySongsController } from './my-songs/my-songs.controller';
 import { SongUploadService } from './song-upload/song-upload.service';
 import { SongWebhookService } from './song-webhook/song-webhook.service';
diff --git a/packages/backend/src/song/song.service.spec.ts b/packages/backend/src/song/song.service.spec.ts
@@ -13,8 +13,10 @@ import {
 import { HttpException } from '@nestjs/common';
 import { getModelToken } from '@nestjs/mongoose';
 import { Test, TestingModule } from '@nestjs/testing';
-import { FileService } from '@server/file/file.service';
 import mongoose, { Model } from 'mongoose';
+
+import { FileService } from '@server/file/file.service';
+
 import { SongUploadService } from './song-upload/song-upload.service';
 import { SongWebhookService } from './song-webhook/song-webhook.service';
 import { SongService } from './song.service';
diff --git a/packages/backend/src/song/song.service.ts b/packages/backend/src/song/song.service.ts
@@ -1,9 +1,12 @@
+import type { UserDocument } from '@nbw/database';
 import {
   BROWSER_SONGS,
   PageQueryDTO,
+  Song as SongEntity,
   SongPageDto,
   SongPreviewDto,
   SongViewDto,
+  SongWithUser,
   UploadSongDto,
   UploadSongResponseDto,
 } from '@nbw/database';
@@ -17,9 +20,8 @@ import {
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
-import type { UserDocument } from '@nbw/database';
-import { Song as SongEntity, SongWithUser } from '@nbw/database';
 import { FileService } from '@server/file/file.service';
+
 import { SongUploadService } from './song-upload/song-upload.service';
 import { SongWebhookService } from './song-webhook/song-webhook.service';
 import { removeExtraSpaces } from './song.util';
diff --git a/packages/backend/src/user/user.controller.spec.ts b/packages/backend/src/user/user.controller.spec.ts
@@ -2,6 +2,7 @@ import type { UserDocument } from '@nbw/database';
 import { GetUser, PageQueryDTO } from '@nbw/database';
 import { HttpException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
+
 import { UserController } from './user.controller';
 import { UserService } from './user.service';
 
diff --git a/packages/backend/src/user/user.controller.ts b/packages/backend/src/user/user.controller.ts
@@ -2,7 +2,9 @@ import type { UserDocument } from '@nbw/database';
 import { GetUser, PageQueryDTO, UpdateUsernameDto } from '@nbw/database';
 import { Body, Controller, Get, Inject, Patch, Query } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+
 import { GetRequestToken, validateUser } from '@server/lib/GetRequestUser';
+
 import { UserService } from './user.service';
 
 @Controller('user')
diff --git a/packages/backend/src/user/user.module.ts b/packages/backend/src/user/user.module.ts
@@ -1,6 +1,7 @@
 import { User, UserSchema } from '@nbw/database';
 import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
+
 import { UserController } from './user.controller';
 import { UserService } from './user.service';
 
diff --git a/packages/backend/src/user/user.service.spec.ts b/packages/backend/src/user/user.service.spec.ts
@@ -9,6 +9,7 @@ import { HttpException, HttpStatus } from '@nestjs/common';
 import { getModelToken } from '@nestjs/mongoose';
 import { Test, TestingModule } from '@nestjs/testing';
 import { Model } from 'mongoose';
+
 import { UserService } from './user.service';
 
 const mockUserModel = {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { Test, TestingModule } from '@nestjs/testing';`
	`2`	`+`
`2`	`3`	`import { EmailLoginController } from './email-login.controller';`
`3`	`4`	`import { EmailLoginService } from './email-login.service';`
`4`	`5`