clean trpc #7

src/app/[rc_id]/conversations/[conv_id]/page.tsx

@@ -2,7 +2,7 @@ import { env } from "~/env";
 import { redirect } from "next/navigation";
 
 import { DummySendMessage } from "~/app/_components/dummy-send-message";
-import { api } from "~/lib/infrastructure/trpc/server";
+import { api } from "~/lib/infrastructure/server/trpc/server-api";
 import type AuthGatewayOutputPort from "~/lib/core/ports/secondary/auth-gateway-output-port";
 import serverContainer from "~/lib/infrastructure/server/config/ioc/server-container";
 import { GATEWAYS } from "~/lib/infrastructure/server/config/ioc/server-ioc-symbols";

src/app/[rc_id]/conversations/page.tsx

@@ -1,7 +1,7 @@
 import { env } from "~/env";
 import { redirect } from "next/navigation";
 import { ListConversationsPage } from "../../_components/list-conversations";
-import { api } from "~/lib/infrastructure/trpc/server";
+import { api } from "~/lib/infrastructure/server/trpc/server-api";
 import type AuthGatewayOutputPort from "~/lib/core/ports/secondary/auth-gateway-output-port";
 import serverContainer from "~/lib/infrastructure/server/config/ioc/server-container";
 import { GATEWAYS } from "~/lib/infrastructure/server/config/ioc/server-ioc-symbols";

src/app/[rc_id]/sources/page.tsx

@@ -1,6 +1,6 @@
 import { env } from "~/env";
 import { redirect } from "next/navigation";
-import { api } from "~/lib/infrastructure/trpc/server";
+import { api } from "~/lib/infrastructure/server/trpc/server-api";
 import type AuthGatewayOutputPort from "~/lib/core/ports/secondary/auth-gateway-output-port";
 import serverContainer from "~/lib/infrastructure/server/config/ioc/server-container";
 import { GATEWAYS } from "~/lib/infrastructure/server/config/ioc/server-ioc-symbols";

src/app/api/trpc/[trpc]/route.ts

@@ -2,8 +2,8 @@ import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 import { type NextRequest } from "next/server";
 
 import { env } from "~/env";
