ExternalAccessRolesController up

[portal.git] / portal-BE / src / main / java / org / onap / portal / domain / mapper / FnUserMapper.java

diff --git a/portal-BE/src/main/java/org/onap/portal/domain/mapper/FnUserMapper.java b/portal-BE/src/main/java/org/onap/portal/domain/mapper/FnUserMapper.java
index 869ba81..5e0489a 100644 (file)
--- a/portal-BE/src/main/java/org/onap/portal/domain/mapper/FnUserMapper.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/mapper/FnUserMapper.java
@@ -50,9 +50,8 @@ import org.springframework.stereotype.Component;
 public class FnUserMapper {
               public FnUserDto fnUserToFnUserDto(final FnUser fnUser){
               return FnUserDto.builder()
-                      .userId(fnUser.getUserId())
+                      .userId(fnUser.getId())
                       .orgId(fnUser.getOrgId().getOrgId())
-                      .managerId(fnUser.getManagerId().getUserId())
                       .firstName(fnUser.getFirstName())
                       .middleName(fnUser.getMiddleName())
                       .lastName(fnUser.getLastName())
@@ -64,14 +63,12 @@ public class FnUserMapper {
                       .alertMethodCd(fnUser.getAlertMethodCd().getAlertMethodCd())
                       .hrid(fnUser.getHrid())
                       .orgUserId(fnUser.getOrgUserId())
-                      .org_code(fnUser.getOrg_code())
+                      .org_code(fnUser.getOrgCode())
                       .loginId(fnUser.getLoginId())
                       .loginPwd(fnUser.getLoginPwd())
                       .lastLoginDate(fnUser.getLastLoginDate())
                       .activeYn(fnUser.getActiveYn())
-                      .createdId(fnUser.getCreatedId().getUserId())
                       .createdDate(fnUser.getCreatedDate())
-                      .modifiedId(fnUser.getModifiedId().getUserId())
                       .modifiedDate(fnUser.getModifiedDate())
                       .isInternalYn(fnUser.getIsInternalYn())
                       .addressLine1(fnUser.getAddressLine1())
@@ -89,7 +86,7 @@ public class FnUserMapper {
                       .department(fnUser.getDepartment())
                       .businessUnit(fnUser.getBusinessUnit())
                       .businessUnitName(fnUser.getBusinessUnitName())
-                      .cost_center(fnUser.getCost_center())
+                      .cost_center(fnUser.getCostCenter())
                       .finLocCode(fnUser.getFinLocCode())
                       .siloStatus(fnUser.getSiloStatus())
                       .languageId(fnUser.getLanguageId().getLanguageId())
@@ -100,9 +97,8 @@ public class FnUserMapper {
 
        public FnUser fnUserToFnUser(final FnUser fnUser){
               return FnUser.builder()
-                      .userId(fnUser.getUserId())
+                      .id(fnUser.getId())
                       .orgId(fnUser.getOrgId())
-                      .managerId(fnUser.getManagerId())
                       .firstName(fnUser.getFirstName())
                       .middleName(fnUser.getMiddleName())
                       .lastName(fnUser.getLastName())
@@ -114,14 +110,12 @@ public class FnUserMapper {
                       .alertMethodCd(fnUser.getAlertMethodCd())
                       .hrid(fnUser.getHrid())
                       .orgUserId(fnUser.getOrgUserId())
-                      .org_code(fnUser.getOrg_code())
+                      .org_code(fnUser.getOrgCode())
                       .loginId(fnUser.getLoginId())
                       .loginPwd(fnUser.getLoginPwd())
                       .lastLoginDate(fnUser.getLastLoginDate())
                       .activeYn(fnUser.getActiveYn())
-                      .createdId(fnUser.getCreatedId())
                       .createdDate(fnUser.getCreatedDate())
-                      .modifiedId(fnUser.getModifiedId())
                       .modifiedDate(fnUser.getModifiedDate())
                       .isInternalYn(fnUser.getIsInternalYn())
                       .addressLine1(fnUser.getAddressLine1())
@@ -139,7 +133,7 @@ public class FnUserMapper {
                       .department(fnUser.getDepartment())
                       .businessUnit(fnUser.getBusinessUnit())
                       .businessUnitName(fnUser.getBusinessUnitName())
-                      .cost_center(fnUser.getCost_center())
+                      .cost_center(fnUser.getCostCenter())
                       .finLocCode(fnUser.getFinLocCode())
                       .siloStatus(fnUser.getSiloStatus())
                       .languageId(fnUser.getLanguageId())