From 0df1aaf19a5f245d58079806cc41ade508a33aac Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 18 Oct 2019 10:49:28 +0300 Subject: Revert "Change: refer to resource by name, not id" This reverts commit 03a559309b8790f6bc3ad3d92300a4c172910abb. --- ick2/apibase.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'ick2/apibase.py') diff --git a/ick2/apibase.py b/ick2/apibase.py index b950c11..e18ebe2 100644 --- a/ick2/apibase.py +++ b/ick2/apibase.py @@ -23,7 +23,8 @@ class APIbase: def __init__(self, state): assert (state is None or - isinstance(state, ick2.MemoryPersistentState)) + isinstance(state, ick2.MemoryPersistentState) or + isinstance(state, ick2.MuckPersistentState)) self._trans = ick2.TransactionalState(state) def get_routes(self, path): @@ -181,11 +182,11 @@ class ResourceApiBase(APIbase): body=body, token=token, kwargs=kwargs) as_dict = self.mangle_new_resource(body) - name = self.get_resource_name(as_dict) - if self._trans.has_resource(token, self._type_name, name): - raise ick2.ExistsAlready(name) + rid = self.get_resource_name(as_dict) + if self._trans.has_resource(token, self._type_name, rid): + raise ick2.ExistsAlready(rid) - with self._trans.new(token, self._type_name, name) as resource: + with self._trans.new(token, self._type_name, rid) as resource: resource.from_dict(as_dict) return as_dict @@ -197,11 +198,11 @@ class ResourceApiBase(APIbase): raise NotImplementedError() def update(self, body, name, token=None, **kwargs): - name = self.get_resource_name(body) - if not self._trans.has_resource(token, self._type_name, name): - raise ick2.NotFound(kind=self._type_name, name=name) + rid = self.get_resource_name(body) + if not self._trans.has_resource(token, self._type_name, rid): + raise ick2.NotFound(kind=self._type_name, rid=rid) - with self._trans.modify(token, self._type_name, name) as resource: + with self._trans.modify(token, self._type_name, rid) as resource: as_dict = self.mangle_updated_resource(resource.as_dict(), body) resource.from_dict(as_dict) @@ -212,5 +213,5 @@ class ResourceApiBase(APIbase): def delete(self, name, token=None, **kwargs): if not self._trans.has_resource(token, self._type_name, name): - raise ick2.NotFound(kind=self._type_name, name=name) + raise ick2.NotFound(kind=self._type_name, rid=name) self._trans.remove_resource(token, self._type_name, name) -- cgit v1.2.1