fix
This commit is contained in:
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "matrix-backend",
|
"name": "matrix-backend",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"type": "module",
|
"type": "commonjs",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "cross-env NODE_ENV=development ts-node-dev --respawn --transpile-only src/index.ts",
|
"start": "cross-env NODE_ENV=development ts-node-dev --respawn --transpile-only src/index.ts",
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { connectToDatabase } from "./database.service";
|
|
||||||
import { UpdateQuery } from "mongoose";
|
import { UpdateQuery } from "mongoose";
|
||||||
import { CreateUserPayload, IUser, SpotifyConfig, UserModel } from "../../db/models/user";
|
import { CreateUserPayload, IUser, SpotifyConfig, UserModel } from "../../db/models/user";
|
||||||
|
|
||||||
@@ -9,7 +8,6 @@ export class UserService {
|
|||||||
|
|
||||||
public static async create(): Promise<UserService> {
|
public static async create(): Promise<UserService> {
|
||||||
if (!this._instance) {
|
if (!this._instance) {
|
||||||
await connectToDatabase();
|
|
||||||
this._instance = new UserService();
|
this._instance = new UserService();
|
||||||
}
|
}
|
||||||
return this._instance;
|
return this._instance;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
import { describe, it, expect, vi, beforeEach } from "vitest";
|
||||||
import {UserModel} from "../../../src/db/models/user";
|
import { UserModel } from "../../../src/db/models/user";
|
||||||
import {UserService} from "../../../src/services/db/UserService";
|
import { UserService } from "../../../src/services/db/UserService";
|
||||||
import {connectToDatabase} from "../../../src/services/db/database.service";
|
import { connectToDatabase } from "../../../src/services/db/database.service";
|
||||||
|
|
||||||
vi.mock("../../../src/services/db/database.service", () => ({
|
vi.mock("../../../src/services/db/database.service", () => ({
|
||||||
connectToDatabase: vi.fn(),
|
connectToDatabase: vi.fn(),
|
||||||
@@ -37,14 +37,6 @@ describe("UserService", () => {
|
|||||||
|
|
||||||
expect(instance1).toBe(instance2);
|
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", () => {
|
describe("updateUserById", () => {
|
||||||
@@ -57,11 +49,7 @@ describe("UserService", () => {
|
|||||||
|
|
||||||
const result = await userService.updateUserById(userId, updateData);
|
const result = await userService.updateUserById(userId, updateData);
|
||||||
|
|
||||||
expect(mockedUserModel.findByIdAndUpdate).toHaveBeenCalledWith(
|
expect(mockedUserModel.findByIdAndUpdate).toHaveBeenCalledWith(userId, updateData, { new: true });
|
||||||
userId,
|
|
||||||
updateData,
|
|
||||||
{ new: true }
|
|
||||||
);
|
|
||||||
expect(result).toEqual(updatedUser);
|
expect(result).toEqual(updatedUser);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -177,7 +165,7 @@ describe("UserService", () => {
|
|||||||
};
|
};
|
||||||
mockedUserModel.create.mockResolvedValue(createdUserDocument as any);
|
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(mockedUserModel.create).toHaveBeenCalledWith(userData);
|
||||||
expect(result).not.toHaveProperty("password");
|
expect(result).not.toHaveProperty("password");
|
||||||
@@ -231,4 +219,4 @@ describe("UserService", () => {
|
|||||||
expect(result).toBeNull();
|
expect(result).toBeNull();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user