From e48bbd7b47baf70857aac67506018b1aa52e29ae Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Mar 2023 17:33:18 +0100
Subject: [PATCH] rename admin list all contributions query

---
 ...ributions.js => adminListContributions.js} |  4 ++--
 admin/src/pages/CreationConfirm.spec.js       | 20 +++++++++----------
 admin/src/pages/CreationConfirm.vue           | 10 +++++-----
 admin/src/pages/Overview.spec.js              | 14 ++++++-------
 admin/src/pages/Overview.vue                  |  8 ++++----
 backend/src/auth/RIGHTS.ts                    |  2 +-
 .../resolver/ContributionResolver.test.ts     | 20 +++++++++----------
 .../graphql/resolver/ContributionResolver.ts  |  6 +++---
 backend/src/seeds/graphql/queries.ts          |  4 ++--
 9 files changed, 44 insertions(+), 44 deletions(-)
 rename admin/src/graphql/{adminListAllContributions.js => adminListContributions.js} (88%)

diff --git a/admin/src/graphql/adminListAllContributions.js b/admin/src/graphql/adminListContributions.js
similarity index 88%
rename from admin/src/graphql/adminListAllContributions.js
rename to admin/src/graphql/adminListContributions.js
index cd47cd1d4..7b6848bd5 100644
--- a/admin/src/graphql/adminListAllContributions.js
+++ b/admin/src/graphql/adminListContributions.js
@@ -1,13 +1,13 @@
 import gql from 'graphql-tag'
 
