not-node 6.5.57 → 6.5.59
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -13,7 +13,12 @@ module.exports = class StandartQueriesBeforeAction {
|
|
|
13
13
|
if (query.search) {
|
|
14
14
|
query.search = notFilter.filter.modifyRules(
|
|
15
15
|
query.search,
|
|
16
|
-
query.filter
|
|
16
|
+
query.filter,
|
|
17
|
+
(filter, property, rule)=>{
|
|
18
|
+
if(!Object.hasOwn(filter, property)){
|
|
19
|
+
filter[property] = rule;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
17
22
|
);
|
|
18
23
|
}
|
|
19
24
|
}
|
package/src/model/routine.js
CHANGED
|
@@ -100,9 +100,17 @@ class ModelRoutine {
|
|
|
100
100
|
filter.__latest = true;
|
|
101
101
|
filter.__closed = false;
|
|
102
102
|
if (ModelConstructor.findOneAndUpdate) {
|
|
103
|
+
const setData = {}, unsetData = {};
|
|
104
|
+
Object.keys(data).forEach((key)=>{
|
|
105
|
+
if(typeof data[key] === 'undefined'){
|
|
106
|
+
unsetData[key] = 1;
|
|
107
|
+
}else{
|
|
108
|
+
setData[key] = data[key];
|
|
109
|
+
}
|
|
110
|
+
});
|
|
103
111
|
const updateResult = await ModelConstructor.findOneAndUpdate(
|
|
104
112
|
filter,
|
|
105
|
-
{ $set:
|
|
113
|
+
{ $set: setData, $unset: unsetData },
|
|
106
114
|
{
|
|
107
115
|
returnDocument: "after"
|
|
108
116
|
}
|