⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
add mode insensitive in case we are using postgresql + rename table
Jordan Higuera Higuera895ef8e60f7e
diff --git a/lib/api/controllers/links/getLinks.ts b/lib/api/controllers/links/getLinks.tsindex 22df9fb3..4f9b1e69 100644--- a/lib/api/controllers/links/getLinks.ts+++ b/lib/api/controllers/links/getLinks.ts@@ -1,145 +1,152 @@-import { prisma } from "@/lib/api/db";-import { LinkRequestQuery, Sort } from "@/types/global";+import {prisma} from "@/lib/api/db";+import {LinkRequestQuery, Sort} from "@/types/global";+import * as process from "process";export default async function getLink(userId: number, body: string) {- const query: LinkRequestQuery = JSON.parse(decodeURIComponent(body));- console.log(query);+ const query: LinkRequestQuery = JSON.parse(decodeURIComponent(body));+ console.log(query);- // Sorting logic- let order: any;- if (query.sort === Sort.DateNewestFirst)- order = {- createdAt: "desc",- };- else if (query.sort === Sort.DateOldestFirst)- order = {- createdAt: "asc",- };- else if (query.sort === Sort.NameAZ)- order = {- name: "asc",- };- else if (query.sort === Sort.NameZA)- order = {- name: "desc",- };- else if (query.sort === Sort.DescriptionAZ)- order = {- name: "asc",- };- else if (query.sort === Sort.DescriptionZA)- order = {- name: "desc",- };+ const POSTGRES_IS_ENABLED = process.env.DATABASE_URL.startsWith("postgresql");+ // Sorting logic+ let order: any;+ if (query.sort === Sort.DateNewestFirst)+ order = {+ createdAt: "desc",+ };+ else if (query.sort === Sort.DateOldestFirst)+ order = {+ createdAt: "asc",+ };+ else if (query.sort === Sort.NameAZ)+ order = {+ name: "asc",+ };+ else if (query.sort === Sort.NameZA)+ order = {+ name: "desc",+ };+ else if (query.sort === Sort.DescriptionAZ)+ order = {+ name: "asc",+ };+ else if (query.sort === Sort.DescriptionZA)+ order = {+ name: "desc",+ };- const links = await prisma.link.findMany({- take: Number(process.env.PAGINATION_TAKE_COUNT) || 20,- skip: query.cursor ? 1 : undefined,- cursor: query.cursor- ? {- id: query.cursor,- }- : undefined,- where: {- collection: {- id: query.collectionId ? query.collectionId : undefined, // If collectionId was defined, filter by collection- OR: [- {- ownerId: userId,- },- {- members: {- some: {- userId,- },+ const links = await prisma.link.findMany({+ take: Number(process.env.PAGINATION_TAKE_COUNT) || 20,+ skip: query.cursor ? 1 : undefined,+ cursor: query.cursor+ ? {+ id: query.cursor,+ }+ : undefined,+ where: {+ collection: {+ id: query.collectionId ? query.collectionId : undefined, // If collectionId was defined, filter by collection+ OR: [+ {+ ownerId: userId,+ },+ {+ members: {+ some: {+ userId,+ },+ },+ },+ ],},- },- ],- },- [query.searchQuery ? "OR" : "AND"]: [- {- pinnedBy: query.pinnedOnly ? { some: { id: userId } } : undefined,- },- {- name: {- contains:- query.searchQuery && query.searchFilter?.name- ? query.searchQuery- : undefined,- },- },- {- url: {- contains:- query.searchQuery && query.searchFilter?.url- ? query.searchQuery- : undefined,- },- },- {- description: {- contains:- query.searchQuery && query.searchFilter?.description- ? query.searchQuery- : undefined,- },- },- {- tags:- query.searchQuery && !query.searchFilter?.tags- ? undefined- : {- some: query.tagId- ? {- // If tagId was defined, filter by tag- id: query.tagId,- name:- query.searchQuery && query.searchFilter?.tags- ? {- contains: query.searchQuery,- }- : undefined,- OR: [- { ownerId: userId }, // Tags owned by the user- {- links: {- some: {- name: {- contains:- query.searchQuery &&- query.searchFilter?.tags- ? query.searchQuery- : undefined,- },- collection: {- members: {- some: {- userId, // Tags from collections where the user is a member- },- },- },- },+ [query.searchQuery ? "OR" : "AND"]: [+ {+ pinnedBy: query.pinnedOnly ? {some: {id: userId}} : undefined,+ },+ {+ name: {+ contains:+ query.searchQuery && query.searchFilter?.name+ ? query.searchQuery+ : undefined,+ mode: POSTGRES_IS_ENABLED ? "insensitive" : undefined+ },+ },+ {+ url: {+ contains:+ query.searchQuery && query.searchFilter?.url+ ? query.searchQuery+ : undefined,+ mode: POSTGRES_IS_ENABLED ? "insensitive" : undefined+ },+ },+ {+ description: {+ contains:+ query.searchQuery && query.searchFilter?.description+ ? query.searchQuery+ : undefined,+ mode: POSTGRES_IS_ENABLED ? "insensitive" : undefined+ },+ },+ {+ tags:+ query.searchQuery && !query.searchFilter?.tags+ ? undefined+ : {+ some: query.tagId+ ? {+ // If tagId was defined, filter by tag+ id: query.tagId,+ name:+ query.searchQuery && query.searchFilter?.tags+ ? {+ contains: query.searchQuery,+ mode: POSTGRES_IS_ENABLED ? "insensitive" : undefined+ }+ : undefined,+ OR: [+ {ownerId: userId}, // Tags owned by the user+ {+ links: {+ some: {+ name: {+ contains:+ query.searchQuery &&+ query.searchFilter?.tags+ ? query.searchQuery+ : undefined,+ mode: POSTGRES_IS_ENABLED ? "insensitive" : undefined+ },+ collection: {+ members: {+ some: {+ userId, // Tags from collections where the user is a member+ },+ },+ },+ },+ },+ },+ ],+ }+ : undefined,},- },- ],- }- : undefined,},+ ],+ },+ include: {+ tags: true,+ collection: true,+ pinnedBy: {+ where: {id: userId},+ select: {id: true},+ },+ },+ orderBy: order || {+ createdAt: "desc",},- ],- },- include: {- tags: true,- collection: true,- pinnedBy: {- where: { id: userId },- select: { id: true },- },- },- orderBy: order || {- createdAt: "desc",- },- });+ });- return { response: links, status: 200 };+ return {response: links, status: 200};}diff --git a/prisma/schema.prisma b/prisma/schema.prismaindex da10e492..dc9170bf 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -3,7 +3,7 @@ generator client {}datasource db {- provider = "postgresql"+ provider = "sqlite"url = env("DATABASE_URL")}@@ -56,11 +56,11 @@ model User {collectionsJoined UsersAndCollections[]isPrivate Boolean @default(false)- whitelistedUsers whitelistedUser[]+ whitelistedUsers WhitelistedUser[]createdAt DateTime @default(now())}-model whitelistedUser {+model WhitelistedUser {id Int @id @default(autoincrement())username String @default("")