inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-16 17:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Activity Service - add check for private site & more system tests

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka 2008-05-21 13:35:34 +00:00
parent 6c5f524c11
commit 86027f41f1
6 changed files with 75 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/alfresco/activities/org.hibernate.dialect.HSQLDialect/ActivityFeed.xml
View File

@ -23,7 +23,7 @@
<select id="select.activity.feed.for.feeduser" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select.activity.feed.for.feeduser" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
from alf_activity_feed from alf_activity_feed
where feed_user_id = #feedUserId# where feed_user_id = #feedUserId#
and post_user_id != #feedUserId# and post_user_id != #feedUserId#
@ -32,19 +32,9 @@
]]> ]]>
</select> </select>
<select id="select.activity.feedcontrol" parameterClass="FeedControl" resultClass="long">
<![CDATA[
select id as id
from alf_activity_feed_control
where feed_user_id = #feedUserId#
and site_network = #siteNetwork#
and app_tool = #appTool#
]]>
</select>
<select id="select.activity.feed.for.feeduser.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select.activity.feed.for.feeduser.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
from alf_activity_feed from alf_activity_feed
where feed_user_id = #feedUserId# where feed_user_id = #feedUserId#
and post_user_id != #feedUserId# and post_user_id != #feedUserId#
@ -56,7 +46,7 @@
<select id="select.activity.feed.for.site" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select.activity.feed.for.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
from alf_activity_feed from alf_activity_feed
where feed_user_id = '' where feed_user_id = ''
and site_network = #siteNetwork# and site_network = #siteNetwork#

10
config/alfresco/activities/org.hibernate.dialect.HSQLDialect/ActivityFeedControl.xml
View File

