Merge pull request #142 from premieroctet/fix/already-used-bookmark

Fix: Prisma query for unused bookmarks
premieroctet · Oct 2, 2024 · 7d61019 · 7d61019
2 parents d406f97 + cbde0bf
commit 7d61019
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/components/bookmark/BookmarkListDnd.tsx b/src/components/bookmark/BookmarkListDnd.tsx
@@ -1,8 +1,8 @@
-import { Draggable, Droppable } from 'react-beautiful-dnd';
-import { BookmarkItem } from './BookmarkItem';
-import { getTeamBySlug } from '@/services/database/team';
 import { getDigest } from '@/services/database/digest';
 import { TeamLinks } from '@/services/database/link';
+import { getTeamBySlug } from '@/services/database/team';
+import { Draggable, Droppable } from 'react-beautiful-dnd';
+import { BookmarkItem } from './BookmarkItem';
 
 export type BookmarkListDndProps = {
   digest: NonNullable<Awaited<ReturnType<typeof getDigest>>>;
@@ -23,7 +23,7 @@ const BookmarkListDnd = ({ teamLinks, team, digest }: BookmarkListDndProps) => {
             return (
               <Draggable
                 key={teamLink.id}
-                draggableId={teamLink.bookmark[0].id}
+                draggableId={teamLink?.bookmark[0]?.id}
                 index={index}
               >
                 {(provided) => (

diff --git a/src/services/database/link.ts b/src/services/database/link.ts
@@ -49,12 +49,12 @@ export const getTeamLinks = async (
         bookmark: {
           some: {
             teamId,
+            ...(options.onlyNotInDigest && {
+              digestBlocks: {
+                none: {},
+              },
+            }),
           },
-          ...(options.onlyNotInDigest && {
-            every: {
-              digestBlocks: { none: {} },
-            },
-          }),
         },
       },
     ],
@@ -101,14 +101,10 @@ export const getTeamLinks = async (
         },
         where: {
           teamId,
-          ...(options.onlyNotInDigest && {
-            digestBlocks: { none: {} },
-          }),
         },
       },
     },
   });
-
   return {
     teamLinks,
     linksCount,