profile: subscriptions

iliakan · iliakan · commit 628af8508f4a · 2015-11-12T13:30:54.000+03:00
diff --git a/handlers/newsletter/controllers/frontpage.js b/handlers/newsletter/controllers/frontpage.js
@@ -23,7 +23,7 @@ exports.get = function*() {
   } else if (this.user) {
     subscription = yield Subscription.findOne({
       email: this.user.email
-    }).exec();
+    });
   }
 
   this.locals.email = subscription ? subscription.email :
diff --git a/handlers/newsletter/controllers/subscribe.js b/handlers/newsletter/controllers/subscribe.js
@@ -4,7 +4,6 @@ const path = require('path');
 const Newsletter = require('../models/newsletter');
 const Subscription = require('../models/subscription');
 const SubscriptionAction = require('../models/subscriptionAction');
-const sendMail = require('mailer').send;
 const config = require('config');
 const _ = require('lodash');
 const notify = require('../lib/notify');
@@ -24,6 +23,10 @@ const ACTION_REMOVE = 'remove';
  */
 exports.post = function*() {
 
+  yield function(cb) {
+    setTimeout(cb, 5000);
+  };
+
   var self = this;
 
   var subscription;
@@ -33,7 +36,7 @@ exports.post = function*() {
   if (this.request.body.accessKey) {
     subscription = yield Subscription.findOne({
       accessKey: this.request.body.accessKey
-    }).exec();
+    });
     if (!subscription) {
       this.throw(404, "Нет такой подписки.");
     }
@@ -43,7 +46,7 @@ exports.post = function*() {
     }
     subscription = yield Subscription.findOne({
       email: this.request.body.email
-    }).exec();
+    });
   }
 
   var email = subscription ? subscription.email : this.request.body.email;
diff --git a/handlers/newsletter/controllers/subscriptionsByUser.js b/handlers/newsletter/controllers/subscriptionsByUser.js
@@ -0,0 +1,43 @@
+"use strict";
+
+const Newsletter = require('../models/newsletter');
+const Subscription = require('../models/subscription');
+const _ = require('lodash');
+
+/**
+ * The order form is sent to checkout when it's 100% valid (client-side code validated it)
+ * It uses order.module.createOrderFromTemplate to create an order, it can throw if something's wrong
+ * the order CANNOT be changed after submitting to payment
+ * @param next
+ */
+exports.get = function*(next) {
+
+  var user = this.userById;
+
+  if (!this.user._id.equals(user._id) && !this.isAdmin) {
+    this.throw(403);
+  }
+
+  var subscription = yield Subscription.findOne({
+    email: this.user.email
+  });
+
+
+  var newsletters = yield Newsletter.find({}).sort({weight: 1}).exec();
+
+  var newslettersFormatted = newsletters.map(function(newsletter) {
+    return {
+      slug:       newsletter.slug,
+      title:      newsletter.title,
+      period:     newsletter.period,
+      // mongoose array can #indexOf ObjectIds
+      subscribed: Boolean(subscription && ~subscription.newsletters.indexOf(newsletter._id))
+    };
+  });
+
+
+  this.body = newslettersFormatted;
+
+};
+
+
diff --git a/handlers/newsletter/router.js b/handlers/newsletter/router.js
@@ -1,11 +1,13 @@
 var Router = require('koa-router');
+var mustBeAuthenticated = require('auth').mustBeAuthenticated;
 
 var action = require('./controllers/action');
 var frontpage = require('./controllers/frontpage');
 //var subscriptions = require('./controllers/subscriptions');
 var subscribe = require('./controllers/subscribe');
 
 var router = module.exports = new Router();
+router.param('userById', require('users').routeUserById);
 
 router.post("/subscribe", subscribe.post);
 router.get("/", frontpage.get);
@@ -14,3 +16,6 @@ router.get("/action/:accessKey", action.get);
 
 router.get("/subscriptions/:accessKey", frontpage.get);
 
+// for profile
+router.get('/profile/:userById', mustBeAuthenticated, require('./controllers/subscriptionsByUser').get);
+
diff --git a/handlers/profile/client/config.js b/handlers/profile/client/config.js
@@ -43,6 +43,15 @@ angular.module('profile').config(($locationProvider, $stateProvider, $urlRouterP
         quizResults: /*@ngInject*/ (QuizResults) => QuizResults.query()
       }
     },
