1 files changed, 10 insertions, 49 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileController.java
index 24ea203f..5c96e169 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileController.java
@@ -42,6 +42,7 @@ import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -51,6 +52,7 @@ import org.json.JSONObject;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.portalsdk.core.domain.Role;
 import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.domain.UserApp;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.service.RoleService;
 import org.onap.portalsdk.core.service.UserProfileService;
@@ -95,55 +97,6 @@ public class ProfileController extends RestrictedBaseController {
 	@Autowired
 	private RoleService roleService;
 	
-	@RequestMapping(value = { "/profile" }, method = RequestMethod.GET)
-	public ModelAndView profile(HttpServletRequest request) throws IOException {
-		Map<String, Object> model = new HashMap<>();
-		ObjectMapper mapper = new ObjectMapper();
-		User user = UserUtils.getUserSession(request);
-
-		User profile;
-		Long profileId;
-		if (request.getRequestURI().indexOf("self_profile.htm") > -1) {
-			profile = UserUtils.getUserSession(request);
-			profileId = profile.getId();
-		} else {
-			profileId = Long.parseLong(request.getParameter(PROFILE_ID));
-			profile = userService.getUser(String.valueOf(profileId));
-		}
-
-		try {
-			model.put(STATE_LIST, mapper.writeValueAsString(getStates()));
-			model.put(COUNTRIES, mapper.writeValueAsString(getCountries()));
-			model.put(TIME_ZONES, mapper.writeValueAsString(getTimeZones()));
-			model.put(AVAILABLE_ROLES, mapper.writeValueAsString(getAvailableRoles(user.getOrgUserId())));
-			model.put(PROFILE, mapper.writeValueAsString(profile));
-			model.put(PROFILEID, mapper.writeValueAsString(profileId));
-		} catch (Exception e) {
-			logger.error(EELFLoggerDelegate.errorLogger, "profile: failed to write JSON", e);
-		}
-		return new ModelAndView(PROFILE, "model", model);
-	}
-
-	@RequestMapping(value = { "/self_profile" }, method = RequestMethod.GET)
-	public ModelAndView selfProfile(HttpServletRequest request) {
-		Map<String, Object> model = new HashMap<>();
-		ObjectMapper mapper = new ObjectMapper();
-
-		Long profileId = null;
-		User user = UserUtils.getUserSession(request);
-		User profile = UserUtils.getUserSession(request);
-		try {
-			model.put(STATE_LIST, mapper.writeValueAsString(getStates()));
-			model.put(COUNTRIES, mapper.writeValueAsString(getCountries()));
-			model.put(TIME_ZONES, mapper.writeValueAsString(getTimeZones()));
-			model.put(AVAILABLE_ROLES, mapper.writeValueAsString(getAvailableRoles(user.getOrgUserId())));
-			model.put(PROFILE, mapper.writeValueAsString(profile));
-			model.put(PROFILEID, mapper.writeValueAsString(profileId));
-		} catch (Exception e) {
-			logger.error(EELFLoggerDelegate.errorLogger, "self_profile: failed to write JSON", e);
-		}
-		return new ModelAndView(PROFILE, "model", model);
-	}
 
 	@RequestMapping(value = { "/get_self_profile" }, method = RequestMethod.GET)
 	public void getSelfProfile(HttpServletRequest request, HttpServletResponse response) {
@@ -153,6 +106,10 @@ public class ProfileController extends RestrictedBaseController {
 
 		Long profileId = null;
 		User profile = UserUtils.getUserSession(request);	
+		 @SuppressWarnings("unchecked")
+			Set<UserApp> userapps =  user.getUserApps();
+	        Set<UserApp> userapplications = UserUtils.getUserApps(userapps);
+	        profile.setUserApps(userapplications);
 		try {
 			model.put(STATE_LIST, mapper.writeValueAsString(getStates()));
 			model.put(COUNTRIES, mapper.writeValueAsString(getCountries()));
@@ -184,6 +141,10 @@ public class ProfileController extends RestrictedBaseController {
 				profileId = Long.parseLong(request.getParameter(PROFILE_ID));
 				profile = userService.getUser(String.valueOf(profileId));				
 			}
+			 @SuppressWarnings("unchecked")
+		     Set<UserApp> userapps =  user.getUserApps();
+		     Set<UserApp> userapplications = UserUtils.getUserApps(userapps);
+		     profile.setUserApps(userapplications);
 			model.put(STATE_LIST, mapper.writeValueAsString(getStates()));
 			model.put(COUNTRIES, mapper.writeValueAsString(getCountries()));
 			model.put(TIME_ZONES, mapper.writeValueAsString(getTimeZones()));