diff --git a/admin/src/graphql/adminCreateContributionMessage.js b/admin/src/graphql/adminCreateContributionMessage.js index 25d81f151..747e6d7d4 100644 --- a/admin/src/graphql/adminCreateContributionMessage.js +++ b/admin/src/graphql/adminCreateContributionMessage.js @@ -1,7 +1,7 @@ import gql from 'graphql-tag' export const adminCreateContributionMessage = gql` - mutation ($contributionId: Float!, $message: String!) { + mutation ($contributionId: Int!, $message: String!) { adminCreateContributionMessage(contributionId: $contributionId, message: $message) { id message diff --git a/admin/src/graphql/listContributionMessages.js b/admin/src/graphql/listContributionMessages.js index c3ffdb0b9..a311598e2 100644 --- a/admin/src/graphql/listContributionMessages.js +++ b/admin/src/graphql/listContributionMessages.js @@ -1,7 +1,7 @@ import gql from 'graphql-tag' export const listContributionMessages = gql` - query ($contributionId: Float!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) { + query ($contributionId: Int!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) { listContributionMessages( contributionId: $contributionId pageSize: $pageSize diff --git a/backend/src/federation/validateCommunities.test.ts b/backend/src/federation/validateCommunities.test.ts index bf9093b16..599564ea6 100644 --- a/backend/src/federation/validateCommunities.test.ts +++ b/backend/src/federation/validateCommunities.test.ts @@ -154,7 +154,8 @@ describe('validate Communities', () => { }) it('logs unsupported api for community with api 2_0 ', () => { expect(logger.warn).toBeCalledWith( - `Federation: dbCom: ${dbCom.id} with unsupported apiVersion=2_0; supported versions=1_0,1_1`, + `Federation: dbCom: ${dbCom.id} with unsupported apiVersion=2_0; supported versions`, + ['1_0', '1_1'], ) }) }) diff --git a/backend/src/graphql/arg/ContributionMessageArgs.ts b/backend/src/graphql/arg/ContributionMessageArgs.ts index 0e573bd36..8b44756a6 100644 --- a/backend/src/graphql/arg/ContributionMessageArgs.ts +++ b/backend/src/graphql/arg/ContributionMessageArgs.ts @@ -1,9 +1,9 @@ -import { ArgsType, Field, ID, InputType } from 'type-graphql' +import { ArgsType, Field, Int, InputType } from 'type-graphql' @InputType() @ArgsType() export default class ContributionMessageArgs { - @Field(() => ID) + @Field(() => Int) contributionId: number @Field(() => String) diff --git a/backend/src/graphql/model/Community.ts b/backend/src/graphql/model/Community.ts index bf8784be2..0cd1926f5 100644 --- a/backend/src/graphql/model/Community.ts +++ b/backend/src/graphql/model/Community.ts @@ -2,7 +2,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import { ObjectType, Field, ID } from 'type-graphql' +import { ObjectType, Field, Int } from 'type-graphql' @ObjectType() export class Community { @@ -16,7 +16,7 @@ export class Community { } } - @Field(() => ID) + @Field(() => Int) id: number @Field(() => String) diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts index 4345a79a6..59c156cad 100644 --- a/backend/src/graphql/model/Contribution.ts +++ b/backend/src/graphql/model/Contribution.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, Int, ID } from 'type-graphql' +import { ObjectType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' import { Contribution as dbContribution } from '@entity/Contribution' import { User } from '@entity/User' @@ -23,7 +23,7 @@ export class Contribution { this.deletedBy = contribution.deletedBy } - @Field(() => ID) + @Field(() => Int) id: number @Field(() => String, { nullable: true }) @@ -44,13 +44,13 @@ export class Contribution { @Field(() => Date, { nullable: true }) confirmedAt: Date | null - @Field(() => ID, { nullable: true }) + @Field(() => Int, { nullable: true }) confirmedBy: number | null @Field(() => Date, { nullable: true }) deniedAt: Date | null - @Field(() => ID, { nullable: true }) + @Field(() => Int, { nullable: true }) deniedBy: number | null @Field(() => Date, { nullable: true }) diff --git a/backend/src/graphql/model/ContributionLink.ts b/backend/src/graphql/model/ContributionLink.ts index 0a81db38d..7a06f8dff 100644 --- a/backend/src/graphql/model/ContributionLink.ts +++ b/backend/src/graphql/model/ContributionLink.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, Int, ID } from 'type-graphql' +import { ObjectType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' import { ContributionLink as dbContributionLink } from '@entity/ContributionLink' import CONFIG from '@/config' @@ -21,7 +21,7 @@ export class ContributionLink { this.link = CONFIG.COMMUNITY_REDEEM_CONTRIBUTION_URL.replace(/{code}/g, this.code) } - @Field(() => ID) + @Field(() => Int) id: number @Field(() => Decimal) diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts index bdcfc093d..6bd6a4715 100644 --- a/backend/src/graphql/model/ContributionMessage.ts +++ b/backend/src/graphql/model/ContributionMessage.ts @@ -1,4 +1,4 @@ -import { Field, ID, Int, ObjectType } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage' import { User } from '@entity/User' @@ -16,7 +16,7 @@ export class ContributionMessage { this.isModerator = contributionMessage.isModerator } - @Field(() => ID) + @Field(() => Int) id: number @Field(() => String) @@ -37,7 +37,7 @@ export class ContributionMessage { @Field(() => String, { nullable: true }) userLastName: string | null - @Field(() => ID, { nullable: true }) + @Field(() => Int, { nullable: true }) userId: number | null @Field(() => Boolean) diff --git a/backend/src/graphql/model/GdtEntry.ts b/backend/src/graphql/model/GdtEntry.ts index 01fb308ae..bbf1cceef 100644 --- a/backend/src/graphql/model/GdtEntry.ts +++ b/backend/src/graphql/model/GdtEntry.ts @@ -2,7 +2,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import { ObjectType, Field, Float, ID } from 'type-graphql' +import { ObjectType, Field, Float, Int } from 'type-graphql' import { GdtEntryType } from '@enum/GdtEntryType' @ObjectType() @@ -21,7 +21,7 @@ export class GdtEntry { this.gdt = json.gdt } - @Field(() => ID) + @Field(() => Int) id: number @Field(() => Float) diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts index 6f480000b..96b80f9a0 100644 --- a/backend/src/graphql/model/Transaction.ts +++ b/backend/src/graphql/model/Transaction.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, ID } from 'type-graphql' +import { ObjectType, Field, Int } from 'type-graphql' import { Decay } from './Decay' import { Transaction as dbTransaction } from '@entity/Transaction' import Decimal from 'decimal.js-light' @@ -47,13 +47,13 @@ export class Transaction { : transaction.transactionLinkId || null } - @Field(() => ID) + @Field(() => Int) id: number @Field(() => User) user: User - @Field(() => ID, { nullable: true }) + @Field(() => Int, { nullable: true }) previous: number | null @Field(() => TransactionTypeId) @@ -80,10 +80,10 @@ export class Transaction { @Field(() => User, { nullable: true }) linkedUser: User | null - @Field(() => ID, { nullable: true }) + @Field(() => Int, { nullable: true }) linkedTransactionId: number | null // Links to the TransactionLink/ContributionLink when transaction was created by a link - @Field(() => ID, { nullable: true }) + @Field(() => Int, { nullable: true }) linkId: number | null } diff --git a/backend/src/graphql/model/TransactionLink.ts b/backend/src/graphql/model/TransactionLink.ts index 4c10c79d8..b0a8ab184 100644 --- a/backend/src/graphql/model/TransactionLink.ts +++ b/backend/src/graphql/model/TransactionLink.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, Int, ID } from 'type-graphql' +import { ObjectType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' import { User } from './User' @@ -21,7 +21,7 @@ export class TransactionLink { this.link = CONFIG.COMMUNITY_REDEEM_URL.replace(/{code}/g, this.code) } - @Field(() => ID) + @Field(() => Int) id: number @Field(() => User) diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts index 068505594..75112ecf5 100644 --- a/backend/src/graphql/model/UnconfirmedContribution.ts +++ b/backend/src/graphql/model/UnconfirmedContribution.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, Int, ID } from 'type-graphql' +import { ObjectType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' import { Contribution } from '@entity/Contribution' import { User } from '@entity/User' @@ -29,7 +29,7 @@ export class UnconfirmedContribution { @Field(() => String) lastName: string - @Field(() => ID) + @Field(() => Int) userId: number @Field(() => String) @@ -44,7 +44,7 @@ export class UnconfirmedContribution { @Field(() => Decimal) amount: Decimal - @Field(() => ID, { nullable: true }) + @Field(() => Int, { nullable: true }) moderator: number | null @Field(() => [Decimal]) diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts index bf973d047..aeb764941 100644 --- a/backend/src/graphql/model/User.ts +++ b/backend/src/graphql/model/User.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, ID, Int } from 'type-graphql' +import { ObjectType, Field, Int } from 'type-graphql' import { KlickTipp } from './KlickTipp' import { User as dbUser } from '@entity/User' import { UserContact } from './UserContact' @@ -28,7 +28,7 @@ export class User { this.hideAmountGDT = user.hideAmountGDT } - @Field(() => ID) + @Field(() => Int) id: number @Field(() => String) @@ -37,7 +37,7 @@ export class User { @Field(() => String, { nullable: true }) alias: string | null - @Field(() => ID, { nullable: true }) + @Field(() => Int, { nullable: true }) emailId: number | null // TODO privacy issue here diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts index e4e3a8315..e7330471b 100644 --- a/backend/src/graphql/model/UserAdmin.ts +++ b/backend/src/graphql/model/UserAdmin.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, Int, ID } from 'type-graphql' +import { ObjectType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' import { User } from '@entity/User' @@ -17,7 +17,7 @@ export class UserAdmin { this.isAdmin = user.isAdmin } - @Field(() => ID) + @Field(() => Int) userId: number @Field(() => String) diff --git a/backend/src/graphql/model/UserContact.ts b/backend/src/graphql/model/UserContact.ts index b62e746a2..bb31d0745 100644 --- a/backend/src/graphql/model/UserContact.ts +++ b/backend/src/graphql/model/UserContact.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, ID, Int } from 'type-graphql' +import { ObjectType, Field, Int } from 'type-graphql' import { UserContact as dbUserContact } from '@entity/UserContact' @ObjectType() @@ -18,13 +18,13 @@ export class UserContact { this.deletedAt = userContact.deletedAt } - @Field(() => ID) + @Field(() => Int) id: number @Field(() => String) type: string - @Field(() => ID) + @Field(() => Int) userId: number @Field(() => String) diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index c35008ae9..e9258490e 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/restrict-template-expressions */ -import { Arg, Args, Authorized, Ctx, ID, Mutation, Query, Resolver } from 'type-graphql' +import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql' import { getConnection } from '@dbTools/typeorm' import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage' @@ -69,7 +69,7 @@ export class ContributionMessageResolver { @Authorized([RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES]) @Query(() => ContributionMessageListResult) async listContributionMessages( - @Arg('contributionId', () => ID) contributionId: number, + @Arg('contributionId', () => Int) contributionId: number, @Args() { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated, ): Promise { diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index dc31282cb..477bc2a5e 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -2024,7 +2024,7 @@ describe('ContributionResolver', () => { ).resolves.toEqual( expect.objectContaining({ data: { - adminCreateContribution: [1000, 1000, 590], + adminCreateContribution: ['1000', '1000', '590'], }, }), ) diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts index 5f3c71bd3..c660a72da 100644 --- a/backend/src/graphql/resolver/TransactionResolver.test.ts +++ b/backend/src/graphql/resolver/TransactionResolver.test.ts @@ -328,7 +328,7 @@ describe('send coins', () => { ).toEqual( expect.objectContaining({ data: { - sendCoins: 'true', + sendCoins: true, }, }), ) @@ -383,7 +383,7 @@ describe('send coins', () => { ).resolves.toEqual( expect.objectContaining({ data: { - sendCoins: 'true', + sendCoins: true, }, }), ) @@ -399,7 +399,7 @@ describe('send coins', () => { ).resolves.toEqual( expect.objectContaining({ data: { - sendCoins: 'true', + sendCoins: true, }, }), ) @@ -415,7 +415,7 @@ describe('send coins', () => { ).resolves.toEqual( expect.objectContaining({ data: { - sendCoins: 'true', + sendCoins: true, }, }), ) @@ -431,7 +431,7 @@ describe('send coins', () => { ).resolves.toEqual( expect.objectContaining({ data: { - sendCoins: 'true', + sendCoins: true, }, }), ) diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index 0e613a4aa..a57346583 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -288,7 +288,7 @@ describe('UserResolver', () => { }) describe('no publisher id', () => { - it('sets publisher id to null', async () => { + it('sets publisher id to 0', async () => { await mutate({ mutation: createUser, variables: { ...variables, email: 'raeuber@hotzenplotz.de', publisherId: undefined }, @@ -299,7 +299,7 @@ describe('UserResolver', () => { emailContact: expect.objectContaining({ email: 'raeuber@hotzenplotz.de', }), - publisherId: null, + publisherId: 0, }), ]), ) @@ -854,7 +854,7 @@ describe('UserResolver', () => { it('returns true', async () => { await expect(mutate({ mutation: logout })).resolves.toEqual( expect.objectContaining({ - data: { logout: 'true' }, + data: { logout: true }, errors: undefined, }), ) diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts index 79684d378..69d6d16d8 100644 --- a/backend/src/seeds/graphql/mutations.ts +++ b/backend/src/seeds/graphql/mutations.ts @@ -269,7 +269,7 @@ export const denyContribution = gql` ` export const createContributionMessage = gql` - mutation ($contributionId: Float!, $message: String!) { + mutation ($contributionId: Int!, $message: String!) { createContributionMessage(contributionId: $contributionId, message: $message) { id message @@ -283,7 +283,7 @@ export const createContributionMessage = gql` ` export const adminCreateContributionMessage = gql` - mutation ($contributionId: Float!, $message: String!) { + mutation ($contributionId: Int!, $message: String!) { adminCreateContributionMessage(contributionId: $contributionId, message: $message) { id message diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts index 6e2e58c67..299a0103d 100644 --- a/backend/src/seeds/graphql/queries.ts +++ b/backend/src/seeds/graphql/queries.ts @@ -301,7 +301,7 @@ export const searchAdminUsers = gql` ` export const listContributionMessages = gql` - query ($contributionId: Float!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) { + query ($contributionId: Int!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) { listContributionMessages( contributionId: $contributionId pageSize: $pageSize diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js index 111eb7ab5..55858b09b 100644 --- a/frontend/src/graphql/mutations.js +++ b/frontend/src/graphql/mutations.js @@ -128,7 +128,7 @@ export const deleteContribution = gql` ` export const createContributionMessage = gql` - mutation($contributionId: Float!, $message: String!) { + mutation($contributionId: Int!, $message: String!) { createContributionMessage(contributionId: $contributionId, message: $message) { id message