Revision 46476
Added by Panagiotis Kanakakis about 7 years ago
| modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/MonitorTest.java | ||
|---|---|---|
| 3 | 3 |
import eu.dnetlib.goldoa.domain.*; |
| 4 | 4 |
import eu.dnetlib.goldoa.service.BudgetManager; |
| 5 | 5 |
import eu.dnetlib.goldoa.service.RequestManagerImpl; |
| 6 |
import eu.dnetlib.goldoa.service.UserManager; |
|
| 6 | 7 |
import org.junit.Test; |
| 7 | 8 |
import org.junit.runner.RunWith; |
| 8 | 9 |
import org.springframework.beans.factory.annotation.Autowired; |
| ... | ... | |
| 28 | 29 |
BudgetManager bm; |
| 29 | 30 |
@Autowired |
| 30 | 31 |
RequestManagerImpl rm; |
| 32 |
@Autowired |
|
| 33 |
UserManager um; |
|
| 31 | 34 |
|
| 32 | 35 |
@Test |
| 33 | 36 |
@Transactional |
| ... | ... | |
| 70 | 73 |
|
| 71 | 74 |
} |
| 72 | 75 |
|
| 76 |
@Test |
|
| 77 |
@Transactional |
|
| 78 |
@Rollback(true) |
|
| 79 |
public void monitorUserRoles(){
|
|
| 80 |
um.acceptUserRole("pkanakakis@di.uoa.gr","project_coordinator");
|
|
| 81 |
} |
|
| 82 |
|
|
| 73 | 83 |
} |
| modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java | ||
|---|---|---|
| 198 | 198 |
User user = (User) createEntityCriteria().add(Restrictions.eq("email", email)).list().get(0);
|
| 199 | 199 |
user.setActive(false); |
| 200 | 200 |
log.debug("user is active -> " + user.isActive());
|
| 201 |
getSession().update(user);
|
|
| 201 |
User user_merged = (User) getSession().merge(user);
|
|
| 202 | 202 |
log.debug("user is active -> " + user.isActive());
|
| 203 | 203 |
} |
| 204 | 204 |
|
| 205 | 205 |
public void acceptUserRole(String email, String roleId) {
|
| 206 | 206 |
Criteria cr = getSession().createCriteria(UserRole.class); |
| 207 | 207 |
User user = getUserByEmail(email); |
| 208 |
Role role = getRole(roleId); |
|
| 209 |
UserRole ur = (UserRole) cr.add(Restrictions.eq("pk.user", user))
|
|
| 210 |
.add(Restrictions.eq("pk.role", role)).list().get(0);
|
|
| 211 | 208 |
|
| 212 |
ur.setApproved(true); |
|
| 213 |
getSession().update(ur); |
|
| 209 |
for (UserRole ur : user.getRoles()) {
|
|
| 210 |
if (ur.getPk().getRole().getId() == roleId) {
|
|
| 211 |
ur.setApproved(true); |
|
| 212 |
persist(user); |
|
| 213 |
} |
|
| 214 |
} |
|
| 214 | 215 |
} |
| 215 | 216 |
|
| 216 | 217 |
public void rejectUserRole(String email, String roleId) {
|
| 217 |
Criteria cr = getSession().createCriteria(UserRole.class); |
|
| 218 | 218 |
User user = getUserByEmail(email); |
| 219 |
Role role = getRole(roleId); |
|
| 220 |
UserRole ur = (UserRole) cr.add(Restrictions.eq("pk.user", user))
|
|
| 221 |
.add(Restrictions.eq("pk.role", role)).list().get(0);
|
|
| 222 |
|
|
| 223 |
ur.setApproved(false); |
|
| 224 |
user.getRoles().remove(ur); |
|
| 225 |
getSession().update(ur); |
|
| 226 |
getSession().update(user); |
|
| 219 |
for(UserRole ur : user.getRoles()) {
|
|
| 220 |
if (ur.getPk().getRole().getId() == roleId) {
|
|
| 221 |
ur.setApproved(false); |
|
| 222 |
user.getRoles().remove(ur); |
|
| 223 |
} |
|
| 224 |
} |
|
| 225 |
saveUser(user); |
|
| 227 | 226 |
} |
| 228 | 227 |
|
| 229 | 228 |
|
| modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/UserManagerImpl.java | ||
|---|---|---|
| 204 | 204 |
} |
| 205 | 205 |
|
| 206 | 206 |
@Override |
| 207 |
public void activateUsers(List<String> userIds) {
|
|
| 208 |
for (String userId : userIds) {
|
|
| 209 |
userDAO.activateUser(userId);
|
|
| 207 |
public void activateUsers(List<String> emails) {
|
|
| 208 |
for (String email : emails) {
|
|
| 209 |
userDAO.activateUser(email);
|
|
| 210 | 210 |
} |
| 211 | 211 |
} |
| 212 | 212 |
|
| modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/RequestComment.java | ||
|---|---|---|
| 1 | 1 |
package eu.dnetlib.goldoa.domain; |
| 2 | 2 |
|
| 3 |
import com.fasterxml.jackson.annotation.JsonBackReference; |
|
| 4 |
|
|
| 3 | 5 |
import java.io.Serializable; |
| 4 | 6 |
import javax.persistence.*; |
| 5 | 7 |
|
| ... | ... | |
| 21 | 23 |
@Id |
| 22 | 24 |
@ManyToOne |
| 23 | 25 |
@JoinColumn(name = "\"user\"") |
| 26 |
@JsonBackReference |
|
| 24 | 27 |
private User user; |
| 25 | 28 |
|
| 26 | 29 |
@Id |
| modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/HIbernateDomainConverter.java | ||
|---|---|---|
| 70 | 70 |
String json = mapper.writeValueAsString(returnType.cast(obj)); |
| 71 | 71 |
log.debug(json); |
| 72 | 72 |
log.debug(returnType); |
| 73 |
System.out.println(json); |
|
| 74 |
System.out.println(returnType); |
|
| 75 | 73 |
return mapper.readValue(json, returnType); |
| 76 | 74 |
} |
| 77 | 75 |
|
| modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/Request.java | ||
|---|---|---|
| 1 | 1 |
package eu.dnetlib.goldoa.domain; |
| 2 | 2 |
|
| 3 |
import com.fasterxml.jackson.annotation.JsonBackReference; |
|
| 3 | 4 |
import com.google.gwt.user.client.rpc.IsSerializable; |
| 4 | 5 |
|
| 5 | 6 |
import java.io.Serializable; |
| ... | ... | |
| 135 | 136 |
|
| 136 | 137 |
@OneToOne |
| 137 | 138 |
@JoinColumn(name = "\"user\"") |
| 139 |
@JsonBackReference |
|
| 138 | 140 |
private User user; |
| 139 | 141 |
|
| 140 | 142 |
@OneToMany(mappedBy = "pk.request",cascade=CascadeType.ALL) |
Also available in: Unified diff