You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/11/27 09:05:50 UTC
svn commit: r1545956 - in
/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db:
dao/room/InvitationDao.java entity/room/Invitation.java
Author: solomax
Date: Wed Nov 27 08:05:49 2013
New Revision: 1545956
URL: http://svn.apache.org/r1545956
Log:
[OPENMEETINGS-844] Invitation queries are fixed;
code clean up
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Invitation.java
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/InvitationDao.java?rev=1545956&r1=1545955&r2=1545956&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/InvitationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/InvitationDao.java Wed Nov 27 08:05:49 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.db.dao.room;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.Date;
import javax.persistence.EntityManager;
@@ -26,16 +28,13 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.entity.room.Invitation;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@Transactional
public class InvitationDao {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- InvitationDao.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(InvitationDao.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
@@ -57,7 +56,6 @@ public class InvitationDao {
try {
TypedQuery<Invitation> query = em.createNamedQuery("getInvitationbyId", Invitation.class);
- query.setParameter("deleted", true);
query.setParameter("invid", invId);
try {
@@ -66,7 +64,7 @@ public class InvitationDao {
}
} catch (Exception e) {
- log.error("getInvitationbyId : ", e);
+ log.error("get : ", e);
}
return null;
}
@@ -76,7 +74,6 @@ public class InvitationDao {
TypedQuery<Invitation> query = em.createNamedQuery("getInvitationByHashCode", Invitation.class);
query.setParameter("hashCode", hashCode);
- query.setParameter("deleted", false);
try {
return query.getSingleResult();
@@ -84,7 +81,7 @@ public class InvitationDao {
}
} catch (Exception e) {
- log.error("getInvitationbyAppointementId : ", e);
+ log.error("getInvitationByHashCode : ", e);
}
return null;
}
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Invitation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Invitation.java?rev=1545956&r1=1545955&r2=1545956&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Invitation.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Invitation.java Wed Nov 27 08:05:49 2013
@@ -42,14 +42,12 @@ import org.apache.openmeetings.db.entity
@Entity
@NamedQueries({
- @NamedQuery(name = "getInvitationbyId", query = "select invi from Invitations invi "
- + "WHERE invi.deleted <> :deleted "
- + "AND invi.invitations_id = :invid"),
- @NamedQuery(name = "getInvitationByHashCode", query = "select c from Invitations as c "
- + "where c.hash LIKE :hashCode "
- + "AND c.deleted = :deleted"),
- @NamedQuery(name = "getInvitationByAppointment", query = "select a from Invitations a "
- + "WHERE a.appointmentId = :appointmentId ")
+ @NamedQuery(name = "getInvitationbyId", query = "SELECT i FROM Invitation i "
+ + "WHERE i.deleted = false AND i.id = :invid"),
+ @NamedQuery(name = "getInvitationByHashCode", query = "SELECT i FROM Invitation i "
+ + "where i.hash LIKE :hashCode AND i.deleted = false"),
+ @NamedQuery(name = "getInvitationByAppointment", query = "SELECT i FROM Invitation i "
+ + "WHERE i.appointment.id = :appointmentId ")
})
@Table(name = "invitations")
public class Invitation implements Serializable {