added luDataInitializer

src/Business/lu-webapi-crud-business.js

@@ -14,34 +14,36 @@
 
                 Business.dataAccess = dataAccess;
 
+                Business.dboInitializer = Business.dataAccess.dboInitializer;
+
                 Business.initDbo = function(dbo)
                 {
-                    return Business.dataAccess.initDbo(dbo);
+                    return Business.dataAccess.dboInitializer.initDbo(dbo, Business.dataAccess.TYPE_DBO);
                 };
 
                 Business.initListDbo = function(list)
                 {
-                    return Business.dataAccess.initListDbo(list);
+                    return Business.dataAccess.dboInitializer.initListDbo(list, Business.dataAccess.TYPE_DBO);
                 };
 
                 Business.initPaginatedDbo = function(data)
                 {
-                    return Business.dataAccess.initPaginatedDbo(data);
+                    return Business.dataAccess.dboInitializer.initPaginatedDbo(data, Business.dataAccess.TYPE_DBO);
                 };
 
                 Business.thenInitDbo = function(promise)
                 {
-                    return Business.dataAccess.thenInitDbo(promise);
+                    return Business.dataAccess.dboInitializer.thenInitDbo(promise, Business.dataAccess.TYPE_DBO);
                 };
 
                 Business.thenInitListDbo = function(promise)
                 {
-                    return Business.dataAccess.thenInitListDbo(promise);
+                    return Business.dataAccess.dboInitializer.thenInitListDbo(promise, Business.dataAccess.TYPE_DBO);
                 };
 
                 Business.thenInitPaginatedDbo = function(promise)
                 {
-                    return Business.dataAccess.thenInitPaginatedDbo(promise);
+                    return Business.dataAccess.dboInitializer.thenInitPaginatedDbo(promise, Business.dataAccess.TYPE_DBO);
                 };
 
 

src/DataAccess/lu-data-initializer.js

@@ -0,0 +1,72 @@
+/**
+ * Created by robin on 12/11/16.
+ */
+
+(function () {
+    'use strict';
+    angular.module('luticate2Utils')
+        .factory('luDataInitializer', ['$q',
+            function ($q) {
+
+            var luDataInitializer = {};
+
+            luDataInitializer.create = function (initData) {
+                var initializer = {};
+
+                initializer.initData = initData;
+
+                initializer.initListData = function(list, userData)
+                {
+                    var d = [];
+                    for (var i = 0; i < list.length; ++i) {
+                        d.push(initializer.initData(list[i], userData));
+                    }
+                    return d;
+                };
+
+                initializer.initPaginatedData = function(data, userData)
+                {
+                    var d = {
+                        count: data.count,
+                        data: initializer.initListData(data.data, userData)
+                    };
+                    return d;
+                };
+
+                initializer.thenInitData = function(promise, userData)
+                {
+                    var deferred = $q.defer();
+                    promise.then(function(data)
+                    {
+                        deferred.resolve(initializer.initData(data, userData));
+                    }, deferred.reject);
+                    return deferred.promise;
+                };
+
+                initializer.thenInitListData = function(promise, userData)
+                {
+                    var deferred = $q.defer();
+                    promise.then(function(data)
+                    {
+                        deferred.resolve(initializer.initListData(data, userData));
+                    }, deferred.reject);
+                    return deferred.promise;
+                };
+
+                initializer.thenInitPaginatedData = function(promise, userData)
+                {
+                    var deferred = $q.defer();
+                    promise.then(function(data)
+                    {
+                        deferred.resolve(initializer.initPaginatedData(data, userData));
+                    }, deferred.reject);
+                    return deferred.promise;
+                };
+
+                return initializer;
+            };
+
+            return luDataInitializer;
+
+        }]);
+})();

src/DataAccess/lu-webapi-crud-dataaccess.js

