Skip to content

Commit

Permalink
Merge pull request #4 from Shubham4026/main
Browse files Browse the repository at this point in the history 
Issue PS-603 fix: Added Standard Resposne Error message
  • Loading branch information
@vijaykhollam
vijaykhollam authored May 29, 2024
2 parents e2ee441 + c5df363 commit 3ccbba2
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 36 deletions.
5 changes: 0 additions & 5 deletions src/modules/attendance/attendance.controller.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,8 @@ import {
} from "@nestjs/swagger";
import {
Controller,
Get,
Post,
Body,
Put,
Param,
UseInterceptors,
ClassSerializerInterceptor,
SerializeOptions,
Req,
Request,
Expand Down
48 changes: 17 additions & 31 deletions src/modules/attendance/attendance.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import { Response} from 'express';


// import { CohortMembers } from 'src/cohortMembers/entities/cohort-member.entity';

const moment = require('moment');
// const facetedSearch = require('in-memory-faceted-search');

@Injectable()
Expand Down Expand Up @@ -77,7 +75,7 @@ export class AttendanceService {
whereClause['attendanceDate'] = Between(fromDate, toDate);
} else {
// If filter key is invalid, return a BadRequest response
APIResponse.error(response, apiId, "BAD_REQUEST", `Please Enter Valid Key to Search. Invalid Key entered Is ${key}`,HttpStatus.BAD_REQUEST);
return APIResponse.error(response, apiId, "BAD_REQUEST", `Please Enter Valid Key to Search. Invalid Key entered Is ${key}`,HttpStatus.BAD_REQUEST);
}
}
}
Expand All @@ -92,7 +90,7 @@ export class AttendanceService {
orderOption[column] = order.toUpperCase();
} else {
// If sort key is invalid, return a BadRequest response
APIResponse.error(response, apiId, "BAD_REQUEST", `${column} Invalid sort key`,HttpStatus.BAD_REQUEST);
return APIResponse.error(response, apiId, "BAD_REQUEST", `${column} Invalid sort key`,HttpStatus.BAD_REQUEST);
}
}

Expand All @@ -111,7 +109,7 @@ export class AttendanceService {
// attendanceList: paginatedAttendanceList,
// },
// });
APIResponse.success(response,apiId,{attendanceList: paginatedAttendanceList},HttpStatus.OK,"Ateendance List Fetched Successfully");
return APIResponse.success(response,apiId,{attendanceList: paginatedAttendanceList},HttpStatus.OK,"Ateendance List Fetched Successfully");
}

if (facets && facets.length > 0) {
Expand All @@ -128,7 +126,7 @@ export class AttendanceService {
// statusCode: HttpStatus.BAD_REQUEST,
// errorMessage: `${facet} Invalid facet`,
// });
APIResponse.error(response, apiId, "BAD_REQUEST", `${facet} Invalid facet`,HttpStatus.BAD_REQUEST);
return APIResponse.error(response, apiId, "BAD_REQUEST", `${facet} Invalid facet`,HttpStatus.BAD_REQUEST);

}

Expand All @@ -146,7 +144,7 @@ export class AttendanceService {
});

if (!tree) {
APIResponse.error(response,apiId,"Invalid Sort Key","BAD_REQUEST",HttpStatus.BAD_REQUEST);
return APIResponse.error(response,apiId,"Invalid Sort Key","BAD_REQUEST",HttpStatus.BAD_REQUEST);
}
result[field] = tree[field];
}
Expand All @@ -159,23 +157,11 @@ export class AttendanceService {
// result: result,
// },
// });
APIResponse.success(response,apiId,result,HttpStatus.OK,"Ateendance List Fetched Successfully");
return APIResponse.success(response,apiId,result,HttpStatus.OK,"Ateendance List Fetched Successfully");
}
} catch (error) {
if (error.code === '22P02') {
// Handle invalid input value error
// return new ErrorResponseTypeOrm({
// statusCode: HttpStatus.BAD_REQUEST,
// errorMessage: `Invalid value entered for ${error.routine}`,
// });
APIResponse.error(response,apiId,"Invalid input value error",`Invalid value entered for ${error.routine}`,HttpStatus.BAD_REQUEST)
}
// Handle other errors with internal server error response
APIResponse.error(response,apiId,"INTERNAL_SERVER_ERROR",error,HttpStatus.BAD_REQUEST)
// return new ErrorResponseTypeOrm({
// statusCode: HttpStatus.INTERNAL_SERVER_ERROR,
// errorMessage: error, // Use error message if available
// });
const errorMessage = error.message || "Internal Server Error";
return APIResponse.error(response,apiId,"INTERNAL_SERVER_ERROR",errorMessage,HttpStatus.INTERNAL_SERVER_ERROR)
}
}

Expand Down Expand Up @@ -537,18 +523,19 @@ export class AttendanceService {
try {
const attendanceFound = await this.updateAttendance(attendanceDto,loginUserId);
if (attendanceFound) {
APIResponse.success(res,apiId,attendanceFound,HttpStatus.OK,"Attendance updated successfully");
return APIResponse.success(res,apiId,attendanceFound,HttpStatus.OK,"Attendance updated successfully");
} else {
if (!attendanceDto.scope) {
attendanceDto.scope = 'student';
}
attendanceDto.createdBy = loginUserId;
attendanceDto.updatedBy = loginUserId;
let attendanceCreated = await this.createAttendance(attendanceDto);
APIResponse.success(res,apiId,attendanceCreated,HttpStatus.CREATED,"Attendance created successfully");
return APIResponse.success(res,apiId,attendanceCreated,HttpStatus.CREATED,"Attendance created successfully");
}
} catch (e) {
APIResponse.error(res, apiId, "Internal Server Error", `Error is ${e}`,HttpStatus.INTERNAL_SERVER_ERROR);
const errorMessage = e.message || "Internal Server Error";
return APIResponse.error(res, apiId, "Internal Server Error", errorMessage,HttpStatus.INTERNAL_SERVER_ERROR);
}
}

Expand Down Expand Up @@ -694,16 +681,15 @@ export class AttendanceService {
}
if (errors.length > 0) {
if(!results.length){
APIResponse.error(res, apiId, "BAD_REQUEST", `Attendance Can not be created or updated.Error is ${errors[0].error}`, HttpStatus.BAD_REQUEST);
return APIResponse.error(res, apiId, "BAD_REQUEST", `Attendance Can not be created or updated.Error is ${errors[0].error}`, HttpStatus.BAD_REQUEST);
}
APIResponse.success(res, apiId, { count: count, errors: errors, successresults: results }, HttpStatus.CREATED, "Bulk Attendance Processed with some errors");
return APIResponse.success(res, apiId, { count: count, errors: errors, successresults: results }, HttpStatus.CREATED, "Bulk Attendance Processed with some errors");
} else {
APIResponse.success(res, apiId, { count: count, results: results }, HttpStatus.CREATED, "Bulk Attendance Updated successfully");
return APIResponse.success(res, apiId, { count: count, results: results }, HttpStatus.CREATED, "Bulk Attendance Updated successfully");
}
} catch (e) {
APIResponse.error(res, apiId, "Internal Server Error", `Error is ${e}`, HttpStatus.INTERNAL_SERVER_ERROR);
const errorMessage = e.message || "Internal Server Error";
return APIResponse.error(res, apiId, "Internal Server Error", errorMessage, HttpStatus.INTERNAL_SERVER_ERROR);
}
}


}

0 comments on commit 3ccbba2

Please sign in to comment.