Refactor volunteer and workshop routers to improve structure and error handling

- Moved volunteer-related queries and mutations under an 'admin' router for better organization.
- Simplified error handling in volunteer queries and mutations.
- Updated workshop router to include pagination in signups retrieval and improved error messages.
- Added batch confirmation and cancellation of workshop signups with detailed success/failure reporting.
- Enhanced manual signup process with checks for existing signups and workshop capacity.
- Updated registration time management with validation and revalidation of tags.

Author: Starefossen

__tests__/api/trpc/volunteer.test.ts

@@ -132,15 +132,15 @@ describe('volunteer router', () => {
   describe('list', () => {
     it('should reject unauthenticated requests', async () => {
       const caller = createAnonymousCaller()
-      await expect(caller.volunteer.list()).rejects.toMatchObject({
+      await expect(caller.volunteer.admin.list()).rejects.toMatchObject({
         code: 'UNAUTHORIZED',
       })
     })
 
     it('should reject non-admin users', async () => {
       const regularUser = speakers.find((s) => !s.isOrganizer)!
       const caller = createAuthenticatedCaller(regularUser._id)
-      await expect(caller.volunteer.list()).rejects.toMatchObject({
+      await expect(caller.volunteer.admin.list()).rejects.toMatchObject({
         code: 'FORBIDDEN',
       })
     })
@@ -151,7 +151,7 @@ describe('volunteer router', () => {
       const regularUser = speakers.find((s) => !s.isOrganizer)!
       const caller = createAuthenticatedCaller(regularUser._id)
       await expect(
-        caller.volunteer.getById({ id: 'vol-1' }),
+        caller.volunteer.admin.getById({ id: 'vol-1' }),
       ).rejects.toMatchObject({ code: 'FORBIDDEN' })
     })
 
@@ -163,7 +163,7 @@ describe('volunteer router', () => {
 
       const caller = createAdminCaller()
       await expect(
-        caller.volunteer.getById({ id: 'nonexistent' }),
+        caller.volunteer.admin.getById({ id: 'nonexistent' }),
       ).rejects.toMatchObject({ code: 'NOT_FOUND' })
     })
 
@@ -178,7 +178,7 @@ describe('volunteer router', () => {
       })
 
       const caller = createAdminCaller()
-      const result = await caller.volunteer.getById({ id: 'vol-1' })
+      const result = await caller.volunteer.admin.getById({ id: 'vol-1' })
       expect(result._id).toBe('vol-1')
     })
   })
@@ -196,7 +196,7 @@ describe('volunteer router', () => {
 
       const caller = createAdminCaller()
       await expect(
-        caller.volunteer.sendEmail({
+        caller.volunteer.admin.sendEmail({
           volunteerId: 'vol-1',
           subject: 'Welcome',
           message: 'Congrats',

docs/TRPC_SERVER_ARCHITECTURE.md

@@ -13,19 +13,19 @@ src/
 ├── server/
 │   ├── _app.ts            # Root router composing all feature routers
 │   ├── routers/            # tRPC route definitions (13 routers)
-│   │   ├── badge.ts        # OpenBadges management
-│   │   ├── featured.ts     # Featured talks & speakers
-│   │   ├── gallery.ts      # Photo gallery
-│   │   ├── proposal.ts     # CFP proposals + admin sub-router
+│   │   ├── badge.ts        # OpenBadges verification + admin sub-router
+│   │   ├── featured.ts     # Featured talks & speakers (admin sub-router)
+│   │   ├── gallery.ts      # Photo gallery + admin sub-router
+│   │   ├── proposal.ts     # CFP proposals + admin & invitation sub-routers
 │   │   ├── registration.ts # Attendee registration
 │   │   ├── schedule.ts     # Schedule management
 │   │   ├── signing.ts      # Contract signing
-│   │   ├── speaker.ts      # Speaker profiles, email, CLI auth + admin sub-router
-│   │   ├── sponsor.ts      # Sponsors, tiers, CRM, email + admin sub-routers
-│   │   ├── tickets.ts      # Ticket management
-│   │   ├── travelSupport.ts # Travel support applications
-│   │   ├── volunteer.ts    # Volunteer signups
-│   │   └── workshop.ts     # Workshop management
+│   │   ├── speaker.ts      # Speaker profiles + admin sub-router
+│   │   ├── sponsor.ts      # Sponsors + tiers, crm, emailTemplates, contractTemplates sub-routers
+│   │   ├── tickets.ts      # Ticket management (admin sub-router)
+│   │   ├── travelSupport.ts # Travel support + admin sub-router
+│   │   ├── volunteer.ts    # Volunteer signups + admin sub-router
+│   │   └── workshop.ts     # Workshop management + admin sub-router
 │   ├── schemas/            # Zod validation schemas
 │   │   ├── common.ts       # Shared schemas (IdParamSchema, etc.)
 │   │   ├── speaker.ts      # Speaker input/update schemas
@@ -50,16 +50,13 @@ src/
 
 ### Router Organization
 
-One router per domain, registered in `src/server/_app.ts`. Use sub-routers for scoped operations:
+One router per domain, registered in `src/server/_app.ts`. All routers with admin operations use a standardized `admin` sub-router to separate organizer-only procedures from user-facing ones:
 
 ```typescript
 export const speakerRouter = router({
-  // Top-level: user-facing procedures (protectedProcedure)
+  // Top-level: user-facing procedures (protectedProcedure / publicProcedure)
   getCurrent: protectedProcedure.query(...),
   update: protectedProcedure.input(SpeakerInputSchema).mutation(...),
-  getEmails: protectedProcedure.query(...),
-  updateEmail: protectedProcedure.input(EmailUpdateSchema).mutation(...),
-  generateCliToken: protectedProcedure.mutation(...),
 
   // admin sub-router: organizer-only operations (adminProcedure)
   admin: router({
@@ -70,26 +67,27 @@ export const speakerRouter = router({
     update: adminProcedure.input(...).mutation(...),
     delete: adminProcedure.input(IdParamSchema).mutation(...),
     sendEmail: adminProcedure.input(...).mutation(...),
-    broadcastEmail: adminProcedure.input(...).mutation(...),
-    syncAudience: adminProcedure.mutation(...),
   }),
 })
 ```
 
+**All 10 routers with admin procedures use this pattern:** badge, featured, gallery, proposal, speaker, tickets, travelSupport, volunteer, workshop. The sponsor router uses domain-specific sub-routers (tiers, crm, emailTemplates, contractTemplates) instead. Three routers stay flat: registration (2 admin ops), signing (0 admin), schedule (1 admin).
+
 ### Naming Conventions
 
 **Routers** — singular noun, camelCase: `speaker`, `proposal`, `sponsor`, `travelSupport`.
 
 **Sub-routers** — group related operations under a descriptive key:
 
-| Pattern          | Example                       | Purpose                            |
-| ---------------- | ----------------------------- | ---------------------------------- |
-| `admin`          | `speaker.admin.list`          | Organizer-only CRUD and management |
-| `crm`            | `sponsor.crm.sendEmail`       | CRM-specific operations            |
-| `tiers`          | `sponsor.tiers.create`        | Domain sub-entity management       |
-| `invitation`     | `proposal.invitation.send`    | Feature-specific workflows         |
-| `activities`     | `sponsor.crm.activities.list` | Nested sub-entities                |
-| `emailTemplates` | `sponsor.emailTemplates.list` | Configuration management           |
+| Pattern             | Example                          | Purpose                            |
+| ------------------- | -------------------------------- | ---------------------------------- |
+| `admin`             | `speaker.admin.list`             | Organizer-only CRUD and management |
+| `crm`               | `sponsor.crm.sendEmail`          | CRM-specific operations            |
+| `tiers`             | `sponsor.tiers.create`           | Domain sub-entity management       |
+| `invitation`        | `proposal.invitation.send`       | Feature-specific workflows         |
+| `activities`        | `sponsor.crm.activities.list`    | Nested sub-entities                |
+| `emailTemplates`    | `sponsor.emailTemplates.list`    | Configuration management           |
+| `contractTemplates` | `sponsor.contractTemplates.list` | Template management                |
 
 **Procedures** — use verb or verb+noun, camelCase:
 
@@ -457,7 +455,7 @@ When migrating a REST route to tRPC:
 
 1. **Read the route handler** — identify auth checks, input parsing, business logic, response shape
 2. **Pick the right router** — add to existing feature router, not a new one
-3. **Pick the right sub-router** — `admin` for organizer ops, domain-specific (`crm`, `tiers`) for grouped features
+3. **Pick the right sub-router** — `admin` for organizer ops (standardized across all routers), domain-specific (`crm`, `tiers`) only for sponsor
 4. **Choose procedure type** — `adminProcedure` for organizer-only, `protectedProcedure` for authenticated users
 5. **Convert input validation** — `req.body` → Zod schema in `.input()`. Do not use `.passthrough()` on schemas that feed typed interfaces
 6. **Handle service return types** — if the existing service returns `Response` objects (REST-oriented), check `.ok` and throw `TRPCError` on failure

src/app/(admin)/admin/marketing/featured/page.tsx

@@ -14,7 +14,7 @@ export default function AdminFeaturedPage() {
     data: summary,
     isLoading: summaryLoading,
     error: summaryError,
-  } = api.featured.summary.useQuery()
+  } = api.featured.admin.summary.useQuery()
 
   if (summaryError) {
     return (

src/app/(admin)/admin/marketing/gallery/client.tsx

@@ -35,7 +35,7 @@ function GalleryPageContent() {
     data: images,
     isLoading,
     refetch: refetchImages,
-  } = api.gallery.list.useQuery(
+  } = api.gallery.admin.list.useQuery(
     {
       featured: filters.featured,
       speakerId: filters.speakerId,
@@ -53,7 +53,7 @@ function GalleryPageContent() {
     },
   )
 
-  const { data: filteredCount } = api.gallery.count.useQuery({
+  const { data: filteredCount } = api.gallery.admin.count.useQuery({
     featured: filters.featured,
     speakerId: filters.speakerId,
     dateFrom: filters.dateFrom,
@@ -62,11 +62,11 @@ function GalleryPageContent() {
     locationSearch: filters.locationSearch,
   })
 
-  const deleteMutation = api.gallery.delete.useMutation({
+  const deleteMutation = api.gallery.admin.delete.useMutation({
     onSuccess: () => {
       showNotification({ title: 'Image deleted successfully', type: 'success' })
-      utils.gallery.list.invalidate()
-      utils.gallery.count.invalidate()
+      utils.gallery.admin.list.invalidate()
+      utils.gallery.admin.count.invalidate()
     },
     onError: (error) => {
       showNotification({
@@ -76,11 +76,11 @@ function GalleryPageContent() {
     },
   })
 
-  const toggleFeaturedMutation = api.gallery.toggleFeatured.useMutation({
+  const toggleFeaturedMutation = api.gallery.admin.toggleFeatured.useMutation({
     onSuccess: () => {
       showNotification({ title: 'Featured status updated', type: 'success' })
-      utils.gallery.list.invalidate()
-      utils.gallery.count.invalidate()
+      utils.gallery.admin.list.invalidate()
+      utils.gallery.admin.count.invalidate()
     },
     onError: (error) => {
       showNotification({
@@ -100,8 +100,8 @@ function GalleryPageContent() {
 
       while (attempts < maxAttempts) {
         await new Promise((resolve) => setTimeout(resolve, 500))
-        await utils.gallery.list.invalidate()
-        await utils.gallery.count.invalidate()
+        await utils.gallery.admin.list.invalidate()
+        await utils.gallery.admin.count.invalidate()
         const result = await refetchImages()
 
         const newCount = result.data?.length ?? 0
@@ -117,8 +117,8 @@ function GalleryPageContent() {
   )
 
   const handleImageUpdate = useCallback(() => {
-    utils.gallery.list.invalidate()
-    utils.gallery.count.invalidate()
+    utils.gallery.admin.list.invalidate()
+    utils.gallery.admin.count.invalidate()
     setIsMetadataModalOpen(false)
     setSelectedImage(null)
   }, [utils])
@@ -148,8 +148,8 @@ function GalleryPageContent() {
   }, [selectedImages])
 
   const handleBulkUpdate = useCallback(() => {
-    utils.gallery.list.invalidate()
-    utils.gallery.count.invalidate()
+    utils.gallery.admin.list.invalidate()
+    utils.gallery.admin.count.invalidate()
     setIsMetadataModalOpen(false)
     setSelectedImage(null)
     setSelectedImages([])

src/components/admin/BadgeManagementClient.tsx

@@ -89,9 +89,9 @@ export function BadgeManagementClient({
   }, [searchQuery])
 
   const { data: existingBadges, refetch: refetchBadges } =
-    api.badge.list.useQuery({}, { initialData: initialBadges })
+    api.badge.admin.list.useQuery({}, { initialData: initialBadges })
 
-  const issueMutation = api.badge.issue.useMutation({
+  const issueMutation = api.badge.admin.issue.useMutation({
     onSuccess: (data) => {
       refetchBadges()
       setSelectedSpeakers(new Set())
@@ -113,7 +113,7 @@ export function BadgeManagementClient({
     },
   })
 
-  const bulkIssueMutation = api.badge.bulkIssue.useMutation({
+  const bulkIssueMutation = api.badge.admin.bulkIssue.useMutation({
     onSuccess: (data) => {
       refetchBadges()
       setSelectedSpeakers(new Set())
@@ -146,7 +146,7 @@ export function BadgeManagementClient({
     },
   })
 
-  const deleteMutation = api.badge.delete.useMutation({
+  const deleteMutation = api.badge.admin.delete.useMutation({
     onSuccess: (data) => {
       refetchBadges()
       showNotification({

src/components/admin/BadgeValidator.stories.tsx

@@ -202,7 +202,7 @@ export const Default: Story = {
   parameters: {
     msw: {
       handlers: [
-        http.post('/api/trpc/badge.validate', () => {
+        http.post('/api/trpc/badge.admin.validate', () => {
           return HttpResponse.json({
             result: { data: mockSuccessResponse },
           })
@@ -216,7 +216,7 @@ export const ValidationSuccess: Story = {
   parameters: {
     msw: {
       handlers: [
-        http.post('/api/trpc/badge.validate', () => {
+        http.post('/api/trpc/badge.admin.validate', () => {
           return HttpResponse.json({
             result: { data: mockSuccessResponse },
           })
@@ -233,7 +233,7 @@ export const ValidationErrors: Story = {
   parameters: {
     msw: {
       handlers: [
-        http.post('/api/trpc/badge.validate', () => {
+        http.post('/api/trpc/badge.admin.validate', () => {
           return HttpResponse.json({
             result: { data: mockErrorResponse },
           })
@@ -250,7 +250,7 @@ export const ValidationWarnings: Story = {
   parameters: {
     msw: {
       handlers: [
-        http.post('/api/trpc/badge.validate', () => {
+        http.post('/api/trpc/badge.admin.validate', () => {
           return HttpResponse.json({
             result: { data: mockWarningResponse },
           })
@@ -267,7 +267,7 @@ export const ServerError: Story = {
   parameters: {
     msw: {
       handlers: [
-        http.post('/api/trpc/badge.validate', () => {
+        http.post('/api/trpc/badge.admin.validate', () => {
           return HttpResponse.json(
             {
               error: {

src/components/admin/BadgeValidator.tsx

@@ -52,7 +52,7 @@ export default function BadgeValidator() {
   const [credential, setCredential] = useState<BadgeCredential | null>(null)
   const [svgPreview, setSvgPreview] = useState<string | null>(null)
 
-  const validateMutation = api.badge.validate.useMutation({
+  const validateMutation = api.badge.admin.validate.useMutation({
     onSuccess: (data) => {
       if (data.checks) {
         setChecks(data.checks)