Revision 403c8ca0 src/gr/ebs/gss/server/ejb/AdminAPIBean.java
| b/src/gr/ebs/gss/server/ejb/AdminAPIBean.java | ||
|---|---|---|
| 30 | 30 |
import gr.ebs.gss.server.domain.Permission; |
| 31 | 31 |
import gr.ebs.gss.server.domain.User; |
| 32 | 32 |
import gr.ebs.gss.server.domain.UserClass; |
| 33 |
import gr.ebs.gss.server.domain.UserLogin; |
|
| 33 | 34 |
import gr.ebs.gss.server.domain.dto.FileBodyDTO; |
| 34 | 35 |
import gr.ebs.gss.server.domain.dto.FileHeaderDTO; |
| 35 | 36 |
import gr.ebs.gss.server.domain.dto.FolderDTO; |
| ... | ... | |
| 225 | 226 |
public List<UserDTO> searchUsers(String query) {
|
| 226 | 227 |
List<User> users = dao.getUsersByUserNameOrEmailLike(query); |
| 227 | 228 |
List<UserDTO> result = new ArrayList<UserDTO>(); |
| 228 |
for (User u : users) |
|
| 229 |
result.add(u.getDTO()); |
|
| 229 |
for (User u : users){
|
|
| 230 |
UserDTO tempDTO = u.getDTO(); |
|
| 231 |
List<UserLogin> userLogins = dao.getLoginsForUser(u.getId()); |
|
| 232 |
tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate()); |
|
| 233 |
tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate()); |
|
| 234 |
result.add(tempDTO); |
|
| 235 |
} |
|
| 230 | 236 |
return result; |
| 231 | 237 |
} |
| 232 | 238 |
|
| 233 | 239 |
@Override |
| 234 | 240 |
public UserDTO getUser(String username) throws ObjectNotFoundException{
|
| 235 | 241 |
User u = dao.getUser(username); |
| 236 |
if(u!=null) |
|
| 237 |
return u.getDTO(); |
|
| 242 |
if(u!=null){
|
|
| 243 |
UserDTO tempDTO = u.getDTO(); |
|
| 244 |
List<UserLogin> userLogins = dao.getLoginsForUser(u.getId()); |
|
| 245 |
tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate()); |
|
| 246 |
tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate()); |
|
| 247 |
return tempDTO; |
|
| 248 |
|
|
| 249 |
} |
|
| 238 | 250 |
return null; |
| 239 | 251 |
} |
| 240 | 252 |
@Override |
| ... | ... | |
| 315 | 327 |
public List<UserDTO> getLastLoggedInUsers(Date lastLoginDate) {
|
| 316 | 328 |
List<User> users = dao.getUsersByLastLogin(lastLoginDate); |
| 317 | 329 |
List<UserDTO> result = new ArrayList<UserDTO>(); |
| 318 |
for (User u : users) |
|
| 319 |
result.add(u.getDTO()); |
|
| 330 |
for (User u : users){
|
|
| 331 |
UserDTO tempDTO = u.getDTO(); |
|
| 332 |
List<UserLogin> userLogins = dao.getLoginsForUser(u.getId()); |
|
| 333 |
tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate()); |
|
| 334 |
tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate()); |
|
| 335 |
result.add(tempDTO); |
|
| 336 |
} |
|
| 320 | 337 |
return result; |
| 321 | 338 |
} |
| 322 |
|
|
| 339 |
|
|
| 323 | 340 |
@Override |
| 324 | 341 |
public List<FileBodyDTO> getVersions(Long userId, Long fileId) throws ObjectNotFoundException, InsufficientPermissionsException {
|
| 325 | 342 |
if (userId == null) |
| ... | ... | |
| 337 | 354 |
public List<UserDTO> getUsersWaitingActivation(){
|
| 338 | 355 |
List<User> users = dao.getInactiveUsers(); |
| 339 | 356 |
List<UserDTO> result = new ArrayList<UserDTO>(); |
| 340 |
for(User u :users) |
|
| 341 |
result.add(u.getDTO()); |
|
| 357 |
for(User u :users){
|
|
| 358 |
UserDTO tempDTO = u.getDTO(); |
|
| 359 |
List<UserLogin> userLogins = dao.getLoginsForUser(u.getId()); |
|
| 360 |
tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate()); |
|
| 361 |
tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate()); |
|
| 362 |
result.add(tempDTO); |
|
| 363 |
|
|
| 364 |
} |
|
| 342 | 365 |
return result; |
| 343 | 366 |
} |
| 344 | 367 |
|
| ... | ... | |
| 448 | 471 |
for(FileUploadStatus s : sts) |
| 449 | 472 |
dao.delete(s); |
| 450 | 473 |
int deleteCount=dao.deletePermissionsNotCorrespondingToFilesAndFolders(userId); |
| 474 |
|
|
| 475 |
List<UserLogin> allUserLogins = dao.getAllLoginsForUser(userId); |
|
| 476 |
for(UserLogin ul : allUserLogins) |
|
| 477 |
dao.delete(ul); |
|
| 451 | 478 |
dao.flush(); |
| 452 | 479 |
dao.delete(user); |
| 453 | 480 |
} |
Also available in: Unified diff