From 72d974ca63fb797ef50ba67becc662ddbe609b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franc=CC=A7ois=20Hodierne?= Date: Tue, 21 Nov 2023 19:51:09 +0100 Subject: [PATCH] update GraphQL schema --- src/graphql/schema.graphql | 55 ++++++++++++++++++++++++++++-------- src/graphql/schemaV2.graphql | 17 +++++++++-- 2 files changed, 57 insertions(+), 15 deletions(-) diff --git a/src/graphql/schema.graphql b/src/graphql/schema.graphql index b5a81d88..215bc044 100644 --- a/src/graphql/schema.graphql +++ b/src/graphql/schema.graphql @@ -36,7 +36,7 @@ interface CollectiveInterface { """ Defines if a collective is pledged """ - isPledged: Boolean @deprecated(reason: "2023-11-20: Pledged collectives do not exist anymore") + isPledged: Boolean data: JSON @deprecated(reason: "2020-10-08: This field is not provided anymore and will return an empty object") """ @@ -726,11 +726,12 @@ enum OrderStatus { PAID ERROR PROCESSING - REJECTED ACTIVE CANCELLED PENDING EXPIRED + PLEDGED + REJECTED DISPUTED REFUNDED IN_REVIEW @@ -2133,7 +2134,7 @@ type Collective implements CollectiveInterface { """ Defines if a collective is pledged """ - isPledged: Boolean @deprecated(reason: "2023-11-20: Pledged collectives do not exist anymore") + isPledged: Boolean data: JSON @deprecated(reason: "2020-10-08: This field is not provided anymore and will return an empty object") """ @@ -2397,7 +2398,7 @@ type Event implements CollectiveInterface { """ Defines if a collective is pledged """ - isPledged: Boolean @deprecated(reason: "2023-11-20: Pledged collectives do not exist anymore") + isPledged: Boolean data: JSON @deprecated(reason: "2020-10-08: This field is not provided anymore and will return an empty object") """ @@ -2661,7 +2662,7 @@ type Fund implements CollectiveInterface { """ Defines if a collective is pledged """ - isPledged: Boolean @deprecated(reason: "2023-11-20: Pledged collectives do not exist anymore") + isPledged: Boolean data: JSON @deprecated(reason: "2020-10-08: This field is not provided anymore and will return an empty object") """ @@ -2925,7 +2926,7 @@ type Organization implements CollectiveInterface { """ Defines if a collective is pledged """ - isPledged: Boolean @deprecated(reason: "2023-11-20: Pledged collectives do not exist anymore") + isPledged: Boolean data: JSON @deprecated(reason: "2020-10-08: This field is not provided anymore and will return an empty object") """ @@ -3189,7 +3190,7 @@ type Project implements CollectiveInterface { """ Defines if a collective is pledged """ - isPledged: Boolean @deprecated(reason: "2023-11-20: Pledged collectives do not exist anymore") + isPledged: Boolean data: JSON @deprecated(reason: "2020-10-08: This field is not provided anymore and will return an empty object") """ @@ -3453,7 +3454,12 @@ type Expense implements Transaction { """ Fee kept by the payment processor in the lowest unit of the currency of the host (ie. in cents) """ - paymentProcessorFeeInHostCurrency: Int + paymentProcessorFeeInHostCurrency( + """ + Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity. + """ + fetchPaymentProcessorFee: Boolean = false + ): Int """ The amount paid in tax (for example VAT) for this transaction @@ -3473,6 +3479,11 @@ type Expense implements Transaction { Fetch HOST_FEE transaction and integrate in calculation for retro-compatiblity. """ fetchHostFee: Boolean = false + + """ + Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity. + """ + fetchPaymentProcessorFee: Boolean = false ): Int amountInHostCurrency: Int host: User @@ -3553,6 +3564,11 @@ interface Transaction { Fetch HOST_FEE transaction and integrate in calculation for retro-compatibility. """ fetchHostFee: Boolean = false + + """ + Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity. + """ + fetchPaymentProcessorFee: Boolean = false ): Int amountInHostCurrency: Int @@ -3566,7 +3582,12 @@ interface Transaction { fetchHostFee: Boolean = false ): Int platformFeeInHostCurrency: Int - paymentProcessorFeeInHostCurrency: Int + paymentProcessorFeeInHostCurrency( + """ + Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity. + """ + fetchPaymentProcessorFee: Boolean = false + ): Int taxAmount: Int taxInfo: TaxInfo createdByUser: UserDetails @@ -3623,7 +3644,12 @@ type Order implements Transaction { """ Fee kept by the payment processor in the lowest unit of the currency of the host (ie. in cents) """ - paymentProcessorFeeInHostCurrency: Int + paymentProcessorFeeInHostCurrency( + """ + Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity. + """ + fetchPaymentProcessorFee: Boolean = false + ): Int """ The amount paid in tax (for example VAT) for this transaction @@ -3643,6 +3669,11 @@ type Order implements Transaction { Fetch HOST_FEE transaction and integrate in calculation for retro-compatiblity. """ fetchHostFee: Boolean = false + + """ + Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity. + """ + fetchPaymentProcessorFee: Boolean = false ): Int amountInHostCurrency: Int host: User @@ -3698,7 +3729,7 @@ type User implements CollectiveInterface { """ Defines if a collective is pledged """ - isPledged: Boolean @deprecated(reason: "2023-11-20: Pledged collectives do not exist anymore") + isPledged: Boolean data: JSON @deprecated(reason: "2020-10-08: This field is not provided anymore and will return an empty object") """ @@ -3963,7 +3994,7 @@ type Vendor implements CollectiveInterface { """ Defines if a collective is pledged """ - isPledged: Boolean @deprecated(reason: "2023-11-20: Pledged collectives do not exist anymore") + isPledged: Boolean data: JSON @deprecated(reason: "2020-10-08: This field is not provided anymore and will return an empty object") """ diff --git a/src/graphql/schemaV2.graphql b/src/graphql/schemaV2.graphql index be32942c..c37996c6 100644 --- a/src/graphql/schemaV2.graphql +++ b/src/graphql/schemaV2.graphql @@ -1114,11 +1114,12 @@ enum OrderStatus { PAID ERROR PROCESSING - REJECTED ACTIVE CANCELLED PENDING EXPIRED + PLEDGED + REJECTED DISPUTED REFUNDED IN_REVIEW @@ -1163,12 +1164,22 @@ interface Transaction { Fetch HOST_FEE transaction and integrate in calculation for retro-compatiblity. """ fetchHostFee: Boolean = false + + """ + Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity. + """ + fetchPaymentProcessorFee: Boolean = false ): Amount! netAmountInHostCurrency( """ Fetch HOST_FEE transaction and integrate in calculation for retro-compatiblity. """ fetchHostFee: Boolean = false + + """ + Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity. + """ + fetchPaymentProcessorFee: Boolean = false ): Amount! taxAmount: Amount! @@ -5040,7 +5051,6 @@ enum ActivityType { TICKET_CONFIRMED ORDER_CANCELED_ARCHIVED_COLLECTIVE ORDER_PENDING - ORDER_PENDING_CRYPTO ORDER_PENDING_CONTRIBUTION_NEW ORDER_PENDING_CONTRIBUTION_REMINDER ORDER_PROCESSING @@ -5085,6 +5095,7 @@ enum ActivityType { COLLECTIVE_VIRTUAL_CARD_CREATED SUBSCRIPTION_CONFIRMED COLLECTIVE_COMMENT_CREATED + ORDER_PENDING_CRYPTO BACKYOURSTACK_DISPATCH_CONFIRMED } @@ -13268,7 +13279,6 @@ enum ActivityAndClassesType { TICKET_CONFIRMED ORDER_CANCELED_ARCHIVED_COLLECTIVE ORDER_PENDING - ORDER_PENDING_CRYPTO ORDER_PENDING_CONTRIBUTION_NEW ORDER_PENDING_CONTRIBUTION_REMINDER ORDER_PROCESSING @@ -13313,6 +13323,7 @@ enum ActivityAndClassesType { COLLECTIVE_VIRTUAL_CARD_CREATED SUBSCRIPTION_CONFIRMED COLLECTIVE_COMMENT_CREATED + ORDER_PENDING_CRYPTO BACKYOURSTACK_DISPATCH_CONFIRMED COLLECTIVE EXPENSES