Merge remote-tracking branch 'origin/master'
commit
8abdedd00e
|
@ -3,8 +3,8 @@ const ContactModel= require('../model/contact.model')
|
|||
//getAll :
|
||||
|
||||
module.exports.getAll =(async(req,res)=>{
|
||||
const contacts= await ContactModel.find({})
|
||||
res.status(200).json({success: true, data: contacts});
|
||||
// const contacts= await ContactModel.find({})
|
||||
res.status(200).json(res.advancedResults);
|
||||
})
|
||||
|
||||
|
||||
|
@ -58,12 +58,12 @@ module.exports.update= async(req,res)=>{
|
|||
//delete :
|
||||
|
||||
module.exports.delete= (async(req,res)=>{
|
||||
let contact= await contactModel.find({})
|
||||
let contact= await ContactModel.find({})
|
||||
if(!contact){
|
||||
res.status(200).json({sucess: false,data: "NoData"})
|
||||
return
|
||||
}
|
||||
await contactModel.deleteOne(req.params.id)
|
||||
await ContactModel.deleteOne({_id: req.params.id})
|
||||
res.status(200).json({success: true, data: {}})
|
||||
})
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ const schema = new mongoose.Schema({
|
|||
require: true,
|
||||
maxLength: 70,
|
||||
minLength: 2,
|
||||
default: ""
|
||||
default: ''
|
||||
},
|
||||
firstname: {
|
||||
type: String,
|
||||
|
@ -30,10 +30,10 @@ const schema = new mongoose.Schema({
|
|||
ref: 'vehicle'
|
||||
},
|
||||
status: String,
|
||||
createdBy: {
|
||||
type: String,
|
||||
ref: 'user'
|
||||
}
|
||||
// createdBy: {
|
||||
// type: String,
|
||||
// ref: 'user'
|
||||
// }
|
||||
},
|
||||
{
|
||||
timestamps:true
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
const contactController= require('../controller/contact.controller')
|
||||
const advancedResults = require('../../../shared/middleware/advanced-result')
|
||||
const ContactModel= require('../model/contact.model')
|
||||
|
||||
const router= require('express').Router()
|
||||
|
||||
//getAll :
|
||||
|
||||
router.route('/').get(contactController.getAll)
|
||||
router.route('/').get(advancedResults(ContactModel),contactController.getAll)
|
||||
|
||||
//getById :
|
||||
|
||||
|
|
|
@ -3,8 +3,8 @@ const ProblemModel= require('../model/problem.model')
|
|||
//getAll :
|
||||
|
||||
module.exports.getAll =(async(req,res)=>{
|
||||
const problems= await ProblemModel.find({});
|
||||
res.status(200).json({success: true, data: problems});
|
||||
// const problems= await ProblemModel.find({});
|
||||
res.status(200).json(res.advancedResults);
|
||||
})
|
||||
|
||||
|
||||
|
@ -63,7 +63,7 @@ module.exports.delete= (async(req,res)=>{
|
|||
res.status(200).json({success: false,data: "NoData"})
|
||||
return
|
||||
}
|
||||
await ProblemModel.deleteOne(req.params.id)
|
||||
await ProblemModel.deleteOne({_id: req.params.id})
|
||||
res.status(200).json({success: true, data: {}})
|
||||
})
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ const schema= new mongoose.Schema({
|
|||
default: ""
|
||||
},
|
||||
date: {
|
||||
type: Date,
|
||||
type: String,
|
||||
default: ""
|
||||
},
|
||||
state: {
|
||||
|
|
|
@ -1,10 +1,14 @@
|
|||
const problemController= require('../controller/problem.controller')
|
||||
|
||||
const advancedResults= require('../../../shared/middleware/advanced-result')
|
||||
|
||||
const ProblemModel= require('../model/problem.model')
|
||||
|
||||
const router= require('express').Router()
|
||||
|
||||
//getAll :
|
||||
|
||||
router.route('/').get(problemController.getAll)
|
||||
router.route('/').get(advancedResults(ProblemModel),problemController.getAll)
|
||||
|
||||
//getById :
|
||||
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
const advancedResult =(model)=> async (req, res, next) => {
|
||||
//search : l'information que je cherche
|
||||
//fields : les colonnes je veux utiliser pour la recherche
|
||||
const fields = req.query.fields;
|
||||
const search = req.query.search;
|
||||
let page = req.query.page;
|
||||
let limit = req.query.limit;
|
||||
const fields = req.query.fields; //Permet de récupérer les champs qu'on va effectuer la recherche du front.
|
||||
const search = req.query.search; //Permet de récupérer la recherche
|
||||
let page = req.query.page; //Permet de récupérer la page actuelle
|
||||
let limit = req.query.limit; //Permet de récupérer la page de limite
|
||||
|
||||
|
||||
let find = {}
|
||||
|
@ -14,6 +14,9 @@ const advancedResult =(model)=> async (req, res, next) => {
|
|||
|
||||
//Recherche l'element search dans le tableau de propriété fields
|
||||
const query = {
|
||||
//$or: c'est pour faire la recherche sur plusieurs champs, $regex : permet de stocker la recherche
|
||||
//i : c'est pour mettre le texte insensible à la casse.
|
||||
//-i: sensible à la casse.
|
||||
$or: fields.map(property => ({
|
||||
[property]: {$regex: search, $options: 'i'}
|
||||
}))
|
||||
|
|
Loading…
Reference in New Issue