1 files changed, 64 insertions, 3 deletions

diff --git a/portal-BE/src/main/java/org/onap/portal/aop/service/FnUserServiceAOP.java b/portal-BE/src/main/java/org/onap/portal/aop/service/FnUserServiceAOP.java
index 0cb17cc6..84f430e7 100644
--- a/portal-BE/src/main/java/org/onap/portal/aop/service/FnUserServiceAOP.java
+++ b/portal-BE/src/main/java/org/onap/portal/aop/service/FnUserServiceAOP.java
@@ -1,3 +1,43 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software 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.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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.
+ *
+ * ============LICENSE_END============================================
+ *
+ *
+ */
+
 package org.onap.portal.aop.service;
 
 import java.security.Principal;
@@ -6,6 +46,8 @@ import javax.validation.ConstraintViolation;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.onap.portal.domain.db.fn.FnUser;
+import org.onap.portal.domain.mapper.FnUserMapper;
+import org.onap.portal.service.fn.FnUserService;
 import org.onap.portal.validation.DataValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,23 +57,42 @@ import org.springframework.stereotype.Component;
 @Aspect
 @Component
 public class FnUserServiceAOP {
+
        private static final Logger LOGGER = LoggerFactory.getLogger(FnLanguageServiceAOP.class);
 
+       private final DataValidator dataValidator;
+       private final FnUserMapper fnUserMapper;
+       private final FnUserService fnUserService;
+
        @Autowired
-       private DataValidator dataValidator;
+       public FnUserServiceAOP(final DataValidator dataValidator, final FnUserMapper fnUserMapper,
+               final FnUserService fnUserService) {
+              this.dataValidator = dataValidator;
+              this.fnUserMapper = fnUserMapper;
+              this.fnUserService = fnUserService;
+       }
 
        @Before("execution(* org.onap.portal.service.fn.FnUserService.saveFnUser(..)) && args(principal, fnUser)")
        public void save(final Principal principal, final FnUser fnUser) {
+              FnUser user;
               if (fnUser == null) {
                      LOGGER.error("User " + principal.getName() + " try to save NULL fnUser");
                      throw new NullPointerException("FnUser cannot be null or empty");
               }
-              if (!dataValidator.isValid(fnUser)) {
-                     String violations = dataValidator.getConstraintViolations(fnUser).stream()
+              try {
+                     user = fnUserMapper.fnUserToFnUser(fnUser);
+              } catch (NullPointerException e) {
+                     throw new NullPointerException(e.getLocalizedMessage() + ", " + e.getMessage());
+              }
+
+              if (!dataValidator.isValid(user)) {
+                     String violations = dataValidator.getConstraintViolations(user).stream()
                              .map(ConstraintViolation::getMessage)
                              .collect(Collectors.joining(", "));
                      LOGGER.error("User " + principal.getName() + " try to save not valid fnUser: " + violations);
                      throw new IllegalArgumentException("FnUser is not valid, " + violations);
+              } else {
+                     LOGGER.error("User " + principal.getName() + " send valid fnUser");
               }
        }
 }