fetch allTransactions globally, fix default collective.isActive

opencollective · Feb 21, 2018 · 036ff10 · 036ff10
1 parent 9f63398
commit 036ff10
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/server/graphql/TransactionInterface.js b/server/graphql/TransactionInterface.js
@@ -42,7 +42,7 @@ export const TransactionInterfaceType = new GraphQLInterfaceType({
       platformFeeInHostCurrency: { type: GraphQLInt },
       paymentProcessorFeeInHostCurrency: { type: GraphQLInt },
       createdByUser: { type: UserType },
-      host: { type: UserCollectiveType },
+      host: { type: CollectiveInterfaceType },
       paymentMethod: { type: PaymentMethodType },
       fromCollective: { type: CollectiveInterfaceType },
       collective: { type: CollectiveInterfaceType },

diff --git a/server/graphql/mutations/collectives.js b/server/graphql/mutations/collectives.js
@@ -59,7 +59,7 @@ export function createCollective(_, args, req) {
           if (!hc) return Promise.reject(new Error(`Host collective with id ${args.collective.HostCollectiveId} not found`));
           hostCollective = hc;
           collectiveData.currency = collectiveData.currency || hc.currency;
-          if (req.remoteUser.hasRole([roles.ADMIN, roles.HOST, roles.MEMBER], hostCollective.id)) {
+          if (req.remoteUser.hasRole([roles.ADMIN, roles.HOST], hostCollective.id)) {
             collectiveData.isActive = true;
           }
         })

diff --git a/server/graphql/queries.js b/server/graphql/queries.js
@@ -75,18 +75,23 @@ const queries = {
   allTransactions: {
     type: new GraphQLList(TransactionInterfaceType),
     args: {
-      CollectiveId: { type: new GraphQLNonNull(GraphQLInt) },
+      CollectiveId: { type: GraphQLInt },
+      collectiveSlug: { type: GraphQLString },
       type: { type: GraphQLString },
       limit: { type: GraphQLInt },
       offset: { type: GraphQLInt },
       dateFrom: { type: GraphQLString },
       dateTo: { type: GraphQLString },
     },
-    resolve(_, args) {
+    async resolve(_, args) {
       const query = {
-        where: { CollectiveId: args.CollectiveId },
+        where: {},
         order: [ ['createdAt', 'DESC'] ]
       };
+
+      const CollectiveId = args.CollectiveId || await fetchCollectiveId(args.collectiveSlug);
+
+      if (CollectiveId) query.where.CollectiveId = CollectiveId;
       if (args.type) query.where.type = args.type;
       if (args.limit) query.limit = args.limit;
       if (args.offset) query.offset = args.offset;