/*
 * Copyright 2016 EPAM Systems
 * 
 * 
 * This file is part of EPAM Report Portal.
 * https://github.com/epam/ReportPortal
 * 
 * Report Portal is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 * 
 * Report Portal is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License
 * along with Report Portal.  If not, see <http://www.gnu.org/licenses/>.
 */ 

package com.epam.ta.reportportal.core.user.impl;

import java.util.List;

import com.epam.ta.reportportal.auth.UatClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import com.epam.ta.reportportal.commons.Predicates;
import com.epam.ta.reportportal.commons.validation.BusinessRule;
import com.epam.ta.reportportal.core.user.IDeleteUserHandler;
import com.epam.ta.reportportal.database.dao.ProjectRepository;
import com.epam.ta.reportportal.database.dao.UserRepository;
import com.epam.ta.reportportal.database.entity.Project;
import com.epam.ta.reportportal.database.entity.project.ProjectUtils;
import com.epam.ta.reportportal.database.entity.user.User;
import com.epam.ta.reportportal.exception.ReportPortalException;
import com.epam.ta.reportportal.ws.model.ErrorType;
import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
import com.google.common.collect.Lists;

/**
 * Delete user handler
 * 
 * @author Aliaksandr_Kazantsau
 * @author Andrei_Ramanchuk
 */
@Service
public class DeleteUserHandler implements IDeleteUserHandler {

	@Autowired
	private UserRepository userRepository;

	@Autowired
	private ProjectRepository projectRepository;

	@Autowired
	private UatClient uatClient;

	@Override
	public OperationCompletionRS deleteUser(String userId, String principal) {
		User user = userRepository.findOne(userId);
		BusinessRule.expect(user, Predicates.notNull()).verify(ErrorType.USER_NOT_FOUND, userId);
		BusinessRule.expect(userId.equalsIgnoreCase(principal), Predicates.equalTo(false)).verify(ErrorType.INCORRECT_REQUEST,
				"You cannot delete own account");
		try {
			List<Project> userProjects = projectRepository.findUserProjects(userId);
			userProjects.forEach(project -> ProjectUtils.excludeProjectRecipients(Lists.newArrayList(user), project));
			projectRepository.removeUserFromProjects(userId);
			projectRepository.save(userProjects);
		} catch (Exception exp) {
			throw new ReportPortalException("Error while updating projects", exp);
		}

		try {
			uatClient.revokeUserTokens(userId);
			userRepository.delete(user);
		} catch (Exception exp) {
			throw new ReportPortalException("Error while deleting user", exp);
		}

		OperationCompletionRS response = new OperationCompletionRS();
		String message = "User with ID = '" + userId + "' successfully deleted.";

		response.setResultMessage(message);
		return response;
	}
}

@@ -3015,40 +3015,14 @@
 %0A%0A%09%09
-OperationCompletionRS response =
+return
  new
@@ -3048,30 +3048,8 @@
 nRS(
-);%0A%09%09String message = 
 %22Use
@@ -3103,66 +3103,9 @@
 ed.%22
-;%0A%0A%09%09response.setResultMessage(message);%0A%09%09return response
+)
 ;%0A%09%7D

fix according CR comments