From 4d2ad1034d0c37da4fb7b51596f566896afe6d9d Mon Sep 17 00:00:00 2001
From: chris <cwer542@gmail.com>
Date: Wed, 22 Oct 2025 02:57:25 +0200
Subject: [PATCH] Refactor subject resolver to use SubjectService; add tenant
 resolver for tenant data retrieval

---
 .../src/app/resolvers/subject.resolver.ts     |  8 +++----
 .../src/app/resolvers/tenantResolver.ts       | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 src/angular/frontend/src/app/resolvers/tenantResolver.ts

diff --git a/src/angular/frontend/src/app/resolvers/subject.resolver.ts b/src/angular/frontend/src/app/resolvers/subject.resolver.ts
index 27a7ca6..9d05963 100644
--- a/src/angular/frontend/src/app/resolvers/subject.resolver.ts
+++ b/src/angular/frontend/src/app/resolvers/subject.resolver.ts
@@ -1,15 +1,15 @@
 import {ResolveFn} from '@angular/router';
 import {inject} from '@angular/core';
-import {ProxyService} from '../clients/gandalf/mithrandir/proxy.service';
 import {map} from 'rxjs';
+import {SubjectService} from '../clients/gandalf/mithrandir/subject.service';
 
 export const subjectResolver: ResolveFn<string> = (route, state) => {
-  const proxyService = inject(ProxyService);
-  return proxyService.me$().pipe(
+  const subjectService = inject(SubjectService);
+  return subjectService.me$().pipe(
     map(x => {
-        console.log(x);
         return x.name;
       }
     )
   );
 };
+
diff --git a/src/angular/frontend/src/app/resolvers/tenantResolver.ts b/src/angular/frontend/src/app/resolvers/tenantResolver.ts
new file mode 100644
index 0000000..b5c4e7c
--- /dev/null
+++ b/src/angular/frontend/src/app/resolvers/tenantResolver.ts
@@ -0,0 +1,21 @@
+import {ResolveFn} from "@angular/router";
+import {TenantGridViewDto} from "../clients/gandalf/mithrandir/tenant/dtos/tenant-grid-view-dto";
+import {inject} from "@angular/core";
+import {TenantService} from "../clients/gandalf/mithrandir/tenant/tenant.service";
+import {map} from 'rxjs';
+
+export const tenantResolver: ResolveFn<TenantGridViewDto | null> = (route, state) => {
+  const tenantService = inject(TenantService);
+
+  const id = route.paramMap.get('id')
+
+  return tenantService.getTenant$(id);
+};
+
+export const tenantNameResolver: ResolveFn<string> = (route, state) => {
+  const tenantService = inject(TenantService);
+
+  const id = route.paramMap.get('id')
+
+  return tenantService.getTenant$(id).pipe(map(tenant => tenant?.name ?? 'Unnamed Tenant'));
+};