streaper2/maaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor service layer

Browse Source
This commit is contained in:
Michael Dausmann
2023-04-05 22:42:36 +10:00
parent f2bbe8596a
commit 5350a5c712
11 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/trpc/context.ts
View File

@@ -2,7 +2,8 @@ import { inferAsyncReturnType, TRPCError } from '@trpc/server'
import { H3Event } from 'h3';
import { serverSupabaseUser } from '#supabase/server'
import { User } from '@supabase/supabase-js';
import UserAccountService, { FullDBUser } from '~~/lib/services/user.account.service';
import { FullDBUser } from '~~/lib/services/service.types';
import AuthService from '~~/lib/services/auth.service';
export async function createContext(event: H3Event){
let user: User | null = null;
@@ -12,11 +13,11 @@ export async function createContext(event: H3Event){
user = await serverSupabaseUser(event);
}
if (!dbUser && user) {
const userService = new UserAccountService();
dbUser = await userService.getFullUserBySupabaseId(user.id);
const authService = new AuthService();
dbUser = await authService.getFullUserBySupabaseId(user.id);
if (!dbUser && user) {
dbUser = await userService.createUser(user.id, user.user_metadata.full_name?user.user_metadata.full_name:"no name supplied", user.email?user.email:"no@email.supplied" );
dbUser = await authService.createUser(user.id, user.user_metadata.full_name?user.user_metadata.full_name:"no name supplied", user.email?user.email:"no@email.supplied" );
console.log(`\n Created DB User \n ${JSON.stringify(dbUser)}\n`);
}
}

27
server/trpc/routers/account.router.ts
View File

@@ -1,14 +1,15 @@
import UserAccountService from '~~/lib/services/user.account.service';
import { router, adminProcedure } from '../trpc'
import { ACCOUNT_ACCESS } from '@prisma/client';
import { z } from 'zod';
import AccountService from '~~/lib/services/account.service';
import { MembershipWithAccount } from '~~/lib/services/service.types';
export const accountRouter = router({
changeAccountName: adminProcedure
.input(z.object({ account_id: z.number(), new_name: z.string() }))
.query(async ({ ctx, input }) => {
const uaService = new UserAccountService();
const account = await uaService.changeAccountName(input.account_id, input.new_name);
const accountService = new AccountService();
const account = await accountService.changeAccountName(input.account_id, input.new_name);
return {
account,
@@ -17,8 +18,8 @@ export const accountRouter = router({
changeAccountPlan: adminProcedure
.input(z.object({ account_id: z.number(), plan_id: z.number() }))
.query(async ({ ctx, input }) => {
const uaService = new UserAccountService();
const account = await uaService.changeAccountPlan(input.account_id, input.plan_id);
const accountService = new AccountService();
const account = await accountService.changeAccountPlan(input.account_id, input.plan_id);
return {
account,
@@ -27,8 +28,8 @@ export const accountRouter = router({
joinUserToAccount: adminProcedure
.input(z.object({ account_id: z.number(), user_id: z.number() }))
.query(async ({ ctx, input }) => {
const uaService = new UserAccountService();
const membership = (ctx.dbUser?.id)?await uaService.joinUserToAccount(input.user_id, input.account_id):null;
const accountService = new AccountService();
const membership: MembershipWithAccount| null = (ctx.dbUser?.id)?await accountService.joinUserToAccount(input.user_id, input.account_id):null;
return {
membership,
}
@@ -36,8 +37,8 @@ export const accountRouter = router({
changeUserAccessWithinAccount: adminProcedure
.input(z.object({ user_id: z.number(), account_id: z.number(), access: z.enum([ACCOUNT_ACCESS.ADMIN, ACCOUNT_ACCESS.OWNER, ACCOUNT_ACCESS.READ_ONLY, ACCOUNT_ACCESS.READ_WRITE]) }))
.query(async ({ ctx, input }) => {
const uaService = new UserAccountService();
const membership = await uaService.changeUserAccessWithinAccount(input.user_id, input.account_id, input.access);
const accountService = new AccountService();
const membership = await accountService.changeUserAccessWithinAccount(input.user_id, input.account_id, input.access);
return {
membership,
@@ -46,8 +47,8 @@ export const accountRouter = router({
claimOwnershipOfAccount: adminProcedure
.input(z.object({ account_id: z.number() }))
.query(async ({ ctx, input }) => {
const uaService = new UserAccountService();
const membership = await uaService.claimOwnershipOfAccount(ctx.dbUser.id, input.account_id);
const accountService = new AccountService();
const membership = await accountService.claimOwnershipOfAccount(ctx.dbUser.id, input.account_id);
return {
membership,
@@ -56,8 +57,8 @@ export const accountRouter = router({
getAccountMembers: adminProcedure
.input(z.object({ account_id: z.number() }))
.query(async ({ ctx, input }) => {
const uaService = new UserAccountService();
const memberships = await uaService.getAccountMembers(input.account_id);
const accountService = new AccountService();
const memberships = await accountService.getAccountMembers(input.account_id);
return {
memberships,

1
server/trpc/trpc.ts
View File

@@ -39,7 +39,6 @@ const isAdminForInputAccountId = t.middleware(({ next, rawInput, ctx }) => {
if (!result.success) throw new TRPCError({ code: 'BAD_REQUEST' });
const { account_id } = result.data;
const test_membership = ctx.dbUser.memberships.find(membership => membership.account_id == account_id);
console.log(`isAdminForInputAccountId test_membership?.access:${test_membership?.access}`);
if(!test_membership || (test_membership?.access !== ACCOUNT_ACCESS.ADMIN && test_membership?.access !== ACCOUNT_ACCESS.OWNER)) {
throw new TRPCError({ code: 'UNAUTHORIZED' });
}