+    'root.subscriptions':  {
+      url:         '/subscriptions',
+      title:       'Уведомления',
+      templateUrl: "/profile/templates/partials/subscriptions",
+      controller:  'ProfileSubscriptionsCtrl',
+      resolve:     {
+        newsletters: /*@ngInject*/ (Newsletters) => Newsletters.query()
+      }
+    },
     'root.orders':  {
       url:         '/orders',
       title:       'Заказы',
diff --git a/handlers/profile/client/controller/root.js b/handlers/profile/client/controller/root.js
@@ -7,7 +7,7 @@ profile.controller('ProfileRootCtrl', ($scope, $state, $timeout, $http, me, prom
 
   $scope.loadingTracker = promiseTracker();
 
-  var tabs = ['root.aboutme', 'root.account'];
+  var tabs = ['root.aboutme', 'root.account', 'root.subscriptions'];
   window.currentUser.profileTabsEnabled.forEach(function(tab) {
     tabs.push('root.' + tab);
   });
diff --git a/handlers/profile/client/controller/subscriptions.js b/handlers/profile/client/controller/subscriptions.js
@@ -0,0 +1,35 @@
+var angular = require('angular');
+var notification = require('client/notification');
+
+//var newsletter = require('newsletter/client');
+
+var profile = angular.module('profile');
+
+profile.controller('ProfileSubscriptionsCtrl', ($scope, $http, me, newsletters) => {
+
+  $scope.newsletters = newsletters;
+
+  $scope.submit = function() {
+    var body = {
+      email: me.email,
+      slug: newsletters.filter(nl => nl.subscribed).map(nl => nl.slug),
+      replace: true
+    };
+
+    $http({
+      method:           'POST',
+      url:              '/newsletter/subscribe',
+      tracker:          $scope.loadingTracker,
+      headers:          {'Content-Type': 'application/json'},
+      transformRequest: angular.identity,
+      data:             JSON.stringify(body)
+    }).then((response) => {
+
+      new notification.Success('Настройки обновлены.');
+
+    }, (response) => {
+      new notification.Error("Ошибка загрузки, статус " + response.status);
+    });
+  };
+
+});
diff --git a/handlers/profile/client/factory/newsletters.js b/handlers/profile/client/factory/newsletters.js
@@ -0,0 +1,14 @@
+var angular = require('angular');
+
+angular.module('profile').factory('Newsletters', ($resource) => {
+  return $resource('/newsletter/profile/' + window.currentUser.id, {}, {
+    query: {
+      method:            'GET',
+      isArray:           true,
+      transformResponse: function(data) {
+        data = JSON.parse(data);
+        return data;
+      }
+    }
+  });
+});
diff --git a/handlers/profile/client/index.js b/handlers/profile/client/index.js
@@ -19,8 +19,8 @@ require('./directive/dateRangeValidator');
 require('./factory/me');
 
 require('./factory/quizResults');
-
 require('./factory/orders');
+require('./factory/newsletters');
 require('./factory/courseGroups');
 
 require('./config');
@@ -33,6 +33,8 @@ require('./controller/courseGroups');
 
 require('./controller/aboutme');
 
+require('./controller/subscriptions');
+
 require('./controller/quizResults');
 
 require('./controller/account');
diff --git a/handlers/profile/controller/index.js b/handlers/profile/controller/index.js
@@ -1,8 +1,5 @@
 var config = require('config');
 var User = require('users').User;
-var mongoose = require('mongoose');
-var QuizResult = require('quiz').QuizResult;
-var Order = require('payments').Order;
 
 // skips the request unless it's the owner
 exports.get = function* (next) {
@@ -19,7 +16,7 @@ exports.get = function* (next) {
     return;
   }
 
-  var user = yield User.findOne({profileName: this.params.profileName}).exec();
+  var user = yield User.findOne({profileName: this.params.profileName});
 
   if (!user) {
     this.throw(404);
diff --git a/handlers/profile/templates/partials/subscriptions.jade b/handlers/profile/templates/partials/subscriptions.jade
@@ -0,0 +1,18 @@
+include /bem
+
++b.subscribe
+  +e('h3').title Управление подписками
+
+  +e('form')(
+    name="form"
+    ng-submit="submit()"
+  ).form
+    +e.line(ng-repeat="newsletter in newsletters")
+      +e('label').name
+        +e('input').input(type="checkbox" name="slug" ng-model="newsletter.subscribed") {{newsletter.title}}
+
+    +e.action
+      +b('button')(type="submit").button._action.__save
+        +e('span').text Сохранить
+
+
diff --git a/handlers/render.js b/handlers/render.js
@@ -114,6 +114,7 @@ function addStandardHelpers(locals, ctx) {
     orders: 'Заказы',
     courses: 'Курсы',
     aboutme: 'Публичный профиль',
+    subscriptions: 'Уведомления',
     account: 'Аккаунт'
   };
 
diff --git a/styles/blocks/subscribe/subscribe.styl b/styles/blocks/subscribe/subscribe.styl
@@ -30,3 +30,5 @@
   &__input
     margin-right 7px
 
+  &__action
+    margin-top 20px
diff --git a/templates/blocks/user.jade b/templates/blocks/user.jade
@@ -12,6 +12,8 @@
           +e('a').secondary-link.__usermenu-link(href=user.getProfileUrl()) Публичный профиль
         +e('li').usermenu-item
           +e('a').secondary-link.__usermenu-link(href=user.getProfileUrl() + "/account") Аккаунт
+        +e('li').usermenu-item
+          +e('a').secondary-link.__usermenu-link(href=user.getProfileUrl() + "/subscriptions") Уведомления
         each tab in user.profileTabsEnabled
           +e('li').usermenu-item
             +e('a').secondary-link.__usermenu-link(href=user.getProfileUrl() + "/" + tab)= profileTabNames[tab]

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ exports.get = function*() {`
`23`	`23`	`} else if (this.user) {`
`24`	`24`	`subscription = yield Subscription.findOne({`
`25`	`25`	`email: this.user.email`
`26`		`- }).exec();`
	`26`	`+ });`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`this.locals.email = subscription ? subscription.email :`