create utility types on server - include Account with Membership - start moving account functions to store actions

server/trpc/context.ts

@@ -1,15 +1,15 @@
-import { Membership, PrismaClient, User as DBUser } from '@prisma/client';
+import { PrismaClient } from '@prisma/client';
 import { inferAsyncReturnType, TRPCError } from '@trpc/server'
 import { H3Event } from 'h3';
 import { serverSupabaseClient } from '#supabase/server';
 import SupabaseClient from '@supabase/supabase-js/dist/module/SupabaseClient';
 import { User } from '@supabase/supabase-js';
-import UserAccountService from '~~/lib/services/user.account.service';
+import UserAccountService, { FullDBUser } from '~~/lib/services/user.account.service';
 
 let prisma: PrismaClient | undefined
 let supabase: SupabaseClient | undefined
 let user: User | null;
-let dbUser: (DBUser & { memberships: Membership[]; }) | null
+let dbUser: FullDBUser | null
 
 export async function createContext(event: H3Event){
   if (!supabase) {
@@ -23,7 +23,7 @@ export async function createContext(event: H3Event){
   }
   if (!dbUser && user) {
     const userService = new UserAccountService(prisma);
-    dbUser = await userService.getUserBySupabaseId(user.id);
+    dbUser = await userService.getFullUserBySupabaseId(user.id);
     
     if (!dbUser && user) {
       dbUser = await userService.createUser( user.id, user.user_metadata.full_name );

server/trpc/routers/user.account.router.ts

@@ -1,6 +1,7 @@
 import UserAccountService from '~~/lib/services/user.account.service';
 import { protectedProcedure, router } from '../trpc'
 import { ACCOUNT_ACCESS } from '@prisma/client';
+import { z } from 'zod';
 
 export const userAccountRouter = router({
   getDBUser: protectedProcedure
@@ -10,10 +11,10 @@ export const userAccountRouter = router({
       }
     }),  
   changeAccountPlan: protectedProcedure
-    .query(async ({ ctx }) => {
+    .input(z.object({ account_id: z.number(), plan_id: z.number() }))
+    .query(async ({ ctx, input }) => {
       const uaService = new UserAccountService(ctx.prisma);
-      // TODO - account id and plan should be an input param and then the ternary removed
-      const account = (ctx.dbUser?.memberships[0].account_id)?await uaService.changeAccountPlan(ctx.dbUser?.memberships[0].account_id, 2):null;
+      const account = await uaService.changeAccountPlan(input.account_id, input.plan_id);
       return {
         account,
       }