Merge pull request #3091 from gradido/user-query-on-find-contributions

feat(backend): user query on find contributions

backend/src/graphql/resolver/ContributionResolver.test.ts

@@ -2890,6 +2890,97 @@ describe('ContributionResolver', () => {
           ]),
         })
       })
+
+      describe('with user query', () => {
+        it('returns only contributions of the queried user', async () => {
+          const {
+            data: { adminListContributions: contributionListObject },
+          } = await query({
+            query: adminListContributions,
+            variables: {
+              query: 'Peter',
+            },
+          })
+          expect(contributionListObject.contributionList).toHaveLength(3)
+          expect(contributionListObject).toMatchObject({
+            contributionCount: 3,
+            contributionList: expect.arrayContaining([
+              expect.objectContaining({
+                amount: expect.decimalEqual(400),
+                firstName: 'Peter',
+                id: expect.any(Number),
+                lastName: 'Lustig',
+                memo: 'Herzlich Willkommen bei Gradido!',
+                messagesCount: 0,
+                status: 'PENDING',
+              }),
+              expect.objectContaining({
+                amount: expect.decimalEqual(100),
+                firstName: 'Peter',
+                id: expect.any(Number),
+                lastName: 'Lustig',
+                memo: 'Test env contribution',
+                messagesCount: 0,
+                status: 'PENDING',
+              }),
+              expect.objectContaining({
+                amount: expect.decimalEqual(200),
+                firstName: 'Peter',
+                id: expect.any(Number),
+                lastName: 'Lustig',
+                memo: 'Das war leider zu Viel!',
+                messagesCount: 0,
+                status: 'DELETED',
+              }),
+            ]),
+          })
+        })
+
+        // test for case sensitivity and email
+        it('returns only contributions of the queried user email', async () => {
+          const {
+            data: { adminListContributions: contributionListObject },
+          } = await query({
+            query: adminListContributions,
+            variables: {
+              query: 'RAEUBER', // only found in lowercase in the email
+            },
+          })
+          expect(contributionListObject.contributionList).toHaveLength(3)
+          expect(contributionListObject).toMatchObject({
+            contributionCount: 3,
+            contributionList: expect.arrayContaining([
+              expect.objectContaining({
+                amount: expect.decimalEqual(166),
+                firstName: 'Räuber',
+                id: expect.any(Number),
+                lastName: 'Hotzenplotz',
+                memo: 'Whatever contribution',
+                messagesCount: 0,
+                status: 'DENIED',
+              }),
+              expect.objectContaining({
+                amount: expect.decimalEqual(166),
+                firstName: 'Räuber',
+                id: expect.any(Number),
+                lastName: 'Hotzenplotz',
+                memo: 'Whatever contribution',
+                messagesCount: 0,
+                status: 'DELETED',
+              }),
+              expect.objectContaining({
+                amount: expect.decimalEqual(166),
+                firstName: 'Räuber',
+                id: expect.any(Number),
+                lastName: 'Hotzenplotz',
+                memo: 'Whatever contribution',
+                messagesCount: 0,
+                status: 'CONFIRMED',
+              }),
+            ]),
+          })
+        })
+      })
     })
   })
 })

backend/src/graphql/resolver/ContributionResolver.ts

@@ -138,7 +138,7 @@ export class ContributionResolver {
       currentPage,
       pageSize,
       withDeleted: true,
-      relations: ['messages'],
+      relations: { messages: true },
       userId: user.id,
       statusFilter,
     })
@@ -160,7 +160,7 @@ export class ContributionResolver {
       order,
       currentPage,
       pageSize,
-      relations: ['user'],
+      relations: { user: true },
       statusFilter,
     })
 
@@ -372,6 +372,8 @@ export class ContributionResolver {
     statusFilter?: ContributionStatus[] | null,
     @Arg('userId', () => Int, { nullable: true })
     userId?: number | null,
+    @Arg('query', () => String, { nullable: true })
+    query?: string | null,
   ): Promise<ContributionListResult> {
     const [dbContributions, count] = await findContributions({
       order,
@@ -379,8 +381,14 @@ export class ContributionResolver {
       pageSize,
       withDeleted: true,
       userId,
-      relations: ['user', 'messages'],
+      relations: {
+        user: {
+          emailContact: true,
+        },
+        messages: true,
+      },
       statusFilter,
+      query,
     })
 
     return new ContributionListResult(

backend/src/graphql/resolver/util/findContributions.ts

@@ -1,38 +1,73 @@
-import { In } from '@dbTools/typeorm'
+import { In, Like } from '@dbTools/typeorm'
 import { Contribution as DbContribution } from '@entity/Contribution'
 
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { Order } from '@enum/Order'
 
+interface Relations {
+  [key: string]: boolean | Relations
+}
+
 interface FindContributionsOptions {
   order: Order
   currentPage: number
   pageSize: number
   withDeleted?: boolean
-  relations?: string[]
+  relations?: Relations | undefined
   userId?: number | null
   statusFilter?: ContributionStatus[] | null
+  query?: string | null
 }
 
 export const findContributions = async (
   options: FindContributionsOptions,
 ): Promise<[DbContribution[], number]> => {
-  const { order, currentPage, pageSize, withDeleted, relations, userId, statusFilter } = {
+  const { order, currentPage, pageSize, withDeleted, relations, userId, statusFilter, query } = {
     withDeleted: false,
-    relations: [],
+    relations: undefined,
+    query: '',
     ...options,
   }
+
+  const requiredWhere = {
+    ...(statusFilter?.length && { contributionStatus: In(statusFilter) }),
+    ...(userId && { userId }),
+  }
+
+  const where =
+    query && relations?.user
+      ? [
+          {
+            ...requiredWhere,
+            user: {
+              firstName: Like(`%${query}%`),
+            },
+          },
+          {
+            ...requiredWhere,
+            user: {
+              lastName: Like(`%${query}%`),
+            },
+          },
+          {
+            ...requiredWhere,
+            user: {
+              emailContact: {
+                email: Like(`%${query}%`),
+              },
+            },
+          },
+        ]
+      : requiredWhere
+
   return DbContribution.findAndCount({
-    where: {
-      ...(statusFilter?.length && { contributionStatus: In(statusFilter) }),
-      ...(userId && { userId }),
-    },
+    relations,
+    where,
     withDeleted,
     order: {
       createdAt: order,
       id: order,
     },
-    relations,
     skip: (currentPage - 1) * pageSize,
     take: pageSize,
   })

backend/src/seeds/graphql/queries.ts

@@ -235,6 +235,7 @@ export const adminListContributions = gql`
     $order: Order = DESC
     $statusFilter: [ContributionStatus!]
     $userId: Int
+    $query: String
   ) {
     adminListContributions(
       currentPage: $currentPage
@@ -242,6 +243,7 @@ export const adminListContributions = gql`
       order: $order
       statusFilter: $statusFilter
       userId: $userId
+      query: $query
     ) {
       contributionCount
       contributionList {