import gr.ebs.gss.client.exceptions.RpcException;
import gr.ebs.gss.server.Login;
import gr.ebs.gss.server.domain.User;
+import gr.ebs.gss.server.domain.UserLogin;
import gr.ebs.gss.server.domain.dto.StatsDTO;
import gr.ebs.gss.server.ejb.TransactionHelper;
import java.io.IOException;
+import java.util.Date;
+import java.util.List;
import java.util.concurrent.Callable;
import javax.servlet.http.Cookie;
String announcement = getConfiguration().getString("announcement");
if (announcement != null && !announcement.isEmpty())
json.put("announcement", announcement);
- if (owner.getLastLogin() != null)
- json.put("lastLogin", owner.getLastLogin().getTime());
+ List<UserLogin> userLogins = getService().getLastUserLogins(owner.getId());
+ UserLogin currentLogin = userLogins.get(0);
+ Date currentLoginDate = currentLogin.getLoginDate();
+ UserLogin lastLogin = userLogins.get(1);
+ Date lastLoginDate = lastLogin.getLoginDate();
+ json.put("lastLogin", lastLoginDate.getTime())
+ .put("currentLogin", currentLoginDate.getTime());
} catch (JSONException e) {
logger.error("", e);
resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);