Compare commits
20 Commits
da028ea2c4
...
deadline
| Author | SHA1 | Date | |
|---|---|---|---|
|
7fead5486b
|
|||
|
5cc214a29b
|
|||
|
65a6ae2e3c
|
|||
|
83d07a2812
|
|||
|
e8acfd7b30
|
|||
|
438ae4b5d0
|
|||
|
6ccc899320
|
|||
|
5afb6e22bf
|
|||
|
bdba2f6e29
|
|||
|
30c6f2e3f1
|
|||
|
b47ec6c440
|
|||
|
b4f200cb32
|
|||
|
ec53fcb247
|
|||
|
371d960cf3
|
|||
|
3525fb12e6
|
|||
|
82afff9878
|
|||
|
fef2bda082
|
|||
|
f87aecaf75
|
|||
|
170b9a5693
|
|||
|
c9ca39ddfa
|
2
.idea/inspectionProfiles/Project_Default.xml
generated
2
.idea/inspectionProfiles/Project_Default.xml
generated
@@ -3,7 +3,7 @@
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
|
||||
<Languages>
|
||||
<language minSize="114" name="TypeScript" />
|
||||
<language minSize="174" name="TypeScript" />
|
||||
</Languages>
|
||||
</inspection_tool>
|
||||
</profile>
|
||||
|
||||
6
db.sql
6
db.sql
@@ -77,7 +77,7 @@ CREATE TABLE `models` (
|
||||
-- Table structure for table `rents`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS 'rents';
|
||||
DROP TABLE IF EXISTS `rents`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `rents` (
|
||||
@@ -88,7 +88,7 @@ CREATE TABLE `rents` (
|
||||
`eat` date NOT NULL,
|
||||
`need_survey` tinyint(1) DEFAULT NULL,
|
||||
`km_at_start` int(11) DEFAULT NULL,
|
||||
`id` tinyint(1) NOT NULL,
|
||||
`id` varchar(36) NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `rent_vehicles_id_fk` (`vehicle_id`),
|
||||
KEY `rent_users_id_fk` (`user_id`),
|
||||
@@ -152,4 +152,4 @@ CREATE TABLE `vehicles` (
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
|
||||
-- Dump completed on 2024-04-29 14:54:00
|
||||
-- Dump completed on 2024-05-03 14:56:07
|
||||
|
||||
BIN
schema-db.png
BIN
schema-db.png
Binary file not shown.
|
Before Width: | Height: | Size: 176 KiB After Width: | Height: | Size: 198 KiB |
@@ -42,7 +42,7 @@ async function createModel(req: Request, res: Response): Promise<Response> {
|
||||
|
||||
async function updateModel(req: Request, res: Response): Promise<Response> {
|
||||
const body: IDbModel = req.body;
|
||||
const doesExist = await ModelService.getBySlug(`${body.slug_name}`);
|
||||
const doesExist = await ModelService.getBySlug(`${req.params["modelSlug"]}`);
|
||||
if (!doesExist) {
|
||||
logger.error("Model does not exist");
|
||||
return res.status(404).json({
|
||||
|
||||
150
src/controllers/rent.controller.ts
Normal file
150
src/controllers/rent.controller.ts
Normal file
@@ -0,0 +1,150 @@
|
||||
import { isDebugMode } from "@utils/debugState";
|
||||
import type { Request, Response } from "express";
|
||||
import { Logger } from "tslog";
|
||||
import RentService from "@services/rent.service";
|
||||
import {HttpStatusCode} from "@interfaces/requests/HttpStatusCode";
|
||||
import type IDbRent from "@interfaces/database/IDbRent";
|
||||
import JwtService from "@services/jwt.service";
|
||||
import UserService from "@services/user.service";
|
||||
|
||||
|
||||
const logger = new Logger({
|
||||
name: "RentController",
|
||||
});
|
||||
|
||||
async function createRent(req: Request, res: Response): Promise<Response> {
|
||||
try {
|
||||
const rentData: IDbRent = req.body;
|
||||
if (!rentData.active || !rentData.need_survey || !rentData.eat || !rentData.iat || !rentData.user_id || !rentData.vehicle_id || !rentData.km_at_start || !rentData.active) {
|
||||
logger.error("Invalid rent data");
|
||||
return res.status(HttpStatusCode.BadRequest).json({
|
||||
error: "Invalid rent data",
|
||||
});
|
||||
}
|
||||
const rent = await RentService.create(rentData);
|
||||
logger.info(`\n\n> Rent created successfully! (ID: ${rentData.vehicle_id})\n`);
|
||||
return res.status(201).json({
|
||||
message: "Rent created successfully",
|
||||
rent,
|
||||
});
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Failed to create rent !\n${error}\n`);
|
||||
return res.status(500).json({
|
||||
error: "Failed to create rent",
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async function updateRent(req: Request, res: Response): Promise<Response> {
|
||||
const body: IDbRent = req.body;
|
||||
if (!body.vehicle_id || !body.user_id || !body.active || !body.need_survey || !body.eat || !body.iat || !body.km_at_start) {
|
||||
logger.error("Invalid rent data");
|
||||
return res.status(HttpStatusCode.BadRequest).json({
|
||||
error: "Invalid rent data",
|
||||
});
|
||||
}
|
||||
const rentId = req.params["rentId"];
|
||||
if (!rentId || rentId.length !== 36) {
|
||||
logger.error("Invalid rent ID");
|
||||
return res.status(HttpStatusCode.BadRequest).json({
|
||||
error: "Invalid rent ID",
|
||||
});
|
||||
}
|
||||
const result = await RentService.update({
|
||||
id: rentId,
|
||||
vehicle_id: ``,
|
||||
user_id: ``,
|
||||
active: !!body.active,
|
||||
need_survey: !!body.need_survey,
|
||||
eat: body.eat,
|
||||
iat: body.iat,
|
||||
km_at_start: body.km_at_start,
|
||||
})
|
||||
if (!result) {
|
||||
logger.error(`Failed to update rent with ID: ${rentId}`);
|
||||
return res.status(HttpStatusCode.InternalServerError).json({
|
||||
error: `Failed to update rent with ID: ${rentId}`,
|
||||
});
|
||||
}
|
||||
logger.info(`Rent with ID: ${rentId} updated successfully`);
|
||||
return res.status(HttpStatusCode.Ok).json({
|
||||
message: `Rent with ID: ${rentId} updated successfully`,
|
||||
});
|
||||
}
|
||||
|
||||
async function getAllAssigned(res: Response): Promise<Response> {
|
||||
const rents = await RentService.getAll();
|
||||
if (rents.length === 0) {
|
||||
return res.status(HttpStatusCode.NotFound).json({
|
||||
error: "No assigned rents found",
|
||||
});
|
||||
}
|
||||
return res.status(HttpStatusCode.Ok).json({
|
||||
iat: Date.now(),
|
||||
rents: rents,
|
||||
total: rents.length
|
||||
});
|
||||
}
|
||||
|
||||
async function getAssignedToUser(req: Request, res: Response): Promise<Response> {
|
||||
const authHeader = req.headers.authorization;
|
||||
const bearerToken = authHeader?.split(" ")[1];
|
||||
if (!bearerToken) {
|
||||
logger.warn(`Bearer token not provided (${req.ip})`);
|
||||
return res
|
||||
.type("application/json")
|
||||
.status(HttpStatusCode.Unauthorized)
|
||||
.json({
|
||||
error: "Unauthorized",
|
||||
});
|
||||
}
|
||||
const payload = await JwtService.verify(bearerToken);
|
||||
if (!payload || !payload.sub) {
|
||||
logger.warn(`Unauthorized access attempt (${req.ip})`);
|
||||
return res
|
||||
.type("application/json")
|
||||
.status(HttpStatusCode.Unauthorized)
|
||||
.json({
|
||||
error: "Unauthorized",
|
||||
});
|
||||
}
|
||||
const sourceUser = await UserService.getFromId(payload.sub);
|
||||
if (!sourceUser) {
|
||||
return res.type("application/json").status(HttpStatusCode.ImATeapot).json({
|
||||
error: "You dont exist anymore",
|
||||
});
|
||||
}
|
||||
const userId: string = payload.sub;
|
||||
if (!userId || userId.length !== 36) {
|
||||
logger.error("Invalid user ID");
|
||||
return res.status(HttpStatusCode.BadRequest).json({
|
||||
error: "Invalid user ID",
|
||||
});
|
||||
}
|
||||
let targetId = userId
|
||||
if ("is_admin" in sourceUser && sourceUser.is_admin) {
|
||||
targetId = req.body.targetId || userId
|
||||
}
|
||||
const rents = await RentService.getUserRent(targetId);
|
||||
if (!rents) {
|
||||
return res.status(HttpStatusCode.NotFound).json({
|
||||
error: "No assigned rents found for the user",
|
||||
});
|
||||
}
|
||||
return res.status(HttpStatusCode.Ok).json({
|
||||
iat: Date.now(),
|
||||
rents: rents,
|
||||
total: rents.length,
|
||||
});
|
||||
}
|
||||
|
||||
if (isDebugMode()) logger.debug("\nController loaded.");
|
||||
|
||||
const RentController = {
|
||||
create: createRent,
|
||||
update: updateRent,
|
||||
getAll: getAllAssigned,
|
||||
getAssignedToUser,
|
||||
};
|
||||
|
||||
export default RentController;
|
||||
174
src/controllers/vehicle.controller.ts
Normal file
174
src/controllers/vehicle.controller.ts
Normal file
@@ -0,0 +1,174 @@
|
||||
import type { IDbVehicle } from "@interfaces/database/IDbVehicle";
|
||||
import VehicleService from "@services/vehicle.service";
|
||||
import { isDebugMode } from "@utils/debugState";
|
||||
import type { Request, Response } from "express";
|
||||
import { Logger } from "tslog";
|
||||
//import {validationResult} from "express-validator";
|
||||
|
||||
const logger = new Logger({
|
||||
name: "VehicleController",
|
||||
});
|
||||
|
||||
/**
|
||||
* Creates a new vehicle in the database.
|
||||
*
|
||||
* @param {Request} req - The request object containing the vehicle details in the body.
|
||||
* @param {Response} res - The response object used to send the result of the operation.
|
||||
* @returns {Promise<Response>} The response with the result of the operation.
|
||||
*/
|
||||
async function createVehicle(req: Request, res: Response): Promise<Response> {
|
||||
const body: IDbVehicle = req.body;
|
||||
const createResult = await VehicleService.create({
|
||||
plate_number: `${body.plate_number}`,
|
||||
model_id: `${body.plate_number}`,
|
||||
odometer: Number.parseInt(`${body.odometer}`),
|
||||
health_state: Number.parseInt(`${body.health_state}`),
|
||||
});
|
||||
if (!createResult) {
|
||||
logger.error("Failed to create vehicle");
|
||||
return res.status(500).json({
|
||||
error: "Failed to create vehicle",
|
||||
});
|
||||
}
|
||||
logger.info(`Vehicle created successfully ! (${body.plate_number})`);
|
||||
return res.status(201).json({
|
||||
message: "Vehicle created successfully",
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates a vehicle in the database.
|
||||
*
|
||||
* @param {Request} req - The request object containing the vehicle data in the request body and the vehicle ID in the request parameters.
|
||||
* @param {Response} res - The response object used to send the result of the update operation.
|
||||
*
|
||||
* @return {Promise<Response>} A promise that resolves to the response object with a status and a JSON body indicating the result of the update operation.
|
||||
*/
|
||||
async function updateVehicle(req: Request, res: Response): Promise<Response> {
|
||||
const body: IDbVehicle = req.body;
|
||||
const vehicleId = req.params["vehicleId"];
|
||||
if (!vehicleId || vehicleId.length !== 36) {
|
||||
if (isDebugMode()) logger.error("Vehicle ID is missing");
|
||||
return res.status(400).json({
|
||||
error: "Vehicle ID is missing or not valid",
|
||||
});
|
||||
}
|
||||
const updateResult = await VehicleService.update({
|
||||
plate_number: `${body.plate_number}`,
|
||||
model_id: `${body.plate_number}`,
|
||||
odometer: Number.parseInt(`${body.odometer}`),
|
||||
health_state: Number.parseInt(`${body.health_state}`),
|
||||
});
|
||||
if (!updateResult) {
|
||||
logger.error("Failed to update vehicle");
|
||||
return res.status(500).json({
|
||||
error: "Failed to update vehicle",
|
||||
});
|
||||
}
|
||||
logger.info(`Vehicle updated successfully ! (${body.plate_number})`);
|
||||
return res.status(200).json({
|
||||
message: "Vehicle updated successfully",
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves all vehicles from the vehicle service.
|
||||
*
|
||||
* @param {Response} res - The response object from the client.
|
||||
* @returns {Promise<Response>} A promise that resolves to a response object containing the result of the operation. The result is a JSON object containing all vehicles.
|
||||
*/
|
||||
async function getAllVehicle(res: Response): Promise<Response> {
|
||||
const getAllVehicleResult = await VehicleService.getAll();
|
||||
if (!getAllVehicleResult) {
|
||||
logger.error("Failed to get all vehicles");
|
||||
return res.status(500).json({
|
||||
error: "Failed to get all vehicles",
|
||||
});
|
||||
}
|
||||
return res.status(200).json(getAllVehicleResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the available vehicles from the VehicleService
|
||||
*
|
||||
* @param {Response} res - The Response object to send the result to
|
||||
* @returns {Promise<Response<any, Record<string, any>>>} - A promise that resolves to a Response object containing the available vehicles or an error message
|
||||
*/
|
||||
async function getAvailableVehicle(res: Response): Promise<Response<any, Record<string, any>>> {
|
||||
const getAvailableVehicleResult = await VehicleService.getAvailable();
|
||||
if (!getAvailableVehicleResult) {
|
||||
logger.error("Failed to get available vehicles");
|
||||
return res.status(500).json({
|
||||
error: "Failed to get available vehicles",
|
||||
});
|
||||
}
|
||||
return res.status(200).json(getAvailableVehicleResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves a vehicle by its ID.
|
||||
*
|
||||
* @param {Request} req - The request object containing the vehicle ID.
|
||||
* @param {Response} res - The response object used to send the result.
|
||||
*
|
||||
* @return {Promise<Response>} A promise that resolves to the result of the retrieval operation.
|
||||
*/
|
||||
async function getVehicleById(req: Request, res: Response): Promise<Response> {
|
||||
const vehicleId = req.params["vehicleId"];
|
||||
if (!vehicleId || vehicleId.length !== 36) {
|
||||
if (isDebugMode()) logger.error("Vehicle ID is missing or not valid");
|
||||
return res.status(400).json({
|
||||
error: "Vehicle ID is missing or not valid",
|
||||
});
|
||||
}
|
||||
const getVehicleResult = await VehicleService.getById(vehicleId);
|
||||
if (!getVehicleResult) {
|
||||
logger.error(`Failed to get vehicle by ID: ${vehicleId}`);
|
||||
return res.status(500).json({
|
||||
error: `Failed to get vehicle by ID: ${vehicleId}`,
|
||||
});
|
||||
}
|
||||
return res.status(200).json(getVehicleResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a vehicle.
|
||||
*
|
||||
* @param {Object} req - The request object.
|
||||
* @param {Object} res - The response object.
|
||||
*
|
||||
* @return {Promise<Response>} A promise that resolves to the response JSON object.
|
||||
*/
|
||||
async function deleteVehicle(req: Request, res: Response): Promise<Response> {
|
||||
const vehicleId = req.params["vehicleId"];
|
||||
if (!vehicleId || vehicleId.length !== 36) {
|
||||
if (isDebugMode()) logger.error("Vehicle ID is missing or not valid");
|
||||
return res.status(400).json({
|
||||
error: "Vehicle ID is missing or not valid",
|
||||
});
|
||||
}
|
||||
const deleteResult = await VehicleService.delete(vehicleId);
|
||||
if (!deleteResult) {
|
||||
logger.error(`Failed to delete vehicle with ID: ${vehicleId}`);
|
||||
return res.status(500).json({
|
||||
error: `Failed to delete vehicle with ID: ${vehicleId}`,
|
||||
});
|
||||
}
|
||||
logger.info(`Vehicle deleted successfully ! (ID: ${vehicleId})`);
|
||||
return res.status(200).json({
|
||||
message: "Vehicle deleted successfully",
|
||||
});
|
||||
}
|
||||
|
||||
if (isDebugMode()) logger.debug("\nController loaded.");
|
||||
|
||||
const VehicleController = {
|
||||
create: createVehicle,
|
||||
update: updateVehicle,
|
||||
getAll: getAllVehicle,
|
||||
delete: deleteVehicle,
|
||||
getById: getVehicleById,
|
||||
getAvailable: getAvailableVehicle,
|
||||
};
|
||||
|
||||
export default VehicleController;
|
||||
@@ -4,4 +4,5 @@ export interface IDbVehicle {
|
||||
model_id: string;
|
||||
odometer: number;
|
||||
health_state: number;
|
||||
isAvailable?: boolean;
|
||||
}
|
||||
|
||||
@@ -1,27 +1,29 @@
|
||||
import AdminGuard from "@validators/AdminGuard";
|
||||
import UserGuard from "@validators/UserGuard";
|
||||
import express, { type Router } from "express";
|
||||
import VehicleController from "@controllers/vehicle.controller";
|
||||
import RentController from "@controllers/rent.controller";
|
||||
|
||||
const RentRouter: Router = express.Router();
|
||||
|
||||
// Get rent affected to the user
|
||||
RentRouter.route("/affected").get(UserGuard);
|
||||
RentRouter.route("/affected").get(UserGuard, RentController.getAssignedToUser);
|
||||
|
||||
// Get all vehicle in rent (admin only)
|
||||
RentRouter.route("/affected/all").get(AdminGuard);
|
||||
RentRouter.route("/affected/all").get(AdminGuard, RentController.getAll);
|
||||
|
||||
// Add a new vehicle (admin only)
|
||||
RentRouter.route("/veh/new").post(AdminGuard);
|
||||
RentRouter.route("/veh/new").post(AdminGuard, VehicleController.create);
|
||||
|
||||
// Get all vehicles
|
||||
RentRouter.route("/veh/all").get();
|
||||
RentRouter.route("/veh/all").get(VehicleController.getAll);
|
||||
|
||||
// Rent a specific vehicle
|
||||
RentRouter.route("/veh/rent/:vehicleId").post(UserGuard);
|
||||
|
||||
RentRouter.route("/veh/:vehicleId")
|
||||
.get(UserGuard)
|
||||
.patch(AdminGuard)
|
||||
.delete(AdminGuard);
|
||||
.get(UserGuard, VehicleController.getById)
|
||||
.patch(AdminGuard, VehicleController.update)
|
||||
.delete(AdminGuard, VehicleController.delete);
|
||||
|
||||
export default RentRouter;
|
||||
|
||||
@@ -80,12 +80,14 @@ async function deleteModel(modelSlug: string): Promise<boolean> {
|
||||
}
|
||||
logger.info(`Deleting model with ID: ${modelSlug}`);
|
||||
const doesExist = await MysqlService.Model.getBySlug(DbHandler, modelSlug);
|
||||
if (!doesExist || !doesExist.id) {
|
||||
if (!doesExist[0]) {
|
||||
logger.warn(`Model with slug ${modelSlug} not found`);
|
||||
return false;
|
||||
}
|
||||
const target = doesExist[0]
|
||||
if (!target.id) return false;
|
||||
try {
|
||||
await MysqlService.Model.delete(DbHandler, doesExist.id);
|
||||
await MysqlService.Model.delete(DbHandler, target.id);
|
||||
logger.info("Deletion Successful !");
|
||||
return true;
|
||||
} catch (error) {
|
||||
@@ -104,11 +106,11 @@ async function getBySlugModel(modelSlug: string): Promise<IDbModel | null> {
|
||||
logger.info(`Fetching model with slug: ${modelSlug}`);
|
||||
try {
|
||||
const model = await MysqlService.Model.getBySlug(DbHandler, modelSlug);
|
||||
if (!model) {
|
||||
if (!model[0]) {
|
||||
logger.warn(`Model with slug ${modelSlug} not found`);
|
||||
return null;
|
||||
}
|
||||
return model;
|
||||
return model[0];
|
||||
} catch (error) {
|
||||
logger.error(`Error fetching model by slug: ${error}`);
|
||||
return null;
|
||||
|
||||
@@ -228,9 +228,7 @@ const MySqlService = {
|
||||
actionName: "Update user..",
|
||||
})
|
||||
.then((factorizeResult) => {
|
||||
const _sql = `UPDATE users SET (${factorizeResult._keysTemplate}) WERE id VALUES(${
|
||||
factorizeResult._questionMarksFields
|
||||
})`;
|
||||
const _sql = `UPDATE users SET (${factorizeResult._keysTemplate}) WERE id VALUES(${factorizeResult._questionMarksFields})`;
|
||||
|
||||
try {
|
||||
if (isDebugMode()) handler.Logger.trace(_sql);
|
||||
@@ -432,9 +430,7 @@ const MySqlService = {
|
||||
actionName: "Update brand..",
|
||||
})
|
||||
.then((factorizeResult) => {
|
||||
const _sql = `UPDATE brands SET (${factorizeResult._keysTemplate}) WERE id VALUES(${
|
||||
factorizeResult._questionMarksFields
|
||||
})`;
|
||||
const _sql = `UPDATE brands SET (${factorizeResult._keysTemplate}) WERE id VALUES(${factorizeResult._questionMarksFields})`;
|
||||
|
||||
try {
|
||||
if (isDebugMode()) handler.Logger.trace(_sql);
|
||||
@@ -573,20 +569,20 @@ const MySqlService = {
|
||||
},
|
||||
|
||||
/**
|
||||
* Retrieves a database model by slug from a given MySQL handler.
|
||||
* Retrieves a list of database models by slug name.
|
||||
*
|
||||
* @param {MysqlHandler} handler - The MySQL handler instance.
|
||||
* @param {string} modelSlug - The slug of the model to retrieve.
|
||||
* @return {Promise<IDbModel>} A promise that resolves with the retrieved model.
|
||||
* @throws {Error} If there was an error executing the query.
|
||||
* @param {MysqlHandler} handler - The MySQL handler used to execute the query.
|
||||
* @param {string} modelSlug - The slug name of the model to retrieve.
|
||||
* @return {Promise<Array<IDbModel>>} - A promise that resolves to an array of database models.
|
||||
* @throws {Error} - If an error occurs during the execution of the query.
|
||||
*/
|
||||
getBySlug(handler: MysqlHandler, modelSlug: string): Promise<IDbModel> {
|
||||
getBySlug(handler: MysqlHandler, modelSlug: string): Promise<Array<IDbModel>> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const _sql = "SELECT * FROM models WHERE slug_name VALUES(?)";
|
||||
const _values = [modelSlug];
|
||||
try {
|
||||
handler.execute(_sql, _values).then((result) => {
|
||||
return resolve(result as unknown as IDbModel);
|
||||
return resolve(result as unknown as Array<IDbModel>);
|
||||
});
|
||||
} catch (err: unknown) {
|
||||
reject(err as Error);
|
||||
@@ -672,9 +668,7 @@ const MySqlService = {
|
||||
actionName: "Update model..",
|
||||
})
|
||||
.then((factorizeResult) => {
|
||||
const _sql = `UPDATE models SET (${factorizeResult._keysTemplate}) WERE id VALUES(${
|
||||
factorizeResult._questionMarksFields
|
||||
})`;
|
||||
const _sql = `UPDATE models SET (${factorizeResult._keysTemplate}) WERE id VALUES(${factorizeResult._questionMarksFields})`;
|
||||
|
||||
try {
|
||||
if (isDebugMode()) handler.Logger.trace(_sql);
|
||||
@@ -778,9 +772,7 @@ const MySqlService = {
|
||||
actionName: "Update vehicle..",
|
||||
})
|
||||
.then((factorizeResult) => {
|
||||
const _sql = `UPDATE vehicles SET (${factorizeResult._keysTemplate}) WERE id VALUES(${
|
||||
factorizeResult._questionMarksFields
|
||||
})`;
|
||||
const _sql = `UPDATE vehicles SET (${factorizeResult._keysTemplate}) WERE id VALUES(${factorizeResult._questionMarksFields})`;
|
||||
|
||||
try {
|
||||
if (isDebugMode()) handler.Logger.trace(_sql);
|
||||
@@ -803,14 +795,14 @@ const MySqlService = {
|
||||
},
|
||||
|
||||
/**
|
||||
* Retrieves a vehicle from the database by its ID.
|
||||
* Retrieves an array of vehicles from the database by a given vehicle ID.
|
||||
*
|
||||
* @param {MysqlHandler} handler - The instance of the MySQL handler.
|
||||
* @param {MysqlHandler} handler - The MySQL handler object for executing database queries.
|
||||
* @param {string} vehicleId - The ID of the vehicle to retrieve.
|
||||
* @returns {Promise<IDbVehicle>} - A promise that resolves to the retrieved vehicle.
|
||||
* @throws {Error} - If an error occurs while retrieving the vehicle.
|
||||
* @returns {Promise<Array<IDbVehicle>>} - A promise that resolves with an array of vehicles matching the ID.
|
||||
* @throws {Error} - If there is an error executing the query or the ID is invalid.
|
||||
*/
|
||||
getById(handler: MysqlHandler, vehicleId: string): Promise<IDbVehicle> {
|
||||
getById(handler: MysqlHandler, vehicleId: string): Promise<Array<IDbVehicle>> {
|
||||
return new Promise((resolve, reject) => {
|
||||
if (!vehicleId) return reject("Id is undefined");
|
||||
if (vehicleId.length !== 36) return reject("Id invalid");
|
||||
@@ -818,7 +810,7 @@ const MySqlService = {
|
||||
const _values = [vehicleId];
|
||||
try {
|
||||
handler.execute(_sql, _values).then((result) => {
|
||||
return resolve(result as unknown as IDbVehicle);
|
||||
return resolve(result as unknown as Array<IDbVehicle>);
|
||||
});
|
||||
} catch (err: unknown) {
|
||||
reject(err as Error);
|
||||
@@ -903,9 +895,9 @@ const MySqlService = {
|
||||
.then((factorizedResult) => {
|
||||
const valuesArray = factorizedResult._valuesArray;
|
||||
const template = factorizedResult._keysTemplate;
|
||||
const _sql = `INSERT INTO categories (${template + `, id`}) VALUES(${
|
||||
factorizedResult._questionMarksFields
|
||||
})`;
|
||||
const _sql = `INSERT INTO categories (${
|
||||
template + `, id`
|
||||
}) VALUES(${factorizedResult._questionMarksFields})`;
|
||||
|
||||
try {
|
||||
if (isDebugMode()) handler.Logger.trace(_sql);
|
||||
@@ -939,9 +931,7 @@ const MySqlService = {
|
||||
actionName: "Update brand..",
|
||||
})
|
||||
.then((factorizeResult) => {
|
||||
const _sql = `UPDATE categories SET (${factorizeResult._keysTemplate}) WERE id VALUES(${
|
||||
factorizeResult._questionMarksFields
|
||||
})`;
|
||||
const _sql = `UPDATE categories SET (${factorizeResult._keysTemplate}) WERE id VALUES(${factorizeResult._questionMarksFields})`;
|
||||
|
||||
try {
|
||||
if (isDebugMode()) handler.Logger.trace(_sql);
|
||||
@@ -1066,7 +1056,10 @@ const MySqlService = {
|
||||
* @param {string} categoryId - The ID of the category.
|
||||
* @return {Promise<Array<IDbModel>>} - A promise that resolves to an array of database models belonging to the specified category.
|
||||
*/
|
||||
getAllModelsFromCategory(handler: MysqlHandler, categoryId: string): Promise<Array<IDbModel>> {
|
||||
getAllModelsFromCategory(
|
||||
handler: MysqlHandler,
|
||||
categoryId: string,
|
||||
): Promise<Array<IDbModel>> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const _sql =
|
||||
"SELECT models.* FROM models INNER JOIN categories ON models.category_id = categories.id WHERE categories.id VALUES(?)";
|
||||
@@ -1079,7 +1072,6 @@ const MySqlService = {
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
},
|
||||
Rent: {
|
||||
//ToTest
|
||||
@@ -1143,6 +1135,32 @@ const MySqlService = {
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* Retrieves rental information from the database by rental ID.
|
||||
*
|
||||
* @param {MysqlHandler} handler - The instance of the MySQL handler used to execute the query.
|
||||
* @param {string} rentId - The ID of the rental to retrieve.
|
||||
*
|
||||
* @returns {Promise<Array<IDbRent>>} A promise that resolves with an array of rental information
|
||||
* or rejects with an error message if the ID is undefined or invalid.
|
||||
*/
|
||||
getById(handler: MysqlHandler, rentId: string): Promise<Array<IDbRent>> {
|
||||
return new Promise((resolve, reject) => {
|
||||
if (!rentId) return reject("Id is undefined");
|
||||
if (rentId.length !== 36) return reject("Id invalid");
|
||||
const _sql = "SELECT * FROM rents WHERE id VALUES(?)";
|
||||
const _values = [rentId];
|
||||
try {
|
||||
handler.execute(_sql, _values).then((result) => {
|
||||
return resolve(result as unknown as Array<IDbRent>);
|
||||
});
|
||||
} catch (err: unknown) {
|
||||
reject(err as Error);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
//ToTest
|
||||
/**
|
||||
* Retrieves all assigned vehicles from the database.
|
||||
*
|
||||
@@ -1164,6 +1182,16 @@ const MySqlService = {
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
//ToTest
|
||||
/**
|
||||
* Updates a rent record in the database.
|
||||
*
|
||||
* @param {MysqlHandler} handler - The database handler object.
|
||||
* @param {IDbRent} data - The rent object containing the updated data.
|
||||
* @returns {Promise<IDbStatusResult>} - A promise that resolves to the status result of the update operation.
|
||||
* @throws {Error} - If an error occurs during the update operation.
|
||||
*/
|
||||
update(handler: MysqlHandler, data: IDbRent): Promise<IDbStatusResult> {
|
||||
return new Promise((resolve, reject) => {
|
||||
if (!data.id) return reject("Id is undefined");
|
||||
@@ -1197,10 +1225,7 @@ const MySqlService = {
|
||||
});
|
||||
},
|
||||
|
||||
delete(
|
||||
handler: MysqlHandler,
|
||||
rentId: string,
|
||||
): Promise<IDbStatusResult> {
|
||||
delete(handler: MysqlHandler, rentId: string): Promise<IDbStatusResult> {
|
||||
return new Promise((resolve, reject) => {
|
||||
if (!rentId) return reject("Id is undefined");
|
||||
if (rentId.length !== 36) return reject("Id invalid");
|
||||
|
||||
182
src/services/rent.service.ts
Normal file
182
src/services/rent.service.ts
Normal file
@@ -0,0 +1,182 @@
|
||||
//import { ErrorType, type ISError } from "@interfaces/services/ISError";
|
||||
import MySqlService from "@services/mysql.service";
|
||||
import { isDebugMode } from "@utils/debugState";
|
||||
import { Logger } from "tslog";
|
||||
import { v4 } from "uuid";
|
||||
import IDbRent from "@interfaces/database/IDbRent";
|
||||
|
||||
const logger = new Logger({
|
||||
name: "RentService",
|
||||
});
|
||||
|
||||
const DbHandler = new MySqlService.Handler("RentService");
|
||||
|
||||
async function createRentService(data: IDbRent): Promise<boolean> {
|
||||
if (isDebugMode()) logger.debug(`\n\n> Creating a new rent...\n`);
|
||||
const wantedVehicleId = data.id;
|
||||
const targetUserId = data.user_id;
|
||||
if (!targetUserId || !wantedVehicleId) {
|
||||
logger.error(`Missing targetUserId or targetVehicleId`);
|
||||
return false;
|
||||
}
|
||||
const userIfExist = await MySqlService.User.getById(DbHandler, targetUserId);
|
||||
if (!userIfExist[0]) {
|
||||
logger.error(`User does not exist`);
|
||||
return false;
|
||||
}
|
||||
const targetUser = userIfExist[0]
|
||||
if (!targetUser.id) return false;
|
||||
const vehicleIfExist = await MySqlService.Vehicle.getById(DbHandler, wantedVehicleId);
|
||||
if (!vehicleIfExist[0] || !vehicleIfExist[0].id) {
|
||||
logger.error(`Vehicle does not exist`);
|
||||
return false;
|
||||
}
|
||||
const vehicleId = vehicleIfExist[0].id
|
||||
if (!vehicleIfExist[0].isAvailable) {
|
||||
logger.error(`Vehicle is not available`);
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
const result = await MySqlService.Rent.insert(DbHandler, {
|
||||
id: v4(),
|
||||
vehicle_id: vehicleId,
|
||||
user_id: targetUser.id,
|
||||
active: data.active,
|
||||
iat: new Date(Date.parse(`${data.iat}`)),
|
||||
eat: new Date(Date.parse(`${data.eat}`)),
|
||||
need_survey: data.need_survey,
|
||||
km_at_start: Number.parseInt(`${data.km_at_start}`)
|
||||
});
|
||||
if (result.affectedRows !== 0) {
|
||||
logger.info("\n\n> Success !");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Error creating category: \n${error}\n`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function updateRentService(data: IDbRent) {
|
||||
if (isDebugMode()) logger.debug(`\n\n> Updating a rent...\n`);
|
||||
const wantedVehicleId = data.id;
|
||||
const targetUserId = data.user_id;
|
||||
if (!targetUserId || !wantedVehicleId || !data.id) {
|
||||
logger.error(`Missing targetUserId or targetVehicleId`);
|
||||
return false;
|
||||
}
|
||||
const rentIfExist = await MySqlService.Rent.getById(DbHandler, data.id);
|
||||
if (!rentIfExist[0]) {
|
||||
logger.error(`Rent does not exist`);
|
||||
return false;
|
||||
}
|
||||
const rentId = rentIfExist[0].id;
|
||||
if (!rentId) {
|
||||
logger.error(`RentId does not exist`);
|
||||
return false;
|
||||
}
|
||||
|
||||
const userIfExist = await MySqlService.User.getById(DbHandler, targetUserId);
|
||||
if (!userIfExist[0]) {
|
||||
logger.error(`User does not exist`);
|
||||
return false;
|
||||
}
|
||||
const targetUser = userIfExist[0]
|
||||
if (!targetUser.id) return false;
|
||||
const vehicleIfExist = await MySqlService.Vehicle.getById(DbHandler, wantedVehicleId);
|
||||
if (!vehicleIfExist[0] || !vehicleIfExist[0].id) {
|
||||
logger.error(`Vehicle does not exist`);
|
||||
return false;
|
||||
}
|
||||
const vehicleId = vehicleIfExist[0].id
|
||||
try {
|
||||
const result = await MySqlService.Rent.update(DbHandler, {
|
||||
id: rentId,
|
||||
vehicle_id: vehicleId,
|
||||
user_id: targetUser.id,
|
||||
active: data.active,
|
||||
iat: new Date(Date.parse(`${data.iat}`)),
|
||||
eat: new Date(Date.parse(`${data.eat}`)),
|
||||
need_survey: data.need_survey,
|
||||
km_at_start: Number.parseInt(`${data.km_at_start}`)
|
||||
});
|
||||
if (result.affectedRows !== 0) {
|
||||
logger.info("\n\n> Success !");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Error updating category: \n${error}\n`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function getAllAssignedRentService() {
|
||||
const result = await MySqlService.Rent.getAllAssigned(DbHandler);
|
||||
if (result.length > 0) {
|
||||
return result;
|
||||
}
|
||||
logger.warn(`No assigned rents found`);
|
||||
return [];
|
||||
}
|
||||
|
||||
async function getRentByIdService(rentId: string) {
|
||||
if (!rentId || rentId.length !== 36) {
|
||||
logger.warn(`Id missing or not conform`)
|
||||
return false;
|
||||
}
|
||||
const rent = await MySqlService.Rent.getById(DbHandler, rentId);
|
||||
if (rent.length > 0) {
|
||||
return rent[0];
|
||||
}
|
||||
logger.warn(`Rent not found`);
|
||||
return null;
|
||||
}
|
||||
|
||||
async function deleteRentService(rentId: string) {
|
||||
const rentIfExist = await MySqlService.Rent.getById(DbHandler, rentId);
|
||||
if (!rentIfExist[0]) {
|
||||
logger.error(`Rent does not exist`);
|
||||
return false;
|
||||
}
|
||||
const target = rentIfExist[0]
|
||||
if (!target.id) return false;
|
||||
try {
|
||||
const result = await MySqlService.Rent.delete(DbHandler, target.id);
|
||||
if (result.affectedRows !== 0) {
|
||||
logger.info("\n\n> Success !");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Error deleting rent: \n${error}\n`);
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
async function getUserRentService(userId: string) {
|
||||
if (!userId) {
|
||||
logger.warn(`Missing userId`);
|
||||
return false;
|
||||
}
|
||||
const rents = await MySqlService.Rent.getAssignedToUser(DbHandler, userId);
|
||||
if (rents.length > 0) {
|
||||
return rents;
|
||||
}
|
||||
logger.warn(`No rents found for user`);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isDebugMode()) logger.debug("\nService loaded.");
|
||||
|
||||
const VehicleService = {
|
||||
create: createRentService,
|
||||
update: updateRentService,
|
||||
getAll: getAllAssignedRentService,
|
||||
getById: getRentByIdService,
|
||||
delete: deleteRentService,
|
||||
getUserRent: getUserRentService,
|
||||
};
|
||||
|
||||
export default VehicleService;
|
||||
@@ -1,9 +1,9 @@
|
||||
import type { IDbVehicle } from "@interfaces/database/IDbVehicle";
|
||||
//import { ErrorType, type ISError } from "@interfaces/services/ISError";
|
||||
import MySqlService from "@services/mysql.service";
|
||||
import { isDebugMode } from "@utils/debugState";
|
||||
import { Logger } from "tslog";
|
||||
import { v4 } from "uuid";
|
||||
import {IDbVehicle} from "@interfaces/database/IDbVehicle";
|
||||
|
||||
const logger = new Logger({
|
||||
name: "VehicleService",
|
||||
@@ -19,8 +19,8 @@ async function createVehicleService(data: IDbVehicle) {
|
||||
plate_number: data.plate_number,
|
||||
model_id: data.model_id,
|
||||
odometer: data.odometer | 0,
|
||||
health_state: data.health_state
|
||||
})
|
||||
health_state: data.health_state,
|
||||
});
|
||||
if (result.affectedRows !== 0) {
|
||||
logger.info("\n\n> Success !");
|
||||
return true;
|
||||
@@ -36,24 +36,24 @@ async function updateVehicleService(data: IDbVehicle) {
|
||||
if (isDebugMode()) logger.debug(`\n\n> Updating vehicle...\n`);
|
||||
try {
|
||||
if (!data.id) {
|
||||
return false
|
||||
return false;
|
||||
}
|
||||
const result = await MySqlService.Vehicle.update(DbHandler, {
|
||||
id: data.id,
|
||||
plate_number: data.plate_number,
|
||||
model_id: data.model_id,
|
||||
odometer: data.odometer | 0,
|
||||
health_state: data.health_state
|
||||
});
|
||||
if (result.affectedRows !== 0) {
|
||||
logger.info("\n\n> Success !");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Error updating vehicle: \n${error}\n`);
|
||||
return false;
|
||||
}
|
||||
const result = await MySqlService.Vehicle.update(DbHandler, {
|
||||
id: data.id,
|
||||
plate_number: data.plate_number,
|
||||
model_id: data.model_id,
|
||||
odometer: data.odometer | 0,
|
||||
health_state: data.health_state,
|
||||
});
|
||||
if (result.affectedRows !== 0) {
|
||||
logger.info("\n\n> Success !");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Error updating vehicle: \n${error}\n`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function getAllVehiclesService() {
|
||||
@@ -62,7 +62,7 @@ async function getAllVehiclesService() {
|
||||
return {
|
||||
iat: Date.now(),
|
||||
vehicles: result,
|
||||
total: result.length
|
||||
total: result.length,
|
||||
};
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Error getting vehicles: \n${error}\n`);
|
||||
@@ -72,15 +72,15 @@ async function getAllVehiclesService() {
|
||||
|
||||
async function getVehicleByIdService(vehicleId: string) {
|
||||
try {
|
||||
const result = await MySqlService.Vehicle.getById(DbHandler, vehicleId);
|
||||
return {
|
||||
const result = await MySqlService.Vehicle.getById(DbHandler, vehicleId);
|
||||
return {
|
||||
iat: Date.now(),
|
||||
vehicle: result
|
||||
vehicle: result,
|
||||
};
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Error getting vehicle by id: \n${error}\n`);
|
||||
return false;
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Error getting vehicle by id: \n${error}\n`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function getAvailableVehicleService() {
|
||||
@@ -89,30 +89,28 @@ async function getAvailableVehicleService() {
|
||||
return {
|
||||
iat: Date.now(),
|
||||
vehicles: result,
|
||||
total: result.length
|
||||
total: result.length,
|
||||
};
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Error getting available vehicles: \n${error}\n`);
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function deleteVehicleService(vehicleId: string) {
|
||||
try {
|
||||
//TODO DELETE
|
||||
const result = await MySqlService.Vehicle.delete(DbHandler, vehicleId);
|
||||
if (result.affectedRows !== 0) {
|
||||
logger.info("\n\n> Success !");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Error deleting vehicle: \n${error}\n`);
|
||||
return false;
|
||||
}
|
||||
const result = await MySqlService.Vehicle.delete(DbHandler, vehicleId);
|
||||
if (result.affectedRows !== 0) {
|
||||
logger.info("\n\n> Success !");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
} catch (error) {
|
||||
logger.error(`\n\n> Error deleting vehicle: \n${error}\n`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (isDebugMode()) logger.debug("\nService loaded.");
|
||||
|
||||
const VehicleService = {
|
||||
@@ -121,7 +119,7 @@ const VehicleService = {
|
||||
getAll: getAllVehiclesService,
|
||||
getById: getVehicleByIdService,
|
||||
delete: deleteVehicleService,
|
||||
getAvailable: getAvailableVehicleService
|
||||
}
|
||||
getAvailable: getAvailableVehicleService,
|
||||
};
|
||||
|
||||
export default VehicleService;
|
||||
export default VehicleService;
|
||||
|
||||
Reference in New Issue
Block a user