From 6bf28d11a82d7a6017f3c18afe9b6aad1d51c15d Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Tue, 21 Nov 2023 09:34:38 +0700
Subject: [PATCH] refactor: route decorators

---
 Prototype/server/src/controllers/fileController.ts     | 10 +++++-----
 Prototype/server/src/controllers/folderController.ts   | 10 +++++-----
 .../server/src/controllers/subFolderController.ts      | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Prototype/server/src/controllers/fileController.ts b/Prototype/server/src/controllers/fileController.ts
index 7382fde..fe9d1f9 100644
--- a/Prototype/server/src/controllers/fileController.ts
+++ b/Prototype/server/src/controllers/fileController.ts
@@ -20,9 +20,9 @@ import { pathExist } from "../utils/minio";
 import HttpError from "../interfaces/http-error";
 import { EhrFile } from "../interfaces/ehr-fs";
 
-@Route("/cabinet")
+@Route("/cabinet/{cabinetName}/drawer/{drawerName}/folder/{folderName}/file")
 export class FileController extends Controller {
-  @Post("/{cabinetName}/drawer/{drawerName}/folder/{folderName}/file")
+  @Post("/")
   @Tags("File")
   @Security("bearerAuth")
   @SuccessResponse(HttpStatusCode.CREATED)
@@ -111,7 +111,7 @@ export class FileController extends Controller {
     return this.setStatus(HttpStatusCode.CREATED);
   }
 
-  @Get("/{cabinetName}/drawer/{drawerName}/folder/{folderName}/file")
+  @Get("/")
   @Tags("File")
   @SuccessResponse(HttpStatusCode.OK)
   public async getFile(
@@ -146,7 +146,7 @@ export class FileController extends Controller {
     return records;
   }
 
-  @Patch("/{cabinetName}/drawer/{drawerName}/folder/{folderName}/file/{fileName}")
+  @Patch("/{fileName}")
   @Tags("File")
   @Security("bearerAuth")
   @SuccessResponse(HttpStatusCode.OK)
@@ -238,7 +238,7 @@ export class FileController extends Controller {
     return this.setStatus(HttpStatusCode.NO_CONTENT);
   }
 
-  @Delete("/{cabinetName}/drawer/{drawerName}/folder/{folderName}/file/{fileName}")
+  @Delete("/{fileName}")
   @Tags("File")
   @Security("bearerAuth")
   @SuccessResponse(HttpStatusCode.OK)
diff --git a/Prototype/server/src/controllers/folderController.ts b/Prototype/server/src/controllers/folderController.ts
index 3d3104d..d7e4a47 100644
--- a/Prototype/server/src/controllers/folderController.ts
+++ b/Prototype/server/src/controllers/folderController.ts
@@ -21,9 +21,9 @@ import { listFolder, pathExist } from "../utils/minio";
 import { EhrFolder } from "../interfaces/ehr-fs";
 import minioClient from "../storage";
 
-@Route("/cabinet")
+@Route("/cabinet/{cabinetName}/drawer/{drawerName}/folder")
 export class FolderController extends Controller {
-  @Get("/{cabinetName}/drawer/{drawerName}/folder")
+  @Get("/")
   @Tags("Folder")
   @SuccessResponse(HttpStatusCode.OK)
   public async listFolder(
@@ -39,7 +39,7 @@ export class FolderController extends Controller {
     return listFolder(fullpath);
   }
 
-  @Post("/{cabinetName}/drawer/{drawerName}/folder")
+  @Post("/")
   @Tags("Folder")
   @Security("bearerAuth")
   @SuccessResponse(HttpStatusCode.CREATED)
@@ -67,7 +67,7 @@ export class FolderController extends Controller {
     return this.setStatus(HttpStatusCode.CREATED);
   }
 
-  @Put("/{cabinetName}/drawer/{drawerName}/folder/{folderName}")
+  @Put("/{folderName}")
   @Tags("Folder")
   @Security("bearerAuth")
   @SuccessResponse(HttpStatusCode.NO_CONTENT)
@@ -113,7 +113,7 @@ export class FolderController extends Controller {
     });
   }
 
-  @Delete("/{cabinetName}/drawer/{drawerName}/folder/{folderName}")
+  @Delete("/{folderName}")
   @Tags("Folder")
   @Security("bearerAuth")
   @SuccessResponse(HttpStatusCode.NO_CONTENT)
diff --git a/Prototype/server/src/controllers/subFolderController.ts b/Prototype/server/src/controllers/subFolderController.ts
index 5e7b68b..f72a2d4 100644
--- a/Prototype/server/src/controllers/subFolderController.ts
+++ b/Prototype/server/src/controllers/subFolderController.ts
@@ -21,9 +21,9 @@ import { listFolder, pathExist } from "../utils/minio";
 import { EhrFolder } from "../interfaces/ehr-fs";
 import minioClient from "../storage";
 
-@Route("/cabinet")
+@Route("/cabinet/{cabinetName}/drawer/{drawerName}/folder/{folderName}/subfolder")
 export class SubFolderController extends Controller {
-  @Get("/{cabinetName}/drawer/{drawerName}/folder/{folderName}/subfolder")
+  @Get("/")
   @Tags("SubFolder")
   @SuccessResponse(HttpStatusCode.OK)
   public async listFolder(
@@ -40,7 +40,7 @@ export class SubFolderController extends Controller {
     return listFolder(fullpath);
   }
 
-  @Post("/{cabinetName}/drawer/{drawerName}/folder/{folderName}/subfolder")
+  @Post("/")
   @Tags("SubFolder")
   @Security("bearerAuth")
   @SuccessResponse(HttpStatusCode.CREATED)
@@ -72,7 +72,7 @@ export class SubFolderController extends Controller {
     return this.setStatus(HttpStatusCode.CREATED);
   }
 
-  @Put("/{cabinetName}/drawer/{drawerName}/folder/{folderName}/subfolder/{subFolderName}")
+  @Put("/{subFolderName}")
   @Tags("SubFolder")
   @Security("bearerAuth")
   @SuccessResponse(HttpStatusCode.NO_CONTENT)
@@ -119,7 +119,7 @@ export class SubFolderController extends Controller {
     });
   }
 
-  @Delete("/{cabinetName}/drawer/{drawerName}/folder/{folderName}/subfolder/{subFolderName}")
+  @Delete("/{subFolderName}")
   @Tags("SubFolder")
   @Security("bearerAuth")
   @SuccessResponse(HttpStatusCode.NO_CONTENT)