resolved conflicts

app/action/sendContactEmail.js

@@ -10,7 +10,7 @@ export async function sendContactEmail(username, fromEmail, message, subject) {
       subject: subject,
       html: ContactEmailTemplate({ username, message, fromEmail }),
     });
-    console.log(res);
+
     if (!res.data) throw new Error(res.error.name);
 
     return {

app/api/teams/create-team/route.jsx

@@ -1,7 +1,7 @@
 import dbConnect from "../../../../lib/dbConnect";
 import { teamSchema } from "../../../../model/Schema/teamSchema";
 import { TeamModel } from "../../../../model/Team";
-import { UserModel } from "../../../../model/User";
+import UserModel from "../../../../model/User";
 
 export async function POST(request) {
   await dbConnect();

app/api/teams/send-request/route.js

@@ -1,6 +1,6 @@
 import dbConnect from "../../../../lib/dbConnect";
 import { TeamModel } from "../../../../model/Team";
-import { UserModel } from "../../../../model/User";
+import UserModel from "../../../../model/User";
 
 export async function POST(req) {
   await dbConnect();

model/User.js → model/User.ts

@@ -1,7 +1,30 @@
-import mongoose, { models, model } from "mongoose";
-const { Schema } = mongoose;
+import mongoose, { Document, Model, Schema } from "mongoose";
 
-const userSchema = new Schema({
+interface IUser extends Document {
+  username: string;
+  name?: string;
+  email: string;
+  bio?: string;
+  discordId?: string;
+  googleId?: string;
+  twoFactorActivated: boolean;
+  createdAt: Date;
+  verifyCode: string;
+  verifyCodeExpiry: Date;
+  password: string;
+  eventsRegistered: Array<mongoose.Types.ObjectId>;
+}
+
+interface IUserMethods {
+  updatePassword(newPassword: string): Promise<void>;
+}
+
+interface IUserModel extends Model<IUser, {}, IUserMethods> {
+  findByEmail(email: string): Promise<IUser | null>;
+}
+
+//  Created the User Schema
+const userSchema = new Schema<IUser, IUserModel, IUserMethods>({
   _id: {
     type: Schema.Types.ObjectId,
     required: true,
@@ -62,6 +85,8 @@ const userSchema = new Schema({
   ],
 });
 
-const UserModel = models.UserModel || model("UserModel", userSchema);
-
+// Created the User Model
+const UserModel =
+  mongoose.models.UserModel ||
+  mongoose.model<IUser, IUserModel>("UserModel", userSchema);
 export default UserModel;

package.json

@@ -67,6 +67,7 @@
     "@eslint/js": "^9.17.0",
     "@tailwindcss/typography": "0.5.13",
     "@types/bcryptjs": "^2.4.6",
+    "@types/mongoose": "^5.11.97",
     "@types/node": "20.11.24",
     "@types/react": "18.2.61",
     "@types/react-dom": "18.2.19",