Merge branch 'main' into environment/staging

Author: alexander2001i

lerna.json

@@ -3,7 +3,7 @@
     "packages/*",
     "packages/firebase/functions"
   ],
-  "version": "1.9.10-rc.1",
+  "version": "1.9.11-rc.0",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

packages/admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "admin",
-  "version": "1.9.10-rc.0",
+  "version": "1.9.11-rc.0",
   "private": true,
   "scripts": {
     "dev": "next dev",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@common/core",
-  "version": "1.9.10-rc.0",
+  "version": "1.9.11-rc.0",
   "author": "Alexander Ivanov @alexander2001i",
   "main": "dist/index.js",
   "scripts": {
@@ -19,7 +19,7 @@
     "typescript": "^4.2.3"
   },
   "dependencies": {
-    "@common/queues": "^1.9.10-rc.0",
+    "@common/queues": "^1.9.11-rc.0",
     "@prisma/client": "^2.20.1",
     "axios": "^0.21.1",
     "date-fns": "^2.19.0",

packages/firebase/__tests__/funtions/__snapshots__/common.test.ts.snap

@@ -4,7 +4,6 @@ exports[`Common Related Cloud Functions Common Creation should fail validation o
 Array [
   "You must provide a valid URL",
   "image is a required field",
-  "byline is a required field",
   "contributionAmount is a required field",
 ]
 `;

packages/firebase/functions/package.json

@@ -2,7 +2,7 @@
   "name": "@common/functions",
   "main": "dist/index.js",
   "private": true,
-  "version": "1.9.10-rc.1",
+  "version": "1.9.11-rc.0",
   "description": "Cloud Functions for Common",
   "engines": {
     "node": "12"

packages/firebase/functions/src/common/business/createCommon.ts

@@ -23,9 +23,9 @@ const createCommonDataValidationScheme = yup.object({
     })
     .required(),
 
-  byline: yup.string().min(10).required(),
+  byline: yup.string().min(10),
 
-  description: yup.string().required(),
+  description: yup.string(),
 
   contributionAmount: yup.number().min(0).required(),
 

packages/firebase/functions/src/core/graph/generated/schema.graphql

@@ -2,6 +2,16 @@
 ### Do not make changes to this file directly
 
 
+type Amount {
+  amount: String
+  currency: String
+}
+
+type Balance {
+  available: Amount
+  unsettled: Amount
+}
+
 type Card {
   circleCardId: ID!
 
@@ -83,9 +93,7 @@ type CommonMember {
 }
 
 type CommonMetadata {
-  byline: String!
   contributionType: CommonContributionType
-  description: String!
   founderId: String!
   minFeeToJoin: Int!
 }
@@ -183,6 +191,7 @@ enum IntentionType {
 }
 
 type Mutation {
+  approvePayout(index: Int!, payoutId: ID!, token: String!): Boolean
   createIntention(input: CreateIntentionInput!): Intention
   executePayouts(input: ExecutePayoutInput!): Payout
 
@@ -193,7 +202,11 @@ type Mutation {
     """The common id to refresh"""
     commonId: ID!
   ): Int
-  updatePaymentData(id: ID!, trackId: ID = "f4a15b1d-19f7-4d66-a0d2-95a504f6c2c4"): Boolean
+  updatePaymentData(id: ID!, trackId: ID = "919d4c7d-1a93-40da-a3c1-59eac6f18ba2"): Boolean
+  updatePaymentsCommonId: Boolean
+  updatePayoutStatus(payoutId: ID!): Boolean
+  updatePayoutsStatus: Boolean
+  whitelistCommon(commonId: ID!): Boolean
 }
 
 type Payment {
@@ -369,6 +382,7 @@ enum ProposalVoteOutcome {
 }
 
 type Query {
+  balance: Balance
   common(
     """The ID of the common, that you want to retrieve"""
     commonId: ID!

packages/firebase/functions/src/core/graph/generated/schema.types.ts

@@ -4,8 +4,9 @@
  */
 
 
-import { IRequestContext } from "./../../../core"
-import { core } from "nexus"
+import { IRequestContext } from './../../../core';
+import { core } from 'nexus';
+
 declare global {
   interface NexusGenCustomInputMethods<TypeName extends string> {
     date<FieldName extends string>(fieldName: FieldName, opts?: core.CommonInputFieldConfig<TypeName, FieldName>): void // "Date";
@@ -61,6 +62,14 @@ export interface NexusGenScalars {
 }
 
 export interface NexusGenObjects {
+  Amount: { // root type
+    amount?: string | null; // String
+    currency?: string | null; // String
+  }
+  Balance: { // root type
+    available?: NexusGenRootTypes['Amount'] | null; // Amount
+    unsettled?: NexusGenRootTypes['Amount'] | null; // Amount
+  }
   Card: { // root type
     circleCardId: string; // ID!
     createdAt: NexusGenScalars['Date']; // Date!
@@ -98,9 +107,7 @@ export interface NexusGenObjects {
     userId: string; // ID!
   }
   CommonMetadata: { // root type
-    byline: string; // String!
     contributionType?: NexusGenEnums['CommonContributionType'] | null; // CommonContributionType
-    description: string; // String!
     founderId: string; // String!
     minFeeToJoin: number; // Int!
   }
@@ -266,6 +273,14 @@ export type NexusGenRootTypes = NexusGenObjects
 export type NexusGenAllTypes = NexusGenRootTypes & NexusGenScalars & NexusGenEnums
 
 export interface NexusGenFieldTypes {
+  Amount: { // field return type
+    amount: string | null; // String
+    currency: string | null; // String
+  }
+  Balance: { // field return type
+    available: NexusGenRootTypes['Amount'] | null; // Amount
+    unsettled: NexusGenRootTypes['Amount'] | null; // Amount
+  }
   Card: { // field return type
     circleCardId: string; // ID!
     createdAt: NexusGenScalars['Date']; // Date!
@@ -310,9 +325,7 @@ export interface NexusGenFieldTypes {
     userId: string; // ID!
   }
   CommonMetadata: { // field return type
-    byline: string; // String!
     contributionType: NexusGenEnums['CommonContributionType'] | null; // CommonContributionType
-    description: string; // String!
     founderId: string; // String!
     minFeeToJoin: number; // Int!
   }
@@ -333,10 +346,15 @@ export interface NexusGenFieldTypes {
     updatedAt: NexusGenScalars['Date']; // Date!
   }
   Mutation: { // field return type
+    approvePayout: boolean | null; // Boolean
     createIntention: NexusGenRootTypes['Intention'] | null; // Intention
     executePayouts: NexusGenRootTypes['Payout'] | null; // Payout
     refreshCommonMembers: number | null; // Int
     updatePaymentData: boolean | null; // Boolean
+    updatePaymentsCommonId: boolean | null; // Boolean
+    updatePayoutStatus: boolean | null; // Boolean
+    updatePayoutsStatus: boolean | null; // Boolean
+    whitelistCommon: boolean | null; // Boolean
   }
   Payment: { // field return type
     amount: NexusGenRootTypes['PaymentAmount']; // PaymentAmount!
@@ -425,6 +443,7 @@ export interface NexusGenFieldTypes {
     voterId: string; // ID!
   }
   Query: { // field return type
+    balance: NexusGenRootTypes['Balance'] | null; // Balance
     common: NexusGenRootTypes['Common'] | null; // Common
     commons: Array<NexusGenRootTypes['Common'] | null> | null; // [Common]
     event: NexusGenRootTypes['Event'] | null; // Event
@@ -509,6 +528,14 @@ export interface NexusGenFieldTypes {
 }
 
 export interface NexusGenFieldTypeNames {
+  Amount: { // field return type name
+    amount: 'String'
+    currency: 'String'
+  }
+  Balance: { // field return type name
+    available: 'Amount'
+    unsettled: 'Amount'
+  }
   Card: { // field return type name
     circleCardId: 'ID'
     createdAt: 'Date'
@@ -553,9 +580,7 @@ export interface NexusGenFieldTypeNames {
     userId: 'ID'
   }
   CommonMetadata: { // field return type name
-    byline: 'String'
     contributionType: 'CommonContributionType'
-    description: 'String'
     founderId: 'String'
     minFeeToJoin: 'Int'
   }
@@ -576,10 +601,15 @@ export interface NexusGenFieldTypeNames {
     updatedAt: 'Date'
   }
   Mutation: { // field return type name
+    approvePayout: 'Boolean'
     createIntention: 'Intention'
     executePayouts: 'Payout'
     refreshCommonMembers: 'Int'
     updatePaymentData: 'Boolean'
+    updatePaymentsCommonId: 'Boolean'
+    updatePayoutStatus: 'Boolean'
+    updatePayoutsStatus: 'Boolean'
+    whitelistCommon: 'Boolean'
   }
   Payment: { // field return type name
     amount: 'PaymentAmount'
@@ -668,6 +698,7 @@ export interface NexusGenFieldTypeNames {
     voterId: 'ID'
   }
   Query: { // field return type name
+    balance: 'Balance'
     common: 'Common'
     commons: 'Common'
     event: 'Event'
@@ -761,6 +792,11 @@ export interface NexusGenArgTypes {
     }
   }
   Mutation: {
+    approvePayout: { // args
+      index: number; // Int!
+      payoutId: string; // ID!
+      token: string; // String!
+    }
     createIntention: { // args
       input: NexusGenInputs['CreateIntentionInput']; // CreateIntentionInput!
     }
@@ -774,6 +810,12 @@ export interface NexusGenArgTypes {
       id: string; // ID!
       trackId: string | null; // ID
     }
+    updatePayoutStatus: { // args
+      payoutId: string; // ID!
+    }
+    whitelistCommon: { // args
+      commonId: string; // ID!
+    }
   }
   Query: {
     common: { // args

packages/firebase/functions/src/core/graph/schema/commons/types/Common.type.ts

@@ -24,12 +24,12 @@ export const CommonType = objectType({
 
     t.nonNull.int('balance', {
       description: 'The currently available funds of the common',
-      resolve: (root: ICommonEntity) => Math.round(root.balance),
+      resolve: (root) => Math.round((root as ICommonEntity).balance)
     });
 
     t.nonNull.int('raised', {
       description: 'The total amount of money, raised by the common',
-      resolve: (root: ICommonEntity) => Math.round(root.raised),
+      resolve: (root) => Math.round((root as ICommonEntity).raised)
     });
 
     t.nonNull.field('metadata', {

packages/firebase/functions/src/core/graph/schema/commons/types/CommonMetadata.type.ts

@@ -5,8 +5,6 @@ import { CommonContributionTypeEnum } from '../enums/CommonContributionType.enum
 export const CommonMetadataType = objectType({
   name: 'CommonMetadata',
   definition(t) {
-    t.nonNull.string('byline');
-    t.nonNull.string('description');
     t.nonNull.string('founderId');
     t.nonNull.int('minFeeToJoin');