1 files changed, 209 insertions, 200 deletions
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/PortalAdminController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/PortalAdminController.java
index 2499ec66..b98a7cb4 100644
--- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/PortalAdminController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/PortalAdminController.java
@@ -1,200 +1,209 @@
-/*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-package org.openecomp.portalapp.portal.controller;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.slf4j.MDC;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import org.openecomp.portalsdk.core.domain.AuditLog;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.service.AuditService;
-import org.openecomp.portalapp.controller.EPRestrictedBaseController;
-import org.openecomp.portalapp.portal.domain.EPRole;
-import org.openecomp.portalapp.portal.domain.EPUser;
-import org.openecomp.portalapp.portal.domain.EcompAuditLog;
-import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
-import org.openecomp.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
-import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
-import org.openecomp.portalapp.portal.service.AdminRolesService;
-import org.openecomp.portalapp.portal.service.PortalAdminService;
-import org.openecomp.portalapp.portal.transport.FieldsValidator;
-import org.openecomp.portalapp.portal.transport.PortalAdmin;
-import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
-import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
-import org.openecomp.portalapp.util.EPUserUtils;
-
-@RestController
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
-@EPAuditLog
-public class PortalAdminController extends EPRestrictedBaseController {
-	@Autowired
-	PortalAdminService portalAdminService;
-	@Autowired
-	AdminRolesService adminRolesService;
-	@Autowired
-	AuditService auditService;
-
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PortalAdminController.class);
-
-	@RequestMapping(value = { "/portalApi/portalAdmins" }, method = RequestMethod.GET, produces = "application/json")
-	public List<PortalAdmin> getPortalAdmins(HttpServletRequest request, HttpServletResponse response) {
-		EPUser user = EPUserUtils.getUserSession(request);
-		List<PortalAdmin> portalAdmins = null;
-		if (user == null) {
-			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.getPortalAdmins, null user");
-			EcompPortalUtils.setBadPermissions(user, response, "getPortalAdmins");
-		} else if (!adminRolesService.isSuperAdmin(user)) {
-			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.getPortalAdmins, bad permissions");
-			EcompPortalUtils.setBadPermissions(user, response, "createPortalAdmin");
-		} else {
-			// return the list of portal admins
-			portalAdmins = portalAdminService.getPortalAdmins();
-			logger.debug(EELFLoggerDelegate.debugLogger, "portalAdmins: called getPortalAdmins()");
-			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/getPortalAdmins", "result =", portalAdmins);
-		}
-
-		return portalAdmins;
-	}
-
-	/**
-	 * RESTful service method to create a new portal admin. Requirement: you
-	 * must be the Ecomp portal super admin user.
-	 */
-
-	@RequestMapping(value = { "/portalApi/portalAdmin" }, method = RequestMethod.POST)
-	public FieldsValidator createPortalAdmin(HttpServletRequest request, @RequestBody String sbcid,
-			HttpServletResponse response) {
-		EPUser user = EPUserUtils.getUserSession(request);
-		FieldsValidator fieldsValidator = null;
-		if (user == null) {
-			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.createPortalAdmin, null user");
-			EcompPortalUtils.setBadPermissions(user, response, "createPortalAdmin");
-		} else if (!adminRolesService.isSuperAdmin(user)) {
-			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.createPortalAdmin bad permissions");
-			EcompPortalUtils.setBadPermissions(user, response, "createPortalAdmin");
-		} else {
-			fieldsValidator = portalAdminService.createPortalAdmin(sbcid);
-			int statusCode = fieldsValidator.httpStatusCode.intValue();
-			response.setStatus(statusCode);
-			if (statusCode == 200) {
-				AuditLog auditLog = new AuditLog();
-				auditLog.setUserId(user.getId());
-				auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_ADD_PORTAL_ADMIN);
-				auditLog.setAffectedRecordId(sbcid);
-				auditService.logActivity(auditLog, null);
-
-				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				logger.info(EELFLoggerDelegate.auditLogger,
-						EPLogUtil.formatAuditLogMessage("PortalAdminController.createPortalAdmin",
-								EcompAuditLog.CD_ACTIVITY_ADD_PORTAL_ADMIN, user.getOrgUserId(), sbcid,
-								"A new Portal Admin has been added"));
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
-			}
-		}
-		EcompPortalUtils.logAndSerializeObject(logger, "/portalAdmin", "POST result =", response.getStatus());
-
-		return fieldsValidator;
-	}
-
-	@RequestMapping(value = { "/portalApi/portalAdmin/{userInfo}" }, method = RequestMethod.DELETE)
-	public FieldsValidator deletePortalAdmin(HttpServletRequest request, @PathVariable("userInfo") String userInfo,
-			 HttpServletResponse response) {
-		int userIdIdx = userInfo.indexOf("-");
-		Long userId = null;
-		String sbcid = null;
-		FieldsValidator fieldsValidator = null;
-		try{
-			if(userIdIdx==-1){
-				logger.error(EELFLoggerDelegate.errorLogger,"deletePortalAdmin missing userId");
-				return fieldsValidator;
-			}else{
-				String userIdStr = userInfo.substring(0, userIdIdx);
-				userId = Long.valueOf(userIdStr);
-				sbcid = userInfo.substring(userIdIdx+1, userInfo.length());
-			}
-		}catch(Exception e){
-			logger.error(EELFLoggerDelegate.errorLogger,"deletePortalAdmin error while parsing the userInfo",e);
-		}
-		EPUser user = EPUserUtils.getUserSession(request);
-		if (!adminRolesService.isSuperAdmin(user)) {
-			EcompPortalUtils.setBadPermissions(user, response, "deletePortalAdmin");
-		} else {
-			fieldsValidator = portalAdminService.deletePortalAdmin(userId);
-			int statusCode = fieldsValidator.httpStatusCode.intValue();
-			response.setStatus(statusCode);
-			if (statusCode == 200) {
-				AuditLog auditLog = new AuditLog();
-				auditLog.setUserId(user.getId());
-				auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_DELETE_PORTAL_ADMIN);
-				auditLog.setAffectedRecordId(sbcid);
-				auditService.logActivity(auditLog, null);
-
-				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				logger.info(EELFLoggerDelegate.auditLogger,
-						EPLogUtil.formatAuditLogMessage("PortalAdminController.deletePortalAdmin",
-								EcompAuditLog.CD_ACTIVITY_DELETE_PORTAL_ADMIN, user.getOrgUserId(), sbcid,
-								"A Portal Admin has been deleted"));
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
-			}
-		}
-		EcompPortalUtils.logAndSerializeObject(logger, "/portalAdmin", "DELETE result =", response.getStatus());
-
-		return fieldsValidator;
-	}
-
-	@RequestMapping(value = {
-			"/portalApi/adminAppsRoles/{appId}" }, method = RequestMethod.GET, produces = "application/json")
-	public List<EPRole> getRolesByApp(HttpServletRequest request, @PathVariable("appId") Long appId,
-			HttpServletResponse response) {
-		EPUser user = EPUserUtils.getUserSession(request);
-		List<EPRole> rolesByApp = null;
-
-		try {
-			if (user == null) {
-				EcompPortalUtils.setBadPermissions(user, response, "getUserApps");
-			} else {
-				rolesByApp = adminRolesService.getRolesByApp(user, appId);
-			}
-		} catch (Exception e) {
-			logger.error(EELFLoggerDelegate.errorLogger,
-					"Exception occurred while performing getRolesByApp operation, Details: "
-							+ EcompPortalUtils.getStackTrace(e));
-		}
-
-		return rolesByApp;
-	}
-
-}
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.domain.AuditLog;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.AuditService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPRole;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EcompAuditLog;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.service.AdminRolesService;
+import org.openecomp.portalapp.portal.service.PortalAdminService;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.PortalAdmin;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.util.EPUserUtils;
+
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class PortalAdminController extends EPRestrictedBaseController {
+	@Autowired
+	PortalAdminService portalAdminService;
+	@Autowired
+	AdminRolesService adminRolesService;
+	@Autowired
+	AuditService auditService;
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PortalAdminController.class);
+
+	@RequestMapping(value = { "/portalApi/portalAdmins" }, method = RequestMethod.GET, produces = "application/json")
+	public List<PortalAdmin> getPortalAdmins(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<PortalAdmin> portalAdmins = null;
+		if (user == null) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.getPortalAdmins, null user");
+			EcompPortalUtils.setBadPermissions(user, response, "getPortalAdmins");
+		} else if (!adminRolesService.isSuperAdmin(user)) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.getPortalAdmins, bad permissions");
+			EcompPortalUtils.setBadPermissions(user, response, "createPortalAdmin");
+		} else {
+			// return the list of portal admins
+			portalAdmins = portalAdminService.getPortalAdmins();
+			logger.debug(EELFLoggerDelegate.debugLogger, "portalAdmins: called getPortalAdmins()");
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/getPortalAdmins", "result =", portalAdmins);
+		}
+
+		return portalAdmins;
+	}
+
+	/**
+	 * RESTful service method to create a new portal admin. Requirement: you
+	 * must be the Ecomp portal super admin user.
+	 */
+
+	@RequestMapping(value = { "/portalApi/portalAdmin" }, method = RequestMethod.POST)
+	public FieldsValidator createPortalAdmin(HttpServletRequest request, @RequestBody String userId,
+			HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		FieldsValidator fieldsValidator = null;
+		if (user == null) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.createPortalAdmin, null user");
+			EcompPortalUtils.setBadPermissions(user, response, "createPortalAdmin");
+		} else if (!adminRolesService.isSuperAdmin(user)) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.createPortalAdmin bad permissions");
+			EcompPortalUtils.setBadPermissions(user, response, "createPortalAdmin");
+		} else {
+			fieldsValidator = portalAdminService.createPortalAdmin(userId);
+			int statusCode = fieldsValidator.httpStatusCode.intValue();
+			response.setStatus(statusCode);
+			if (statusCode == 200) {
+				AuditLog auditLog = new AuditLog();
+				auditLog.setUserId(user.getId());
+				auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_ADD_PORTAL_ADMIN);
+				auditLog.setAffectedRecordId(userId);
+				auditService.logActivity(auditLog, null);
+
+				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+				EcompPortalUtils.calculateDateTimeDifferenceForLog(
+						MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
+						MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
+				logger.info(EELFLoggerDelegate.auditLogger,
+						EPLogUtil.formatAuditLogMessage("PortalAdminController.createPortalAdmin",
+								EcompAuditLog.CD_ACTIVITY_ADD_PORTAL_ADMIN, user.getOrgUserId(), userId,
+								"A new Portal Admin has been added"));
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+				MDC.remove(SystemProperties.MDC_TIMER);
+			}
+		}
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalAdmin", "POST result =", response.getStatus());
+
+		return fieldsValidator;
+	}
+
+	@RequestMapping(value = { "/portalApi/portalAdmin/{userInfo}" }, method = RequestMethod.DELETE)
+	public FieldsValidator deletePortalAdmin(HttpServletRequest request, @PathVariable("userInfo") String userInfo,
+			HttpServletResponse response) {
+		int userIdIdx = userInfo.indexOf("-");
+		Long userId = null;
+		String sbcid = null;
+		FieldsValidator fieldsValidator = null;
+		try {
+			if (userIdIdx == -1) {
+				logger.error(EELFLoggerDelegate.errorLogger, "deletePortalAdmin missing userId");
+				return fieldsValidator;
+			} else {
+				String userIdStr = userInfo.substring(0, userIdIdx);
+				userId = Long.valueOf(userIdStr);
+				sbcid = userInfo.substring(userIdIdx + 1, userInfo.length());
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "deletePortalAdmin error while parsing the userInfo", e);
+		}
+		EPUser user = EPUserUtils.getUserSession(request);
+		if (!adminRolesService.isSuperAdmin(user)) {
+			EcompPortalUtils.setBadPermissions(user, response, "deletePortalAdmin");
+		} else {
+			fieldsValidator = portalAdminService.deletePortalAdmin(userId);
+			int statusCode = fieldsValidator.httpStatusCode.intValue();
+			response.setStatus(statusCode);
+			if (statusCode == 200) {
+				AuditLog auditLog = new AuditLog();
+				auditLog.setUserId(user.getId());
+				auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_DELETE_PORTAL_ADMIN);
+				auditLog.setAffectedRecordId(sbcid);
+				auditService.logActivity(auditLog, null);
+
+				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+				EcompPortalUtils.calculateDateTimeDifferenceForLog(
+						MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
+						MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
+				logger.info(EELFLoggerDelegate.auditLogger,
+						EPLogUtil.formatAuditLogMessage("PortalAdminController.deletePortalAdmin",
+								EcompAuditLog.CD_ACTIVITY_DELETE_PORTAL_ADMIN, user.getOrgUserId(), sbcid,
+								"A Portal Admin has been deleted"));
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+				MDC.remove(SystemProperties.MDC_TIMER);
+			}
+		}
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalAdmin", "DELETE result =", response.getStatus());
+
+		return fieldsValidator;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/adminAppsRoles/{appId}" }, method = RequestMethod.GET, produces = "application/json")
+	public List<EPRole> getRolesByApp(HttpServletRequest request, @PathVariable("appId") Long appId,
+			HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<EPRole> rolesByApp = null;
+
+		try {
+			if (user == null) {
+				EcompPortalUtils.setBadPermissions(user, response, "getUserApps");
+			} else {
+				rolesByApp = adminRolesService.getRolesByApp(user, appId);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred while performing getRolesByApp operation, Details: "
+							+ EcompPortalUtils.getStackTrace(e));
+		}
+
+		return rolesByApp;
+	}
+
+}