4214376748

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/hifiwi-fi/breadcrum.net/commit/<a class=hub.com/hifiwi-fi/breadcrum.net/commit/<a class="double-link" href="https://git"><a class=hub.com/hifiwi-fi/breadcrum.net/commit/<a class="double-link" href="https://git"><a class=hub.com/hifiwi-fi/breadcrum.net/commit/<a class="double-link" href="https://git"><a class=hub.com/hifiwi-fi/breadcrum.net/commit/<a class="double-link" href="https://git"><a class=hub.com/hifiwi-fi/breadcrum.net/commit/6a9cf0566c187d687b5e5d37a60b2e16e4f4b141">6a9cf0566">&lt;a href=&quot;https://github.com/hifiwi-fi/breadcrum.net/commit/</a><a class="double-link" href="https://github.com/hifiwi-fi/breadcrum.net/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/hifiwi-fi/breadcrum.net/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/hifiwi-fi/breadcrum.net/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/hifiwi-fi/breadcrum.net/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/hifiwi-fi/breadcrum.net/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/hifiwi-fi/breadcrum.net/commit/6a9cf0566c187d687b5e5d37a60b2e16e4f4b141">6a9cf0566</a><a href="https://github.com/hifiwi-fi/breadcrum.net/commit/6a9cf0566c187d687b5e5d37a60b2e16e4f4b141">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/hifiwi-fi/breadcrum.net/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/hifiwi-fi/breadcrum.net/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/hifiwi-fi/breadcrum.net/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/hifiwi-fi/breadcrum.net/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/hifiwi-fi/breadcrum.net/commit/6a9cf0566c187d687b5e5d37a60b2e16e4f4b141&quot;&gt;6a9cf0566&lt;/a&gt;&lt;a href=&quot;https://github.com/hifiwi-fi/breadcrum.net/commit/6a9cf0566c187d687b5e5d37a60b2e16e4f4b141&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/hifiwi-fi/breadcrum.net/commit/6a9cf0566c187d687b5e5d37a60b2e16e4f4b141&amp;quot;&amp;gt;&amp;amp;quot;&amp;amp;gt;&amp;amp;amp;lt;a h... (continued)

Pull Request Pull Request #252: Optimistic save

Run Details

298 of 458 branches covered (65.07%)

Branch coverage included in aggregate %.

127 of 127 new or added lines in 3 files covered. (100.0%)

4700 of 9714 relevant lines covered (48.38%)

0.94 hits per line

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

28.11

/routes/api/bookmarks/_id/put-bookmark.js

/* eslint-disable camelcase */
import SQL from '@nearform/sql'
import { createEpisode } from '../../episodes/episode-query-create.js'
import { commnonBookmarkProps } from '../bookmark-props.js'
import { createEpisodeProp } from '../../episodes/episode-props.js'
import { resolveEpisode } from '../../episodes/resolve-episode.js'
import { fullBookmarkPropsWithEpisodes } from '../mixed-bookmark-props.js'
import { getBookmarksQuery } from '../get-bookmarks-query.js'

