fix: teacher and student types fix

Author: Dmytro-Doronin

server/src/repositories/commandRepositories/student.command.ts

@@ -3,14 +3,10 @@ import { StudentTypeDB } from "../../db/schemes/types/student.types.js";
 import { StudentModel } from "../../db/schemes/studentSchema.js";
 import { HttpError } from "../../utils/error.util.js";
 import { isMongoDuplicateKeyError } from "../../utils/duplicateType.guard.js";
-import {
-  CreateGoogleStudent,
-  CreateLocalStudent,
-} from "../../types/student/student.types.js";
 
 @injectable()
 export class StudentCommand {
-  async createStudent(newStudent: CreateLocalStudent | CreateGoogleStudent) {
+  async createStudent(newStudent: StudentTypeDB) {
     try {
       const created = await StudentModel.create(newStudent);
       return created.toObject();

server/src/repositories/commandRepositories/teacher.command.ts

@@ -1,14 +1,11 @@
 import { injectable } from "inversify";
 import { TeacherModel } from "../../db/schemes/teacherSchema.js";
 import { HttpError } from "../../utils/error.util.js";
-import {
-  CreateGoogleTeacher,
-  CreateLocalTeacher,
-} from "../../types/teacher/teacher.types.js";
+import { TeacherTypeDB } from "../../db/schemes/types/teacher.types.js";
 
 @injectable()
 export class TeacherCommand {
-  async createTeacher(newTeacher: CreateLocalTeacher | CreateGoogleTeacher) {
+  async createTeacher(newTeacher: TeacherTypeDB) {
     try {
       const created = await TeacherModel.create(newTeacher);
       return created.toObject();

server/src/services/auth/auth.service.ts

@@ -20,6 +20,10 @@ import { StudentCommand } from "../../repositories/commandRepositories/student.c
 import { TeacherCommand } from "../../repositories/commandRepositories/teacher.command.js";
 import { sendPasswordResetEmail } from "../email/mailSender.js";
 import { logError, logWarning } from "../../utils/logging.js";
+import {
+  buildGoogleStudent,
+  buildGoogleTeacher,
+} from "../../utils/builders/user.builders.js";
 
 @injectable()
 export class AuthService {
@@ -411,36 +415,24 @@ export class AuthService {
     }
 
     if (role === "student") {
-      return await this.studentCommand.createStudent({
-        id: randomUUID(),
-        role,
+      const student = buildGoogleStudent({
         email: goggle.email,
         firstName: goggle.firstName,
         lastName: goggle.lastName,
-        profileImageUrl: goggle.picture ?? null,
-        address: null,
-        mainLanguage: null,
-        authProvider: "google",
+        picture: goggle.picture,
         googleSub: goggle.googleSub,
-        passwordReset: { tokenHash: null, expiresAt: null },
-        createdAt: new Date(),
-      });
-    } else {
-      return await this.teacherCommand.createTeacher({
-        id: randomUUID(),
-        role,
-        email: goggle.email,
-        firstName: goggle.firstName,
-        lastName: goggle.lastName,
-        profileImageUrl: goggle.picture ?? null,
-        address: null,
-        mainLanguage: null,
-        authProvider: "google",
-        googleSub: goggle.googleSub,
-        passwordReset: { tokenHash: null, expiresAt: null },
-        createdAt: new Date(),
       });
+      return await this.studentCommand.createStudent(student);
     }
+
+    const teacher = buildGoogleTeacher({
+      email: goggle.email,
+      firstName: goggle.firstName,
+      lastName: goggle.lastName,
+      picture: goggle.picture,
+      googleSub: goggle.googleSub,
+    });
+    return await this.teacherCommand.createTeacher(teacher);
   }
 
   async googleLogin(args: GoogleAuthRequest) {

server/src/services/student/student.service.ts

@@ -52,6 +52,8 @@ export class StudentService {
       createdAt: new Date(),
       profileImageUrl: null,
       mainLanguage: null,
+      authProvider: "local",
+      googleSub: null,
       role,
     };
     try {

server/src/services/teacher/teacher.service.ts

@@ -78,7 +78,8 @@ export class TeacherService {
         zipCode: null,
         country: null,
       },
-
+      authProvider: "local",
+      googleSub: null,
       createdAt: new Date(),
 
       role,

server/src/types/common.types.ts

@@ -6,4 +6,4 @@ export type RequestWithBody<B> = Request<object, object, B, object>;
 export type ResponseWithData<D> = Response<D>;
 export type RequestWithParams<P> = Request<P, object, object, object>;
 export type RequestWithQuery<Q> = Request<object, object, object, Q>;
-export type Role = "student" | "teacher" | "admin";
+export type Role = "student" | "teacher";

server/src/types/student/student.types.ts

@@ -10,8 +10,6 @@ export type StudentViewType = {
   mainLanguage: string | null;
   createdAt: Date;
   role: string;
-  authProvider: "local" | "google";
-  googleSub: string | null;
 };
 
 export type UpdateStudentProfileType = {

server/src/types/teacher/teacher.types.ts

@@ -1,4 +1,5 @@
-import { Role } from "../../../index.js";
+import { AddressItem } from "../../db/schemes/types/teacher.types.js";
+import { Role } from "../common.types.js";
 
 export type EducationViewItem = {
   degree: string;
@@ -64,8 +65,6 @@ export type TeacherViewType = {
   address: AddressView;
   createdAt: Date;
   role: string;
-  authProvider: "local" | "google";
-  googleSub: string | null;
 };
 
 type SortDirection = "asc" | "desc";
@@ -116,7 +115,7 @@ export type TeacherCreateBase = {
   lastName: string;
 
   profileImageUrl?: string | null;
-  address?: string | null;
+  address?: AddressItem;
   mainLanguage?: string | null;
 
   authProvider: "local" | "google";

server/src/utils/builders/user.builders.ts

@@ -0,0 +1,79 @@
+import { randomUUID } from "node:crypto";
+import { StudentTypeDB } from "../../db/schemes/types/student.types.js";
+import { TeacherTypeDB } from "../../db/schemes/types/teacher.types.js";
+
+export function buildGoogleStudent(args: {
+  email: string;
+  firstName: string;
+  lastName: string;
+  picture: string | null;
+  googleSub: string | null;
+}): StudentTypeDB {
+  return {
+    id: randomUUID(),
+    role: "student",
+    email: args.email,
+    firstName: args.firstName,
+    lastName: args.lastName,
+    profileImageUrl: args.picture,
+    address: null,
+    mainLanguage: null,
+    passwordHash: null,
+    passwordSalt: null,
+    passwordReset: { tokenHash: null, expiresAt: null },
+    authProvider: "google",
+    googleSub: args.googleSub,
+    createdAt: new Date(),
+  };
+}
+
+export function buildGoogleTeacher(args: {
+  email: string;
+  firstName: string;
+  lastName: string;
+  picture: string | null;
+  googleSub: string | null;
+}): TeacherTypeDB {
+  return {
+    id: randomUUID(),
+    role: "teacher",
+    email: args.email,
+    firstName: args.firstName,
+    lastName: args.lastName,
+    profileImageUrl: args.picture,
+    passwordHash: null,
+    passwordSalt: null,
+    passwordReset: { tokenHash: null, expiresAt: null },
+    priceFrom: 0,
+    rating: 0,
+    experience: 0,
+    bio: null,
+    headline: null,
+    phoneNumber: null,
+    dateOfBirth: null,
+    gender: null,
+    mainLanguage: null,
+    education: [],
+    subjects: [],
+    timezone: "Europe/Amsterdam",
+    availability: {
+      monday: [],
+      tuesday: [],
+      wednesday: [],
+      thursday: [],
+      friday: [],
+      saturday: [],
+      sunday: [],
+    },
+    address: {
+      street: null,
+      city: null,
+      state: null,
+      zipCode: null,
+      country: null,
+    },
+    createdAt: new Date(),
+    authProvider: "google",
+    googleSub: args.googleSub,
+  };
+}

server/src/utils/mappers/student.mapper.ts

@@ -15,7 +15,5 @@ export const studentMapper = (
     mainLanguage: student.mainLanguage,
     createdAt: student.createdAt,
     role: student.role,
-    authProvider: student.authProvider,
-    googleSub: student.googleSub,
   };
 };