@yrpri/api 9.0.103 → 9.0.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.103",
+  "version": "9.0.104",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {

package/dist/active-citizen/controllers/activities.cjs

@@ -1,174 +0,0 @@
-"use strict";
-var express = require('express');
-var router = express.Router();
-var models = require("../../models/index.cjs");
-var auth = require('../../authorization.cjs');
-var log = require('../utils/logger.cjs');
-var async = require('async');
-var _ = require('lodash');
-var getCommonWhereOptions = require('../engine/news_feeds/news_feeds_utils.cjs').getCommonWhereOptions;
-var defaultKeyActivities = require('../engine/news_feeds/news_feeds_utils.cjs').defaultKeyActivities;
-var activitiesDefaultIncludes = require('../engine/news_feeds/news_feeds_utils.cjs').activitiesDefaultIncludes;
-var getActivities = function (req, res, options, callback) {
-    options = _.merge(options, {
-        dateColumn: 'created_at'
-    });
-    if (req.query.afterDate) {
-        options = _.merge(options, {
-            afterDate: new Date(req.query.afterDate)
-        });
-    }
-    if (req.query.beforeDate) {
-        options = _.merge(options, {
-            beforeDate: new Date(req.query.beforeDate)
-        });
-    }
-    var where = _.merge(getCommonWhereOptions(options), { type: { $in: defaultKeyActivities } });
-    if (options.noBulkOperations) {
-        where = _.merge(where, {
-            //TODO: Fix should exclude bulkOperation
-            sub_type: null
-        });
-    }
-    models.AcActivity.findAll({
-        where: where,
-        order: [
-            ["created_at", "desc"],
-            [models.User, { model: models.Image, as: 'UserProfileImages' }, 'created_at', 'asc'],
-            [models.Post, { model: models.Image, as: 'PostHeaderImages' }, 'created_at', 'asc'],
-            [models.Group, { model: models.Image, as: 'GroupLogoImages' }, 'created_at', 'asc'],
-        ],
-        include: activitiesDefaultIncludes(options),
-        limit: 20
-    }).then(function (activities) {
-        var slicedActivitesBecauseOfLimitBug = _.take(activities, 20);
-        let collectedPostIds = _.map(slicedActivitesBecauseOfLimitBug, function (activity) {
-            if (activity.Post) {
-                return activity.Post.id;
-            }
-        });
-        let collectedPointIds = _.map(slicedActivitesBecauseOfLimitBug, function (activity) {
-            if (activity.Point) {
-                return activity.Point.id;
-            }
-        });
-        let collectedPosts = _.map(slicedActivitesBecauseOfLimitBug, function (activity) {
-            if (activity.Post) {
-                return activity.Post;
-            }
-        });
-        let collectedPoints = _.map(slicedActivitesBecauseOfLimitBug, function (activity) {
-            if (activity.Point) {
-                return activity.Point;
-            }
-        });
-        collectedPostIds = collectedPostIds.filter(e => e !== undefined);
-        collectedPointIds = collectedPointIds.filter(e => e !== undefined);
-        collectedPosts = collectedPosts.filter(e => e !== undefined);
-        collectedPoints = collectedPoints.filter(e => e !== undefined);
-        async.parallel([
-            (innerCallback) => {
-                models.Post.getVideosForPosts(collectedPostIds, (error, videos) => {
-                    if (error) {
-                        innerCallback(error);
-                    }
-                    else {
-                        if (videos.length > 0) {
-                            models.Post.addVideosToAllActivityPosts(slicedActivitesBecauseOfLimitBug, videos);
-                        }
-                        innerCallback();
-                    }
-                });
-            },
-            (innerCallback) => {
-                models.Point.getVideosForPoints(collectedPointIds, (error, videos) => {
-                    if (error) {
-                        innerCallback(error);
-                    }
-                    else {
-                        if (videos.length > 0) {
-                            models.Point.addVideosToAllActivityPoints(slicedActivitesBecauseOfLimitBug, videos);
-                        }
-                        innerCallback();
-                    }
-                });
-            },
-            (innerCallback) => {
-                models.Point.setOrganizationUsersForPoints(collectedPoints, (error) => {
-                    innerCallback(error);
-                });
-            },
-            (innerCallback) => {
-                models.Post.setOrganizationUsersForPosts(collectedPosts, (error) => {
-                    innerCallback(error);
-                });
-            },
-            (innerCallback) => {
-                models.AcActivity.setOrganizationUsersForActivities(slicedActivitesBecauseOfLimitBug, (error) => {
-                    innerCallback(error);
-                });
-            }
-        ], (error) => {
-            if (error) {
-                log.error(error);
-                res.sendStatus(500);
-            }
-            else {
-                res.send({
-                    activities: slicedActivitesBecauseOfLimitBug,
-                    oldestProcessedActivityAt: slicedActivitesBecauseOfLimitBug.length > 0 ? _.last(slicedActivitesBecauseOfLimitBug).created_at : null
-                });
-            }
-            callback(error);
-        });
-    }).catch(function (error) {
-        callback(error);
-    });
-};
-router.get('/domains/:id', auth.can('view domain'), function (req, res) {
-    var options = {
-        domain_id: req.params.id,
-        noBulkOperations: true
-    };
-    getActivities(req, res, options, function (error) {
-        if (error) {
-            log.error("Activities Error Domain", { domainId: req.params.id, userId: req.user ? req.user.id : null, errorStatus: 500 });
-            res.sendStatus(500);
-        }
-    });
-});
-router.get('/communities/:id', auth.can('view community'), function (req, res) {
-    var options = {
-        community_id: req.params.id,
-        noBulkOperations: true
-    };
-    getActivities(req, res, options, function (error) {
-        if (error) {
-            log.error("Activities Error Community", { communityId: req.params.id, userId: req.user ? req.user.id : null, errorStatus: 500 });
-            res.sendStatus(500);
-        }
-    });
-});
-router.get('/groups/:id', auth.can('view group'), function (req, res) {
-    var options = {
-        group_id: req.params.id
-    };
-    getActivities(req, res, options, function (error) {
-        if (error) {
-            log.error("Activities Error Group", { groupId: req.params.id, userId: req.user ? req.user.id : null, errorStatus: 500 });
-            res.sendStatus(500);
-        }
-    });
-});
-router.get('/posts/:id', auth.can('view post'), function (req, res) {
-    var options = {
-        post_id: req.params.id
-    };
-    getActivities(req, res, options, function (error) {
-        if (error) {
-            log.error("Activities Error Group", { postId: req.params.id, userId: req.user ? req.user.id : null, errorStatus: 500 });
-            res.sendStatus(500);
-        }
-    });
-});
-module.exports = router;

package/dist/active-citizen/controllers/news_feeds.cjs

@@ -1,96 +0,0 @@
-"use strict";
-var express = require('express');
-var router = express.Router();
-var auth = require('../../authorization.cjs');
-var log = require('../utils/logger.cjs');
-var _ = require('lodash');
-var getCuratedNewsItems = require('../engine/news_feeds/generate_dynamically.cjs').getCuratedNewsItems;
-var setupOptions = function (req) {
-    var options = {
-        user_id: req.user.id
-    };
-    if (req.query.afterDate) {
-        options = _.merge(options, {
-            afterDate: new Date(req.query.afterDate)
-        });
-    }
-    if (req.query.beforeDate) {
-        options = _.merge(options, {
-            beforeDate: new Date(req.query.beforeDate)
-        });
-    }
-    return options;
-};
-router.get('/domains/:id', auth.can('view domain'), auth.isLoggedInNoAnonymousCheck, function (req, res) {
-    var options = setupOptions(req);
-    options = _.merge(options, {
-        domain_id: req.params.id
-    });
-    getCuratedNewsItems(options, function (error, activities, oldestProcessedActivityAt) {
-        if (error) {
-            log.error("News Feed Error Domain", { err: error, domainId: req.params.id, userId: req.user.id, errorStatus: 500 });
-            res.sendStatus(500);
-        }
-        else {
-            res.send({
-                activities: activities,
-                oldestProcessedActivityAt: oldestProcessedActivityAt
-            });
-        }
-    });
-});
-router.get('/communities/:id', auth.can('view community'), auth.isLoggedInNoAnonymousCheck, function (req, res) {
-    var options = setupOptions(req);
-    options = _.merge(options, {
-        community_id: req.params.id
-    });
-    getCuratedNewsItems(options, function (error, activities, oldestProcessedActivityAt) {
-        if (error) {
-            log.error("News Feed Error Communities", { err: error, communityId: req.params.id, userId: req.user.id, errorStatus: 500 });
-            res.sendStatus(500);
-        }
-        else {
-            res.send({
-                activities: activities,
-                oldestProcessedActivityAt: oldestProcessedActivityAt
-            });
-        }
-    });
-});
-router.get('/groups/:id', auth.can('view group'), auth.isLoggedInNoAnonymousCheck, function (req, res) {
-    var options = setupOptions(req);
-    options = _.merge(options, {
-        group_id: req.params.id
-    });
-    getCuratedNewsItems(options, function (error, activities, oldestProcessedActivityAt) {
-        if (error) {
-            log.error("News Feed Error Group", { err: error, groupId: req.params.id, userId: req.user.id, errorStatus: 500 });
-            res.sendStatus(500);
-        }
-        else {
-            res.send({
-                activities: activities,
-                oldestProcessedActivityAt: oldestProcessedActivityAt
-            });
-        }
-    });
-});
-router.get('/posts/:id', auth.can('view post'), auth.isLoggedInNoAnonymousCheck, function (req, res) {
-    var options = setupOptions(req);
-    options = _.merge(options, {
-        post_id: req.params.id
-    });
-    getCuratedNewsItems(options, function (error, activities, oldestProcessedActivityAt) {
-        if (error) {
-            log.error("News Feed Error Post", { err: error, postId: req.params.id, userId: req.user.id, errorStatus: 500 });
-            res.sendStatus(500);
-        }
-        else {
-            res.send({
-                activities: activities,
-                oldestProcessedActivityAt: oldestProcessedActivityAt
-            });
-        }
-    });
-});
-module.exports = router;

package/dist/active-citizen/controllers/notifications.cjs

@@ -1,243 +0,0 @@
-"use strict";
-var express = require('express');
-var router = express.Router();
-var models = require("../../models/index.cjs");
-var auth = require('../../authorization.cjs');
-var log = require('../utils/logger.cjs');
-var _ = require('lodash');
-var async = require('async');
-var getCommonWhereDateOptions = require('../engine/news_feeds/news_feeds_utils.cjs').getCommonWhereDateOptions;
-var getNotifications = function (req, options, callback) {
-    options = _.merge(options, {
-        dateColumn: 'updated_at'
-    });
-    if (req.query.afterDate) {
-        options = _.merge(options, {
-            afterDate: new Date(req.query.afterDate)
-        });
-    }
-    if (req.query.beforeDate) {
-        options = _.merge(options, {
-            beforeDate: new Date(req.query.beforeDate)
-        });
-    }
-    var where = _.merge({
-        user_id: req.user.id
-    }, getCommonWhereDateOptions(options));
-    var activityWhereOptions;
-    //TODO: Enabled this when limit bug is fixed in Sequelize or de normalize domain_id to notifications
-    /*
-    if (process.env.NODE_ENV == 'production') {
-      activityWhereOptions = { domain_id: req.ypDomain.id }
-    }
-    */
-    var notifications, unViewedCount;
-    async.series([
-        function (seriesCallback) {
-            models.AcNotification.findAll({
-                where: where,
-                attributes: ['id'],
-                order: [
-                    ["updated_at", "desc"]
-                ],
-                limit: 20
-            }).then(function (inNotifications) {
-                if (inNotifications) {
-                    notifications = inNotifications;
-                    seriesCallback();
-                }
-                else {
-                    seriesCallback("Notifications return null");
-                }
-            }).catch(function (error) {
-                seriesCallback(error);
-            });
-        },
-        function (seriesCallback) {
-            models.AcNotification.findAll({
-                where: {
-                    id: {
-                        $in: _.map(notifications, (item) => { return item.id; })
-                    }
-                },
-                attributes: ['id', 'type', 'created_at', 'updated_at', 'viewed'],
-                order: [
-                    ["updated_at", "desc"],
-                    [{ model: models.AcActivity, as: 'AcActivities' }, 'created_at', 'desc'],
-                    [{ model: models.AcActivity, as: 'AcActivities' }, models.User, { model: models.Image, as: 'UserProfileImages' }, 'created_at', 'asc'],
-                ],
-                include: [
-                    {
-                        model: models.AcActivity,
-                        as: 'AcActivities',
-                        attributes: ['id', 'type'],
-                        where: activityWhereOptions,
-                        required: true,
-                        include: [
-                            {
-                                model: models.Post,
-                                required: false,
-                                attributes: ['id', 'name', 'user_id']
-                            },
-                            { model: models.User,
-                                attributes: ["id", "name", "facebook_id", "twitter_id", "google_id", "github_id"],
-                                required: false,
-                                include: [
-                                    {
-                                        model: models.Image, as: 'UserProfileImages',
-                                        attributes: ['id', 'formats'],
-                                        required: false
-                                    }
-                                ]
-                            },
-                            {
-                                model: models.Community,
-                                required: false,
-                                attributes: ['id', 'name']
-                            },
-                            {
-                                model: models.Group,
-                                required: false,
-                                attributes: ['id', 'name']
-                            },
-                            {
-                                model: models.Point,
-                                required: false,
-                                attributes: ['id', 'value', 'content']
-                            }
-                        ]
-                    }
-                ]
-            }).then(function (inNotifications) {
-                notifications = inNotifications;
-                seriesCallback();
-            }).catch(function (error) {
-                seriesCallback(error);
-            });
-        },
-        function (seriesCallback) {
-            models.AcNotification.count({
-                where: {
-                    viewed: false,
-                    user_id: req.user.id
-                }
-            }).then(function (count) {
-                unViewedCount = count;
-                seriesCallback();
-            }).catch(function (error) {
-                seriesCallback(error);
-            });
-        }
-    ], function (error) {
-        if (error) {
-            callback(error);
-        }
-        else if (!notifications) {
-            callback("No notifications found");
-        }
-        else {
-            try {
-                const allActivities = [];
-                for (let n = 0; n < notifications.length; n++) {
-                    if (notifications[n].AcActivities) {
-                        for (let a = 0; a < notifications[n].AcActivities.length; a++) {
-                            allActivities.push(notifications[n].AcActivities[a]);
-                        }
-                    }
-                }
-                models.AcActivity.setOrganizationUsersForActivities(allActivities, (error) => {
-                    if (error) {
-                        callback(error);
-                    }
-                    else {
-                        callback(null, {
-                            notifications: notifications,
-                            unViewedCount: unViewedCount,
-                            oldestProcessedNotificationAt: notifications.length > 0 ? _.last(notifications).created_at : null
-                        });
-                    }
-                });
-            }
-            catch (error) {
-                callback(error);
-            }
-        }
-    });
-};
-router.get('/', auth.isLoggedInNoAnonymousCheck, function (req, res) {
-    var options = {};
-    getNotifications(req, options, function (error, notifications) {
-        if (error) {
-            log.error("Notifications Error", { userId: req.user ? req.user.id : null, errorStatus: 500, err: error });
-            res.sendStatus(500);
-        }
-        else {
-            res.send(notifications);
-        }
-    });
-});
-router.put('/markAllViewed', auth.isLoggedInNoAnonymousCheck, function (req, res) {
-    models.AcNotification.update({
-        viewed: true
-    }, {
-        where: { user_id: req.user.id },
-        silent: true
-    }).then(results => {
-        const [affectedCount, affectedRows] = results;
-        log.info("Notifications Have Marked All As Viewed", { affectedCount: affectedCount, affectedRows: affectedRows, userId: req.user ? req.user.id : null });
-        res.sendStatus(200);
-    }).catch(function (error) {
-        log.error("Notifications Have Marked All As Viewed Error", { userId: req.user ? req.user.id : null, err: error, errorStatus: 500 });
-        res.sendStatus(500);
-    });
-});
-router.put('/setIdsViewed', auth.isLoggedInNoAnonymousCheck, function (req, res) {
-    var viewedIds = req.body.viewedIds;
-    var unViewedCount;
-    async.series([
-        function (seriesCallback) {
-            models.AcNotification.update({
-                viewed: true
-            }, {
-                where: {
-                    user_id: req.user.id,
-                    id: {
-                        $in: viewedIds
-                    }
-                },
-                silent: true
-            }).then(results => {
-                const [affectedCount, affectedRows] = results;
-                log.info("Notifications Have Marked Ids As Viewed", { affectedCount: affectedCount, affectedRows: affectedRows, userId: req.user ? req.user.id : null });
-                seriesCallback();
-            }).catch(function (error) {
-                seriesCallback(error);
-            });
-        },
-        function (seriesCallback) {
-            models.AcNotification.count({
-                where: {
-                    viewed: false,
-                    user_id: req.user.id
-                }
-            }).then(function (count) {
-                unViewedCount = count;
-                seriesCallback();
-            }).catch(function (error) {
-                seriesCallback(error);
-            });
-        }
-    ], function (error) {
-        if (error) {
-            log.error("Notifications Have Marked Ids As Viewed Error", { userId: req.user ? req.user.id : null, err: error, errorStatus: 500 });
-            res.sendStatus(500);
-        }
-        else {
-            res.send({
-                viewedIds: viewedIds,
-                unViewedCount: unViewedCount
-            });
-        }
-    });
-});
-module.exports = router;