Skip to content

Commit

Permalink
Merge pull request sakaiproject#422 from sakaiproject/ctools-29Q
Browse files Browse the repository at this point in the history 
DASH-334 changes to the user sync job, switching the session user to facilitate permission checks
  • Loading branch information
@zqian
zqian committed Apr 16, 2015
2 parents 852965b + a636402 commit 3095c8e
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 61 deletions.
152 changes: 91 additions & 61 deletions dashboard/impl/src/java/org/sakaiproject/dash/logic/DashboardLogicImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.sakaiproject.dash.model.Person;
import org.sakaiproject.dash.model.RepeatingCalendarItem;
import org.sakaiproject.dash.model.SourceType;
import org.sakaiproject.entitybroker.DeveloperHelperService;
import org.sakaiproject.site.api.Site;
import org.sakaiproject.user.api.User;
import org.springframework.transaction.PlatformTransactionManager;
Expand Down Expand Up @@ -93,8 +94,6 @@ public DashboardLogicImpl(PlatformTransactionManager transactionManager) {

protected Date delay = null;



/************************************************************************
* Constructor-assigned transaction template
************************************************************************/
Expand Down Expand Up @@ -126,6 +125,12 @@ public void setDashboardConfig(DashboardConfig dashboardConfig) {
public void setCache(Cache cache) {
this.cache = cache;
}


protected DeveloperHelperService developerHelperService;
public void setDeveloperHelperService(DeveloperHelperService developerHelperService) {
this.developerHelperService = developerHelperService;
}

/************************************************************************
* init() and destroy()
Expand Down Expand Up @@ -252,39 +257,52 @@ public void addCalendarLinks(String sakaiUserId, String contextId) {
Person person = this.getOrCreatePerson(sakaiUserId);
if(person == null) {
logger.warn("Failed attempt to add calendar links for non-existent user: " + sakaiUserId);
return;
} else {
// TODO: deal with expired items
List<CalendarItem> items = dao.getCalendarItemsByContext(contextId);
if(items == null || items.isEmpty()) {
StringBuilder message = new StringBuilder();
message.append("There is no calendar events in context (");
message.append(contextId);
message.append(") for new user (");
message.append(sakaiUserId);
message.append(")");
logger.info(message.toString());
} else {
final List<CalendarLink> calendarLinks = new ArrayList<CalendarLink>();
for(CalendarItem item: items) {
SourceType sourceType = item.getSourceType();
DashboardEntityInfo dashboardEntityInfo = this.dashboardEntityInfoMap.get(sourceType.getIdentifier());
if(dashboardEntityInfo != null && dashboardEntityInfo.isAvailable(item.getEntityReference()) && dashboardEntityInfo.isUserPermitted(sakaiUserId, item.getEntityReference(), item.getContext().getContextId())) {
CalendarLink calendarLink = new CalendarLink(person, item, item.getContext(), false, false);
calendarLinks.add(calendarLink);
try
{
// set the current user id
developerHelperService.setCurrentUser("/user/" + sakaiUserId);

List<CalendarItem> items = dao.getCalendarItemsByContext(contextId);
if(items == null || items.isEmpty()) {
StringBuilder message = new StringBuilder();
message.append("There is no calendar event in context (");
message.append(contextId);
message.append(") for new user (");
message.append(sakaiUserId);
message.append(")");
logger.info(message.toString());
} else {
final List<CalendarLink> calendarLinks = new ArrayList<CalendarLink>();
for(CalendarItem item: items) {
SourceType sourceType = item.getSourceType();
DashboardEntityInfo dashboardEntityInfo = this.dashboardEntityInfoMap.get(sourceType.getIdentifier());
if(dashboardEntityInfo != null && dashboardEntityInfo.isAvailable(item.getEntityReference())) {
CalendarLink calendarLink = new CalendarLink(person, item, item.getContext(), false, false);
calendarLinks.add(calendarLink);
}
}
if(calendarLinks.size() > 0) {

count = (Integer) this.transactionTemplate.execute(new TransactionCallback(){

@Override
public Object doInTransaction(TransactionStatus status) {

int count = dao.addCalendarLinks(calendarLinks);
return count;
}});

}
}
if(calendarLinks.size() > 0) {

count = (Integer) this.transactionTemplate.execute(new TransactionCallback(){

@Override
public Object doInTransaction(TransactionStatus status) {

int count = dao.addCalendarLinks(calendarLinks);
return count;
}});

}

// restore the current user to previous user
developerHelperService.restoreCurrentUser();
}
catch (Exception e)
{
logger.info(this + " addCalendarLinks user id=" + sakaiUserId + " Exception" + e.getMessage());
}
}
if(logger.isDebugEnabled()) {
Expand Down Expand Up @@ -373,37 +391,50 @@ public void addNewsLinks(String sakaiUserId, String contextId) {
Person person = this.getOrCreatePerson(sakaiUserId);
if(person == null) {
logger.warn("Attempting to add news links for non-existent user: " + sakaiUserId);
return;
} else {
// TODO: deal with expired items
List<NewsItem> items = dao.getNewsItemsByContext(contextId);
if(items == null || items.isEmpty()) {
StringBuilder message = new StringBuilder();
message.append("There is no news events in context (");
message.append(contextId);
message.append(") for new user (");
message.append(sakaiUserId);
message.append(")");
logger.info(message.toString());
} else {
final List<NewsLink> newsLinks = new ArrayList<NewsLink>();
for(NewsItem item: items) {
SourceType sourceType = item.getSourceType();
DashboardEntityInfo dashboardEntityInfo = this.dashboardEntityInfoMap.get(sourceType.getIdentifier());
if(dashboardEntityInfo != null && dashboardEntityInfo.isAvailable(item.getEntityReference()) && dashboardEntityInfo.isUserPermitted(sakaiUserId, item.getEntityReference(), item.getContext().getContextId()) ) {
NewsLink newsLink = new NewsLink(person, item, item.getContext(), false, false);
newsLinks.add(newsLink);
try
{
// set the current user id
developerHelperService.setCurrentUser("/user/" + sakaiUserId);

List<NewsItem> items = dao.getNewsItemsByContext(contextId);
if(items == null || items.isEmpty()) {
StringBuilder message = new StringBuilder();
message.append("There is no news event in context (");
message.append(contextId);
message.append(") for new user (");
message.append(sakaiUserId);
message.append(")");
logger.info(message.toString());
} else {
final List<NewsLink> newsLinks = new ArrayList<NewsLink>();
for(NewsItem item: items) {
SourceType sourceType = item.getSourceType();
DashboardEntityInfo dashboardEntityInfo = this.dashboardEntityInfoMap.get(sourceType.getIdentifier());
if(dashboardEntityInfo != null && dashboardEntityInfo.isAvailable(item.getEntityReference())) {
NewsLink newsLink = new NewsLink(person, item, item.getContext(), false, false);
newsLinks.add(newsLink);
}
}
if(newsLinks.size() > 0) {

count = (Integer) this.transactionTemplate.execute(new TransactionCallback(){

@Override
public Object doInTransaction(TransactionStatus status) {
int count = dao.addNewsLinks(newsLinks);
return count;
}});
}
}
if(newsLinks.size() > 0) {

count = (Integer) this.transactionTemplate.execute(new TransactionCallback(){

@Override
public Object doInTransaction(TransactionStatus status) {
int count = dao.addNewsLinks(newsLinks);
return count;
}});
}

// restore current user to previous user
developerHelperService.restoreCurrentUser();
}
catch (Exception e)
{
logger.info(this + " addNewsLinks user id=" + sakaiUserId + " Exception" + e.getMessage());
}
}
if(logger.isDebugEnabled()) {
Expand Down Expand Up @@ -1431,5 +1462,4 @@ public void updateTaskLock(String task) {
public void removeTaskLocks(String task) {
this.dao.deleteTaskLocks(task);
}

}
1 change: 1 addition & 0 deletions dashboard/pack/src/webapp/WEB-INF/components.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
<property name="dao" ref="org.sakaiproject.dash.dao.DashboardDao" />
<property name="cache" ref="org.sakaiproject.dash.cache" />
<property name="dashboardConfig" ref="org.sakaiproject.dash.app.DashboardConfig" />
<property name="developerHelperService" ref="org.sakaiproject.entitybroker.DeveloperHelperService" />
</bean>

<bean id="org.sakaiproject.dash.app.DashboardUserLogic"
Expand Down

0 comments on commit 3095c8e

Please sign in to comment.