Use proper $and in patch and remove methods #383

Activity

1. DaddyWarbucks commented on Jan 9, 2022

   

   DaddyWarbucks

   on Jan 9, 2022

   ContributorAuthor

   More actions

   Also, we likely need to do some more type checking on the $and. Note in this line that we assume the $and is an array. But the code also potentially returns an object instead of an array.
   

   feathers-sequelize/lib/index.js

   Line 169 in db4b5ff

   [and]: where[and] ? [...where[and], { [this.id]: id }] : { [this.id]: id }

   
   So if $and works with an object and not just an array, when we need to check that. I think it is most common that its an array so we should also return an array.

   Something like

   applyAndQuery(where, id) {
     const { and } = this.Op;
     const IdQuery = { [this.id]: id };
     const newWhere = Object.assign({}, where);
   
     if (!newWhere[and]) {
       newWhere[and] = [IdQuery]
       return newWhere;
     }
   
     if (Array.isArray(newWhere[and])) {
       newWhere[and] = [...newWhere[and], idQuery];
       return newWhere;
     }
   
     newWhere[and] = [newWhere[and], idQuery];
     return newWhere;
   }
2. fratzinger commented on Jan 9, 2022

   

   fratzinger

   on Jan 9, 2022

   Contributor

   More actions

   Good catch! We should add a test for that. Maybe even on @feathersjs/adapter-tests and we could add $and to the official supported operators list at https://docs.feathersjs.com/api/databases/querying.html.

   Op.and and Op.or can be used as an object, indeed (see https://sequelize.org/v6/manual/model-querying-basics.html#examples-with--code-op-and--code--and--code-op-or--code-). But I believe at the root level they're always meant to be arrays. It makes sense if they're nested within a column query like:

   where: {
     rank: {
       [Op.and]: {
         [Op.lt]: 1000,
         [Op.eq]: null
       }
     },
   }
3. fratzinger commented on May 12, 2024

   

   fratzinger

   on May 12, 2024

   Contributor

   More actions

   resolved by #429
4. fratzinger

   closed this as completedon May 12, 2024