split logic into business layers

8 files changed, 259 insertions, 71 deletions

diff --git a/js/app/controllers/controllers.coffee b/js/app/controllers/controllers.coffee
index 41c272347..a7d86b074 100644
--- a/js/app/controllers/controllers.coffee
+++ b/js/app/controllers/controllers.coffee
@@ -30,13 +30,13 @@ angular.module('News').controller 'SettingsController',
 
 angular.module('News').controller 'FeedController',
 ['$scope', '_FeedController', 'FolderModel', 'FeedModel', 'ActiveFeed',
-'ShowAll', 'FeedType', 'StarredCount', 'Persistence', 'ItemModel',
+'ShowAll', 'FeedType', 'StarredCount', 'Persistence', 'FolderBl', 'FeedBl',
 ($scope, _FeedController, FolderModel, FeedModel, ActiveFeed,
-ShowAll, FeedType, StarredCount, Persistence, ItemModel)->
+ShowAll, FeedType, StarredCount, Persistence, FolderBl, FeedBl)->
 
 	return new _FeedController($scope, FolderModel, FeedModel, ActiveFeed,
 		                       ShowAll, FeedType, StarredCount, Persistence,
-		                       ItemModel)
+		                       FolderBl, FeedBl)
 ]
 
 angular.module('News').controller 'ItemController',
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee
index 82586378f..580bd4763 100644
--- a/js/app/controllers/feedcontroller.coffee
+++ b/js/app/controllers/feedcontroller.coffee
@@ -27,7 +27,7 @@ angular.module('News').factory '_FeedController', ->
 
 		constructor: (@$scope, @_folderModel, @_feedModel, @_active,
 					@_showAll, @_feedType, @_starredCount, @_persistence,
-					@_itemModel) ->
+					@_folderBl, @_feedBl) ->
 
 			@_isAddingFolder = false
 			@_isAddingFeed = false
@@ -36,15 +36,24 @@ angular.module('News').factory '_FeedController', ->
 			@$scope.feeds = @_feedModel.getAll()
 			@$scope.folders = @_folderModel.getAll()
 			@$scope.feedType = @_feedType
+			@$scope.folderBl = @_folderBl
+			@$scope.feedBl = @_feedBl
 
-			@$scope.isFeedActive = (type, id) =>
-				return @isFeedActive(type, id)
 			
 			@$scope.isShown = (type, id) =>
 				return @isShown(type, id)
 
-			@$scope.getUnreadCount = (type, id) =>
-				return @getUnreadCount(type, id)
+			@$scope.getUnreadCount = =>
+				return @_transFormCount(@_feedBl.getUnreadCount())
+
+			@$scope.getStarredCount = =>
+				return @_transFormCount(@_starredCount.getStarredCount())
+
+			@$scope.getFeedUnreadCount = (feedId) =>
+				return @_transFormCount(@_feedBl.getFeedUnreadCount(feedId))
+
+			@$scope.getUnreadCount = (folderId) =>
+				return @_transFormCount(@_folderBl.getFolderUnreadCount(folderId))
 
 			@$scope.isShowAll = =>
 				return @isShowAll()
@@ -120,17 +129,6 @@ angular.module('News').factory '_FeedController', ->
 						@_isAddingFolder = false
 
 
-		toggleFolder: (folderId) ->
-			folder = @_folderModel.getById(folderId)
-			
-			if angular.isDefined(folder)
-				folder.open = !folder.open
-				if folder.open
-					@_persistence.openFolder(folder.id)
-				else
-					@_persistence.collapseFolder(folder.id)
-
-
 		isFeedActive: (type, id) ->
 			return type == @_active.getType() and id == @_active.getId()
 
@@ -155,18 +153,7 @@ angular.module('News').factory '_FeedController', ->
 			return @_showAll.getShowAll()
 
 
-		getUnreadCount: (type, id) ->
-			# TODO: use polymorphism instead of switches
-			switch type
-				when @_feedType.Subscriptions
-					count = @_feedModel.getUnreadCount()
-				when @_feedType.Starred
-					count = @_starredCount.getStarredCount()
-				when @_feedType.Feed
-					count = @_feedModel.getFeedUnreadCount(id)
-				when @_feedType.Folder
-					count = @_feedModel.getFolderUnreadCount(id)
-
+		_transFormCount: (count) ->
 			if count > 999
 				count = '999+'
 
@@ -184,44 +171,6 @@ angular.module('News').factory '_FeedController', ->
 				@_persistence.getItems(type, id, 0, null, lastModified)
 
 
