Merge branch 'sb/287' into 'master'

backend for agnostic campaigns

See merge request debtcollective/debtcollective!174

controllers/Admin/Collectives/CampaignsController.js

@@ -1,5 +1,5 @@
 /* globals neonode, CONFIG, Class, Admin, RestfulController, Collective, DisputeTool,
-NotFoundError, Campaign */
+NotFoundError, Campaign, logger */
 
 const fs = require('fs-extra');
 
@@ -28,6 +28,7 @@ Class(Admin.Collectives, 'CampaignsController').inherits(RestfulController)({
     {
       before(req, res, next) {
         res.locals.selectedCollective = req.params.collective_id;
+        logger.debug(`Identified selectedCollective (${res.locals.selectedCollective})`);
         next();
       },
       actions: ['new', 'edit', 'update'],
@@ -54,6 +55,8 @@ Class(Admin.Collectives, 'CampaignsController').inherits(RestfulController)({
 
   prototype: {
     _loadCampaign(req, res, next) {
+      logger.debug(`Loading campaign ${req.params.id}`);
+
       Admin.Collectives.Campaign.query()
         .where('id', req.params.id)
         .include('collective')
@@ -64,6 +67,7 @@ Class(Admin.Collectives, 'CampaignsController').inherits(RestfulController)({
 
           req.campaign = campaign[0];
           res.locals.campaign = campaign[0];
+          logger.debug(`Campaign ${req.params.id} loaded from db`);
           return next();
         })
         .catch(next);
@@ -79,14 +83,16 @@ Class(Admin.Collectives, 'CampaignsController').inherits(RestfulController)({
       campaign.collectiveId = req.params.collective_id;
       campaign.active = true;
 
+      logger.debug(`Creating new campaign ${campaign.title}`);
+
       campaign.save()
         .then(() => {
           if (req.files && req.files.image && req.files.image.length > 0) {
             const image = req.files.image[0];
 
             return campaign.attach('cover', image.path, {
               fileSize: image.size,
-              mimeType: image.mimetype || image.mimeType
+              mimeType: image.mimetype || image.mimeType,
             })
             .then(() => {
               fs.unlinkSync(image.path);
@@ -104,6 +110,7 @@ Class(Admin.Collectives, 'CampaignsController').inherits(RestfulController)({
           );
         })
         .catch((err) => {
+          logger.error(`Unable to create campaign ${campaign.title}: ${err} ${err.stack}`);
           res.status(400);
 
           res.locals.errors = err.errors || err;
@@ -113,10 +120,13 @@ Class(Admin.Collectives, 'CampaignsController').inherits(RestfulController)({
     },
 
     edit(req, res) {
+      logger.debug(`Someone is updating campaign ${req.campaign.title}`);
       res.render('admin/campaigns/edit');
     },
 
     update(req, res) {
+      logger.debug(`Updating campaign ${req.campaign.title}`);
+
       req.campaign.updateAttributes(req.body);
 
       const active = req.body.active === 'true';
@@ -132,7 +142,7 @@ Class(Admin.Collectives, 'CampaignsController').inherits(RestfulController)({
 
             return req.campaign.attach('cover', image.path, {
               fileSize: image.size,
-              mimeType: image.mimetype || image.mimeType
+              mimeType: image.mimetype || image.mimeType,
             })
             .then(() => {
               fs.unlinkSync(image.path);
@@ -161,8 +171,11 @@ Class(Admin.Collectives, 'CampaignsController').inherits(RestfulController)({
     activate(req, res, next) {
       req.campaign.active = true;
 
+      logger.debug('Activating campaign ${req.campaign.title}');
+
       req.campaign.save()
         .then(() => {
+          logger.debug(`Successfully activated campaign ${req.campaign.title}`);
           req.flash('success', 'The campaign is now active.');
           res.redirect(CONFIG.router.helpers.Campaigns.show.url(req.campaign.id));
         })

controllers/Admin/Collectives/UsersController.js

@@ -120,7 +120,7 @@ Admin.UsersController = Class(Admin.Collectives, 'UsersController').inherits(Res
     },
     {
       before(req, res, next) {
-        Collective.query()
+        Collective.queryVisible()
           .where('id', req.params.collective_id)
           .then(([collective]) => {
             req.collective = collective;

controllers/Admin/CollectivesController.js

@@ -31,7 +31,7 @@ Admin.CollectivesController = Class(Admin, 'CollectivesController').inherits(Res
     // Load Collectives
     {
       before(req, res, next) {
-        Admin.Collective.query()
+        Admin.Collective.queryVisible()
           .include('tools')
           .orderBy('created_at', 'DESC')
           .then((collectives) => {
@@ -63,7 +63,7 @@ Admin.CollectivesController = Class(Admin, 'CollectivesController').inherits(Res
   ],
   prototype: {
     _loadCollective(req, res, next) {
-      Collective.query()
+      Collective.queryVisible()
         .where({ id: req.params.id })
         .include('tools')
         .then(([collective]) => {

controllers/Admin/UsersController.js

@@ -79,7 +79,7 @@ Admin.UsersController = Class(Admin, 'UsersController').inherits(RestfulControll
           res.locals._backUrl = req.query._backUrl;
         }
 
-        Collective.query()
+        Collective.queryVisible()
           .orderBy('created_at', 'ASC')
           .then((collectives) => {
             req.collectives = collectives;

controllers/CampaignsController.js

@@ -2,6 +2,7 @@
 User, Event, EventAssistant, KBTopic, KBPost */
 
 const path = require('path');
+
 const RESTfulAPI = require(path.join(process.cwd(), 'lib', 'RESTfulAPI'));
 
 const marked = require('marked');
@@ -305,6 +306,10 @@ const CampaignsController = Class('CampaignsController').inherits(RestfulControl
       res.render('campaigns/show');
     },
 
+    index(req, res) {
+      res.render('campaigns/index');
+    },
+
     join(req, res, next) {
       const knex = Campaign.knex();
       const debtAmount = (req.body.debt_amount * 100) || 0;

controllers/CollectivesController.js

@@ -37,7 +37,7 @@ const CollectivesController = Class('CollectivesController').inherits(RestfulCon
     // Load Collectives
     {
       before(req, res, next) {
-        Collective.query()
+        Collective.queryVisible()
           .orderBy('created_at', 'DESC')
           .then((collectives) => Promise.all(collectives.map((c) => {
             const subquery = Campaign.query()

controllers/PostsController.js

@@ -1,5 +1,5 @@
 /* global Class, CONFIG, RestfulController, NotFoundError, Post, PostsController,
-PostImage, neonode, Campaign, Account */
+PostImage, neonode, Campaign, Account, logger */
 
 const _ = require('lodash');
 const sanitize = require('sanitize-html');
@@ -169,6 +169,8 @@ const PostsController = Class('PostsController').inherits(RestfulController)({
     },
 
     create(req, res) {
+      logger.debug(`Creating a new post by ${req.user.id}`);
+
       let builder = false;
 
       const controller = neonode.controllers.Posts;
@@ -186,10 +188,11 @@ const PostsController = Class('PostsController').inherits(RestfulController)({
       }
 
       if (!builder) {
-        builder = Promise.reject(new Error('Invalid post type'));
+        logger.debug(`New post by ${req.user.id} had invalid post type ${req.body.type}`);
+        return Promise.reject(new Error('Invalid post type'));
       }
 
-      builder
+      return builder
         .then((post) => {
           res.json(post);
         })
@@ -397,10 +400,10 @@ const PostsController = Class('PostsController').inherits(RestfulController)({
       }
 
       if (!builder) {
-        builder = Promise.reject(new Error('Invalid post type'));
+        return Promise.reject(new Error('Invalid post type'));
       }
 
-      builder
+      return builder
         .then(() => {
           res.json(post);
         })

controllers/UsersController.js

@@ -1,5 +1,5 @@
 /* globals Class, RestfulController, User, NotFoundError,
-CONFIG, Collective, Account, DisputeTool */
+CONFIG, Collective, Account, DisputeTool, logger */
 const Promise = require('bluebird');
 const fs = require('fs-extra');
 const createQueue = require('../workers/utils').createQueue;
@@ -86,9 +86,13 @@ const UsersController = Class('UsersController').inherits(RestfulController)({
 
       user.role = 'User';
 
+      logger.debug(`Creating a new user ${user.email}`);
+
       if (!Array.isArray(req.body.collectiveIds)) {
         req.body.collectiveIds = [req.body.collectiveIds];
       }
+      const collectiveIds = req.body.collectiveIds;
+      collectiveIds.push(Collective.invisibleId);
 
       User.transaction(trx =>
         user
@@ -106,7 +110,7 @@ const UsersController = Class('UsersController').inherits(RestfulController)({
               .del()
           )
           .then(() => {
-            const userCollectives = req.body.collectiveIds.map(
+            const userCollectives = collectiveIds.map(
               collectiveId => ({
                 user_id: user.id,
                 collective_id: collectiveId,
@@ -118,12 +122,11 @@ const UsersController = Class('UsersController').inherits(RestfulController)({
               .transacting(trx)
               .insert(userCollectives);
           })
-          .then(() =>
-            Promise.each(req.body.collectiveIds, collectiveId =>
-              Collective.query()
+          .then(() => Promise.each(collectiveIds, collectiveId => Collective.query()
                 .transacting(trx)
                 .where('id', collectiveId)
                 .then(([collective]) => {
+                  logger.debug(`Incrementing ${collective.name} userCount for new user ${user.id}`)
                   collective.userCount++;
 
                   return collective.transacting(trx).save();
@@ -150,6 +153,7 @@ const UsersController = Class('UsersController').inherits(RestfulController)({
             .save();
         })
         .catch(err => {
+          logger.debug(`Unable to create user ${user.email} because of error: ${err}${err.stack}`);
           res.status(400);
 
           if (err.message === 'Must provide a password') {

middlewares/CSRFError.js

@@ -5,7 +5,7 @@ if (sessions === false) {
   module.exports = (req, res, next) => next();
 } else {
   module.exports = (err, req, res, next) => {
-    logger.error('CSRF', err, res.locals._csrf);
+    logger.error('CSRFError (check redis server)', err, res.locals._csrf);
     next(err);
   };
 }

middlewares/locals.js

@@ -14,7 +14,7 @@ module.exports = function locals(req, res, next) {
   res.locals.STRIPE_PUBLISHABLE_KEY = CONFIG.env().stripe.publishable;
 
   if (!req.user) {
-    return Collective.query().then((collectives) => {
+    return Collective.queryVisible().then((collectives) => {
       res.locals.COLLECTIVES = collectives;
       next();
     });

model-relations/User.js

@@ -18,6 +18,7 @@ User.relations = {
   },
 
   debtTypes: {
+    // will never return the invisible collective (see `query` in `models/Collective.js`)
     type: 'HasManyThrough',
     relatedModel: Collective,
     ownerCol: 'id',

models/Collective.js

@@ -25,6 +25,7 @@ const Collective = Class('Collective').inherits(Krypton.Model).includes(Krypton.
     maxFileSize: 5242880,
     acceptedMimeTypes: [/image/],
   })),
+  invisibleId: '00000000-0000-0000-0000-000000000000',
 
   prototype: {
     init(config) {
@@ -50,6 +51,12 @@ const Collective = Class('Collective').inherits(Krypton.Model).includes(Krypton.
       return this;
     },
   },
+
+  queryVisible(...args) {
+    return Krypton.Model.query.call(this, ...args)
+        .whereNot('id', this.invisibleId);
+  }
+
 });
 
 module.exports = Collective;

seeds/20171116114842_collectives.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 
-exports.seed = (knex) => {
-  return knex('Collectives').del()
+exports.seed = (knex) =>
+  knex('Collectives').del()
     .then(() => {
       const collectives = [
         {
@@ -108,13 +108,17 @@ Debt has isolated us and made us feel alone and ashamed. We have come out of the
 
 We are committed to direct action, mutual aid and campaign support.`,
         },
+        {
+          id: '00000000-0000-0000-0000-000000000000',
+          name: 'Invisible Collective',
+          description: 'This collective is a placeholder for agnostic campaigns, and is invisible to users. All users are "members" of this invisible, non-collective collective.',
+        },
       ];
 
-      return knex('Collectives').insert(collectives.map((collective) => {
-        return Object.assign(collective, {
+      return knex('Collectives').insert(collectives.map((collective) =>
+        Object.assign(collective, {
           created_at: new Date(),
           updated_at: new Date(),
-        });
-      }));
+        })
+      ));
     });
-};

seeds/20171118114842_add_users_to_collectives.js

@@ -0,0 +1,16 @@
+exports.seed = (knex) => {
+  const collectiveId = '00000000-0000-0000-0000-000000000000';
+
+  return knex.transaction(trx =>
+    knex('UsersCollectives').transacting(trx).del().where('collective_id', collectiveId)
+      .then(() => knex('Users').select('id'))
+      .then((users) =>
+        Promise.all(users.map(user =>
+          knex('UsersCollectives').transacting(trx)
+            .insert({ user_id: user.id, collective_id: collectiveId })
+        ))
+        .then(() => knex('Collectives').where('id', collectiveId).transacting(trx)
+        .update({ user_count: users.length })
+      ))
+    );
+};