Merge pull request #1859 from Giveth/move-revoke-badge-to-project-ver…

…ification-form-section-in-adminJS- move revoke badge to project verification form section in adminJS
Giveth · Oct 7, 2024 · 67b3adb · 67b3adb
2 parents f06ba5f + d4c8068
commit 67b3adb
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 71 deletions.
diff --git a/src/server/adminJs/tabs/projectVerificationTab.ts b/src/server/adminJs/tabs/projectVerificationTab.ts
@@ -9,6 +9,7 @@ import {
   ProjectVerificationForm,
 } from '../../../entities/projectVerificationForm';
 import {
+  canAccessProjectAction,
   canAccessProjectVerificationFormAction,
   ResourceActions,
 } from '../adminJsPermissions';
@@ -21,6 +22,7 @@ import {
   approveMultipleProjects,
   approveProject,
   findProjectVerificationFormById,
+  getVerificationFormByProjectId,
   makeFormDraft,
   verifyForm,
   verifyMultipleForms,
@@ -35,8 +37,13 @@ import {
 } from '../../../repositories/projectRepository';
 import { getNotificationAdapter } from '../../../adapters/adaptersFactory';
 import { logger } from '../../../utils/logger';
-import { Project } from '../../../entities/project';
+import { Project, RevokeSteps } from '../../../entities/project';
 import { fillSocialProfileAndQfRounds } from './projectsTab';
+import { refreshUserProjectPowerView } from '../../../repositories/userProjectPowerViewRepository';
+import {
+  refreshProjectFuturePowerView,
+  refreshProjectPowerView,
+} from '../../../repositories/projectPowerViewRepository';
 
 const extractLastComment = (verificationForm: ProjectVerificationForm) => {
   const commentsSorted = verificationForm.commentsSection?.comments?.sort(
@@ -303,6 +310,67 @@ export const approveVerificationForms = async (
   };
 };
 
+export const revokeGivbacksEligibility = async (
+  context: AdminJsContextInterface,
+  request: AdminJsRequestInterface,
+) => {
+  const { records, currentAdmin } = context;
+  try {
+    const projectFormIds = request?.query?.recordIds
+      ?.split(',')
+      ?.map(strId => Number(strId)) as number[];
+    const projectIds: number[] = [];
+    for (const formId of projectFormIds) {
+      const verificationForm = await findProjectVerificationFormById(formId);
+      if (verificationForm) {
+        projectIds.push(verificationForm.projectId);
+      }
+    }
+    const updateParams = { isGivbackEligible: false };
+    const projects = await Project.createQueryBuilder('project')
+      .update<Project>(Project, updateParams)
+      .where('project.id IN (:...ids)')
+      .setParameter('ids', projectIds)
+      .returning('*')
+      .updateEntity(true)
+      .execute();
+
+    for (const project of projects.raw) {
+      const projectWithAdmin = (await findProjectById(project.id)) as Project;
+      projectWithAdmin.verificationStatus = RevokeSteps.Revoked;
+      await projectWithAdmin.save();
+      await getNotificationAdapter().projectBadgeRevoked({
+        project: projectWithAdmin,
+      });
+      const verificationForm = await getVerificationFormByProjectId(project.id);
+      if (verificationForm) {
+        await makeFormDraft({
+          formId: verificationForm.id,
+          adminId: currentAdmin.id,
+        });
+      }
+    }
+    await Promise.all([
+      refreshUserProjectPowerView(),
+      refreshProjectPowerView(),
+      refreshProjectFuturePowerView(),
+    ]);
+  } catch (error) {
+    logger.error('revokeGivbacksEligibility() error', error);
+    throw error;
+  }
+  return {
+    redirectUrl: '/admin/resources/ProjectVerificationForm',
+    records: records.map(record => {
+      record.toJSON(context.currentAdmin);
+    }),
+    notice: {
+      message: 'Project(s) successfully revoked from Givbacks eligibility',
+      type: 'success',
+    },
+  };
+};
+
 export const projectVerificationTab = {
   resource: ProjectVerificationForm,
   options: {
@@ -678,6 +746,19 @@ export const projectVerificationTab = {
         },
         component: false,
       },
+      revokeGivbacksEligible: {
+        actionType: 'bulk',
+        isVisible: true,
+        isAccessible: ({ currentAdmin }) =>
+          canAccessProjectAction(
+            { currentAdmin },
+            ResourceActions.REVOKE_BADGE,
+          ),
+        handler: async (request, _response, context) => {
+          return revokeGivbacksEligibility(context, request);
+        },
+        component: false,
+      },
     },
   },
 };
