xwx.moe/el.xwx.moe
xwx.moe/ el.xwx.moe
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Actions Packages Projects Eldonoj Wiki Activity

add mode insensitive in case we are using postgresql + rename table

This commit is contained in:
Jordan Higuera Higuera 2023-08-04 10:08:04 -07:00
parent 22093c0c29
commit 895ef8e60f
No known key found for this signature in database
GPG Key ID: B07085A04D061948
2 changed files with 146 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

279
lib/api/controllers/links/getLinks.ts
View File

@ -1,145 +1,152 @@
import { prisma } from "@/lib/api/db"; import {prisma} from "@/lib/api/db";
import { LinkRequestQuery, Sort } from "@/types/global"; import {LinkRequestQuery, Sort} from "@/types/global";
import * as process from "process";
export default async function getLink(userId: number, body: string) { export default async function getLink(userId: number, body: string) {
const query: LinkRequestQuery = JSON.parse(decodeURIComponent(body)); const query: LinkRequestQuery = JSON.parse(decodeURIComponent(body));
console.log(query); console.log(query);
// Sorting logic const POSTGRES_IS_ENABLED = process.env.DATABASE_URL.startsWith("postgresql");
let order: any; // Sorting logic
if (query.sort === Sort.DateNewestFirst) let order: any;
order = { if (query.sort === Sort.DateNewestFirst)
createdAt: "desc", order = {
}; createdAt: "desc",
else if (query.sort === Sort.DateOldestFirst) };
order = { else if (query.sort === Sort.DateOldestFirst)
createdAt: "asc", order = {
}; createdAt: "asc",
else if (query.sort === Sort.NameAZ) };
order = { else if (query.sort === Sort.NameAZ)
name: "asc", order = {
}; name: "asc",
else if (query.sort === Sort.NameZA) };
order = { else if (query.sort === Sort.NameZA)
name: "desc", order = {
}; name: "desc",
else if (query.sort === Sort.DescriptionAZ) };
order = { else if (query.sort === Sort.DescriptionAZ)
name: "asc", order = {
}; name: "asc",
else if (query.sort === Sort.DescriptionZA) };
order = { else if (query.sort === Sort.DescriptionZA)
name: "desc", order = {
}; name: "desc",
};
const links = await prisma.link.findMany({ const links = await prisma.link.findMany({
take: Number(process.env.PAGINATION_TAKE_COUNT) || 20, take: Number(process.env.PAGINATION_TAKE_COUNT) || 20,
skip: query.cursor ? 1 : undefined, skip: query.cursor ? 1 : undefined,
cursor: query.cursor cursor: query.cursor
? { ? {
id: query.cursor, id: query.cursor,
} }
: undefined, : undefined,
where: { where: {
collection: { collection: {
id: query.collectionId ? query.collectionId : undefined, // If collectionId was defined, filter by collection id: query.collectionId ? query.collectionId : undefined, // If collectionId was defined, filter by collection
OR: [ OR: [
{ {
ownerId: userId, ownerId: userId,
}, },
{ {
members: { members: {
some: { some: {
userId, 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
},
},
},
},
}, },
}, },
], },
} ],
: undefined, },
[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,
},
},
],
}, },
], include: {
}, tags: true,
include: { collection: true,
tags: true, pinnedBy: {
collection: true, where: {id: userId},
pinnedBy: { select: {id: true},
where: { id: userId }, },
select: { id: true }, },
}, orderBy: order || {
}, createdAt: "desc",
orderBy: order || { },
createdAt: "desc", });
},
});
return { response: links, status: 200 }; return {response: links, status: 200};
} }

6
prisma/schema.prisma
View File

@ -3,7 +3,7 @@ generator client {
} }
datasource db { datasource db {
provider = "postgresql" provider = "sqlite"
url = env("DATABASE_URL") url = env("DATABASE_URL")
} }
@ -56,11 +56,11 @@ model User {
collectionsJoined UsersAndCollections[] collectionsJoined UsersAndCollections[]
isPrivate Boolean @default(false) isPrivate Boolean @default(false)
whitelistedUsers whitelistedUser[] whitelistedUsers WhitelistedUser[]
createdAt DateTime @default(now()) createdAt DateTime @default(now())
} }
model whitelistedUser { model WhitelistedUser {
id Int @id @default(autoincrement()) id Int @id @default(autoincrement())
username String @default("") username String @default("")