@@ -5,8 +5,8 @@
 (function () {
     'use strict';
     angular.module('luticate2Utils')
-        .factory('luWebApiCrudDataAccess', ['luWebApiDataAccess', '$q', 'luUtilsDataAccess',
-            function (luWebApiDataAccess, $q, luUtilsDataAccess) {
+        .factory('luWebApiCrudDataAccess', ['luWebApiDataAccess', '$q', 'luUtilsDataAccess', 'luDataInitializer',
+            function (luWebApiDataAccess, $q, luUtilsDataAccess, luDataInitializer) {
 
             var luWebApiCrudDataAccess = {};
 
@@ -16,6 +16,31 @@
                 DataAccess.OP_EDIT = 'OP_EDIT';
                 DataAccess.OP_ADD = 'OP_ADD';
 
+                DataAccess.TYPE_DBO = 'TYPE_DBO';
+                DataAccess.TYPE_MODEL = 'TYPE_MODEL';
+
+                DataAccess.defaultDbo = {
+                    id: null,
+                    createdAt: null,
+                    updatedAt: null,
+                    toString: function()
+                    {
+                        return this.id;
+                    }
+                };
+
+
+                DataAccess.modelInitializer = luDataInitializer.create(function(model, op)
+                {
+                    return DataAccess.initModel(model, op);
+                });
+
+                DataAccess.dboInitializer = luDataInitializer.create(function(dbo, type)
+                {
+                    return DataAccess.initDbo(dbo, type);
+                });
+
+
                 DataAccess._initModel = function(model, op)
                 {
                     if (model == null) {
@@ -35,65 +60,21 @@
                     return DataAccess._initModel(model, op);
                 };
 
-                DataAccess.initListModel = function(list, op)
-                {
-                    var d = [];
-                    for (var i = 0; i < list.length; ++i) {
-                        d.push(DataAccess.initModel(list[i], op));
-                    }
-                    return d;
-                };
 
-                DataAccess.initPaginatedModel = function(data, op)
+                DataAccess._initDbo = function(model, type)
                 {
-                    var d = {
-                        count: data.count,
-                        data: DataAccess.initListModel(data.data, op)
-                    };
-                    return d;
-                };
-
-                DataAccess.thenInitModel = function(promise, op)
-                {
-                    var deferred = $q.defer();
-                    promise.then(function(data)
-                    {
-                        deferred.resolve(DataAccess.initModel(data, op));
-                    }, deferred.reject);
-                    return deferred.promise;
-                };
-
-                DataAccess.thenInitListModel = function(promise, op)
-                {
-                    var deferred = $q.defer();
-                    promise.then(function(data)
-                    {
-                        deferred.resolve(DataAccess.initListModel(data, op));
-                    }, deferred.reject);
-                    return deferred.promise;
+                    if (model == null) {
+                        return null;
+                    }
+                    var dbo = DataAccess.extendDeep({}, DataAccess.defaultDbo, model);
+                    dbo.createdAt = luUtilsDataAccess.stringToMomentDateTime(dbo.createdAt);
+                    dbo.updatedAt = luUtilsDataAccess.stringToMomentDateTime(dbo.updatedAt);
+                    return dbo;
                 };
 
-                DataAccess.thenInitPaginatedModel = function(promise, op)
+                DataAccess.initDbo = function(model, type)
                 {
-                    var deferred = $q.defer();
-                    promise.then(function(data)
-                    {
-                        deferred.resolve(DataAccess.initPaginatedModel(data, op));
-                    }, deferred.reject);
-                    return deferred.promise;
-                };
-
-
-
-
-                DataAccess.defaultDbo = {
-                    id: null,
-                    createdAt: null,
-                    updatedAt: null,
-                    toString: function()
-                    {
-                        return this.id;
-                    }
+                    return DataAccess._initDbo(model, type);
                 };
 
                 DataAccess.extendDeep = function extendDeep(dst) {
@@ -110,98 +91,34 @@
                     });
                     return dst;
                 };
-
-                DataAccess._initDbo = function(model)
-                {
-                    if (model == null) {
-                        return null;
-                    }
-                    var dbo = DataAccess.extendDeep({}, DataAccess.defaultDbo, model);
-                    dbo.createdAt = luUtilsDataAccess.stringToMomentDateTime(dbo.createdAt);
-                    dbo.updatedAt = luUtilsDataAccess.stringToMomentDateTime(dbo.updatedAt);
-                    return dbo;
-                };
-
-                DataAccess.initDbo = function(model)
-                {
-                    return DataAccess._initDbo(model);
-                };
-
-                DataAccess.initListDbo = function(list)
-                {
-                    var d = [];
-                    for (var i = 0; i < list.length; ++i) {
-                        d.push(DataAccess.initDbo(list[i]));
-                    }
-                    return d;
-                };
-
-                DataAccess.initPaginatedDbo = function(data)
-                {
-                    var d = {
-                        count: data.count,
-                        data: DataAccess.initListDbo(data.data)
-                    };
-                    return d;
-                };
-
-                DataAccess.thenInitDbo = function(promise)
-                {
-                    var deferred = $q.defer();
-                    promise.then(function(data)
-                    {
-                        deferred.resolve(DataAccess.initDbo(data));
-                    }, deferred.reject);
-                    return deferred.promise;
-                };
-
-                DataAccess.thenInitListDbo = function(promise)
-                {
-                    var deferred = $q.defer();
-                    promise.then(function(data)
-                    {
-                        deferred.resolve(DataAccess.initListDbo(data));
-                    }, deferred.reject);
-                    return deferred.promise;
-                };
-
-                DataAccess.thenInitPaginatedDbo = function(promise)
-                {
-                    var deferred = $q.defer();
-                    promise.then(function(data)
-                    {
-                        deferred.resolve(DataAccess.initPaginatedDbo(data));
-                    }, deferred.reject);
-                    return deferred.promise;
-                };
                 
                 
                 
                 DataAccess.getSingleById = function (id, luBusyGroups) {
-                    return DataAccess.thenInitDbo(DataAccess.get(id, null, luBusyGroups));
+                    return DataAccess.dboInitializer.thenInitData(DataAccess.get(id, null, luBusyGroups), DataAccess.TYPE_MODEL);
                 };
 
                 DataAccess.getMultiple = function (orderBy, filter, page, perPage, luBusyGroups) {
-                    return DataAccess.thenInitPaginatedDbo(DataAccess.get('', {
+                    return DataAccess.dboInitializer.thenInitPaginatedData(DataAccess.get('', {
                         orderBy: orderBy,
                         filter: filter,
                         page: page,
                         perPage: perPage
-                    }, luBusyGroups));
+                    }, luBusyGroups), DataAccess.TYPE_MODEL);
                 };
 
                 DataAccess.addDbo = function(data, luBusyGroups) {
-                    var model = DataAccess.initModel(data, DataAccess.OP_ADD);
-                    return DataAccess.thenInitDbo(DataAccess.post('', null, model, luBusyGroups));
+                    var model = DataAccess.modelInitializer.initData(data, DataAccess.OP_ADD);
+                    return DataAccess.dboInitializer.thenInitData(DataAccess.post('', null, model, luBusyGroups), DataAccess.TYPE_MODEL);
                 };
 
                 DataAccess.editSingleByIdDbo = function(id, data, luBusyGroups) {
-                    var model = DataAccess.initModel(data, DataAccess.OP_EDIT);
-                    return DataAccess.thenInitDbo(DataAccess.post(id, null, model, luBusyGroups));
+                    var model = DataAccess.modelInitializer.initData(data, DataAccess.OP_EDIT);
+                    return DataAccess.dboInitializer.thenInitData(DataAccess.post(id, null, model, luBusyGroups), DataAccess.TYPE_MODEL);
                 };
 
                 DataAccess.deleteDbo = function(id, luBusyGroups) {
-                    return DataAccess.thenInitDbo(DataAccess.delete(id, null, null, luBusyGroups));
+                    return DataAccess.dboInitializer.thenInitData(DataAccess.delete(id, null, null, luBusyGroups), DataAccess.TYPE_MODEL);
                 };
 
                 return DataAccess;