SAVE

apps/e2e/features/exchanges/studient_filters.feature

@@ -0,0 +1,12 @@
+#language: fr
+Fonctionnalité: Posez une question
+
+  Scénario: Poser une question sur le forum
+    Soit une base de données nourrie au grain
+    * je navigue sur la page
+    * je me connecte en tant que "[email protected]"
+    * je clique sur "Échanges"
+    * je vois dans le titre "Exchange :: Serkels"
+
+    Quand je clique sur "Mes cercles"
+    Alors je vois "P'tit pause café avec l'ami Jackie"

apps/www/app/(main)/exchanges/layout.tsx

@@ -1,6 +1,7 @@
 ///
 
 import { AsideFilter } from ":components/shell/AsideFilter";
+import { TrpcRootProvider } from ":trpc/root";
 import { Exchanges_Filter } from ":widgets/exchanges/filter";
 import { SearchForm } from ":widgets/exchanges/list";
 import { Grid } from "@1.ui/react/grid";
@@ -27,10 +28,12 @@ export default async function Layout({
 
         {categories}
       </AsideFilter>
-      <div className="col-span-full md:col-span-6 md:my-10">{children}</div>
-      {/* <aside className="mt-10 hidden xl:col-span-3 xl:block xl:px-10">
+      <TrpcRootProvider>
+        <div className="col-span-full md:col-span-6 md:my-10">{children}</div>
+      </TrpcRootProvider>
+      <aside className="mt-10 hidden xl:col-span-3 xl:block xl:px-10">
         {see_also}
-      </aside> */}
+      </aside>
     </Grid>
   );
 }

apps/www/app/(main)/exchanges/page.tsx

@@ -1,5 +1,6 @@
 //
 
+import { TrpcRootProvider } from ":trpc/root";
 import { TRPC_Hydrate } from ":trpc/server";
 import { List } from ":widgets/exchanges/list";
 import { trpc_server } from "@1.infra/trpc/react-query/server";
@@ -50,13 +51,15 @@ export default async function Page({
   });
 
   return (
-    <TRPC_Hydrate>
-      <main>
-        <NewExchangeSection />
+    <TrpcRootProvider>
+      <TRPC_Hydrate>
+        <main>
+          <NewExchangeSection />
 
-        <List key="list" />
-      </main>
-    </TRPC_Hydrate>
+          <List key="list" />
+        </main>
+      </TRPC_Hydrate>
+    </TrpcRootProvider>
   );
 }
 

apps/www/app/(main)/navbar.tsx

@@ -6,6 +6,7 @@ import {
   Notification_DotIndicator,
 } from ":components/navbar/notification_indicator.client";
 import { MobileNavBar } from ":components/shell/MobileNavBar";
+import { TrpcRootProvider } from ":trpc/root";
 import { TRPC_SSR } from ":trpc/server";
 import { auth } from "@1.modules/auth.next";
 import { PROFILE_ROLES, type AuthProfile } from "@1.modules/profile.domain";
@@ -32,8 +33,9 @@ export default function UserBar() {
         </figure>
 
         <MobileNavBar className="left-0 right-0 z-50 hidden h-16 sm:z-auto sm:col-auto sm:h-full md:col-span-4 md:block xl:col-span-6 sm:[&>ul]:w-full lg:[&>ul]:w-auto" />
-
-        <UserNavGroup className="h-full md:col-span-2 xl:col-span-3" />
+        <TrpcRootProvider>
+          <UserNavGroup className="h-full md:col-span-2 xl:col-span-3" />
+        </TrpcRootProvider>
       </Grid>
     </header>
   );