diff --git a/src/server/adminJs/tabs/projectsTab.test.ts b/src/server/adminJs/tabs/projectsTab.test.ts
@@ -35,12 +35,12 @@ import {
   addFeaturedProjectUpdate,
   exportProjectsWithFiltersToCsv,
   listDelist,
-  revokeGivbacksEligibility,
   updateStatusOfProjects,
   verifyProjects,
 } from './projectsTab';
 import { messages } from '../../../utils/messages';
 import { ProjectStatus } from '../../../entities/projectStatus';
+import { revokeGivbacksEligibility } from './projectVerificationTab';
 
 describe(
   'verifyMultipleProjects() test cases',
@@ -464,7 +464,7 @@ function verifyProjectsTestCases() {
       },
       {
         query: {
-          recordIds: String(project.id),
+          recordIds: String(projectVerificationForm.id),
         },
       },
     );

diff --git a/src/server/adminJs/tabs/projectsTab.ts b/src/server/adminJs/tabs/projectsTab.ts
@@ -12,7 +12,6 @@ import {
   ProjectUpdate,
   ProjStatus,
   ReviewStatus,
-  RevokeSteps,
 } from '../../../entities/project';
 import { canAccessProjectAction, ResourceActions } from '../adminJsPermissions';
 import {
@@ -184,60 +183,6 @@ export const addFeaturedProjectUpdate = async (
   };
 };
 
-export const revokeGivbacksEligibility = async (
-  context: AdminJsContextInterface,
-  request: AdminJsRequestInterface,
-) => {
-  const { records, currentAdmin } = context;
-  try {
-    const projectIds = request?.query?.recordIds
-      ?.split(',')
-      ?.map(strId => Number(strId)) as number[];
-    const updateParams = { isGivbackEligible: false };
-    const projects = await Project.createQueryBuilder('project')
-      .update<Project>(Project, updateParams)
-      .where('project.id IN (:...ids)')
-      .setParameter('ids', projectIds)
-      .returning('*')
-      .updateEntity(true)
-      .execute();
-
-    for (const project of projects.raw) {
-      const projectWithAdmin = (await findProjectById(project.id)) as Project;
-      projectWithAdmin.verificationStatus = RevokeSteps.Revoked;
-      await projectWithAdmin.save();
-      await getNotificationAdapter().projectBadgeRevoked({
-        project: projectWithAdmin,
-      });
-      const verificationForm = await getVerificationFormByProjectId(project.id);
-      if (verificationForm) {
-        await makeFormDraft({
-          formId: verificationForm.id,
-          adminId: currentAdmin.id,
-        });
-      }
-    }
-    await Promise.all([
-      refreshUserProjectPowerView(),
-      refreshProjectPowerView(),
-      refreshProjectFuturePowerView(),
-    ]);
-  } catch (error) {
-    logger.error('revokeGivbacksEligibility() error', error);
-    throw error;
-  }
-  return {
-    redirectUrl: '/admin/resources/Project',
-    records: records.map(record => {
-      record.toJSON(context.currentAdmin);
-    }),
-    notice: {
-      message: 'Project(s) successfully revoked from Givbacks eligibility',
-      type: 'success',
-    },
-  };
-};
-
 export const verifyProjects = async (
   context: AdminJsContextInterface,
   request: AdminJsRequestInterface,
@@ -1310,19 +1255,6 @@ export const projectsTab = {
         },
         component: false,
       },
-      revokeGivbacksEligible: {
-        actionType: 'bulk',
-        isVisible: true,
-        isAccessible: ({ currentAdmin }) =>
-          canAccessProjectAction(
-            { currentAdmin },
-            ResourceActions.REVOKE_BADGE,
-          ),
-        handler: async (request, _response, context) => {
-          return revokeGivbacksEligibility(context, request);
-        },
-        component: false,
-      },
       activate: {
         actionType: 'bulk',
         isVisible: true,