@ -24,6 +24,16 @@
]]> ]]>
</select> </select>
<select id="select.activity.feedcontrol" parameterClass="FeedControl" resultClass="long">
<![CDATA[
select id as id
from alf_activity_feed_control
where feed_user_id = #feedUserId#
and site_network = #siteNetwork#
and app_tool = #appTool#
]]>
</select>
<insert id="insert.activity.feedcontrol" parameterClass="FeedControl"> <insert id="insert.activity.feedcontrol" parameterClass="FeedControl">
insert into alf_activity_feed_control (feed_user_id, site_network, app_tool, last_modified) insert into alf_activity_feed_control (feed_user_id, site_network, app_tool, last_modified)
values (#feedUserId#, #siteNetwork#, #appTool#, #lastModified#) values (#feedUserId#, #siteNetwork#, #appTool#, #lastModified#)

6
config/alfresco/activities/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeed.xml
View File

@ -23,7 +23,7 @@
<select id="select.activity.feed.for.feeduser" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select.activity.feed.for.feeduser" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
from alf_activity_feed from alf_activity_feed
where feed_user_id = #feedUserId# where feed_user_id = #feedUserId#
and post_user_id != #feedUserId# and post_user_id != #feedUserId#
@ -34,7 +34,7 @@
<select id="select.activity.feed.for.feeduser.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select.activity.feed.for.feeduser.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
from alf_activity_feed from alf_activity_feed
where feed_user_id = #feedUserId# where feed_user_id = #feedUserId#
and post_user_id != #feedUserId# and post_user_id != #feedUserId#
@ -46,7 +46,7 @@
<select id="select.activity.feed.for.site" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select.activity.feed.for.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
from alf_activity_feed from alf_activity_feed
where feed_user_id = '' where feed_user_id = ''
and site_network = #siteNetwork# and site_network = #siteNetwork#

6
config/alfresco/activities/org.hibernate.dialect.Oracle9Dialect/ActivityFeed.xml
View File

@ -23,7 +23,7 @@
<select id="select.activity.feed.for.feeduser" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select.activity.feed.for.feeduser" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
from alf_activity_feed from alf_activity_feed
where feed_user_id = #feedUserId# where feed_user_id = #feedUserId#
and post_user_id != #feedUserId# and post_user_id != #feedUserId#
@ -34,7 +34,7 @@
<select id="select.activity.feed.for.feeduser.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select.activity.feed.for.feeduser.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
from alf_activity_feed from alf_activity_feed
where feed_user_id = #feedUserId# where feed_user_id = #feedUserId#
and post_user_id != #feedUserId# and post_user_id != #feedUserId#
@ -46,7 +46,7 @@
<select id="select.activity.feed.for.site" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select.activity.feed.for.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
from alf_activity_feed from alf_activity_feed
where feed_user_id = '' where feed_user_id = ''
and site_network = #siteNetwork# and site_network = #siteNetwork#

23
source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
View File

@ -283,18 +283,9 @@ public class ActivityServiceImpl implements ActivityService
List<String> activityFeedEntries = new ArrayList<String>(); List<String> activityFeedEntries = new ArrayList<String>();
String currentUser = AuthenticationUtil.getCurrentUserName();
if (currentUser != null)
{
if (! userNamesAreCaseSensitive) if (! userNamesAreCaseSensitive)
{ {
feedUserId = feedUserId.toLowerCase(); feedUserId = feedUserId.toLowerCase();
currentUser = currentUser.toLowerCase();
}
if ((! authorityService.isAdminAuthority(currentUser)) && (! currentUser.equals(feedUserId)))
{
throw new AlfrescoRuntimeException("Unable to get feed entries for '" + feedUserId + "' - currently logged in as '" + currentUser +"'");
} }
try try
@ -328,11 +319,6 @@ public class ActivityServiceImpl implements ActivityService
{ {
throw new AlfrescoRuntimeException("Unable to get user feed entries: " + je.getMessage()); throw new AlfrescoRuntimeException("Unable to get user feed entries: " + je.getMessage());
} }
}
else
{
throw new AlfrescoRuntimeException("Unable to get user feed entries - current user is null");
}
return activityFeedEntries; return activityFeedEntries;
} }
@ -347,10 +333,6 @@ public class ActivityServiceImpl implements ActivityService
List<String> activityFeedEntries = new ArrayList<String>(); List<String> activityFeedEntries = new ArrayList<String>();
String currentUser = AuthenticationUtil.getCurrentUserName();
if (currentUser != null)
{
// TODO - check whether site is public or private, if private, check whether user is member or admin - authorityService.isAdminAuthority(currentUser))
try try
{ {
List<ActivityFeedDAO> activityFeeds = feedDaoService.selectSiteFeedEntries(siteId, format); List<ActivityFeedDAO> activityFeeds = feedDaoService.selectSiteFeedEntries(siteId, format);
@ -374,11 +356,6 @@ public class ActivityServiceImpl implements ActivityService
{ {
throw new AlfrescoRuntimeException("Unable to get site feed entries: " + je.getMessage()); throw new AlfrescoRuntimeException("Unable to get site feed entries: " + je.getMessage());
} }
}
else
{
throw new AlfrescoRuntimeException("Unable to get site feed entries - current user is null");
}
return activityFeedEntries; return activityFeedEntries;
} }

30
source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java
View File

@ -27,7 +27,7 @@ package org.alfresco.repo.activities.feed;
import java.util.Date; import java.util.Date;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONStringer; import org.json.JSONObject;
/** /**
* Activity Feed DAO * Activity Feed DAO
@ -158,22 +158,16 @@ public class ActivityFeedDAO
public String getJSONString() throws JSONException public String getJSONString() throws JSONException
{ {
return new JSONStringer() JSONObject jo = new JSONObject();
.object()
.key("postUserId") jo.put("postUserId", postUserId);
.value(postUserId) jo.put("postDate", postDate);
.key("postDate") if (feedUserId != null) { jo.put("feedUserId", feedUserId); } // eg. site feed
.value(postDate) jo.put("siteNetwork", siteNetwork);
.key("feedUserId") jo.put("activityType", activityType);
.value(feedUserId) jo.put("activitySummary", activitySummary);
.key("siteNetwork") jo.put("activitySummaryFormat", activitySummaryFormat);
.value(siteNetwork)
.key("activityType") return jo.toString();
.value(activityType)
.key("activitySummary")
.value(activitySummary)
.key("activitySummaryFormat")
.value(activitySummaryFormat)
.endObject().toString();
} }
} }