Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

move logic to user service

Browse Source
This commit is contained in:
Athou
2013-11-26 15:09:32 +01:00
parent c2ed6d47f1
commit 174d21fd4e
2 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
View File

@@ -1,8 +1,6 @@
package com.commafeed.frontend.rest.resources;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
@@ -18,8 +16,6 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import lombok.extern.slf4j.Slf4j;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.authentication.IAuthenticationStrategy;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
@@ -32,7 +28,6 @@ import com.codahale.metrics.MetricRegistry;
import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.services.FeedSubscriptionService;
import com.commafeed.frontend.CommaFeedApplication;
import com.commafeed.frontend.CommaFeedSession;
import com.commafeed.frontend.SecurityCheck;
@@ -40,7 +35,6 @@ import com.commafeed.frontend.SecurityCheck;
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@SecurityCheck(Role.USER)
@Slf4j
public abstract class AbstractREST {
@Context
@@ -55,9 +49,6 @@ public abstract class AbstractREST {
@Inject
private UserDAO userDAO;
@Inject
FeedSubscriptionService feedSubscriptionService;
@PostConstruct
public void init() {
CommaFeedApplication app = CommaFeedApplication.get();
@@ -107,8 +98,6 @@ public abstract class AbstractREST {
@AroundInvoke
public Object intercept(InvocationContext context) throws Exception {
startFullRefresh(getUser());
Method method = context.getMethod();
// check security
@@ -148,19 +137,6 @@ public abstract class AbstractREST {
return result;
}
private void startFullRefresh(User user) {
if (user == null)
return;
Date now = new Date();
if (user.getLastFullRefresh() == null || (now.getTime() - user.getLastFullRefresh().getTime()) > TimeUnit.MINUTES.toMillis(30)) {
log.info("Starting full refresh for {}", user.getName());
user.setLastFullRefresh(now);
userDAO.saveOrUpdate(user);
feedSubscriptionService.refreshAll(user);
}
}
private boolean checkRole(Role requiredRole) {
if (requiredRole == Role.NONE) {
return true;