Merge pull request #2668 from withspectrum/2.2.0

2.2.0

Author: brianlovin

Diff for: .circleci/config.yml

@@ -41,11 +41,11 @@ aliases:
       |
         node -e "const setup = require('./shared/testing/setup.js')().then(() => process.exit())"
         yarn run build:web
-        yarn run build:iris
+        yarn run build:api
 
-  - &start-iris
-    name: Start Iris in the background
-    command: TEST_DB=true yarn run dev:iris
+  - &start-api
+    name: Start the API in the background
+    command: TEST_DB=true yarn run dev:api
     background: true
 
   - &start-web
@@ -99,7 +99,7 @@ jobs:
       - run: *start-rethinkdb
       - run: sleep 10
       - run: *setup-and-build-web
-      - run: *start-iris
+      - run: *start-api
       - run: *start-web
       - run: sleep 60
       - run:

Diff for: .eslintignore

@@ -12,6 +12,7 @@ rethinkdb_data
 debug
 now-secrets.json
 build-iris
+build-api
 build-athena
 build-hermes
 build-chronos
@@ -28,6 +29,7 @@ queries-by-time.js
 test-extend.js
 stats.json
 iris/.env
+api/.env
 .expo
 mobile/.expo
 test-results.json

Diff for: .github/PULL_REQUEST_TEMPLATE.md

@@ -9,6 +9,7 @@ rethinkdb_data
 debug
 now-secrets.json
 build-iris
+build-api
 build-athena
 build-hermes
 build-chronos
@@ -25,6 +26,7 @@ queries-by-time.js
 test-extend.js
 stats.json
 iris/.env
+api/.env
 .expo
 mobile/.expo
 test-results.json

Diff for: .gitignore

