diff options
author | Koren Lev <korenlev@gmail.com> | 2017-10-10 18:08:39 +0300 |
---|---|---|
committer | Koren Lev <korenlev@gmail.com> | 2017-10-10 15:11:31 +0000 |
commit | 33802c45e4bc24c1e78f6b46cf968306cee2d4da (patch) | |
tree | cd56ab878d8c5aadff49f3c5c89cf265f64e664d /app/api/responders/responder_base.py | |
parent | 87e9e89e07b751b64e9684f02928acb3467489c4 (diff) |
release 1.1 for euphrates
Change-Id: Iddc0e0148db7c72458b7fcdfcb7664e4aa609be0
Signed-off-by: Koren Lev <korenlev@gmail.com>
(cherry picked from commit 5c6eb170878cefa12f717a62c31f7228d440e61e)
Diffstat (limited to 'app/api/responders/responder_base.py')
-rw-r--r-- | app/api/responders/responder_base.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/api/responders/responder_base.py b/app/api/responders/responder_base.py index 479a897..e59f4cf 100644 --- a/app/api/responders/responder_base.py +++ b/app/api/responders/responder_base.py @@ -102,22 +102,22 @@ class ResponderBase(DataValidate, DictNamingConverter): env_name = query.get("environment") if env_name and \ not self.check_environment_name(env_name): - self.bad_request("unkown environment: " + env_name) + self.bad_request("unknown environment: " + env_name) self.not_found() obj = objs[0] stringify_object_values_by_types(obj, stringify_types) - if id is "_id": + if id == "_id": obj['id'] = obj.get('_id') return obj - def get_objects_list(self, collection, query, page, page_size, - projection, stringify_types=None): + def get_objects_list(self, collection, query, page=0, page_size=1000, + projection=None, stringify_types=None): objects = self.read(collection, query, projection, page, page_size) if not objects: env_name = query.get("environment") if env_name and \ not self.check_environment_name(env_name): - self.bad_request("unkown environment: " + env_name) + self.bad_request("unknown environment: " + env_name) self.not_found() for obj in objects: if "id" not in obj and "_id" in obj: @@ -205,8 +205,8 @@ class ResponderBase(DataValidate, DictNamingConverter): def write(self, document, collection="inventory"): try: - self.get_collection_by_name(collection).\ - insert_one(document) + return self.get_collection_by_name(collection)\ + .insert_one(document) except errors.DuplicateKeyError as e: self.conflict("The key value ({0}) already exists". format(', '. |