From 7b38ec166068f8c977143d5bfb552fa1b88a9df3 Mon Sep 17 00:00:00 2001
From: StarAppeal <silkfan11@gmail.com>
Date: Fri, 26 Sep 2025 00:01:19 +0200
Subject: [PATCH] fix

---
 package.json                          |  2 +-
 src/services/db/UserService.ts        |  2 --
 tests/services/db/UserService.test.ts | 24 ++++++------------------
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 581cb58..aeef0fd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "matrix-backend",
   "version": "1.0.0",
-  "type": "module",
+  "type": "commonjs",
   "main": "dist/index.js",
   "scripts": {
     "start": "cross-env NODE_ENV=development ts-node-dev --respawn --transpile-only src/index.ts",
diff --git a/src/services/db/UserService.ts b/src/services/db/UserService.ts
index 875e651..6aaf196 100644
--- a/src/services/db/UserService.ts
+++ b/src/services/db/UserService.ts
@@ -1,4 +1,3 @@
-import { connectToDatabase } from "./database.service";
 import { UpdateQuery } from "mongoose";
 import { CreateUserPayload, IUser, SpotifyConfig, UserModel } from "../../db/models/user";
 
@@ -9,7 +8,6 @@ export class UserService {
 
     public static async create(): Promise<UserService> {
         if (!this._instance) {
-            await connectToDatabase();
             this._instance = new UserService();
         }
         return this._instance;
diff --git a/tests/services/db/UserService.test.ts b/tests/services/db/UserService.test.ts
index 9f93dbd..b0b77ca 100644
--- a/tests/services/db/UserService.test.ts
+++ b/tests/services/db/UserService.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
-import {UserModel} from "../../../src/db/models/user";
-import {UserService} from "../../../src/services/db/UserService";
-import {connectToDatabase} from "../../../src/services/db/database.service";
+import { UserModel } from "../../../src/db/models/user";
+import { UserService } from "../../../src/services/db/UserService";
+import { connectToDatabase } from "../../../src/services/db/database.service";
 
 vi.mock("../../../src/services/db/database.service", () => ({
     connectToDatabase: vi.fn(),
@@ -37,14 +37,6 @@ describe("UserService", () => {
 
             expect(instance1).toBe(instance2);
         });
-
-        it("should connect to database only on first creation", async () => {
-
-            await UserService.create();
-            await UserService.create();
-
-            expect(mockedConnectToDatabase).toHaveBeenCalledTimes(1);
-        });
     });
 
     describe("updateUserById", () => {
@@ -57,11 +49,7 @@ describe("UserService", () => {
 
             const result = await userService.updateUserById(userId, updateData);
 
-            expect(mockedUserModel.findByIdAndUpdate).toHaveBeenCalledWith(
-                userId,
-                updateData,
-                { new: true }
-            );
+            expect(mockedUserModel.findByIdAndUpdate).toHaveBeenCalledWith(userId, updateData, { new: true });
             expect(result).toEqual(updatedUser);
         });
 
@@ -177,7 +165,7 @@ describe("UserService", () => {
             };
             mockedUserModel.create.mockResolvedValue(createdUserDocument as any);
 
-            const result = await userService.createUser(userData as any)
+            const result = await userService.createUser(userData as any);
 
             expect(mockedUserModel.create).toHaveBeenCalledWith(userData);
             expect(result).not.toHaveProperty("password");
@@ -231,4 +219,4 @@ describe("UserService", () => {
             expect(result).toBeNull();
         });
     });
-});
\ No newline at end of file
+});