10301481406

Committed 08 Aug 2024 11:48AM UTC coverage: 32.189% (+0.2%) from 32.024%

Build # 10301481406

Build Type

Pull #9301

github

Committed by

oetherington

Commit Message

Merge branch 'master' into normalized-posts-contents

Pull Request Pull Request #9301: Normalized posts contents

Run Details

5018 of 40256 branches covered (12.47%)

Branch coverage included in aggregate %.

143 of 250 new or added lines in 44 files covered. (57.2%)

11 existing lines in 10 files now uncovered.

28919 of 65173 relevant lines covered (44.37%)

191.41 hits per line

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

44.44

/packages/lesswrong/server/repos/NotificationsRepo.ts

import AbstractRepo from "./AbstractRepo";
import Notifications from "../../lib/collections/notifications/collection";
import { READ_WORDS_PER_MINUTE } from "../../lib/collections/posts/schema";
import { getSocialPreviewSql } from "../../lib/collections/posts/helpers";
import type { NotificationDisplay } from "../../lib/notificationTypes";

// This should return an object of type `NotificationDisplayUser`
const buildNotificationUser = (prefix: string) =>
  `CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
    '_id', ${prefix}."_id",
    'slug', ${prefix}."slug",
    'createdAt', ${prefix}."createdAt",
    'displayName', ${prefix}."displayName",
    'profileImageId', ${prefix}."profileImageId",
    'karma', ${prefix}."karma",
    'deleted', ${prefix}."deleted",
    'htmlBio', COALESCE(${prefix}."biography"->>'html', ''),
    'postCount', ${prefix}."postCount",
    'commentCount', ${prefix}."commentCount"
  ) END`;

// This should return an object of type `NotificationDisplayLocalgroup`
const buildNotificationLocalgroup = (prefix: string) =>
  `CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
    '_id', ${prefix}."_id",
    'name', ${prefix}."name"
  ) END`;

const buildNotificationRevision = (prefix: string) =>
  `JSONB_BUILD_OBJECT(
    'html', ${prefix}."html",
    'wordCount', ${prefix}."wordCount",
    'originalContents', ${prefix}."originalContents",
    'editedAt', ${prefix}."editedAt",
    'userId', ${prefix}."userId",
    'version', ${prefix}."version"
  )`;

// This should return an object of type `NotificationDisplayPost`
const buildNotificationPost = (
  prefix: string,
  revisionPrefix: string,
  userPrefix: string,
  localgroupPrefix: string,
) =>
  `CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
    '_id', ${prefix}."_id",
    'slug', ${prefix}."slug",
    'title', ${prefix}."title",
    'draft', ${prefix}."draft",
    'url', ${prefix}."url",
    'isEvent', ${prefix}."isEvent",
    'startTime', ${prefix}."startTime",
    'curatedDate', ${prefix}."curatedDate",
    'postedAt', ${prefix}."postedAt",
    'groupId', ${prefix}."groupId",
    'fmCrosspost', ${prefix}."fmCrosspost",
    'collabEditorDialogue', ${prefix}."collabEditorDialogue",
    'readTimeMinutes', COALESCE(
      ${prefix}."readTimeMinutesOverride",
      (${revisionPrefix}."wordCount")::INTEGER / ${READ_WORDS_PER_MINUTE}
    ),
    'socialPreviewData', ${getSocialPreviewSql(prefix)},
    'customHighlight', ${prefix}."customHighlight",
    'contents', ${buildNotificationRevision(revisionPrefix)},
    'rsvps', ${prefix}."rsvps",
    'user', ${buildNotificationUser(userPrefix)},
    'group', ${buildNotificationLocalgroup(localgroupPrefix)}
  ) END`;

// This should return an object of type `NotificationDisplayComment`
const buildNotificationComment = (
  prefix: string,
  userPrefix: string,
  postPrefix: string,
  postRevisionPrefix: string,
  postUserPrefix: string,
  postLocalgroupPrefix: string,
) =>
  `CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
    '_id', ${prefix}."_id",
    'user', ${buildNotificationUser(userPrefix)},
    'post', ${buildNotificationPost(postPrefix, postRevisionPrefix, postUserPrefix, postLocalgroupPrefix)}
  ) END`;

// This should return an object of type `NotificationDisplayTag`
const buildNotificationTag = (prefix: string) =>
  `CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
    '_id', ${prefix}."_id",
    'name', ${prefix}."name",
    'slug', ${prefix}."slug"
  ) END`;
  
// This should return an object of type `NotificationDisplaySequence`
const buildNotificationSequence = (prefix: string) =>
  `CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
    '_id', ${prefix}."_id",
    'title', ${prefix}."title"
  ) END`;

