diff --git a/src/MongoDBLibrary/mongoquery.py b/src/MongoDBLibrary/mongoquery.py index 33baed5..11f2831 100644 --- a/src/MongoDBLibrary/mongoquery.py +++ b/src/MongoDBLibrary/mongoquery.py @@ -1,5 +1,5 @@ -import json from bson.objectid import ObjectId +from bson.json_util import loads from pymongo import ReturnDocument @@ -134,7 +134,7 @@ def save_mongodb_records(self, dbName, dbCollName, recordJSON): """ dbName = str(dbName) dbCollName = str(dbCollName) - recordJSON = dict(json.loads(recordJSON)) + recordJSON = dict(loads(recordJSON)) if '_id' in recordJSON: recordJSON['_id'] = ObjectId(recordJSON['_id']) try: @@ -159,8 +159,8 @@ def update_many_mongodb_records(self, dbName, dbCollName, queryJSON, updateJSON, """ db_name = str(dbName) collection_name = str(dbCollName) - query_json = json.loads(queryJSON) - update_json = json.loads(updateJSON) + query_json = loads(queryJSON) + update_json = loads(updateJSON) if '_id' in query_json: query_json['_id'] = ObjectId(queryJSON['_id']) try: @@ -217,8 +217,8 @@ def retrieve_and_update_one_mongodb_record(self, dbName, dbCollName, queryJSON, """ dbname = str(dbName) dbcollname = str(dbCollName) - record_json = dict(json.loads(queryJSON)) - update_json = dict(json.loads(updateJSON)) + record_json = dict(loads(queryJSON)) + update_json = dict(loads(updateJSON)) document_to_return = ReturnDocument.BEFORE if returnBeforeDocument is True else ReturnDocument.AFTER if '_id' in record_json: record_json['_id'] = ObjectId(record_json['_id']) @@ -308,10 +308,10 @@ def retrieve_mongodb_records_with_desired_fields(self, dbName, dbCollName, recor dbName, dbCollName, recordJSON, fields, return__id) return self._retrieve_mongodb_records(dbName, dbCollName, recordJSON, data, returnDocuments) - def _retrieve_mongodb_records(self, dbName, dbCollName, recordJSON, fields=[], returnDocuments=False): - dbName = str(dbName) + def _retrieve_mongodb_records(self, dbName, dbCollName, recordJSON, fields=[], returnDocuments=False): + dbName = str(dbName) dbCollName = str(dbCollName) - criteria = dict(json.loads(recordJSON)) + criteria = dict(loads(recordJSON)) try: db = self._dbconnection['%s' % (dbName,)] except TypeError: @@ -350,7 +350,7 @@ def remove_mongodb_records(self, dbName, dbCollName, recordJSON): """ dbName = str(dbName) dbCollName = str(dbCollName) - recordJSON = json.loads(recordJSON) + recordJSON = loads(recordJSON) if '_id' in recordJSON: recordJSON['_id'] = ObjectId(recordJSON['_id']) try: