Skip to content

I
IncomeCalculator
Commit e5bc1518 by Yashvant Kantival
Options

POM File For UAT Added

parent 52791e53
Showing with 332 additions and 16 deletions
pom UAT.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com</groupId>
<artifactId>ic</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>incomeCalc</name>
<description>Demo project for Spring Boot</description>
<packaging>war</packaging>
<properties>
<!--<start-class>com.incomeCalc.incomeCalcApplication</start-class>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>-->
<maven.test.skip>true</maven.test.skip>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>11.2.0.3</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<!-- Add Log4j2 Dependency -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<!-- Needed for Async Logging with Log4j 2 -->
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>3.3.6</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.12</version>
</dependency>
<!-- For Java 8 Date/Time Support -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20190722</version>
</dependency>
<dependency>
<groupId>com.google.firebase</groupId>
<artifactId>firebase-admin</artifactId>
<version>6.8.1</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.4.12.Final</version>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
<version>1.0.0.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.imgscalr</groupId>
<artifactId>imgscalr-lib</artifactId>
<version>4.2</version>
</dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf-spring4</artifactId>
<version>2.1.5.RELEASE</version>
</dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>2.1.5.RELEASE</version>
</dependency>
<dependency>
<groupId>nz.net.ultraq.thymeleaf</groupId>
<artifactId>thymeleaf-layout-dialect</artifactId>
<version>2.1.2</version>
</dependency>
<dependency>
<groupId>org.xhtmlrenderer</groupId>
<artifactId>flying-saucer-pdf-itext5</artifactId>
<version>9.1.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.sf.jtidy</groupId>
<artifactId>jtidy</artifactId>
<version>r938</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.xhtmlrenderer</groupId>
<artifactId>flying-saucer-core</artifactId>
<version>9.1.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>3.0.1-b08</version>
</dependency>
<!-- <dependency>
<groupId>com.billdesk.pgidsk</groupId>
<artifactId>pgichecksum</artifactId>
<version>1.2</version>
</dependency> -->
</dependencies>
<repositories>
<repository>
<id>spring-releases</id>
<url>https://repo.spring.io/libs-release</url>
</repository>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>http://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<build>
<directory>target</directory>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
<packagingExcludes>
WEB-INF/lib/log4j-to-slf4j-2.12.1.jar,WEB-INF/lib/log4j-slf4j-impl-2.12.1.jar
</packagingExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<outputDirectory>E:\Streebo\Tata_Aia\Income_Calculator\wlp\usr\servers\incomeCalc\dropins\spring</outputDirectory>
<skipTests>true</skipTests>
<mainClass>com.ic.IncomeCalcApplication</mainClass>
</configuration>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
src/main/java/com/ic/modules/auth/controller/AuthController.java
...@@ -77,6 +77,11 @@ public class AuthController { ...@@ -77,6 +77,11 @@ public class AuthController {
//DataSourceContextHolder.setDataSourceName("iRecruitSchemaDataSource"); //DataSourceContextHolder.setDataSourceName("iRecruitSchemaDataSource");
Map<String, Object> returnUserObject = new HashMap<>(); Map<String, Object> returnUserObject = new HashMap<>();
String jwt; String jwt;
if(loginRequest.getUsername().matches("[0-9]+")) {
loginRequest.setUsername(String.format("%09d", Integer.parseInt(loginRequest.getUsername())));
}
try { try {
UsernamePasswordAuthenticationToken authenticationObj = new UsernamePasswordAuthenticationToken(loginRequest.getUsername(), loginRequest.getUserId()); UsernamePasswordAuthenticationToken authenticationObj = new UsernamePasswordAuthenticationToken(loginRequest.getUsername(), loginRequest.getUserId());
......
src/main/java/com/ic/modules/auth/repository/UserRepository.java
...@@ -3,6 +3,8 @@ package com.ic.modules.auth.repository; ...@@ -3,6 +3,8 @@ package com.ic.modules.auth.repository;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import com.ic.modules.auth.model.User; import com.ic.modules.auth.model.User;
...@@ -12,6 +14,10 @@ public interface UserRepository extends JpaRepository<User, String>{ ...@@ -12,6 +14,10 @@ public interface UserRepository extends JpaRepository<User, String>{
// List<User> findAll(); // List<User> findAll();
/*List<User> findByName(String name);*/ /*List<User> findByName(String name);*/
Optional<User> findByUserId(String id); // Optional<User> findByUserId(String id);
List<User> findByUserIdIn(List<Long> ids); // List<User> findByUserIdIn(List<Long> ids);
@Query(value = "SELECT * FROM NAAF_USER_DETAIL u where TRIM(UPPER(u.USER_ID))=UPPER(:id)", nativeQuery = true)
User findByUserId(@Param("id") String id);
} }
src/main/java/com/ic/modules/auth/service/UserService.java
...@@ -14,7 +14,7 @@ public interface UserService { ...@@ -14,7 +14,7 @@ public interface UserService {
public User save(User user); public User save(User user);
public User save(UserDto user); public User save(UserDto user);
public List<User> findByIds(List<Long> userIds); // public List<User> findByIds(List<Long> userIds);
} }
\ No newline at end of file
src/main/java/com/ic/modules/auth/service/impl/UserServiceImpl.java
...@@ -41,7 +41,7 @@ public class UserServiceImpl implements UserService { ...@@ -41,7 +41,7 @@ public class UserServiceImpl implements UserService {
public User save(UserDto userDto) { public User save(UserDto userDto) {
User user = new User(); User user = new User();
if(userDto.getId() != null) { if(userDto.getId() != null) {
user = userRepository.findByUserId(userDto.getId()).orElseThrow(()-> new ResourceNotFoundException("User", "id", userDto.getId())); user = userRepository.findByUserId(userDto.getId());// .orElseThrow(()-> new ResourceNotFoundException("User", "id", userDto.getId()));
} }
user.setFirstName(userDto.getName()); user.setFirstName(userDto.getName());
user.setEmailId(userDto.getEmail()); user.setEmailId(userDto.getEmail());
...@@ -56,9 +56,9 @@ public class UserServiceImpl implements UserService { ...@@ -56,9 +56,9 @@ public class UserServiceImpl implements UserService {
} }
public List<User> findByIds(List<Long> userIds){ // public List<User> findByIds(List<Long> userIds){
return userRepository.findByUserIdIn(userIds); // return userRepository.findByUserIdIn(userIds);
} // }
@Override @Override
public User save(User user) { public User save(User user) {
...@@ -68,16 +68,24 @@ public class UserServiceImpl implements UserService { ...@@ -68,16 +68,24 @@ public class UserServiceImpl implements UserService {
@Override @Override
public User findById(String id) { public User findById(String id) {
Optional<User> user = userRepository.findByUserId(id); User user = userRepository.findByUserId(id.trim());
if(user == null) {
return null;
}
else {
return user;
}
LOG.info("user---user----user"+user.toString()); // Optional<User> user = userRepository.findByUserId(id);
if(user.toString() == "Optional.empty") { // LOG.info("user---user----user"+user.toString());
return null; //
} // if(user.toString() == "Optional.empty") {
else { // return null;
return userRepository.findByUserId(id).orElseThrow(()->new ResourceNotFoundException("User", "id", id)); // }
} // else {
// return userRepository.findByUserId(id).orElseThrow(()->new ResourceNotFoundException("User", "id", id));
// }
//return userRepository.findById(id).orElseThrow(()->new ResourceNotFoundException("User", "id", id)); //return userRepository.findById(id).orElseThrow(()->new ResourceNotFoundException("User", "id", id));
} }
......
src/main/resources/application.properties
...@@ -57,7 +57,8 @@ spring.jackson.time-zone= UTC ...@@ -57,7 +57,8 @@ spring.jackson.time-zone= UTC
#mobileno.generateOtpExpirationInMs = 60000 #mobileno.generateOtpExpirationInMs = 60000
logging.level.com.appsdeveloperblog.examples=DEBUG logging.level.com.appsdeveloperblog.examples=DEBUG
logging.file = /data/Nirav/projects/SMS/service.log logging.file = /applogs/IRECRUIT/application.log
management.endpoints.web.exposure.include=* management.endpoints.web.exposure.include=*
management.endpoints.web.exposure.exclude= management.endpoints.web.exposure.exclude=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment