Merge pull request #647 from rationalrevolt/userservice-tests

Remove dependency on HttpSession in UserService

src/main/java/com/commafeed/backend/model/User.java

@@ -15,6 +15,7 @@ import javax.persistence.TemporalType;
 import lombok.Getter;
 import lombok.Setter;
 
+import org.apache.commons.lang.time.DateUtils;
 import org.hibernate.annotations.Cascade;
 
 import com.commafeed.backend.model.UserRole.Role;
@@ -77,5 +78,13 @@ public class User extends AbstractModel {
 		}
 		return false;
 	}
+	
+	public boolean shouldRefreshFeedsAt(Date when) {
+		return (lastFullRefresh == null || lastFullRefreshMoreThan30MinutesBefore(when));
+	}
+
+	private boolean lastFullRefreshMoreThan30MinutesBefore(Date when) {
+		return lastFullRefresh.before(DateUtils.addMinutes(when, -30));
+	}
 
 }

src/main/java/com/commafeed/backend/service/UserService.java

@@ -6,7 +6,6 @@ import java.util.UUID;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import javax.servlet.http.HttpSession;
 
 import lombok.RequiredArgsConstructor;
 
@@ -28,8 +27,6 @@ import com.google.common.base.Preconditions;
 @Singleton
 public class UserService {
 
-	private static final String SESSION_KEY_USER = "user";
-
 	private final FeedCategoryDAO feedCategoryDAO;
 	private final UserDAO userDAO;
 	private final UserSettingsDAO userSettingsDAO;
@@ -54,37 +51,12 @@ public class UserService {
 		if (user != null && !user.isDisabled()) {
 			boolean authenticated = encryptionService.authenticate(password, user.getPassword(), user.getSalt());
 			if (authenticated) {
-				afterLogin(user);
-				return Optional.fromNullable(user);
-			}
-		}
-		return Optional.absent();
-	}
-
-	/**
-	 * try to log in with given credentials and create a session for the user
-	 */
-	public Optional<User> login(String nameOrEmail, String password, HttpSession sessionToFill) {
-		Optional<User> user = login(nameOrEmail, password);
-		if (user.isPresent()) {
-			sessionToFill.setAttribute(SESSION_KEY_USER, user.get());
-		}
-		return user;
-	}
-
-	/**
-	 * try to log in by checking if the user has an active session
-	 */
-	public Optional<User> login(HttpSession session) {
-		if (session != null) {
-			User user = (User) session.getAttribute(SESSION_KEY_USER);
-			if (user != null) {
-				afterLogin(user);
+				performPostLoginActivities(user);
 				return Optional.of(user);
 			}
 		}
 		return Optional.absent();
-	}
+	}	
 
 	/**
 	 * try to log in with given api key
@@ -96,8 +68,8 @@ public class UserService {
 
 		User user = userDAO.findByApiKey(apiKey);
 		if (user != null && !user.isDisabled()) {
-			afterLogin(user);
-			return Optional.fromNullable(user);
+			performPostLoginActivities(user);
+			return Optional.of(user);
 		}
 		return Optional.absent();
 	}
@@ -105,7 +77,7 @@ public class UserService {
 	/**
 	 * should triggers after successful login
 	 */
-	private void afterLogin(User user) {
+	public void performPostLoginActivities(User user) {
 		postLoginActivities.executeFor(user);
 	}
 

src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java

@@ -28,16 +28,15 @@ public class PostLoginActivities {
 
 		boolean saveUser = false;
 		// only update lastLogin field every hour in order to not
-		// invalidate the cache everytime someone logs in
+		// invalidate the cache every time someone logs in
 		if (lastLogin == null || lastLogin.before(DateUtils.addHours(now, -1))) {
 			user.setLastLogin(now);
 			saveUser = true;
 		}
-		if (config.getApplicationSettings().isHeavyLoad()
-				&& (user.getLastFullRefresh() == null || user.getLastFullRefresh().before(DateUtils.addMinutes(now, -30)))) {
+		if (config.getApplicationSettings().isHeavyLoad() && user.shouldRefreshFeedsAt(now)) {
+			feedSubscriptionService.refreshAll(user);
 			user.setLastFullRefresh(now);
 			saveUser = true;
-			feedSubscriptionService.refreshAll(user);
 		}
 		if (saveUser) {
 			userDAO.merge(user);