Rename TransactionLinkFilters fields from by* back to with*

backend/src/graphql/arg/TransactionLinkFilters.ts

@@ -3,11 +3,11 @@ import { Field, InputType } from 'type-graphql'
 @InputType()
 export default class TransactionLinkFilters {
   @Field(() => Boolean, { nullable: true, defaultValue: true })
-  byDeleted: boolean
+  withDeleted: boolean
 
   @Field(() => Boolean, { nullable: true, defaultValue: true })
-  byExpired: boolean
+  withExpired: boolean
 
   @Field(() => Boolean, { nullable: true, defaultValue: true })
-  byRedeemed: boolean
+  withRedeemed: boolean
 }

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

@@ -1333,9 +1333,9 @@ describe('AdminResolver', () => {
     const variables = {
       userId: 1, // dummy, may be replaced
       filters: {
-        byDeleted: null,
-        byExpired: null,
-        byRedeemed: null,
+        withDeleted: null,
+        withExpired: null,
+        withRedeemed: null,
       },
       currentPage: 1,
       pageSize: 5,
@@ -1465,9 +1465,9 @@ describe('AdminResolver', () => {
                 variables: {
                   ...variables,
                   filters: {
-                    byDeleted: true, // Wolle: rename to `withDeleted`?
-                    byExpired: null,
-                    byRedeemed: null,
+                    withDeleted: true, // Wolle: rename to `withDeleted`?
+                    withExpired: null,
+                    withRedeemed: null,
                   },
                 },
               }),
@@ -1502,9 +1502,9 @@ describe('AdminResolver', () => {
                 variables: {
                   ...variables,
                   filters: {
-                    byDeleted: null,
-                    byExpired: true,
-                    byRedeemed: null,
+                    withDeleted: null,
+                    withExpired: true,
+                    withRedeemed: null,
                   },
                 },
               }),
@@ -1539,9 +1539,9 @@ describe('AdminResolver', () => {
                 variables: {
                   ...variables,
                   filters: {
-                    byDeleted: null,
-                    byExpired: null,
-                    byRedeemed: true,
+                    withDeleted: null,
+                    withExpired: null,
+                    withRedeemed: true,
                   },
                 },
               }),

backend/src/graphql/resolver/AdminResolver.ts

@@ -438,13 +438,11 @@ export class AdminResolver {
     } = {
       userId,
     }
-    if (!filters.byRedeemed) where.redeemedBy = null
-    if (!filters.byExpired) where.validUntil = MoreThan(new Date())
+    if (!filters.withRedeemed) where.redeemedBy = null
+    if (!filters.withExpired) where.validUntil = MoreThan(new Date())
     const [transactionLinks, count] = await dbTransactionLink.findAndCount({
       where,
-      // Wolle: works not as expected
-      withDeleted: filters.byDeleted,
-      // withDeleted: filters.byDeleted !== undefined ? !filters.byDeleted : undefined,
+      withDeleted: filters.withDeleted,
       order: {
         createdAt: order,
       },