Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/core/src/usecase/CreateServerForUser.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,13 @@ import { ServerRepository } from '../repository/ServerRepository';
import { UserCreditsRepository } from '../repository/UserCreditsRepository';
import { UserRepository } from '../repository/UserRepository';
import { EventLogger } from '../services/EventLogger';
import { IdGenerator } from '../services/IdGenerator';
import { ServerManager } from '../services/ServerManager';
import { ServerManagerFactory } from '@tf2qs/providers';
import { ConfigManager } from '../utils/ConfigManager';
import { CreateServerForUser } from './CreateServerForUser';
import { UserBanRepository } from '../repository/UserBanRepository';

vi.mock("uuid", () => {
return {
v4: () => "test-uuid"
}
})

const chance = new Chance();

const createTestEnvironment = () => {
Expand All @@ -33,13 +28,16 @@ const createTestEnvironment = () => {
const configManager = mock<ConfigManager>();
const userRepository = mock<UserRepository>();
const guildParametersRepository = mock<GuildParametersRepository>();
const idGenerator = mock<IdGenerator>();
const userBanRepository = mock<UserBanRepository>({
isUserBanned: vi.fn().mockResolvedValue({ isBanned: false, reason: '' })
});

// Configure the factory to return the mocked server manager for any Region
serverManagerFactory.createServerManager.mockReturnValue(serverManager);

when(idGenerator.generate).calledWith().thenReturn("test-uuid");

when(configManager.getCreditsConfig).calledWith().thenReturn({
enabled: true
});
Expand Down Expand Up @@ -104,6 +102,7 @@ const createTestEnvironment = () => {
userRepository,
guildParametersRepository,
userBanRepository,
idGenerator,
}),
mocks: {
serverRepository,
Expand All @@ -116,6 +115,7 @@ const createTestEnvironment = () => {
userRepository,
guildParametersRepository,
userBanRepository,
idGenerator,
trx,
statusUpdater
},
Expand Down
7 changes: 4 additions & 3 deletions packages/core/src/usecase/CreateServerForUser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import { UserCreditsRepository } from "../repository/UserCreditsRepository";
import { UserRepository } from "../repository/UserRepository";
import { UserBanRepository } from "../repository/UserBanRepository";
import { EventLogger } from "../services/EventLogger";
import { IdGenerator } from "../services/IdGenerator";
import { ServerManagerFactory } from '@tf2qs/providers';
import { StatusUpdater } from "../services/StatusUpdater";
import { ConfigManager } from "../utils/ConfigManager";
import { v4 as uuid } from "uuid";
import SteamID from "steamid";
import { logger } from '@tf2qs/telemetry';
export class CreateServerForUser {
Expand All @@ -24,6 +24,7 @@ export class CreateServerForUser {
configManager: ConfigManager,
userRepository: UserRepository,
userBanRepository: UserBanRepository,
idGenerator: IdGenerator,
}) { }

public async execute(args: {
Expand All @@ -33,7 +34,7 @@ export class CreateServerForUser {
guildId: string,
statusUpdater: StatusUpdater
}): Promise<Server> {
const { serverManagerFactory, serverRepository, userCreditsRepository, eventLogger, sourceTvEventLogger, configManager, userRepository, guildParametersRepository, userBanRepository } = this.dependencies;
const { serverManagerFactory, serverRepository, userCreditsRepository, eventLogger, sourceTvEventLogger, configManager, userRepository, guildParametersRepository, userBanRepository, idGenerator } = this.dependencies;
const statusUpdater = args.statusUpdater;

const serverManager = serverManagerFactory.createServerManager(args.region);
Expand Down Expand Up @@ -92,7 +93,7 @@ export class CreateServerForUser {
throw new UserError('You do not have enough credits to start a server.')
}
}
const serverId = uuid();
const serverId = idGenerator.generate();

await serverRepository.runInTransaction(async (trx) => {
const allServers = await serverRepository.getAllServersByUserId(args.creatorId, trx);
Expand Down
3 changes: 2 additions & 1 deletion packages/entrypoints/src/discordBot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ export async function startDiscordBot() {
configManager: defaultConfigManager,
userRepository,
guildParametersRepository,
userBanRepository
userBanRepository,
idGenerator: new UuidIdGenerator()
}),
createCreditsPurchaseOrder: new CreateCreditsPurchaseOrder({
creditOrdersRepository,
Expand Down
Loading