This commit is contained in:
@@ -11,7 +11,6 @@ import javax.persistence.Query;
|
|||||||
|
|
||||||
import org.yacos.core.users.Role;
|
import org.yacos.core.users.Role;
|
||||||
import org.yacos.core.users.User;
|
import org.yacos.core.users.User;
|
||||||
import org.yacos.core.users.UserManagerBean;
|
|
||||||
|
|
||||||
|
|
||||||
@Stateless
|
@Stateless
|
||||||
@@ -45,14 +44,13 @@ public class ConferenceManagerBean implements IConferenceManager {
|
|||||||
|
|
||||||
public List<Conference> getConferences(User user){
|
public List<Conference> getConferences(User user){
|
||||||
List<Conference> list = new ArrayList<Conference>();
|
List<Conference> list = new ArrayList<Conference>();
|
||||||
List<Role> tmpList = new UserManagerBean().getRoles();
|
|
||||||
|
List<Role> tmpList = this.getRoles(user);
|
||||||
|
|
||||||
Conference conf;
|
Conference conf;
|
||||||
for (Role role : tmpList) {
|
for (Role role : tmpList) {
|
||||||
conf = role.getConference();
|
conf = role.getConference();
|
||||||
if(!list.contains(conf)){
|
list.add(conf);
|
||||||
list.add(conf);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
@@ -60,12 +58,11 @@ public class ConferenceManagerBean implements IConferenceManager {
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* méthodes relatives aux roles
|
* m<EFBFBD>thodes relatives aux roles
|
||||||
* */
|
* */
|
||||||
|
|
||||||
public void addRole(Role.RoleType roleType, User user, Conference conf) {
|
public void addRole(Role.RoleType roleType, User user, Conference conf) {
|
||||||
Role role = new Role(roleType, user, conf);
|
Role role = new Role(roleType, user, conf);
|
||||||
System.out.println(role);
|
|
||||||
em.persist(role);
|
em.persist(role);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,11 +74,18 @@ public class ConferenceManagerBean implements IConferenceManager {
|
|||||||
em.merge(role);
|
em.merge(role);
|
||||||
}
|
}
|
||||||
|
|
||||||
//FIXME
|
@SuppressWarnings("unchecked")
|
||||||
//methode utile?
|
public List<Role> getRoles(Conference conf){
|
||||||
public List<Role> getRoles(){
|
Query query = em.createQuery("from Role role where conference = ?");
|
||||||
return em.createQuery("from Role role").getResultList();
|
query.setParameter(1, conf);
|
||||||
|
return query.getResultList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public List<Role> getRoles(User user) {
|
||||||
|
Query query = em.createQuery("from Role role where user = ?");
|
||||||
|
query.setParameter(1, user);
|
||||||
|
return query.getResultList();
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@@ -89,9 +93,11 @@ public class ConferenceManagerBean implements IConferenceManager {
|
|||||||
Query query = em.createQuery("from Role role where conference = ? and user = ?");
|
Query query = em.createQuery("from Role role where conference = ? and user = ?");
|
||||||
query.setParameter(1, conf);
|
query.setParameter(1, conf);
|
||||||
query.setParameter(2, user);
|
query.setParameter(2, user);
|
||||||
|
|
||||||
return query.getResultList();
|
return query.getResultList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ public interface IConferenceManager {
|
|||||||
//role et user methode
|
//role et user methode
|
||||||
public void addRole(Role.RoleType roleType, User user, Conference conf);
|
public void addRole(Role.RoleType roleType, User user, Conference conf);
|
||||||
public void removeRole(Role role);
|
public void removeRole(Role role);
|
||||||
public List<Role> getRoles();
|
public List<Role> getRoles(Conference conf);
|
||||||
public List<Role> getRoles(User user, Conference conf);
|
public List<Role> getRoles(User user, Conference conf);
|
||||||
public void updateRole(Role role);
|
public void updateRole(Role role);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,9 @@ import javax.persistence.EntityManager;
|
|||||||
import javax.persistence.PersistenceContext;
|
import javax.persistence.PersistenceContext;
|
||||||
import javax.persistence.Query;
|
import javax.persistence.Query;
|
||||||
|
|
||||||
|
import org.yacos.core.conferences.Conference;
|
||||||
import org.yacos.core.exceptions.PKAlreadyUsedException;
|
import org.yacos.core.exceptions.PKAlreadyUsedException;
|
||||||
|
import org.yacos.core.users.Role.RoleType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author christiancorsano
|
* @author christiancorsano
|
||||||
@@ -66,9 +68,14 @@ public class UserManagerBean implements IUserManager{
|
|||||||
return (this.getUser(login)!= null);
|
return (this.getUser(login)!= null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Role> getRoles() {
|
public List<User> getUsers(Conference conf) {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return em.createQuery("from Role").getResultList();
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<User> getUsers(RoleType type) {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user