-		hasFeeds: (folderId) ->
-			return @_feedModel.getAllOfFolder(folderId).length
-
-
-		delete: (type, id) ->
-			# TODO: use polymorphism instead of switches
-			switch type
-				when @_feedType.Feed
-					count = @_feedModel.removeById(id)
-					@_persistence.deleteFeed(id)
-				when @_feedType.Folder
-					count = @_folderModel.removeById(id)
-					@_persistence.deleteFolder(id)
-
-
-		markAllRead: (type, id) ->
-			# TODO: use polymorphism instead of switches
-			switch type
-				when @_feedType.Subscriptions
-					for feed in @_feedModel.getAll()
-						@markAllRead(@_feedType.Feed, feed.id)
-				when @_feedType.Feed
-					feed = @_feedModel.getById(id)
-					if angular.isDefined(feed)
-						feed.unreadCount = 0
-						# TODO: also update items in the right field if id is the
-						# the same
-						highestItemId = @_itemModel.getHighestId()
-						@_persistence.setFeedRead(id, highestItemId)
-				when @_feedType.Folder
-					for feed in @_feedModel.getAllOfFolder(id)
-						@markAllRead(@_feedType.Feed, feed.id)
-
-
-		getFeedsOfFolder: (folderId) ->
-			return @_feedModel.getAllOfFolder(folderId)
-
-
 		setShowAll: (showAll) ->
 			@_showAll.setShowAll(showAll)
 			if showAll
diff --git a/js/app/services/bl/feedbl.coffee b/js/app/services/bl/feedbl.coffee
new file mode 100644
index 000000000..1c2e4af09
--- /dev/null
+++ b/js/app/services/bl/feedbl.coffee
@@ -0,0 +1,65 @@
+###
+
+ownCloud - News
+
+@author Bernhard Posselt
+@copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+License as published by the Free Software Foundation; either
+version 3 of the License, or any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+You should have received a copy of the GNU Affero General Public
+License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+###
+
+
+angular.module('News').factory '_FeedBl', ->
+
+	class FeedBl
+
+		constructor: (@_feedModel, @_itemBl, @_persistence) ->
+
+
+		getUnreadCount: (feedId) ->
+			@_feedModel.getFeedUnreadCount(feedId)
+
+
+		getFeedsOfFolder: (folderId) ->
+			return @_feedModel.getAllOfFolder(folderId)
+
+
+		getFolderUnreadCount: (folderId) ->
+			@_feedModel.getFolderUnreadCount(folderId)
+
+
+		getUnreadCount: ->
+			return @_feedModel.getUnreadCount()
+
+
+		delete: (feedId) ->
+			@_feedModel.removeById(feedId)
+			@_persistence.deleteFeed(feedId)
+
+
+		markFeedRead: (feedId) ->
+			feed = @_feedModel.getById(feedId)
+			if angular.isDefined(feed)
+				feed.unreadCount = 0
+				@_itemBl.markAllRead(feedId)
+
+
+		markAllRead: ->
+			for feed in @_feedModel.getAll()
+				@markFeedRead(feed.id)
+
+
+
+	return FeedBl
diff --git a/js/app/services/bl/folderbl.coffee b/js/app/services/bl/folderbl.coffee
new file mode 100644
index 000000000..e869453f2
--- /dev/null
+++ b/js/app/services/bl/folderbl.coffee
@@ -0,0 +1,56 @@
+###
+
+ownCloud - News
+
+@author Bernhard Posselt
+@copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+License as published by the Free Software Foundation; either
+version 3 of the License, or any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+You should have received a copy of the GNU Affero General Public
+License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+###
+
+
+angular.module('News').factory '_FolderBl', ->
+
+	class FolderBl
+
+		constructor: (@_folderModel, @_feedBl, @_persistence) ->
+
+
+		delete: (folderId) ->
+			@_folderModel.removeById(folderId)
+			@_persistence.deleteFolder(folderId)
+
+
+		hasFeeds: (folderId) ->
+			return @_feedBl.getFeedsOfFolder(folderId).length
+
+
+		markFolderRead: (folderId) ->
+			for feed in @_feedBl.getFeedsOfFolder(folderId)
+				@_feedBl.markFeedRead(feed.id)
+
+
+		toggleFolder: (folderId) ->
+			folder = @_folderModel.getById(folderId)
+			
+			if angular.isDefined(folder)
+				folder.open = !folder.open
+				if folder.open
+					@_persistence.openFolder(folder.id)
+				else
+					@_persistence.collapseFolder(folder.id)
+
+
+	return FolderBl
diff --git a/js/app/services/bl/itembl.coffee b/js/app/services/bl/itembl.coffee
new file mode 100644
index 000000000..ee4d9049a
--- /dev/null
+++ b/js/app/services/bl/itembl.coffee
@@ -0,0 +1,38 @@
+###
+
+ownCloud - News
+
+@author Bernhard Posselt
+@copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+License as published by the Free Software Foundation; either
+version 3 of the License, or any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+You should have received a copy of the GNU Affero General Public
+License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+###
+
+
+angular.module('News').factory '_ItemBl', ->
+
+	class ItemBl
+
+		constructor: (@_itemModel, @_persistence) ->
+
+
+		markAllRead: (feedId) ->
+			highestItemId = @_itemModel.getHighestId()
+			@_persistence.setFeedRead(feedId, highestItemId)
+			for item in @_itemModel.getAll()
+				item.setRead()
+
+
+	return ItemBl
diff --git a/js/app/services/models/itemmodel.coffee b/js/app/services/models/itemmodel.coffee
index 09c187443..61030b50e 100644
--- a/js/app/services/models/itemmodel.coffee
+++ b/js/app/services/models/itemmodel.coffee
@@ -21,8 +21,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
 angular.module('News').factory '_ItemModel',