-import { appRouter } from "~/lib/infrastructure/server/config/trpc/root";
-import { createTRPCContext } from "~/lib/infrastructure/trpc/trpc";
+import { appRouter } from "~/lib/infrastructure/server/trpc/app-router";
+import { createTRPCContext } from "~/lib/infrastructure/server/trpc/server";
 
 /**
  * This wraps the `createTRPCContext` helper and provides the required context for the tRPC API when

src/app/page.tsx

@@ -2,10 +2,10 @@ import { env } from "~/env";
 import { redirect } from "next/navigation";
 import { ListResearchContextsPage } from "./_components/list-research-contexts";
 import type { ResearchContext } from "@maany_shr/kernel-planckster-sdk-ts";
-import { api } from "~/lib/infrastructure/trpc/server";
 import serverContainer from "~/lib/infrastructure/server/config/ioc/server-container";
 import type AuthGatewayOutputPort from "~/lib/core/ports/secondary/auth-gateway-output-port";
 import { GATEWAYS } from "~/lib/infrastructure/server/config/ioc/server-ioc-symbols";
+import { api } from "~/lib/infrastructure/server/trpc/server-api";
 export default async function Home() {
   const authGateway = serverContainer.get<AuthGatewayOutputPort>(GATEWAYS.AUTH_GATEWAY);
   const session = await authGateway.getSession();

src/app/sources/page.tsx

@@ -2,7 +2,7 @@ import { env } from "~/env";
 import { redirect } from "next/navigation";
 import { DummyUploadComponent } from "../_components/dummy-upload";
 import { DummyDownloadComponent } from "../_components/dummy-download";
-import { api } from "~/lib/infrastructure/trpc/server";
+import { api } from "~/lib/infrastructure/server/trpc/server-api";
 import type AuthGatewayOutputPort from "~/lib/core/ports/secondary/auth-gateway-output-port";
 import serverContainer from "~/lib/infrastructure/server/config/ioc/server-container";
 import { GATEWAYS } from "~/lib/infrastructure/server/config/ioc/server-ioc-symbols";

src/lib/infrastructure/client/trpc/react.tsx

@@ -8,7 +8,7 @@ import { loggerLink, unstable_httpBatchStreamLink } from "@trpc/client";
 import { createTRPCReact } from "@trpc/react-query";
 import { useState } from "react";
 import SuperJSON from "superjson";
-import type { AppRouter } from "~/lib/infrastructure/server/config/trpc/root";
+import type { AppRouter } from "~/lib/infrastructure/server/trpc/app-router";
 
 
 const createQueryClient = () => new QueryClient();

src/lib/infrastructure/server/config/auth/next-auth-credentials-provider.ts

@@ -22,7 +22,7 @@ export default class NextAuthCredentialsProvider {
                         id: env.KP_CLIENT_ID.toString() || "1",
                         name: username,
                         email: "planckster-example@mpi-sws.org",
-                        image: "https://cdn-icons-png.freepik.com/512/3177/3177440.png", // TODO: change this to the actual image
+                        image: "https://api.multiavatar.com/user.svg", // TODO: change this to the actual image
                         kp: {
                             client_id: env.KP_CLIENT_ID || 1,
                             auth_token: env.KP_AUTH_TOKEN

src/lib/infrastructure/server/trpc/app-router.ts

@@ -0,0 +1,26 @@
+import { postRouter } from "~/lib/infrastructure/server/trpc/routers/post";
+import { researchContextRouter } from "~/lib/infrastructure/server/trpc/routers/research-contexts";
+import { conversationRouter } from "~/lib/infrastructure/server/trpc/routers/conversations";
+import { messageRouter } from "~/lib/infrastructure/server/trpc/routers/messages";
+import { sourceDataRouter } from "~/lib/infrastructure/server/trpc/routers/source-data";
+import { kernelPlancksterHealthCheckRouter } from "./routers/health-check";
+import { createTRPCRouter } from "~/lib/infrastructure/server/trpc/server";
+
+
+/**
+ * This is the primary router for your server.
+ *
+ * All routers added in /api/routers should be manually added here.
+ */
+export const appRouter = createTRPCRouter({
+  post: postRouter,
+  researchContext: researchContextRouter,
+  conversation: conversationRouter,
+  message: messageRouter,
+  sourceData: sourceDataRouter,
+  healthCheck: kernelPlancksterHealthCheckRouter,
+});
+
+// export type definition of API
+export type AppRouter = typeof appRouter;
+

src/lib/infrastructure/server/config/trpc/context.ts → src/lib/infrastructure/server/trpc/context.ts

@@ -1,6 +1,6 @@
 import { headers } from "next/headers";
 import { cache } from "react";
-import { createTRPCContext } from "~/lib/infrastructure/trpc/trpc";
+import { createTRPCContext } from "~/lib/infrastructure/server/trpc/server";
 import { OpenAPI as KERNEL_PLANCKSTER_CONFIG } from "@maany_shr/kernel-planckster-sdk-ts";
 import { env } from "~/env";
 

src/lib/infrastructure/server/trpc-routers/conversations.ts → src/lib/infrastructure/server/trpc/routers/conversations.ts

@@ -1,9 +1,9 @@
 import { z } from "zod";
 
-import { createTRPCRouter, protectedProcedure } from "~/lib/infrastructure/trpc/trpc";
 
 import { ClientService as sdk } from "@maany_shr/kernel-planckster-sdk-ts";
 import { env } from "~/env";
