Skip to content
This repository has been archived by the owner on Dec 22, 2023. It is now read-only.

Admin gets to see phone numbers #42

Merged
merged 2 commits into from
Aug 20, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@ public interface EmergencyPhoneNumberService{
* @throws Exception
*/
public TypeValue[] setEmergencyPhoneNumbers(String netid, TypeValue[] phoneNumbers) throws Exception;

public TypeValue[] getEmergencyPhoneNumbers(String username,
String manifestGroups, String netId);

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package edu.wisc.my.profile.emergencyPhone.service;

import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
Expand All @@ -11,14 +14,23 @@

@Service
public class EmergencyPhoneNumberServiceImpl implements EmergencyPhoneNumberService{

protected final Logger logger = LoggerFactory.getLogger(getClass());

private EmergencyPhoneNumberDao dao;

private String adminGroup;

@Autowired
public void setEmergencyPhoneNumberDao(EmergencyPhoneNumberDao dao) {
this.dao = dao;
}

@Value("${adminGroup}")
public void setAdminGroup(String group) {
adminGroup = group;
}

@Override
public TypeValue[] getEmergencyPhoneNumbers(String netId) {
return dao.getData(netId);
Expand All @@ -32,5 +44,17 @@ public TypeValue[] setEmergencyPhoneNumbers(String netId,
}
return dao.setData(netId, phoneNumbers);
}

@Override
public TypeValue[] getEmergencyPhoneNumbers(String username, String manifestGroups, String netId) {
if(StringUtils.isNotBlank(adminGroup) && manifestGroups.contains(adminGroup)){
logger.info("User {} lookuped up user {} emergency phone number", username, netId);
return dao.getData(netId);
}else {
//TODO : implement uw-spring-security
logger.warn("Security violation: User {} looked up user{} emergency phone number", username, netId);
throw new SecurityException("Security violation, forbidden");
}
}

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package edu.wisc.my.profile.service;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import edu.wisc.my.profile.dao.EmergencyPhoneNumberDao;
Expand All @@ -9,8 +13,17 @@
@Service
public class EmergencyPhoneNumberServiceImpl implements EmergencyPhoneNumberService {

protected final Logger logger = LoggerFactory.getLogger(getClass());

private String adminGroup;

@Autowired
private EmergencyPhoneNumberDao dao;

@Value("${adminGroup}")
public void setAdminGroup(String group) {
adminGroup = group;
}

@Override
public TypeValue[] getEmergencyPhoneNumbers(String netId) {
Expand All @@ -22,4 +35,16 @@ public TypeValue[] setEmergencyPhoneNumbers(String netId, TypeValue[] phoneNumbe
return dao.setPhoneNumbers(netId, phoneNumbers);
}

@Override
public TypeValue[] getEmergencyPhoneNumbers(String username, String manifestGroups, String netId) {
if(StringUtils.isNotBlank(adminGroup) && manifestGroups.contains(adminGroup)){
logger.info("User {} lookuped up user {} emergency phone number", username, netId);
return dao.getPhoneNumbers(netId);
}else {
//TODO : implement uw-spring-security
logger.warn("Security violation: User {} looked up user{} emergency phone number", username, netId);
throw new SecurityException("Security violation, forbidden");
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@

import edu.wisc.my.profile.model.ContactInformation;
import edu.wisc.my.profile.model.SearchTerm;
import edu.wisc.my.profile.model.TypeValue;
import edu.wisc.my.profile.model.User;
import edu.wisc.my.profile.service.EmergencyContactInformationService;
import edu.wisc.my.profile.service.EmergencyPhoneNumberService;
import edu.wisc.my.profile.service.LocalContactInformationService;
import edu.wisc.my.profile.service.SearchUsersService;

Expand All @@ -44,6 +46,9 @@ public class LocalContactAdminController {
@Autowired
private SearchUsersService searchUsersService;

@Autowired
private EmergencyPhoneNumberService emPhoneNumberService;

@Value("${manifestAttribute}")
public void setManifestGroupAttribute(String attr) {
manifestAttribute = attr;
Expand Down Expand Up @@ -99,10 +104,14 @@ public void setUsernameAttr(String attr) {
}
ContactInformation[] emergencyInfo = emergencyService.getContactInfo(username, manifestGroups, netId);
ContactInformation localInfo = localService.getContactInfo(username,manifestGroups, netId);
TypeValue[] emergencyPhoneNumbers = emPhoneNumberService.getEmergencyPhoneNumbers(username, manifestGroups, netId);
String localContactInfoString = gson.toJson(localInfo);
String emergencyContactInfoString = gson.toJson(emergencyInfo);
String emergencyPhoneNumbersString = gson.toJson(emergencyPhoneNumbers);
response.setContentType("application/json");
response.getWriter().write("{\"emergency\":"+ emergencyContactInfoString +" , \"local\":"+localContactInfoString+"}");
response.getWriter().write("{\"emergency\":"+ emergencyContactInfoString +
" , \"local\":"+localContactInfoString+
" , \"emergencyPhoneNumbers\":"+emergencyPhoneNumbersString+"}");
} catch (Exception e) {
logger.error("Issue happened during lookup", e);
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<div class='col-sm-offset-2 col-sm-8'>
<div class='info-card'>
<p><strong>Local Phone Numbers</strong></p>
<div ng-repeat="phone in people.contactInformation.local.phoneNumbers">{{phone.type}} : {{phone.value}}</div>
<div ng-repeat="phone in people.emegencyPhoneNumbers">{{phone.type}} : {{phone.value}}</div>
<div ng-if='people.contactInformation.local.phoneNumbers && people.contactInformation.local.phoneNumbers.length === 0'>
No local phone numbers available for {{people.firstName}} {{people.middleName}} {{people.lastName}}
</div>
Expand Down