Automated merge with https://gss.googlecode.com/hg/

[pithos] / src / gr / ebs / gss / server / rest / UserHandler.java

diff --git a/src/gr/ebs/gss/server/rest/UserHandler.java b/src/gr/ebs/gss/server/rest/UserHandler.java
index f5bed77..55aca29 100644 (file)
--- a/src/gr/ebs/gss/server/rest/UserHandler.java
+++ b/src/gr/ebs/gss/server/rest/UserHandler.java
@@ -24,10 +24,13 @@ import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
 import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.Login;
 import gr.ebs.gss.server.domain.User;
 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 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;
 import java.util.concurrent.Callable;
 
 import javax.servlet.http.Cookie;

@@ -91,8 +94,13 @@ public class UserHandler extends RequestHandler {
                        String announcement = getConfiguration().getString("announcement");
                        if (announcement != null && !announcement.isEmpty())
                                json.put("announcement", announcement);
                        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);
                } catch (JSONException e) {
                        logger.error("", e);
                        resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);