fix:ts error in transpile

Rithick574 · Jul 8, 2024 · b5f553d · b5f553d
1 parent 00364cf
commit b5f553d
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 23 deletions.
diff --git a/auth-service/src/_lib/common/error/errorhandler.ts b/auth-service/src/_lib/common/error/errorhandler.ts
@@ -1,17 +1,26 @@
 import { Request, Response, NextFunction } from "express";
+import ErrorResponse from "./errorResponse";
 
 const errorHandler = (
   err: any,
   req: Request,
   res: Response,
   next: NextFunction
 ) => {
-  const statusCode = err.status || 400;
+  if (err instanceof ErrorResponse) {
+    return res.status(err.status).json({
+      success: false,
+      status: err.status,
+      message: err.message,
+    });
+  }
+
+
   return res.status(400).json({
     success: false,
-    status: err.statusCode,
-    message: err.message || "Something went wrong",
+    status: 400,
+    message: "Internal Server Error",
   });
 };
 
-export default errorHandler;
+export default errorHandler;
diff --git a/auth-service/src/domain/entities/otp.entity.ts b/auth-service/src/domain/entities/otp.entity.ts
@@ -1,4 +1,4 @@
-import { ObjectId } from "mongoose";
+import { Document, ObjectId } from "mongoose";
 
 export interface IOtp extends Document {
     _id: ObjectId;

diff --git a/auth-service/src/presentation/controllers/googleAuth.ts b/auth-service/src/presentation/controllers/googleAuth.ts
@@ -31,7 +31,7 @@ export const googleAuthController = (dependencies: IDependencies) => {
         });
       }
 
-      const { email, given_name, family_name } = payload;
+      const { email, given_name } = payload;
 
       const exist = await findUserByEmailUseCase(dependencies).execute(email);
 

diff --git a/auth-service/src/presentation/index.ts b/auth-service/src/presentation/index.ts
@@ -1,4 +1,4 @@
-import express, { Application, NextFunction, Request, Response } from "express";
+import express, { Application, Request, Response } from "express";
 import dotenv from "dotenv";
 import cookieParser from "cookie-parser"
 dotenv.config();

diff --git a/course-service/src/_lib/common/error/errorhandler.ts b/course-service/src/_lib/common/error/errorhandler.ts
@@ -1,16 +1,25 @@
 import { Request, Response, NextFunction } from "express";
+import ErrorResponse from "./errorResponse";
 
 const errorHandler = (
   err: any,
   req: Request,
   res: Response,
   next: NextFunction
 ) => {
-  const statusCode = err.status || 400;
+  if (err instanceof ErrorResponse) {
+    return res.status(err.status).json({
+      success: false,
+      status: err.status,
+      message: err.message,
+    });
+  }
+
+
   return res.status(400).json({
     success: false,
-    status: err.statusCode,
-    message: err.message || "Something went wrong",
+    status: 400,
+    message: "Internal Server Error",
   });
 };
 

diff --git a/course-service/src/infrastructure/database/mongoDB/models/enrollment.ts b/course-service/src/infrastructure/database/mongoDB/models/enrollment.ts
@@ -1,16 +1,6 @@
 import { EnrollmentEntity } from "@/domain/entities";
 import { Schema, model } from "mongoose";
 
-const LessonProgressSchema = new Schema({
-  lessonId: {
-    type: Schema.Types.ObjectId,
-    required: true,
-  },
-  totalTimeWatched: {
-    type: Number,
-    default: 0,
-  },
-});
 
 const enrollmentSchema = new Schema({
   userId: {

diff --git a/...ervice/src/infrastructure/database/mongoDB/repositories/enrollment/paymentListForAdmin.ts b/...ervice/src/infrastructure/database/mongoDB/repositories/enrollment/paymentListForAdmin.ts
@@ -1,6 +1,6 @@
 import { ErrorResponse } from "@learnwise/common";
 import { Enrollment } from "../../models/enrollment";
-import { Types } from "mongoose";
+import { Document, Types } from "mongoose";
 
 
 interface User {

diff --git a/notification-service/src/_lib/nodemailer/mailFunction.ts b/notification-service/src/_lib/nodemailer/mailFunction.ts
@@ -1,7 +1,7 @@
 import {generateVerificationMail} from "./index"
 
 export const sendOTPMail = async (email:string, otp:string) => {
-    const mailResponse = await generateVerificationMail(
+     await generateVerificationMail(
       email,
       "Email Verification",
       `<!DOCTYPE html>

diff --git a/notification-service/src/presentation/server.ts b/notification-service/src/presentation/server.ts
@@ -1,4 +1,4 @@
-import express, { Application, Request, Response, NextFunction } from "express";
+import express, { Application, Request, Response } from "express";
 import dotenv from "dotenv";
 import cookieParser from "cookie-parser";
 import { notificationRoutes } from "@/infrastructure/routes";
-Original file line number
+Diff line change
@@ Expand Up @@
             });
           }
-          const { email, given_name, family_name } = payload;
+          const { email, given_name } = payload;
           const exist = await findUserByEmailUseCase(dependencies).execute(email);
@@ Expand Down @@