Multitenant capability

Christoph Henrici · Christoph Henrici · commit 44a3c0a92a3f · 2025-11-07T00:17:37.000+01:00
diff --git a/frontend/.env.development b/frontend/.env.development
@@ -1,3 +1,3 @@
-VITE_USE_MOCK=true
+VITE_USE_MOCK=false
 # If you want real backend in dev, flip to false and (optionally) set:
 VITE_BACKEND_URL=http://localhost:8080
diff --git a/frontend/src/api/clients.ts b/frontend/src/api/clients.ts
@@ -10,9 +10,9 @@ export type Client = v.InferOutput<typeof Client>
 const Clients = v.array(Client)
 
 export async function getClients() {
-	const response = await fetch('/clients')
+	const response = await fetch('/clients', {credentials: 'include'})
 	if (!response.ok) {
-		throw new Error('Failed to fetch')
+		throw new Error('Failed to fetch Clients')
 	}
 	return v.parse(Clients, await response.json())
 }
diff --git a/frontend/src/api/tenantInfo.ts b/frontend/src/api/tenantInfo.ts
@@ -0,0 +1,13 @@
+import * as v from 'valibot'
+
+const TenantInfo = v.object({
+	tenantDisplay: v.string(),
+	clientCount: v.optional(v.number())
+})
+export type TenantInfo = v.InferOutput<typeof TenantInfo>
+
+export async function getTenantInfo() {
+	const res = await fetch('/tenantInfo', { credentials: 'include' })
+	if (!res.ok) throw new Error(`Tenant load failed: ${res.status}`)
+	return v.parse(TenantInfo, await res.json())
+}
diff --git a/frontend/src/components/PageLayout.tsx b/frontend/src/components/PageLayout.tsx
@@ -1,5 +1,7 @@
 import type { ReactNode } from 'react'
 import { Head } from '@/components/Head' // your existing title helper
+import { TenantBadge } from '@/components/TenantBadge'
+
 
 interface PageLayoutProps {
   title: string
@@ -11,9 +13,12 @@ export function PageLayout({ title, children }: PageLayoutProps) {
     <div className="min-h-screen bg-gray-200 text-gray-900 flex flex-col">
       <Head title={title} />
       <main className="flex-1 container mx-auto p-6">{children}</main>
-      <footer className="text-sm text-gray-500 text-center py-4">
+
+      <footer className="text-sm text-gray-500 text-center py-4 flex items-center justify-center gap-3">
         © {new Date().getFullYear()} Christoph Henrici · Spring + React CRUD Demo
+        <span className="hidden sm:inline">·</span>
+        <TenantBadge />
       </footer>
     </div>
   )
-}
+}
diff --git a/frontend/src/components/TenantBadge.tsx b/frontend/src/components/TenantBadge.tsx
@@ -0,0 +1,16 @@
+import { getTenantInfo} from '@/api/tenantInfo'
+import { useSuspenseQuery } from '@tanstack/react-query'
+
+export function TenantBadge() {
+ const { data } = useSuspenseQuery({
+		queryFn: getTenantInfo,
+		queryKey: ['tenantInfo']
+	})
+  if (!data?.tenantDisplay) return null
+  return (
+    <span className="text-xs text-gray-500">
+      Workspace: <span className="font-mono">{data.tenantDisplay}</span>
+      {typeof data.clientCount === 'number' && <> · {data.clientCount} clients</>}
+    </span>
+  )
+}
diff --git a/frontend/src/mocks/data/clients.json b/frontend/src/mocks/data/clients.json
@@ -16,7 +16,7 @@
 	},
 	{
 		"id": 4,
-		"name": "Wtf",
+		"name": "Whatever Client",
 		"email": "fourth©example.com"
 	}
 	
diff --git a/frontend/src/mocks/handlers.ts b/frontend/src/mocks/handlers.ts
@@ -1,9 +1,30 @@
 import {delay, HttpResponse, http} from 'msw'
 import clients from './data/clients.json' with {type: 'json'}
 
+
 export const handlers = [
 	http.get('/clients', async () => {
 		await delay('real')
 		return HttpResponse.json(clients)
-	})
+	}),
+	http.get('/api/tenant', async () => {
+    await delay('real')
+    return HttpResponse.json({
+      tenantDisplay: getMockTenantDisplay(),
+      createdAt: new Date().toISOString(),
+      clientCount: 3 // or compute from your mock clients.json length
+    })
+  })
 ]
