From 302a76985cef867f509a4180387cc45e934452d5 Mon Sep 17 00:00:00 2001 From: eug-vs Date: Sun, 28 Jun 2020 16:13:34 +0300 Subject: feat: improve votes --- services/votes/votes.hooks.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'services') diff --git a/services/votes/votes.hooks.ts b/services/votes/votes.hooks.ts index 7d0b3ba..56e9000 100644 --- a/services/votes/votes.hooks.ts +++ b/services/votes/votes.hooks.ts @@ -1,15 +1,9 @@ -import { HookContext } from '@feathersjs/feathers'; import requireAuth from '../../hooks/requireAuth'; - -const addUserId = async (context: HookContext): Promise => { - const { params: { user } } = context; - context.data.userId = user._id; - return context; -}; +import signAuthority from '../../hooks/signAuthority'; export default { before: { - create: [requireAuth, addUserId] + create: [requireAuth, signAuthority] } }; -- cgit v1.2.3 From 02b0da08155c6615a48b8d7f49648c19c1600020 Mon Sep 17 00:00:00 2001 From: eug-vs Date: Sun, 28 Jun 2020 16:18:20 +0300 Subject: feat: create feedback service --- services/feedback/feedback.hooks.ts | 10 ++++++++++ services/feedback/feedback.service.ts | 13 +++++++++++++ services/index.ts | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 services/feedback/feedback.hooks.ts create mode 100644 services/feedback/feedback.service.ts (limited to 'services') diff --git a/services/feedback/feedback.hooks.ts b/services/feedback/feedback.hooks.ts new file mode 100644 index 0000000..04f3af1 --- /dev/null +++ b/services/feedback/feedback.hooks.ts @@ -0,0 +1,10 @@ +import { HookContext } from '@feathersjs/feathers'; +import requireAuth from '../../hooks/requireAuth'; +import signAuthority from '../../hooks/signAuthority'; + +export default { + before: { + create: [requireAuth, signAuthority] + } +}; + diff --git a/services/feedback/feedback.service.ts b/services/feedback/feedback.service.ts new file mode 100644 index 0000000..a15ede9 --- /dev/null +++ b/services/feedback/feedback.service.ts @@ -0,0 +1,13 @@ +import { Application } from '@feathersjs/express'; +import service from 'feathers-mongoose'; +import Model from '../../models/feedback/feedback.model'; + +import hooks from './feedback.hooks'; + +const FeebackService = service({ Model }); + +export default (app: Application): void => { + app.use('/feedback', FeebackService); + app.service('feedback').hooks(hooks); +}; + diff --git a/services/index.ts b/services/index.ts index 1763a17..e5ea703 100644 --- a/services/index.ts +++ b/services/index.ts @@ -5,6 +5,7 @@ import Profiles from './profiles/profiles.service'; import Votes from './votes/votes.service'; import Auth from './auth/auth.service'; import Feed from './feed/feed.service'; +import Feedback from './feedback/feedback.service'; import tryAuthenticate from '../hooks/tryAuthenticate'; import logging from '../hooks/logging'; @@ -17,6 +18,7 @@ export default (app: Application): void => { app.configure(Profiles); app.configure(Votes); app.configure(Feed); + app.configure(Feedback); app.hooks({ before: { -- cgit v1.2.3 From c3438eb4a7187773e2736dea765bb8281f7edf0e Mon Sep 17 00:00:00 2001 From: eug-vs Date: Sun, 28 Jun 2020 18:33:58 +0300 Subject: refactor: move convertPoll to polls hooks --- services/feed/feed.hooks.ts | 4 ++-- services/polls/polls.hooks.ts | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) (limited to 'services') diff --git a/services/feed/feed.hooks.ts b/services/feed/feed.hooks.ts index 54f6d61..6bff8dc 100644 --- a/services/feed/feed.hooks.ts +++ b/services/feed/feed.hooks.ts @@ -7,7 +7,7 @@ const raiseNewVerifedPolls = async (context: HookContext): Promise // Raise unseen verified polls to the very top context.result = _.sortBy( context.result, - poll => !(poll.author.verified && !poll.userChoice) + poll => !(poll.author.verified && !poll.vote) ); return context; }; @@ -16,7 +16,7 @@ const lowerOldPolls = async (context: HookContext): Promise => { // Move all seen polls down context.result = _.sortBy( context.result, - poll => !!poll.userChoice + poll => !!poll.vote ); return context; }; diff --git a/services/polls/polls.hooks.ts b/services/polls/polls.hooks.ts index 77fcc7a..9f2183f 100644 --- a/services/polls/polls.hooks.ts +++ b/services/polls/polls.hooks.ts @@ -1,6 +1,47 @@ -import convertPoll from '../../hooks/convertPoll'; +import { HookContext } from '@feathersjs/feathers'; +import { Types } from 'mongoose'; +import bluebird from 'bluebird'; import _ from 'lodash'; +import { Poll } from 'which-types'; + +import { PollSchema } from '../../models/polls/poll.schema'; +import VoteModel from '../../models/votes/vote.model'; import sortByDate from '../../hooks/sortByDate'; + +const convertPoll = async (context: HookContext): Promise => { + const { app, result, params: { user } } = context; + + const convert = async (poll: PollSchema): Promise => { + const author = await app.service('users').get(poll.authorId); + + const contents = await VoteModel.aggregate([ + { $match: { pollId: Types.ObjectId(poll._id) } }, + { $group: { _id: '$which', total: { $sum: 1 } } } + ]).then(groups => groups.reduce( + (acc, group) => _.set(acc, `${group._id}.votes`, group.total), + { left: { votes: 0 }, right: { votes: 0 } } + )); + + const vote = await VoteModel.findOne( + { pollId: poll._id, authorId: user?._id } + ); + + return _.merge( + _.omit(poll, ['authorId']), + { author, contents, vote } + ); + }; + + if (Array.isArray(result)) { + const polls = await bluebird.map(result, (poll: PollSchema) => convert(poll)); + context.result = _.compact(polls); + } else { + context.result = await convert(result); + } + return context; +}; + + export default { before: { find: sortByDate -- cgit v1.2.3 From 00387d9ad38049db555cad7b5cb375167a108a6e Mon Sep 17 00:00:00 2001 From: eug-vs Date: Sun, 28 Jun 2020 18:56:14 +0300 Subject: style: fix linting errors --- services/feedback/feedback.hooks.ts | 1 - 1 file changed, 1 deletion(-) (limited to 'services') diff --git a/services/feedback/feedback.hooks.ts b/services/feedback/feedback.hooks.ts index 04f3af1..56e9000 100644 --- a/services/feedback/feedback.hooks.ts +++ b/services/feedback/feedback.hooks.ts @@ -1,4 +1,3 @@ -import { HookContext } from '@feathersjs/feathers'; import requireAuth from '../../hooks/requireAuth'; import signAuthority from '../../hooks/signAuthority'; -- cgit v1.2.3