@@ -10,6 +10,7 @@ export const communityInfoFragment = gql`
     website
     profilePhoto
     coverPhoto
+    hasChargeableSource
     communityPermissions {
       isMember
       isBlocked

Diff for: README.md

@@ -63,6 +63,6 @@ export const clearApolloStore = () => {
   try {
     client.resetStore();
   } catch (e) {
-    console.log('error clearing store');
+    console.error('error clearing store');
   }
 };

Diff for: admin/src/api/fragments/community/communityInfo.js

@@ -91,7 +91,7 @@ class CommunitySettings extends Component {
         this.setState({
           isLoading: false,
         });
-        console.log('error', err);
+        console.error('error', err);
       });
   };
 

Diff for: admin/src/api/index.js

@@ -91,7 +91,7 @@ class UserCommunitySettings extends Component {
         this.setState({
           isLoading: false,
         });
-        console.log('error', err);
+        console.error('error', err);
       });
   };
 

Diff for: admin/src/views/communities/components/communitySettings/index.js

@@ -4,7 +4,7 @@
  */
 console.log('Server starting...');
 const compression = require('compression');
-const debug = require('debug')('iris');
+const debug = require('debug')('api');
 debug('logging with debug enabled!');
 import { createServer } from 'http';
 import express from 'express';
@@ -119,3 +119,5 @@ process.on('uncaughtException', async err => {
     process.exit(1);
   }
 });
+
+//

Diff for: admin/src/views/users/components/userCommunitySettings/index.js

@@ -36,6 +36,7 @@ import {
   __createDirectMessageSnippetLoader,
 } from './directMessageThread';
 import { __createReactionLoader } from './reaction';
+import { __createStripeCustomersLoader } from './stripe';
 import type { DataLoaderOptions } from './types';
 
 // Create all the necessary loaders to be attached to the GraphQL context for each request
@@ -62,6 +63,7 @@ const createLoaders = (options?: DataLoaderOptions) => ({
   community: __createCommunityLoader(options),
   communityBySlug: __createCommunityBySlugLoader(options),
   communityRecurringPayments: __createCommunityRecurringPaymentsLoader(options),
+  stripeCustomers: __createStripeCustomersLoader(options),
   communityChannelCount: __createCommunityChannelCountLoader(options),
   communityMemberCount: __createCommunityMemberCountLoader(options),
   communitySettings: __createCommunitySettingsLoader(options),

Diff for: iris/authentication.js renamed to api/authentication.js

@@ -0,0 +1,7 @@
+import { getStripeCustomersByCustomerIds } from '../models/stripeCustomers';
+import createLoader from './create-loader';
+
+export const __createStripeCustomersLoader = createLoader(
+  customers => getStripeCustomersByCustomerIds(customers),
+  'group'
+);

Diff for: iris/index.js renamed to api/index.js

@@ -0,0 +1,24 @@
+exports.up = function(r, conn) {
+  const createCustomersTable = () =>
+    r.tableCreate('stripeCustomers', { primaryKey: 'customerId' }).run(conn);
+  const createInvoicesTable = () =>
+    r.tableCreate('stripeInvoices', { primaryKey: 'invoiceId' }).run(conn);
+
+  return Promise.all([createCustomersTable(), createInvoicesTable()])
+    .then(() =>
+      Promise.all([
+        r
+          .table('stripeInvoices')
+          .indexCreate('customerId')
+          .run(conn),
+      ])
+    )
+    .catch(err => console.log(err));
+};
+
+exports.down = function(r, conn) {
+  return Promise.all([
+    r.tableDrop('stripeCustomers').run(conn),
+    r.tableDrop('stripeInvoices').run(conn),
+  ]);
+};

Diff for: iris/loaders/channel.js renamed to api/loaders/channel.js

@@ -0,0 +1,66 @@
+exports.up = async (r, conn) => {
+  const addFields = r
+    .table('communities')
+    .update({
+      // a distinct email for each community where receipts and admin
+      // messages will be sent, can be different from the owner's personal
+      // email
+      administratorEmail: null,
+      // references the actual creator of the community, discrete from the 'owner'
+      // role
+      creatorId: null,
+      // will be used to fetch records from the stripeCustomers and stripeInvoices
+      // tables in order to populate the billing area and resolve query fields
+      // for community features
+      stripeCustomerId: null,
+      // these are two feature flags that pluto will listen to changes for in
+      // order to trigger billing events
+      analyticsEnabled: false,
+      prioritySupportEnabled: false,
+    })
+    .run(conn);
+
+  // gets all the owner records in a community, figures out which one is the oldest,
+  // then uses that record to populate an administratorEmail and creatorId field
+  // if they exist
+  const oldestOwners = await r
+    .table('usersCommunities')
+    .filter({ isOwner: true })
+    .group('communityId')
+    .ungroup()
+    .map(row => row('reduction'))
+    .map(row => row.min('createdAt'))
+    .eqJoin('userId', r.table('users'))
+    .zip()
+    .run(conn)
+    .then(cursor => cursor.toArray());
+
+  const setAdminFields = oldestOwners.map(async owner => {
+    if (!owner || !owner.userId || !owner.communityId) return;
+    return await r
+      .table('communities')
+      .get(owner.communityId)
+      .update({
+        administratorEmail: owner.email,
+        creatorId: owner.userId,
+      })
+      .run(conn);
+  });
+
+  return Promise.all([addFields]).then(
+    async () => await Promise.all(setAdminFields)
+  );
+};
+
+exports.down = function(r, conn) {
+  return r
+    .table('communities')
+    .update({
+      administratorEmail: r.literal(),
+      creatorId: r.literal(),
+      stripeCustomerId: r.literal(),
+      analyticsEnabled: r.literal(),
+      prioritySupportEnabled: r.literal(),
+    })
+    .run(conn);
+};

Diff for: iris/loaders/community.js renamed to api/loaders/community.js

@@ -6,7 +6,7 @@ const DEFAULT_CONFIG = {
   db: process.env.NODE_ENV === 'test' ? 'testing' : 'spectrum',
   host: 'localhost',
   port: 28015,
-  migrationsDirectory: 'iris/migrations',
+  migrationsDirectory: 'api/migrations',
 };
 
 const RUN_IN_PROD = !!process.env.AWS_RETHINKDB_PASSWORD;

Diff for: iris/loaders/create-loader.js renamed to api/loaders/create-loader.js

@@ -0,0 +1,57 @@
+// @flow
+const constants = require('./constants');
+const {
+  DATE,
+  SPECTRUM_COMMUNITY_ID,
+  PAYMENTS_COMMUNITY_ID,
+  SPECTRUM_GENERAL_CHANNEL_ID,
+  SPECTRUM_PRIVATE_CHANNEL_ID,
+  PAYMENTS_GENERAL_CHANNEL_ID,
+  PAYMENTS_PRIVATE_CHANNEL_ID,
+} = constants;
+
+module.exports = [
+  {
+    id: SPECTRUM_GENERAL_CHANNEL_ID,
+    communityId: SPECTRUM_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    name: 'General',
+    description: 'General chatter',
+    slug: 'general',
+    isPrivate: false,
+    isDefault: true,
+  },
+
+  {
+    id: SPECTRUM_PRIVATE_CHANNEL_ID,
+    communityId: SPECTRUM_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    name: 'Private',
+    description: 'Private chatter',
+    slug: 'private',
+    isPrivate: true,
+    isDefault: false,
+  },
+
+  {
+    id: PAYMENTS_GENERAL_CHANNEL_ID,
+    communityId: PAYMENTS_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    name: 'General',
+    description: 'General chatter',
+    slug: 'general',
+    isPrivate: false,
+    isDefault: true,
+  },
+
+  {
+    id: PAYMENTS_PRIVATE_CHANNEL_ID,
+    communityId: PAYMENTS_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    name: 'Private',
+    description: 'Private chatter',
+    slug: 'private',
+    isPrivate: true,
+    isDefault: false,
+  },
+];

Diff for: iris/loaders/directMessageThread.js renamed to api/loaders/directMessageThread.js

@@ -0,0 +1,30 @@
+// @flow
+const constants = require('./constants');
+const { DATE, SPECTRUM_COMMUNITY_ID, PAYMENTS_COMMUNITY_ID } = constants;
+
+module.exports = [
+  {
+    id: SPECTRUM_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    name: 'Spectrum',
+    description: 'The future of communities',
+    website: 'https://spectrum.chat',
+    profilePhoto:
+      'https://spectrum.imgix.net/communities/-Kh6RfPYjmSaIWbkck8i/Twitter Profile.png.0.6225566835336693',
+    coverPhoto:
+      'https://spectrum.imgix.net/communities/-Kh6RfPYjmSaIWbkck8i/Twitter Header.png.0.3303118636071434',
+    slug: 'spectrum',
+  },
+  {
+    id: PAYMENTS_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    name: 'Payments',
+    description: 'Where payments are tested',
+    website: 'https://spectrum.chat',
+    profilePhoto:
+      'https://spectrum.imgix.net/communities/-Kh6RfPYjmSaIWbkck8i/Twitter Profile.png.0.6225566835336693',
+    coverPhoto:
+      'https://spectrum.imgix.net/communities/-Kh6RfPYjmSaIWbkck8i/Twitter Header.png.0.3303118636071434',
+    slug: 'payments',
+  },
+];