8649925793

Committed 11 Apr 2024 04:14PM UTC coverage: 31.965% (+0.007%) from 31.958%

Build # 8649925793

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #9104 from ForumMagnum/master

[EA] add lastUpdated field to Sequences table, and some Wrapped code cleanup

Run Details

4628 of 37786 branches covered (12.25%)

Branch coverage included in aggregate %.

23 of 111 new or added lines in 4 files covered. (20.72%)

3 existing lines in 2 files now uncovered.

27024 of 61236 relevant lines covered (44.13%)

182.84 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

18.42

/packages/lesswrong/server/callbacks/chapterCallbacks.ts

import { Sequences } from '../../lib/collections/sequences/collection';
import { sequenceGetAllPosts } from '../../lib/collections/sequences/helpers';
import { Posts } from '../../lib/collections/posts/collection'
import { createAdminContext } from '../vulcan-lib/query';
import { getCollectionHooks } from '../mutationCallbacks';
import { asyncForeachSequential } from '../../lib/utils/asyncUtils';
import * as _ from 'underscore';
import { createNotifications, getSubscribedUsers } from '../notificationCallbacksHelpers';
import { subscriptionTypes } from '../../lib/collections/subscriptions/schema';
import xor from 'lodash/xor';

async function ChaptersEditCanonizeCallback (chapter: DbChapter) {
  const context = await createAdminContext();
  const posts = await sequenceGetAllPosts(chapter.sequenceId, context)
  const sequence = await Sequences.findOne({_id:chapter.sequenceId})

  const postsWithCanonicalSequenceId = await Posts.find({canonicalSequenceId: chapter.sequenceId}).fetch()
  const removedPosts = _.difference(_.pluck(postsWithCanonicalSequenceId, '_id'), _.pluck(posts, '_id'))

  await asyncForeachSequential(removedPosts, async (postId) => {
    await Posts.rawUpdateOne({_id: postId}, {$unset: {
      canonicalPrevPostSlug: true,
      canonicalNextPostSlug: true,
      canonicalSequenceId: true,
    }});
  })

  await asyncForeachSequential(posts, async (currentPost: DbPost, i: number) => {
    const validSequenceId = (currentPost: DbPost, sequence: DbSequence) => {
      // Only update a post if it either doesn't have a canonicalSequence, or if we're editing
      // chapters *from* its canonicalSequence
      return !currentPost.canonicalSequenceId || currentPost.canonicalSequenceId === sequence._id
    }

    if ((currentPost.userId === sequence?.userId) && validSequenceId(currentPost, sequence)) {
      let prevPost = {slug:""}
      let nextPost = {slug:""}
      if (i-1>=0) {
        prevPost = posts[i-1]
      }
      if (i+1<posts.length) {
        nextPost = posts[i+1]
      }
      await Posts.rawUpdateOne({slug: currentPost.slug}, {$set: {
        canonicalPrevPostSlug: prevPost.slug,
        canonicalNextPostSlug: nextPost.slug,
        canonicalSequenceId: chapter.sequenceId,
      }});
    }
  })
}

getCollectionHooks("Chapters").newAsync.add(ChaptersEditCanonizeCallback);
getCollectionHooks("Chapters").editAsync.add(ChaptersEditCanonizeCallback);


getCollectionHooks("Chapters").updateAsync.add(async function UpdateSequence({oldDocument, newDocument}) {
  // If any of the user-facing fields have changed, also update the parent sequence's lastUpdated date
  if (
    oldDocument.title !== newDocument.title ||
    oldDocument.subtitle !== newDocument.subtitle ||
    xor(oldDocument.postIds, newDocument.postIds).length > 0
  ) {
    await Sequences.rawUpdateOne(
      {_id: newDocument.sequenceId},
      {$set: {lastUpdated: new Date()}}
    )
  }
});

getCollectionHooks("Chapters").updateAsync.add(async function NewSequencePostNotifications({oldDocument, newDocument, context}) {
  // Check if there were any posts added to this chapter
  const newPostIds = _.difference(newDocument.postIds, oldDocument.postIds)
  if (!newPostIds.length) {
    return
  }
  const posts = await Posts.find({
    _id: {$in: newPostIds},
    draft: {$ne: true},
    deletedDraft: {$ne: true},
  }).fetch()
  if (!posts.length) {
    return
  }

  // If so, notify the relevant users
  const subscribedUsers = await getSubscribedUsers({
    documentId: oldDocument.sequenceId,
    collectionName: "Sequences",
    type: subscriptionTypes.newSequencePosts
  })
  const sequence = await Sequences.findOne({_id: oldDocument.sequenceId})
  if (sequence && !sequence.isDeleted && !sequence.draft) {
    let subscribedUserIds = _.map(subscribedUsers, u=>u._id);
    
    // Don't notify the user who added the post
    subscribedUserIds = context.currentUser?._id ? _.difference(subscribedUserIds, context.currentUser._id) : subscribedUserIds
    await createNotifications({userIds: subscribedUserIds, notificationType: 'newSequencePosts', documentType: 'sequence', documentId: sequence._id, extraData: {postIds: newPostIds}})
  }
});

