Skip to content

Commit be9959c

Browse files
jhonattandiegotc86
authored andcommitted
refactor: update user model and service to streamline user type usage
1 parent 8d0d2cf commit be9959c

File tree

3 files changed

+7
-18
lines changed

3 files changed

+7
-18
lines changed

src/models/user.model.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
1-
export interface User {
2-
id: number;
3-
email: string;
4-
name: string | null;
5-
password: string | null;
6-
isGuest: boolean;
7-
createdAt: string;
8-
updatedAt: string;
9-
}
1+
import type { User as PrismaUser } from "generated/prisma/client";
2+
3+
export type User = PrismaUser;
104

115
export interface AuthResponse {
12-
user: Omit<User, "password">;
6+
user: User;
137
token: string;
148
}
15-
16-
// For creating new users (no id, timestamps)
17-
export type CreateUserDTO = Omit<User, "id" | "createdAt" | "updatedAt">;

src/services/user.service.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import {
88
} from "@/lib/utils.tests";
99
import { getSession } from "@/session.server";
1010
import { prisma } from "@/db/prisma";
11-
import type { User } from "generated/prisma/client";
12-
1311
import * as userService from "./user.service";
1412

1513
// Mocking dependencies for unit tests

src/services/user.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import { hashPassword } from "@/lib/security";
2-
import type { Prisma, User } from "generated/prisma/client";
2+
import type { User, AuthResponse } from "@/models/user.model";
33
import { prisma } from "@/db/prisma";
44
import { getSession } from "@/session.server";
55

66
export async function updateUser(
77
updatedUser: Partial<User>,
88
request: Request
9-
): Promise<User> {
9+
): Promise<AuthResponse["user"]> {
1010
const session = await getSession(request.headers.get("Cookie"));
1111
const id = session.get("userId");
1212

1313
if (!id) {
1414
throw new Error("User not authenticated");
1515
}
1616

17-
const data: Prisma.UserUpdateInput = { ...updatedUser };
17+
const data = { ...updatedUser } as any;
1818

1919
if (updatedUser.password) {
2020
const hashedPassword = await hashPassword(updatedUser.password);

0 commit comments

Comments
 (0)