fix auto resume and suspend service

clashperk · May 20, 2024 · fd77ebe · fd77ebe
1 parent c31ffbd
commit fd77ebe
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/app.controller.ts b/src/app.controller.ts
@@ -63,6 +63,6 @@ export class AppController {
   @UseGuards(ApiKeyGuard)
   @Delete('/services/:id')
   deleteService(@Param('id') serviceId: string) {
-    return this.appService.stopService(serviceId);
+    return this.appService.deleteService(serviceId);
   }
 }
diff --git a/src/app.service.ts b/src/app.service.ts
@@ -114,17 +114,27 @@ export class AppService {
     return { message: 'OK' };
   }
 
-  async suspendService(serviceId: string) {
+  async deleteService(serviceId: string) {
     const service = await this.storageService.findById(serviceId);
     if (!service) throw new NotFoundException('Service not found');
 
     try {
-      await this.dockerService.stopContainer(service.containerId);
+      await this.dockerService.deleteContainer(service.containerId);
     } catch (error) {
-      this.logger.log(`Service [${service.name}] suspend failed`);
+      this.logger.log(`Service [${service.name}] stop failed`);
       this.logger.error(error);
     }
 
+    await this.storageService.stopService(serviceId);
+
+    return { message: 'OK' };
+  }
+
+  async suspendService(serviceId: string) {
+    const service = await this.storageService.findById(serviceId);
+    if (!service) throw new NotFoundException('Service not found');
+
+    await this.stopService(serviceId);
     await this.storageService.suspendService(serviceId);
 
     return { message: 'OK' };

diff --git a/src/storage.service.ts b/src/storage.service.ts
@@ -68,6 +68,10 @@ export class StorageService {
     );
   }
 
+  async deleteService(serviceId: string) {
+    return this.collection.deleteOne({ serviceId });
+  }
+
   async suspendService(serviceId: string) {
     return this.collection.findOneAndUpdate(
       { serviceId },