database set_one/set_list. Adding pull_list parameter
Change-Id: I5cd5ba66457845d4c31235e4fc04e900a178e268
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/osm_common/dbmongo.py b/osm_common/dbmongo.py
index 0784985..b0686aa 100644
--- a/osm_common/dbmongo.py
+++ b/osm_common/dbmongo.py
@@ -363,7 +363,7 @@
raise DbException(e)
def set_one(self, table, q_filter, update_dict, fail_on_empty=True, unset=None, pull=None, push=None,
- push_list=None):
+ push_list=None, pull_list=None):
"""
Modifies an entry at database
:param table: collection or table
@@ -375,6 +375,7 @@
ignored. If not exist, it is ignored
:param pull: Plain dictionary with the content to be removed from an array. It is a dot separated keys and value
if exist in the array is removed. If not exist, it is ignored
+ :param pull_list: Same as pull but values are arrays where each item is removed from the array
:param push: Plain dictionary with the content to be appended to an array. It is a dot separated keys and value
is appended to the end of the array
:param push_list: Same as push but values are arrays where each item is and appended instead of appending the
@@ -387,8 +388,10 @@
db_oper["$set"] = update_dict
if unset:
db_oper["$unset"] = unset
- if pull:
- db_oper["$pull"] = pull
+ if pull or pull_list:
+ db_oper["$pull"] = pull or {}
+ if pull_list:
+ db_oper["$pull"].update({k: {"$in": v} for k, v in pull_list.items()})
if push or push_list:
db_oper["$push"] = push or {}
if push_list:
@@ -406,7 +409,7 @@
except Exception as e: # TODO refine
raise DbException(e)
- def set_list(self, table, q_filter, update_dict, unset=None, pull=None, push=None, push_list=None):
+ def set_list(self, table, q_filter, update_dict, unset=None, pull=None, push=None, push_list=None, pull_list=None):
"""
Modifies al matching entries at database
:param table: collection or table
@@ -418,6 +421,7 @@
if exist in the array is removed. If not exist, it is ignored
:param push: Plain dictionary with the content to be appended to an array. It is a dot separated keys, the
single value is appended to the end of the array
+ :param pull_list: Same as pull but values are arrays where each item is removed from the array
:param push_list: Same as push but values are arrays where each item is and appended instead of appending the
whole array
:return: Dict with the number of entries modified
@@ -428,8 +432,10 @@
db_oper["$set"] = update_dict
if unset:
db_oper["$unset"] = unset
- if pull:
- db_oper["$pull"] = pull
+ if pull or pull_list:
+ db_oper["$pull"] = pull or {}
+ if pull_list:
+ db_oper["$pull"].update({k: {"$in": v} for k, v in pull_list.items()})
if push or push_list:
db_oper["$push"] = push or {}
if push_list: