Phase3

apps/api/src/servers/servers.service.ts

@@ -2,10 +2,8 @@ import { randomUUID } from 'node:crypto';
 
 import {
   ConflictException,
-  ForbiddenException,
   Inject,
   Injectable,
-  NotFoundException,
 } from '@nestjs/common';
 import { Queue } from 'bullmq';
 import type Redis from 'ioredis';
@@ -22,6 +20,7 @@ type GameServerStatus = GameServer['status'];
 
 import { PrismaService } from '../prisma/prisma.service';
 
+import { findOwnedServer } from './shared/server-ownership.util';
 import { ServerStateService } from './server-state.service';
 
 export const REDIS_CLIENT = Symbol('SERVERS_REDIS_CLIENT');
@@ -77,15 +76,30 @@ export class ServersService {
   }
 
   async getServer(userId: string, serverId: string): Promise<ServerResponse> {
-    const server = await this.findOwnedServer(userId, serverId);
+    const server = await findOwnedServer(this.prisma, userId, serverId);
     return this.toResponse(server);
   }
 
+  async restartServer(
+    userId: string,
+    serverId: string,
+    skipStop = false,
+  ): Promise<ServerActionResponse> {
+    const server = await findOwnedServer(this.prisma, userId, serverId);
+    this.serverState.assertNotInProgress(server.status);
+
+    if (!skipStop && server.status === 'RUNNING') {
+      await this.stopServer(userId, serverId);
+    }
+
+    return this.startServer(userId, serverId);
+  }
+
   async startServer(
     userId: string,
     serverId: string,
   ): Promise<ServerActionResponse> {
-    const server = await this.findOwnedServer(userId, serverId);
+    const server = await findOwnedServer(this.prisma, userId, serverId);
     this.serverState.assertNotInProgress(server.status);
 
     const targetStatus = this.serverState.resolveStartTarget(server.status);
@@ -143,7 +157,7 @@ export class ServersService {
     userId: string,
     serverId: string,
   ): Promise<ServerActionResponse> {
-    const server = await this.findOwnedServer(userId, serverId);
+    const server = await findOwnedServer(this.prisma, userId, serverId);
     this.serverState.assertNotInProgress(server.status);
 
     const targetStatus = this.serverState.resolveStopTarget(server.status);
@@ -225,25 +239,6 @@ export class ServersService {
     );
   }
 
-  private async findOwnedServer(
-    userId: string,
-    serverId: string,
-  ): Promise<GameServer> {
-    const server = await this.prisma.gameServer.findUnique({
-      where: { id: serverId },
-    });
-
-    if (!server) {
-      throw new NotFoundException('Server not found');
-    }
-
-    if (server.userId !== userId) {
-      throw new ForbiddenException('You do not own this server');
-    }
-
-    return server;
-  }
-
   private async transitionServer(
     server: GameServer,
     toStatus: GameServerStatus,