+// Persist a friendly token in *sessionStorage* to emulate a session-scoped tenant
+function getMockTenantDisplay(): string {
+  const k = 'mock-tenant-display'
+  let val = sessionStorage.getItem(k)
+  if (!val) {
+    val = crypto.randomUUID().slice(0, 8)
+    sessionStorage.setItem(k, val)
+  }
+  return val
+}
+
+ 
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
@@ -34,6 +34,10 @@ export default defineConfig(({ mode }) => {
                 target: BACKEND_URL,
                 changeOrigin: true,
               },
+              '/tenantInfo': {
+                target: BACKEND_URL,
+                changeOrigin: true,
+              },
             },
           }),
     },
diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-jdbc</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
diff --git a/src/main/java/ch/henr/reactboot/TenantContext.java b/src/main/java/ch/henr/reactboot/TenantContext.java
@@ -0,0 +1,10 @@
+package ch.henr.reactboot;
+
+// TenantContext.java
+public final class TenantContext {
+  private static final ThreadLocal<String> CUR = new ThreadLocal<>();
+  public static void set(String t){ CUR.set(t); }
+  public static String get(){ return CUR.get(); }
+  public static void clear(){ CUR.remove(); }
+  private TenantContext(){}
+}
diff --git a/src/main/java/ch/henr/reactboot/TenantFilter.java b/src/main/java/ch/henr/reactboot/TenantFilter.java
@@ -0,0 +1,39 @@
+package ch.henr.reactboot;
+
+import java.io.IOException;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
+// TenantFilter.java
+@Component
+public class TenantFilter extends OncePerRequestFilter {
+    @Override
+    protected void doFilterInternal(HttpServletRequest req, HttpServletResponse res, FilterChain chain)
+            throws ServletException, IOException {
+        try {
+            // Always create/keep a session, derive tenant from it
+            HttpSession session = req.getSession(true);
+            String tenant = (String) session.getAttribute("tenantId");
+            if (tenant == null) {
+                tenant = "sess:" + session.getId();
+                session.setAttribute("tenantId", tenant);
+            }
+            String display = (String) session.getAttribute("tenantDisplay");
+            if (display == null) {
+                display = java.util.UUID.randomUUID().toString().substring(0, 8);
+                session.setAttribute("tenantDisplay", display);
+            }
+            TenantContext.set(tenant);
+            chain.doFilter(req, res);
+        } finally {
+            TenantContext.clear();
+        }
+    }
+}
diff --git a/src/main/java/ch/henr/reactboot/controller/ClientsController.java b/src/main/java/ch/henr/reactboot/controller/ClientsController.java
@@ -4,6 +4,7 @@
 import java.net.URISyntaxException;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,50 +15,57 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import ch.henr.reactboot.db.ClientRepository;
 import ch.henr.reactboot.model.Client;
-
+import ch.henr.reactboot.service.ClientsService;
 
 @RestController
 @RequestMapping(value = "/clients")
 public class ClientsController {
 
-    private final ClientRepository clientRepository;
+    @Autowired
+    private ClientsService clientsService;
 
-    public ClientsController(ClientRepository clientRepository) {
-        this.clientRepository = clientRepository;
+    public ClientsController(ClientsService clientsService) {
+        this.clientsService = clientsService;
     }
 
     @GetMapping
     public List<Client> getClients() {
-        var clients = clientRepository.findAll();
+        var clients = clientsService.list();
+        if (clients.isEmpty()) {
+            clientsService.save(new Client(null, "First Example Client", "first@example.com", null));
+            clientsService.save(new Client(null, "Second Example Client", "second@example.com", null));
+            clients = clientsService.list();
+        }
+
         return clients;
     }
 
     @GetMapping("/{id}")
     public Client getClient(@PathVariable Long id) {
-        var client = clientRepository.findById(id).orElseThrow(RuntimeException::new);
-        return client;   }
+        var client = clientsService.findById(id);
+        return client;
+    }
 
     @PostMapping
     public ResponseEntity<Client> createClient(@RequestBody Client client) throws URISyntaxException {
-        Client savedClient = clientRepository.save(client);
+        Client savedClient = clientsService.save(client);
         return ResponseEntity.created(new URI("/clients/" + savedClient.getId())).body(savedClient);
     }
 
     @PutMapping("/{id}")
     public ResponseEntity<Client> updateClient(@PathVariable Long id, @RequestBody Client client) {
-        Client currentClient = clientRepository.findById(id).orElseThrow(RuntimeException::new);
+        Client currentClient = clientsService.findById(id);
         currentClient.setName(client.getName());
         currentClient.setEmail(client.getEmail());
-        currentClient = clientRepository.save(currentClient);
+        currentClient = clientsService.save(currentClient);
 
         return ResponseEntity.ok(currentClient);
     }
 
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteClient(@PathVariable Long id) {
-        clientRepository.deleteById(id);
+        clientsService.delete(id);
         return ResponseEntity.ok().build();
     }
 }