-['_Model', '_MaximumQuery', '_MinimumQuery',
-(_Model, _MaximumQuery, _MinimumQuery) ->
+['_Model', '_MaximumQuery', '_MinimumQuery', 'StatusFlag',
+(_Model, _MaximumQuery, _MinimumQuery, StatusFlag) ->
 
 	class ItemModel extends _Model
 
@@ -41,6 +41,8 @@ angular.module('News').factory '_ItemModel',
 		# in case we get updated items with the same two fields we
 		# also need to update the field
 		add: (data, clearCache=true) ->
+			@_bindMethods(data)
+
 			hash = data.feedId + '_' + data.guidHash
 			entry = @_guidFeedIdHash[hash]
 
@@ -52,6 +54,21 @@ angular.module('News').factory '_ItemModel',
 				super(data, clearCache)
 
 
+		_bindMethods: (data) ->
+			data.isRead = ->
+				return !((@status & StatusFlag.UNREAD) == StatusFlag.UNREAD)
+			data.setRead = ->
+				@status &= ~StatusFlag.UNREAD
+			data.setUnread = ->
+				@status |= StatusFlag.UNREAD
+			data.isStarred = ->
+				return (@status & StatusFlag.STARRED) == StatusFlag.STARRED
+			data.setStarred = ->
+				@status |= StatusFlag.STARRED
+			data.setUnstarred = ->
+				@status &= ~StatusFlag.STARRED
+
+
 		update: (data, clearCache=true) ->
 			hash = data.feedId + '_' + data.guidHash
 			entry = @_guidFeedIdHash[hash]
diff --git a/js/app/services/services.coffee b/js/app/services/services.coffee
index cf1389fa7..6e27ece9d 100644
--- a/js/app/services/services.coffee
+++ b/js/app/services/services.coffee
@@ -34,12 +34,44 @@ angular.module('News').factory 'Request',
 	return new _Request($http, Publisher, Router)
 ]
 
+
 # loading helpers
 angular.module('News').factory 'FeedLoading',
 ['_Loading', (_Loading) ->
 	return new _Loading()
 ]
 
+angular.module('News').factory 'AutoPageLoading',
+['_Loading', (_Loading) ->
+	return new _Loading()
+]
+
+angular.module('News').factory 'NewLoading',
+['_Loading', (_Loading) ->
+	return new _Loading()
+]
+
+
+# business layer
+angular.module('News').factory 'ItemBl',
+['_ItemBl', 'ItemModel', 'Persistence',
+(_ItemBl, ItemModel, Persistence) ->
+	return new _ItemBl(ItemModel, Persistence)
+]
+
+angular.module('News').factory 'FeedBl',
+['_FeedBl', 'FeedModel', 'ItemBl', 'Persistence',
+(_FeedBl, FeedModel, ItemBl, Persistence) ->
+	return new _FeedBl(FeedModel, ItemBl, Persistence)
+]
+
+angular.module('News').factory 'FolderBl',
+['_FolderBl', 'FolderModel', 'FeedBl', 'Persistence',
+(_FolderBl, FolderModel, FeedBl, Persistence) ->
+	return new _FolderBl(FolderModel, FeedBl, Persistence)
+]
+
+
 # models
 angular.module('News').factory 'ActiveFeed', ['_ActiveFeed', (_ActiveFeed) ->
 	return new _ActiveFeed()
diff --git a/js/app/services/statusflag.coffee b/js/app/services/statusflag.coffee
new file mode 100644
index 000000000..c280c7ced
--- /dev/null
+++ b/js/app/services/statusflag.coffee
@@ -0,0 +1,31 @@
+###
+
+ownCloud - News
+
+@author Bernhard Posselt
+@copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+License as published by the Free Software Foundation; either
+version 3 of the License, or any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+You should have received a copy of the GNU Affero General Public
+License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+###
+
+
+angular.module('News').factory 'StatusFlag', ->
+
+	return {
+		UNREAD: 0x02
+		STARRED: 0x04
+		DELETED: 0x08
+		UPDATED: 0x16
+	}
\ No newline at end of file