-export const adminListAllContributions = gql`
+export const adminListContributions = gql`
   query (
     $currentPage: Int = 1
     $pageSize: Int = 25
     $order: Order = DESC
     $statusFilter: [ContributionStatus!]
   ) {
-    adminListAllContributions(
+    adminListContributions(
       currentPage: $currentPage
       pageSize: $pageSize
       order: $order
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 87f94e91f..c9d9661c2 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
 import CreationConfirm from './CreationConfirm'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
 import { denyContribution } from '../graphql/denyContribution'
-import { adminListAllContributions } from '../graphql/adminListAllContributions'
+import { adminListContributions } from '../graphql/adminListContributions'
 import { confirmContribution } from '../graphql/confirmContribution'
 import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
 import VueApollo from 'vue-apollo'
@@ -38,7 +38,7 @@ const mocks = {
 
 const defaultData = () => {
   return {
-    adminListAllContributions: {
+    adminListContributions: {
       contributionCount: 2,
       contributionList: [
         {
@@ -92,14 +92,14 @@ const defaultData = () => {
 
 describe('CreationConfirm', () => {
   let wrapper
-  const adminListAllContributionsMock = jest.fn()
+  const adminListContributionsMock = jest.fn()
   const adminDeleteContributionMock = jest.fn()
   const adminDenyContributionMock = jest.fn()
   const confirmContributionMock = jest.fn()
 
   mockClient.setRequestHandler(
-    adminListAllContributions,
-    adminListAllContributionsMock
+    adminListContributions,
+    adminListContributionsMock
       .mockRejectedValueOnce({ message: 'Ouch!' })
       .mockResolvedValue({ data: defaultData() }),
   )
@@ -337,7 +337,7 @@ describe('CreationConfirm', () => {
         })
 
         it('refetches contributions with proper filter', () => {
-          expect(adminListAllContributionsMock).toBeCalledWith({
+          expect(adminListContributionsMock).toBeCalledWith({
             currentPage: 1,
             order: 'DESC',
             pageSize: 25,
@@ -352,7 +352,7 @@ describe('CreationConfirm', () => {
           })
 
           it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
+            expect(adminListContributionsMock).toBeCalledWith({
               currentPage: 1,
               order: 'DESC',
               pageSize: 25,
@@ -368,7 +368,7 @@ describe('CreationConfirm', () => {
           })
 
           it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
+            expect(adminListContributionsMock).toBeCalledWith({
               currentPage: 1,
               order: 'DESC',
               pageSize: 25,
@@ -384,7 +384,7 @@ describe('CreationConfirm', () => {
           })
 
           it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
+            expect(adminListContributionsMock).toBeCalledWith({
               currentPage: 1,
               order: 'DESC',
               pageSize: 25,
@@ -400,7 +400,7 @@ describe('CreationConfirm', () => {
           })
 
           it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
+            expect(adminListContributionsMock).toBeCalledWith({
               currentPage: 1,
               order: 'DESC',
               pageSize: 25,
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 55b819268..aad03ffde 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -73,7 +73,7 @@
 <script>
 import Overlay from '../components/Overlay'
 import OpenCreationsTable from '../components/Tables/OpenCreationsTable'
-import { adminListAllContributions } from '../graphql/adminListAllContributions'
+import { adminListContributions } from '../graphql/adminListContributions'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
 import { confirmContribution } from '../graphql/confirmContribution'
 import { denyContribution } from '../graphql/denyContribution'
@@ -384,7 +384,7 @@ export default {
   apollo: {
     ListAllContributions: {
       query() {
-        return adminListAllContributions
+        return adminListContributions
       },
       variables() {
         return {
@@ -394,9 +394,9 @@ export default {
         }
       },
       fetchPolicy: 'no-cache',
-      update({ adminListAllContributions }) {
-        this.rows = adminListAllContributions.contributionCount
-        this.items = adminListAllContributions.contributionList
+      update({ adminListContributions }) {
+        this.rows = adminListContributions.contributionCount
+        this.items = adminListContributions.contributionList
       },
       error({ message }) {
         this.toastError(message)
diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index beb5bc2dd..2f4126f2b 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/admin/src/pages/Overview.spec.js
@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils'
 import Overview from './Overview'
-import { adminListAllContributions } from '../graphql/adminListAllContributions'
+import { adminListContributions } from '../graphql/adminListContributions'
 import VueApollo from 'vue-apollo'
 import { createMockClient } from 'mock-apollo-client'
 import { toastErrorSpy } from '../../test/testSetup'
@@ -30,7 +30,7 @@ const mocks = {
 
 const defaultData = () => {
   return {
-    adminListAllContributions: {
+    adminListContributions: {
       contributionCount: 2,
       contributionList: [
         {
@@ -84,11 +84,11 @@ const defaultData = () => {
 
 describe('Overview', () => {
   let wrapper
-  const adminListAllContributionsMock = jest.fn()
+  const adminListContributionsMock = jest.fn()
 
   mockClient.setRequestHandler(
-    adminListAllContributions,
-    adminListAllContributionsMock
+    adminListContributions,
+    adminListContributionsMock
       .mockRejectedValueOnce({ message: 'Ouch!' })
       .mockResolvedValue({ data: defaultData() }),
   )
@@ -109,8 +109,8 @@ describe('Overview', () => {
       })
     })
 
-    it('calls the adminListAllContributions query', () => {
-      expect(adminListAllContributionsMock).toBeCalledWith({
+    it('calls the adminListContributions query', () => {
+      expect(adminListContributionsMock).toBeCalledWith({
         currentPage: 1,
         order: 'DESC',
         pageSize: 25,
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index c5316a35b..90924c9a9 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -31,7 +31,7 @@
   </div>
 </template>
 <script>
-import { adminListAllContributions } from '../graphql/adminListAllContributions'
+import { adminListContributions } from '../graphql/adminListContributions'
 
 export default {
   name: 'overview',
@@ -43,7 +43,7 @@ export default {
   apollo: {
     AllContributions: {
       query() {
-        return adminListAllContributions
+        return adminListContributions
       },
       variables() {
         // may be at some point we need a pagination here
@@ -51,8 +51,8 @@ export default {
           statusFilter: this.statusFilter,
         }
       },
-      update({ adminListAllContributions }) {
-        this.$store.commit('setOpenCreations', adminListAllContributions.contributionCount)
+      update({ adminListContributions }) {
+        this.$store.commit('setOpenCreations', adminListContributions.contributionCount)
       },
       error({ message }) {
         this.toastError(message)
diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index 8b0e82c86..58a762028 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -44,7 +44,7 @@ export enum RIGHTS {
   ADMIN_CREATE_CONTRIBUTION = 'ADMIN_CREATE_CONTRIBUTION',
   ADMIN_UPDATE_CONTRIBUTION = 'ADMIN_UPDATE_CONTRIBUTION',
   ADMIN_DELETE_CONTRIBUTION = 'ADMIN_DELETE_CONTRIBUTION',
-  LIST_UNCONFIRMED_CONTRIBUTIONS = 'LIST_UNCONFIRMED_CONTRIBUTIONS',
+  ADMIN_LIST_CONTRIBUTIONS = 'ADMIN_LIST_CONTRIBUTIONS',
   CONFIRM_CONTRIBUTION = 'CONFIRM_CONTRIBUTION',
   SEND_ACTIVATION_EMAIL = 'SEND_ACTIVATION_EMAIL',
   CREATION_TRANSACTION_LIST = 'CREATION_TRANSACTION_LIST',
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index ed4cdffa0..249e15c91 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -22,7 +22,7 @@ import {
 import {
   listAllContributions,
   listContributions,
-  adminListAllContributions,
+  adminListContributions,
 } from '@/seeds/graphql/queries'
 import {
   sendContributionConfirmedEmail,
@@ -2656,12 +2656,12 @@ describe('ContributionResolver', () => {
     })
   })
 
-  describe('adminListAllContribution', () => {
+  describe('adminListContributions', () => {
     describe('unauthenticated', () => {
       it('returns an error', async () => {
         await expect(
           query({
-            query: adminListAllContributions,
+            query: adminListContributions,
           }),
         ).resolves.toEqual(
           expect.objectContaining({
@@ -2686,7 +2686,7 @@ describe('ContributionResolver', () => {
       it('returns an error', async () => {
         await expect(
           query({
-            query: adminListAllContributions,
+            query: adminListContributions,
           }),
         ).resolves.toEqual(
           expect.objectContaining({
@@ -2710,9 +2710,9 @@ describe('ContributionResolver', () => {
 
       it('returns 17 creations in total', async () => {
         const {
-          data: { adminListAllContributions: contributionListObject },
-        }: { data: { adminListAllContributions: ContributionListResult } } = await query({
-          query: adminListAllContributions,
+          data: { adminListContributions: contributionListObject },
+        }: { data: { adminListContributions: ContributionListResult } } = await query({
+          query: adminListContributions,
         })
         expect(contributionListObject.contributionList).toHaveLength(17)
         expect(contributionListObject).toMatchObject({
@@ -2877,9 +2877,9 @@ describe('ContributionResolver', () => {
 
       it('returns two pending creations with page size set to 2', async () => {
         const {
-          data: { adminListAllContributions: contributionListObject },
-        }: { data: { adminListAllContributions: ContributionListResult } } = await query({
-          query: adminListAllContributions,
+          data: { adminListContributions: contributionListObject },
+        }: { data: { adminListContributions: ContributionListResult } } = await query({
+          query: adminListContributions,
           variables: {
             currentPage: 1,
             pageSize: 2,
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 5946b0237..4c585d2d9 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -376,9 +376,9 @@ export class ContributionResolver {
     return result
   }
 
-  @Authorized([RIGHTS.LIST_UNCONFIRMED_CONTRIBUTIONS])
-  @Query(() => ContributionListResult) // [UnconfirmedContribution]
-  async adminListAllContributions(
+  @Authorized([RIGHTS.ADMIN_LIST_CONTRIBUTIONS])
+  @Query(() => ContributionListResult)
+  async adminListContributions(
     @Args()
     { currentPage = 1, pageSize = 3, order = Order.DESC }: Paginated,
     @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts
index 6e2e58c67..22e0e9186 100644
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@@ -204,14 +204,14 @@ query ($currentPage: Int = 1, $pageSize: Int = 5, $order: Order = DESC, $statusF
 `
 // from admin interface
 
-export const adminListAllContributions = gql`
+export const adminListContributions = gql`
   query (
     $currentPage: Int = 1
     $pageSize: Int = 25
     $order: Order = DESC
     $statusFilter: [ContributionStatus!]
   ) {
-    adminListAllContributions(
+    adminListContributions(
       currentPage: $currentPage
       pageSize: $pageSize
       order: $order