feat : use mod unique id instead of cuid for pagination

faithful-mods · Aug 19, 2024 · 33189c6 · 33189c6
1 parent daec0ad
commit 33189c6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/src/app/(pages)/mods/[modId]/gallery/page.tsx b/src/app/(pages)/mods/[modId]/gallery/page.tsx
@@ -14,7 +14,7 @@ import { useEffectOnce } from '~/hooks/use-effect-once';
 import { BREAKPOINT_MOBILE_LARGE, BREAKPOINT_TABLET, ITEMS_PER_PAGE, ITEMS_PER_ROW } from '~/lib/constants';
 import { searchFilter } from '~/lib/utils';
 import { getLatestContributionsOfModVersion } from '~/server/data/contributions';
-import { getModVersionFromMod } from '~/server/data/mods-version';
+import { getModVersionFromModForgeId } from '~/server/data/mods-version';
 import { getTexturesFromModVersion } from '~/server/data/texture';
 
 import type { ModVersion, Texture } from '@prisma/client';
@@ -48,7 +48,7 @@ export default function ModGalleryPage() {
 	const texturesGroupRef = useRef<HTMLDivElement>(null);
 
 	useEffectOnce(() => {
-		getModVersionFromMod(modId).then((versions) => {
+		getModVersionFromModForgeId(modId).then((versions) => {
 			setModVersions(versions);
 			setModVersionShown(versions[0]?.id ?? null);
 		});

diff --git a/src/app/(pages)/mods/[modId]/layout.tsx b/src/app/(pages)/mods/[modId]/layout.tsx
@@ -16,7 +16,7 @@ import { TextureImage } from '~/components/texture-img';
 import { useDeviceSize } from '~/hooks/use-device-size';
 import { useEffectOnce } from '~/hooks/use-effect-once';
 import { BREAKPOINT_MOBILE_LARGE } from '~/lib/constants';
-import { getModsFromIds, getModDownloads } from '~/server/data/mods';
+import { getModDownloads, getModFromForgeId } from '~/server/data/mods';
 
 import type { Mod } from '@prisma/client';
 import type { Downloads } from '~/types';
@@ -35,8 +35,8 @@ export default function ModLayout({ children }: { children: React.ReactNode }) {
 	useEffectOnce(() => {
 		if (!modId) return;
 
-		getModsFromIds([modId])
-			.then((mod) => setMod(mod[0] ?? null))
+		getModFromForgeId(modId)
+			.then(setMod)
 			.then(() => getModDownloads(modId).then(setDownloads))
 			.finally(() => setLoading(false));
 	});

diff --git a/src/app/(pages)/mods/[modId]/page.tsx b/src/app/(pages)/mods/[modId]/page.tsx
@@ -14,8 +14,8 @@ import { Tile } from '~/components/tile';
 import { useDeviceSize } from '~/hooks/use-device-size';
 import { useEffectOnce } from '~/hooks/use-effect-once';
 import { BREAKPOINT_MOBILE_LARGE, ITEMS_PER_PAGE, RESOLUTIONS_COLORS, EMPTY_PROGRESSION, ITEMS_PER_PAGE_DEFAULT } from '~/lib/constants';
-import { getModsFromIds } from '~/server/data/mods';
-import { getModVersionFromMod, getModVersionProgressionFromMod } from '~/server/data/mods-version';
+import { getModFromForgeId } from '~/server/data/mods';
+import { getModVersionFromModForgeId, getModVersionProgressionFromModForgeId } from '~/server/data/mods-version';
 
 import type { Mod, ModVersion } from '@prisma/client';
 import type { Progression } from '~/types';
@@ -107,9 +107,9 @@ export default function ModPage() {
 	}, [search, versions]);
 
 	useEffectOnce(() => {
-		getModsFromIds([modId]).then((mod) => setMod(mod[0] ?? null));
-		getModVersionProgressionFromMod(modId).then(setProgressions);
-		getModVersionFromMod(modId).then((versions) => {
+		getModFromForgeId(modId).then(setMod);
+		getModVersionProgressionFromModForgeId(modId).then(setProgressions);
+		getModVersionFromModForgeId(modId).then((versions) => {
 			setVersions(versions);
 			setFilteredVersions(versions);
 		});

diff --git a/src/app/(pages)/mods/page.tsx b/src/app/(pages)/mods/page.tsx
@@ -280,7 +280,7 @@ export default function Mods() {
 					modsShown[activePage - 1] && modsShown[activePage - 1]?.map((m) => (
 						<Tile
 							key={m.id}
-							onClick={() => router.push(`/mods/${m.id}`)}
+							onClick={() => router.push(`/mods/${m.forgeId}`)}
 							className="cursor-pointer mod-card"
 						>
 							<Stack gap="xs">

diff --git a/src/server/data/mods-version.ts b/src/server/data/mods-version.ts
@@ -42,8 +42,11 @@ export async function getModVersionsWithModpacks(modId: string): Promise<ModVers
 	return res;
 }
 
-export async function getModVersionFromMod(modId: string): Promise<ModVersion[]> {
-	return db.modVersion.findMany({ where: { modId } }).then((res) => res.sort((a, b) => sortBySemver(a.version, b.version)));
+export async function getModVersionFromModForgeId(forgeId: string): Promise<ModVersion[]> {
+	const mod = await db.mod.findFirst({ where: { forgeId }	});
+	if (!mod) return [];
+
+	return db.modVersion.findMany({ where: { modId: mod.id } });
 }
 
 export async function getModVersions(): Promise<ModVersion[]> {
@@ -69,8 +72,8 @@ export async function getModsVersionsFromResources(resourceIds: string[]): Promi
 		.then((res) => res.map((modVer) => ({ ...modVer, resources: modVer.resources.map((r) => r.id) })));
 }
 
-export async function getModVersionProgressionFromMod(modId: string): Promise<Record<string, Progression>> {
-	const modVersions = await db.modVersion.findMany({ where: { modId }, select: { id: true } });
+export async function getModVersionProgressionFromModForgeId(forgeId: string): Promise<Record<string, Progression>> {
+	const modVersions = await getModVersionFromModForgeId(forgeId);
 	const modVersionsIds = modVersions.map((mv) => mv.id);
 
 	const progressions: Record<string, Progression> = {};

diff --git a/src/server/data/mods.ts b/src/server/data/mods.ts
@@ -16,6 +16,10 @@ import type { Downloads } from '~/types';
 
 // GET
 
+export async function getModFromForgeId(forgeId: string): Promise<Mod | null> {
+	return db.mod.findFirst({ where: { forgeId } });
+}
+
 export async function getModsFromIds(ids: string[]): Promise<Mod[]> {
 	return db.mod.findMany({ where: { id: { in: ids } } });
 }