graphqlV2: return hosts as Host and not as Organization

opencollective · Dec 18, 2023 · 2760bcf · 2760bcf
1 parent 04a1ab3
commit 2760bcf
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 37 deletions.
diff --git a/server/graphql/schemaV1.graphql b/server/graphql/schemaV1.graphql
@@ -3426,7 +3426,7 @@ type Expense implements Transaction {
   uuid: String
   type: String
   kind: String
-  amount: Int
+  amount: Float
   currency: String
   hostCurrency: String
 
@@ -3443,12 +3443,12 @@ type Expense implements Transaction {
     Fetch HOST_FEE transaction for retro-compatiblity.
     """
     fetchHostFee: Boolean = false
-  ): Int
+  ): Float
 
   """
   Fee kept by the Open Collective Platform in the lowest unit of the currency of the host (ie. in cents)
   """
-  platformFeeInHostCurrency: Int
+  platformFeeInHostCurrency: Float
 
   """
   Fee kept by the payment processor in the lowest unit of the currency of the host (ie. in cents)
@@ -3458,12 +3458,12 @@ type Expense implements Transaction {
     Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity.
     """
     fetchPaymentProcessorFee: Boolean = false
-  ): Int
+  ): Float
 
   """
   The amount paid in tax (for example VAT) for this transaction
   """
-  taxAmount: Int
+  taxAmount: Float
 
   """
   If taxAmount is set, this field will contain more info about the tax
@@ -3483,8 +3483,8 @@ type Expense implements Transaction {
     Fetch PAYMENT_PROCESSOR_FEE transaction and integrate in calculation for retro-compatiblity.
     """
     fetchPaymentProcessorFee: Boolean = false
-  ): Int
-  amountInHostCurrency: Int
+  ): Float
+  amountInHostCurrency: Float
   host: User
   createdByUser: UserDetails
   fromCollective: CollectiveInterface
@@ -3550,7 +3550,7 @@ interface Transaction {
   id: Int
   idV2: String
   uuid: String
-  amount: Int
+  amount: Float
   currency: String
   hostCurrency: String
   hostCurrencyFxRate: Float
@@ -3568,8 +3568,8 @@ interface Transaction {
     Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity.
     """
     fetchPaymentProcessorFee: Boolean = false
-  ): Int
-  amountInHostCurrency: Int
+  ): Float
+  amountInHostCurrency: Float
 
   """
   Fee kept by the host in the lowest unit of the currency of the host (ie. in cents)
@@ -3579,15 +3579,15 @@ interface Transaction {
     Fetch HOST_FEE transaction for retro-compatibility.
     """
     fetchHostFee: Boolean = false
-  ): Int
-  platformFeeInHostCurrency: Int
+  ): Float
+  platformFeeInHostCurrency: Float
   paymentProcessorFeeInHostCurrency(
     """
     Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity.
     """
     fetchPaymentProcessorFee: Boolean = false
-  ): Int
-  taxAmount: Int
+  ): Float
+  taxAmount: Float
   taxInfo: TaxInfo
   createdByUser: UserDetails
   host: CollectiveInterface