1	import { Sequences } from '../../lib/collections/sequences/collection';	18✔
2	import { sequenceGetAllPosts } from '../../lib/collections/sequences/helpers';	18✔
3	import { Posts } from '../../lib/collections/posts/collection'	18✔
4	import { createAdminContext } from '../vulcan-lib/query';	18✔
5	import { getCollectionHooks } from '../mutationCallbacks';	18✔
6	import { asyncForeachSequential } from '../../lib/utils/asyncUtils';	18✔
7	import * as _ from 'underscore';	18✔
8	import { createNotifications, getSubscribedUsers } from '../notificationCallbacksHelpers';	18✔
9	import { subscriptionTypes } from '../../lib/collections/subscriptions/schema';	18✔
10	import xor from 'lodash/xor';	18✔
11
12	async function ChaptersEditCanonizeCallback (chapter: DbChapter) {
13	const context = await createAdminContext();	×
14	const posts = await sequenceGetAllPosts(chapter.sequenceId, context)	×
15	const sequence = await Sequences.findOne({_id:chapter.sequenceId})	×
16
17	const postsWithCanonicalSequenceId = await Posts.find({canonicalSequenceId: chapter.sequenceId}).fetch()	×
18	const removedPosts = _.difference(_.pluck(postsWithCanonicalSequenceId, '_id'), _.pluck(posts, '_id'))	×
19
20	await asyncForeachSequential(removedPosts, async (postId) => {	×
21	await Posts.rawUpdateOne({_id: postId}, {$unset: {	×
22	canonicalPrevPostSlug: true,
23	canonicalNextPostSlug: true,
24	canonicalSequenceId: true,
25	}});
26	})
27
28	await asyncForeachSequential(posts, async (currentPost: DbPost, i: number) => {	×
29	const validSequenceId = (currentPost: DbPost, sequence: DbSequence) => {	×
30	// Only update a post if it either doesn't have a canonicalSequence, or if we're editing
31	// chapters from its canonicalSequence
32	return !currentPost.canonicalSequenceId \|\| currentPost.canonicalSequenceId === sequence._id	×
33	}
34
35	if ((currentPost.userId === sequence?.userId) && validSequenceId(currentPost, sequence)) {	×
36	let prevPost = {slug:""}	×
37	let nextPost = {slug:""}	×
38	if (i-1>=0) {	×
39	prevPost = posts[i-1]	×
40	}
41	if (i+1<posts.length) {	×
42	nextPost = posts[i+1]	×
43	}
44	await Posts.rawUpdateOne({slug: currentPost.slug}, {$set: {	×
45	canonicalPrevPostSlug: prevPost.slug,
46	canonicalNextPostSlug: nextPost.slug,
47	canonicalSequenceId: chapter.sequenceId,
48	}});
49	}
50	})
51	}	18✔
52
53	getCollectionHooks("Chapters").newAsync.add(ChaptersEditCanonizeCallback);	18✔
54	getCollectionHooks("Chapters").editAsync.add(ChaptersEditCanonizeCallback);	18✔
55
56
57	getCollectionHooks("Chapters").updateAsync.add(async function UpdateSequence({oldDocument, newDocument}) {
58	// If any of the user-facing fields have changed, also update the parent sequence's lastUpdated date
NEW 59	if (	×
60	oldDocument.title !== newDocument.title \|\|	×
61	oldDocument.subtitle !== newDocument.subtitle \|\|
62	xor(oldDocument.postIds, newDocument.postIds).length > 0
63	) {
NEW 64	await Sequences.rawUpdateOne(	×
65	{_id: newDocument.sequenceId},
66	{$set: {lastUpdated: new Date()}}
67	)
68	}
69	});	18✔
70
71	getCollectionHooks("Chapters").updateAsync.add(async function NewSequencePostNotifications({oldDocument, newDocument, context}) {
72	// Check if there were any posts added to this chapter
73	const newPostIds = _.difference(newDocument.postIds, oldDocument.postIds)	×
74	if (!newPostIds.length) {	×
75	return	×
76	}
77	const posts = await Posts.find({	×
78	_id: {$in: newPostIds},
79	draft: {$ne: true},
80	deletedDraft: {$ne: true},
81	}).fetch()
82	if (!posts.length) {	×
83	return	×
84	}
85
86	// If so, notify the relevant users
87	const subscribedUsers = await getSubscribedUsers({	×
88	documentId: oldDocument.sequenceId,
89	collectionName: "Sequences",
90	type: subscriptionTypes.newSequencePosts
91	})
92	const sequence = await Sequences.findOne({_id: oldDocument.sequenceId})	×
93	if (sequence && !sequence.isDeleted && !sequence.draft) {	×
94	let subscribedUserIds = _.map(subscribedUsers, u=>u._id);	×
95
96	// Don't notify the user who added the post
97	subscribedUserIds = context.currentUser?._id ? _.difference(subscribedUserIds, context.currentUser._id) : subscribedUserIds	×
98	await createNotifications({userIds: subscribedUserIds, notificationType: 'newSequencePosts', documentType: 'sequence', documentId: sequence._id, extraData: {postIds: newPostIds}})	×
99	}
100	});

ForumMagnum / ForumMagnum / 8649925793

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous