fix errors

This commit is contained in:
2024-10-18 16:53:03 -05:00
parent 69a6bb656e
commit 439b285126
6 changed files with 41 additions and 16 deletions

View File

@@ -91,10 +91,11 @@ export const createUser = async (
fullName: string, pushToken: string
) => {
try {
console.log(appleId, email, fullName, pushToken);
if (!appleId || !email || !fullName || !pushToken) {
throw new Error("Error: All required fields must be filled");
}
// Check if username or email is already taken
const existingUser = await db.select().from(schema.users)
.where(or(eq(schema.users.appleId, appleId), eq(schema.users.email, email)));
@@ -102,15 +103,18 @@ export const createUser = async (
if (existingUser.length > 0) {
throw new Error("Username or email is already in use");
}
console.log('right before we add the user');
const newUsers: User[] = await db.insert(schema.users).values({
appleId, email, fullName, pushToken
}).returning() as User[]; // return the newly created user
const newUser: User | undefined = newUsers[0];
if (!newUsers.length || !newUsers[0]?.id)
throw new Error("Failed to create new user");
return newUsers[0];
return newUser;
} catch (error) {
if (error instanceof Error) {
@@ -144,8 +148,10 @@ export const getPfpUrl = async (userId: number) => {
try {
const users = await db.select().from(schema.users)
.where(eq(schema.users.id, userId))
console.log(users);
const user = users[0] as User;
return (users === undefined) ? user.pfpUrl : null;
if (!user) return null;
return user.pfpUrl;
} catch (error) {
console.error('Error getting pfp url:', error);
}