export async function putBookmark (fastify, opts) {
  fastify.put('/', {
    preHandler: fastify.auth([fastify.verifyJWT]),
    schema: {
      params: {
        type: 'object',
        properties: {
          id: { type: 'string', format: 'uuid' }
        },
        required: ['id']
      },
      body: {
        type: 'object',
        properties: {
          ...commnonBookmarkProps,
          ...createEpisodeProp
        },
        minProperties: 1,
        additionalProperties: false
      },
      response: {
        200: {
          type: 'object',
          description: 'Existing bookmarks are returned unmodified',
          properties: {
            status: { enum: ['updated'] },
            site_url: { type: 'string' },
            data: {
              type: 'object',
              properties: {
                ...fullBookmarkPropsWithEpisodes
              }
            }
          }
        }
      }
    }
  },
  async function putBookmarkHandler (request, reply) {
    return fastify.pg.transact(async client => {
      const userId = request.user.id
      const bookmarkId = request.params.id
      const bookmark = request.body

      // Check if bookmark exists:
      const bookmarkQuery = SQL`
              select url from bookmarks
              WHERE id = ${bookmarkId}
              AND owner_id =${userId};
            `
      const bookmarkResults = await client.query(bookmarkQuery)
      const existingBookmark = bookmarkResults.rows[0]
      if (!existingBookmark) {
        return reply.notFound(`bookmark ${bookmarkId} not found for user ${userId}`)
      }

      const updates = []

      if (bookmark.url != null) updates.push(SQL`url = ${bookmark.url}`)
      if (bookmark.title != null) updates.push(SQL`title = ${bookmark.title}`)
      if (bookmark.note != null) updates.push(SQL`note = ${bookmark.note}`)
      if (bookmark.starred != null) updates.push(SQL`starred = ${bookmark.starred}`)
      if (bookmark.toread != null) updates.push(SQL`toread = ${bookmark.toread}`)
      if (bookmark.sensitive != null) updates.push(SQL`sensitive = ${bookmark.sensitive}`)
      if (bookmark.archive_urls != null) updates.push(SQL`archive_urls = ${bookmark.archive_urls}`)

      if (updates.length > 0) {
        const query = SQL`
          UPDATE bookmarks
          SET ${SQL.glue(updates, ' , ')}
          WHERE id = ${bookmarkId}
            AND owner_id =${userId};
          `

        await client.query(query)
      }

      if (Array.isArray(bookmark.tags)) {
        if (bookmark.tags.length > 0) {
          const createTags = SQL`
          INSERT INTO tags (name, owner_id)
          VALUES
             ${SQL.glue(
                bookmark.tags.map(tag => SQL`(${tag},${userId})`),
                ' , '
              )}
          ON CONFLICT (name, owner_id)
          DO UPDATE
            SET name = EXCLUDED.name
          returning id, name, created_at, updated_at;
          `

          const tagsResults = await client.query(createTags)

          const applyTags = SQL`
          INSERT INTO bookmarks_tags (bookmark_id, tag_id)
          VALUES
            ${SQL.glue(
              tagsResults.rows.map(tag => SQL`(${bookmarkId},${tag.id})`),
              ' , '
            )}
          ON CONFLICT (bookmark_id, tag_id)
          DO NOTHING;
          `

          await client.query(applyTags)
          fastify.metrics.tagAppliedCounter.inc(tagsResults.rows.length)

          const removeOldTags = SQL`
          DELETE FROM bookmarks_tags
          WHERE bookmark_id = ${bookmarkId}
            AND tag_id NOT IN (${SQL.glue(tagsResults.rows.map(tag => SQL`${tag.id}`), ', ')})
        `

          const removeResults = await client.query(removeOldTags)
          fastify.metrics.tagRemovedCounter.inc(removeResults.rows.length)
        } else {
          const removeAllTags = SQL`
          DELETE FROM bookmarks_tags
          WHERE bookmark_id = ${bookmarkId}
        `

          await client.query(removeAllTags)
        }
      }

      if (bookmark?.createEpisode) {
        const { id: episodeId, medium: episodeMedium, url: episodeURL } = await createEpisode({
          client,
          userId,
          bookmarkId,
          type: bookmark.createEpisode.type,
          medium: bookmark.createEpisode.medium,
          url: request?.body?.createEpisode.url ?? bookmark.url ?? existingBookmark.url
        })

        await client.query('commit')
        fastify.metrics.episodeCounter.inc()

        fastify.pqueue.add(() => {
          return resolveEpisode({
            fastify,
            userID: userId,
            episodeID: episodeId,
            medium: episodeMedium,
            url: episodeURL,
            log: request.log
          })
        })
      }
      await client.query('commit')
      fastify.metrics.bookmarkEditCounter.inc()

      // Look up the newly created bookmark instead of trying to re-assemble it here.
      const updatedBookmarkQuery = getBookmarksQuery({
        ownerId: userId,
        bookmarkId,
        sensitive: true,
        perPage: 1
      })

      const createdResults = await fastify.pg.query(updatedBookmarkQuery)
      const createdBookmark = createdResults.rows.pop()

      reply.status(200)

      return {
        status: 'updated',
        site_url: `${fastify.config.TRANSPORT}://${fastify.config.HOST}/bookmarks/b?id=${bookmarkId}`,
        data: createdBookmark
      }
    })
  })
}