diff --git a/src/main/java/ch/henr/reactboot/controller/TenantController.java b/src/main/java/ch/henr/reactboot/controller/TenantController.java
@@ -0,0 +1,43 @@
+package ch.henr.reactboot.controller;
+
+import jakarta.servlet.http.HttpSession;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.annotation.JsonClassDescription;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import ch.henr.reactboot.db.ClientRepository;
+
+import java.time.Instant;
+import java.util.UUID;
+
+@RestController
+@RequestMapping("/tenantInfo")
+public class TenantController {
+
+    record TenantInfo(String tenantDisplay, long clientCount) {
+    }
+
+    private final ClientRepository repo;
+
+    public TenantController(ClientRepository repo) {
+        this.repo = repo;
+    }
+
+    @GetMapping
+    public TenantInfo info(HttpSession session) {
+        String display = (String) session.getAttribute("tenantDisplay");
+        Instant createdAt = (Instant) session.getAttribute("tenantCreated");
+
+        if (display == null) {
+            display = UUID.randomUUID().toString().substring(0, 8);
+            createdAt = Instant.now();
+            session.setAttribute("tenantDisplay", display);
+            session.setAttribute("tenantCreated", createdAt);
+        }
+        long count = repo.count(); // total clients for this tenant/session
+        return new TenantInfo(display, count);
+    }
+}
diff --git a/src/main/java/ch/henr/reactboot/db/ClientRepository.java b/src/main/java/ch/henr/reactboot/db/ClientRepository.java
@@ -1,8 +1,17 @@
 package ch.henr.reactboot.db;
 
+import java.util.List;
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import ch.henr.reactboot.model.Client;
-
 public interface ClientRepository extends JpaRepository<Client, Long> {
+  @Query("select c from Client c where c.tenantId = :tenant")
+  List<Client> findAllByTenant(@Param("tenant") String tenant);
+
+  @Query("select c from Client c where c.tenantId = :tenant and c.id = :id")
+  Optional<Client> findByTenantAndId(@Param("tenant") String tenant, @Param("id") Long id);
 }
diff --git a/src/main/java/ch/henr/reactboot/db/FilterOrderConfig.java b/src/main/java/ch/henr/reactboot/db/FilterOrderConfig.java
@@ -0,0 +1,17 @@
+package ch.henr.reactboot.db;
+
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import ch.henr.reactboot.TenantFilter;
+
+@Configuration
+public class FilterOrderConfig {
+  @Bean
+  public FilterRegistrationBean<TenantFilter> tenantFilterRegistration(TenantFilter f) {
+    var reg = new FilterRegistrationBean<>(f);
+    reg.setOrder(0);
+    return reg;
+  }
+}
diff --git a/src/main/java/ch/henr/reactboot/model/Client.java b/src/main/java/ch/henr/reactboot/model/Client.java
diff --git a/src/main/java/ch/henr/reactboot/service/ClientsService.java b/src/main/java/ch/henr/reactboot/service/ClientsService.java
diff --git a/src/main/java/ch/henr/reactboot/service/ClientsServiceImpl.java b/src/main/java/ch/henr/reactboot/service/ClientsServiceImpl.java
diff --git a/src/main/java/ch/henr/reactboot/setup/DataInitializer.java b/src/main/java/ch/henr/reactboot/setup/DataInitializer.java
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ export type Client = v.InferOutput<typeof Client>`
`10`	`10`	`const Clients = v.array(Client)`
`11`	`11`
`12`	`12`	`export async function getClients() {`
`13`		`- const response = await fetch('/clients')`
	`13`	`+ const response = await fetch('/clients', {credentials: 'include'})`
`14`	`14`	`if (!response.ok) {`
`15`		`- throw new Error('Failed to fetch')`
	`15`	`+ throw new Error('Failed to fetch Clients')`
`16`	`16`	`}`
`17`	`17`	`return v.parse(Clients, await response.json())`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`},`
`17`	`17`	`{`
`18`	`18`	`"id": 4,`
`19`		`- "name": "Wtf",`
	`19`	`+ "name": "Whatever Client",`
`20`	`20`	`"email": "fourth©example.com"`
`21`	`21`	`}`
`22`	`22`