Author: prabath
Date: Tue Mar 18 01:06:09 2008
New Revision: 14949
Log:
added new field to the OpenID by User report [last visited time]
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statopenidbyuser.jsp
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/OpenIDUserRPDAO.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/OpenIDSummaryReportData.java
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statopenidbyuser.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statopenidbyuser.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statopenidbyuser.jsp
Tue Mar 18 01:06:09 2008
@@ -56,12 +56,14 @@
<th>UserId</th>
<th>OpenID</th>
<th>Visits</th>
+ <th>Last Login</th>
</tr>
<s:iterator value="dataList" status="status">
<tr>
<td><s:property value="userId" /></td>
<td><s:property value="openID" /></td>
<td><s:property value="cardCount" /></td>
+ <td><s:property value="lastVisit" /></td>
</tr>
</s:iterator>
</table>
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/OpenIDUserRPDAO.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/OpenIDUserRPDAO.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/OpenIDUserRPDAO.java
Tue Mar 18 01:06:09 2008
@@ -1,6 +1,7 @@
package org.wso2.solutions.identity.persistence.dao;
import java.util.ArrayList;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -110,16 +111,17 @@
}
/**
- *
- * @return
+ * Returns user name,number of total visits, last login time and OpenID, of
+ * all the users who at least used his OpenID once.
+ * @return user data
*/
public List<OpenIDSummaryReportData> getOpenIDsGroupedByUser() {
- String stmt = "select c.userName, count(c.visitCount) from
OpenIDUserRPDO c group by c.userName";
+ String stmt = "select c.userName, sum(c.visitCount),max(lastVisit)
from OpenIDUserRPDO c group by c.userName";
Session session = hbConfig.getCurrentSession();
-
+
List<OpenIDSummaryReportData> userData = new
ArrayList<OpenIDSummaryReportData>();
-
+
try {
Query query = session.createQuery(stmt);
List lst = query.list();
@@ -127,12 +129,13 @@
while (ite.hasNext()) {
Object[] tuple = (Object[]) ite.next();
String userId = (String) tuple[0];
- Integer count = (Integer) tuple[1];
+ Integer count = (Integer) tuple[1];
OpenIDSummaryReportData data = new OpenIDSummaryReportData();
data.setCardCount(count.intValue());
data.setUserId(userId);
+ data.setLastVisit((Date)tuple[2]);
userData.add(data);
- }
+ }
} catch (Throwable e) {
String msg = messages.getMessage("errorQuerryingOpenIDUserRP");
log.error(msg, e);
@@ -143,4 +146,4 @@
return userData;
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/OpenIDSummaryReportData.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/OpenIDSummaryReportData.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/OpenIDSummaryReportData.java
Tue Mar 18 01:06:09 2008
@@ -1,5 +1,7 @@
package org.wso2.solutions.identity.report;
+import java.util.Date;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.solutions.identity.IdentityProviderException;
@@ -8,8 +10,8 @@
public class OpenIDSummaryReportData extends SummaryReportData {
private static Log log = LogFactory.getLog(OpenIDSummaryReportData.class);
-
private String openID;
+ private Date lastVisit;
public String getOpenID() {
try {
@@ -21,4 +23,12 @@
}
}
+ public Date getLastVisit() {
+ return lastVisit;
+ }
+
+ public void setLastVisit(Date lastVisit) {
+ this.lastVisit = lastVisit;
+ }
+
}
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