1	/* eslint-disable camelcase */	2✔
2	import SQL from '@nearform/sql'	2✔
3	import { createEpisode } from '../../episodes/episode-query-create.js'	2✔
4	import { commnonBookmarkProps } from '../bookmark-props.js'	2✔
5	import { createEpisodeProp } from '../../episodes/episode-props.js'	2✔
6	import { resolveEpisode } from '../../episodes/resolve-episode.js'	2✔
7	import { fullBookmarkPropsWithEpisodes } from '../mixed-bookmark-props.js'	2✔
8	import { getBookmarksQuery } from '../get-bookmarks-query.js'	2✔
9		2✔
10	export async function putBookmark (fastify, opts) {	2✔
11	fastify.put('/', {	2✔
12	preHandler: fastify.auth([fastify.verifyJWT]),	2✔
13	schema: {	2✔
14	params: {	2✔
15	type: 'object',	2✔
16	properties: {	2✔
17	id: { type: 'string', format: 'uuid' }	2✔
18	},	2✔
19	required: ['id']	2✔
20	},	2✔
21	body: {	2✔
22	type: 'object',	2✔
23	properties: {	2✔
24	...commnonBookmarkProps,	2✔
25	...createEpisodeProp	2✔
26	},	2✔
27	minProperties: 1,	2✔
28	additionalProperties: false	2✔
29	},	2✔
30	response: {	2✔
31	200: {	2✔
32	type: 'object',	2✔
33	description: 'Existing bookmarks are returned unmodified',	2✔
34	properties: {	2✔
35	status: { enum: ['updated'] },	2✔
36	site_url: { type: 'string' },	2✔
37	data: {	2✔
38	type: 'object',	2✔
39	properties: {	2✔
40	...fullBookmarkPropsWithEpisodes	2✔
41	}	2✔
42	}	2✔
43	}	2✔
44	}	2✔
45	}	2✔
46	}	2✔
47	},	2✔
48	async function putBookmarkHandler (request, reply) {	2✔
49	return fastify.pg.transact(async client => {	×
50	const userId = request.user.id	×
51	const bookmarkId = request.params.id	×
52	const bookmark = request.body	×
53		×
54	// Check if bookmark exists:	×
55	const bookmarkQuery = SQL`	×
56	select url from bookmarks	×
57	WHERE id = ${bookmarkId}	×
58	AND owner_id =${userId};	×
59	`	×
60	const bookmarkResults = await client.query(bookmarkQuery)	×
61	const existingBookmark = bookmarkResults.rows[0]	×
62	if (!existingBookmark) {	×
63	return reply.notFound(`bookmark ${bookmarkId} not found for user ${userId}`)	×
64	}	×
65		×
66	const updates = []	×
67		×
68	if (bookmark.url != null) updates.push(SQL`url = ${bookmark.url}`)	×
69	if (bookmark.title != null) updates.push(SQL`title = ${bookmark.title}`)	×
70	if (bookmark.note != null) updates.push(SQL`note = ${bookmark.note}`)	×
71	if (bookmark.starred != null) updates.push(SQL`starred = ${bookmark.starred}`)	×
72	if (bookmark.toread != null) updates.push(SQL`toread = ${bookmark.toread}`)	×
73	if (bookmark.sensitive != null) updates.push(SQL`sensitive = ${bookmark.sensitive}`)	×
74	if (bookmark.archive_urls != null) updates.push(SQL`archive_urls = ${bookmark.archive_urls}`)	×
75		×
76	if (updates.length > 0) {	×
77	const query = SQL`	×
78	UPDATE bookmarks	×
79	SET ${SQL.glue(updates, ' , ')}	×
80	WHERE id = ${bookmarkId}	×
81	AND owner_id =${userId};	×
82	`	×
83		×
84	await client.query(query)	×
85	}	×
86		×
87	if (Array.isArray(bookmark.tags)) {	×
88	if (bookmark.tags.length > 0) {	×
89	const createTags = SQL`	×
90	INSERT INTO tags (name, owner_id)	×
91	VALUES	×
92	${SQL.glue(	×
93	bookmark.tags.map(tag => SQL`(${tag},${userId})`),	×
94	' , '	×
95	)}	×
96	ON CONFLICT (name, owner_id)	×
97	DO UPDATE	×
98	SET name = EXCLUDED.name	×
99	returning id, name, created_at, updated_at;	×
100	`	×
101		×
102	const tagsResults = await client.query(createTags)	×
103		×
104	const applyTags = SQL`	×
105	INSERT INTO bookmarks_tags (bookmark_id, tag_id)	×
106	VALUES	×
107	${SQL.glue(	×
108	tagsResults.rows.map(tag => SQL`(${bookmarkId},${tag.id})`),	×
109	' , '	×
110	)}	×
111	ON CONFLICT (bookmark_id, tag_id)	×
112	DO NOTHING;	×
113	`	×
114		×
115	await client.query(applyTags)	×
116	fastify.metrics.tagAppliedCounter.inc(tagsResults.rows.length)	×
117		×
118	const removeOldTags = SQL`	×
119	DELETE FROM bookmarks_tags	×
120	WHERE bookmark_id = ${bookmarkId}	×
121	AND tag_id NOT IN (${SQL.glue(tagsResults.rows.map(tag => SQL`${tag.id}`), ', ')})	×
122	`	×
123		×
124	const removeResults = await client.query(removeOldTags)	×
125	fastify.metrics.tagRemovedCounter.inc(removeResults.rows.length)	×
126	} else {	×
127	const removeAllTags = SQL`	×
128	DELETE FROM bookmarks_tags	×
129	WHERE bookmark_id = ${bookmarkId}	×
130	`	×
131		×
132	await client.query(removeAllTags)	×
133	}	×
134	}	×
135		×
136	if (bookmark?.createEpisode) {	×
137	const { id: episodeId, medium: episodeMedium, url: episodeURL } = await createEpisode({	×
138	client,	×
139	userId,	×
140	bookmarkId,	×
141	type: bookmark.createEpisode.type,	×
142	medium: bookmark.createEpisode.medium,	×
143	url: request?.body?.createEpisode.url ?? bookmark.url ?? existingBookmark.url	×
144	})	×
145		×
146	await client.query('commit')	×
147	fastify.metrics.episodeCounter.inc()	×
148		×
149	fastify.pqueue.add(() => {	×
150	return resolveEpisode({	×
151	fastify,	×
152	userID: userId,	×
153	episodeID: episodeId,	×
154	medium: episodeMedium,	×
155	url: episodeURL,	×
156	log: request.log	×
157	})	×
158	})	×
159	}	×
160	await client.query('commit')	×
161	fastify.metrics.bookmarkEditCounter.inc()	×
162		×
163	// Look up the newly created bookmark instead of trying to re-assemble it here.	×
164	const updatedBookmarkQuery = getBookmarksQuery({	×
165	ownerId: userId,	×
166	bookmarkId,	×
167	sensitive: true,	×
168	perPage: 1	×
169	})	×
170		×
171	const createdResults = await fastify.pg.query(updatedBookmarkQuery)	×
172	const createdBookmark = createdResults.rows.pop()	×
173		×
174	reply.status(200)	×
175		×
176	return {	×
177	status: 'updated',	×
178	site_url: `${fastify.config.TRANSPORT}://${fastify.config.HOST}/bookmarks/b?id=${bookmarkId}`,	×
179	data: createdBookmark	×
180	}	×
181	})	×
182	})	2✔
183	}	2✔

hifiwi-fi / breadcrum.net / 4214376748

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