Skip to content

I
IncomeCalculator
Commit 3309db73 by Yashvant Kantival
Options

Merge branch 'Development_Yashvant' into 'master' 

Development yashvant

See merge request !1
parents 167a448f 6745b4b8
Showing with 1006 additions and 472 deletions
.classpath
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
......
.gitignore
/target /target
\ No newline at end of file .metadata
\ No newline at end of file
.project
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>iRecruit</name> <name>incomeCalc</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>
......
.settings/org.eclipse.wst.common.component
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="iRecruit-0.0.1-SNAPSHOT"> <wb-module deploy-name="ic-0.0.1-SNAPSHOT">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<property name="context-root" value="iRecruit"/>
<property name="java-output-path" value="/iRecruit/target/classes"/> <property name="java-output-path" value="/iRecruit/target/classes"/>
<property name="component.exclusion.patterns"/> <property name="component.exclusion.patterns"/>
<property name="context-root" value="ic"/>
</wb-module> </wb-module>
</project-modules> </project-modules>
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
pom.xml
<?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" <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"> 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> <modelVersion>4.0.0</modelVersion>
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>com</groupId> <groupId>com</groupId>
<artifactId>iRecruit</artifactId> <artifactId>ic</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>iRecruit</name> <name>incomeCalc</name>
<description>Demo project for Spring Boot</description> <description>Demo project for Spring Boot</description>
<packaging>war</packaging> <packaging>jar</packaging>
<properties> <properties>
<!--<start-class>com.iRecruit.IRecruitApplication</start-class> <!--<start-class>com.incomeCalc.incomeCalcApplication</start-class>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>--> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>-->
<maven.test.skip>true</maven.test.skip> <maven.test.skip>true</maven.test.skip>
...@@ -29,9 +29,6 @@ ...@@ -29,9 +29,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId> <artifactId>spring-boot-starter-mail</artifactId>
...@@ -42,14 +39,6 @@ ...@@ -42,14 +39,6 @@
<version>3.1.0</version> <version>3.1.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.18</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <artifactId>spring-boot-starter-security</artifactId>
...@@ -61,12 +50,12 @@ ...@@ -61,12 +50,12 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<exclusions>
</dependency> <exclusion>
<dependency> <groupId>org.springframework.boot</groupId>
<groupId>mysql</groupId> <artifactId>spring-boot-starter-tomcat</artifactId>
<artifactId>mysql-connector-java</artifactId> </exclusion>
<scope>runtime</scope> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -100,7 +89,13 @@ ...@@ -100,7 +89,13 @@
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </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> <dependency>
<groupId>com.lmax</groupId> <groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId> <artifactId>disruptor</artifactId>
...@@ -214,6 +209,8 @@ ...@@ -214,6 +209,8 @@
<version>9.1.6</version> <version>9.1.6</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<repositories> <repositories>
...@@ -257,19 +254,16 @@ ...@@ -257,19 +254,16 @@
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
<build> <build>
<directory>target</directory> <directory>target</directory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration> <configuration>
<outputDirectory>spring</outputDirectory> <outputDirectory>E:\Streebo\Tata_Aia\Income_Calculator\wlp\usr\servers\incomeCalc\dropins\spring</outputDirectory>
<skipTests>true</skipTests> <skipTests>true</skipTests>
<mainClass>com.iRecruit.IRecruitApplication</mainClass> <mainClass>com.ic.IncomeCalcApplication</mainClass>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
......
src/main/java/com/iRecruit/modules/auth/service/L1slabsMappingService.java deleted 100644 → 0
package com.iRecruit.modules.auth.service;
import java.util.List;
import com.iRecruit.modules.auth.model.FycMapping;
import com.iRecruit.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.payload.L1slabsDto;
import com.iRecruit.modules.auth.payload.mpbDto;
public interface L1slabsMappingService {
public L1slabsMapping save(L1slabsDto l1slabsmapping,Boolean isCreate);
public List<L1slabsMapping> findAll();
}
src/main/java/com/iRecruit/IRecruitApplication.java → src/main/java/com/ic/IncomeCalcApplication.java
package com.iRecruit; package com.ic;
import java.util.TimeZone; import java.util.TimeZone;
...@@ -18,15 +18,19 @@ import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters; ...@@ -18,15 +18,19 @@ import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import com.iRecruit.audit.SpringSecurityAuditorAware; import com.ic.audit.SpringSecurityAuditorAware;
import com.iRecruit.constant.DBConfig; import com.ic.constant.DBConfig;
import com.iRecruit.constant.TemplateConfig; import com.ic.constant.TemplateConfig;
//@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class, MultipartAutoConfiguration.class }) //@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class, MultipartAutoConfiguration.class })
@SpringBootApplication @SpringBootApplication
@EnableCaching @EnableCaching
@EnableJpaAuditing(auditorAwareRef = "auditorAware") @EnableJpaAuditing(auditorAwareRef = "auditorAware")
public class IRecruitApplication { @EntityScan(basePackageClasses = {
IncomeCalcApplication.class,
Jsr310JpaConverters.class
})
public class IncomeCalcApplication extends SpringBootServletInitializer {
@PostConstruct @PostConstruct
...@@ -48,12 +52,17 @@ public class IRecruitApplication { ...@@ -48,12 +52,17 @@ public class IRecruitApplication {
/*@Override /*@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(IRecruitApplication.class); return application.sources(IncomeCalcApplication.class);
}*/ }*/
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(IncomeCalcApplication.class);
}
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(IRecruitApplication.class, args); SpringApplication.run(IncomeCalcApplication.class, args);
} }
......
src/main/java/com/iRecruit/annotation/AuditLogs.java → src/main/java/com/ic/annotation/AuditLogs.java
package com.iRecruit.annotation; package com.ic.annotation;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
......
src/main/java/com/iRecruit/aspect/ServiceVersionAspect.java → src/main/java/com/ic/aspect/ServiceVersionAspect.java
package com.iRecruit.aspect; package com.ic.aspect;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
...@@ -28,13 +28,13 @@ import org.springframework.web.context.request.ServletRequestAttributes; ...@@ -28,13 +28,13 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.modules.auth.payload.AuditLogsDto; import com.ic.modules.auth.payload.AuditLogsDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.payload.request.LoginRequest; import com.ic.modules.auth.payload.request.LoginRequest;
import com.iRecruit.modules.auth.service.AuditLogsService; import com.ic.modules.auth.service.AuditLogsService;
import com.iRecruit.security.UserPrincipal; import com.ic.security.UserPrincipal;
@Aspect @Aspect
@Component @Component
...@@ -43,7 +43,7 @@ public class ServiceVersionAspect { ...@@ -43,7 +43,7 @@ public class ServiceVersionAspect {
@Autowired @Autowired
AuditLogsService auditLogsService; AuditLogsService auditLogsService;
@Around("@annotation(com.iRecruit.annotation.AuditLogs)") @Around("@annotation(com.ic.annotation.AuditLogs)")
public ResponseEntity<?> auditLog(ProceedingJoinPoint joinPoint) throws Throwable { public ResponseEntity<?> auditLog(ProceedingJoinPoint joinPoint) throws Throwable {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
...@@ -106,7 +106,7 @@ public class ServiceVersionAspect { ...@@ -106,7 +106,7 @@ public class ServiceVersionAspect {
AuditLogs name = method.getAnnotation(AuditLogs.class); AuditLogs name = method.getAnnotation(AuditLogs.class);
Timestamp timestamp = new Timestamp(System.currentTimeMillis()); Timestamp timestamp = new Timestamp(System.currentTimeMillis());
com.iRecruit.modules.auth.model.AuditLogs auditLogs = new com.iRecruit.modules.auth.model.AuditLogs(null, name.service(), remoteAddr, com.ic.modules.auth.model.AuditLogs auditLogs = new com.ic.modules.auth.model.AuditLogs(null, name.service(), remoteAddr,
userPrincipal.getDeviceInfo(), userPrincipal.getBrowserInfo(), userPrincipal.getUsername(), userPrincipal.getOS(), userPrincipal.getDeviceInfo(), userPrincipal.getBrowserInfo(), userPrincipal.getUsername(), userPrincipal.getOS(),
ar.getCode(), ar.getMessage(), timeTaken, joinPoint.getArgs().length>0?joinPoint.getArgs()[0].toString():null , ar.getMessage(),new Date()); ar.getCode(), ar.getMessage(), timeTaken, joinPoint.getArgs().length>0?joinPoint.getArgs()[0].toString():null , ar.getMessage(),new Date());
......
src/main/java/com/iRecruit/audit/SpringSecurityAuditorAware.java → src/main/java/com/ic/audit/SpringSecurityAuditorAware.java
package com.iRecruit.audit; package com.ic.audit;
import java.util.Optional; import java.util.Optional;
...@@ -7,7 +7,7 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken; ...@@ -7,7 +7,7 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import com.iRecruit.security.UserPrincipal; import com.ic.security.UserPrincipal;
public class SpringSecurityAuditorAware implements AuditorAware<String> { public class SpringSecurityAuditorAware implements AuditorAware<String> {
......
src/main/java/com/iRecruit/config/APIExceptionHandler.java → src/main/java/com/ic/config/APIExceptionHandler.java
package com.iRecruit.config; package com.ic.config;
import java.util.Date; import java.util.Date;
...@@ -20,11 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -20,11 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.request.WebRequest; import org.springframework.web.context.request.WebRequest;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
import com.iRecruit.modules.auth.model.AuditLogs; import com.ic.modules.auth.model.AuditLogs;
import com.iRecruit.modules.auth.payload.AuditLogsDto; import com.ic.modules.auth.payload.AuditLogsDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.AuditLogsService; import com.ic.modules.auth.service.AuditLogsService;
import com.iRecruit.security.UserPrincipal; import com.ic.security.UserPrincipal;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
src/main/java/com/iRecruit/config/CommonRoutingDataSource.java → src/main/java/com/ic/config/CommonRoutingDataSource.java
package com.iRecruit.config; package com.ic.config;
import java.util.HashMap; import java.util.HashMap;
......
src/main/java/com/iRecruit/config/CustomPhysicalNamingStrategy.java → src/main/java/com/ic/config/CustomPhysicalNamingStrategy.java
package com.iRecruit.config; package com.ic.config;
import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.boot.model.naming.PhysicalNamingStrategy; import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
......
src/main/java/com/iRecruit/config/DataSourceContextHolder.java → src/main/java/com/ic/config/DataSourceContextHolder.java
package com.iRecruit.config; package com.ic.config;
public class DataSourceContextHolder { public class DataSourceContextHolder {
......
src/main/java/com/iRecruit/config/IRecruitSchemaConfig.java → src/main/java/com/ic/config/IRecruitSchemaConfig.java
package com.iRecruit.config; package com.ic.config;
import java.util.HashMap; import java.util.HashMap;
import javax.annotation.Resource;
import javax.persistence.EntityManagerFactory; import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.AvailableSettings;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.context.annotation.PropertySource; import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.jdbc.datasource.lookup.JndiDataSourceLookup;
import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
...@@ -29,8 +31,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -29,8 +31,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
entityManagerFactoryRef = "iRecruitSchemaEntityManagerFactory", entityManagerFactoryRef = "iRecruitSchemaEntityManagerFactory",
transactionManagerRef = "iRecruitSchemaTransactionManager", transactionManagerRef = "iRecruitSchemaTransactionManager",
basePackages = { basePackages = {
"com.iRecruit.modules.auth.repository", "com.ic.modules.auth.repository"
}) })
//@Resource(name="jdbc/", type=javax.sql.DataSource.class, lookup="jdbc/fileUploadDS") //@Resource(name="jdbc/", type=javax.sql.DataSource.class, lookup="jdbc/fileUploadDS")
public class IRecruitSchemaConfig { public class IRecruitSchemaConfig {
...@@ -43,25 +45,18 @@ public class IRecruitSchemaConfig { ...@@ -43,25 +45,18 @@ public class IRecruitSchemaConfig {
private static final String JNDI_NAME = "jdbc/irecruit"; private static final String JNDI_NAME = "jdbc/irecruit";
@Primary @Primary
@Bean(name = "iRecruitSchemaDataSource") @Bean(name = "iRecruitSchemaDataSource")
//@ConfigurationProperties(prefix = "irecruit.datasource") @ConfigurationProperties(prefix = "irecruit.datasource")
//@Resource(name = JNDI_NAME) @Resource(name = JNDI_NAME)
public DataSource iRecruitSchemaDataSource() { public DataSource iRecruitSchemaDataSource() {
//HikariDataSource dataSource = new HikariDataSource(); //HikariDataSource dataSource = new HikariDataSource();
DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create();
dataSourceBuilder.driverClassName(environment.getProperty("irecruit.datasource.driver-class-name"));
dataSourceBuilder.url(environment.getProperty("spring.datasource.url"));
dataSourceBuilder.username(environment.getProperty("irecruit.datasource.username"));
dataSourceBuilder.password(environment.getProperty("irecruit.datasource.password"));
return dataSourceBuilder.build();
//dataSource.setDataSourceJNDI(environment.getProperty("irecruit.datasource.jndi-name")); //dataSource.setDataSourceJNDI(environment.getProperty("irecruit.datasource.jndi-name"));
/*dataSource.setDriverClassName(environment.getProperty("irecruit.datasource.driver-class-name")); /*dataSource.setDriverClassName(environment.getProperty("irecruit.datasource.driver-class-name"));
dataSource.setJdbcUrl(environment.getProperty("spring.datasource.url")); dataSource.setJdbcUrl(environment.getProperty("irecruit.datasource.url"));
dataSource.setUsername(environment.getProperty("irecruit.datasource.username")); dataSource.setUsername(environment.getProperty("irecruit.datasource.username"));
dataSource.setPassword(environment.getProperty("irecruit.datasource.password")); dataSource.setPassword(environment.getProperty("irecruit.datasource.password"));
dataSource.setCatalog("irecruitCat"); dataSource.setCatalog("irecruitCat");
*/
/*dataSource.setConnectionTimeout(Long.parseLong(environment.getProperty("spring.datasource.hikari.connectionTimeout"))); /*dataSource.setConnectionTimeout(Long.parseLong(environment.getProperty("spring.datasource.hikari.connectionTimeout")));
dataSource.setValidationTimeout(Long.parseLong(environment.getProperty("spring.datasource.hikari.validationTimeout"))); dataSource.setValidationTimeout(Long.parseLong(environment.getProperty("spring.datasource.hikari.validationTimeout")));
dataSource.setMaximumPoolSize(Integer.parseInt(environment.getProperty("spring.datasource.hikari.maximumPoolSize"))); dataSource.setMaximumPoolSize(Integer.parseInt(environment.getProperty("spring.datasource.hikari.maximumPoolSize")));
...@@ -71,11 +66,11 @@ public class IRecruitSchemaConfig { ...@@ -71,11 +66,11 @@ public class IRecruitSchemaConfig {
return dataSource;*/ return dataSource;*/
/*JndiDataSourceLookup jndiDataSourceLookup = new JndiDataSourceLookup(); JndiDataSourceLookup jndiDataSourceLookup = new JndiDataSourceLookup();
jndiDataSourceLookup.setResourceRef(true); jndiDataSourceLookup.setResourceRef(true);
return jndiDataSourceLookup.getDataSource(JNDI_NAME); return jndiDataSourceLookup.getDataSource(JNDI_NAME);
*/
//return DataSourceBuilder.create().build(); //return DataSourceBuilder.create().build();
} }
...@@ -86,8 +81,8 @@ public class IRecruitSchemaConfig { ...@@ -86,8 +81,8 @@ public class IRecruitSchemaConfig {
LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
em.setDataSource(iRecruitSchemaDataSource()); em.setDataSource(iRecruitSchemaDataSource());
em.setPersistenceUnitName("iRecruitSchema"); em.setPersistenceUnitName("iRecruitSchema");
em.setPackagesToScan(new String[] { "com.iRecruit.modules.auth.model", em.setPackagesToScan(new String[] { "com.ic.modules.auth.model"
}); });
HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
em.setJpaVendorAdapter(vendorAdapter); em.setJpaVendorAdapter(vendorAdapter);
HashMap<String, Object> properties = new HashMap<>(); HashMap<String, Object> properties = new HashMap<>();
......
src/main/java/com/iRecruit/config/IdGenerator.java → src/main/java/com/ic/config/IdGenerator.java
package com.iRecruit.config; package com.ic.config;
import java.io.Serializable; import java.io.Serializable;
import java.util.Properties; import java.util.Properties;
......
src/main/java/com/iRecruit/config/JavaImageConverter.java → src/main/java/com/ic/config/JavaImageConverter.java
package com.iRecruit.config; package com.ic.config;
import java.awt.Color; import java.awt.Color;
......
src/main/java/com/iRecruit/config/QuerySpecification.java → src/main/java/com/ic/config/QuerySpecification.java
package com.iRecruit.config; package com.ic.config;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root; ...@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;
import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.domain.Specification;
import com.iRecruit.modules.auth.payload.request.Condition; import com.ic.modules.auth.payload.request.Condition;
public class QuerySpecification { public class QuerySpecification {
......
src/main/java/com/iRecruit/config/SecurityConfig.java → src/main/java/com/ic/config/SecurityConfig.java
package com.iRecruit.config; package com.ic.config;
import java.util.Arrays; import java.util.Arrays;
...@@ -21,10 +21,10 @@ import org.springframework.web.cors.CorsConfiguration; ...@@ -21,10 +21,10 @@ import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import com.iRecruit.security.AuthProvider; import com.ic.security.AuthProvider;
import com.iRecruit.security.CustomUserDetailsService; import com.ic.security.CustomUserDetailsService;
import com.iRecruit.security.JwtAuthenticationEntryPoint; import com.ic.security.JwtAuthenticationEntryPoint;
import com.iRecruit.security.JwtAuthenticationFilter; import com.ic.security.JwtAuthenticationFilter;
@Configuration @Configuration
@EnableWebSecurity @EnableWebSecurity
...@@ -92,7 +92,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -92,7 +92,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/**/*.css", "/**/*.css",
"/**/*.js") "/**/*.js")
.permitAll() .permitAll()
.antMatchers("/api/v1/configurations/**","/api/v1/auth/signin/**","/api/v1/msamapping/**","/api/v1/mdbmapping/**","/api/v1/l1salbsmapping/**","/api/v1/ngpatongplCalculation/**","/api/v1/ngpaCalculation/**","/api/v1/l2salbsmapping/**","/api/v1/mpbmapping/**","/api/v1/leaderCalculation/**","/api/v1/fycmapping/**","/api/v1/auth/P100Login","/api/v1/auth/SendOTP","/v2/api-docs","/api/v1/auth/ValidateOTP", "/configuration/ui", "/swagger-resources/**", "/configuration/security", "/swagger-ui.html", "/webjars/**") .antMatchers("/api/v1/configurations/**","/api/v1/auth/signin/**","/api/v1/msamapping/**","/api/v1/mdbmapping/**","/api/v1/l1salbsmapping/**","/api/v1/l2salbsmapping/**","/api/v1/mpbmapping/**","/v2/api-docs","/configuration/ui", "/swagger-resources/**", "/configuration/security", "/swagger-ui.html", "/webjars/**")
.permitAll() .permitAll()
.antMatchers("/api/userPhoto", "/api/user/checkEmailAvailability") .antMatchers("/api/userPhoto", "/api/user/checkEmailAvailability")
.permitAll() .permitAll()
...@@ -108,7 +108,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -108,7 +108,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Bean @Bean
public CorsConfigurationSource corsConfigurationSource() { public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration configuration = new CorsConfiguration(); CorsConfiguration configuration = new CorsConfiguration();
configuration.setAllowedOrigins(Arrays.asList("*")); // configuration.setAllowedOrigins(Arrays.asList("*"));
configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
configuration.setAllowedHeaders(Arrays.asList("authorization", "content-type", "x-auth-token", "auth")); configuration.setAllowedHeaders(Arrays.asList("authorization", "content-type", "x-auth-token", "auth"));
configuration.setExposedHeaders(Arrays.asList("x-auth-token", "auth")); configuration.setExposedHeaders(Arrays.asList("x-auth-token", "auth"));
......
src/main/java/com/iRecruit/config/SwaggerConfig.java → src/main/java/com/ic/config/SwaggerConfig.java
package com.iRecruit.config; package com.ic.config;
import static springfox.documentation.builders.PathSelectors.regex; import static springfox.documentation.builders.PathSelectors.regex;
...@@ -28,7 +28,7 @@ public class SwaggerConfig { ...@@ -28,7 +28,7 @@ public class SwaggerConfig {
@Bean @Bean
public Docket productApi() { public Docket productApi() {
return new Docket(DocumentationType.SWAGGER_2).select() return new Docket(DocumentationType.SWAGGER_2).select()
.apis(RequestHandlerSelectors.basePackage("com.iRecruit")).paths(regex("/api.*")) .apis(RequestHandlerSelectors.basePackage("com.ic")).paths(regex("/api.*"))
.build().apiInfo(apiInfo()).securitySchemes(Lists.newArrayList(apiKey())) .build().apiInfo(apiInfo()).securitySchemes(Lists.newArrayList(apiKey()))
.securityContexts(Lists.newArrayList(securityContext())); .securityContexts(Lists.newArrayList(securityContext()));
} }
......
src/main/java/com/iRecruit/config/Utility.java → src/main/java/com/ic/config/Utility.java
package com.iRecruit.config; package com.ic.config;
import java.net.URI; import java.net.URI;
import java.util.Enumeration; import java.util.Enumeration;
......
src/main/java/com/iRecruit/config/WebMvcConfig.java → src/main/java/com/ic/config/WebMvcConfig.java
package com.iRecruit.config; package com.ic.config;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
......
src/main/java/com/iRecruit/constant/BooleanType.java → src/main/java/com/ic/constant/BooleanType.java
package com.iRecruit.constant; package com.ic.constant;
public enum BooleanType { public enum BooleanType {
Y,N Y,N
......
src/main/java/com/iRecruit/constant/DBConfig.java → src/main/java/com/ic/constant/DBConfig.java
package com.iRecruit.constant; package com.ic.constant;
import java.util.List; import java.util.List;
...@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory; ...@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iRecruit.modules.auth.model.Configurations; import com.ic.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.service.ConfigurationsService; import com.ic.modules.auth.service.ConfigurationsService;
import groovy.util.logging.Log; import groovy.util.logging.Log;
...@@ -35,7 +35,7 @@ public class DBConfig { ...@@ -35,7 +35,7 @@ public class DBConfig {
for(Configurations configuration : configurations) { for(Configurations configuration : configurations) {
System.out.println("configurations"); System.out.println("configurations");
System.out.println(configurations); System.out.println(configurations);
configs.put(configuration.getConfig(), configuration.getValue()); configs.put(configuration.getKey(), configuration.getValue());
System.out.println("configs"); System.out.println("configs");
System.out.println(configs); System.out.println(configs);
......
src/main/java/com/iRecruit/constant/GlobalConstants.java → src/main/java/com/ic/constant/GlobalConstants.java
package com.iRecruit.constant; package com.ic.constant;
public class GlobalConstants { public class GlobalConstants {
......
src/main/java/com/iRecruit/constant/PaymentMode.java → src/main/java/com/ic/constant/PaymentMode.java
package com.iRecruit.constant; package com.ic.constant;
public enum PaymentMode { public enum PaymentMode {
CREDIT,DEBIT,DISCOUNT CREDIT,DEBIT,DISCOUNT
......
src/main/java/com/iRecruit/constant/PaymentType.java → src/main/java/com/ic/constant/PaymentType.java
package com.iRecruit.constant; package com.ic.constant;
public enum PaymentType { public enum PaymentType {
CASH,CHECK,ONLINE,PAYTM,PHONEPAY,DD CASH,CHECK,ONLINE,PAYTM,PHONEPAY,DD
......
src/main/java/com/iRecruit/constant/PenaltyType.java → src/main/java/com/ic/constant/PenaltyType.java
package com.iRecruit.constant; package com.ic.constant;
public enum PenaltyType { public enum PenaltyType {
FixedAmount,FixedRate FixedAmount,FixedRate
......
src/main/java/com/iRecruit/constant/QuestionType.java → src/main/java/com/ic/constant/QuestionType.java
package com.iRecruit.constant; package com.ic.constant;
public enum QuestionType { public enum QuestionType {
RADIO,CHECKBOX,TEXT,DROPDOWN RADIO,CHECKBOX,TEXT,DROPDOWN
......
src/main/java/com/iRecruit/constant/RequestType.java → src/main/java/com/ic/constant/RequestType.java
package com.iRecruit.constant; package com.ic.constant;
public enum RequestType { public enum RequestType {
BOOKING,MEETING,PROBLEM,GENERAL BOOKING,MEETING,PROBLEM,GENERAL
......
src/main/java/com/iRecruit/constant/RolesConstant.java → src/main/java/com/ic/constant/RolesConstant.java
package com.iRecruit.constant; package com.ic.constant;
public enum RolesConstant { public enum RolesConstant {
LEADER,PANALIST,FINAL_INTERVIEWER,REMO,BRANCH_MANAGER LEADER,PANALIST,FINAL_INTERVIEWER,REMO,BRANCH_MANAGER
......
src/main/java/com/iRecruit/constant/SchedulerType.java → src/main/java/com/ic/constant/SchedulerType.java
package com.iRecruit.constant; package com.ic.constant;
public enum SchedulerType { public enum SchedulerType {
HOURLY,DAILY,WEEKLY,MONTHLY,YEARLY,ONETIME HOURLY,DAILY,WEEKLY,MONTHLY,YEARLY,ONETIME
......
src/main/java/com/iRecruit/constant/Stages.java → src/main/java/com/ic/constant/Stages.java
package com.iRecruit.constant; package com.ic.constant;
public enum Stages { public enum Stages {
......
src/main/java/com/iRecruit/constant/Status.java → src/main/java/com/ic/constant/Status.java
package com.iRecruit.constant; package com.ic.constant;
public enum Status { public enum Status {
INIT,LOCK,DISABLED,ACTIVE,INACTIVE,DELETED,SENT,SUCCESS INIT,LOCK,DISABLED,ACTIVE,INACTIVE,DELETED,SENT,SUCCESS
......
src/main/java/com/iRecruit/constant/StatusCode.java → src/main/java/com/ic/constant/StatusCode.java
package com.iRecruit.constant; package com.ic.constant;
public class StatusCode { public class StatusCode {
public static final int INVALID_USER = 100; public static final int INVALID_USER = 100;
......
src/main/java/com/iRecruit/constant/TemplateConfig.java → src/main/java/com/ic/constant/TemplateConfig.java
package com.iRecruit.constant; package com.ic.constant;
import java.util.List; import java.util.List;
...@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory; ...@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iRecruit.modules.auth.model.Templates; import com.ic.modules.auth.model.Templates;
import com.iRecruit.modules.auth.service.TemplatesService; import com.ic.modules.auth.service.TemplatesService;
@Service @Service
public class TemplateConfig { public class TemplateConfig {
...@@ -30,7 +30,7 @@ public class TemplateConfig { ...@@ -30,7 +30,7 @@ public class TemplateConfig {
List<Templates> templates = templatesService.findAll(); List<Templates> templates = templatesService.findAll();
configs = new JSONObject(); configs = new JSONObject();
for(Templates configuration : templates) { for(Templates configuration : templates) {
configs.put(configuration.getConfig(), configuration.getValue()); configs.put(configuration.getKey(), configuration.getValue());
} }
} }
public String getValue(String key) { public String getValue(String key) {
......
src/main/java/com/iRecruit/constant/TemplateType.java → src/main/java/com/ic/constant/TemplateType.java
package com.iRecruit.constant; package com.ic.constant;
public enum TemplateType { public enum TemplateType {
MAIL,PDF,SMS,NOTIFICATION MAIL,PDF,SMS,NOTIFICATION
......
src/main/java/com/iRecruit/constant/VehicalType.java → src/main/java/com/ic/constant/VehicalType.java
package com.iRecruit.constant; package com.ic.constant;
public enum VehicalType { public enum VehicalType {
CAR,BYKE,SCOOTER,BYCYCLE CAR,BYKE,SCOOTER,BYCYCLE
......
src/main/java/com/iRecruit/exception/AppException.java → src/main/java/com/ic/exception/AppException.java
package com.iRecruit.exception; package com.ic.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
......
src/main/java/com/iRecruit/exception/FileNotFoundException.java → src/main/java/com/ic/exception/FileNotFoundException.java
package com.iRecruit.exception; package com.ic.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
......
src/main/java/com/iRecruit/exception/FileStorageException.java → src/main/java/com/ic/exception/FileStorageException.java
package com.iRecruit.exception; package com.ic.exception;
public class FileStorageException extends RuntimeException { public class FileStorageException extends RuntimeException {
......
src/main/java/com/iRecruit/exception/InvalidArgument.java → src/main/java/com/ic/exception/InvalidArgument.java
package com.iRecruit.exception; package com.ic.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
......
src/main/java/com/iRecruit/exception/InvalidOTPOrRef.java → src/main/java/com/ic/exception/InvalidOTPOrRef.java
package com.iRecruit.exception; package com.ic.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
......
src/main/java/com/iRecruit/exception/OTPExpire.java → src/main/java/com/ic/exception/OTPExpire.java
package com.iRecruit.exception; package com.ic.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
......
src/main/java/com/iRecruit/exception/ResourceAlreadyExist.java → src/main/java/com/ic/exception/ResourceAlreadyExist.java
package com.iRecruit.exception; package com.ic.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
......
src/main/java/com/iRecruit/exception/ResourceNotFoundException.java → src/main/java/com/ic/exception/ResourceNotFoundException.java
package com.iRecruit.exception; package com.ic.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
......
src/main/java/com/iRecruit/exception/TenantNotSelectedException.java → src/main/java/com/ic/exception/TenantNotSelectedException.java
package com.iRecruit.exception; package com.ic.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
......
src/main/java/com/iRecruit/exception/WrongUsernamePassword.java → src/main/java/com/ic/exception/WrongUsernamePassword.java
package com.iRecruit.exception; package com.ic.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
......
src/main/java/com/iRecruit/firebase/FCMInitializer.java → src/main/java/com/ic/firebase/FCMInitializer.java
package com.iRecruit.firebase; package com.ic.firebase;
import java.io.IOException; import java.io.IOException;
......
src/main/java/com/iRecruit/firebase/FCMService.java → src/main/java/com/ic/firebase/FCMService.java
package com.iRecruit.firebase; package com.ic.firebase;
import java.time.Duration; import java.time.Duration;
import java.util.Map; import java.util.Map;
...@@ -15,7 +15,7 @@ import com.google.firebase.messaging.Aps; ...@@ -15,7 +15,7 @@ import com.google.firebase.messaging.Aps;
import com.google.firebase.messaging.FirebaseMessaging; import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message; import com.google.firebase.messaging.Message;
import com.google.firebase.messaging.Notification; import com.google.firebase.messaging.Notification;
import com.iRecruit.modules.auth.model.PushNotificationRequest; import com.ic.modules.auth.model.PushNotificationRequest;
@Service @Service
public class FCMService { public class FCMService {
......
src/main/java/com/iRecruit/firebase/NotificationParameter.java → src/main/java/com/ic/firebase/NotificationParameter.java
package com.iRecruit.firebase; package com.ic.firebase;
public enum NotificationParameter { public enum NotificationParameter {
......
src/main/java/com/iRecruit/modules/auth/controller/AuthController.java → src/main/java/com/ic/modules/auth/controller/AuthController.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -22,24 +22,24 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -22,24 +22,24 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.User; import com.ic.modules.auth.model.User;
import com.iRecruit.modules.auth.payload.P100LoginResponse; import com.ic.modules.auth.payload.P100LoginResponse;
import com.iRecruit.modules.auth.payload.UserDto; import com.ic.modules.auth.payload.UserDto;
import com.iRecruit.modules.auth.payload.UserOTPDto; import com.ic.modules.auth.payload.UserOTPDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.payload.request.JwtAuthenticationResponse; import com.ic.modules.auth.payload.request.JwtAuthenticationResponse;
import com.iRecruit.modules.auth.payload.request.LoginRequest; import com.ic.modules.auth.payload.request.LoginRequest;
import com.iRecruit.modules.auth.payload.request.OTPRequest; import com.ic.modules.auth.payload.request.OTPRequest;
import com.iRecruit.modules.auth.payload.request.OTPValidateRequest; import com.ic.modules.auth.payload.request.OTPValidateRequest;
import com.iRecruit.modules.auth.payload.request.P100LoginRequest; import com.ic.modules.auth.payload.request.P100LoginRequest;
import com.iRecruit.modules.auth.service.UserService; import com.ic.modules.auth.service.UserService;
import com.iRecruit.security.AuthProvider; import com.ic.security.AuthProvider;
import com.iRecruit.security.JwtTokenProvider; import com.ic.security.JwtTokenProvider;
import com.iRecruit.security.UserPrincipal; import com.ic.security.UserPrincipal;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -77,9 +77,14 @@ public class AuthController { ...@@ -77,9 +77,14 @@ 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.getPassword()); UsernamePasswordAuthenticationToken authenticationObj = new UsernamePasswordAuthenticationToken(loginRequest.getUsername(), loginRequest.getUserId());
authenticationObj.setDetails(loginRequest); authenticationObj.setDetails(loginRequest);
Authentication authentication = authenticationManager.authenticate(authenticationObj); Authentication authentication = authenticationManager.authenticate(authenticationObj);
SecurityContextHolder.getContext().setAuthentication(authentication); SecurityContextHolder.getContext().setAuthentication(authentication);
......
src/main/java/com/iRecruit/modules/auth/controller/ConfigurationsController.java → src/main/java/com/ic/modules/auth/controller/ConfigurationsController.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import javax.validation.Valid; import javax.validation.Valid;
...@@ -17,14 +17,14 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -17,14 +17,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.DBConfig; import com.ic.constant.DBConfig;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.Configurations; import com.ic.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.payload.ConfigurationsDto; import com.ic.modules.auth.payload.ConfigurationsDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.ConfigurationsService; import com.ic.modules.auth.service.ConfigurationsService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
......
src/main/java/com/ic/modules/auth/controller/DTslabsMappingController.java 0 → 100644
package com.ic.modules.auth.controller;
import javax.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.ic.annotation.AuditLogs;
import com.ic.constant.LeaderCalcConfig;
import com.ic.constant.StatusCode;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.DTSlabsMapping;
import com.ic.modules.auth.model.L1slabsMapping;
import com.ic.modules.auth.payload.DTslabsDto;
import com.ic.modules.auth.payload.L1slabsDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.DTslabsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@RestController
@RequestMapping("/api/v1")
@Api(description = "DT Slabs maping management API")
public class DTslabsMappingController {
@Autowired
DTslabsService dtslabsService;
LeaderCalcConfig LeaderCalcConfig;
@PostMapping("/dtslabsmapping/get")
@ApiOperation("Get all dtslabs mapping list")
@AuditLogs(isRequest = true, isResponse = true,service="Get dtslabs")
public ResponseEntity<?> getAllDtslabsMappings( ){ // neel gosrani 27-05-2020 Activation DT CR to fetch data from service and DB
return new ResponseEntity(new ApiResponse(HttpStatus.OK.value(), true, "dt slabs List", dtslabsService.findAll().stream().map(DtSlabsMapping -> new DTslabsDto(DtSlabsMapping))), HttpStatus.OK);
}
@PostMapping("/dtslabsmapping/create")
@ApiOperation("Create dtsalbsmapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create dtslabsmapping")
public ResponseEntity<?> createdtslabsmapping(@RequestBody DTslabsDto dtslabsMapping) { // neel gosrani 27-05-2020 Activation DT CR to store data from service and DB
DTSlabsMapping l1 = null;
try {
l1 = dtslabsService.save(dtslabsMapping,true);
}catch(ResourceNotFoundException e) {
e.printStackTrace();
return new ResponseEntity(new ApiResponse(StatusCode.RESOURCE_NOT_FOUND, true, "dtmapping Not found", l1.getId()), HttpStatus.NOT_FOUND);
}catch(Exception e) {
e.printStackTrace();
return new ResponseEntity(new ApiResponse(StatusCode.UNEXPECTED_ERROR, true, "dtmapping creation failed", l1.getId()), HttpStatus.BAD_REQUEST);
}
return new ResponseEntity(new ApiResponse(HttpStatus.OK.value(), true, "dtmapping added successfully", new DTslabsDto(l1)), HttpStatus.OK);
//return new ResponseEntity(new ApiResponse(StatusCode.RESOURCE_EXIST, true, "USER_Already_Exist", null), HttpStatus.NOT_FOUND);
}
@PostMapping("/dtslabsmapping/update")
@ApiOperation("update dtslabsmapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create dtslabsmapping")
public ResponseEntity<?> updatedtslabsmapping(@RequestBody DTslabsDto DtSlabsMapping) { // neel gosrani 27-05-2020 Activation DT CR to update data from service and DB
DTSlabsMapping l1 = null;
try {
l1 = dtslabsService.save(DtSlabsMapping,false);
}catch(ResourceNotFoundException e) {
e.printStackTrace();
return new ResponseEntity(new ApiResponse(StatusCode.RESOURCE_NOT_FOUND, true, "dtmapping Not found", l1.getId()), HttpStatus.NOT_FOUND);
}catch(Exception e) {
e.printStackTrace();
return new ResponseEntity(new ApiResponse(StatusCode.UNEXPECTED_ERROR, true, "dtmapping creation failed", l1.getId()), HttpStatus.BAD_REQUEST);
}
return new ResponseEntity(new ApiResponse(HttpStatus.OK.value(), true, "dtmapping added successfully", new DTslabsDto(l1)), HttpStatus.OK);
//return new ResponseEntity(new ApiResponse(StatusCode.RESOURCE_EXIST, true, "USER_Already_Exist", null), HttpStatus.NOT_FOUND);
}
}
src/main/java/com/iRecruit/modules/auth/controller/FycMappingController.java → src/main/java/com/ic/modules/auth/controller/FycMappingController.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import javax.validation.Valid; import javax.validation.Valid;
...@@ -17,17 +17,17 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -17,17 +17,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.DBConfig; import com.ic.constant.DBConfig;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.Configurations; import com.ic.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.model.FycMapping; import com.ic.modules.auth.model.FycMapping;
import com.iRecruit.modules.auth.payload.ConfigurationsDto; import com.ic.modules.auth.payload.ConfigurationsDto;
import com.iRecruit.modules.auth.payload.fycDto; import com.ic.modules.auth.payload.fycDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.ConfigurationsService; import com.ic.modules.auth.service.ConfigurationsService;
import com.iRecruit.modules.auth.service.FycMappingService; import com.ic.modules.auth.service.FycMappingService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -56,8 +56,8 @@ public class FycMappingController { ...@@ -56,8 +56,8 @@ public class FycMappingController {
@ApiOperation("Create fycmapping") @ApiOperation("Create fycmapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create fycmapping") @AuditLogs(isRequest = true, isResponse = true,service="Create fycmapping")
public ResponseEntity<?> createFycmapping(@RequestBody fycDto fycMapping) { public ResponseEntity<?> createFycmapping(@RequestBody fycDto fycMapping) {
System.out.println("in fyc contrroler"); // System.out.println("in fyc contrroler");
System.out.println("in fycmapping"); // System.out.println("in fycmapping");
FycMapping fyc = null; FycMapping fyc = null;
try { try {
fyc = fycMappingService.save(fycMapping,true); fyc = fycMappingService.save(fycMapping,true);
...@@ -77,8 +77,8 @@ public class FycMappingController { ...@@ -77,8 +77,8 @@ public class FycMappingController {
@ApiOperation("update fycmapping") @ApiOperation("update fycmapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create fycmapping") @AuditLogs(isRequest = true, isResponse = true,service="Create fycmapping")
public ResponseEntity<?> updateFycmapping(@RequestBody fycDto fycMapping) { //Neel – 20-Apr-2020 – Tata - Fyc mapping – Added function for Store data of fyc from table public ResponseEntity<?> updateFycmapping(@RequestBody fycDto fycMapping) { //Neel – 20-Apr-2020 – Tata - Fyc mapping – Added function for Store data of fyc from table
System.out.println("in fyc contrroler"); // System.out.println("in fyc contrroler");
System.out.println("in fycmapping"); // System.out.println("in fycmapping");
FycMapping fycupdate = null; FycMapping fycupdate = null;
try { try {
fycupdate = fycMappingService.save(fycMapping,false); fycupdate = fycMappingService.save(fycMapping,false);
......
src/main/java/com/iRecruit/modules/auth/controller/L1slabsMappingController.java → src/main/java/com/ic/modules/auth/controller/L1slabsMappingController.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import javax.validation.Valid; import javax.validation.Valid;
...@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig; import com.ic.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L1slabsMapping; import com.ic.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.MpbMapping; import com.ic.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.payload.L1slabsDto; import com.ic.modules.auth.payload.L1slabsDto;
import com.iRecruit.modules.auth.payload.mpbDto; import com.ic.modules.auth.payload.mpbDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.L1slabsMappingService; import com.ic.modules.auth.service.L1slabsMappingService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -54,8 +54,8 @@ public class L1slabsMappingController { ...@@ -54,8 +54,8 @@ public class L1slabsMappingController {
@AuditLogs(isRequest = true, isResponse = true,service="Create l1salbsmapping") @AuditLogs(isRequest = true, isResponse = true,service="Create l1salbsmapping")
//Neel – 20-Apr-2020 – Tata - l1 slabs mapping – Added function for store all data of l1 slabs table //Neel – 20-Apr-2020 – Tata - l1 slabs mapping – Added function for store all data of l1 slabs table
public ResponseEntity<?> createL1slabsmapping(@RequestBody L1slabsDto l1slabsmapping) { public ResponseEntity<?> createL1slabsmapping(@RequestBody L1slabsDto l1slabsmapping) {
System.out.println("in l1salbsmapping contrroler"); // System.out.println("in l1salbsmapping contrroler");
System.out.println("in l1salbsmapping"); // System.out.println("in l1salbsmapping");
L1slabsMapping l1 = null; L1slabsMapping l1 = null;
try { try {
l1 = l1slabsMappingService.save(l1slabsmapping,true); l1 = l1slabsMappingService.save(l1slabsmapping,true);
...@@ -76,8 +76,8 @@ public class L1slabsMappingController { ...@@ -76,8 +76,8 @@ public class L1slabsMappingController {
@ApiOperation("update l1salbsmapping") @ApiOperation("update l1salbsmapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create l1salbsmapping") @AuditLogs(isRequest = true, isResponse = true,service="Create l1salbsmapping")
public ResponseEntity<?> updateL1slabsmapping(@RequestBody L1slabsDto l1slabsmapping) { public ResponseEntity<?> updateL1slabsmapping(@RequestBody L1slabsDto l1slabsmapping) {
System.out.println("in l1salbsmapping contrroler"); // System.out.println("in l1salbsmapping contrroler");
System.out.println("in l1salbsmapping"); // System.out.println("in l1salbsmapping");
L1slabsMapping l1 = null; L1slabsMapping l1 = null;
try { try {
l1 = l1slabsMappingService.save(l1slabsmapping,false); l1 = l1slabsMappingService.save(l1slabsmapping,false);
......
src/main/java/com/iRecruit/modules/auth/controller/L2slabsMappingController.java → src/main/java/com/ic/modules/auth/controller/L2slabsMappingController.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import javax.validation.Valid; import javax.validation.Valid;
...@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig; import com.ic.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L1slabsMapping; import com.ic.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.L2slabsMapping; import com.ic.modules.auth.model.L2slabsMapping;
import com.iRecruit.modules.auth.payload.L1slabsDto; import com.ic.modules.auth.payload.L1slabsDto;
import com.iRecruit.modules.auth.payload.L2slabsDto; import com.ic.modules.auth.payload.L2slabsDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.L2slabsMappingService; import com.ic.modules.auth.service.L2slabsMappingService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -57,8 +57,8 @@ public class L2slabsMappingController { ...@@ -57,8 +57,8 @@ public class L2slabsMappingController {
//Neel – 20-Apr-2020 – Tata - l2 slabs mapping – Added function for store all data of l1 slabs table //Neel – 20-Apr-2020 – Tata - l2 slabs mapping – Added function for store all data of l1 slabs table
public ResponseEntity<?> createL1slabsmapping(@RequestBody L2slabsDto l2slabsmapping) { public ResponseEntity<?> createL1slabsmapping(@RequestBody L2slabsDto l2slabsmapping) {
System.out.println("in l2salbsmapping contrroler"); // System.out.println("in l2salbsmapping contrroler");
System.out.println("in l2salbsmapping"); // System.out.println("in l2salbsmapping");
L2slabsMapping l2 = null; L2slabsMapping l2 = null;
try { try {
l2 = l2slabsMappingService.save(l2slabsmapping,true); l2 = l2slabsMappingService.save(l2slabsmapping,true);
...@@ -78,8 +78,8 @@ public class L2slabsMappingController { ...@@ -78,8 +78,8 @@ public class L2slabsMappingController {
@ApiOperation("update l2salbsmapping") @ApiOperation("update l2salbsmapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create l2salbsmapping") @AuditLogs(isRequest = true, isResponse = true,service="Create l2salbsmapping")
public ResponseEntity<?> updateL1slabsmapping(@RequestBody L2slabsDto l2slabsmapping) { public ResponseEntity<?> updateL1slabsmapping(@RequestBody L2slabsDto l2slabsmapping) {
System.out.println("in l2salbsmapping contrroler"); // System.out.println("in l2salbsmapping contrroler");
System.out.println("in l2salbsmapping"); // System.out.println("in l2salbsmapping");
L2slabsMapping l2 = null; L2slabsMapping l2 = null;
try { try {
l2 = l2slabsMappingService.save(l2slabsmapping,false); l2 = l2slabsMappingService.save(l2slabsmapping,false);
......
src/main/java/com/iRecruit/modules/auth/controller/LeaderCalc.java → src/main/java/com/ic/modules/auth/controller/LeaderCalc.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import java.util.Map; import java.util.Map;
...@@ -21,21 +21,22 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -21,21 +21,22 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.json.JSONException;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig; import com.ic.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L1slabsMapping; import com.ic.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.MpbMapping; import com.ic.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.payload.L1slabsDto; import com.ic.modules.auth.payload.L1slabsDto;
import com.iRecruit.modules.auth.payload.mpbDto; import com.ic.modules.auth.payload.mpbDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.payload.request.Apiresponse1; import com.ic.modules.auth.payload.request.Apiresponse1;
import com.iRecruit.modules.auth.service.L1slabsMappingService; import com.ic.modules.auth.service.L1slabsMappingService;
import com.iRecruit.modules.auth.service.LeaderCalcService; import com.ic.modules.auth.service.LeaderCalcService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -55,8 +56,8 @@ public class LeaderCalc { ...@@ -55,8 +56,8 @@ public class LeaderCalc {
//Neel – 20-Apr-2020 – Tata - Leader calculation – Added method for calculation of leader sheet //Neel – 20-Apr-2020 – Tata - Leader calculation – Added method for calculation of leader sheet
public ResponseEntity<?> Calculate(@RequestBody Map<String, Object> lookupRequestObject) throws JsonProcessingException { public ResponseEntity<?> Calculate(@RequestBody Map<String, Object> lookupRequestObject) throws JsonProcessingException {
System.out.println("in fyc contrroler"); // System.out.println("in fyc contrroler");
System.out.println("in fycmapping"); // System.out.println("in fycmapping");
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String data = mapper.writeValueAsString(lookupRequestObject); String data = mapper.writeValueAsString(lookupRequestObject);
...@@ -66,10 +67,16 @@ public class LeaderCalc { ...@@ -66,10 +67,16 @@ public class LeaderCalc {
try { try {
System.out.println("in try"); // System.out.println("in try");
calc = leaderCalcService.calculate(data); // Yashvant - 16 May 2020 - 0000 - Validation For JSON Keys ( < , > )
System.out.println("after operation calc"); if( checkValidation(data) ) {
System.out.println(calc); calc = leaderCalcService.calculate(data);
}
else {
return new ResponseEntity( new ApiResponse( StatusCode.UNEXPECTED_ERROR, true, "Request Contains Invalid Input", calc ), HttpStatus.BAD_REQUEST );
}
// System.out.println("after operation calc");
// System.out.println(calc);
...@@ -77,7 +84,7 @@ public class LeaderCalc { ...@@ -77,7 +84,7 @@ public class LeaderCalc {
calc = new JSONObject(); calc = new JSONObject();
calc.put("Error_Code", "503"); calc.put("Error_Code", "503");
calc.put("Error_Message", "Technical Error caught while calculating"); calc.put("Error_Message", "Technical Error caught while calculating");
System.out.println(e); // System.out.println(e);
e.printStackTrace(); e.printStackTrace();
return new ResponseEntity(new ApiResponse(StatusCode.RESOURCE_NOT_FOUND, true, "calculation failed", calc), HttpStatus.NOT_FOUND); return new ResponseEntity(new ApiResponse(StatusCode.RESOURCE_NOT_FOUND, true, "calculation failed", calc), HttpStatus.NOT_FOUND);
}catch(Exception e) { }catch(Exception e) {
...@@ -86,7 +93,7 @@ public class LeaderCalc { ...@@ -86,7 +93,7 @@ public class LeaderCalc {
calc.put("Error_Code", "503"); calc.put("Error_Code", "503");
calc.put("Error_Message", "Technical Error caught while calculating"); calc.put("Error_Message", "Technical Error caught while calculating");
e.printStackTrace(); e.printStackTrace();
System.out.println(e); // System.out.println(e);
return new ResponseEntity(new ApiResponse(StatusCode.UNEXPECTED_ERROR, true, "calculation failed", calc), HttpStatus.BAD_REQUEST); return new ResponseEntity(new ApiResponse(StatusCode.UNEXPECTED_ERROR, true, "calculation failed", calc), HttpStatus.BAD_REQUEST);
} }
...@@ -94,5 +101,26 @@ public class LeaderCalc { ...@@ -94,5 +101,26 @@ public class LeaderCalc {
//return new ResponseEntity(new ApiResponse(StatusCode.RESOURCE_EXIST, true, "USER_Already_Exist", null), HttpStatus.NOT_FOUND); //return new ResponseEntity(new ApiResponse(StatusCode.RESOURCE_EXIST, true, "USER_Already_Exist", null), HttpStatus.NOT_FOUND);
} }
// Yashvant - 16 May 2020 - 0000 - Validation For JSON Keys ( < , > )
public boolean checkValidation(String requestString) throws JSONException {
// No need of try catch as default exception added
int i;
String [] jsonKeysStringValue = new String [4];
JSONObject request = new JSONObject(requestString);
request = request.getJSONObject("CALC_JSON");
jsonKeysStringValue[0] = request.getString("LEADER_CODE");
jsonKeysStringValue[1] = request.getString("LEADER_DESIGNATION");
jsonKeysStringValue[2] = request.getString("LEADER_NAME");
jsonKeysStringValue[3] = request.getString("LEADER_FIRM_NAME");
for( i = 0; i < jsonKeysStringValue.length; i++ ) {
if( jsonKeysStringValue[i].contains("<") && jsonKeysStringValue[i].contains(">") ) {
return false;
}
}
return true;
}
} }
src/main/java/com/iRecruit/modules/auth/controller/MDBMappingController.java → src/main/java/com/ic/modules/auth/controller/MDBMappingController.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import javax.validation.Valid; import javax.validation.Valid;
...@@ -17,21 +17,21 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -17,21 +17,21 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig; import com.ic.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L1slabsMapping; import com.ic.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.L2slabsMapping; import com.ic.modules.auth.model.L2slabsMapping;
import com.iRecruit.modules.auth.model.MDBMapping; import com.ic.modules.auth.model.MDBMapping;
import com.iRecruit.modules.auth.model.MpbMapping; import com.ic.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.payload.L1slabsDto; import com.ic.modules.auth.payload.L1slabsDto;
import com.iRecruit.modules.auth.payload.L2slabsDto; import com.ic.modules.auth.payload.L2slabsDto;
import com.iRecruit.modules.auth.payload.MDBDto; import com.ic.modules.auth.payload.MDBDto;
import com.iRecruit.modules.auth.payload.mpbDto; import com.ic.modules.auth.payload.mpbDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.MDBMappingService; import com.ic.modules.auth.service.MDBMappingService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -62,8 +62,8 @@ public class MDBMappingController { ...@@ -62,8 +62,8 @@ public class MDBMappingController {
@AuditLogs(isRequest = true, isResponse = true,service="Create mdbmapping") @AuditLogs(isRequest = true, isResponse = true,service="Create mdbmapping")
//Neel – 20-Apr-2020 – Tata - mdb mapping – Added function for storing all data of mdb mapping table //Neel – 20-Apr-2020 – Tata - mdb mapping – Added function for storing all data of mdb mapping table
public ResponseEntity<?> createmdbsmapping(@RequestBody MDBDto mdbmapping) { public ResponseEntity<?> createmdbsmapping(@RequestBody MDBDto mdbmapping) {
System.out.println("in mdb contrroler"); // System.out.println("in mdb contrroler");
System.out.println("in mdbmapping"); // System.out.println("in mdbmapping");
MDBMapping mdb = null; MDBMapping mdb = null;
try { try {
mdb = mdbMappingService.save(mdbmapping,true); mdb = mdbMappingService.save(mdbmapping,true);
...@@ -83,8 +83,8 @@ public class MDBMappingController { ...@@ -83,8 +83,8 @@ public class MDBMappingController {
@ApiOperation("update mdbmapping") @ApiOperation("update mdbmapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create mdbmapping") @AuditLogs(isRequest = true, isResponse = true,service="Create mdbmapping")
public ResponseEntity<?> updatemdbsmapping(@RequestBody MDBDto mdbmapping) { public ResponseEntity<?> updatemdbsmapping(@RequestBody MDBDto mdbmapping) {
System.out.println("in mdb contrroler"); // System.out.println("in mdb contrroler");
System.out.println("in mdbmapping"); // System.out.println("in mdbmapping");
MDBMapping mdb = null; MDBMapping mdb = null;
try { try {
mdb = mdbMappingService.save(mdbmapping,false); mdb = mdbMappingService.save(mdbmapping,false);
......
src/main/java/com/iRecruit/modules/auth/controller/MpbMappingController.java → src/main/java/com/ic/modules/auth/controller/MpbMappingController.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import javax.validation.Valid; import javax.validation.Valid;
...@@ -17,17 +17,17 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -17,17 +17,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig; import com.ic.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.payload.fycDto; import com.ic.modules.auth.payload.fycDto;
import com.iRecruit.modules.auth.payload.mpbDto; import com.ic.modules.auth.payload.mpbDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.FycMappingService; import com.ic.modules.auth.service.FycMappingService;
import com.iRecruit.modules.auth.service.MpbMappingService; import com.ic.modules.auth.service.MpbMappingService;
import com.iRecruit.modules.auth.model.FycMapping; import com.ic.modules.auth.model.FycMapping;
import com.iRecruit.modules.auth.model.MpbMapping; import com.ic.modules.auth.model.MpbMapping;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -55,8 +55,8 @@ public class MpbMappingController { ...@@ -55,8 +55,8 @@ public class MpbMappingController {
@AuditLogs(isRequest = true, isResponse = true,service="Create mpbmapping") @AuditLogs(isRequest = true, isResponse = true,service="Create mpbmapping")
//Neel – 20-Apr-2020 – Tata - mdb mapping – Added function for storing all data of mdb mapping table //Neel – 20-Apr-2020 – Tata - mdb mapping – Added function for storing all data of mdb mapping table
public ResponseEntity<?> createMpbmapping(@RequestBody mpbDto mpbMapping) { public ResponseEntity<?> createMpbmapping(@RequestBody mpbDto mpbMapping) {
System.out.println("in mpb contrroler"); // System.out.println("in mpb contrroler");
System.out.println("in mpbmapping"); // System.out.println("in mpbmapping");
MpbMapping mpb = null; MpbMapping mpb = null;
try { try {
mpb = mpbMappingService.save(mpbMapping,true); mpb = mpbMappingService.save(mpbMapping,true);
...@@ -75,8 +75,8 @@ public class MpbMappingController { ...@@ -75,8 +75,8 @@ public class MpbMappingController {
@ApiOperation("update mpbmapping") @ApiOperation("update mpbmapping")
@AuditLogs(isRequest = true, isResponse = true,service="update mpbmapping") @AuditLogs(isRequest = true, isResponse = true,service="update mpbmapping")
public ResponseEntity<?> updateMpbmapping(@RequestBody mpbDto mpbMapping) { public ResponseEntity<?> updateMpbmapping(@RequestBody mpbDto mpbMapping) {
System.out.println("in mpb contrroler"); // System.out.println("in mpb contrroler");
System.out.println("in mpbmapping"); // System.out.println("in mpbmapping");
MpbMapping mpb = null; MpbMapping mpb = null;
try { try {
mpb = mpbMappingService.save(mpbMapping,false); mpb = mpbMappingService.save(mpbMapping,false);
......
src/main/java/com/iRecruit/modules/auth/controller/MsaMappingController.java → src/main/java/com/ic/modules/auth/controller/MsaMappingController.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import javax.validation.Valid; import javax.validation.Valid;
...@@ -17,24 +17,24 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -17,24 +17,24 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig; import com.ic.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L1slabsMapping; import com.ic.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.L2slabsMapping; import com.ic.modules.auth.model.L2slabsMapping;
import com.iRecruit.modules.auth.model.MDBMapping; import com.ic.modules.auth.model.MDBMapping;
import com.iRecruit.modules.auth.model.MpbMapping; import com.ic.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.model.MsaMapping; import com.ic.modules.auth.model.MsaMapping;
import com.iRecruit.modules.auth.payload.L1slabsDto; import com.ic.modules.auth.payload.L1slabsDto;
import com.iRecruit.modules.auth.payload.L2slabsDto; import com.ic.modules.auth.payload.L2slabsDto;
import com.iRecruit.modules.auth.payload.MDBDto; import com.ic.modules.auth.payload.MDBDto;
import com.iRecruit.modules.auth.payload.MsaDto; import com.ic.modules.auth.payload.MsaDto;
import com.iRecruit.modules.auth.payload.mpbDto; import com.ic.modules.auth.payload.mpbDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.MDBMappingService; import com.ic.modules.auth.service.MDBMappingService;
import com.iRecruit.modules.auth.service.MsaMappingService; import com.ic.modules.auth.service.MsaMappingService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -60,8 +60,8 @@ public class MsaMappingController { ...@@ -60,8 +60,8 @@ public class MsaMappingController {
@ApiOperation("Create msamapping") @ApiOperation("Create msamapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create msamapping") @AuditLogs(isRequest = true, isResponse = true,service="Create msamapping")
public ResponseEntity<?> createMsamapping(@RequestBody MsaDto msaMapping) { public ResponseEntity<?> createMsamapping(@RequestBody MsaDto msaMapping) {
System.out.println("in mpb contrroler"); // System.out.println("in mpb contrroler");
System.out.println("in mpbmapping"); // System.out.println("in mpbmapping");
MsaMapping msa = null; MsaMapping msa = null;
try { try {
msa = msaMappingService.save(msaMapping,true); msa = msaMappingService.save(msaMapping,true);
...@@ -82,8 +82,8 @@ public class MsaMappingController { ...@@ -82,8 +82,8 @@ public class MsaMappingController {
@ApiOperation("Create msamapping") @ApiOperation("Create msamapping")
@AuditLogs(isRequest = true, isResponse = true,service="update msamapping") @AuditLogs(isRequest = true, isResponse = true,service="update msamapping")
public ResponseEntity<?>updateMsamapping(@RequestBody MsaDto msaMapping) { public ResponseEntity<?>updateMsamapping(@RequestBody MsaDto msaMapping) {
System.out.println("in mpb contrroler"); // System.out.println("in mpb contrroler");
System.out.println("in mpbmapping"); // System.out.println("in mpbmapping");
MsaMapping msa = null; MsaMapping msa = null;
try { try {
msa = msaMappingService.save(msaMapping,false); msa = msaMappingService.save(msaMapping,false);
......
src/main/java/com/iRecruit/modules/auth/controller/NGPACalc.java → src/main/java/com/ic/modules/auth/controller/NGPACalc.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -25,18 +25,18 @@ import com.fasterxml.jackson.core.JsonParser; ...@@ -25,18 +25,18 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig; import com.ic.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L1slabsMapping; import com.ic.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.MpbMapping; import com.ic.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.payload.L1slabsDto; import com.ic.modules.auth.payload.L1slabsDto;
import com.iRecruit.modules.auth.payload.mpbDto; import com.ic.modules.auth.payload.mpbDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.L1slabsMappingService; import com.ic.modules.auth.service.L1slabsMappingService;
import com.iRecruit.modules.auth.service.LeaderCalcService; import com.ic.modules.auth.service.LeaderCalcService;
import com.iRecruit.modules.auth.service.NGPACalcService; import com.ic.modules.auth.service.NGPACalcService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -56,7 +56,7 @@ public class NGPACalc { ...@@ -56,7 +56,7 @@ public class NGPACalc {
@AuditLogs(isRequest = true, isResponse = true,service="Ngpa service") @AuditLogs(isRequest = true, isResponse = true,service="Ngpa service")
@JsonSerialize @JsonSerialize
public ResponseEntity<?> CalculateNGPA(@RequestBody Map<String, Object> lookupRequestObject) throws JsonProcessingException { public ResponseEntity<?> CalculateNGPA(@RequestBody Map<String, Object> lookupRequestObject) throws JsonProcessingException {
System.out.println("in ngpa contrroler"); // System.out.println("in ngpa contrroler");
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
...@@ -66,15 +66,15 @@ public class NGPACalc { ...@@ -66,15 +66,15 @@ public class NGPACalc {
JSONObject calc = null; JSONObject calc = null;
try { try {
System.out.println("in try"); // System.out.println("in try");
calc = nGPACalcService.prepareAllFormula(requestJSON); calc = nGPACalcService.prepareAllFormula(requestJSON);
System.out.println("after operation calc"); // System.out.println("after operation calc");
System.out.println(calc); // System.out.println(calc);
result =new HashMap<String, Object>(); result =new HashMap<String, Object>();
result.put("response", calc); result.put("response", calc);
System.out.println(result); // System.out.println(result);
}catch(ResourceNotFoundException e) { }catch(ResourceNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
......
src/main/java/com/iRecruit/modules/auth/controller/NGPAtoNGPLCalc.java → src/main/java/com/ic/modules/auth/controller/NGPAtoNGPLCalc.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -21,22 +21,23 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -21,22 +21,23 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.json.JSONException;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig; import com.ic.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L1slabsMapping; import com.ic.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.MpbMapping; import com.ic.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.payload.L1slabsDto; import com.ic.modules.auth.payload.L1slabsDto;
import com.iRecruit.modules.auth.payload.mpbDto; import com.ic.modules.auth.payload.mpbDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.L1slabsMappingService; import com.ic.modules.auth.service.L1slabsMappingService;
import com.iRecruit.modules.auth.service.LeaderCalcService; import com.ic.modules.auth.service.LeaderCalcService;
import com.iRecruit.modules.auth.service.NGPAtoNGPLCalcService; import com.ic.modules.auth.service.NGPAtoNGPLCalcService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -55,7 +56,7 @@ public class NGPAtoNGPLCalc { ...@@ -55,7 +56,7 @@ public class NGPAtoNGPLCalc {
@AuditLogs(isRequest = true, isResponse = true,service="ngpatongplcalc") @AuditLogs(isRequest = true, isResponse = true,service="ngpatongplcalc")
@JsonSerialize @JsonSerialize
public ResponseEntity<?> CalculateNGPL(@RequestBody Map<String, Object> lookupRequestObject) throws JsonProcessingException { public ResponseEntity<?> CalculateNGPL(@RequestBody Map<String, Object> lookupRequestObject) throws JsonProcessingException {
System.out.println("in ngpl contrroler"); // System.out.println("in ngpl contrroler");
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
...@@ -65,15 +66,21 @@ public class NGPAtoNGPLCalc { ...@@ -65,15 +66,21 @@ public class NGPAtoNGPLCalc {
JSONObject calc = null; JSONObject calc = null;
try { try {
System.out.println("in try"); // System.out.println("in try");
calc = nGPAtoNGPLCalcService.prepareAllFormula(requestJSON); // Yashvant - 16 May 2020 - 0000 - Validation For JSON Keys ( < , > )
System.out.println("after operation calc"); if( checkValidation(requestJSON) ) {
System.out.println(calc); calc = nGPAtoNGPLCalcService.prepareAllFormula(requestJSON);
}
else {
return new ResponseEntity( new ApiResponse( StatusCode.UNEXPECTED_ERROR, true, "Request Contains Invalid Input", calc ), HttpStatus.BAD_REQUEST );
}
// System.out.println("after operation calc");
// System.out.println(calc);
result =new HashMap<String, Object>(); result =new HashMap<String, Object>();
result.put("response", calc); result.put("response", calc);
System.out.println(result); // System.out.println(result);
}catch(ResourceNotFoundException e) { }catch(ResourceNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
...@@ -88,4 +95,28 @@ public class NGPAtoNGPLCalc { ...@@ -88,4 +95,28 @@ public class NGPAtoNGPLCalc {
//return new ResponseEntity(new ApiResponse(StatusCode.RESOURCE_EXIST, true, "USER_Already_Exist", null), HttpStatus.NOT_FOUND); //return new ResponseEntity(new ApiResponse(StatusCode.RESOURCE_EXIST, true, "USER_Already_Exist", null), HttpStatus.NOT_FOUND);
} }
// Yashvant - 16 May 2020 - 0000 - Validation For JSON Keys ( < , > )
public boolean checkValidation(JSONObject request) throws JSONException {
// No need of try catch as default exception added
int i;
String [] jsonKeysStringValue = new String [6];
jsonKeysStringValue[0] = request.getString("FS_Type");
jsonKeysStringValue[1] = request.getString("Total_Validations_Met");
request = request.getJSONObject("Metrics_MeetingConversion_Earnings");
jsonKeysStringValue[2] = request.getJSONObject("Year_1_NGPA").getString("Validations_Met");
jsonKeysStringValue[3] = request.getJSONObject("Year_1_NGPL").getString("Validations_Met");
jsonKeysStringValue[4] = request.getJSONObject("Year_1_Total").getString("Validations_Met");
jsonKeysStringValue[5] = request.getJSONObject("Year_2_4_Validated_NGPAs").getString("Validations_Met");
for( i = 0; i < jsonKeysStringValue.length; i++ ) {
if( jsonKeysStringValue[i].contains("<") && jsonKeysStringValue[i].contains(">") ) {
return false;
}
}
return true;
}
} }
src/main/java/com/iRecruit/modules/auth/controller/TemplatesController.java → src/main/java/com/ic/modules/auth/controller/TemplatesController.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import javax.validation.Valid; import javax.validation.Valid;
...@@ -11,14 +11,14 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -11,14 +11,14 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.DBConfig; import com.ic.constant.DBConfig;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.Templates; import com.ic.modules.auth.model.Templates;
import com.iRecruit.modules.auth.payload.TemplatesDto; import com.ic.modules.auth.payload.TemplatesDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.TemplatesService; import com.ic.modules.auth.service.TemplatesService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
......
src/main/java/com/iRecruit/modules/auth/controller/UserController.java → src/main/java/com/ic/modules/auth/controller/UserController.java
package com.iRecruit.modules.auth.controller; package com.ic.modules.auth.controller;
import javax.validation.Valid; import javax.validation.Valid;
...@@ -17,13 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -17,13 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs; import com.ic.annotation.AuditLogs;
import com.iRecruit.constant.StatusCode; import com.ic.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException; import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.User; import com.ic.modules.auth.model.User;
import com.iRecruit.modules.auth.payload.UserDto; import com.ic.modules.auth.payload.UserDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse; import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.UserService; import com.ic.modules.auth.service.UserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
......
src/main/java/com/iRecruit/modules/auth/model/AuditLogs.java → src/main/java/com/ic/modules/auth/model/AuditLogs.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import java.util.Date; import java.util.Date;
...@@ -9,7 +9,7 @@ import javax.persistence.Id; ...@@ -9,7 +9,7 @@ import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import com.iRecruit.modules.auth.payload.AuditLogsDto; import com.ic.modules.auth.payload.AuditLogsDto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
......
src/main/java/com/iRecruit/modules/auth/model/Auditable.java → src/main/java/com/ic/modules/auth/model/Auditable.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import static javax.persistence.TemporalType.TIMESTAMP; import static javax.persistence.TemporalType.TIMESTAMP;
......
src/main/java/com/iRecruit/modules/auth/model/Configurations.java → src/main/java/com/ic/modules/auth/model/Configurations.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -26,7 +26,7 @@ public class Configurations{ ...@@ -26,7 +26,7 @@ public class Configurations{
@NotBlank @NotBlank
@Column(length=50) @Column(length=50)
private String config; private String key;
@NotBlank @NotBlank
@Column(length=500) @Column(length=500)
...@@ -34,5 +34,7 @@ public class Configurations{ ...@@ -34,5 +34,7 @@ public class Configurations{
private String description; private String description;
private String isFrontEnd;
} }
src/main/java/com/ic/modules/auth/model/DTSlabsMapping.java 0 → 100644
package com.ic.modules.auth.model;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.validation.constraints.NotBlank;
import com.google.firebase.database.annotations.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Entity
@Table(name = "tbl_dt_slabs_mapping")
@Setter
@Getter
public class DTSlabsMapping { // neel gosrani 27-05-2020 Activation DT CR
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE)
private Long id;
@NotNull
@Column(length=500)
private int minval;
@NotNull
@Column(length=500)
private int maxval;
private int BA;
private int SBA;
private int CBA;
private int PBA;
private int Partner;
private int Senior_Partner;
}
src/main/java/com/iRecruit/modules/auth/model/FycMapping.java → src/main/java/com/ic/modules/auth/model/FycMapping.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
src/main/java/com/iRecruit/modules/auth/model/L1slabsMapping.java → src/main/java/com/ic/modules/auth/model/L1slabsMapping.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
src/main/java/com/iRecruit/modules/auth/model/L2slabsMapping.java → src/main/java/com/ic/modules/auth/model/L2slabsMapping.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
src/main/java/com/iRecruit/modules/auth/model/MDBMapping.java → src/main/java/com/ic/modules/auth/model/MDBMapping.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
src/main/java/com/iRecruit/modules/auth/model/MpbMapping.java → src/main/java/com/ic/modules/auth/model/MpbMapping.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
src/main/java/com/iRecruit/modules/auth/model/MsaMapping.java → src/main/java/com/ic/modules/auth/model/MsaMapping.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
src/main/java/com/iRecruit/modules/auth/model/PushNotificationRequest.java → src/main/java/com/ic/modules/auth/model/PushNotificationRequest.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
public class PushNotificationRequest { public class PushNotificationRequest {
......
src/main/java/com/iRecruit/modules/auth/model/PushNotificationResponse.java → src/main/java/com/ic/modules/auth/model/PushNotificationResponse.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
public class PushNotificationResponse { public class PushNotificationResponse {
......
src/main/java/com/iRecruit/modules/auth/model/Templates.java → src/main/java/com/ic/modules/auth/model/Templates.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.EntityListeners;
import javax.persistence.EnumType; import javax.persistence.EnumType;
import javax.persistence.Enumerated; import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
...@@ -12,9 +11,7 @@ import javax.persistence.Lob; ...@@ -12,9 +11,7 @@ import javax.persistence.Lob;
import javax.persistence.Table; import javax.persistence.Table;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import org.springframework.data.jpa.domain.support.AuditingEntityListener; import com.ic.constant.TemplateType;
import com.iRecruit.constant.TemplateType;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -30,7 +27,7 @@ public class Templates{ ...@@ -30,7 +27,7 @@ public class Templates{
@NotBlank @NotBlank
@Column(length=50) @Column(length=50)
private String config; private String key;
@NotBlank @NotBlank
@Lob @Lob
......
src/main/java/com/iRecruit/modules/auth/model/User.java → src/main/java/com/ic/modules/auth/model/User.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import java.sql.Timestamp; import java.sql.Timestamp;
...@@ -12,8 +12,7 @@ import javax.persistence.Table; ...@@ -12,8 +12,7 @@ import javax.persistence.Table;
import org.springframework.data.jpa.domain.support.AuditingEntityListener; import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import com.iRecruit.constant.RolesConstant; import com.ic.constant.Status;
import com.iRecruit.constant.Status;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -25,11 +24,8 @@ import lombok.Setter; ...@@ -25,11 +24,8 @@ import lombok.Setter;
@EntityListeners(AuditingEntityListener.class) @EntityListeners(AuditingEntityListener.class)
public class User { public class User {
@Id
@Column(length=10)
private String id;
@Column(length=11) @Column(length=11)
@Id
private String userId; private String userId;
@Column(length=200) @Column(length=200)
private String firstName; private String firstName;
...@@ -54,11 +50,11 @@ public class User { ...@@ -54,11 +50,11 @@ public class User {
@Column(length=8) @Column(length=8)
private Timestamp modifiedDate; private Timestamp modifiedDate;
@Column(length=11) @Column(length=11)
private String level1NtId; private String level1_NtId;
@Column(length=11) @Column(length=11)
private String level5NtId; private String level5_NtId;
@Column(length=3) @Column(length=3)
private String level1DesignationCode; private String level1_DesignationCode;
@Column(length=5) @Column(length=5)
private String branchCode; private String branchCode;
@Column(length=100) @Column(length=100)
...@@ -70,58 +66,37 @@ public class User { ...@@ -70,58 +66,37 @@ public class User {
@Column(length=63) @Column(length=63)
private String userRole2; private String userRole2;
@Column(length=30) @Column(length=30)
private String level2DesignationC0de; private String level2_DesignationC0de;
@Column(length=30) @Column(length=30)
private String branchCdLevel2; private String branchCdLevel2;
@Column(length=63) @Column(length=63)
private String userRole3; private String userRole3;
@Column(length=30) @Column(length=30)
private String level3DesignationC0de; private String level3_DesignationC0de;
@Column(length=30) @Column(length=30)
private String branchCdLevel3; private String branchCdLevel3;
@Column(length=63) @Column(length=63)
private String userRole4; private String userRole4;
@Column(length=30) @Column(length=30)
private String level4DesignationC0de; private String level4_DesignationC0de;
@Column(length=30) @Column(length=30)
private String branchCdLevel4; private String branchCdLevel4;
@Column(length=63) @Column(length=63)
private String userRole5; private String userRole5;
@Column(length=30) @Column(length=30)
private String level5DesignationC0de; private String level5_DesignationC0de;
@Column(length=30) @Column(length=30)
private String branchCdLevel5; private String branchCdLevel5;
@Column(length=10) @Column(length=10)
private String baType; private String baType;
private Long baRank; private Long baRank;
@Column(length=1)
private String gender;
@Column(length=20)
private String dob;
@Column(length=50)
private String branchName;
@Column(length=20)
private String middleName;
@Column(length=5)
private String designation;
@Column(length=10) @Column(length=10)
private String pan; private String employeeId;
@Column(length=1)
private String agentStatus;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
protected Status status = Status.ACTIVE; protected Status status = Status.ACTIVE;
@Enumerated(EnumType.STRING) @Column(length=10)
private RolesConstant role = RolesConstant.LEADER;
private String notificationId; private String notificationId;
private int failedAttemptLogin = 0; private int failedAttemptLogin = 0;
......
src/main/java/com/iRecruit/modules/auth/model/UserOTP.java → src/main/java/com/ic/modules/auth/model/UserOTP.java
package com.iRecruit.modules.auth.model; package com.ic.modules.auth.model;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -16,8 +16,8 @@ import org.hibernate.annotations.GenericGenerator; ...@@ -16,8 +16,8 @@ import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Parameter;
import org.springframework.data.jpa.domain.support.AuditingEntityListener; import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import com.iRecruit.config.IdGenerator; import com.ic.config.IdGenerator;
import com.iRecruit.constant.Status; import com.ic.constant.Status;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -33,7 +33,7 @@ public class UserOTP extends Auditable<Long>{ ...@@ -33,7 +33,7 @@ public class UserOTP extends Auditable<Long>{
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "user_otp_seq") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "user_otp_seq")
@GenericGenerator( @GenericGenerator(
name = "user_otp_seq", name = "user_otp_seq",
strategy = "com.iRecruit.config.IdGenerator", strategy = "com.ic.config.IdGenerator",
parameters = { parameters = {
@Parameter(name = IdGenerator.INCREMENT_PARAM, value = "1"), @Parameter(name = IdGenerator.INCREMENT_PARAM, value = "1"),
@Parameter(name = IdGenerator.VALUE_PREFIX_PARAMETER, value = "UO"), @Parameter(name = IdGenerator.VALUE_PREFIX_PARAMETER, value = "UO"),
......
src/main/java/com/iRecruit/modules/auth/payload/AuditLogsDto.java → src/main/java/com/ic/modules/auth/payload/AuditLogsDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import com.iRecruit.modules.auth.model.AuditLogs; import com.ic.modules.auth.model.AuditLogs;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
......
src/main/java/com/iRecruit/modules/auth/payload/ConfigurationsDto.java → src/main/java/com/ic/modules/auth/payload/ConfigurationsDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import com.iRecruit.modules.auth.model.Configurations; import com.ic.modules.auth.model.Configurations;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
...@@ -25,10 +25,13 @@ public class ConfigurationsDto{ ...@@ -25,10 +25,13 @@ public class ConfigurationsDto{
private String description; private String description;
private String isFrontEnd;
public ConfigurationsDto(Configurations configurations) { public ConfigurationsDto(Configurations configurations) {
this.key = configurations.getConfig(); this.key = configurations.getKey();
this.value = configurations.getValue(); this.value = configurations.getValue();
this.description = configurations.getDescription(); this.description = configurations.getDescription();
this.isFrontEnd = configurations.getIsFrontEnd();
} }
} }
......
src/main/java/com/ic/modules/auth/payload/DTslabsDto.java 0 → 100644
package com.ic.modules.auth.payload;
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.ic.constant.RolesConstant;
import com.ic.constant.Status;
import com.ic.modules.auth.model.Configurations;
import com.ic.modules.auth.model.DTSlabsMapping;
import com.ic.modules.auth.model.FycMapping;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.ic.modules.auth.model.MpbMapping;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.ic.modules.auth.model.L1slabsMapping;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Setter
@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@JsonInclude(Include.NON_NULL)
public class DTslabsDto { // neel gosrani 27-05-2020 Activation DT CR
private Long Id;
private int maxval;
private int minval;
private int BA;
private int SBA;
private int CBA;
private int PBA;
private int Partner;
private int Senior_Partner;
public DTslabsDto(DTSlabsMapping dtslabsMapping) {
this.Id = dtslabsMapping.getId();
this.maxval = dtslabsMapping.getMaxval();
this.minval = dtslabsMapping.getMinval();
this.BA = dtslabsMapping.getBA();
this.SBA = dtslabsMapping.getSBA();
this.CBA = dtslabsMapping.getCBA();
this.PBA = dtslabsMapping.getPBA();
this.Partner = dtslabsMapping.getPartner();
this.Senior_Partner = dtslabsMapping.getSenior_Partner();
}
}
src/main/java/com/iRecruit/modules/auth/payload/IdDto.java → src/main/java/com/ic/modules/auth/payload/IdDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
......
src/main/java/com/iRecruit/modules/auth/payload/L1slabsDto.java → src/main/java/com/ic/modules/auth/payload/L1slabsDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.constant.RolesConstant; import com.ic.constant.RolesConstant;
import com.iRecruit.constant.Status; import com.ic.constant.Status;
import com.iRecruit.modules.auth.model.Configurations; import com.ic.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.model.FycMapping; import com.ic.modules.auth.model.FycMapping;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -19,7 +19,7 @@ import lombok.ToString; ...@@ -19,7 +19,7 @@ import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.modules.auth.model.MpbMapping; import com.ic.modules.auth.model.MpbMapping;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -30,7 +30,7 @@ import lombok.ToString; ...@@ -30,7 +30,7 @@ import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.modules.auth.model.L1slabsMapping; import com.ic.modules.auth.model.L1slabsMapping;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/iRecruit/modules/auth/payload/L2slabsDto.java → src/main/java/com/ic/modules/auth/payload/L2slabsDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.modules.auth.model.L2slabsMapping; import com.ic.modules.auth.model.L2slabsMapping;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/iRecruit/modules/auth/payload/MDBDto.java → src/main/java/com/ic/modules/auth/payload/MDBDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.modules.auth.model.MDBMapping; import com.ic.modules.auth.model.MDBMapping;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/iRecruit/modules/auth/payload/MsaDto.java → src/main/java/com/ic/modules/auth/payload/MsaDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.constant.RolesConstant; import com.ic.constant.RolesConstant;
import com.iRecruit.constant.Status; import com.ic.constant.Status;
import com.iRecruit.modules.auth.model.Configurations; import com.ic.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.model.FycMapping; import com.ic.modules.auth.model.FycMapping;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -20,8 +20,8 @@ import lombok.ToString; ...@@ -20,8 +20,8 @@ import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.modules.auth.model.MpbMapping; import com.ic.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.model.MsaMapping; import com.ic.modules.auth.model.MsaMapping;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/iRecruit/modules/auth/payload/OTPResponse.java → src/main/java/com/ic/modules/auth/payload/OTPResponse.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
......
src/main/java/com/iRecruit/modules/auth/payload/P100LoginResponse.java → src/main/java/com/ic/modules/auth/payload/P100LoginResponse.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
......
src/main/java/com/iRecruit/modules/auth/payload/RoleDto.java → src/main/java/com/ic/modules/auth/payload/RoleDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
......
src/main/java/com/iRecruit/modules/auth/payload/TemplatesDto.java → src/main/java/com/ic/modules/auth/payload/TemplatesDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import com.iRecruit.constant.TemplateType; import com.ic.constant.TemplateType;
import com.iRecruit.modules.auth.model.Templates; import com.ic.modules.auth.model.Templates;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
...@@ -28,7 +28,7 @@ public class TemplatesDto{ ...@@ -28,7 +28,7 @@ public class TemplatesDto{
private TemplateType type; private TemplateType type;
public TemplatesDto(Templates template) { public TemplatesDto(Templates template) {
this.key = template.getConfig(); this.key = template.getKey();
this.value = template.getValue(); this.value = template.getValue();
this.type = template.getType(); this.type = template.getType();
} }
......
src/main/java/com/iRecruit/modules/auth/payload/UserDto.java → src/main/java/com/ic/modules/auth/payload/UserDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import javax.persistence.EnumType; import javax.persistence.EnumType;
import javax.persistence.Enumerated; import javax.persistence.Enumerated;
...@@ -8,9 +8,9 @@ import javax.validation.constraints.Pattern; ...@@ -8,9 +8,9 @@ import javax.validation.constraints.Pattern;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.constant.RolesConstant; import com.ic.constant.RolesConstant;
import com.iRecruit.constant.Status; import com.ic.constant.Status;
import com.iRecruit.modules.auth.model.User; import com.ic.modules.auth.model.User;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -52,14 +52,14 @@ public class UserDto { ...@@ -52,14 +52,14 @@ public class UserDto {
private int failedAttemptLogin = 0; private int failedAttemptLogin = 0;
public UserDto(User user) { public UserDto(User user) {
this.id = user.getId(); this.id = user.getUserId();
// this.status = user.getStatus(); // this.status = user.getStatus();
this.name = user.getFirstName(); this.name = user.getFirstName();
this.mobileNumber = user.getMobileNo(); this.mobileNumber = user.getMobileNo();
this.email = user.getEmailId(); this.email = user.getEmailId();
this.notificationId = user.getNotificationId(); this.notificationId = user.getNotificationId();
this.failedAttemptLogin = user.getFailedAttemptLogin(); this.failedAttemptLogin = user.getFailedAttemptLogin();
this.role = user.getRole(); //this.role = user.getRole();
} }
} }
\ No newline at end of file
src/main/java/com/iRecruit/modules/auth/payload/UserOTPDto.java → src/main/java/com/ic/modules/auth/payload/UserOTPDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.constant.Status; import com.ic.constant.Status;
import com.iRecruit.modules.auth.model.UserOTP; import com.ic.modules.auth.model.UserOTP;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/iRecruit/modules/auth/payload/fycDto.java → src/main/java/com/ic/modules/auth/payload/fycDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.constant.RolesConstant; import com.ic.constant.RolesConstant;
import com.iRecruit.constant.Status; import com.ic.constant.Status;
import com.iRecruit.modules.auth.model.Configurations; import com.ic.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.model.FycMapping; import com.ic.modules.auth.model.FycMapping;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/iRecruit/modules/auth/payload/mpbDto.java → src/main/java/com/ic/modules/auth/payload/mpbDto.java
package com.iRecruit.modules.auth.payload; package com.ic.modules.auth.payload;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.constant.RolesConstant; import com.ic.constant.RolesConstant;
import com.iRecruit.constant.Status; import com.ic.constant.Status;
import com.iRecruit.modules.auth.model.Configurations; import com.ic.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.model.FycMapping; import com.ic.modules.auth.model.FycMapping;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -20,7 +20,7 @@ import lombok.ToString; ...@@ -20,7 +20,7 @@ import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.modules.auth.model.MpbMapping; import com.ic.modules.auth.model.MpbMapping;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/iRecruit/modules/auth/payload/request/ApiResponse.java → src/main/java/com/ic/modules/auth/payload/request/ApiResponse.java
package com.iRecruit.modules.auth.payload.request; package com.ic.modules.auth.payload.request;
import com.iRecruit.modules.auth.model.FycMapping; import com.ic.modules.auth.model.FycMapping;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
......
src/main/java/com/iRecruit/modules/auth/payload/request/Apiresponse1.java → src/main/java/com/ic/modules/auth/payload/request/Apiresponse1.java
package com.iRecruit.modules.auth.payload.request; package com.ic.modules.auth.payload.request;
import org.json.JSONObject; import org.json.JSONObject;
......
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