Refactor: make State handle any resource type

1 files changed, 6 insertions, 11 deletions

diff --git a/ick2/controllerapi.py b/ick2/controllerapi.py
index 958b35d..c2d4ef4 100644
--- a/ick2/controllerapi.py
+++ b/ick2/controllerapi.py
@@ -30,12 +30,7 @@ class ControllerAPI:
     def set_state_directory(self, dirname):
         self._state.set_state_directory(dirname)
 
-    def load_projects(self):  # pragma: no cover
-        return self._state.load_projects()
-
     def find_missing_route(self, missing_path):  # pragma: no cover
-        self.load_projects()
-
         apis = {
             '/version': VersionAPI,
             '/projects': ProjectAPI,
@@ -43,6 +38,7 @@ class ControllerAPI:
 
         routes = []
         for path in apis:
+            self._state.load_resources(path[1:])
             api = apis[path](self._state)
             routes.extend(api.get_routes(path))
         ick2.log.log('info', msg_texg='Found routes', routes=routes)
@@ -179,21 +175,20 @@ class ProjectAPI(APIbase):
 
     def list(self):
         return {
-            'projects': self._state.get_projects(),
+            'projects': self._state.get_resources('projects'),
         }
 
     def show(self, name):
-        ick2.log.log('xxxxxxx')
-        return self._state.get_project(name)
+        return self._state.get_resource('projects', name)
 
     def create(self, body):
-        return self._state.add_project(body)
+        return self._state.add_resource('projects', body['project'], body)
 
     def update(self, body, name):
-        return self._state.update_project(name, body)
+        return self._state.update_resource('projects', name, body)
 
     def delete(self, name):
-        self._state.remove_project(name)
+        self._state.remove_resource('projects', name)
 
 
 def response(status_code, body, headers):  # pragma: no cover