Skip to content

Commit

Permalink
fixes to interface and implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
@rodrigotiscareno
rodrigotiscareno committed Aug 4, 2024
1 parent 30cabdf commit 448fbe1
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 73 deletions.
154 changes: 86 additions & 68 deletions backend/typescript/services/implementations/userService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@
// } mongodb
// postgresql {
import * as firebaseAdmin from "firebase-admin";
import { PrismaClient } from "@prisma/client";
import IUserService from "../interfaces/userService";
import { PrismaClient } from '@prisma/client';
import { CreateUserDTO, Role, UpdateUserDTO, UserDTO } from "../../types";
import { getErrorMessage } from "../../utilities/errorUtils";
import logger from "../../utilities/logger";
Expand All @@ -356,24 +356,24 @@ class UserService implements IUserService {
let firebaseUser: firebaseAdmin.auth.UserRecord;

try {
user = await prisma.user.findUnique({
where: { id: userId }
user = await prisma.users.findUnique({
where: { id: Number(userId) },
});

if (!user) {
throw new Error(`userId ${userId} not found.`);
}

firebaseUser = await firebaseAdmin.auth().getUser(user.authId);
firebaseUser = await firebaseAdmin.auth().getUser(user.auth_id);
} catch (error: unknown) {
Logger.error(`Failed to get user. Reason = ${getErrorMessage(error)}`);
throw error;
}

return {
id: user.id,
firstName: user.firstName,
lastName: user.lastName,
id: String(user.id),
firstName: user.first_name,
lastName: user.last_name,
email: firebaseUser.email ?? "",
role: user.role,
};
Expand All @@ -385,8 +385,8 @@ class UserService implements IUserService {

try {
firebaseUser = await firebaseAdmin.auth().getUserByEmail(email);
user = await prisma.user.findUnique({
where: { authId: firebaseUser.uid }
user = await prisma.users.findUnique({
where: { auth_id: firebaseUser.uid },
});

if (!user) {
Expand All @@ -398,40 +398,42 @@ class UserService implements IUserService {
}

return {
id: user.id,
firstName: user.firstName,
lastName: user.lastName,
id: String(user.id),
firstName: user.first_name,
lastName: user.last_name,
email: firebaseUser.email ?? "",
role: user.role,
};
}

async getUserRoleByAuthId(authId: string): Promise<Role> {
try {
const user = await prisma.user.findUnique({
where: { authId }
const user = await prisma.users.findUnique({
where: { auth_id: authId },
});

if (!user) {
throw new Error(`User with authId ${authId} not found.`);
}
return user.role;
} catch (error: unknown) {
Logger.error(`Failed to get user role. Reason = ${getErrorMessage(error)}`);
Logger.error(
`Failed to get user role. Reason = ${getErrorMessage(error)}`,
);
throw error;
}
}

async getUserIdByAuthId(authId: string): Promise<string> {
try {
const user = await prisma.user.findUnique({
where: { authId }
const user = await prisma.users.findUnique({
where: { auth_id: authId },
});

if (!user) {
throw new Error(`User with authId ${authId} not found.`);
}
return user.id;
return String(user.id);
} catch (error: unknown) {
Logger.error(`Failed to get user id. Reason = ${getErrorMessage(error)}`);
throw error;
Expand All @@ -440,14 +442,14 @@ class UserService implements IUserService {

async getAuthIdById(userId: string): Promise<string> {
try {
const user = await prisma.user.findUnique({
where: { id: userId }
const user = await prisma.users.findUnique({
where: { id: Number(userId) },
});

if (!user) {
throw new Error(`User ID ${userId} not found.`);
}
return user.authId;
return user.auth_id;
} catch (error: unknown) {
Logger.error(`Failed to get authId. Reason = ${getErrorMessage(error)}`);
throw error;
Expand All @@ -458,26 +460,30 @@ class UserService implements IUserService {
let userDtos: Array<UserDTO> = [];

try {
const users = await prisma.user.findMany();
const users = await prisma.users.findMany();

userDtos = await Promise.all(users.map(async (user) => {
let firebaseUser: firebaseAdmin.auth.UserRecord;
userDtos = await Promise.all(
users.map(async (user) => {
let firebaseUser: firebaseAdmin.auth.UserRecord;

try {
firebaseUser = await firebaseAdmin.auth().getUser(user.authId);
} catch (error) {
Logger.error(`User with authId ${user.authId} could not be fetched from Firebase`);
throw error;
}
try {
firebaseUser = await firebaseAdmin.auth().getUser(user.auth_id);
} catch (error) {
Logger.error(
`User with authId ${user.auth_id} could not be fetched from Firebase`,
);
throw error;
}

return {
id: user.id,
firstName: user.firstName,
lastName: user.lastName,
email: firebaseUser.email ?? "",
role: user.role,
};
}));
return {
id: String(user.id),
firstName: user.first_name,
lastName: user.last_name,
email: firebaseUser.email ?? "",
role: user.role,
};
}),
);
} catch (error: unknown) {
Logger.error(`Failed to get users. Reason = ${getErrorMessage(error)}`);
throw error;
Expand All @@ -486,32 +492,36 @@ class UserService implements IUserService {
return userDtos;
}

async createUser(user: CreateUserDTO, authId?: string, signUpMethod = "PASSWORD"): Promise<UserDTO> {
async createUser(
user: CreateUserDTO,
authId: string,
signUpMethod = "PASSWORD",
): Promise<UserDTO> {
let firebaseUser: firebaseAdmin.auth.UserRecord;

try {
if (signUpMethod === "GOOGLE") {
firebaseUser = await firebaseAdmin.auth().getUser(authId!);
firebaseUser = await firebaseAdmin.auth().getUser(authId);
} else {
firebaseUser = await firebaseAdmin.auth().createUser({
email: user.email,
password: user.password,
});
}

const newUser = await prisma.user.create({
const newUser = await prisma.users.create({
data: {
firstName: user.firstName,
lastName: user.lastName,
authId: firebaseUser.uid,
first_name: user.firstName,
last_name: user.lastName,
auth_id: firebaseUser.uid,
role: user.role,
}
},
});

return {
id: newUser.id,
firstName: newUser.firstName,
lastName: newUser.lastName,
id: String(newUser.id),
firstName: newUser.first_name,
lastName: newUser.last_name,
email: firebaseUser.email ?? "",
role: newUser.role,
};
Expand All @@ -523,23 +533,25 @@ class UserService implements IUserService {

async updateUserById(userId: string, user: UpdateUserDTO): Promise<UserDTO> {
try {
const updateResult = await prisma.user.update({
where: { id: userId },
const updateResult = await prisma.users.update({
where: { id: Number(userId) },
data: {
firstName: user.firstName,
lastName: user.lastName,
first_name: user.firstName,
last_name: user.lastName,
role: user.role,
}
},
});

let firebaseUser = await firebaseAdmin.auth().updateUser(updateResult.authId, {
email: user.email
});
let firebaseUser = await firebaseAdmin
.auth()
.updateUser(updateResult.auth_id, {
email: user.email,
});

return {
id: updateResult.id,
firstName: updateResult.firstName,
lastName: updateResult.lastName,
id: String(updateResult.id),
firstName: updateResult.first_name,
lastName: updateResult.last_name,
email: firebaseUser.email ?? "",
role: updateResult.role,
};
Expand All @@ -551,14 +563,16 @@ class UserService implements IUserService {

async deleteUserById(userId: string): Promise<void> {
try {
const user = await prisma.user.delete({
where: { id: userId }
const user = await prisma.users.delete({
where: { id: Number(userId) },
});

try {
await firebaseAdmin.auth().deleteUser(user.authId);
await firebaseAdmin.auth().deleteUser(user.auth_id);
} catch (error) {
Logger.error(`Failed to delete Firebase user after deleting user in database. AuthId: ${user.authId}`);
Logger.error(
`Failed to delete Firebase user after deleting user in database. AuthId: ${user.auth_id}`,
);
throw error;
}
} catch (error: unknown) {
Expand All @@ -570,18 +584,22 @@ class UserService implements IUserService {
async deleteUserByEmail(email: string): Promise<void> {
try {
const firebaseUser = await firebaseAdmin.auth().getUserByEmail(email);
const user = await prisma.user.delete({
where: { authId: firebaseUser.uid }
const user = await prisma.users.delete({
where: { auth_id: firebaseUser.uid },
});

try {
await firebaseAdmin.auth().deleteUser(user.authId);
await firebaseAdmin.auth().deleteUser(user.auth_id);
} catch (error) {
Logger.error(`Failed to delete Firebase user after deleting user in database. AuthId: ${user.authId}`);
Logger.error(
`Failed to delete Firebase user after deleting user in database. AuthId: ${user.auth_id}`,
);
throw error;
}
} catch (error: unknown) {
Logger.error(`Failed to delete user by email. Reason = ${getErrorMessage(error)}`);
Logger.error(
`Failed to delete user by email. Reason = ${getErrorMessage(error)}`,
);
throw error;
}
}
Expand Down
10 changes: 5 additions & 5 deletions backend/typescript/services/interfaces/userService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,39 +13,39 @@ interface IUserService {
* @returns A UserDTO containing the user's information or null if no user is found.
* @throws Error if the retrieval process fails.
*/
getUserById(userId: string): Promise<UserDTO | null>;
getUserById(userId: string): Promise<UserDTO>;

/**
* Retrieves a user by their email address.
* @param email The email address of the user to retrieve.
* @returns A UserDTO containing the user's information or null if no user is found.
* @throws Error if the retrieval process fails.
*/
getUserByEmail(email: string): Promise<UserDTO | null>;
getUserByEmail(email: string): Promise<UserDTO>;

/**
* Retrieves the role of a user by their authentication ID.
* @param authId The authentication ID associated with the user.
* @returns The role of the user or null if the user cannot be found.
* @throws Error if the retrieval process fails.
*/
getUserRoleByAuthId(authId: string): Promise<Role | null>;
getUserRoleByAuthId(authId: string): Promise<Role>;

/**
* Retrieves the ID of a user by their authentication ID.
* @param authId The authentication ID associated with the user.
* @returns The user's ID or null if the user cannot be found.
* @throws Error if the retrieval process fails.
*/
getUserIdByAuthId(authId: string): Promise<string | null>;
getUserIdByAuthId(authId: string): Promise<string>;

/**
* Retrieves the authentication ID associated with a user ID.
* @param userId The user's ID to lookup the authentication ID.
* @returns The authentication ID or null if the user cannot be found.
* @throws Error if the retrieval process fails.
*/
getAuthIdById(userId: string): Promise<string | null>;
getAuthIdById(userId: string): Promise<string>;

/**
* Retrieves all users in the system.
Expand Down

0 comments on commit 448fbe1

Please sign in to comment.