<groupId>org.springframework.session</groupId>
<artifactId>spring-session-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<artifactId>epsdk-logger</artifactId>
<version>2.6.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.onap.portal.sdk</groupId>
- <artifactId>epsdk-logger</artifactId>
- <version>2.6.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-core</artifactId>
@Before("execution(* org.onap.portal.service.fn.FnLanguageService.save(..)) && args(principal, fnLanguage)")
public void save(final Principal principal, final FnLanguage fnLanguage) {
if (fnLanguage == null) {
- LOGGER.error("User " + principal.getName() + " try to save NULL fnLanguage");
+ LOGGER.info("User " + principal.getName() + " try to save NULL fnLanguage");
throw new NullPointerException("FnLanguage cannot be null or empty");
}
if (!dataValidator.isValid(fnLanguage)) {
String violations = dataValidator.getConstraintViolations(fnLanguage).stream()
.map(ConstraintViolation::getMessage)
.collect(Collectors.joining(", "));
- LOGGER.error("User " + principal.getName() + " try to save not valid fnLanguage: " + violations);
+ LOGGER.info("User " + principal.getName() + " try to save not valid fnLanguage: " + violations);
throw new IllegalArgumentException("FnLanguage is not valid, " + violations);
}
}
+
+ @Before("execution(* org.onap.portal.service.fn.FnLanguageService.getLanguageList(..)) && args(principal)")
+ public void getLanguageList(final Principal principal) {
+ LOGGER.info("User " + principal.getName() + " try requested for all language list");
+ }
+
+
}
--- /dev/null
+package org.onap.portal.aop.service;
+
+import java.security.Principal;
+import java.util.stream.Collectors;
+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.validation.DataValidator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+public class FnUserServiceAOP {
+ private static final Logger LOGGER = LoggerFactory.getLogger(FnLanguageServiceAOP.class);
+
+ @Autowired
+ private DataValidator dataValidator;
+
+ @Before("execution(* org.onap.portal.service.fn.FnUserService.saveFnUser(..)) && args(principal, fnUser)")
+ public void save(final Principal principal, final FnUser fnUser) {
+ 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()
+ .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);
+ }
+ }
+}
import java.security.Principal;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.onap.portal.aop.service.FnLanguageServiceAOP;
+import java.util.Optional;
import org.onap.portal.domain.db.fn.FnLanguage;
import org.onap.portal.domain.db.fn.FnUser;
import org.onap.portal.domain.dto.PortalRestResponse;
import org.springframework.web.bind.annotation.PostMapping;
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;
@RestController
@RequestMapping("/auxapi")
public class LanguageController {
+
private static final Logger LOGGER = LoggerFactory.getLogger(LanguageController.class);
private final FnLanguageService languageService;
this.fnUserService = fnUserService;
}
- @GetMapping(value = "/language", produces = "application/json;charset=UTF-8")
- public List<FnLanguage> getLanguageList() {
- return languageService.getLanguages();
+ @GetMapping(value = "/language", produces = MediaType.APPLICATION_JSON_VALUE)
+ public List<FnLanguage> getLanguageList(final Principal principal) {
+ return languageService.getLanguages(principal);
}
@PostMapping(value = "/languageSetting/user/{loginId}")
- public void setUpUserLanguage(@RequestBody FnLanguage fnLanguage,
- @PathVariable("loginId") Long loginId) {
- if (fnUserService.getUser(loginId).isPresent()){
- FnUser user = fnUserService.getUser(loginId).get();
- user.setLanguage_id(fnLanguage.getLanguageId());
- fnUserService.saveFnUser(user);
+ public PortalRestResponse<String> setUpUserLanguage(Principal principal, @RequestBody FnLanguage fnLanguage,
+ @PathVariable("loginId") Long userId) {
+ PortalRestResponse<String> response = new PortalRestResponse<>();
+ try {
+ if (fnUserService.getUser(userId).isPresent()) {
+ FnUser user = fnUserService.getUser(userId).get();
+ user.setLanguageId(fnLanguage);
+ fnUserService.saveFnUser(principal, user);
+ }
+ response.setMessage("SUCCESS");
+ response.setStatus(PortalRestStatusEnum.OK);
+ } catch (Exception e) {
+ response.setMessage("FAILURE");
+ response.setResponse(e.getMessage());
+ response.setStatus(PortalRestStatusEnum.ERROR);
+ return response;
}
+ return response;
}
- @GetMapping(value = "/languageSetting/user/{loginId}")
- public FnLanguage getUserLanguage(HttpServletRequest request, HttpServletResponse response,
- @PathVariable("loginId") Long loginId) {
- if (fnUserService.getUser(loginId).isPresent()){
- Long languageId = fnUserService.getUser(loginId).get().getLanguage_id();
- return languageService.findById(languageId).orElse(new FnLanguage());
+ @GetMapping(value = "/languageSetting/user/{loginId}", produces = MediaType.APPLICATION_JSON_VALUE)
+ public FnLanguage getUserLanguage(@PathVariable("loginId") final Long loginId) {
+ if (fnUserService.getUser(loginId).isPresent()) {
+ return Optional.of(fnUserService.getUser(loginId).get().getLanguageId()).orElse(new FnLanguage());
}
return new FnLanguage();
}
@PostMapping(value = "/language", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
- public PortalRestResponse<String> saveLanguage(final Principal principal, @RequestBody final FnLanguage fnLanguage){
+ public PortalRestResponse<String> saveLanguage(final Principal principal,
+ @RequestBody final FnLanguage fnLanguage) {
PortalRestResponse<String> response = new PortalRestResponse<>();
try {
response.setMessage("SUCCESS");
response.setResponse(languageService.save(principal, fnLanguage).toString());
response.setStatus(PortalRestStatusEnum.OK);
- } catch (Exception e){
+ } catch (Exception e) {
response.setMessage("FAILURE");
response.setResponse(e.getMessage());
response.setStatus(PortalRestStatusEnum.ERROR);
--- /dev/null
+/*
+ * ============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.dao.fn;
+
+import org.onap.portal.domain.db.fn.FnLuTimezone;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+@Repository
+@Transactional
+public interface FnLuTimezoneDao extends JpaRepository<FnLuTimezone, Integer> {
+
+}
package org.onap.portal.domain.db.fn;
import com.fasterxml.jackson.annotation.JsonInclude;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.OneToMany;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.validation.constraints.Digits;
@Setter
@Entity
@JsonInclude()
-@SequenceGenerator(name="seq", initialValue=3, allocationSize=100)
+@SequenceGenerator(name="seq", initialValue=1000, allocationSize=100000)
public class FnLanguage {
@Id
@NotNull(message = "languageAlias must not be null")
@SafeHtml
private String languageAlias;
+ @OneToMany(
+ targetEntity = FnUser.class,
+ mappedBy = "languageId",
+ cascade = CascadeType.ALL,
+ fetch = FetchType.EAGER
+ )
+ private List<FnUser> fnUsers = new ArrayList<>();
}
import javax.persistence.NamedNativeQueries;
import javax.persistence.NamedNativeQuery;
import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import javax.validation.Valid;
import javax.validation.constraints.PastOrPresent;
import javax.validation.constraints.Size;
import lombok.AllArgsConstructor;
+import lombok.Builder.Default;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import lombok.ToString;
import org.hibernate.validator.constraints.SafeHtml;
import org.onap.portal.domain.db.cr.CrReportFileHistory;
import org.onap.portal.domain.db.ep.EpPersUserWidgetPlacement;
@Getter
@Setter
@Entity
-public class FnUser extends DomainVo implements UserDetails {
+@SequenceGenerator(name="seq", initialValue=1000, allocationSize=100000)
+public class FnUser implements UserDetails {
@Id
- @GeneratedValue(strategy = GenerationType.AUTO)
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "seq")
@Column(name = "user_id", length = 11, nullable = false)
@Digits(integer = 11, fraction = 0)
private Long userId;
@Column(name = "active_yn", length = 1, columnDefinition = "character varying(1) default 'y'", nullable = false)
@Size(max = 1)
@SafeHtml
- @NotNull
+ //@NotNull(message = "activeYn must not be null")
private String activeYn;
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumn(name = "created_id")
@Column(name = "is_internal_yn", length = 1, columnDefinition = "character varying(1) default 'n'", nullable = false)
@Size(max = 1)
@SafeHtml
- @NotNull
+ //@NotNull(message = "isInternalYn must not be null")
private String isInternalYn;
@Column(name = "address_line_1", length = 100, columnDefinition = "varchar(100) DEFAULT NULL")
@Size(max = 100)
@Size(max = 10)
@SafeHtml
private String siloStatus;
- @Column(name = "language_id", length = 2, columnDefinition = "int(2) default 1", nullable = false)
- @Digits(integer = 2, fraction = 0)
- @NotNull
- private Long language_id;
+ @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+ @JoinColumn(name = "language_id", nullable = false, columnDefinition = "int(11) DEFAULT 1")
+ @Valid
+ //@NotNull(message = "languageId must not be null")
+ private FnLanguage languageId;
@Column(name = "is_guest", columnDefinition = "boolean default 0", nullable = false)
- @NotNull
+ @NotNull(message = "guest must not be null")
private boolean guest;
@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "fnUserList")
private List<CrReportFileHistory> crReportFileHistorie = new ArrayList<>();
@Getter
@Setter
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode
@NoArgsConstructor
@AllArgsConstructor
@Inheritance(strategy = InheritanceType.JOINED)
import org.onap.portal.dao.fn.FnLanguageDao;
import org.onap.portal.domain.db.fn.FnLanguage;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
@Service
+@EnableAspectJAutoProxy
+@Transactional
public class FnLanguageService {
private final FnLanguageDao fnLanguageDao;
public Optional<FnLanguage> findById(final Long id){
return fnLanguageDao.findById(id);
}
- public List<FnLanguage> getLanguages(){
+ public List<FnLanguage> getLanguages(Principal principal){
return fnLanguageDao.findAll();
}
public FnLanguage save(final Principal principal, final FnLanguage fnLanguage){
--- /dev/null
+/*
+ * ============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.service.fn;
+
+import java.util.Optional;
+import org.onap.portal.dao.fn.FnLuTimezoneDao;
+import org.onap.portal.domain.db.fn.FnLuTimezone;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class FnLuTimezoneService {
+ private final FnLuTimezoneDao fnLuTimezoneDao;
+
+ @Autowired
+ public FnLuTimezoneService(final FnLuTimezoneDao fnLuTimezoneDao) {
+ this.fnLuTimezoneDao = fnLuTimezoneDao;
+ }
+
+ public Optional<FnLuTimezone> getById(Integer id){
+ return fnLuTimezoneDao.findById(id);
+ }
+}
package org.onap.portal.service.fn;
+import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import org.onap.portal.dao.fn.FnUserDao;
import org.onap.portal.domain.db.fn.FnUser;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
@Service
+@EnableAspectJAutoProxy
+@Transactional
public class FnUserService implements UserDetailsService {
- private FnUserDao fnUserDao;
+ private final FnUserDao fnUserDao;
@Autowired
public FnUserService(FnUserDao fnUserDao) {
this.fnUserDao = fnUserDao;
}
- public FnUser saveFnUser(FnUser fnUser) {
+ public FnUser saveFnUser(final Principal principal, final FnUser fnUser) {
return fnUserDao.save(fnUser);
}
List<FnUser> etActiveUsers(){
return fnUserDao.findAll().stream().filter(fnUser -> "Y".equals(fnUser.getActiveYn())).collect(Collectors.toList());
}
+
+ public void deleteUser(FnUser fnUser){
+ fnUserDao.delete(fnUser);
+ }
}
package org.onap.portal.controller;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.onap.portal.dao.fn.FnLanguageDao;
import org.onap.portal.domain.db.fn.FnLanguage;
+import org.onap.portal.domain.db.fn.FnUser;
import org.onap.portal.domain.dto.PortalRestResponse;
import org.onap.portal.domain.dto.PortalRestStatusEnum;
+import org.onap.portal.service.fn.FnUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
@RunWith(SpringRunner.class)
@SpringBootTest
@TestPropertySource(locations="classpath:test.properties")
+@Transactional
class LanguageControllerTest {
private UsernamePasswordAuthenticationToken principal = new UsernamePasswordAuthenticationToken("demo", "XZa6pS1vC0qKXWtn9wcZWdLx61L0=");
private LanguageController languageController;
@Autowired
private FnLanguageDao fnLanguageDao;
+ @Autowired
+ private FnUserService fnUserService;
@Test
void saveLanguage() {
//When
PortalRestResponse<String> expected = new PortalRestResponse<>();
expected.setMessage("SUCCESS");
- expected.setResponse("FnLanguage(languageId=3, languageName=Polish, languageAlias=PL)");
+ expected.setResponse("FnLanguage(languageId=101001, languageName=Polish, languageAlias=PL, fnUsers=[])");
expected.setStatus(PortalRestStatusEnum.OK);
- PortalRestResponse<String> actual = languageController.saveLanguage(principal, fnLanguage);
+ PortalRestResponse<String> actual = languageController.saveLanguage(principal, fnLanguage);
//Then
assertEquals(expected, actual);
fnLanguageDao.delete(fnLanguage);
}
+ @Test
+ void getLanguageListTest(){
+ assertEquals(languageController.getLanguageList(principal).size(), 2);
+ }
+
+ @Test
+ void setUpUserLanguage(){
+ //Given
+ FnLanguage fnLanguage = new FnLanguage();
+ fnLanguage.setLanguageName("Polish");
+ fnLanguage.setLanguageAlias("PL");
+
+ PortalRestResponse<String> expected = new PortalRestResponse<>();
+ expected.setMessage("SUCCESS");
+ expected.setStatus(PortalRestStatusEnum.OK);
+
+ languageController.saveLanguage(principal, fnLanguage);
+ FnUser fnUser = fnUserService.getUser(1L).get();
+ PortalRestResponse<String> actual = languageController.setUpUserLanguage(principal, fnLanguage, fnUser.getUserId());
+
+ assertEquals(expected, actual);
+ assertEquals(fnUser.getLanguageId(), fnLanguage);
+
+
+ //Clean up
+ fnLanguageDao.delete(fnLanguage);
+ }
+
+
+
}
\ No newline at end of file
--- /dev/null
+/*
+ * ============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.service.fn;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.time.LocalDateTime;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.onap.portal.domain.db.fn.FnLanguage;
+import org.onap.portal.domain.db.fn.FnLuTimezone;
+import org.onap.portal.domain.db.fn.FnUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@TestPropertySource(locations="classpath:test.properties")
+@Transactional
+class FnUserServiceTest {
+ private UsernamePasswordAuthenticationToken principal = new UsernamePasswordAuthenticationToken("demo", "XZa6pS1vC0qKXWtn9wcZWdLx61L0=");
+ @Autowired
+ private FnUserService fnUserService;
+ @Autowired
+ private FnLuTimezoneService fnLuTimezoneService;
+ @Autowired
+ private FnLanguageService fnLanguageService;
+
+ @Test
+ void saveUser(){
+ FnUser actual = fnUserService.getUser(1L).get();
+
+ FnUser expected = new FnUser();
+ expected.setUserId(123L);
+ expected.setFirstName("Demo");
+ expected.setLastName("User");
+ expected.setEmail("demo@openecomp.org");
+ expected.setOrgUserId("demo");
+ expected.setTimezone(fnLuTimezoneService.getById(10).orElse(new FnLuTimezone()));
+ expected.setLoginId("demo");
+ expected.setLoginPwd("4Gl6WL1bmwviYm+XZa6pS1vC0qKXWtn9wcZWdLx61L0=");
+ expected.setLastLoginDate(LocalDateTime.parse("2019-08-08T12:18:17"));
+ expected.setActiveYn("Y");
+ expected.setCreatedDate(LocalDateTime.parse("2016-10-14T21:00"));
+ expected.setModifiedId(actual);
+ expected.setModifiedDate(LocalDateTime.parse("2019-08-08T12:18:17"));
+ expected.setIsInternalYn("N");
+ expected.setStateCd("NJ");
+ expected.setCountryCd("US");
+ expected.setLanguageId(fnLanguageService.findById(1L).orElse(new FnLanguage()));
+
+ fnUserService.saveFnUser(principal, expected);
+
+ //Clean up
+ fnUserService.deleteUser(expected);
+ }
+
+ @Test
+ void getUser() {
+ FnUser actual = fnUserService.getUser(1L).get();
+
+
+ FnUser expected = new FnUser();
+ expected.setUserId(1L);
+ expected.setFirstName("Demo");
+ expected.setLastName("User");
+ expected.setEmail("demo@openecomp.org");
+ expected.setOrgUserId("demo");
+ expected.setLoginId("demo");
+ expected.setLoginPwd("4Gl6WL1bmwviYm+XZa6pS1vC0qKXWtn9wcZWdLx61L0=");
+ expected.setLastLoginDate(LocalDateTime.parse("2019-08-08T12:18:17"));
+ expected.setActiveYn("Y");
+ expected.setCreatedDate(LocalDateTime.parse("2016-10-14T21:00"));
+ expected.setModifiedId(actual);
+ expected.setModifiedDate(LocalDateTime.parse("2019-08-08T12:18:17"));
+ expected.setIsInternalYn("N");
+ expected.setStateCd("NJ");
+ expected.setCountryCd("US");
+ expected.setTimezone(fnLuTimezoneService.getById(10).orElse(new FnLuTimezone()));
+ expected.setLanguageId(fnLanguageService.findById(1L).orElse(new FnLanguage()));
+
+
+ assertEquals(expected.getUserId(), actual.getUserId());
+ assertEquals(expected.getOrgId(), actual.getOrgId());
+ assertEquals(expected.getManagerId(), actual.getManagerId());
+ assertEquals(expected.getFirstName(), actual.getFirstName());
+ assertEquals(expected.getMiddleName(), actual.getMiddleName());
+ assertEquals(expected.getLastName(), actual.getLastName());
+ assertEquals(expected.getPhone(), actual.getPhone());
+ assertEquals(expected.getFax(), actual.getFax());
+ assertEquals(expected.getCellular(), actual.getCellular());
+ assertEquals(expected.getEmail(), actual.getEmail());
+ assertEquals(expected.getAddressId(), actual.getAddressId());
+ assertEquals(expected.getAlertMethodCd(), actual.getAlertMethodCd());
+ assertEquals(expected.getHrid(), actual.getHrid());
+ assertEquals(expected.getOrgUserId(), actual.getOrgUserId());
+ assertEquals(expected.getOrg_code(), actual.getOrg_code());
+ assertEquals(expected.getLoginId(), actual.getLoginId());
+ assertEquals(expected.getLoginPwd(), actual.getLoginPwd());
+ assertEquals(expected.getLastLoginDate(), actual.getLastLoginDate());
+ assertEquals(expected.getActiveYn(), actual.getActiveYn());
+ assertEquals(expected.getCreatedId(), actual.getCreatedId());
+ assertEquals(expected.getCreatedDate(), actual.getCreatedDate());
+ assertEquals(expected.getModifiedId(), actual.getModifiedId());
+ assertEquals(expected.getModifiedDate(), actual.getModifiedDate());
+ assertEquals(expected.getIsInternalYn(), actual.getIsInternalYn());
+ assertEquals(expected.getAddressLine1(), actual.getAddressLine1());
+ assertEquals(expected.getAddressLine2(), actual.getAddressLine2());
+ assertEquals(expected.getCity(), actual.getCity());
+ assertEquals(expected.getStateCd(), actual.getStateCd());
+ assertEquals(expected.getZipCode(), actual.getZipCode());
+ assertEquals(expected.getCountryCd(), actual.getCountryCd());
+ assertEquals(expected.getLocationClli(), actual.getLocationClli());
+ assertEquals(expected.getOrgManagerUserId(), actual.getOrgManagerUserId());
+ assertEquals(expected.getCompany(), actual.getCompany());
+ assertEquals(expected.getDepartmentName(), actual.getDepartmentName());
+ assertEquals(expected.getJobTitle(), actual.getJobTitle());
+ assertEquals(expected.getTimezone().getTimezoneId(), actual.getTimezone().getTimezoneId());
+ assertEquals(expected.getDepartment(), actual.getDepartment());
+ assertEquals(expected.getBusinessUnit(), actual.getBusinessUnit());
+ assertEquals(expected.getBusinessUnitName(), actual.getBusinessUnitName());
+ assertEquals(expected.getCost_center(), actual.getCost_center());
+ assertEquals(expected.getFinLocCode(), actual.getFinLocCode());
+ assertEquals(expected.getSiloStatus(), actual.getSiloStatus());
+ assertEquals(expected.getLanguageId(), actual.getLanguageId());
+ }
+}
\ No newline at end of file
Code Review / portal.git / commitdiff