profile slug error (#3555)

src/pages/profile/body/body.tsx

@@ -11,9 +11,13 @@ import { useRootData } from "hooks/use-root-data";
 import { Globe, MapPin } from "lucide-react";
 import type { EndowmentBalances } from "types/aws";
 import { useProfileContext } from "../profile-context";
+import { npoId } from "./common/npo-id";
 
-export const loader: LoaderFunction = async ({ params }) =>
-  getEndowBalance(params.id);
+export const loader: LoaderFunction = async ({ params }) => {
+  const id = await npoId(params.id);
+  if (typeof id !== "number") return id;
+  return getEndowBalance(id.toString());
+};
 
 export default function Body() {
   const p = useProfileContext();

src/pages/profile/body/common/npo-id.ts

@@ -0,0 +1,16 @@
+import { endowIdParam, segment } from "@better-giving/endowment/schema";
+import { safeParse, union } from "valibot";
+import { getNpoByIdOrSlug } from ".server/npo";
+
+export const npoId = async (
+  idOrSlugParam: string | undefined
+): Promise<number | Response> => {
+  const id = safeParse(union([segment, endowIdParam]), idOrSlugParam);
+  if (id.issues) throw new Response(id.issues[0].message, { status: 400 });
+
+  if (typeof id.output === "number") return id.output;
+
+  const npo = await getNpoByIdOrSlug(id.output, ["id"]);
+  if (!npo) throw new Response(null, { status: 404 });
+  return npo.id;
+};

src/pages/profile/body/general-info/api.ts

@@ -2,8 +2,7 @@ import type { IMedia, Program } from "@better-giving/endowment";
 import type { FundItem } from "@better-giving/fundraiser";
 import type { LoaderFunction } from "@vercel/remix";
 import { getPrograms } from "api/get/programs";
-import { plusInt } from "api/schema/endow-id";
-import { parse } from "valibot";
+import { npoId } from "../common/npo-id";
 import { featuredMedia } from "../featured-media";
 import { getFundsNpoMemberOf } from ".server/funds";
 
@@ -14,10 +13,12 @@ export interface LoaderData {
 }
 
 export const loader: LoaderFunction = async ({ params }) => {
-  const id = parse(plusInt, params.id);
+  const id = await npoId(params.id);
+  if (typeof id !== "number") return id;
+
   return {
-    programs: await getPrograms(params.id),
-    media: await featuredMedia(params.id),
+    programs: await getPrograms(id),
+    media: await featuredMedia(id.toString()),
     funds: await getFundsNpoMemberOf(id, {
       npoProfileFeatured: true,
     }),

src/pages/profile/body/program/index.ts

@@ -1,9 +1,13 @@
 import type { LinksFunction, LoaderFunction } from "@vercel/remix";
 import { getProgram } from "api/get/program";
 import { richTextStyles } from "components/rich-text";
+import { npoId } from "../common/npo-id";
 export { default } from "./program";
 export { ErrorBoundary } from "components/error";
-export const loader: LoaderFunction = ({ params }) =>
-  getProgram(params.id, params.programId);
+export const loader: LoaderFunction = async ({ params }) => {
+  const id = await npoId(params.id);
+  if (typeof id !== "number") return id;
 
+  return getProgram(id, params.programId);
+};
 export const links: LinksFunction = () => [...richTextStyles];