@@ -3616,7 +3616,7 @@ type Order implements Transaction {
   uuid: String
   type: String
   kind: String
-  amount: Int
+  amount: Float
   currency: String
   hostCurrency: String
 
@@ -3633,12 +3633,12 @@ type Order implements Transaction {
     Fetch HOST_FEE transaction for retro-compatiblity.
     """
     fetchHostFee: Boolean = false
-  ): Int
+  ): Float
 
   """
   Fee kept by the Open Collective Platform in the lowest unit of the currency of the host (ie. in cents)
   """
-  platformFeeInHostCurrency: Int
+  platformFeeInHostCurrency: Float
 
   """
   Fee kept by the payment processor in the lowest unit of the currency of the host (ie. in cents)
@@ -3648,12 +3648,12 @@ type Order implements Transaction {
     Fetch PAYMENT_PROCESSOR_FEE transaction for retro-compatiblity.
     """
     fetchPaymentProcessorFee: Boolean = false
-  ): Int
+  ): Float
 
   """
   The amount paid in tax (for example VAT) for this transaction
   """
-  taxAmount: Int
+  taxAmount: Float
 
   """
   If taxAmount is set, this field will contain more info about the tax
@@ -3673,8 +3673,8 @@ type Order implements Transaction {
     Fetch PAYMENT_PROCESSOR_FEE transaction and integrate in calculation for retro-compatiblity.
     """
     fetchPaymentProcessorFee: Boolean = false
-  ): Int
-  amountInHostCurrency: Int
+  ): Float
+  amountInHostCurrency: Float
   host: User
   createdByUser: UserDetails
   fromCollective: CollectiveInterface

diff --git a/server/graphql/schemaV2.graphql b/server/graphql/schemaV2.graphql
@@ -17087,6 +17087,7 @@ input ExpenseCreateInput {
 
 input PayoutMethodInput {
   id: String
+  legacyId: Int
   data: JSON
   name: String
   isSaved: Boolean

diff --git a/server/graphql/v2/object/Host.js b/server/graphql/v2/object/Host.js
@@ -101,8 +101,7 @@ export const GraphQLHost = new GraphQLObjectType({
   name: 'Host',
   description: 'This represents an Host account',
   interfaces: () => [GraphQLAccount, GraphQLAccountWithContributions],
-  // Due to overlap between our Organization and Host types, we cannot use isTypeOf here
-  // isTypeOf: account => account.isHostAccount,
+  isTypeOf: collective => collective.type === 'ORGANIZATION' && collective.isHostAccount,
   fields: () => {
     return {
       ...AccountFields,

diff --git a/server/graphql/v2/object/Organization.js b/server/graphql/v2/object/Organization.js
@@ -11,7 +11,7 @@ export const GraphQLOrganization = new GraphQLObjectType({
   name: 'Organization',
   description: 'This represents an Organization account',
   interfaces: () => [GraphQLAccount, GraphQLAccountWithContributions],
-  isTypeOf: collective => collective.type === 'ORGANIZATION',
+  isTypeOf: collective => collective.type === 'ORGANIZATION' && !collective.isHostAccount,
   fields: () => {
     return {
       ...AccountFields,

diff --git a/test/server/graphql/v2/mutation/AccountingCategoriesMutations.test.ts b/test/server/graphql/v2/mutation/AccountingCategoriesMutations.test.ts
@@ -27,18 +27,16 @@ describe('server/graphql/v2/mutation/AccountingCategoriesMutations', () => {
     const editAccountingCategoriesMutation = gqlV2/* GraphQL */ `
       mutation EditAccountingCategories($account: AccountReferenceInput!, $categories: [AccountingCategoryInput!]!) {
         editAccountingCategories(account: $account, categories: $categories) {
-          ... on Organization {
-            host {
-              id
-              accountingCategories {
-                totalCount
-                nodes {
-                  id
-                  code
-                  name
-                  friendlyName
-                  expensesTypes
-                }
+          ... on Host {
+            id
+            accountingCategories {
+              totalCount
+              nodes {
+                id
+                code
+                name
+                friendlyName
+                expensesTypes
               }
             }
           }
@@ -196,7 +194,7 @@ describe('server/graphql/v2/mutation/AccountingCategoriesMutations', () => {
     it('edits accounting categories successfully', async () => {
       const admin = await fakeUser();
       const host = await fakeActiveHost({ admin });
-      const getNodesFromResult = result => get(result, 'data.editAccountingCategories.host.accountingCategories.nodes');
+      const getNodesFromResult = result => get(result, 'data.editAccountingCategories.accountingCategories.nodes');
 
       // Host starts with no accounting categories
       expect(await host.getAccountingCategories()).to.have.length(0);