redone routes

src/routes/admin.ts

@@ -1,94 +1,117 @@
 import { FastifyInstance } from "fastify";
+import { eq } from "drizzle-orm";
+
+import {
+    authTenantUsers,
+    authUsers,
+    tenants,
+} from "../../db/schema";
 
 export default async function adminRoutes(server: FastifyInstance) {
+
+    // -------------------------------------------------------------
+    // POST /admin/add-user-to-tenant
+    // -------------------------------------------------------------
     server.post("/admin/add-user-to-tenant", async (req, reply) => {
-        const body = req.body as {
-            user_id: string;
-            tenant_id: string;
-            role?: string;
-            mode?: "single" | "multi";
-        };
+        try {
+            const body = req.body as {
+                user_id: string;
+                tenant_id: number;
+                role?: string;
+                mode?: "single" | "multi";
+            };
 
-        if (!body.user_id || !body.tenant_id) {
-            return reply.code(400).send({ error: "user_id and tenant_id required" });
+            if (!body.user_id || !body.tenant_id) {
+                return reply.code(400).send({
+                    error: "user_id and tenant_id required"
+                });
+            }
+
+            const mode = body.mode ?? "multi";
+
+            // ----------------------------
+            // SINGLE MODE → alte Verknüpfungen löschen
+            // ----------------------------
+            if (mode === "single") {
+                await server.db
+                    .delete(authTenantUsers)
+                    .where(eq(authTenantUsers.user_id, body.user_id));
+            }
+
+            // ----------------------------
+            // Neue Verknüpfung hinzufügen
+            // ----------------------------
+
+            await server.db
+                .insert(authTenantUsers)
+                // @ts-ignore
+                .values({
+                    user_id: body.user_id,
+                    tenantId: body.tenant_id,
+                    role: body.role ?? "member",
+                });
+
+            return { success: true, mode };
+
+        } catch (err) {
+            console.error("ERROR /admin/add-user-to-tenant:", err);
+            return reply.code(500).send({ error: "Internal Server Error" });
         }
-
-        // Default: "multi"
-        const mode = body.mode ?? "multi";
-
-        if (mode === "single") {
-            // Erst alle alten Verknüpfungen löschen
-            await server.supabase
-                .from("auth_tenant_users")
-                .delete()
-                .eq("user_id", body.user_id);
-        }
-
-        const { error } = await server.supabase
-        .from("auth_tenant_users")
-        .insert({
-            tenant_id: body.tenant_id,
-            user_id: body.user_id,
-            role: body.role ?? "member",
-        });
-
-        if (error) {
-            return reply.code(400).send({ error: error.message });
-        }
-
-        // Neuen Eintrag setzen
-
-
-        return { success: true, mode };
     });
 
-    /**
-     * Alle Tenants eines Users abfragen
-     */
+
+    // -------------------------------------------------------------
+    // GET /admin/user-tenants/:user_id
+    // -------------------------------------------------------------
     server.get("/admin/user-tenants/:user_id", async (req, reply) => {
-        const { user_id } = req.params as { user_id: string };
+        try {
+            const { user_id } = req.params as { user_id: string };
 
-        if (!user_id) {
-            return reply.code(400).send({ error: "user_id required" });
+            if (!user_id) {
+                return reply.code(400).send({ error: "user_id required" });
+            }
+
+            // ----------------------------
+            // 1) User existiert?
+            // ----------------------------
+            const [user] = await server.db
+                .select()
+                .from(authUsers)
+                .where(eq(authUsers.id, user_id))
+                .limit(1);
+
+            if (!user) {
+                return reply.code(400).send({ error: "faulty user_id presented" });
+            }
+
+            // ----------------------------
+            // 2) Tenants Join über auth_tenant_users
+            // ----------------------------
+            const tenantRecords = await server.db
+                .select({
+                    id: tenants.id,
+                    name: tenants.name,
+                    short: tenants.short,
+                    locked: tenants.locked,
+                    numberRanges: tenants.numberRanges,
+                    extraModules: tenants.extraModules,
+                })
+                .from(authTenantUsers)
+                .innerJoin(
+                    tenants,
+                    eq(authTenantUsers.tenant_id, tenants.id)
+                )
+                .where(eq(authTenantUsers.user_id, user_id));
+
+            return {
+                user_id,
+                tenants: tenantRecords,
+            };
+
+        } catch (err) {
+            console.error("ERROR /admin/user-tenants:", err);
+            return reply.code(500).send({ error: "Internal Server Error" });
         }
-
-        const {data:user, error: userError} = await server.supabase.from("auth_users").select("*,tenants(*)").eq("id", user_id).single();
-
-        console.log(userError)
-        console.log(user)
-
-        if(!user) {
-            return reply.code(400).send({ error: "faulty user_id presented" });
-        } else {
-            return { user_id, tenants: user.tenants };
-        }
-
     });
 
-    /**
-     * Alle User eines Tenants abfragen
-     * TODO: Aktuell nur Multi Tenant
-     */
-    /*server.get("/admin/tenant-users/:tenant_id", async (req, reply) => {
-        const { tenant_id } = req.params as { tenant_id: string };
-
-        if (!tenant_id) {
-            return reply.code(400).send({ error: "tenant_id required" });
-        }
-
-        const { data, error } = await server.supabase
-            .from("auth_tenant_users")
-            .select(`
-        user_id,
-        role,
-        users ( id, email, created_at )
-      `)
-            .eq("tenant_id", tenant_id);
-
-        if (error) {
-            return reply.code(400).send({ error: error.message });
-        }
-
-        return { tenant_id, users: data };
-    });*/
-}
+}