Some more stuff

js/service/apiservice.js

@@ -1,31 +1,126 @@
-app.factory('ApiService', function($http){
-    var ApiService = function(http, BASEURL,endpoint) {
+app.factory('ApiService', function($http, $q){
+    var ApiService = function(http, endpoint) {
         this.endpoint = endpoint;
         this.baseUrl = OC.generateUrl('/apps/deck/' + endpoint);
         this.http = http;
-        this.hashMap = {};
-        this.values = [];
+        this.q = $q;
+        this.data = {};
+        this.id = null;
     };
 
-    ApiService.prototype.getAll = function(){
-        return $http.get(baseUrl);
+    // TODO: Unify error messages
+    ApiService.prototype.fetchAll = function(){
+        var deferred = $q.defer();
+        var self = this;
+        $http.get(this.baseUrl).then(function (response) {
+            var objects = response.data;
+            objects.forEach(function (obj) {
+                self.data[obj.id] = obj;
+            });
+            deferred.resolve(self.data);
+        }, function (error) {
+            deferred.reject('Error while ' + self.getName() + '.fetchAll() ');
+
+        });
+        return deferred.promise;
     }
 
-    ApiService.prototype.getOne = function (id) {
-        return $http.get(baseUrl + '/' + id);
+    ApiService.prototype.fetchOne = function (id) {
+        this.id = id;
+        var deferred = $q.defer();
+        var self = this;
+        $http.get(this.baseUrl + '/' + id).then(function (response) {
+            data = response.data;
+            self.data[data.id] = response.data;
+            deferred.resolve(response.data);
+
+        }, function (error) {
+            deferred.reject('Error in ' + self.endpoint + ' fetchAll() ');
+        });
+        return deferred.promise;
     };
 
     ApiService.prototype.create = function (entity) {
-        return $http.post(baseUrl, entity);
+        var deferred = $q.defer();
+        var self = this;
+        $http.post(this.baseUrl, entity).then(function (response) {
+            self.add(response.data);
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error in ' + self.endpoint + ' create() ');
+        });
+        return deferred.promise;
     };
 
     ApiService.prototype.update = function (entity) {
-        return $http.put(baseUrl, entity)
+        var deferred = $q.defer();
+        var self = this;
+        $http.put(this.baseUrl, entity).then(function (response) {
+            self.add(response.data);
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error while update ' + self.endpoint);
+        });
+        return deferred.promise;
+
     };
 
     ApiService.prototype.delete = function (id) {
-        return $http.delete(baseUrl + '/' + id);
+        var deferred = $q.defer();
+        var self = this;
+
+        $http.delete(this.baseUrl + '/' + id).then(function (response) {
+            self.remove(id);
+            deferred.resolve(response.data);
+
+        }, function (error) {
+            deferred.reject('Error while delete ' + self.endpoint);
+        });
+        return deferred.promise;
+
+    };
+
+    // methods for managing data
+    ApiService.prototype.clear = function() {
+        this.data = {};
+    }
+    ApiService.prototype.add = function (entity) {
+        var element = this.data[entity.id];
+        if(element===undefined) {
+            this.data[entity.id] = entity;
+        } else {
+            Object.keys(entity).forEach(function (key) {
+                element[key] = entity[key];
+                element[key].status = {};
+            });
+        }
+    };
+    ApiService.prototype.remove = function(id) {
+        if (this.data[id] !== undefined) {
+            delete this.data[id];
+        }
+    };
+    ApiService.prototype.addAll = function (entities) {
+        var self = this;
+        angular.forEach(entities, function(entity) {
+            self.add(entity);
+        });
+    };
+
+    ApiService.prototype.getCurrent = function () {
+        return this.data[this.id];
+    }
+
+    ApiService.prototype.getAll = function () {
+        return this.data;
+    }
+
+    ApiService.prototype.getName = function() {
+        var funcNameRegex = /function (.{1,})\(/;
+        var results = (funcNameRegex).exec((this).constructor.toString());
+        return (results && results.length > 1) ? results[1] : "";
     };
 
     return ApiService;
-});
+
+});

js/service/factory.board.js

@@ -1,4 +1,4 @@
-app.factory('boardFactory', function($http, stackFactory){
+app.factory('boardFactory', function($http){
     var service = {};
     var baseUrl = OC.generateUrl('/apps/deck/boards');
 
@@ -12,6 +12,7 @@ app.factory('boardFactory', function($http, stackFactory){
     };
 
     service.createBoard = function (board) {
+
         return $http.post(baseUrl, board);
     };
 
@@ -23,5 +24,14 @@ app.factory('boardFactory', function($http, stackFactory){
         return $http.delete(baseUrl + '/' + id);
     };
 
+    return service;
+});
+
+app.factory('BoardService', function(ApiService, $http, $q){
+    var BoardService = function($http, ep, $q) {
+        ApiService.call(this, $http, ep, $q);
+    };
+    BoardService.prototype = angular.copy(ApiService.prototype);
+    service = new BoardService($http, 'boards', $q)
     return service;
 });

js/service/factory.stack.js

@@ -1,78 +1,21 @@
-app.factory('ApiService', function($http){
-    var ApiService = function(http, endpoint) {
-        this.endpoint = endpoint;
-        this.baseUrl = OC.generateUrl('/apps/deck/' + endpoint);
-        this.http = http;
-        this.hashMap = {};
-        this.values = [];
-        this.once = null;
+app.factory('StackService', function(ApiService, $http, $q){
+    var StackService = function($http, ep, $q) {
+        ApiService.call(this, $http, ep, $q);
     };
-
-    ApiService.prototype.getAll = function(){
-        return $http.get(this.baseUrl);
-    }
-
-    ApiService.prototype.getOne = function (id) {
-        self = this;
-        $http.get(this.baseUrl + '/' + id).then(function (response) {
-            self.once = response.data;
-            return response.data;
+    StackService.prototype = angular.copy(ApiService.prototype);
+    StackService.prototype.fetchAll = function(boardId) {
+        var deferred = $q.defer();
+        var self=this;
+        $http.get(this.baseUrl +'/'+boardId).then(function (response) {
+            self.addAll(response.data);
+            deferred.resolve(self.data);
         }, function (error) {
+            deferred.reject('Error while loading stacks');
         });
-        return this.once;
+        return deferred.promise;
 
-    };
-
-    ApiService.prototype.create = function (entity) {
-        return $http.post(this.baseUrl, entity);
-    };
-
-    ApiService.prototype.update = function (entity) {
-        return $http.put(this.baseUrl, entity)
-    };
-
-    ApiService.prototype.delete = function (id) {
-        return $http.delete(this.baseUrl + '/' + id);
-    };
-
-    return ApiService;
-});
-
-app.factory('stackFactory', function($http){
-    var service = {};
-    var baseUrl = OC.generateUrl('/apps/deck/stacks');
-
-    service.getStacks = function(boardId){
-        return $http.get(baseUrl + '/' + boardId);
     }
-
-    service.getStack = function (id) {
-        return $http.get(baseUrl + '/' + id);
-    };
-
-    service.createStack = function (stack) {
-        return $http.post(baseUrl, stack);
-    };
-
-    service.updateStack = function (stack) {
-        return $http.put(baseUrl, stack)
-    };
-
-    service.deleteStack = function (id) {
-        return $http.delete(baseUrl + '/' + id);
-    };
-
+    service = new StackService($http, 'stacks', $q)
     return service;
 });
 
-app.factory('StackService', function(ApiService, $http){
-    var StackService = function($http, ep) {
-        ApiService.call(this, $http, ep);
-    };
-    StackService.prototype = ApiService.prototype;
-    StackService.prototype.getAll = function(boardId) {
-        return $http.get(this.baseUrl + '/' + boardId);
-    }
-    service = new StackService($http, 'stacks')
-    return service;
-});