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 1535 additions and 799 deletions
.classpath
......@@ -18,7 +18,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</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>
<attribute name="maven.pomderived" value="true"/>
</attributes>
......
.gitignore
/target
.metadata
\ No newline at end of file
.project
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>iRecruit</name>
<name>incomeCalc</name>
<comment></comment>
<projects>
</projects>
......
.settings/org.eclipse.wst.common.component
<?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="/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/resources"/>
<property name="context-root" value="iRecruit"/>
<property name="java-output-path" value="/iRecruit/target/classes"/>
<property name="component.exclusion.patterns"/>
<property name="context-root" value="ic"/>
</wb-module>
</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"
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>
......@@ -9,14 +9,14 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com</groupId>
<artifactId>iRecruit</artifactId>
<artifactId>ic</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>iRecruit</name>
<name>incomeCalc</name>
<description>Demo project for Spring Boot</description>
<packaging>war</packaging>
<packaging>jar</packaging>
<properties>
<!--<start-class>com.iRecruit.IRecruitApplication</start-class>
<!--<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>
......@@ -29,9 +29,6 @@
<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>
......@@ -42,14 +39,6 @@
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.18</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
......@@ -61,12 +50,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -100,7 +89,13 @@
<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>
......@@ -214,6 +209,8 @@
<version>9.1.6</version>
<scope>compile</scope>
</dependency>
</dependencies>
<repositories>
......@@ -260,16 +257,13 @@
<build>
<directory>target</directory>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<outputDirectory>spring</outputDirectory>
<outputDirectory>E:\Streebo\Tata_Aia\Income_Calculator\wlp\usr\servers\incomeCalc\dropins\spring</outputDirectory>
<skipTests>true</skipTests>
<mainClass>com.iRecruit.IRecruitApplication</mainClass>
<mainClass>com.ic.IncomeCalcApplication</mainClass>
</configuration>
</plugin>
</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;
......@@ -18,15 +18,19 @@ import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableScheduling;
import com.iRecruit.audit.SpringSecurityAuditorAware;
import com.iRecruit.constant.DBConfig;
import com.iRecruit.constant.TemplateConfig;
import com.ic.audit.SpringSecurityAuditorAware;
import com.ic.constant.DBConfig;
import com.ic.constant.TemplateConfig;
//@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class, MultipartAutoConfiguration.class })
@SpringBootApplication
@EnableCaching
@EnableJpaAuditing(auditorAwareRef = "auditorAware")
public class IRecruitApplication {
@EntityScan(basePackageClasses = {
IncomeCalcApplication.class,
Jsr310JpaConverters.class
})
public class IncomeCalcApplication extends SpringBootServletInitializer {
@PostConstruct
......@@ -48,12 +52,17 @@ public class IRecruitApplication {
/*@Override
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) {
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.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.lang.reflect.Method;
......@@ -28,13 +28,13 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.modules.auth.payload.AuditLogsDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.payload.request.LoginRequest;
import com.iRecruit.modules.auth.service.AuditLogsService;
import com.iRecruit.security.UserPrincipal;
import com.ic.annotation.AuditLogs;
import com.ic.constant.StatusCode;
import com.ic.modules.auth.payload.AuditLogsDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.payload.request.LoginRequest;
import com.ic.modules.auth.service.AuditLogsService;
import com.ic.security.UserPrincipal;
@Aspect
@Component
......@@ -43,7 +43,7 @@ public class ServiceVersionAspect {
@Autowired
AuditLogsService auditLogsService;
@Around("@annotation(com.iRecruit.annotation.AuditLogs)")
@Around("@annotation(com.ic.annotation.AuditLogs)")
public ResponseEntity<?> auditLog(ProceedingJoinPoint joinPoint) throws Throwable {
long startTime = System.currentTimeMillis();
......@@ -106,7 +106,7 @@ public class ServiceVersionAspect {
AuditLogs name = method.getAnnotation(AuditLogs.class);
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(),
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;
......@@ -7,7 +7,7 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import com.iRecruit.security.UserPrincipal;
import com.ic.security.UserPrincipal;
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;
......@@ -20,11 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.request.WebRequest;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
import com.iRecruit.modules.auth.model.AuditLogs;
import com.iRecruit.modules.auth.payload.AuditLogsDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.AuditLogsService;
import com.iRecruit.security.UserPrincipal;
import com.ic.modules.auth.model.AuditLogs;
import com.ic.modules.auth.payload.AuditLogsDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.AuditLogsService;
import com.ic.security.UserPrincipal;
import lombok.extern.slf4j.Slf4j;
......
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.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 {
......
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 javax.annotation.Resource;
import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
import org.hibernate.cfg.AvailableSettings;
import org.springframework.beans.factory.annotation.Autowired;
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.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.Environment;
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.LocalContainerEntityManagerFactoryBean;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
......@@ -29,7 +31,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
entityManagerFactoryRef = "iRecruitSchemaEntityManagerFactory",
transactionManagerRef = "iRecruitSchemaTransactionManager",
basePackages = {
"com.iRecruit.modules.auth.repository",
"com.ic.modules.auth.repository"
})
//@Resource(name="jdbc/", type=javax.sql.DataSource.class, lookup="jdbc/fileUploadDS")
public class IRecruitSchemaConfig {
......@@ -43,25 +45,18 @@ public class IRecruitSchemaConfig {
private static final String JNDI_NAME = "jdbc/irecruit";
@Primary
@Bean(name = "iRecruitSchemaDataSource")
//@ConfigurationProperties(prefix = "irecruit.datasource")
//@Resource(name = JNDI_NAME)
@ConfigurationProperties(prefix = "irecruit.datasource")
@Resource(name = JNDI_NAME)
public DataSource iRecruitSchemaDataSource() {
//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.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.setPassword(environment.getProperty("irecruit.datasource.password"));
dataSource.setCatalog("irecruitCat");
*/
/*dataSource.setConnectionTimeout(Long.parseLong(environment.getProperty("spring.datasource.hikari.connectionTimeout")));
dataSource.setValidationTimeout(Long.parseLong(environment.getProperty("spring.datasource.hikari.validationTimeout")));
dataSource.setMaximumPoolSize(Integer.parseInt(environment.getProperty("spring.datasource.hikari.maximumPoolSize")));
......@@ -72,10 +67,10 @@ public class IRecruitSchemaConfig {
return dataSource;*/
/*JndiDataSourceLookup jndiDataSourceLookup = new JndiDataSourceLookup();
JndiDataSourceLookup jndiDataSourceLookup = new JndiDataSourceLookup();
jndiDataSourceLookup.setResourceRef(true);
return jndiDataSourceLookup.getDataSource(JNDI_NAME);
*/
//return DataSourceBuilder.create().build();
}
......@@ -86,7 +81,7 @@ public class IRecruitSchemaConfig {
LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
em.setDataSource(iRecruitSchemaDataSource());
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();
em.setJpaVendorAdapter(vendorAdapter);
......
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.util.Properties;
......
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.List;
......@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;
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 {
......
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;
......@@ -21,10 +21,10 @@ import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import com.iRecruit.security.AuthProvider;
import com.iRecruit.security.CustomUserDetailsService;
import com.iRecruit.security.JwtAuthenticationEntryPoint;
import com.iRecruit.security.JwtAuthenticationFilter;
import com.ic.security.AuthProvider;
import com.ic.security.CustomUserDetailsService;
import com.ic.security.JwtAuthenticationEntryPoint;
import com.ic.security.JwtAuthenticationFilter;
@Configuration
@EnableWebSecurity
......@@ -92,7 +92,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/**/*.css",
"/**/*.js")
.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()
.antMatchers("/api/userPhoto", "/api/user/checkEmailAvailability")
.permitAll()
......@@ -108,7 +108,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Bean
public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration configuration = new CorsConfiguration();
configuration.setAllowedOrigins(Arrays.asList("*"));
// configuration.setAllowedOrigins(Arrays.asList("*"));
configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
configuration.setAllowedHeaders(Arrays.asList("authorization", "content-type", "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;
......@@ -28,7 +28,7 @@ public class SwaggerConfig {
@Bean
public Docket productApi() {
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()))
.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.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.web.servlet.config.annotation.CorsRegistry;
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 {
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;
......@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.service.ConfigurationsService;
import com.ic.modules.auth.model.Configurations;
import com.ic.modules.auth.service.ConfigurationsService;
import groovy.util.logging.Log;
......@@ -35,7 +35,7 @@ public class DBConfig {
for(Configurations configuration : 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);
......
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 {
......
src/main/java/com/iRecruit/constant/LeaderCalcConfig.java → src/main/java/com/ic/constant/LeaderCalcConfig.java
package com.iRecruit.constant;
package com.ic.constant;
import java.util.List;
......@@ -11,20 +11,22 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.modules.auth.model.FycMapping;
import com.iRecruit.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.L2slabsMapping;
import com.iRecruit.modules.auth.model.MDBMapping;
import com.iRecruit.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.model.MsaMapping;
import com.iRecruit.modules.auth.model.Templates;
import com.iRecruit.modules.auth.service.FycMappingService;
import com.iRecruit.modules.auth.service.L1slabsMappingService;
import com.iRecruit.modules.auth.service.L2slabsMappingService;
import com.iRecruit.modules.auth.service.MDBMappingService;
import com.iRecruit.modules.auth.service.MpbMappingService;
import com.iRecruit.modules.auth.service.MsaMappingService;
import com.iRecruit.modules.auth.service.TemplatesService;
import com.ic.modules.auth.model.DTSlabsMapping;
import com.ic.modules.auth.model.FycMapping;
import com.ic.modules.auth.model.L1slabsMapping;
import com.ic.modules.auth.model.L2slabsMapping;
import com.ic.modules.auth.model.MDBMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.model.MsaMapping;
import com.ic.modules.auth.model.Templates;
import com.ic.modules.auth.service.DTslabsService;
import com.ic.modules.auth.service.FycMappingService;
import com.ic.modules.auth.service.L1slabsMappingService;
import com.ic.modules.auth.service.L2slabsMappingService;
import com.ic.modules.auth.service.MDBMappingService;
import com.ic.modules.auth.service.MpbMappingService;
import com.ic.modules.auth.service.MsaMappingService;
import com.ic.modules.auth.service.TemplatesService;
@Service
public class LeaderCalcConfig {
......@@ -44,10 +46,12 @@ public class LeaderCalcConfig {
private static JSONArray jarrayfyc;
private static JSONArray jarrayMsa;
private static JSONArray jarraydtslabs;
private static JSONObject LeaderMdbMapping;
private static JSONObject LeaderMsaMapping;
private static JSONObject LeaderdtMapping;
private static JSONArray jarrayl1slabs;
......@@ -71,6 +75,10 @@ public class LeaderCalcConfig {
@Autowired
MsaMappingService msaMappingService;
@Autowired
DTslabsService dtslabsService;
@PostConstruct
public void init() {
refreshConfig();
......@@ -84,6 +92,7 @@ public class LeaderCalcConfig {
List<L2slabsMapping> templatesl2slabs = l2slabsMappingService.findAll();
List<MDBMapping> templatesmdb = mdbMappingService.findAll();
List<MsaMapping> templatesmsa = msaMappingService.findAll();
List<DTSlabsMapping> templatesdtslabs = dtslabsService.findAll(); // neel gosrani 27-05-2020 Activation DT CR for creation JSON while server starts
LeaderMpbMappingJSon = new JSONObject();
LeaderFycMapping = new JSONObject();
......@@ -91,6 +100,7 @@ public class LeaderCalcConfig {
LeaderL2SlabsMapping = new JSONObject();
LeaderMdbMapping = new JSONObject();
LeaderMsaMapping = new JSONObject();
LeaderdtMapping = new JSONObject();
for (MpbMapping mpbMapping : templatesmpb) {
......@@ -121,9 +131,13 @@ public class LeaderCalcConfig {
jarrayMsa = new JSONArray(templatesmsa);
}
for (DTSlabsMapping dtSlabsMapping : templatesdtslabs) { // neel gosrani 27-05-2020 Activation DT CR for creation JSON while server starts
jarraydtslabs = new JSONArray(templatesdtslabs);
}
System.out.println("jarrayMsa");
System.out.println(jarrayMsa);
LeaderMpbMappingJSon.put("LeaderMpbMapping", jarray);
LeaderFycMapping.put("LeaderFycMapping", jarrayfyc);
......@@ -147,10 +161,10 @@ public class LeaderCalcConfig {
jarrayl2slabsconfig = LeaderL2SlabsMapping.getJSONArray("LeaderL2SlabsMapping");
jarrayMDBconfig = LeaderMdbMapping.getJSONArray("MPBMapping");
System.out.println(jarraympbconfig);
System.out.println(jarrayfycconfig);
System.out.println(jarrayl1slabsconfig);
System.out.println(jarrayMDBconfig);
// System.out.println(jarraympbconfig);
// System.out.println(jarrayfycconfig);
// System.out.println(jarrayl1slabsconfig);
// System.out.println(jarrayMDBconfig);
}
public JSONArray getValue(String key) {
......@@ -170,6 +184,9 @@ public class LeaderCalcConfig {
}
else if (key.equalsIgnoreCase("msa")) {
return jarrayMsa;
}
else if (key.equalsIgnoreCase("dtslabs")) { // neel gosrani 27-05-2020 Activation DT CR for creation JSON while server starts
return jarraydtslabs;
}else {
return null;
}
......
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
......
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 {
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 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;
......@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.modules.auth.model.Templates;
import com.iRecruit.modules.auth.service.TemplatesService;
import com.ic.modules.auth.model.Templates;
import com.ic.modules.auth.service.TemplatesService;
@Service
public class TemplateConfig {
......@@ -30,7 +30,7 @@ public class TemplateConfig {
List<Templates> templates = templatesService.findAll();
configs = new JSONObject();
for(Templates configuration : templates) {
configs.put(configuration.getConfig(), configuration.getValue());
configs.put(configuration.getKey(), configuration.getValue());
}
}
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 {
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 {
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.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.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 {
......
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.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.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.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.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.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.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.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;
......
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.util.Map;
......@@ -15,7 +15,7 @@ import com.google.firebase.messaging.Aps;
import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import com.google.firebase.messaging.Notification;
import com.iRecruit.modules.auth.model.PushNotificationRequest;
import com.ic.modules.auth.model.PushNotificationRequest;
@Service
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 {
......
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.Map;
......@@ -22,24 +22,24 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.User;
import com.iRecruit.modules.auth.payload.P100LoginResponse;
import com.iRecruit.modules.auth.payload.UserDto;
import com.iRecruit.modules.auth.payload.UserOTPDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.payload.request.JwtAuthenticationResponse;
import com.iRecruit.modules.auth.payload.request.LoginRequest;
import com.iRecruit.modules.auth.payload.request.OTPRequest;
import com.iRecruit.modules.auth.payload.request.OTPValidateRequest;
import com.iRecruit.modules.auth.payload.request.P100LoginRequest;
import com.iRecruit.modules.auth.service.UserService;
import com.iRecruit.security.AuthProvider;
import com.iRecruit.security.JwtTokenProvider;
import com.iRecruit.security.UserPrincipal;
import com.ic.annotation.AuditLogs;
import com.ic.constant.StatusCode;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.User;
import com.ic.modules.auth.payload.P100LoginResponse;
import com.ic.modules.auth.payload.UserDto;
import com.ic.modules.auth.payload.UserOTPDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.payload.request.JwtAuthenticationResponse;
import com.ic.modules.auth.payload.request.LoginRequest;
import com.ic.modules.auth.payload.request.OTPRequest;
import com.ic.modules.auth.payload.request.OTPValidateRequest;
import com.ic.modules.auth.payload.request.P100LoginRequest;
import com.ic.modules.auth.service.UserService;
import com.ic.security.AuthProvider;
import com.ic.security.JwtTokenProvider;
import com.ic.security.UserPrincipal;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -77,9 +77,14 @@ public class AuthController {
//DataSourceContextHolder.setDataSourceName("iRecruitSchemaDataSource");
Map<String, Object> returnUserObject = new HashMap<>();
String jwt;
if(loginRequest.getUsername().matches("[0-9]+")) {
loginRequest.setUsername(String.format("%09d", Integer.parseInt(loginRequest.getUsername())));
}
try {
UsernamePasswordAuthenticationToken authenticationObj = new UsernamePasswordAuthenticationToken(loginRequest.getUsername(), loginRequest.getPassword());
UsernamePasswordAuthenticationToken authenticationObj = new UsernamePasswordAuthenticationToken(loginRequest.getUsername(), loginRequest.getUserId());
authenticationObj.setDetails(loginRequest);
Authentication authentication = authenticationManager.authenticate(authenticationObj);
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;
......@@ -17,14 +17,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.DBConfig;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.payload.ConfigurationsDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.ConfigurationsService;
import com.ic.annotation.AuditLogs;
import com.ic.constant.DBConfig;
import com.ic.constant.StatusCode;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.Configurations;
import com.ic.modules.auth.payload.ConfigurationsDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.ConfigurationsService;
import io.swagger.annotations.Api;
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;
......@@ -17,17 +17,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.DBConfig;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.model.FycMapping;
import com.iRecruit.modules.auth.payload.ConfigurationsDto;
import com.iRecruit.modules.auth.payload.fycDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.ConfigurationsService;
import com.iRecruit.modules.auth.service.FycMappingService;
import com.ic.annotation.AuditLogs;
import com.ic.constant.DBConfig;
import com.ic.constant.StatusCode;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.Configurations;
import com.ic.modules.auth.model.FycMapping;
import com.ic.modules.auth.payload.ConfigurationsDto;
import com.ic.modules.auth.payload.fycDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.ConfigurationsService;
import com.ic.modules.auth.service.FycMappingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -56,8 +56,8 @@ public class FycMappingController {
@ApiOperation("Create fycmapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create fycmapping")
public ResponseEntity<?> createFycmapping(@RequestBody fycDto fycMapping) {
System.out.println("in fyc contrroler");
System.out.println("in fycmapping");
// System.out.println("in fyc contrroler");
// System.out.println("in fycmapping");
FycMapping fyc = null;
try {
fyc = fycMappingService.save(fycMapping,true);
......@@ -77,8 +77,8 @@ public class FycMappingController {
@ApiOperation("update 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
System.out.println("in fyc contrroler");
System.out.println("in fycmapping");
// System.out.println("in fyc contrroler");
// System.out.println("in fycmapping");
FycMapping fycupdate = null;
try {
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;
......@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
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;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.L1slabsMappingService;
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.L1slabsMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.payload.L1slabsDto;
import com.ic.modules.auth.payload.mpbDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.L1slabsMappingService;
import io.swagger.annotations.Api;
......@@ -54,8 +54,8 @@ public class L1slabsMappingController {
@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
public ResponseEntity<?> createL1slabsmapping(@RequestBody L1slabsDto l1slabsmapping) {
System.out.println("in l1salbsmapping contrroler");
System.out.println("in l1salbsmapping");
// System.out.println("in l1salbsmapping contrroler");
// System.out.println("in l1salbsmapping");
L1slabsMapping l1 = null;
try {
l1 = l1slabsMappingService.save(l1slabsmapping,true);
......@@ -76,8 +76,8 @@ public class L1slabsMappingController {
@ApiOperation("update l1salbsmapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create l1salbsmapping")
public ResponseEntity<?> updateL1slabsmapping(@RequestBody L1slabsDto l1slabsmapping) {
System.out.println("in l1salbsmapping contrroler");
System.out.println("in l1salbsmapping");
// System.out.println("in l1salbsmapping contrroler");
// System.out.println("in l1salbsmapping");
L1slabsMapping l1 = null;
try {
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;
......@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.L2slabsMapping;
import com.iRecruit.modules.auth.payload.L1slabsDto;
import com.iRecruit.modules.auth.payload.L2slabsDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.L2slabsMappingService;
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.L1slabsMapping;
import com.ic.modules.auth.model.L2slabsMapping;
import com.ic.modules.auth.payload.L1slabsDto;
import com.ic.modules.auth.payload.L2slabsDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.L2slabsMappingService;
import io.swagger.annotations.Api;
......@@ -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
public ResponseEntity<?> createL1slabsmapping(@RequestBody L2slabsDto l2slabsmapping) {
System.out.println("in l2salbsmapping contrroler");
System.out.println("in l2salbsmapping");
// System.out.println("in l2salbsmapping contrroler");
// System.out.println("in l2salbsmapping");
L2slabsMapping l2 = null;
try {
l2 = l2slabsMappingService.save(l2slabsmapping,true);
......@@ -78,8 +78,8 @@ public class L2slabsMappingController {
@ApiOperation("update l2salbsmapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create l2salbsmapping")
public ResponseEntity<?> updateL1slabsmapping(@RequestBody L2slabsDto l2slabsmapping) {
System.out.println("in l2salbsmapping contrroler");
System.out.println("in l2salbsmapping");
// System.out.println("in l2salbsmapping contrroler");
// System.out.println("in l2salbsmapping");
L2slabsMapping l2 = null;
try {
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;
......@@ -21,21 +21,22 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.json.JSONException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
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;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.payload.request.Apiresponse1;
import com.iRecruit.modules.auth.service.L1slabsMappingService;
import com.iRecruit.modules.auth.service.LeaderCalcService;
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.L1slabsMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.payload.L1slabsDto;
import com.ic.modules.auth.payload.mpbDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.payload.request.Apiresponse1;
import com.ic.modules.auth.service.L1slabsMappingService;
import com.ic.modules.auth.service.LeaderCalcService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -55,8 +56,8 @@ public class LeaderCalc {
//Neel – 20-Apr-2020 – Tata - Leader calculation – Added method for calculation of leader sheet
public ResponseEntity<?> Calculate(@RequestBody Map<String, Object> lookupRequestObject) throws JsonProcessingException {
System.out.println("in fyc contrroler");
System.out.println("in fycmapping");
// System.out.println("in fyc contrroler");
// System.out.println("in fycmapping");
ObjectMapper mapper = new ObjectMapper();
String data = mapper.writeValueAsString(lookupRequestObject);
......@@ -66,10 +67,16 @@ public class LeaderCalc {
try {
System.out.println("in try");
// System.out.println("in try");
// Yashvant - 16 May 2020 - 0000 - Validation For JSON Keys ( < , > )
if( checkValidation(data) ) {
calc = leaderCalcService.calculate(data);
System.out.println("after operation calc");
System.out.println(calc);
}
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 {
calc = new JSONObject();
calc.put("Error_Code", "503");
calc.put("Error_Message", "Technical Error caught while calculating");
System.out.println(e);
// System.out.println(e);
e.printStackTrace();
return new ResponseEntity(new ApiResponse(StatusCode.RESOURCE_NOT_FOUND, true, "calculation failed", calc), HttpStatus.NOT_FOUND);
}catch(Exception e) {
......@@ -86,7 +93,7 @@ public class LeaderCalc {
calc.put("Error_Code", "503");
calc.put("Error_Message", "Technical Error caught while calculating");
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);
}
......@@ -94,5 +101,26 @@ public class LeaderCalc {
//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;
......@@ -17,21 +17,21 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.L2slabsMapping;
import com.iRecruit.modules.auth.model.MDBMapping;
import com.iRecruit.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.payload.L1slabsDto;
import com.iRecruit.modules.auth.payload.L2slabsDto;
import com.iRecruit.modules.auth.payload.MDBDto;
import com.iRecruit.modules.auth.payload.mpbDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.MDBMappingService;
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.L1slabsMapping;
import com.ic.modules.auth.model.L2slabsMapping;
import com.ic.modules.auth.model.MDBMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.payload.L1slabsDto;
import com.ic.modules.auth.payload.L2slabsDto;
import com.ic.modules.auth.payload.MDBDto;
import com.ic.modules.auth.payload.mpbDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.MDBMappingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -62,8 +62,8 @@ public class MDBMappingController {
@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
public ResponseEntity<?> createmdbsmapping(@RequestBody MDBDto mdbmapping) {
System.out.println("in mdb contrroler");
System.out.println("in mdbmapping");
// System.out.println("in mdb contrroler");
// System.out.println("in mdbmapping");
MDBMapping mdb = null;
try {
mdb = mdbMappingService.save(mdbmapping,true);
......@@ -83,8 +83,8 @@ public class MDBMappingController {
@ApiOperation("update mdbmapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create mdbmapping")
public ResponseEntity<?> updatemdbsmapping(@RequestBody MDBDto mdbmapping) {
System.out.println("in mdb contrroler");
System.out.println("in mdbmapping");
// System.out.println("in mdb contrroler");
// System.out.println("in mdbmapping");
MDBMapping mdb = null;
try {
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;
......@@ -17,17 +17,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.payload.fycDto;
import com.iRecruit.modules.auth.payload.mpbDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.FycMappingService;
import com.iRecruit.modules.auth.service.MpbMappingService;
import com.iRecruit.modules.auth.model.FycMapping;
import com.iRecruit.modules.auth.model.MpbMapping;
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.payload.fycDto;
import com.ic.modules.auth.payload.mpbDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.FycMappingService;
import com.ic.modules.auth.service.MpbMappingService;
import com.ic.modules.auth.model.FycMapping;
import com.ic.modules.auth.model.MpbMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -55,8 +55,8 @@ public class MpbMappingController {
@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
public ResponseEntity<?> createMpbmapping(@RequestBody mpbDto mpbMapping) {
System.out.println("in mpb contrroler");
System.out.println("in mpbmapping");
// System.out.println("in mpb contrroler");
// System.out.println("in mpbmapping");
MpbMapping mpb = null;
try {
mpb = mpbMappingService.save(mpbMapping,true);
......@@ -75,8 +75,8 @@ public class MpbMappingController {
@ApiOperation("update mpbmapping")
@AuditLogs(isRequest = true, isResponse = true,service="update mpbmapping")
public ResponseEntity<?> updateMpbmapping(@RequestBody mpbDto mpbMapping) {
System.out.println("in mpb contrroler");
System.out.println("in mpbmapping");
// System.out.println("in mpb contrroler");
// System.out.println("in mpbmapping");
MpbMapping mpb = null;
try {
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;
......@@ -17,24 +17,24 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L1slabsMapping;
import com.iRecruit.modules.auth.model.L2slabsMapping;
import com.iRecruit.modules.auth.model.MDBMapping;
import com.iRecruit.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.model.MsaMapping;
import com.iRecruit.modules.auth.payload.L1slabsDto;
import com.iRecruit.modules.auth.payload.L2slabsDto;
import com.iRecruit.modules.auth.payload.MDBDto;
import com.iRecruit.modules.auth.payload.MsaDto;
import com.iRecruit.modules.auth.payload.mpbDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
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.L1slabsMapping;
import com.ic.modules.auth.model.L2slabsMapping;
import com.ic.modules.auth.model.MDBMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.model.MsaMapping;
import com.ic.modules.auth.payload.L1slabsDto;
import com.ic.modules.auth.payload.L2slabsDto;
import com.ic.modules.auth.payload.MDBDto;
import com.ic.modules.auth.payload.MsaDto;
import com.ic.modules.auth.payload.mpbDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.MDBMappingService;
import com.iRecruit.modules.auth.service.MsaMappingService;
import com.ic.modules.auth.service.MDBMappingService;
import com.ic.modules.auth.service.MsaMappingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -60,8 +60,8 @@ public class MsaMappingController {
@ApiOperation("Create msamapping")
@AuditLogs(isRequest = true, isResponse = true,service="Create msamapping")
public ResponseEntity<?> createMsamapping(@RequestBody MsaDto msaMapping) {
System.out.println("in mpb contrroler");
System.out.println("in mpbmapping");
// System.out.println("in mpb contrroler");
// System.out.println("in mpbmapping");
MsaMapping msa = null;
try {
msa = msaMappingService.save(msaMapping,true);
......@@ -82,8 +82,8 @@ public class MsaMappingController {
@ApiOperation("Create msamapping")
@AuditLogs(isRequest = true, isResponse = true,service="update msamapping")
public ResponseEntity<?>updateMsamapping(@RequestBody MsaDto msaMapping) {
System.out.println("in mpb contrroler");
System.out.println("in mpbmapping");
// System.out.println("in mpb contrroler");
// System.out.println("in mpbmapping");
MsaMapping msa = null;
try {
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.Map;
......@@ -25,18 +25,18 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
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;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.L1slabsMappingService;
import com.iRecruit.modules.auth.service.LeaderCalcService;
import com.iRecruit.modules.auth.service.NGPACalcService;
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.L1slabsMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.payload.L1slabsDto;
import com.ic.modules.auth.payload.mpbDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.L1slabsMappingService;
import com.ic.modules.auth.service.LeaderCalcService;
import com.ic.modules.auth.service.NGPACalcService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -56,7 +56,7 @@ public class NGPACalc {
@AuditLogs(isRequest = true, isResponse = true,service="Ngpa service")
@JsonSerialize
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();
......@@ -66,15 +66,15 @@ public class NGPACalc {
JSONObject calc = null;
try {
System.out.println("in try");
// System.out.println("in try");
calc = nGPACalcService.prepareAllFormula(requestJSON);
System.out.println("after operation calc");
System.out.println(calc);
// System.out.println("after operation calc");
// System.out.println(calc);
result =new HashMap<String, Object>();
result.put("response", calc);
System.out.println(result);
// System.out.println(result);
}catch(ResourceNotFoundException e) {
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.Map;
......@@ -21,22 +21,23 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.json.JSONException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
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;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.L1slabsMappingService;
import com.iRecruit.modules.auth.service.LeaderCalcService;
import com.iRecruit.modules.auth.service.NGPAtoNGPLCalcService;
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.L1slabsMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.payload.L1slabsDto;
import com.ic.modules.auth.payload.mpbDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.L1slabsMappingService;
import com.ic.modules.auth.service.LeaderCalcService;
import com.ic.modules.auth.service.NGPAtoNGPLCalcService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -55,7 +56,7 @@ public class NGPAtoNGPLCalc {
@AuditLogs(isRequest = true, isResponse = true,service="ngpatongplcalc")
@JsonSerialize
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();
......@@ -65,15 +66,21 @@ public class NGPAtoNGPLCalc {
JSONObject calc = null;
try {
System.out.println("in try");
// System.out.println("in try");
// Yashvant - 16 May 2020 - 0000 - Validation For JSON Keys ( < , > )
if( checkValidation(requestJSON) ) {
calc = nGPAtoNGPLCalcService.prepareAllFormula(requestJSON);
System.out.println("after operation calc");
System.out.println(calc);
}
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.put("response", calc);
System.out.println(result);
// System.out.println(result);
}catch(ResourceNotFoundException e) {
e.printStackTrace();
......@@ -88,4 +95,28 @@ public class NGPAtoNGPLCalc {
//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;
......@@ -11,14 +11,14 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.DBConfig;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.Templates;
import com.iRecruit.modules.auth.payload.TemplatesDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.TemplatesService;
import com.ic.annotation.AuditLogs;
import com.ic.constant.DBConfig;
import com.ic.constant.StatusCode;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.Templates;
import com.ic.modules.auth.payload.TemplatesDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.TemplatesService;
import io.swagger.annotations.Api;
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;
......@@ -17,13 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.iRecruit.annotation.AuditLogs;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.User;
import com.iRecruit.modules.auth.payload.UserDto;
import com.iRecruit.modules.auth.payload.request.ApiResponse;
import com.iRecruit.modules.auth.service.UserService;
import com.ic.annotation.AuditLogs;
import com.ic.constant.StatusCode;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.User;
import com.ic.modules.auth.payload.UserDto;
import com.ic.modules.auth.payload.request.ApiResponse;
import com.ic.modules.auth.service.UserService;
import io.swagger.annotations.Api;
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;
......@@ -9,7 +9,7 @@ import javax.persistence.Id;
import javax.persistence.Table;
import com.iRecruit.modules.auth.payload.AuditLogsDto;
import com.ic.modules.auth.payload.AuditLogsDto;
import lombok.AllArgsConstructor;
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;
......
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.Entity;
......@@ -26,7 +26,7 @@ public class Configurations{
@NotBlank
@Column(length=50)
private String config;
private String key;
@NotBlank
@Column(length=500)
......@@ -34,5 +34,7 @@ public class Configurations{
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.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.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.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.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.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.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 {
......
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 {
......
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.Entity;
import javax.persistence.EntityListeners;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
......@@ -12,9 +11,7 @@ import javax.persistence.Lob;
import javax.persistence.Table;
import javax.validation.constraints.NotBlank;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import com.iRecruit.constant.TemplateType;
import com.ic.constant.TemplateType;
import lombok.Getter;
import lombok.Setter;
......@@ -30,7 +27,7 @@ public class Templates{
@NotBlank
@Column(length=50)
private String config;
private String key;
@NotBlank
@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;
......@@ -12,8 +12,7 @@ import javax.persistence.Table;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import com.iRecruit.constant.RolesConstant;
import com.iRecruit.constant.Status;
import com.ic.constant.Status;
import lombok.Getter;
import lombok.Setter;
......@@ -25,11 +24,8 @@ import lombok.Setter;
@EntityListeners(AuditingEntityListener.class)
public class User {
@Id
@Column(length=10)
private String id;
@Column(length=11)
@Id
private String userId;
@Column(length=200)
private String firstName;
......@@ -54,11 +50,11 @@ public class User {
@Column(length=8)
private Timestamp modifiedDate;
@Column(length=11)
private String level1NtId;
private String level1_NtId;
@Column(length=11)
private String level5NtId;
private String level5_NtId;
@Column(length=3)
private String level1DesignationCode;
private String level1_DesignationCode;
@Column(length=5)
private String branchCode;
@Column(length=100)
......@@ -70,58 +66,37 @@ public class User {
@Column(length=63)
private String userRole2;
@Column(length=30)
private String level2DesignationC0de;
private String level2_DesignationC0de;
@Column(length=30)
private String branchCdLevel2;
@Column(length=63)
private String userRole3;
@Column(length=30)
private String level3DesignationC0de;
private String level3_DesignationC0de;
@Column(length=30)
private String branchCdLevel3;
@Column(length=63)
private String userRole4;
@Column(length=30)
private String level4DesignationC0de;
private String level4_DesignationC0de;
@Column(length=30)
private String branchCdLevel4;
@Column(length=63)
private String userRole5;
@Column(length=30)
private String level5DesignationC0de;
private String level5_DesignationC0de;
@Column(length=30)
private String branchCdLevel5;
@Column(length=10)
private String baType;
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)
private String pan;
@Column(length=1)
private String agentStatus;
private String employeeId;
@Enumerated(EnumType.STRING)
protected Status status = Status.ACTIVE;
@Enumerated(EnumType.STRING)
private RolesConstant role = RolesConstant.LEADER;
@Column(length=10)
private String notificationId;
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.Entity;
......@@ -16,8 +16,8 @@ import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Parameter;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import com.iRecruit.config.IdGenerator;
import com.iRecruit.constant.Status;
import com.ic.config.IdGenerator;
import com.ic.constant.Status;
import lombok.Getter;
import lombok.Setter;
......@@ -33,7 +33,7 @@ public class UserOTP extends Auditable<Long>{
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "user_otp_seq")
@GenericGenerator(
name = "user_otp_seq",
strategy = "com.iRecruit.config.IdGenerator",
strategy = "com.ic.config.IdGenerator",
parameters = {
@Parameter(name = IdGenerator.INCREMENT_PARAM, value = "1"),
@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.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 com.iRecruit.modules.auth.model.Configurations;
import com.ic.modules.auth.model.Configurations;
import lombok.AllArgsConstructor;
import lombok.Getter;
......@@ -25,10 +25,13 @@ public class ConfigurationsDto{
private String description;
private String isFrontEnd;
public ConfigurationsDto(Configurations configurations) {
this.key = configurations.getConfig();
this.key = configurations.getKey();
this.value = configurations.getValue();
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.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 com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.constant.RolesConstant;
import com.iRecruit.constant.Status;
import com.iRecruit.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.model.FycMapping;
import com.ic.constant.RolesConstant;
import com.ic.constant.Status;
import com.ic.modules.auth.model.Configurations;
import com.ic.modules.auth.model.FycMapping;
import lombok.AllArgsConstructor;
import lombok.Builder;
......@@ -19,7 +19,7 @@ import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonInclude;
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.Builder;
......@@ -30,7 +30,7 @@ import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.modules.auth.model.L1slabsMapping;
import com.ic.modules.auth.model.L1slabsMapping;
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.Include;
import com.iRecruit.modules.auth.model.L2slabsMapping;
import com.ic.modules.auth.model.L2slabsMapping;
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.Include;
import com.iRecruit.modules.auth.model.MDBMapping;
import com.ic.modules.auth.model.MDBMapping;
import lombok.AllArgsConstructor;
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 com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.constant.RolesConstant;
import com.iRecruit.constant.Status;
import com.iRecruit.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.model.FycMapping;
import com.ic.constant.RolesConstant;
import com.ic.constant.Status;
import com.ic.modules.auth.model.Configurations;
import com.ic.modules.auth.model.FycMapping;
import lombok.AllArgsConstructor;
import lombok.Builder;
......@@ -20,8 +20,8 @@ import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.model.MsaMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.model.MsaMapping;
import lombok.AllArgsConstructor;
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.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.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.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 com.iRecruit.constant.TemplateType;
import com.iRecruit.modules.auth.model.Templates;
import com.ic.constant.TemplateType;
import com.ic.modules.auth.model.Templates;
import lombok.AllArgsConstructor;
import lombok.Getter;
......@@ -28,7 +28,7 @@ public class TemplatesDto{
private TemplateType type;
public TemplatesDto(Templates template) {
this.key = template.getConfig();
this.key = template.getKey();
this.value = template.getValue();
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.Enumerated;
......@@ -8,9 +8,9 @@ import javax.validation.constraints.Pattern;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.constant.RolesConstant;
import com.iRecruit.constant.Status;
import com.iRecruit.modules.auth.model.User;
import com.ic.constant.RolesConstant;
import com.ic.constant.Status;
import com.ic.modules.auth.model.User;
import lombok.AllArgsConstructor;
import lombok.Builder;
......@@ -52,14 +52,14 @@ public class UserDto {
private int failedAttemptLogin = 0;
public UserDto(User user) {
this.id = user.getId();
this.id = user.getUserId();
// this.status = user.getStatus();
this.name = user.getFirstName();
this.mobileNumber = user.getMobileNo();
this.email = user.getEmailId();
this.notificationId = user.getNotificationId();
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.Include;
import com.iRecruit.constant.Status;
import com.iRecruit.modules.auth.model.UserOTP;
import com.ic.constant.Status;
import com.ic.modules.auth.model.UserOTP;
import lombok.AllArgsConstructor;
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 com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.constant.RolesConstant;
import com.iRecruit.constant.Status;
import com.iRecruit.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.model.FycMapping;
import com.ic.constant.RolesConstant;
import com.ic.constant.Status;
import com.ic.modules.auth.model.Configurations;
import com.ic.modules.auth.model.FycMapping;
import lombok.AllArgsConstructor;
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 com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.iRecruit.constant.RolesConstant;
import com.iRecruit.constant.Status;
import com.iRecruit.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.model.FycMapping;
import com.ic.constant.RolesConstant;
import com.ic.constant.Status;
import com.ic.modules.auth.model.Configurations;
import com.ic.modules.auth.model.FycMapping;
import lombok.AllArgsConstructor;
import lombok.Builder;
......@@ -20,7 +20,7 @@ import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonInclude;
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.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.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;
......
src/main/java/com/iRecruit/modules/auth/payload/request/Condition.java → src/main/java/com/ic/modules/auth/payload/request/Condition.java
package com.iRecruit.modules.auth.payload.request;
package com.ic.modules.auth.payload.request;
import java.util.List;
......
src/main/java/com/iRecruit/modules/auth/payload/request/JwtAuthenticationResponse.java → src/main/java/com/ic/modules/auth/payload/request/JwtAuthenticationResponse.java
package com.iRecruit.modules.auth.payload.request;
package com.ic.modules.auth.payload.request;
import lombok.Getter;
import lombok.Setter;
......
src/main/java/com/iRecruit/modules/auth/payload/request/JwtCustomPayload.java → src/main/java/com/ic/modules/auth/payload/request/JwtCustomPayload.java
package com.iRecruit.modules.auth.payload.request;
package com.ic.modules.auth.payload.request;
/*
* package com.iRecruit.payload;
* package com.ic.payload;
*
* import java.util.Set;
*
......
src/main/java/com/iRecruit/modules/auth/payload/request/LoginRequest.java → src/main/java/com/ic/modules/auth/payload/request/LoginRequest.java
package com.iRecruit.modules.auth.payload.request;
package com.ic.modules.auth.payload.request;
import javax.validation.constraints.NotBlank;
......@@ -14,8 +14,8 @@ public class LoginRequest {
@NotBlank
private String username;
@NotBlank
private String password;
// @NotBlank
private String userId;
private String notificationId;
......
src/main/java/com/iRecruit/modules/auth/payload/request/OTPRequest.java → src/main/java/com/ic/modules/auth/payload/request/OTPRequest.java
package com.iRecruit.modules.auth.payload.request;
package com.ic.modules.auth.payload.request;
import lombok.Getter;
import lombok.Setter;
......
src/main/java/com/iRecruit/modules/auth/payload/request/OTPValidateRequest.java → src/main/java/com/ic/modules/auth/payload/request/OTPValidateRequest.java
package com.iRecruit.modules.auth.payload.request;
package com.ic.modules.auth.payload.request;
import lombok.Getter;
import lombok.Setter;
......
src/main/java/com/iRecruit/modules/auth/payload/request/P100LoginRequest.java → src/main/java/com/ic/modules/auth/payload/request/P100LoginRequest.java
package com.iRecruit.modules.auth.payload.request;
package com.ic.modules.auth.payload.request;
import lombok.Getter;
import lombok.Setter;
......
src/main/java/com/iRecruit/modules/auth/payload/request/PaginationRequest.java → src/main/java/com/ic/modules/auth/payload/request/PaginationRequest.java
package com.iRecruit.modules.auth.payload.request;
package com.ic.modules.auth.payload.request;
import java.util.ArrayList;
import java.util.List;
......
src/main/java/com/iRecruit/modules/auth/payload/request/SignUpRequest.java → src/main/java/com/ic/modules/auth/payload/request/SignUpRequest.java
package com.iRecruit.modules.auth.payload.request;
package com.ic.modules.auth.payload.request;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotNull;
......
src/main/java/com/iRecruit/modules/auth/payload/request/UpdateTenantRequest.java → src/main/java/com/ic/modules/auth/payload/request/UpdateTenantRequest.java
package com.iRecruit.modules.auth.payload.request;
package com.ic.modules.auth.payload.request;
import javax.validation.constraints.NotNull;
......
src/main/java/com/iRecruit/modules/auth/payload/request/setTenantRequest.java → src/main/java/com/ic/modules/auth/payload/request/setTenantRequest.java
package com.iRecruit.modules.auth.payload.request;
package com.ic.modules.auth.payload.request;
import javax.validation.constraints.NotNull;
......
src/main/java/com/iRecruit/modules/auth/repository/AuditLogsRepository.java → src/main/java/com/ic/modules/auth/repository/AuditLogsRepository.java
package com.iRecruit.modules.auth.repository;
package com.ic.modules.auth.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import com.iRecruit.modules.auth.model.AuditLogs;
import com.ic.modules.auth.model.AuditLogs;
public interface AuditLogsRepository extends JpaRepository<AuditLogs, Long> {
......
src/main/java/com/iRecruit/modules/auth/repository/ConfigurationsRepository.java → src/main/java/com/ic/modules/auth/repository/ConfigurationsRepository.java
package com.iRecruit.modules.auth.repository;
package com.ic.modules.auth.repository;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import com.iRecruit.modules.auth.model.Configurations;
import com.ic.modules.auth.model.Configurations;
public interface ConfigurationsRepository extends JpaRepository<Configurations, Long>{
Optional<Configurations> findByConfig(String key);
Optional<Configurations> findByKey(String key);
}
src/main/java/com/ic/modules/auth/repository/DTslabsRepository.java 0 → 100644
package com.ic.modules.auth.repository;
import java.util.Optional;
import org.hibernate.boot.jaxb.internal.stax.LocalXmlResourceResolver.DtdMapping;
import org.springframework.data.jpa.repository.JpaRepository;
import com.ic.modules.auth.model.DTSlabsMapping;
//neel gosrani 27-05-2020 Activation DT CR
public interface DTslabsRepository extends JpaRepository<DTSlabsMapping, Long>{
Optional<DTSlabsMapping> findById(String key);
}
src/main/java/com/iRecruit/modules/auth/repository/FycRepository.java → src/main/java/com/ic/modules/auth/repository/FycRepository.java
package com.iRecruit.modules.auth.repository;
package com.ic.modules.auth.repository;
import java.util.Optional;
......@@ -6,7 +6,7 @@ import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import com.iRecruit.modules.auth.model.FycMapping;
import com.ic.modules.auth.model.FycMapping;
......
src/main/java/com/iRecruit/modules/auth/repository/L1slabsRepository.java → src/main/java/com/ic/modules/auth/repository/L1slabsRepository.java
package com.iRecruit.modules.auth.repository;
package com.ic.modules.auth.repository;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import com.iRecruit.modules.auth.model.L1slabsMapping;
import com.ic.modules.auth.model.L1slabsMapping;
public interface L1slabsRepository extends JpaRepository<L1slabsMapping, Long> {
......
src/main/java/com/iRecruit/modules/auth/repository/L2slabsRepository.java → src/main/java/com/ic/modules/auth/repository/L2slabsRepository.java
package com.iRecruit.modules.auth.repository;
package com.ic.modules.auth.repository;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import com.iRecruit.modules.auth.model.L2slabsMapping;
import com.ic.modules.auth.model.L2slabsMapping;
public interface L2slabsRepository extends JpaRepository<L2slabsMapping, Long> {
......
src/main/java/com/iRecruit/modules/auth/repository/MDBRepository.java → src/main/java/com/ic/modules/auth/repository/MDBRepository.java
package com.iRecruit.modules.auth.repository;
package com.ic.modules.auth.repository;
import java.util.Optional;
......@@ -6,7 +6,7 @@ import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import com.iRecruit.modules.auth.model.MDBMapping;
import com.ic.modules.auth.model.MDBMapping;
public interface MDBRepository extends JpaRepository<MDBMapping, Long> {
......
src/main/java/com/iRecruit/modules/auth/repository/MpbRepository.java → src/main/java/com/ic/modules/auth/repository/MpbRepository.java
package com.iRecruit.modules.auth.repository;
package com.ic.modules.auth.repository;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import com.iRecruit.modules.auth.model.MpbMapping;
import com.ic.modules.auth.model.MpbMapping;
public interface MpbRepository extends JpaRepository<MpbMapping, Long> {
......
src/main/java/com/iRecruit/modules/auth/repository/MsaRepository.java → src/main/java/com/ic/modules/auth/repository/MsaRepository.java
package com.iRecruit.modules.auth.repository;
package com.ic.modules.auth.repository;
import java.util.Optional;
......@@ -6,7 +6,7 @@ import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import com.iRecruit.modules.auth.model.MsaMapping;
import com.ic.modules.auth.model.MsaMapping;
public interface MsaRepository extends JpaRepository<MsaMapping, Long>{
......
src/main/java/com/iRecruit/modules/auth/repository/TemplatesRepository.java → src/main/java/com/ic/modules/auth/repository/TemplatesRepository.java
package com.iRecruit.modules.auth.repository;
package com.ic.modules.auth.repository;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import com.iRecruit.modules.auth.model.Templates;
import com.ic.modules.auth.model.Templates;
public interface TemplatesRepository extends JpaRepository<Templates, Long>{
Optional<Templates> findByConfig(String key);
Optional<Templates> findByKey(String key);
}
src/main/java/com/iRecruit/modules/auth/repository/UserOTPRepository.java → src/main/java/com/ic/modules/auth/repository/UserOTPRepository.java
package com.iRecruit.modules.auth.repository;
package com.ic.modules.auth.repository;
import java.sql.Timestamp;
......@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import com.iRecruit.modules.auth.model.UserOTP;
import com.ic.modules.auth.model.UserOTP;
public interface UserOTPRepository extends JpaRepository<UserOTP, String>, JpaSpecificationExecutor<UserOTP>{
......
src/main/java/com/iRecruit/modules/auth/repository/UserRepository.java → src/main/java/com/ic/modules/auth/repository/UserRepository.java
package com.iRecruit.modules.auth.repository;
package com.ic.modules.auth.repository;
import java.util.List;
import java.util.Optional;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.data.jpa.repository.JpaRepository;
import com.iRecruit.modules.auth.model.User;
import com.ic.modules.auth.model.User;
public interface UserRepository extends JpaRepository<User, String>{
// List<User> findAll();
/*List<User> findByName(String name);*/
Optional<User> findById(String id);
List<User> findByIdIn(List<Long> ids);
// Optional<User> findByUserId(String id);
// List<User> findByUserIdIn(List<Long> ids);
@Query(value = "SELECT * FROM NAAF_USER_DETAIL u where TRIM(UPPER(u.USER_ID))=UPPER(:id)", nativeQuery = true)
User findByUserId(@Param("id") String id);
}
src/main/java/com/iRecruit/modules/auth/service/AuditLogsService.java → src/main/java/com/ic/modules/auth/service/AuditLogsService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import com.iRecruit.modules.auth.model.AuditLogs;
import com.iRecruit.modules.auth.payload.AuditLogsDto;
import com.ic.modules.auth.model.AuditLogs;
import com.ic.modules.auth.payload.AuditLogsDto;
public interface AuditLogsService {
......
src/main/java/com/iRecruit/modules/auth/service/ConfigurationsService.java → src/main/java/com/ic/modules/auth/service/ConfigurationsService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import java.util.List;
import com.iRecruit.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.payload.ConfigurationsDto;
import com.ic.modules.auth.model.Configurations;
import com.ic.modules.auth.payload.ConfigurationsDto;
public interface ConfigurationsService {
......
src/main/java/com/ic/modules/auth/service/DTslabsService.java 0 → 100644
package com.ic.modules.auth.service;
import java.util.List;
import com.ic.modules.auth.model.DTSlabsMapping;
import com.ic.modules.auth.model.L1slabsMapping;
import com.ic.modules.auth.payload.DTslabsDto;
public interface DTslabsService { // neel gosrani 27-05-2020 Activation DT CR
public DTSlabsMapping save(DTslabsDto dtslabsMapping,Boolean isCreate);
public List<DTSlabsMapping> findAll();
}
src/main/java/com/iRecruit/modules/auth/service/EmailService.java → src/main/java/com/ic/modules/auth/service/EmailService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import java.io.File;
......
src/main/java/com/iRecruit/modules/auth/service/FycMappingService.java → src/main/java/com/ic/modules/auth/service/FycMappingService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import java.util.List;
import com.iRecruit.modules.auth.model.FycMapping;
import com.ic.modules.auth.model.FycMapping;
import com.iRecruit.modules.auth.payload.fycDto;
import com.ic.modules.auth.payload.fycDto;
public interface FycMappingService {
......
src/main/java/com/ic/modules/auth/service/L1slabsMappingService.java 0 → 100644
package com.ic.modules.auth.service;
import java.util.List;
import com.ic.modules.auth.model.FycMapping;
import com.ic.modules.auth.model.L1slabsMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.payload.L1slabsDto;
import com.ic.modules.auth.payload.mpbDto;
public interface L1slabsMappingService {
public L1slabsMapping save(L1slabsDto l1slabsmapping,Boolean isCreate);
public List<L1slabsMapping> findAll();
}
src/main/java/com/iRecruit/modules/auth/service/L2slabsMappingService.java → src/main/java/com/ic/modules/auth/service/L2slabsMappingService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import java.util.List;
import com.iRecruit.modules.auth.model.L2slabsMapping;
import com.ic.modules.auth.model.L2slabsMapping;
import com.iRecruit.modules.auth.payload.L2slabsDto;
import com.ic.modules.auth.payload.L2slabsDto;
public interface L2slabsMappingService {
......
src/main/java/com/iRecruit/modules/auth/service/LeaderCalcService.java → src/main/java/com/ic/modules/auth/service/LeaderCalcService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import org.json.JSONObject;
import com.iRecruit.modules.auth.controller.LeaderCalc;
import com.iRecruit.modules.auth.model.FycMapping;
import com.iRecruit.modules.auth.payload.fycDto;
import com.ic.modules.auth.controller.LeaderCalc;
import com.ic.modules.auth.model.FycMapping;
import com.ic.modules.auth.payload.fycDto;
public interface LeaderCalcService {
......
src/main/java/com/iRecruit/modules/auth/service/MDBMappingService.java → src/main/java/com/ic/modules/auth/service/MDBMappingService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import java.util.List;
import com.iRecruit.modules.auth.model.MDBMapping;
import com.ic.modules.auth.model.MDBMapping;
import com.iRecruit.modules.auth.payload.MDBDto;
import com.ic.modules.auth.payload.MDBDto;
public interface MDBMappingService {
......
src/main/java/com/iRecruit/modules/auth/service/MpbMappingService.java → src/main/java/com/ic/modules/auth/service/MpbMappingService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import java.util.List;
import com.iRecruit.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.payload.mpbDto;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.payload.mpbDto;
public interface MpbMappingService {
......
src/main/java/com/iRecruit/modules/auth/service/MsaMappingService.java → src/main/java/com/ic/modules/auth/service/MsaMappingService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import java.util.List;
import com.iRecruit.modules.auth.model.MsaMapping;
import com.ic.modules.auth.model.MsaMapping;
import com.iRecruit.modules.auth.payload.MsaDto;
import com.ic.modules.auth.payload.MsaDto;
......
src/main/java/com/iRecruit/modules/auth/service/NGPACalcService.java → src/main/java/com/ic/modules/auth/service/NGPACalcService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import org.json.JSONObject;
......
src/main/java/com/iRecruit/modules/auth/service/NGPAtoNGPLCalcService.java → src/main/java/com/ic/modules/auth/service/NGPAtoNGPLCalcService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import org.json.JSONObject;
......
src/main/java/com/iRecruit/modules/auth/service/PushNotificationService.java → src/main/java/com/ic/modules/auth/service/PushNotificationService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import java.time.LocalDateTime;
import java.util.HashMap;
......@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.iRecruit.firebase.FCMService;
import com.iRecruit.modules.auth.model.PushNotificationRequest;
import com.ic.firebase.FCMService;
import com.ic.modules.auth.model.PushNotificationRequest;
@Service
public class PushNotificationService {
......
src/main/java/com/iRecruit/modules/auth/service/SMSService.java → src/main/java/com/ic/modules/auth/service/SMSService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import java.util.List;
......
src/main/java/com/iRecruit/modules/auth/service/TemplatesService.java → src/main/java/com/ic/modules/auth/service/TemplatesService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import java.util.List;
import com.iRecruit.modules.auth.model.Templates;
import com.iRecruit.modules.auth.payload.TemplatesDto;
import com.ic.modules.auth.model.Templates;
import com.ic.modules.auth.payload.TemplatesDto;
public interface TemplatesService {
......
src/main/java/com/iRecruit/modules/auth/service/UserService.java → src/main/java/com/ic/modules/auth/service/UserService.java
package com.iRecruit.modules.auth.service;
package com.ic.modules.auth.service;
import java.util.List;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import com.iRecruit.modules.auth.model.User;
import com.iRecruit.modules.auth.payload.UserDto;
import com.ic.modules.auth.model.User;
import com.ic.modules.auth.payload.UserDto;
public interface UserService {
......@@ -14,7 +14,7 @@ public interface UserService {
public User save(User user);
public User save(UserDto user);
public List<User> findByIds(List<Long> userIds);
// public List<User> findByIds(List<Long> userIds);
}
\ No newline at end of file
src/main/java/com/iRecruit/modules/auth/service/impl/AuditLogsServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/AuditLogsServiceImpl.java
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.modules.auth.model.AuditLogs;
import com.iRecruit.modules.auth.payload.AuditLogsDto;
import com.iRecruit.modules.auth.repository.AuditLogsRepository;
import com.iRecruit.modules.auth.service.AuditLogsService;
import com.ic.modules.auth.model.AuditLogs;
import com.ic.modules.auth.payload.AuditLogsDto;
import com.ic.modules.auth.repository.AuditLogsRepository;
import com.ic.modules.auth.service.AuditLogsService;
@Service
public class AuditLogsServiceImpl implements AuditLogsService {
......
src/main/java/com/iRecruit/modules/auth/service/impl/ConfigurationsServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/ConfigurationsServiceImpl.java
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.constant.DBConfig;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.Configurations;
import com.iRecruit.modules.auth.payload.ConfigurationsDto;
import com.iRecruit.modules.auth.repository.ConfigurationsRepository;
import com.iRecruit.modules.auth.service.ConfigurationsService;
import com.ic.constant.DBConfig;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.Configurations;
import com.ic.modules.auth.payload.ConfigurationsDto;
import com.ic.modules.auth.repository.ConfigurationsRepository;
import com.ic.modules.auth.service.ConfigurationsService;
@Service
public class ConfigurationsServiceImpl implements ConfigurationsService {
......@@ -23,10 +23,10 @@ public class ConfigurationsServiceImpl implements ConfigurationsService {
public Configurations save(ConfigurationsDto dto,Boolean isCreate) {
Configurations configuration = null;
if(!isCreate) {
configRepo.findByConfig(dto.getKey()).orElseThrow(()->new ResourceNotFoundException("Config","key",dto.getKey()));
configRepo.findByKey(dto.getKey()).orElseThrow(()->new ResourceNotFoundException("Config","key",dto.getKey()));
}else {
configuration = new Configurations();
configuration.setConfig(dto.getKey());
configuration.setKey(dto.getKey());
}
configuration.setValue(dto.getValue());
configuration.setDescription(dto.getDescription());
......@@ -38,7 +38,7 @@ public class ConfigurationsServiceImpl implements ConfigurationsService {
return configRepo.findAll();
}
public Configurations findByKey(String key) {
return configRepo.findByConfig(key).orElseThrow(()->new ResourceNotFoundException("Config","key",key));
return configRepo.findByKey(key).orElseThrow(()->new ResourceNotFoundException("Config","key",key));
}
}
src/main/java/com/ic/modules/auth/service/impl/DTslabsMappingServiceImpl.java 0 → 100644
package com.ic.modules.auth.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ic.constant.LeaderCalcConfig;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.DTSlabsMapping;
import com.ic.modules.auth.payload.DTslabsDto;
import com.ic.modules.auth.repository.DTslabsRepository;
import com.ic.modules.auth.service.DTslabsService;
@Service
public class DTslabsMappingServiceImpl implements DTslabsService {
@Autowired
DTslabsRepository dtslabsrepo;
@Autowired
LeaderCalcConfig LeaderCalcConfig;
@Override
public List<DTSlabsMapping> findAll() { // neel gosrani 27-05-2020 Activation DT CR Function for fetch all data from DB
return dtslabsrepo.findAll();
}
public DTSlabsMapping save(DTslabsDto dto, Boolean isCreate) { // neel gosrani 27-05-2020 Activation DT CR Function for save all data to DB
if(!isCreate) {
dtslabsrepo.findById(dto.getId()).orElseThrow(()->new ResourceNotFoundException("dtslabs","key",dto.getId()));
}
DTSlabsMapping dtslabsMapping = null;
dtslabsMapping= new DTSlabsMapping();
dtslabsMapping.setId(dto.getId());
dtslabsMapping.setCBA(dto.getCBA());
dtslabsMapping.setBA(dto.getBA());
dtslabsMapping.setSBA(dto.getSBA());
dtslabsMapping.setMaxval(dto.getMaxval());
dtslabsMapping.setMinval(dto.getMinval());
dtslabsMapping.setPartner(dto.getPartner());
dtslabsMapping.setSenior_Partner(dto.getSenior_Partner());
return dtslabsrepo.save(dtslabsMapping);
}
}
src/main/java/com/iRecruit/modules/auth/service/impl/FycMappingServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/FycMappingServiceImpl.java
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.exception.ResourceNotFoundException;
import com.ic.constant.LeaderCalcConfig;
import com.ic.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.FycMapping;
import com.ic.modules.auth.model.FycMapping;
import com.iRecruit.modules.auth.payload.fycDto;
import com.ic.modules.auth.payload.fycDto;
import com.iRecruit.modules.auth.repository.FycRepository;
import com.ic.modules.auth.repository.FycRepository;
import com.iRecruit.modules.auth.service.FycMappingService;
import com.ic.modules.auth.service.FycMappingService;
@Service
public class FycMappingServiceImpl implements FycMappingService {
......
src/main/java/com/iRecruit/modules/auth/service/impl/L1slabsMappingServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/L1slabsMappingServiceImpl.java
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.exception.ResourceNotFoundException;
import com.ic.constant.LeaderCalcConfig;
import com.ic.exception.ResourceNotFoundException;
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;
import com.iRecruit.modules.auth.repository.L1slabsRepository;
import com.ic.modules.auth.model.L1slabsMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.payload.L1slabsDto;
import com.ic.modules.auth.payload.mpbDto;
import com.ic.modules.auth.repository.L1slabsRepository;
import com.iRecruit.modules.auth.service.L1slabsMappingService;
import com.ic.modules.auth.service.L1slabsMappingService;
......
src/main/java/com/iRecruit/modules/auth/service/impl/L2slabsMappingServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/L2slabsMappingServiceImpl.java
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L2slabsMapping;
import com.iRecruit.modules.auth.payload.L2slabsDto;
import com.iRecruit.modules.auth.repository.L2slabsRepository;
import com.ic.constant.LeaderCalcConfig;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.L2slabsMapping;
import com.ic.modules.auth.payload.L2slabsDto;
import com.ic.modules.auth.repository.L2slabsRepository;
import com.iRecruit.modules.auth.service.L2slabsMappingService;
import com.ic.modules.auth.service.L2slabsMappingService;
......
src/main/java/com/iRecruit/modules/auth/service/impl/LeaderCalcServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/LeaderCalcServiceImpl.java
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
......@@ -9,13 +9,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.google.gson.JsonObject;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.constant.TemplateConfig;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.controller.LeaderCalc;
import com.iRecruit.modules.auth.service.FycMappingService;
import com.iRecruit.modules.auth.service.LeaderCalcService;
import com.iRecruit.constant.LeaderCalcConfig;
import com.ic.constant.LeaderCalcConfig;
import com.ic.constant.TemplateConfig;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.controller.LeaderCalc;
import com.ic.modules.auth.service.FycMappingService;
import com.ic.modules.auth.service.LeaderCalcService;
import com.ic.constant.LeaderCalcConfig;
@Service
......@@ -114,9 +114,13 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
double TOTAL_NGPA_WNBP_TOTAL = NGPA_Inputs_TOTAL.getDouble("TOTAL_NGPA_WNBP_TOTAL");
double TOTAL_CASE_SIZE_PER_NOP = NGPA_Inputs_TOTAL.getDouble("TOTAL_CASE_SIZE_PER_NOP");
if (Double.valueOf(TOTAL_CASE_SIZE_PER_NOP).equals(0.0)) {
NGPA_Inputs_TOTAL.put("TOTAL_NOP_NGPA", 0);
} else {
NGPA_Inputs_TOTAL.put("TOTAL_NOP_NGPA",
Double.valueOf(TOTAL_NGPA_WNBP_TOTAL) / Double.valueOf(TOTAL_CASE_SIZE_PER_NOP));
}
// Neel – 20-Apr-2020 – Tata - Leader calculation – NGPA inputs table end
// Neel – 20-Apr-2020 – Tata - Leader calculation – BAU inputs table start
......@@ -142,7 +146,7 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
JSONObject BAU_Inputs_TOTAL = TOTAL.getJSONObject("BAU_INPUTS");
BAU_Inputs_TOTAL.put("TOTAL_ACTIVE_AGENT_BAU",
Addition(Active_Agent_BAU_Dt, NOP_NGPA_BAU_Dt, CASE_SIZE_PER_NOP_BAU_Dt));
Addition(Active_Agent_BAU_Dt, Active_Agent_BAU_L1, Active_Agent_BAU_L2));
double TOTAL_BAU_WNBP_DT = BAU_Inputs_DT.getDouble("TOTAL_BAU_WNBP_DT");
double TOTAL_BAU_WNBP_L1 = BAU_Inputs_L1.getDouble("TOTAL_BAU_WNBP_L1");
......@@ -156,9 +160,13 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
double TOTAL_BAU_WNBP_TOATL = BAU_Inputs_TOTAL.getDouble("TOTAL_BAU_WNBP_TOATL");
double TOTAL_CASE_SIZE_PER_NOP_BAU = BAU_Inputs_TOTAL.getDouble("TOTAL_CASE_SIZE_PER_NOP_BAU");
if (Double.valueOf(TOTAL_CASE_SIZE_PER_NOP_BAU).equals(0.0)) {
BAU_Inputs_TOTAL.put("TOTAL_NOP_AGENT_BAU", 0);
} else {
BAU_Inputs_TOTAL.put("TOTAL_NOP_AGENT_BAU",
Double.valueOf(TOTAL_BAU_WNBP_TOATL) / Double.valueOf(TOTAL_CASE_SIZE_PER_NOP_BAU));
}
// Neel – 20-Apr-2020 – Tata - Leader calculation – BAU inputs table end
// Neel – 20-Apr-2020 – Tata - Leader calculation – BAU2 inputs table start
......@@ -245,12 +253,12 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
}
;
EARNING_DT.put("FYC_CREDIT_DT", mappingDT);
EARNING_DT.put("FYC_CREDIT_DT", mappingDT + "%");
EARNING_L1.put("FYC_CREDIT_L1", mappingL1 + "%");
EARNING_L2.put("FYC_CREDIT_L2", mappingL2 + "%");
if (Double.valueOf(AGENT_FYC_25_DT) > mappingDT_minimum_fyc) {
if (Double.valueOf(AGENT_FYC_25_DT) >= mappingDT_minimum_fyc) {
EARNING_DT.put("WFYC_DT", ((AGENT_FYC_25_DT) * mappingDT) / 100);
} else {
EARNING_DT.put("WFYC_DT", "0");
......@@ -264,7 +272,7 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
EARNING_L1.put("WFYC_L1", "0");
} else {
EARNING_L1.put("WFYC_L1", Multiplication(AGENT_FYC_25_L1, FYC_CREDIT_L1, 1));
EARNING_L1.put("WFYC_L1", ((AGENT_FYC_25_L1* FYC_CREDIT_L1)/100));
}
double WFYC_L1 = EARNING_L1.getDouble("WFYC_L1");
......@@ -273,7 +281,7 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
EARNING_L2.put("WFYC_L2", "0");
} else {
EARNING_L2.put("WFYC_L2", Multiplication(AGENT_FYC_25_L2, FYC_CREDIT_L2, 1));
EARNING_L2.put("WFYC_L2", ((AGENT_FYC_25_L2* FYC_CREDIT_L2)/100));
}
double WFYC_L2 = EARNING_L2.getDouble("WFYC_L2");
......@@ -288,23 +296,26 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
double val = TOTAL_WFYC;
double percentage = 0;
//neel gosrani 22-05-2020 by default percentage valus should be 60 for val above 1 cr
if(val>10000000) {
for (int i = 0; i < fycarrqay.length(); i++) {
percentage=60;
}
else {
for (int i = 0; i < fycarrqay.length(); i++) {
double minval = fycarrqay.getJSONObject(i).getDouble("minval");
double maxval = fycarrqay.getJSONObject(i).getDouble("maxval");
double per = fycarrqay.getJSONObject(i).getDouble("per");
if (val >= minval && val <= maxval) {
percentage = per;
break;
}
}
EARNING_TOTAL.put("TOTAL_MONTHLY_PERFORMANCE_BONUS",
Multiplication((val * percentage) / 100, TOTAL_WFYC, 1));
}
EARNING_TOTAL.put("TOTAL_MONTHLY_PERFORMANCE_BONUS",(val * percentage) / 100);
double TOTAL_MONTHLY_PERFORMANCE_BONUS = EARNING_TOTAL.getDouble("TOTAL_MONTHLY_PERFORMANCE_BONUS");
......@@ -351,11 +362,10 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
// MDB mappings
JSONArray mdb2array = leaderCalcConfig.getValue("mdb");
System.out.println("mdb2array");
System.out.println(mdb2array);
// System.out.println("mdb2array");
// System.out.println(mdb2array);
NGPA_Dt = 2;
TOTAL_NGPA_EP_125_DT = 1250000;
double monthly_ep_18 = 0;
double monthly_ep_36 = 0;
......@@ -366,13 +376,13 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
double MDB = mdb2array.getJSONObject(i).getDouble("MDB");
System.out.println(MDB);
System.out.println(NGPA_Dt);
// System.out.println(MDB);
// System.out.println(NGPA_Dt);
// double maxval = fycarrqay.getJSONObject(i).getDouble("maxval");
// double per = fycarrqay.getJSONObject(i).getDouble("per");
if (NGPA_Dt == MDB) {
System.out.println("in if");
monthly_ep_18 = mdb2array.getJSONObject(i).getDouble("monthly_ep_18");
monthly_ep_36 = mdb2array.getJSONObject(i).getDouble("monthly_ep_36");
monthly_ep_72 = mdb2array.getJSONObject(i).getDouble("monthly_ep_72");
......@@ -383,12 +393,16 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
}
System.out.println("val180000");
System.out.println(monthly_ep_18);
System.out.println(monthly_ep_36);
System.out.println(monthly_ep_72);
System.out.println(monthly_ep_144);
// System.out.println("val180000");
// System.out.println(monthly_ep_18);
// System.out.println(monthly_ep_36);
// System.out.println(monthly_ep_72);
// System.out.println(monthly_ep_144);
if (NGPA_Dt > 5) {
EARNING_DT.put("MONTHLY_DEVELOPMENT_BONUS_DT", 100000);
} else {
if (TOTAL_NGPA_EP_125_DT < 180000) {
EARNING_DT.put("MONTHLY_DEVELOPMENT_BONUS_DT", 0);
} else if (TOTAL_NGPA_EP_125_DT > 180000 && TOTAL_NGPA_EP_125_DT < 360000) {
......@@ -403,9 +417,9 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
} else {
EARNING_DT.put("MONTHLY_DEVELOPMENT_BONUS_DT", monthly_ep_144);
}
// System.out.println("neel");
System.out.println(EARNING_DT.getDouble("MONTHLY_DEVELOPMENT_BONUS_DT"));
}
// // System.out.println("neel");
// System.out.println(EARNING_DT.getDouble("MONTHLY_DEVELOPMENT_BONUS_DT"));
double MONTHLY_DEVELOPMENT_BONUS_DT = EARNING_DT.getDouble("MONTHLY_DEVELOPMENT_BONUS_DT");
EARNING_L1.put("MONTHLY_DEVELOPMENT_BONUS_L1", 0);
......@@ -437,12 +451,13 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
}
}
EARNING_L1.put("ACTIVATION_L1", (Active_Agent_BAU_L1 * multiplier) + (ACTIVE_AGENT_LP_L1 * 500)); //neel gosrani 02-06-2020 condition issue resolved
}
EARNING_L1.put("ACTIVATION_L1", (Active_Agent_BAU_L1 * multiplier) + (ACTIVE_AGENT_LP_L1 * 500));
JSONArray L2Slabsarray = leaderCalcConfig.getValue("l2slabs");
System.out.println("L2Slabsarray");
System.out.println(L2Slabsarray);
// System.out.println("L2Slabsarray");
// System.out.println(L2Slabsarray);
double multiplierL2 = 0;
if (leader_designation.equalsIgnoreCase("PBA") || leader_designation.equalsIgnoreCase("BA")) {
......@@ -470,16 +485,46 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
}
}
EARNING_L2.put("ACTIVATION_L2", (Active_Agent_BAU_L2 * multiplierL2) + (PA_L2 * 500));
EARNING_L2.put("ACTIVATION_L2", (Active_Agent_BAU_L2 * multiplierL2) + (ACTIVE_AGENT_LP_L2 * 500)); // neel gosrani 25-05-2020 ACTIVATION_L2 CR
}
if (Active_Agent_BAU_Dt < 4) {
// neel gosrani 27-05-2020 Activation DT CR start
double multiplierdt = 0;
if (Active_Agent_BAU_Dt < 2) {
EARNING_DT.put("ACTIVATION_DT", 0);
} else {
EARNING_DT.put("ACTIVATION_DT", (ACTIVE_AGENT_LP_DT + Active_Agent_BAU_Dt) * 1000);
if (Active_Agent_BAU_Dt >= 31) {
multiplierdt = 2500;
} else {
JSONArray dtSlabsarray = leaderCalcConfig.getValue("dtslabs");
for (int i = 0; i < dtSlabsarray.length(); i++) {
double minval = dtSlabsarray.getJSONObject(i).getDouble("minval");
double maxval = dtSlabsarray.getJSONObject(i).getDouble("maxval");
if (Active_Agent_BAU_Dt >= minval && Active_Agent_BAU_Dt <= maxval) {
System.out.println("Active_Agent_BAU_Dt");
System.out.println(Active_Agent_BAU_Dt);
System.out.println(leader_designation);
multiplierdt = dtSlabsarray.getJSONObject(i).getDouble(leader_designation);
break;
}
}
}
if (multiplierdt == 0) {
EARNING_DT.put("ACTIVATION_DT", 0);
} else {
EARNING_DT.put("ACTIVATION_DT",
((ACTIVE_AGENT_LP_DT * 1000) + (Active_Agent_BAU_Dt * multiplierdt)));
}
}
// neel gosrani 27-05-2020 Activation DT CR end
double ACTIVATION_L2 = EARNING_L2.getDouble("ACTIVATION_L2");
double ACTIVATION_DT = EARNING_DT.getDouble("ACTIVATION_DT");
double ACTIVATION_L1 = EARNING_L1.getDouble("ACTIVATION_L1");
......@@ -522,7 +567,7 @@ public class LeaderCalcServiceImpl implements LeaderCalcService {
// Neel – 20-Apr-2020 – Tata - Leader calculation – earning table ends
System.out.println(Calc_JSON);
// System.out.println(Calc_JSON);
return Calc_JSON;
......
src/main/java/com/iRecruit/modules/auth/service/impl/MDBMappingServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/MDBMappingServiceImpl.java
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.L2slabsMapping;
import com.iRecruit.modules.auth.model.MDBMapping;
import com.iRecruit.modules.auth.payload.MDBDto;
import com.iRecruit.modules.auth.repository.MDBRepository;
import com.iRecruit.modules.auth.service.MDBMappingService;
import com.ic.constant.LeaderCalcConfig;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.L2slabsMapping;
import com.ic.modules.auth.model.MDBMapping;
import com.ic.modules.auth.payload.MDBDto;
import com.ic.modules.auth.repository.MDBRepository;
import com.ic.modules.auth.service.MDBMappingService;
@Service
public class MDBMappingServiceImpl implements MDBMappingService {
......
src/main/java/com/iRecruit/modules/auth/service/impl/MpbMappingServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/MpbMappingServiceImpl.java
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.FycMapping;
import com.iRecruit.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.payload.fycDto;
import com.iRecruit.modules.auth.payload.mpbDto;
import com.iRecruit.modules.auth.repository.MpbRepository;
import com.iRecruit.modules.auth.service.MpbMappingService;
import com.ic.constant.LeaderCalcConfig;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.FycMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.payload.fycDto;
import com.ic.modules.auth.payload.mpbDto;
import com.ic.modules.auth.repository.MpbRepository;
import com.ic.modules.auth.service.MpbMappingService;
@Service
......
src/main/java/com/iRecruit/modules/auth/service/impl/MsaMappingServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/MsaMappingServiceImpl.java
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.FycMapping;
import com.iRecruit.modules.auth.model.MpbMapping;
import com.iRecruit.modules.auth.model.MsaMapping;
import com.iRecruit.modules.auth.payload.MsaDto;
import com.iRecruit.modules.auth.repository.MDBRepository;
import com.iRecruit.modules.auth.repository.MsaRepository;
import com.iRecruit.modules.auth.service.MsaMappingService;
import com.ic.constant.LeaderCalcConfig;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.FycMapping;
import com.ic.modules.auth.model.MpbMapping;
import com.ic.modules.auth.model.MsaMapping;
import com.ic.modules.auth.payload.MsaDto;
import com.ic.modules.auth.repository.MDBRepository;
import com.ic.modules.auth.repository.MsaRepository;
import com.ic.modules.auth.service.MsaMappingService;
@Service
......
src/main/java/com/iRecruit/modules/auth/service/impl/NGPACalcSerivceImpl.java → src/main/java/com/ic/modules/auth/service/impl/NGPACalcSerivceImpl.java
// Yashvant Calculation Of NGPA Based On Request From Front End - 4 Apr 2020
// Exception Handled Using JSONException Feature
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
......@@ -11,14 +11,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.google.gson.JsonObject;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.constant.TemplateConfig;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.controller.LeaderCalc;
import com.iRecruit.modules.auth.service.FycMappingService;
import com.iRecruit.modules.auth.service.LeaderCalcService;
import com.iRecruit.modules.auth.service.NGPACalcService;
import com.iRecruit.constant.LeaderCalcConfig;
import com.ic.constant.LeaderCalcConfig;
import com.ic.constant.TemplateConfig;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.controller.LeaderCalc;
import com.ic.modules.auth.service.FycMappingService;
import com.ic.modules.auth.service.LeaderCalcService;
import com.ic.modules.auth.service.NGPACalcService;
import com.ic.constant.LeaderCalcConfig;
@Service
......@@ -126,7 +126,7 @@ public class NGPACalcSerivceImpl implements NGPACalcService {
Response_JSON.put("Annual_Year_1_Validations_Met",requestJSON.getString("Annual_Year_1_Validations_Met"));
Response_JSON.put("Annual_Year_2_Validations_Met",requestJSON.getString("Annual_Year_2_Validations_Met"));
Response_JSON.put("Commission_Rate",requestJSON.getString("Commission_Rate"));
Response_JSON.put("Commission_Rate",requestJSON.getDouble("Commission_Rate"));
for( i=0;i<4;i++ ) {
basicJSONOperation1 = new JSONObject();
basicJSONOperation1.put("Validations_Met", ( ( mainTable[i][0] == 1 ) ? "Yes" : "No" ));
......
src/main/java/com/iRecruit/modules/auth/service/impl/NGPAtoNGPLCalcServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/NGPAtoNGPLCalcServiceImpl.java
// Yashvant Calculation Of NGPA To NGPL Based On Request From Front End - 4 Apr 2020
// Exception Handled Using JSONException Feature
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
......@@ -11,18 +11,18 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.google.gson.JsonObject;
import com.iRecruit.constant.LeaderCalcConfig;
import com.iRecruit.constant.TemplateConfig;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.controller.LeaderCalc;
import com.iRecruit.modules.auth.service.FycMappingService;
import com.iRecruit.modules.auth.service.LeaderCalcService;
import com.iRecruit.modules.auth.service.NGPACalcService;
import com.iRecruit.constant.LeaderCalcConfig;
import com.ic.constant.LeaderCalcConfig;
import com.ic.constant.TemplateConfig;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.controller.LeaderCalc;
import com.ic.modules.auth.service.FycMappingService;
import com.ic.modules.auth.service.LeaderCalcService;
import com.ic.modules.auth.service.NGPACalcService;
import com.ic.constant.LeaderCalcConfig;
import com.iRecruit.modules.auth.service.NGPAtoNGPLCalcService;
import com.ic.modules.auth.service.NGPAtoNGPLCalcService;
@Service
public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
......@@ -35,6 +35,7 @@ public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
String[] basicStringArrayOperation1 = {"Year_1_NGPA","Year_1_NGPL","Year_1_Total","Year_2_4_Validated_NGPAs"};
JSONObject basicJSONOperation = new JSONObject();
JSONObject basicJSONOperation1 = new JSONObject();
JSONObject basicJSONOperation2 = new JSONObject();
JSONArray basicJSONArrayOperation = new JSONArray();
double fycPersantage = 25;
......@@ -68,16 +69,24 @@ public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
return basicJSONOperation1;
}
public double calculateMonthlyPerformanceBonus ( Double WFYC ) throws JSONException {
public double calculateMonthlyPerformanceBonus ( Double WFYC , boolean isYear1 ) throws JSONException {
basicDoubleOperation = 0;
// basicStringOperation = ;
basicJSONArrayOperation = leaderCalcConfig.getValue("fyc");
if(!isYear1) {
WFYC = (double) Math.round( WFYC / 12 );
}
for ( i = 0; i < basicJSONArrayOperation.length(); i++ ) {
if (WFYC >= basicJSONArrayOperation.getJSONObject(i).getDouble("minval") && WFYC <= basicJSONArrayOperation.getJSONObject(i).getDouble("maxval")) {
basicDoubleOperation = Math.round( ( WFYC * basicJSONArrayOperation.getJSONObject(i).getDouble("per") ) / 100 );
}
}
return basicDoubleOperation;
if(!isYear1) {
return Math.round( basicDoubleOperation * 12 );
}
else {
return Math.round( basicDoubleOperation * metricsTable[1][0] );
}
}
public void preparengpaToLeaderCareerPathTable(JSONObject requestJSON) throws JSONException {
......@@ -141,27 +150,36 @@ public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
// basicStringOperation = "[{\"180000\":25000,\"360000\":25000,\"720000\":25000,\"1440000\":25000,\"MPB\":2},{\"180000\":25000,\"360000\":50000,\"720000\":50000,\"1440000\":50000,\"MPB\":3},{\"180000\":25000,\"360000\":50000,\"720000\":75000,\"1440000\":75000,\"MPB\":4},{\"180000\":25000,\"360000\":50000,\"720000\":75000,\"1440000\":100000,\"MPB\":5}]";
basicJSONArrayOperation = leaderCalcConfig.getValue("mdb");
for( i=0;i<basicJSONArrayOperation.length();i++ ) {
if ( basicJSONArrayOperation.getJSONObject(i).getDouble("MDB") == 4 ) {
if ( basicJSONArrayOperation.getJSONObject(i).getDouble("MDB") == 2 ) {
basicJSONOperation1 = basicJSONArrayOperation.getJSONObject(i);
break;
} else if ( basicJSONArrayOperation.getJSONObject(i).getDouble("MDB") == 4 ) {
basicJSONOperation2 = basicJSONArrayOperation.getJSONObject(i);
}
}
for( i=0;i<4;i++ ) {
if( metricsTable[i][7] > 180000 && metricsTable[i][7] < 360000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[i] = basicJSONOperation1.getDouble("monthly_ep_18");
} else if ( metricsTable[i][7] > 360000 && metricsTable[i][7] < 720000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[i] = basicJSONOperation1.getDouble("monthly_ep_36");
} else if ( metricsTable[i][7] > 720000 && metricsTable[i][7] < 1400000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[i] = basicJSONOperation1.getDouble("monthly_ep_72");
} else if ( metricsTable[i][7] > 1400000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[i] = basicJSONOperation1.getDouble("monthly_ep_144");
metricsTable[1][7] = Math.round( metricsTable[1][7] / metricsTable[1][0] );
if( metricsTable[1][7] > 180000 && metricsTable[1][7] < 360000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[1] = basicJSONOperation1.getDouble("monthly_ep_18");
} else if ( metricsTable[1][7] > 360000 && metricsTable[1][7] < 720000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[1] = basicJSONOperation1.getDouble("monthly_ep_36");
} else if ( metricsTable[1][7] > 720000 && metricsTable[1][7] < 1400000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[1] = basicJSONOperation1.getDouble("monthly_ep_72");
} else if ( metricsTable[1][7] > 1400000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[1] = basicJSONOperation1.getDouble("monthly_ep_144");
}
if( metricsTable[3][7] > 180000 && metricsTable[3][7] < 360000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[3] = basicJSONOperation2.getDouble("monthly_ep_18");
} else if ( metricsTable[3][7] > 360000 && metricsTable[3][7] < 720000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[3] = basicJSONOperation2.getDouble("monthly_ep_36");
} else if ( metricsTable[3][7] > 720000 && metricsTable[3][7] < 1400000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[3] = basicJSONOperation2.getDouble("monthly_ep_72");
} else if ( metricsTable[3][7] > 1400000 ) {
MonthlyDevelopmentBonus_Year1_NGPL[3] = basicJSONOperation2.getDouble("monthly_ep_144");
}
basicJSONOperation = MSA_Value.getJSONObject(0);
basicStringOperation = requestJSON.getString("FS_Type");
basicDoubleOperation = basicJSONOperation.getDouble(basicStringOperation);
earningsTable[0][0] = Math.round( ( metricsTable[0][6] * fycPersantage ) / 100 );
earningsTable[0][0] = Math.round( ( metricsTable[0][6] * requestJSON.getDouble("Commission_Rate") ) / 100 );
basicJSONOperation1 = new JSONObject();
basicJSONOperation1 = calculateFYCCreditAndWFYC("BA",earningsTable[0][0]);
......@@ -175,18 +193,17 @@ public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
earningsTable[0][5] = earningsTable[0][0] + earningsTable[0][1] + earningsTable[0][2];
earningsTable[0][6] = 0;
earningsTable[1][0] = Math.round( ( metricsTable[1][6] * fycPersantage ) / 100 );
earningsTable[1][0] = Math.round( ( metricsTable[1][6] * requestJSON.getDouble("Commission_Rate") ) / 100 );
basicJSONOperation1 = new JSONObject();
basicJSONOperation1 = calculateFYCCreditAndWFYC("BA",earningsTable[1][0]);
basicJSONOperation1 = calculateFYCCreditAndWFYC("BA", earningsTable[1][0] / metricsTable[1][0] );
earningsTable[1][7] = basicJSONOperation1.getDouble("DT");
earningsTable[1][8] = basicJSONOperation1.getDouble("WFYC");
earningsTable[1][1] = 0;
earningsTable[1][2] = 0;
earningsTable[1][3] = ( earningsTable[1][8] != 0 ? calculateMonthlyPerformanceBonus(earningsTable[1][8]) : 0 );
earningsTable[1][4] = Math.round( MonthlyDevelopmentBonus_Year1_NGPL[1] * ( 12 - metricsTable[0][0] ) );
earningsTable[1][3] = ( earningsTable[1][8] != 0 ? calculateMonthlyPerformanceBonus(earningsTable[1][8], true) : 0 );
earningsTable[1][4] = Math.round( MonthlyDevelopmentBonus_Year1_NGPL[1] * metricsTable[1][0] );
earningsTable[1][5] = earningsTable[1][3] + earningsTable[1][4];
earningsTable[1][6] = 0;
......@@ -205,7 +222,7 @@ public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
earningsTable[2][5] = earningsTable[2][0] + earningsTable[2][1] + earningsTable[2][2] + earningsTable[2][3] + earningsTable[2][4];
earningsTable[2][6] = Math.round( earningsTable[2][5] / 12 );
earningsTable[3][0] = Math.round( ( metricsTable[3][6] * fycPersantage ) / 100 );
earningsTable[3][0] = Math.round( ( metricsTable[3][6] * requestJSON.getDouble("Commission_Rate") ) / 100 );
basicJSONOperation1 = new JSONObject();
basicJSONOperation1 = calculateFYCCreditAndWFYC("BA",earningsTable[3][0]);
......@@ -214,8 +231,8 @@ public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
earningsTable[3][1] = 0;
earningsTable[3][2] = 0;
earningsTable[3][3] = ( earningsTable[3][8] != 0 ? calculateMonthlyPerformanceBonus(earningsTable[3][8]) : 0 );
earningsTable[3][4] = Math.round( ngpaToLeaderCareerPathTable[2][1] * MonthlyDevelopmentBonus_Year1_NGPL[3] * 12 );
earningsTable[3][3] = ( earningsTable[3][8] != 0 ? calculateMonthlyPerformanceBonus(earningsTable[3][8], false) : 0 );
earningsTable[3][4] = Math.round( MonthlyDevelopmentBonus_Year1_NGPL[3] * 12 );
earningsTable[3][5] = earningsTable[3][3] + earningsTable[3][4];
earningsTable[3][6] = Math.round( earningsTable[3][5] / 12 );
......@@ -232,6 +249,7 @@ public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
Response_JSON.put("FS_Type", requestJSON.getString("FS_Type"));
Response_JSON.put("Total_Validations_Met", requestJSON.getString("Total_Validations_Met"));
Response_JSON.put("Eligible_Premium", requestJSON.getDouble("Eligible_Premium"));
Response_JSON.put("Commission_Rate", requestJSON.getDouble("Commission_Rate"));
basicJSONOperation1 = new JSONObject();
for(i=0;i<3;i++) {
......
src/main/java/com/iRecruit/modules/auth/service/impl/TemplatesServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/TemplatesServiceImpl.java
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iRecruit.constant.TemplateConfig;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.Templates;
import com.iRecruit.modules.auth.payload.TemplatesDto;
import com.iRecruit.modules.auth.repository.TemplatesRepository;
import com.iRecruit.modules.auth.service.TemplatesService;
import com.ic.constant.TemplateConfig;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.Templates;
import com.ic.modules.auth.payload.TemplatesDto;
import com.ic.modules.auth.repository.TemplatesRepository;
import com.ic.modules.auth.service.TemplatesService;
@Service
public class TemplatesServiceImpl implements TemplatesService {
......@@ -24,10 +24,10 @@ public class TemplatesServiceImpl implements TemplatesService {
public Templates save(TemplatesDto dto,Boolean isCreate) {
Templates configuration = null;
if(!isCreate) {
configRepo.findByConfig(dto.getKey()).orElseThrow(()->new ResourceNotFoundException("Template","key",dto.getKey()));
configRepo.findByKey(dto.getKey()).orElseThrow(()->new ResourceNotFoundException("Template","key",dto.getKey()));
}else {
configuration = new Templates();
configuration.setConfig(dto.getKey());
configuration.setKey(dto.getKey());
}
configuration.setValue(dto.getValue());
configuration.setType(dto.getType());
......@@ -39,7 +39,7 @@ public class TemplatesServiceImpl implements TemplatesService {
return configRepo.findAll();
}
public Templates findByKey(String key) {
return configRepo.findByConfig(key).orElseThrow(()->new ResourceNotFoundException("Template","key",key));
return configRepo.findByKey(key).orElseThrow(()->new ResourceNotFoundException("Template","key",key));
}
}
src/main/java/com/iRecruit/modules/auth/service/impl/UserServiceImpl.java → src/main/java/com/ic/modules/auth/service/impl/UserServiceImpl.java
package com.iRecruit.modules.auth.service.impl;
package com.ic.modules.auth.service.impl;
import java.util.List;
import java.util.Optional;
......@@ -13,11 +13,11 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import com.iRecruit.exception.ResourceNotFoundException;
import com.iRecruit.modules.auth.model.User;
import com.iRecruit.modules.auth.payload.UserDto;
import com.iRecruit.modules.auth.repository.UserRepository;
import com.iRecruit.modules.auth.service.UserService;
import com.ic.exception.ResourceNotFoundException;
import com.ic.modules.auth.model.User;
import com.ic.modules.auth.payload.UserDto;
import com.ic.modules.auth.repository.UserRepository;
import com.ic.modules.auth.service.UserService;
@Service
@Transactional(propagation = Propagation.REQUIRES_NEW)
......@@ -41,12 +41,12 @@ public class UserServiceImpl implements UserService {
public User save(UserDto userDto) {
User user = new User();
if(userDto.getId() != null) {
user = userRepository.findById(userDto.getId()).orElseThrow(()-> new ResourceNotFoundException("User", "id", userDto.getId()));
user = userRepository.findByUserId(userDto.getId());// .orElseThrow(()-> new ResourceNotFoundException("User", "id", userDto.getId()));
}
user.setFirstName(userDto.getName());
user.setEmailId(userDto.getEmail());
user.setMobileNo(userDto.getMobileNumber());
user.setRole(userDto.getRole());
//user.setRole(userDto.getRole());
user.setFailedAttemptLogin(0);
user.setNotificationId(userDto.getNotificationId());
user.setStatus(userDto.getStatus());
......@@ -56,9 +56,9 @@ public class UserServiceImpl implements UserService {
}
public List<User> findByIds(List<Long> userIds){
return userRepository.findByIdIn(userIds);
}
// public List<User> findByIds(List<Long> userIds){
// return userRepository.findByUserIdIn(userIds);
// }
@Override
public User save(User user) {
......@@ -68,17 +68,25 @@ public class UserServiceImpl implements UserService {
@Override
public User findById(String id) {
Optional<User> user = userRepository.findById(id);
LOG.info("user---user----user"+user.toString());
if(user.toString() == "Optional.empty") {
User user = userRepository.findByUserId(id.trim());
if(user == null) {
return null;
}
else {
return userRepository.findById(id).orElseThrow(()->new ResourceNotFoundException("User", "id", id));
return user;
}
// Optional<User> user = userRepository.findByUserId(id);
// LOG.info("user---user----user"+user.toString());
//
// if(user.toString() == "Optional.empty") {
// return null;
// }
// else {
// return userRepository.findByUserId(id).orElseThrow(()->new ResourceNotFoundException("User", "id", id));
// }
//return userRepository.findById(id).orElseThrow(()->new ResourceNotFoundException("User", "id", id));
}
......
src/main/java/com/iRecruit/pdf/PDFThymeleafConfiguration.java → src/main/java/com/ic/pdf/PDFThymeleafConfiguration.java
package com.iRecruit.pdf;
package com.ic.pdf;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
......
src/main/java/com/iRecruit/schedule/InvoiceGeneratorScheduler.java → src/main/java/com/ic/schedule/InvoiceGeneratorScheduler.java
package com.iRecruit.schedule;
package com.ic.schedule;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
......
src/main/java/com/iRecruit/security/AuthProvider.java → src/main/java/com/ic/security/AuthProvider.java
package com.iRecruit.security;
package com.ic.security;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
......@@ -16,12 +16,12 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Component;
import com.iRecruit.constant.RolesConstant;
import com.iRecruit.constant.Status;
import com.iRecruit.constant.StatusCode;
import com.iRecruit.modules.auth.model.User;
import com.iRecruit.modules.auth.payload.request.LoginRequest;
import com.iRecruit.modules.auth.service.UserService;
import com.ic.constant.RolesConstant;
import com.ic.constant.Status;
import com.ic.constant.StatusCode;
import com.ic.modules.auth.model.User;
import com.ic.modules.auth.payload.request.LoginRequest;
import com.ic.modules.auth.service.UserService;
@Component
......@@ -46,41 +46,45 @@ public class AuthProvider implements AuthenticationProvider {
LoginRequest loginRequest = new LoginRequest();
loginRequest.setUsername(username);
loginRequest.setPassword(password);
loginRequest.setUserId(password);
LOG.info("login request for user "+username);
// LDAP Service Call
User user = null;
user = new User();
// user = userService.findById(username);
LOG.info("---------"+user);
user.setId("1");
user.setBranchCode("abc");
user.setFirstName("xyz");
user.setLastName("abc");
user.setGender("m");
user.setMobileNo("8238284225");
user.setBranchName("abc");
user.setMiddleName("pqr");
user.setEmailId("gosranineel4@gmail.com");
user.setDesignation("PBA");
user.setPan("pan");
user.setAgentStatus("1");
user.setRole(RolesConstant.LEADER);
try {
user = userService.findById(username);
// LOG.info("---------"+user);
//
//
//
// user.setId("1");
// user.setBranchCode("abc");
// user.setFirstName("xyz");
// user.setLastName("abc");
// user.setGender("m");
// user.setMobileNo("8238284225");
// user.setBranchName("abc");
// user.setMiddleName("pqr");
// user.setEmailId("gosranineel4@gmail.com");
// user.setDesignation("PBA");
// user.setPan("pan");
// user.setAgentStatus("1");
// user.setRole(RolesConstant.LEADER);
//
userService.save(user);
LOG.info("user-----"+user);
List<String> roles = new ArrayList<String>();
roles.add("leader");
return new UsernamePasswordAuthenticationToken(UserPrincipal.create(user,(LoginRequest)authentication.getDetails()), password,roles.stream().map(x -> new SimpleGrantedAuthority("ROLE_"+x)).collect(Collectors.toList()));
}
catch (Exception e) {
throw new BadCredentialsException(""+StatusCode.INVALID_CREDENTIAL);
}
}
......
src/main/java/com/iRecruit/security/CurrentUser.java → src/main/java/com/ic/security/CurrentUser.java
package com.iRecruit.security;
package com.ic.security;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
......
src/main/java/com/iRecruit/security/CustomUserDetailsService.java → src/main/java/com/ic/security/CustomUserDetailsService.java
package com.iRecruit.security;
package com.ic.security;
import java.util.stream.Collectors;
......@@ -10,9 +10,9 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.iRecruit.modules.auth.model.User;
import com.iRecruit.modules.auth.payload.request.LoginRequest;
import com.iRecruit.modules.auth.service.UserService;
import com.ic.modules.auth.model.User;
import com.ic.modules.auth.payload.request.LoginRequest;
import com.ic.modules.auth.service.UserService;
@Service
......
src/main/java/com/iRecruit/security/EncrypterDecrypter.java → src/main/java/com/ic/security/EncrypterDecrypter.java
package com.iRecruit.security;
package com.ic.security;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
......
src/main/java/com/iRecruit/security/JwtAuthenticationEntryPoint.java → src/main/java/com/ic/security/JwtAuthenticationEntryPoint.java
package com.iRecruit.security;
package com.ic.security;
import java.io.IOException;
import javax.servlet.ServletException;
......
src/main/java/com/iRecruit/security/JwtAuthenticationFilter.java → src/main/java/com/ic/security/JwtAuthenticationFilter.java
package com.iRecruit.security;
package com.ic.security;
import java.io.IOException;
import javax.servlet.FilterChain;
......@@ -17,7 +17,7 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS
import org.springframework.util.StringUtils;
import org.springframework.web.filter.OncePerRequestFilter;
import com.iRecruit.constant.DBConfig;
import com.ic.constant.DBConfig;
public class JwtAuthenticationFilter extends OncePerRequestFilter {
......
src/main/java/com/iRecruit/security/JwtTokenProvider.java → src/main/java/com/ic/security/JwtTokenProvider.java
package com.iRecruit.security;
package com.ic.security;
import java.io.IOException;
import java.util.Date;
......@@ -15,7 +15,7 @@ import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.iRecruit.constant.DBConfig;
import com.ic.constant.DBConfig;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException;
......
src/main/java/com/iRecruit/security/UserPrincipal.java → src/main/java/com/ic/security/UserPrincipal.java
package com.iRecruit.security;
package com.ic.security;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
......@@ -12,8 +12,8 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import com.iRecruit.modules.auth.model.User;
import com.iRecruit.modules.auth.payload.request.LoginRequest;
import com.ic.modules.auth.model.User;
import com.ic.modules.auth.payload.request.LoginRequest;
import lombok.Getter;
import lombok.Setter;
......@@ -70,13 +70,13 @@ public class UserPrincipal implements UserDetails {
public static UserPrincipal create(User user,LoginRequest loginRequest) {
List<String> roles = new ArrayList<String>();
roles.add(user.getRole().name());
//roles.add(user.getRole().name());
List<GrantedAuthority> authorities = roles.stream().map(role ->
new SimpleGrantedAuthority("ROLE_"+role)
).collect(Collectors.toList());
return new UserPrincipal(user.getFirstName(), user.getId(), user.getEmailId(),loginRequest.getDeviceInfo(),loginRequest.getOS(),loginRequest.getBrowserInfo(), user.getMobileNo(), authorities);
return new UserPrincipal(user.getFirstName(), user.getUserId(), user.getEmailId(),loginRequest.getDeviceInfo(),loginRequest.getOS(),loginRequest.getBrowserInfo(), user.getMobileNo(), authorities);
}
......
src/main/resources/application.properties
spring.datasource.url = jdbc:mysql://localhost:3306/imcalculator?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
#spring.datasource.url = jdbc:mysql://localhost:3306/irecruittest?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
irecruit.datasource.url = jdbc:oracle:thin:@192.168.10.120:1521:orcl
irecruit.datasource.url = jdbc:oracle:thin:@localhost:1521:orcl
irecruit.datasource.jndi-name=jdbc/irecruit
irecruit.jpa.hibernate.ddl-auto=update
irecruit.datasource.username = root
irecruit.datasource.password = P@ssw0rd
irecruit.jpa.hibernate.ddl-auto=none
irecruit.datasource.username = SYSTEM
irecruit.datasource.password = tata
irecruit.datasource.initialization-mode=always
irecruit.datasource.driver-class-name=com.mysql.jdbc.Driver
irecruit.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
irecruit.jpa.hibernate.globally_quoted_identifiers=true
irecruit.jpa.hibernate.physical_naming_strategy=com.iRecruit.config.CustomPhysicalNamingStrategy
......@@ -18,7 +18,7 @@ irecruit.jpa.hibernate.physical_naming_strategy=com.iRecruit.config.CustomPhysic
#naaf.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
naaf.datasource.url = jdbc:oracle:thin:@192.168.10.120:1521:orcl
naaf.jpa.hibernate.ddl-auto=update
naaf.jpa.hibernate.ddl-auto=none
naaf.datasource.username = SOUAT
naaf.datasource.password = tata
......@@ -38,7 +38,7 @@ spring.datasource.hikari.poolName=startup-connection-pool
logging.level.org.hibernate.SQL= DEBUG
server.port=8082
server.port=8083
......@@ -57,7 +57,8 @@ spring.jackson.time-zone= UTC
#mobileno.generateOtpExpirationInMs = 60000
logging.level.com.appsdeveloperblog.examples=DEBUG
logging.file = /data/Nirav/projects/SMS/service.log
logging.file = /applogs/INCOMECALCULATOR/application.log
management.endpoints.web.exposure.include=*
management.endpoints.web.exposure.exclude=
......
src/test/java/com/iRecruit/SmsApplicationTests.java → src/test/java/com/ic/SmsApplicationTests.java
package com.iRecruit;
package com.ic;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
......
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