cleanup code

huytran17 · Jun 5, 2024 · a94bdae · a94bdae
1 parent 370e1dc
commit a94bdae
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 30 deletions.
diff --git a/core/server/src/data-access/controllers/admin/system-configuration/upload-folder-icon.ts b/core/server/src/data-access/controllers/admin/system-configuration/upload-folder-icon.ts
@@ -1,16 +1,19 @@
 import { Request } from "express";
 import { get } from "lodash";
-import { GetLatestSystemConfiguration } from "../../../../use-cases/system-configuration/get-latest-system-configuration";
-import { UpdateSystemConfiguration } from "../../../../use-cases/system-configuration/update-system-configuraion";
 import { HttpStatusCode } from "../../../../constants/http-status-code";
-import { isEmpty } from "../../../../utils/is-empty";
+import {
+  GetSystemConfiguration,
+  IGetSystemConfigurationPayload,
+} from "../../../../use-cases/system-configuration/get-system-configuraion";
+import { UpdateSystemConfiguration } from "../../../../use-cases/system-configuration/update-system-configuraion";
 import deleteS3Object from "../../../../utils/delete-s3-object";
+import { isEmpty } from "../../../../utils/is-empty";
 
 export default function makeUploadFolderIconController({
-  getLatestSystemConfiguration,
+  getSystemConfiguration,
   updateSystemConfiguration,
 }: {
-  getLatestSystemConfiguration: GetLatestSystemConfiguration;
+  getSystemConfiguration: GetSystemConfiguration;
   updateSystemConfiguration: UpdateSystemConfiguration;
 }) {
   return async function uploadFolderIconController(
@@ -21,7 +24,11 @@ export default function makeUploadFolderIconController({
     };
 
     try {
-      const exists = await getLatestSystemConfiguration();
+      const { _id } = <IGetSystemConfigurationPayload>(
+        get(httpRequest, "context.validated", {})
+      );
+
+      const exists = await getSystemConfiguration({ _id });
 
       if (isEmpty(exists)) {
         throw new Error(`System configuration by ${exists._id} does not exist`);

diff --git a/core/server/src/data-access/controllers/admin/system-configuration/upload-owner-avatar.ts b/core/server/src/data-access/controllers/admin/system-configuration/upload-owner-avatar.ts
@@ -1,16 +1,19 @@
 import { Request } from "express";
 import { get } from "lodash";
-import { GetLatestSystemConfiguration } from "../../../../use-cases/system-configuration/get-latest-system-configuration";
-import { UpdateSystemConfiguration } from "../../../../use-cases/system-configuration/update-system-configuraion";
 import { HttpStatusCode } from "../../../../constants/http-status-code";
-import { isEmpty } from "../../../../utils/is-empty";
+import {
+  GetSystemConfiguration,
+  IGetSystemConfigurationPayload,
+} from "../../../../use-cases/system-configuration/get-system-configuraion";
+import { UpdateSystemConfiguration } from "../../../../use-cases/system-configuration/update-system-configuraion";
 import deleteS3Object from "../../../../utils/delete-s3-object";
+import { isEmpty } from "../../../../utils/is-empty";
 
 export default function makeUploadOwnerAvatarController({
-  getLatestSystemConfiguration,
+  getSystemConfiguration,
   updateSystemConfiguration,
 }: {
-  getLatestSystemConfiguration: GetLatestSystemConfiguration;
+  getSystemConfiguration: GetSystemConfiguration;
   updateSystemConfiguration: UpdateSystemConfiguration;
 }) {
   return async function uploadClientAvatarController(
@@ -21,7 +24,11 @@ export default function makeUploadOwnerAvatarController({
     };
 
     try {
-      const exists = await getLatestSystemConfiguration();
+      const { _id } = <IGetSystemConfigurationPayload>(
+        get(httpRequest, "context.validated", {})
+      );
+
+      const exists = await getSystemConfiguration({ _id });
 
       if (isEmpty(exists)) {
         throw new Error(`System configuration by ${exists._id} does not exist`);

diff --git a/core/server/src/data-access/controllers/admin/system-configuration/upload-thumbnail.ts b/core/server/src/data-access/controllers/admin/system-configuration/upload-thumbnail.ts
@@ -1,16 +1,19 @@
 import { Request } from "express";
 import { get } from "lodash";
-import { GetLatestSystemConfiguration } from "../../../../use-cases/system-configuration/get-latest-system-configuration";
-import { UpdateSystemConfiguration } from "../../../../use-cases/system-configuration/update-system-configuraion";
 import { HttpStatusCode } from "../../../../constants/http-status-code";
-import { isEmpty } from "../../../../utils/is-empty";
+import {
+  GetSystemConfiguration,
+  IGetSystemConfigurationPayload,
+} from "../../../../use-cases/system-configuration/get-system-configuraion";
+import { UpdateSystemConfiguration } from "../../../../use-cases/system-configuration/update-system-configuraion";
 import deleteS3Object from "../../../../utils/delete-s3-object";
+import { isEmpty } from "../../../../utils/is-empty";
 
 export default function makeUploadThumbnaiilController({
-  getLatestSystemConfiguration,
+  getSystemConfiguration,
   updateSystemConfiguration,
 }: {
-  getLatestSystemConfiguration: GetLatestSystemConfiguration;
+  getSystemConfiguration: GetSystemConfiguration;
   updateSystemConfiguration: UpdateSystemConfiguration;
 }) {
   return async function uploadThumbnaiilController(
@@ -21,7 +24,11 @@ export default function makeUploadThumbnaiilController({
     };
 
     try {
-      const exists = await getLatestSystemConfiguration();
+      const { _id } = <IGetSystemConfigurationPayload>(
+        get(httpRequest, "context.validated", {})
+      );
+
+      const exists = await getSystemConfiguration({ _id });
 
       if (isEmpty(exists)) {
         throw new Error(`System configuration by ${exists._id} does not exist`);

diff --git a/core/server/src/data-access/controllers/admin/v2/system-configuration/upload-folder-icon.ts b/core/server/src/data-access/controllers/admin/v2/system-configuration/upload-folder-icon.ts
@@ -1,17 +1,20 @@
 import { Request } from "express";
 import { get } from "lodash";
 import { HttpStatusCode } from "../../../../../constants/http-status-code";
-import { GetLatestSystemConfiguration } from "../../../../../use-cases/system-configuration/get-latest-system-configuration";
+import {
+  GetSystemConfiguration,
+  IGetSystemConfigurationPayload,
+} from "../../../../../use-cases/system-configuration/get-system-configuraion";
 import { UpdateSystemConfiguration } from "../../../../../use-cases/system-configuration/update-system-configuraion";
 import deleteUploadedFile from "../../../../../utils/delete-uploaded-file";
 import getFIleUploadedPath from "../../../../../utils/get-file-uploaded-path";
 import { isEmpty } from "../../../../../utils/is-empty";
 
 export default function makeUploadFolderIconController({
-  getLatestSystemConfiguration,
+  getSystemConfiguration,
   updateSystemConfiguration,
 }: {
-  getLatestSystemConfiguration: GetLatestSystemConfiguration;
+  getSystemConfiguration: GetSystemConfiguration;
   updateSystemConfiguration: UpdateSystemConfiguration;
 }) {
   return async function uploadFolderIconController(
@@ -22,7 +25,11 @@ export default function makeUploadFolderIconController({
     };
 
     try {
-      const exists = await getLatestSystemConfiguration();
+      const { _id } = <IGetSystemConfigurationPayload>(
+        get(httpRequest, "context.validated", {})
+      );
+
+      const exists = await getSystemConfiguration({ _id });
 
       if (isEmpty(exists)) {
         throw new Error(`System configuration by ${exists._id} does not exist`);

diff --git a/core/server/src/data-access/controllers/admin/v2/system-configuration/upload-owner-avatar.ts b/core/server/src/data-access/controllers/admin/v2/system-configuration/upload-owner-avatar.ts
@@ -1,17 +1,20 @@
 import { Request } from "express";
 import { get } from "lodash";
 import { HttpStatusCode } from "../../../../../constants/http-status-code";
-import { GetLatestSystemConfiguration } from "../../../../../use-cases/system-configuration/get-latest-system-configuration";
 import { UpdateSystemConfiguration } from "../../../../../use-cases/system-configuration/update-system-configuraion";
 import deleteUploadedFile from "../../../../../utils/delete-uploaded-file";
 import getFIleUploadedPath from "../../../../../utils/get-file-uploaded-path";
 import { isEmpty } from "../../../../../utils/is-empty";
+import {
+  GetSystemConfiguration,
+  IGetSystemConfigurationPayload,
+} from "../../../../../use-cases/system-configuration/get-system-configuraion";
 
 export default function makeUploadOwnerAvatarController({
-  getLatestSystemConfiguration,
+  getSystemConfiguration,
   updateSystemConfiguration,
 }: {
-  getLatestSystemConfiguration: GetLatestSystemConfiguration;
+  getSystemConfiguration: GetSystemConfiguration;
   updateSystemConfiguration: UpdateSystemConfiguration;
 }) {
   return async function uploadClientAvatarController(
@@ -22,7 +25,11 @@ export default function makeUploadOwnerAvatarController({
     };
 
     try {
-      const exists = await getLatestSystemConfiguration();
+      const { _id } = <IGetSystemConfigurationPayload>(
+        get(httpRequest, "context.validated", {})
+      );
+
+      const exists = await getSystemConfiguration({ _id });
 
       if (isEmpty(exists)) {
         throw new Error(`System configuration by ${exists._id} does not exist`);

diff --git a/core/server/src/data-access/controllers/admin/v2/system-configuration/upload-thumbnail.ts b/core/server/src/data-access/controllers/admin/v2/system-configuration/upload-thumbnail.ts
@@ -1,17 +1,20 @@
 import { Request } from "express";
 import { get } from "lodash";
 import { HttpStatusCode } from "../../../../../constants/http-status-code";
-import { GetLatestSystemConfiguration } from "../../../../../use-cases/system-configuration/get-latest-system-configuration";
+import {
+  GetSystemConfiguration,
+  IGetSystemConfigurationPayload,
+} from "../../../../../use-cases/system-configuration/get-system-configuraion";
 import { UpdateSystemConfiguration } from "../../../../../use-cases/system-configuration/update-system-configuraion";
 import deleteUploadedFile from "../../../../../utils/delete-uploaded-file";
 import getFIleUploadedPath from "../../../../../utils/get-file-uploaded-path";
 import { isEmpty } from "../../../../../utils/is-empty";
 
 export default function makeUploadThumbnaiilController({
-  getLatestSystemConfiguration,
+  getSystemConfiguration,
   updateSystemConfiguration,
 }: {
-  getLatestSystemConfiguration: GetLatestSystemConfiguration;
+  getSystemConfiguration: GetSystemConfiguration;
   updateSystemConfiguration: UpdateSystemConfiguration;
 }) {
   return async function uploadThumbnaiilController(
@@ -22,7 +25,11 @@ export default function makeUploadThumbnaiilController({
     };
 
     try {
-      const exists = await getLatestSystemConfiguration();
+      const { _id } = <IGetSystemConfigurationPayload>(
+        get(httpRequest, "context.validated", {})
+      );
+
+      const exists = await getSystemConfiguration({ _id });
 
       if (isEmpty(exists)) {
         throw new Error(`System configuration by ${exists._id} does not exist`);

diff --git a/core/server/src/routes/admin/v2/system-configuration.ts b/core/server/src/routes/admin/v2/system-configuration.ts
@@ -37,4 +37,11 @@ systemConfigurationRouter.post(
   makeExpressCallback(uploadThumbnaiilController)
 );
 
+systemConfigurationRouter.post(
+  "/upload-excel-template/:type/:_id",
+  makeAuthorization(AuthorizationRole.ONLY_OWNER),
+  makeValidator(uploadThumbnailRules),
+  makeExpressCallback(uploadThumbnaiilController)
+);
+
 export default systemConfigurationRouter;