apps/www/components/shell/RootProviders.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { LegalProvider } from ":components/terms/context";
-import { TrpcRootProvider } from ":trpc/root";
+import { TrpcProvider } from ":trpc/client";
 import { SessionProvider } from "@1.modules/auth.next/react";
 import { useMediaQuery } from "@react-hookz/web";
 import {
@@ -27,7 +27,7 @@ export function RootProviders({ children }: PropsWithChildren) {
       <LegalProvider>
         <AuthSessionProvider>
           <ReactQueryClientProvider>
-            <TrpcRootProvider>{children}</TrpcRootProvider>
+            <TrpcProvider>{children}</TrpcProvider>
           </ReactQueryClientProvider>
         </AuthSessionProvider>
       </LegalProvider>

apps/www/widgets/exchanges/card/actions.tsx

@@ -1,6 +1,6 @@
 //
 
-import { TRPC_React } from ":trpc/client";
+import { trpc_client } from "@1.infra/trpc/react-query/client";
 import { useSession } from "@1.modules/auth.next/react";
 import { Exchange_TypeSchema, type Exchange } from "@1.modules/exchange.domain";
 import { Exchange_Ask_Modal } from "@1.modules/exchange.ui/ask/modal";
@@ -32,7 +32,7 @@ export function Exchange_Actions() {
 
 function Exchange_Action_Ask(exchange: Exchange) {
   const { is_studient } = useExchangeMeta();
-  const query = TRPC_React.exchanges.me.deal_by_exchange_id.useQuery(
+  const query = trpc_client.exchanges.me.deal_by_exchange_id.useQuery(
     exchange.id,
     { enabled: is_studient },
   );

apps/www/widgets/exchanges/card/bookmark.tsx

@@ -1,7 +1,7 @@
 //
 
 import { AppToastOptions } from ":components/toast";
-import { TRPC_React } from ":trpc/client";
+import { trpc_client } from "@1.infra/trpc/react-query/client";
 import { useSession } from "@1.modules/auth.next/react";
 import type { BookmarkButton_Props } from "@1.modules/bookmark.ui/BookmarkButton";
 import { useExchange } from "@1.modules/exchange.ui/Card/context";
@@ -21,7 +21,7 @@ export function Exchange_Bookmark() {
   const { data: session } = useSession();
 
   const is_student = session?.profile.role === PROFILE_ROLES.Enum.STUDENT;
-  const query = TRPC_React.bookmarks.check.useQuery(
+  const query = trpc_client.bookmarks.check.useQuery(
     {
       target_id: exchange.id,
       type: "exchange",
@@ -54,8 +54,8 @@ export function Exchange_Bookmark() {
 
 function BookmarkItem_Toggle_Mutation(props: BookmarkButton_Props) {
   const { className, target_id, type, variants } = props;
-  const toggle = TRPC_React.bookmarks.toggle.useMutation();
-  const utils = TRPC_React.useUtils();
+  const toggle = trpc_client.bookmarks.toggle.useMutation();
+  const utils = trpc_client.useUtils();
   const { base, icon } = style({ ...variants });
   return (
     <button

apps/www/widgets/exchanges/card/index.tsx

@@ -2,7 +2,7 @@
 
 import { ReactMarkdown } from ":components/markdown";
 import { AppToastOptions } from ":components/toast";
-import { TRPC_React } from ":trpc/client";
+import { trpc_client } from "@1.infra/trpc/react-query/client";
 import type { Exchange } from "@1.modules/exchange.domain";
 import { Card } from "@1.modules/exchange.ui/Card/Card";
 import { Card_Deleting } from "@1.modules/exchange.ui/Card/Card_Deleting";
@@ -72,11 +72,11 @@ function Card_Outlet({ children }: PropsWithChildren) {
 
 function Deleting({ children }: PropsWithChildren) {
   const { id: exchange_id } = useExchange();
-  const utils = TRPC_React.useUtils();
-  const delete_exchange = TRPC_React.exchanges.me.delete.useMutation();
+  const utils = trpc_client.useUtils();
+  const delete_exchange = trpc_client.exchanges.me.delete.useMutation();
 
   useTimeoutEffect(async () => {
-    await delete_exchange.mutateAsync(exchange_id);
+    await delete_exchange.mutateAsync({ exchange_id });
 
     await Promise.all([
       utils.exchanges.by_id.invalidate(exchange_id),

apps/www/widgets/exchanges/list/List.tsx

@@ -115,18 +115,14 @@ function Item({ id }: Entity) {
 
 //
 
-function useQueryExchangeById(id: string) {
-  return trpc_client.exchanges.by_id.useQuery(id);
-}
-
 function Exchange_byId({
   children,
   id,
 }: {
   id: string;
   children: (exchange: Exchange) => ReactNode;
 }) {
-  const info = useQueryExchangeById(id);
+  const info = trpc_client.exchanges.by_id.useQuery(id);
   return (
     <Exchange_AsyncCard
       info={info as ComponentProps<typeof Exchange_AsyncCard>["info"]}

packages/@1/modules/auth/api/src/index.ts

@@ -2,8 +2,8 @@
 
 import { mergeRouters } from "@1.modules/trpc";
 import signup_router from "./signup";
-import verify_router from "./verify";
+import { verify_api_router } from "./verify";
 
 //
 
-export default mergeRouters(signup_router, verify_router);
+export default mergeRouters(signup_router, verify_api_router);

packages/@1/modules/auth/api/src/verify/index.ts

@@ -1,17 +1,3 @@
 //
 
-import { procedure, router } from "@1.modules/trpc";
-import { z } from "zod";
-
-//
-
-export default router({
-  verify: procedure
-    .input(z.object({ email: z.string() }))
-    .mutation(async ({ ctx: { prisma }, input: { email } }) => {
-      return prisma.user.findUnique({
-        select: { id: true },
-        where: { email },
-      });
-    }),
-});
+export { default as verify_api_router } from "./verify";

packages/@1/modules/auth/api/src/verify/verify.e2e.test.ts

@@ -4,7 +4,7 @@ import { create_douglas_student } from "@1.infra/database/seeding";
 import prisma, { empty_database, migrate } from "@1.infra/database/testing";
 import { createCallerFactory } from "@1.modules/trpc";
 import { beforeAll, expect, test } from "bun:test";
-import verify_router from "./index";
+import verify_router from "./verify";
 
 //
 

packages/@1/modules/auth/api/src/verify/verify.ts

@@ -0,0 +1,17 @@
+//
+
+import { procedure, router } from "@1.modules/trpc";
+import { z } from "zod";
+
+//
+
+export default router({
+  verify: procedure
+    .input(z.object({ email: z.string() }))
+    .mutation(async ({ ctx: { prisma }, input: { email } }) => {
+      return prisma.user.findUnique({
+        select: { id: true },
+        where: { email },
+      });
+    }),
+});

packages/@1/modules/bookmark/api/package.json

@@ -29,6 +29,7 @@
   },
   "devDependencies": {
     "@1.config/typescript": "workspace:*",
+    "@1.infra/database": "workspace:*",
     "@types/node": "22.8.1",
     "typescript": "5.6.3"
   }

packages/@1/modules/bookmark/api/src/check/check.e2e.test.ts

@@ -0,0 +1,66 @@
+//
+
+import {
+  create_douglas_student,
+  create_film_category,
+  create_the_creator_exchange,
+} from "@1.infra/database/seeding";
+import prisma, { empty_database, migrate } from "@1.infra/database/testing";
+import { createCallerFactory } from "@1.modules/trpc";
+import { douglas_student_session } from "@1.modules/trpc/testing";
+import { afterEach, beforeAll, beforeEach, expect, test } from "bun:test";
+import api_router from "./check";
+
+//
+
+beforeAll(empty_database);
+beforeAll(migrate);
+
+//
+
+test("return false when an exchange is not bookmarked", async () => {
+  const caller = createCallerFactory(api_router);
+  const trpc = caller({
+    auth: () => douglas_student_session,
+    prisma,
+  } as any);
+  const data = await trpc.check({
+    target_id: "the_creator_exchange_id",
+    type: "exchange",
+  });
+  expect(data).toBeFalse();
+});
+
+test("return true when an exchange is bookmarked", async () => {
+  const caller = createCallerFactory(api_router);
+  const trpc = caller({
+    auth: () => douglas_student_session,
+    prisma,
+  } as any);
+
+  await prisma.bookmark.create({
+    data: {
+      owner_id: "douglas_profile_id",
+      exchange_id: "the_creator_exchange_id",
+    },
+  });
+
+  const data = await trpc.check({
+    target_id: "the_creator_exchange_id",
+    type: "exchange",
+  });
+  expect(data).toBeTrue();
+});
+
+//
+
+beforeEach(async function seed() {
+  await create_douglas_student(prisma);
+  await create_film_category(prisma);
+  await create_the_creator_exchange(prisma, "douglas_student_id");
+});
+
+afterEach(async function empty_delete_entries() {
+  await prisma.category.deleteMany();
+  await prisma.user.deleteMany();
+});

packages/@1/modules/bookmark/api/src/check/check.ts

@@ -0,0 +1,32 @@
+//
+
+import { Bookmark_Category } from "@1.modules/bookmark.domain";
+import { router } from "@1.modules/trpc";
+import { match } from "ts-pattern";
+import { z } from "zod";
+import { bookmark_type_procedure } from "../procedure";
+
+//
+
+export default router({
+  check: bookmark_type_procedure
+    .input(z.object({ target_id: z.string() }))
+    .query(async ({ ctx: { prisma, session }, input: { target_id, type } }) => {
+      const { id: owner_id } = session.profile;
+
+      const where = match(type)
+        .with(Bookmark_Category.Enum.exchange, () => ({
+          exchange_id: target_id,
+        }))
+        .with(Bookmark_Category.Enum.opportunity, () => ({
+          opportunity_id: target_id,
+        }))
+        .exhaustive();
+
+      const count = await prisma.bookmark.count({
+        where: { owner_id, ...where },
+      });
+
+      return count === 1;
+    }),
+});

packages/@1/modules/bookmark/api/src/check/index.ts

@@ -0,0 +1,3 @@
+//
+
+export { default as check_api_router } from "./check";