+import { createTRPCRouter, protectedProcedure } from "~/lib/infrastructure/server/trpc/server";
 
 export const conversationRouter = createTRPCRouter({
     list: protectedProcedure

src/lib/infrastructure/server/trpc-routers/health-check.ts → src/lib/infrastructure/server/trpc/routers/health-check.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
-import { createTRPCRouter, publicProcedure } from '../../trpc/trpc';
 
 import { HealthCheckService as sdk } from '@maany_shr/kernel-planckster-sdk-ts';
+import { createTRPCRouter, publicProcedure } from '../server';
 
 export const kernelPlancksterHealthCheckRouter = createTRPCRouter({
     ping: publicProcedure

src/lib/infrastructure/server/trpc-routers/messages.ts → src/lib/infrastructure/server/trpc/routers/messages.ts

@@ -1,10 +1,10 @@
 import { z } from "zod";
 
-import { createTRPCRouter, protectedProcedure } from "~/lib/infrastructure/trpc/trpc";
 
 import { ClientService as sdk } from "@maany_shr/kernel-planckster-sdk-ts";
 import { env } from "~/env";
 import OpenAIGateway from "~/lib/infrastructure/server/gateway/openai-gateway";
+import { createTRPCRouter, protectedProcedure } from "../server";
 
 export const messageRouter = createTRPCRouter({
     list: protectedProcedure

src/lib/infrastructure/server/trpc-routers/post.ts → src/lib/infrastructure/server/trpc/routers/post.ts

@@ -1,10 +1,5 @@
 import { z } from "zod";
-
-import {
-  createTRPCRouter,
-  protectedProcedure,
-  publicProcedure,
-} from "~/lib/infrastructure/trpc/trpc";
+import { createTRPCRouter, publicProcedure, protectedProcedure } from "../server";
 
 let post = {
   id: 1,

src/lib/infrastructure/server/trpc-routers/research-contexts.ts → src/lib/infrastructure/server/trpc/routers/research-contexts.ts

@@ -1,13 +1,13 @@
 import { z } from "zod";
 
-import { createTRPCRouter, protectedProcedure } from "~/lib/infrastructure/trpc/trpc";
 
 import { ClientService as sdk } from "@maany_shr/kernel-planckster-sdk-ts";
 import type { NewResearchContextViewModel } from "@maany_shr/kernel-planckster-sdk-ts";
 import { env } from "~/env";
 import type AuthGatewayOutputPort from "~/lib/core/ports/secondary/auth-gateway-output-port";
-import serverContainer from "../config/ioc/server-container";
-import { GATEWAYS } from "../config/ioc/server-ioc-symbols";
+import serverContainer from "../../config/ioc/server-container";
+import { GATEWAYS } from "../../config/ioc/server-ioc-symbols";
+import { createTRPCRouter, protectedProcedure } from "../server";
 
 export const researchContextRouter = createTRPCRouter({
   list: protectedProcedure

src/lib/infrastructure/server/trpc-routers/source-data.ts → src/lib/infrastructure/server/trpc/routers/source-data.ts

@@ -1,12 +1,12 @@
 import { z } from "zod";
 
-import { createTRPCRouter, protectedProcedure } from "~/lib/infrastructure/trpc/trpc";
 
 import { ClientService as sdk } from "@maany_shr/kernel-planckster-sdk-ts";
 
 import { downloadFile, uploadFile } from "~/lib/infrastructure/server/repository/file-repository";
 
 import { env } from "~/env";
+import { createTRPCRouter, protectedProcedure } from "../server";
 
 export const sourceDataRouter = createTRPCRouter({
     listForClient: protectedProcedure

src/lib/infrastructure/trpc/server.ts → src/lib/infrastructure/server/trpc/server-api.ts

@@ -2,9 +2,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import "server-only";
 
-import { createCallerFactory } from "./trpc";
-import { appRouter } from "../server/config/trpc/root";
-import createContext from "../server/config/trpc/context";
+import { appRouter } from "./app-router";
+import createContext from "./context";
+import { createCallerFactory } from "./server";
 
 /**
  * Create a server-side caller for the tRPC API.

src/lib/infrastructure/trpc/trpc.ts → src/lib/infrastructure/server/trpc/server.ts

@@ -10,8 +10,8 @@ import { initTRPC, TRPCError } from "@trpc/server";
 import superjson from "superjson";
 import { ZodError } from "zod";
 import type AuthGatewayOutputPort from "~/lib/core/ports/secondary/auth-gateway-output-port";
-import serverContainer from "../server/config/ioc/server-container";
-import { GATEWAYS } from "../server/config/ioc/server-ioc-symbols";
+import serverContainer from "~/lib/infrastructure/server/config/ioc/server-container";
+import { GATEWAYS } from "~/lib/infrastructure/server/config/ioc/server-ioc-symbols";
 
 
 /**