export default class NotificationsRepo extends AbstractRepo<"Notifications"> {
  constructor() {
    super(Notifications);
  }

  getNotificationDisplays({
    userId,
    type,
    includeMessages = false,
    limit = 20,
    offset = 0,
  }: {
    userId: string,
    type?: string,
    includeMessages?: boolean,
    limit?: number,
    offset?: number,
  }): Promise<NotificationDisplay[]> {
    return this.getRawDb().any(`
      -- NotificationsRepo.getNotificationDisplays
      SELECT
        n."_id",
        n."type",
        n."link",
        n."message",
        n."createdAt",
        tr."_id" "tagRelId",
        COALESCE(
          ${buildNotificationPost("p", "pr", "pu", "pl")},
          ${buildNotificationPost("trp", "trpr", "trpu", "trpl")}
        ) "post",
        ${buildNotificationComment("c", "cu", "cp", "cpr", "cpu", "cpl")} "comment",
        ${buildNotificationTag("t")} "tag",
        ${buildNotificationSequence("s")} "sequence",
        COALESCE(
          ${buildNotificationUser("nma")},
          ${buildNotificationUser("u")}
        ) "user",
        ${buildNotificationLocalgroup("l")} "localgroup"
      FROM "Notifications" n
      LEFT JOIN "Posts" p ON
        n."documentType" = 'post' AND
        n."documentId" = p."_id"
      LEFT JOIN "Revisions" pr ON
        pr."_id" = p."contents_latest"
      LEFT JOIN "Users" pu ON
        p."userId" = pu."_id"
      LEFT JOIN "Localgroups" pl ON
        p."groupId" = pl."_id"
      LEFT JOIN "Comments" c ON
        n."documentType" = 'comment' AND
        n."documentId" = c."_id"
      LEFT JOIN "Users" cu ON
        c."userId" = cu."_id"
      LEFT JOIN "Posts" cp ON
        c."postId" = cp."_id"
      LEFT JOIN "Revisions" cpr ON
        cpr."_id" = cp."contents_latest"
      LEFT JOIN "Users" cpu ON
        cp."userId" = cpu."_id"
      LEFT JOIN "Localgroups" cpl ON
        cp."groupId" = cpl."_id"
      LEFT JOIN "TagRels" tr ON
        n."documentType" = 'tagRel' AND
        n."documentId" = tr."_id"
      LEFT JOIN "Tags" t ON
        t."_id" = tr."tagId"
      LEFT JOIN "Posts" trp ON
        trp."_id" = tr."postId"
      LEFT JOIN "Revisions" trpr ON
        trpr."_id" = trp."contents_latest"
      LEFT JOIN "Users" trpu ON
        trpu."_id" = trp."userId"
      LEFT JOIN "Sequences" s ON
        n."documentType" = 'sequence' AND
        n."documentId" = s."_id"
      LEFT JOIN "Localgroups" trpl ON
        trpl."_id" = trp."groupId"
      LEFT JOIN "Users" u ON
        n."documentType" = 'user' AND
        n."documentId" = u."_id"
      LEFT JOIN "Localgroups" l ON
        n."documentType" = 'localgroup' AND
        n."documentId" = l."_id"
      LEFT JOIN "Users" nma ON
        n."extraData"->>'newMessageAuthorId' = nma."_id"
      WHERE
        n."userId" = $(userId) AND
        n."deleted" IS NOT TRUE AND
        n."emailed" IS NOT TRUE AND
        n."waitingForBatch" IS NOT TRUE AND
        ${type ? `n."type" = $(type) AND` : ""}
        ${includeMessages ? "": `n."documentType" <> 'message' AND`}
        NOT COALESCE(p."deletedDraft", FALSE) AND
        NOT COALESCE(pu."deleted", FALSE) AND
        NOT COALESCE(pl."deleted", FALSE) AND
        NOT COALESCE(c."deleted", FALSE) AND
        NOT COALESCE(cu."deleted", FALSE) AND
        NOT COALESCE(cp."deletedDraft", FALSE) AND
        NOT COALESCE(cpu."deleted", FALSE) AND
        NOT COALESCE(cpl."deleted", FALSE) AND
        NOT COALESCE(t."deleted", FALSE) AND
        NOT COALESCE(u."deleted", FALSE) AND
        NOT COALESCE(l."deleted", FALSE) AND
        NOT COALESCE(s."isDeleted", FALSE) AND
        NOT COALESCE(nma."deleted", FALSE)
      ORDER BY "createdAt" DESC
      LIMIT $(limit)
      OFFSET $(offset)
    `, {userId, type, limit, offset});
  }
}

