@ -1,11 +1,15 @@
import { Router , Request , Response , NextFunction , RequestHandler } from 'express' ;
import Controller from '../Icontroller' ;
import HttpException from '../../middleware/exeption/httpExeption' ;
// import LocationService from '../../service/LocationService';
import IUser from '../../database/schema/User/UserInterface' ;
import UserService from '../../service/UserService' ;
import validator from '../../database/schema/User/UserValidation'
import validationMiddleware from '../../middleware/validation/ValidatorMiddleware' ;
import authenticator from '../../middleware/authMiddleware'
import LocationService from '../../service/LocationService' ;
class TaskController implements Controller {
public path = '/task' ;
class UserController implements Controller {
public path = '/users' ;
public router = Router ( ) ;
private userService = new UserService ( ) ;
private locationService = new LocationService ( ) ;
@ -15,131 +19,193 @@ class TaskController implements Controller {
}
private initialiseRoutes ( ) : void {
//create
this . router . post ( ` ${ this . path } ` , this . createUser ) ;
// // get One
this . router . get ( ` ${ this . path } /:userId ` , this . getUserById ) ;
// // get All
this . router . get ( ` ${ this . path } ` , this . getAllUsers ) ;
this . router . post (
` ${ this . path } /register ` ,
validationMiddleware ( validator . register ) ,
this . register
) ;
this . router . post (
` ${ this . path } /login ` ,
validationMiddleware ( validator . login ) ,
this . login
) ;
this . router . get ( ` ${ this . path } ` , authenticator , this . getUser ) ;
this . router . get ( ` ${ this . path } /nextTo ` , authenticator , this . getUserNext ) ;
//update One
this . router . put ( ` ${ this . path } /:userId ` , this . updateUser ) ;
//Delete One
this . router . delete ( ` ${ this . path } /:userId ` , this . deleteUser ) ;
// //create
// this.router.post(`${this.path}`,this.createUser);
// // // get One
// this.router.get (`${this.path}/:userId`, this.getUserById);
// // // get All
// this.router.get (`${this.path}`, this.getAllUsers);
// //update One
// this.router.put (`${this.path}/:userId`, this.updateUser);
// //Delete One
// this.router.delete (`${this.path}/:userId`, this.deleteUser);
}
private createUser = async (
req : Request ,
res : Response ,
next : NextFunction
) : Promise < Response | void > = > {
try {
// private createUser = async (
//
//
// next: NextFunction
// ): Promise<Response | void> => {
// try {
console . log ( req . body ) ;
await this . userService . createUserById ( reqBody . fin
// console.log(req.body);
//
//
// await this.userService.createUserById(reqBody.fin
//
//
} catch ( error ) {
}
} ;
private readonly getUserById : RequestHandler = async (
next : NextFunction
) : Promise < Response | void > = > {
try {
const id = req . params . taskId ;
const userId = req . params . userId ;
// } catch (error) {
//
// }
// };
// private readonly getUserById: RequestHandler = async (
//
//
// next: NextFunction
// ): Promise<Response | void> => {
// try {
// const id = req.params.taskId;
// const userId = req.params.userId;
//
//
}
}
// }
//
//
// }
}
private readonly getAllUsers : RequestHandler = async (
// }
// private readonly getAllUsers: RequestHandler = async (
// req: Request,
// res: Response,
// next: NextFunction
// ): Promise<Response | void> => {
// try {
// const userId = req.params.userId;
// const tasks = await this.userService.getUsers(userId);
// const responseList = tasks.map(task => new TaskResumedRes(task));
// res.status(201).send(responseList);
// }
// catch(error){
// next(new HttpException(400, 'Cannot get user task'));
// }
// }
// private deleteUser = async (
// req: Request,
// res: Response,
// next: NextFunction
// ): Promise<Response | void> => {
// try {
// const id = req.params.taskId;
// const userId = req.params.userId;
// await this.userService.DeleteUser(id, userId);
// return res.status(200).send({ status: "Success", msg: "Data Removed" });
// } catch (error) {
// next(new HttpException(400, 'Cannot create post'));
// }
// };
// private updateUser = async (
// req: Request,
// res: Response,
// next: NextFunction
// ): Promise<Response | void> => {
// try {
// const taskId = req.params.taskId;
// const userId = req.params.userId;
// const reqBody:CreateTaskReqBody = Object.assign({}, req.body);
// const updatedTask = await this.userService.UpdateTask(
// // req.auth!.uid,
// taskId,
// userId,
// // firebase.auth().currentUser.getIdToken()
// reqBody.nom,
// reqBody.description,
// reqBody.logo,
// reqBody.duration,
// reqBody.done,
// // reqBody.tags,
// reqBody.repepat,
// reqBody.deb,
// reqBody.fin
// );
// // res.send('Success add');
// // res.status(201).json({ task });
// res.status(204).send(`Update a new contact: ${updatedTask}`);
// } catch (error) {
// console.log(error);
// next(new HttpException(403, 'Cannot create post'));
// }
// };
private register = async (
req : Request ,
res : Response ,
next : NextFunction
) : Promise < Response | void > = > {
try {
const userId = req . params . userId ;
const tasks = await this . userService . getUsers ( userId ) ;
const responseList = tasks . map ( task = > new TaskResumedRes ( task ) ) ;
res . status ( 201 ) . send ( responseList ) ;
// the FladId should be created by the Userservice
const { name , email , password , idFlad , idSpotify } = req . body ;
const token = await this . userService . register (
name ,
email ,
password ,
idFlad ,
idSpotify
) ;
res . status ( 201 ) . json ( { token } ) ;
} catch ( error : any ) {
next ( new HttpException ( 400 , error . message ) ) ;
}
catch ( error ) {
next ( new HttpException ( 400 , 'Cannot get user task' ) ) ;
}
}
private deleteUser = async (
} ;
private login = async (
req : Request ,
res : Response ,
next : NextFunction
) : Promise < Response | void > = > {
try {
const id = req . params . taskId ;
const userId = req . params . userId ;
await this . userService . DeleteUser ( id , userId ) ;
return res . status ( 200 ) . send ( { status : "Success" , msg : "Data Removed" } ) ;
} catch ( error ) {
next ( new HttpException ( 400 , 'Cannot create post' ) ) ;
const { email , password } = req . body ;
const token = await this . userService . login ( email , password ) ;
res . status ( 200 ) . json ( { token } ) ;
} catch ( error : any ) {
next ( new HttpException ( 400 , error . message ) ) ;
}
} ;
private updateUser = async (
private getUser = (
req : Request ,
res : Response ,
next : NextFunction
) : Promise < Response | void > = > {
try {
const taskId = req . params . taskId ;
const userId = req . params . userId ;
const reqBody :CreateTaskReqBody = Object . assign ( { } , req . body ) ;
const updatedTask = await this . userService . UpdateTask (
// req.auth!.uid,
taskId ,
userId ,
// firebase.auth().currentUser.getIdToken()
reqBody . nom ,
reqBody . description ,
reqBody . logo ,
reqBody . duration ,
reqBody . done ,
// reqBody.tags,
reqBody . repepat ,
reqBody . deb ,
reqBody . fin
) ;
// res.send('Success add');
// res.status(201).json({ task });
res . status ( 204 ) . send ( ` Update a new contact: ${ updatedTask } ` ) ;
} catch ( error ) {
console . log ( error ) ;
next ( new HttpException ( 403 , 'Cannot create post' ) ) ;
) : Response | void = > {
if ( ! req . user ) {
return next ( new HttpException ( 404 , 'No logged in user' ) ) ;
}
res . status ( 200 ) . send ( { data : req.user } ) ;
} ;
private getUserNext : RequestHandler = async (
private getUserNext = async (
req : Request ,
res : Response ,
next : NextFunction
@ -152,18 +218,29 @@ class TaskController implements Controller {
console . log ( 'Impossible de convertir la chaîne en nombre' ) ;
}
//}
const userId = req . body. userI d;
const userId = req . user. idFla d;
const data = await this . locationService . getNearUser ( userId , latitude , longitude ) ;
console . log ( data ) ;
res . status ( 201 ) . send ( data ) ;
}
catch ( error ) {
next ( new HttpException ( 400 , 'Cannot create post ') ) ;
catch ( error : any ) {
next ( new HttpException ( 400 , 'Cannot create get netUser ') ) ;
}
}
}
export default TaskController ;
export default UserController ;
declare global {
namespace Express {
export interface Request {
user : IUser ;
}
}
}