1	import AbstractRepo from "./AbstractRepo";	1,917✔
2	import Notifications from "../../lib/collections/notifications/collection";	20✔
3	import { READ_WORDS_PER_MINUTE } from "../../lib/collections/posts/schema";	20✔
4	import { getSocialPreviewSql } from "../../lib/collections/posts/helpers";	20✔
5	import type { NotificationDisplay } from "../../lib/notificationTypes";
6
7	// This should return an object of type `NotificationDisplayUser`
8	const buildNotificationUser = (prefix: string) =>	20✔
9	`CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(	×
10	'_id', ${prefix}."_id",
11	'slug', ${prefix}."slug",
12	'createdAt', ${prefix}."createdAt",
13	'displayName', ${prefix}."displayName",
14	'profileImageId', ${prefix}."profileImageId",
15	'karma', ${prefix}."karma",
16	'deleted', ${prefix}."deleted",
17	'htmlBio', COALESCE(${prefix}."biography"->>'html', ''),
18	'postCount', ${prefix}."postCount",
19	'commentCount', ${prefix}."commentCount"
20	) END`;
21
22	// This should return an object of type `NotificationDisplayLocalgroup`
23	const buildNotificationLocalgroup = (prefix: string) =>	20✔
24	`CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(	×
25	'_id', ${prefix}."_id",
26	'name', ${prefix}."name"
27	) END`;
28
29	const buildNotificationRevision = (prefix: string) =>	20✔
NEW 30	`JSONB_BUILD_OBJECT(	×
31	'html', ${prefix}."html",
32	'wordCount', ${prefix}."wordCount",
33	'originalContents', ${prefix}."originalContents",
34	'editedAt', ${prefix}."editedAt",
35	'userId', ${prefix}."userId",
36	'version', ${prefix}."version"
37	)`;
38
39	// This should return an object of type `NotificationDisplayPost`
40	const buildNotificationPost = (	20✔
41	prefix: string,
42	revisionPrefix: string,
43	userPrefix: string,
44	localgroupPrefix: string,
45	) =>
46	`CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(	×
47	'_id', ${prefix}."_id",
48	'slug', ${prefix}."slug",
49	'title', ${prefix}."title",
50	'draft', ${prefix}."draft",
51	'url', ${prefix}."url",
52	'isEvent', ${prefix}."isEvent",
53	'startTime', ${prefix}."startTime",
54	'curatedDate', ${prefix}."curatedDate",
55	'postedAt', ${prefix}."postedAt",
56	'groupId', ${prefix}."groupId",
57	'fmCrosspost', ${prefix}."fmCrosspost",
58	'collabEditorDialogue', ${prefix}."collabEditorDialogue",
59	'readTimeMinutes', COALESCE(
60	${prefix}."readTimeMinutesOverride",
61	(${revisionPrefix}."wordCount")::INTEGER / ${READ_WORDS_PER_MINUTE}
62	),
63	'socialPreviewData', ${getSocialPreviewSql(prefix)},
64	'customHighlight', ${prefix}."customHighlight",
65	'contents', ${buildNotificationRevision(revisionPrefix)},
66	'rsvps', ${prefix}."rsvps",
67	'user', ${buildNotificationUser(userPrefix)},
68	'group', ${buildNotificationLocalgroup(localgroupPrefix)}
69	) END`;
70
71	// This should return an object of type `NotificationDisplayComment`
72	const buildNotificationComment = (	20✔
73	prefix: string,
74	userPrefix: string,
75	postPrefix: string,
76	postRevisionPrefix: string,
77	postUserPrefix: string,
78	postLocalgroupPrefix: string,
79	) =>
80	`CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(	×
81	'_id', ${prefix}."_id",
82	'user', ${buildNotificationUser(userPrefix)},
83	'post', ${buildNotificationPost(postPrefix, postRevisionPrefix, postUserPrefix, postLocalgroupPrefix)}
84	) END`;
85
86	// This should return an object of type `NotificationDisplayTag`
87	const buildNotificationTag = (prefix: string) =>	20✔
88	`CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(	×
89	'_id', ${prefix}."_id",
90	'name', ${prefix}."name",
91	'slug', ${prefix}."slug"
92	) END`;
93
94	// This should return an object of type `NotificationDisplaySequence`
95	const buildNotificationSequence = (prefix: string) =>	20✔
96	`CASE WHEN ${prefix}."_id" IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(	×
97	'_id', ${prefix}."_id",
98	'title', ${prefix}."title"
99	) END`;
100
101	export default class NotificationsRepo extends AbstractRepo<"Notifications"> {
102	constructor() {
103	super(Notifications);	1,857✔
104	}
105
106	getNotificationDisplays({
107	userId,
108	type,
109	includeMessages = false,	×
110	limit = 20,	×
111	offset = 0,	×
112	}: {
113	userId: string,
114	type?: string,
115	includeMessages?: boolean,
116	limit?: number,
117	offset?: number,
118	}): Promise<NotificationDisplay[]> {
119	return this.getRawDb().any(`	×
120	-- NotificationsRepo.getNotificationDisplays
121	SELECT
122	n."_id",
123	n."type",
124	n."link",
125	n."message",
126	n."createdAt",
127	tr."_id" "tagRelId",
128	COALESCE(
129	${buildNotificationPost("p", "pr", "pu", "pl")},
130	${buildNotificationPost("trp", "trpr", "trpu", "trpl")}
131	) "post",
132	${buildNotificationComment("c", "cu", "cp", "cpr", "cpu", "cpl")} "comment",
133	${buildNotificationTag("t")} "tag",
134	${buildNotificationSequence("s")} "sequence",
135	COALESCE(
136	${buildNotificationUser("nma")},
137	${buildNotificationUser("u")}
138	) "user",
139	${buildNotificationLocalgroup("l")} "localgroup"
140	FROM "Notifications" n
141	LEFT JOIN "Posts" p ON
142	n."documentType" = 'post' AND
143	n."documentId" = p."_id"
144	LEFT JOIN "Revisions" pr ON
145	pr."_id" = p."contents_latest"
146	LEFT JOIN "Users" pu ON
147	p."userId" = pu."_id"
148	LEFT JOIN "Localgroups" pl ON
149	p."groupId" = pl."_id"
150	LEFT JOIN "Comments" c ON
151	n."documentType" = 'comment' AND
152	n."documentId" = c."_id"
153	LEFT JOIN "Users" cu ON
154	c."userId" = cu."_id"
155	LEFT JOIN "Posts" cp ON
156	c."postId" = cp."_id"
157	LEFT JOIN "Revisions" cpr ON
158	cpr."_id" = cp."contents_latest"
159	LEFT JOIN "Users" cpu ON
160	cp."userId" = cpu."_id"
161	LEFT JOIN "Localgroups" cpl ON
162	cp."groupId" = cpl."_id"
163	LEFT JOIN "TagRels" tr ON
164	n."documentType" = 'tagRel' AND
165	n."documentId" = tr."_id"
166	LEFT JOIN "Tags" t ON
167	t."_id" = tr."tagId"
168	LEFT JOIN "Posts" trp ON
169	trp."_id" = tr."postId"
170	LEFT JOIN "Revisions" trpr ON
171	trpr."_id" = trp."contents_latest"
172	LEFT JOIN "Users" trpu ON
173	trpu."_id" = trp."userId"
174	LEFT JOIN "Sequences" s ON
175	n."documentType" = 'sequence' AND
176	n."documentId" = s."_id"
177	LEFT JOIN "Localgroups" trpl ON
178	trpl."_id" = trp."groupId"
179	LEFT JOIN "Users" u ON
180	n."documentType" = 'user' AND
181	n."documentId" = u."_id"
182	LEFT JOIN "Localgroups" l ON
183	n."documentType" = 'localgroup' AND
184	n."documentId" = l."_id"
185	LEFT JOIN "Users" nma ON
186	n."extraData"->>'newMessageAuthorId' = nma."_id"
187	WHERE
188	n."userId" = $(userId) AND
189	n."deleted" IS NOT TRUE AND
190	n."emailed" IS NOT TRUE AND
191	n."waitingForBatch" IS NOT TRUE AND
192	${type ? `n."type" = $(type) AND` : ""}	×
193	${includeMessages ? "": `n."documentType" <> 'message' AND`}	×
194	NOT COALESCE(p."deletedDraft", FALSE) AND
195	NOT COALESCE(pu."deleted", FALSE) AND
196	NOT COALESCE(pl."deleted", FALSE) AND
197	NOT COALESCE(c."deleted", FALSE) AND
198	NOT COALESCE(cu."deleted", FALSE) AND
199	NOT COALESCE(cp."deletedDraft", FALSE) AND
200	NOT COALESCE(cpu."deleted", FALSE) AND
201	NOT COALESCE(cpl."deleted", FALSE) AND
202	NOT COALESCE(t."deleted", FALSE) AND
203	NOT COALESCE(u."deleted", FALSE) AND
204	NOT COALESCE(l."deleted", FALSE) AND
205	NOT COALESCE(s."isDeleted", FALSE) AND
206	NOT COALESCE(nma."deleted", FALSE)
207	ORDER BY "createdAt" DESC
208	LIMIT $(limit)
209	OFFSET $(offset)
210	`, {userId, type, limit, offset});
211	}
212	}

ForumMagnum / ForumMagnum / 10301481406

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