diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..d89eab8 --- /dev/null +++ b/pom.xml @@ -0,0 +1,134 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.4.1 + + + com.sahyog.app.inbound + inbound-user-service + 0.0.1-SNAPSHOT + inbound-user-service + project user management services in Spring Boot + + + 17 + 2021.0.3 + + + + + + com.sahyog.app.inbound + inbound-common-lib + 0.0.1-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + javax.validation + validation-api + 2.0.1.Final + + + + + + org.springdoc + springdoc-openapi-ui + 1.6.12 + + + com.mysql + mysql-connector-j + runtime + + + + org.projectlombok + lombok + true + + + com.google.code.gson + gson + + + org.codehaus.jettison + jettison + 1.4.1 + + + net.sf.dozer + dozer + 5.5.1 + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + paketobuildpacks/builder-jammy-base:latest + + + + org.projectlombok + lombok + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/InboundUserServiceApplication.java b/src/main/java/com/sahyog/app/inbound/user/InboundUserServiceApplication.java new file mode 100644 index 0000000..6cd9f09 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/InboundUserServiceApplication.java @@ -0,0 +1,13 @@ +package com.sahyog.app.inbound.user; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class InboundUserServiceApplication { + + public static void main(String[] args) { + SpringApplication.run(InboundUserServiceApplication.class, args); + } + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/config/SecurityConfig.java b/src/main/java/com/sahyog/app/inbound/user/config/SecurityConfig.java new file mode 100644 index 0000000..6ce8cc8 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/config/SecurityConfig.java @@ -0,0 +1,20 @@ +package com.sahyog.app.inbound.user.config; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +//import org.springframework.security.config.annotation.web.builders.HttpSecurity; +//import org.springframework.security.web.SecurityFilterChain; + +//@Configuration +//public class SecurityConfig { +// +// @Bean +// public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { +// http +// .csrf().disable() +// .authorizeHttpRequests() +// .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll() +// .anyRequest().authenticated(); +// return http.build(); +// } +//} + diff --git a/src/main/java/com/sahyog/app/inbound/user/config/UserConfiguration.java b/src/main/java/com/sahyog/app/inbound/user/config/UserConfiguration.java new file mode 100644 index 0000000..a358fc9 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/config/UserConfiguration.java @@ -0,0 +1,15 @@ +package com.sahyog.app.inbound.user.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; + +//@Configuration +//public class UserConfiguration { +// +// @Bean +// public PasswordEncoder passwordEncoder() { +// return new BCryptPasswordEncoder(); +// } +//} diff --git a/src/main/java/com/sahyog/app/inbound/user/controller/RoleController.java b/src/main/java/com/sahyog/app/inbound/user/controller/RoleController.java new file mode 100644 index 0000000..e7c11ea --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/controller/RoleController.java @@ -0,0 +1,85 @@ +package com.sahyog.app.inbound.user.controller; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +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.RestController; + +import com.sahyog.app.inbound.user.dto.RoleDTO; +import com.sahyog.app.inbound.user.exception.RoleAlreadyExistsException; +import com.sahyog.app.inbound.user.model.Role; +import com.sahyog.app.inbound.user.service.RoleService; + +@RestController +@RequestMapping("/api/roles") +public class RoleController { + + private static final Logger log = LoggerFactory.getLogger(RoleController.class); + + @Autowired + private RoleService roleService; + +// @GetMapping("/user-type/{userTypeId}") +// public ResponseEntity> getRolesByUserTypeId(@PathVariable short userTypeId) { +// log.info("Fetching roles for userTypeId: {}", userTypeId); +// List roles = roleService.getRolesByUserTypeId(userTypeId); +// return ResponseEntity.ok(roles); +// } + + // Create Role +// @PostMapping +// public ResponseEntity createRole(@RequestBody RoleDTO roleDTO) { +// Role createdRole = roleService.createRole(roleDTO); +// return ResponseEntity.status(HttpStatus.CREATED).body(createdRole); +// } +// +// // Get Roles by UserTypeId +// @GetMapping("/userType/{userTypeId}") +// public ResponseEntity> getRolesByUserTypeId(@PathVariable int userTypeId) { +// List roles = roleService.getRolesByUserTypeId(userTypeId); +// return ResponseEntity.ok(roles); +// } +// +// +// // Get All Roles +// @GetMapping +// public ResponseEntity> getAllRoles() { +// List roles = roleService.getAllRoles(); +// return ResponseEntity.ok(roles); +// } +// +// // Get Role by ID +// @GetMapping("/{roleId}") +// public ResponseEntity getRoleById(@PathVariable int roleId) { +// Role role = roleService.getRoleById(roleId); +// return ResponseEntity.ok(role); +// } +// +// // Update Role +// @PutMapping("/{roleId}") +// public ResponseEntity updateRole(@PathVariable int roleId, @RequestBody RoleDTO roleDTO) { +// Role updatedRole = roleService.updateRole(roleId, roleDTO); +// return ResponseEntity.ok(updatedRole); +// } +// +// // Delete Role +// @DeleteMapping("/{roleId}") +// public ResponseEntity deleteRole(@PathVariable int roleId) { +// roleService.deleteRole(roleId); +// return ResponseEntity.noContent().build(); +// } +// + +} + diff --git a/src/main/java/com/sahyog/app/inbound/user/controller/TransporterController.java b/src/main/java/com/sahyog/app/inbound/user/controller/TransporterController.java new file mode 100644 index 0000000..4b32959 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/controller/TransporterController.java @@ -0,0 +1,86 @@ +package com.sahyog.app.inbound.user.controller; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +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.RestController; + +import com.sahyog.app.inbound.user.dto.TransporterMasterDto; +import com.sahyog.app.inbound.user.dto.TransporterUpdateDTO; +import com.sahyog.app.inbound.user.exception.TransporterProcessingException; +import com.sahyog.app.inbound.user.service.TransporterService; + +import jakarta.persistence.EntityNotFoundException; +import jakarta.validation.Valid; + +@RestController +@RequestMapping("/users") +public class TransporterController { + + private static final Logger log = LoggerFactory.getLogger(TransporterController.class); + + @Autowired + private TransporterService transporterService; + + @PostMapping(value = "/addUpdateTransporters", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity createOrUpdateTransporters(@Valid @RequestBody List transporterRequestDtos) { + try { + log.info("Received request to process transporters: {}", transporterRequestDtos.size()); + transporterService.processTransporters(transporterRequestDtos); + log.info("Transporters processed successfully."); + return ResponseEntity.status(HttpStatus.CREATED).body("Transporters processed successfully."); + } catch (TransporterProcessingException e) { + log.error("Error processing transporters: {}", e.getMessage(), e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error processing transporters: " + e.getMessage()); + } catch (Exception e) { + log.error("Unexpected error occurred: {}", e.getMessage(), e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Unexpected error occurred."); + } + } + + +// @PutMapping("/{transporterId}") +// public ResponseEntity updateTransporter( +// @PathVariable Long transporterId, +// @RequestBody TransporterUpdateDTO transporterUpdateDto) { +// try { +// transporterService.updateTransporter(transporterId, transporterUpdateDto); +// return ResponseEntity.ok("Transporter updated successfully."); +// } catch (EntityNotFoundException e) { +// return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage()); +// } catch (Exception e) { +// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error updating transporter."); +// } +// } +// +// @PutMapping("/updateBySupplier") +// public ResponseEntity updateTransporters( +// @RequestBody List transporterUpdateDTOList) { +// +// try { +// // Call the service to update the list of transporters +// boolean allUpdatesSuccessful = transporterService.updateTransporters(transporterUpdateDTOList); +// +// if (allUpdatesSuccessful) { +// // Return success response if all transporters are updated +// return ResponseEntity.status(HttpStatus.OK).body("All transporters updated successfully."); +// } else { +// // Return partial success response if some transporters couldn't be updated +// return ResponseEntity.status(HttpStatus.PARTIAL_CONTENT).body("Some transporters could not be updated."); +// } +// } catch (Exception e) { +// // Return error response in case of any exception +// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("An unexpected error occurred while updating the transporters."); +// } +// } +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/controller/UserController.java b/src/main/java/com/sahyog/app/inbound/user/controller/UserController.java new file mode 100644 index 0000000..154bdb0 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/controller/UserController.java @@ -0,0 +1,109 @@ +package com.sahyog.app.inbound.user.controller; + +import com.sahyog.app.inbound.user.dto.UserDTO; +import com.sahyog.app.inbound.user.dto.UserUpdateDTO; +import com.sahyog.app.inbound.user.exception.UserAlreadyExistsException; +import com.sahyog.app.inbound.user.model.User; +import com.sahyog.app.inbound.user.service.UserService; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +@RestController +@RequestMapping("/api/users") +public class UserController { + + private static final Logger log = LoggerFactory.getLogger(UserController.class); + + @Autowired + private UserService userService; + + @PostMapping("/createUser") + public ResponseEntity createInternalUsers(@RequestBody List userDTOs) { + log.info("Received request to create/update users: {}", userDTOs); + try { + List userIds = userService.createInternalUsers(userDTOs); + log.info("Users created/updated successfully. UserIds: {}", userIds); + return ResponseEntity.status(HttpStatus.CREATED) + .body("Users created/updated successfully. UserIds: " + userIds); + } catch (UserAlreadyExistsException e) { + log.warn("UserAlreadyExistsException occurred: {}", e.getMessage()); + return ResponseEntity.status(HttpStatus.CONFLICT) + .body("Error: " + e.getMessage()); + } catch (RuntimeException e) { + log.error("RuntimeException occurred: {}", e.getMessage(), e); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body("Error: " + e.getMessage()); + } catch (Exception e) { + log.error("Unexpected error occurred: {}", e.getMessage(), e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body("An unexpected error occurred."); + } + } + + @PutMapping("/update") + public ResponseEntity updateUser(@RequestParam String userEmpTransCode, + @RequestBody UserUpdateDTO userUpdateDTO) { + log.info("Received request to update user with userEmpTransCode: {}", userEmpTransCode); + if (userEmpTransCode == null || userEmpTransCode.isEmpty()) { + log.warn("Invalid request: userEmpTransCode is null or empty"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body("userEmpTransCode must be provided."); + } + ResponseEntity response = userService.updateUser(userEmpTransCode, userUpdateDTO); + log.info("User updated successfully with userEmpTransCode: {}", userEmpTransCode); + return response; + } + + @GetMapping("/all") + public ResponseEntity> getAllUsers( + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "10") int size) { + log.info("Fetching all users with page: {} and size: {}", page, size); + Page users = userService.getAllUsers(page, size); + log.info("Fetched {} users", users.getTotalElements()); + return ResponseEntity.ok(users); + } + + @GetMapping("/active") + public ResponseEntity> getAllActiveUsers() { + log.info("Fetching all active users"); + List activeUsers = userService.getActiveUsers(); + log.info("Fetched {} active users", activeUsers.size()); + return ResponseEntity.ok(activeUsers); + } + + @GetMapping("/status") + public ResponseEntity> getUsersByStatus(@RequestParam List status) { + log.info("Fetching users by status: {}", status); + List users = userService.getUsersByStatus(status); + log.info("Fetched {} users for statuses: {}", users.size(), status); + return ResponseEntity.ok(users); + } + + @GetMapping("/getUserIDByUserName") + public ResponseEntity getUserIDByUserName(@RequestParam String userName) { + try { + log.info("Received request to get Code by key: {}", userName); + + UserDTO pmDTO = userService.getUserIDByUserName(userName); + + log.info("User fetched successfully."); + + return ResponseEntity.status(HttpStatus.CREATED).body(pmDTO); + + } catch (Exception e) { + + log.error("Unexpected error occurred: {}", e.getMessage(), e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); + } + } + +} + diff --git a/src/main/java/com/sahyog/app/inbound/user/controller/UserRoleController.java b/src/main/java/com/sahyog/app/inbound/user/controller/UserRoleController.java new file mode 100644 index 0000000..115ba16 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/controller/UserRoleController.java @@ -0,0 +1,41 @@ +package com.sahyog.app.inbound.user.controller; + + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import com.sahyog.app.inbound.user.dto.UserRoleDTO; +import com.sahyog.app.inbound.user.exception.RoleNotFoundException; +import com.sahyog.app.inbound.user.exception.UserNotFoundException; +import com.sahyog.app.inbound.user.service.UserRoleService; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +@RestController +@RequestMapping("/api/user-roles") +public class UserRoleController { + + private static final Logger log = LoggerFactory.getLogger(UserRoleController.class); + + @Autowired + private UserRoleService userRoleService; + + // Method to create a new user-role association +// @PostMapping("/create") +// public ResponseEntity createUserRole(@RequestBody UserRoleDTO userRoleDTO, @RequestParam Long userTypeId) { +// try { +// UserRoleDTO createdUserRole = userRoleService.createUserRole(userRoleDTO, userTypeId); +// return ResponseEntity.status(HttpStatus.CREATED).body(createdUserRole); +// } catch (Exception e) { +// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) +// .body(null); +// } +// } + +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/controller/UserTypeController.java b/src/main/java/com/sahyog/app/inbound/user/controller/UserTypeController.java new file mode 100644 index 0000000..8504d4d --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/controller/UserTypeController.java @@ -0,0 +1,78 @@ +package com.sahyog.app.inbound.user.controller; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.sahyog.app.inbound.user.dto.UserTypeDTO; +import com.sahyog.app.inbound.user.model.UserType; +import com.sahyog.app.inbound.user.service.UserTypeService; + +import io.swagger.v3.oas.annotations.parameters.RequestBody; +import jakarta.validation.Valid; + + @RestController + @RequestMapping("/api/user-types") + public class UserTypeController { + + private static final Logger log = LoggerFactory.getLogger(UserTypeController.class); + + @Autowired + private UserTypeService userTypeService; + + + @PostMapping("/create") + public ResponseEntity createUserType(@RequestBody UserTypeDTO userTypeDTO) { + log.info("Received payload: {}", userTypeDTO); + UserType createdUserType = userTypeService.createUserType(userTypeDTO); + + + return ResponseEntity.status(HttpStatus.CREATED).body(createdUserType); + } + + + + @GetMapping("/getAll") + public ResponseEntity> getAllUserTypes() { + log.info("Fetching all user types"); + + List userTypes = userTypeService.getAllUserTypes(); + return ResponseEntity.ok(userTypes); + } + + @GetMapping("/{userTypeId}") + public ResponseEntity getUserTypeById(@PathVariable short userTypeId) { + log.info("Fetching user type with ID: {}", userTypeId); + + UserType userType = userTypeService.getUserTypeById(userTypeId); + return ResponseEntity.ok(userType); + } + + + + @PatchMapping("/update-status/{userTypeId}") + public ResponseEntity updateUserTypeStatus(@PathVariable short userTypeId) { + try { + userTypeService.updateUserTypeStatus(userTypeId); + return ResponseEntity.ok("UserType status updated successfully."); + } catch (RuntimeException e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Error: " + e.getMessage()); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body("An unexpected error occurred: " + e.getMessage()); + } + } + + } \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/dto/RoleDTO.java b/src/main/java/com/sahyog/app/inbound/user/dto/RoleDTO.java new file mode 100644 index 0000000..8af8810 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/dto/RoleDTO.java @@ -0,0 +1,36 @@ +package com.sahyog.app.inbound.user.dto; + + +import com.sahyog.app.inbound.user.model.User; +import com.sahyog.app.inbound.user.model.UserType; + +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Data +public class RoleDTO { + private int roleId; + + private String roleName; + + private String roleDescription; + + private short userTypeId; + + private String status; + + private int createdBy; + + private int lastUpdatedBy; +} diff --git a/src/main/java/com/sahyog/app/inbound/user/dto/TransporterMasterDto.java b/src/main/java/com/sahyog/app/inbound/user/dto/TransporterMasterDto.java new file mode 100644 index 0000000..9b48436 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/dto/TransporterMasterDto.java @@ -0,0 +1,65 @@ +package com.sahyog.app.inbound.user.dto; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +import com.sahyog.app.inbound.user.model.User; + +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@NoArgsConstructor +@AllArgsConstructor +@Getter +@Setter +@ToString +public class TransporterMasterDto { + + private int transporterId; + private short plantId; + private String plantCode; + private int userId; + private String supplierCode; + private String bpGrouping; + private String transporterCode; + private String supplierAccountGroup; + private String transporterName; + private String transporterFirstName; + private String transporterMiddleName; + private String transporterLastName; + private String legalEntity; + private String permanentAccountNumber; + private String street; + private String houseNumber; + private String district; + private String differentCity; + private String postalCode; + private String city; + private String country; + private String state; + private String mobileNumber; + private String emailId; + private String gstn; + private String taxRegime; + private String shortCode; + private LocalDate createdDate; + private LocalDate updationDate; + private String taxCodeDesc; + private Integer taxRate; + private String status; + private int createdBy; + private int lastUpdatedBy; + +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/dto/TransporterRequestDto.java b/src/main/java/com/sahyog/app/inbound/user/dto/TransporterRequestDto.java new file mode 100644 index 0000000..15b4b75 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/dto/TransporterRequestDto.java @@ -0,0 +1,56 @@ +package com.sahyog.app.inbound.user.dto; + +import java.time.LocalDateTime; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@NoArgsConstructor +@AllArgsConstructor +@Getter +@Setter +@ToString +public class TransporterRequestDto { + +// private long transporterId; + private String supplier; + private String plantCode; + private String bpGrouping; + private String supplierAccountGroup; + private String name; + private String firstName; + private String middleName; + private String lastName; + private Long userId; + private String legalEntity; + private String permanentAccountNumber; + private String street; + private String houseNumber; + private String district; + private String differentCity; + private String postalCode; + private String city; + private String state; + private String country; + private String mobileNumber; + private String emailId; + private String gstNumber; + private String taxRegime; + private String status; + private String shortCode; + private LocalDateTime createdDate; + private LocalDateTime updationDate; + private String taxCodeDesc; + private Double taxRate; + private Long createdBy; + private Long lastUpdatedBy; + +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/dto/TransporterResponseDTO.java b/src/main/java/com/sahyog/app/inbound/user/dto/TransporterResponseDTO.java new file mode 100644 index 0000000..ae29077 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/dto/TransporterResponseDTO.java @@ -0,0 +1,50 @@ +package com.sahyog.app.inbound.user.dto; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Getter +@Setter +@ToString +public class TransporterResponseDTO { + +// private long transporterId; + private String supplierCode; + private String plantCode; + private String bpGrouping; + private String supplierAccountGroup; + private String firstName; + private String middleName; + private String lastName; + private String legalEntity; + private String pan; + private String street; + private String houseNumber; + private String district; + private String dfferentCity; + private String postalCode; + private String city; + private String state; + private String country; + private String mobileNumber; + private String emailId; + private String gstNumber; + private String taxRegime; + private String status; + private String shortCode; + private LocalDateTime createdDate; + private LocalDateTime updationDate; + private String taxCodeDesc; + private Double taxRate; + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/dto/TransporterSignupDto.java b/src/main/java/com/sahyog/app/inbound/user/dto/TransporterSignupDto.java new file mode 100644 index 0000000..12259b0 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/dto/TransporterSignupDto.java @@ -0,0 +1,22 @@ +package com.sahyog.app.inbound.user.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TransporterSignupDto { + private String firstName; + private String lastName; + private String email; + private String phoneNo; + private String password; + private String supplierCode; + private String plantCode; + private String bpGrouping; + private String gstNumber; + private String webUrl; + private String roleStatus; +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/dto/TransporterUpdateDTO.java b/src/main/java/com/sahyog/app/inbound/user/dto/TransporterUpdateDTO.java new file mode 100644 index 0000000..b777c2b --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/dto/TransporterUpdateDTO.java @@ -0,0 +1,58 @@ +package com.sahyog.app.inbound.user.dto; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +import com.sahyog.app.inbound.user.model.User; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@ToString +public class TransporterUpdateDTO { + private int transporterId; + private short plantId; + private String plantCode; + private int userId; + private String supplierCode; + private String bpGrouping; + private String transporterCode; + + private String supplierAccountGroup; + private String transporterName; + private String transporterFirstName; + private String transporterMiddleName; + private String transporterLastName; + private String legalEntity; + private String permanentAccountNumber; + private String street; + private String houseNumber; + private String district; + private String differentCity; + private String postalCode; + private String city; + private String country; + private String state; + private String mobileNumber; + private String emailId; + private String gstn; + private String taxRegime; + private String shortCode; + private LocalDate createdDate; + private LocalDate updationDate; + private String taxCodeDesc; + private Integer taxRate; + private String status; + private int createdBy; + private int lastUpdatedBy; + + +} + diff --git a/src/main/java/com/sahyog/app/inbound/user/dto/UserDTO.java b/src/main/java/com/sahyog/app/inbound/user/dto/UserDTO.java new file mode 100644 index 0000000..a7cf324 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/dto/UserDTO.java @@ -0,0 +1,43 @@ +package com.sahyog.app.inbound.user.dto; + +import java.time.LocalDateTime; + +import com.sahyog.app.inbound.user.enums.Status; +import com.sahyog.app.inbound.user.model.User; +import com.sahyog.app.inbound.user.model.UserType; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@ToString +public class UserDTO { + private Integer userId; // + private Integer userTypeId; + private String userName; + private String firstName; + private String lastName; + private String email; + private String mobile; + private String employeeTransCode; + private String addedChannel; + private Status status; // Typically a char field like 'A' or 'I' + private Integer createdBy; // Self-reference for the creator + private Integer lastUpdatedBy; // Self-reference for the last updater +} + diff --git a/src/main/java/com/sahyog/app/inbound/user/dto/UserRoleDTO.java b/src/main/java/com/sahyog/app/inbound/user/dto/UserRoleDTO.java new file mode 100644 index 0000000..c8fc44e --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/dto/UserRoleDTO.java @@ -0,0 +1,27 @@ +package com.sahyog.app.inbound.user.dto; + +import com.sahyog.app.inbound.user.enums.Status; +import com.sahyog.app.inbound.user.model.Role; +import com.sahyog.app.inbound.user.model.User; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Data +public class UserRoleDTO { + + private int userRoleId; + private int userId; + private int roleId; + private Status status; + private int createdBy; + private int lastUpdatedBy; + + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/dto/UserTypeDTO.java b/src/main/java/com/sahyog/app/inbound/user/dto/UserTypeDTO.java new file mode 100644 index 0000000..9e69eba --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/dto/UserTypeDTO.java @@ -0,0 +1,30 @@ +package com.sahyog.app.inbound.user.dto; + +import com.sahyog.app.inbound.user.enums.Status; +import com.sahyog.app.inbound.user.model.User; + +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class UserTypeDTO { + private short userTypeId; // Corresponds to TINYINT UNSIGNED + private String usertypeName; + private String description; + private Status status; // Typically 'A' for active, 'I' for inactive + private int createdBy; + private int lastUpdatedBy; + +} + diff --git a/src/main/java/com/sahyog/app/inbound/user/dto/UserUpdateDTO.java b/src/main/java/com/sahyog/app/inbound/user/dto/UserUpdateDTO.java new file mode 100644 index 0000000..7da7327 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/dto/UserUpdateDTO.java @@ -0,0 +1,30 @@ +package com.sahyog.app.inbound.user.dto; + +import com.sahyog.app.inbound.user.enums.Status; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class UserUpdateDTO { + private int userId; + private short userTypeId; + private String userName; + private String firstName; + private String middleName; + private String lastName; + private String emailId; + private String phoneNumber; + private String userEmpTransCode; + private String addedChannel; + private Status status; + private int createdBy; // User ID of the creator + private int lastUpdatedBy; +} diff --git a/src/main/java/com/sahyog/app/inbound/user/enums/RoleType.java b/src/main/java/com/sahyog/app/inbound/user/enums/RoleType.java new file mode 100644 index 0000000..71c021f --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/enums/RoleType.java @@ -0,0 +1,20 @@ +package com.sahyog.app.inbound.user.enums; + + + public enum RoleType { + ADMIN("Admin"), + GUEST("Guest"), + USER("User"), + MANAGER("Manager"); + + private final String name; + + RoleType(String name) { + this.name = name; + } + + public String getName() { + return name; + } + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/enums/Status.java b/src/main/java/com/sahyog/app/inbound/user/enums/Status.java new file mode 100644 index 0000000..61eb1c4 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/enums/Status.java @@ -0,0 +1,7 @@ +package com.sahyog.app.inbound.user.enums; + +public enum Status { + + A, + I +} diff --git a/src/main/java/com/sahyog/app/inbound/user/enums/UserType.java b/src/main/java/com/sahyog/app/inbound/user/enums/UserType.java new file mode 100644 index 0000000..5fc56b8 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/enums/UserType.java @@ -0,0 +1,6 @@ +package com.sahyog.app.inbound.user.enums; + +public enum UserType { + INTERNAL, + TRANSPORTER +} diff --git a/src/main/java/com/sahyog/app/inbound/user/enums/UserTypeEnum.java b/src/main/java/com/sahyog/app/inbound/user/enums/UserTypeEnum.java new file mode 100644 index 0000000..b189fe3 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/enums/UserTypeEnum.java @@ -0,0 +1,27 @@ +package com.sahyog.app.inbound.user.enums; + +public enum UserTypeEnum { + TRANSPORTER("Transporter"), + MIS("MIS"); + + private final String userTypeName; + + UserTypeEnum(String userTypeName) { + this.userTypeName = userTypeName; + } + + public String getUserTypeName() { + return userTypeName; + } + + // Method to get UserTypeEnum by userTypeName + public static UserTypeEnum fromString(String userTypeName) { + for (UserTypeEnum userType : values()) { + if (userType.getUserTypeName().equalsIgnoreCase(userTypeName)) { + return userType; + } + } + throw new IllegalArgumentException("No enum constant with name " + userTypeName); + } +} + diff --git a/src/main/java/com/sahyog/app/inbound/user/exception/CustomException.java b/src/main/java/com/sahyog/app/inbound/user/exception/CustomException.java new file mode 100644 index 0000000..aa62568 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/exception/CustomException.java @@ -0,0 +1,12 @@ +package com.sahyog.app.inbound.user.exception; + +public class CustomException extends RuntimeException { + + public CustomException(String message) { + super(message); + } + + public CustomException(String message, Throwable cause) { + super(message, cause); + } +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/exception/GlobalExceptionHandler.java b/src/main/java/com/sahyog/app/inbound/user/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..242891b --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/exception/GlobalExceptionHandler.java @@ -0,0 +1,38 @@ +package com.sahyog.app.inbound.user.exception; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class GlobalExceptionHandler { + + private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class); + + @ExceptionHandler(RoleAlreadyExistsException.class) + public ResponseEntity handleRoleAlreadyExistsException(RoleAlreadyExistsException ex) { + log.error("RoleAlreadyExistsException occurred: {}", ex.getMessage(), ex); + return new ResponseEntity<>(ex.getMessage(), HttpStatus.CONFLICT); + } + + @ExceptionHandler(UserAlreadyExistsException.class) + public ResponseEntity handleUserAlreadyExistsException(UserAlreadyExistsException ex) { + log.error("UserAlreadyExistsException occurred: {}", ex.getMessage(), ex); + return ResponseEntity.status(HttpStatus.CONFLICT).body(ex.getMessage()); + } + + @ExceptionHandler(IllegalArgumentException.class) + public ResponseEntity handleIllegalArgumentException(IllegalArgumentException ex) { + log.warn("IllegalArgumentException occurred: {}", ex.getMessage(), ex); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage()); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleGenericException(Exception ex) { + log.error("Unexpected error occurred: {}", ex.getMessage(), ex); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("An unexpected error occurred."); + } +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/exception/RoleAlreadyExistsException.java b/src/main/java/com/sahyog/app/inbound/user/exception/RoleAlreadyExistsException.java new file mode 100644 index 0000000..3c0bd9b --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/exception/RoleAlreadyExistsException.java @@ -0,0 +1,7 @@ +package com.sahyog.app.inbound.user.exception; + +public class RoleAlreadyExistsException extends RuntimeException { + public RoleAlreadyExistsException(String message) { + super(message); + } +} diff --git a/src/main/java/com/sahyog/app/inbound/user/exception/RoleNotFoundException.java b/src/main/java/com/sahyog/app/inbound/user/exception/RoleNotFoundException.java new file mode 100644 index 0000000..5cb0d9a --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/exception/RoleNotFoundException.java @@ -0,0 +1,7 @@ +package com.sahyog.app.inbound.user.exception; + +public class RoleNotFoundException extends RuntimeException { + public RoleNotFoundException(String message) { + super(message); + } +} diff --git a/src/main/java/com/sahyog/app/inbound/user/exception/TransporterProcessingException.java b/src/main/java/com/sahyog/app/inbound/user/exception/TransporterProcessingException.java new file mode 100644 index 0000000..873bc11 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/exception/TransporterProcessingException.java @@ -0,0 +1,12 @@ +package com.sahyog.app.inbound.user.exception; + + +public class TransporterProcessingException extends RuntimeException { + public TransporterProcessingException(String message) { + super(message); + } + + public TransporterProcessingException(String message, Throwable cause) { + super(message, cause); + } +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/exception/UserAlreadyExistsException.java b/src/main/java/com/sahyog/app/inbound/user/exception/UserAlreadyExistsException.java new file mode 100644 index 0000000..26e3f41 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/exception/UserAlreadyExistsException.java @@ -0,0 +1,8 @@ +package com.sahyog.app.inbound.user.exception; + +public class UserAlreadyExistsException extends RuntimeException{ + public UserAlreadyExistsException(String message) { + super(message); + } + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/exception/UserNotFoundException.java b/src/main/java/com/sahyog/app/inbound/user/exception/UserNotFoundException.java new file mode 100644 index 0000000..f49025f --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/exception/UserNotFoundException.java @@ -0,0 +1,8 @@ +package com.sahyog.app.inbound.user.exception; + + +public class UserNotFoundException extends RuntimeException { + public UserNotFoundException(String message) { + super(message); + } +} diff --git a/src/main/java/com/sahyog/app/inbound/user/mapper/RoleMapper.java b/src/main/java/com/sahyog/app/inbound/user/mapper/RoleMapper.java new file mode 100644 index 0000000..39b35a3 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/mapper/RoleMapper.java @@ -0,0 +1,29 @@ +package com.sahyog.app.inbound.user.mapper; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; + +import org.springframework.stereotype.Component; + +import com.sahyog.app.inbound.user.dto.RoleDTO; +import com.sahyog.app.inbound.user.model.Role; +import com.sahyog.app.inbound.user.model.User; +import com.sahyog.app.inbound.user.model.UserType; + +@Component +public class RoleMapper { + +// public Role toEntity(RoleDTO roleDTO, short userTypeId, int createdBy, int lastUpdatedBy) { +// Role role = new Role(); +// role.setRoleName(roleDTO.getRoleName()); +// role.setRoleDescription(roleDTO.getRoleDescription()); +// role.setUserTypeId(roleDTO.getUserType()); +// role.setStatus(roleDTO.getStatus()); +// role.setCreatedBy(createdBy); +//// role.setLastUpdatedBy(lastUpdatedBy); +//// role.setCreatedOn(LocalDateTime.now()); +//// role.setLastUpdatedOn(LocalDateTime.now()); +// return role; +// } +} diff --git a/src/main/java/com/sahyog/app/inbound/user/mapper/TransporterMapper.java b/src/main/java/com/sahyog/app/inbound/user/mapper/TransporterMapper.java new file mode 100644 index 0000000..2c804c0 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/mapper/TransporterMapper.java @@ -0,0 +1,114 @@ +package com.sahyog.app.inbound.user.mapper; + +import org.springframework.stereotype.Component; + +import com.sahyog.app.inbound.user.dto.TransporterMasterDto; +import com.sahyog.app.inbound.user.dto.TransporterUpdateDTO; +import com.sahyog.app.inbound.user.model.Transporter; +import com.sahyog.app.inbound.user.model.User; + +@Component +public class TransporterMapper { + + /** + * Converts a TransporterMasterDto and User to a Transporter entity. + * + * @param dto the TransporterMasterDto + * @param user the User (creator of the transporter) + * @return the mapped Transporter entity + */ + public Transporter toEntity(TransporterMasterDto dto, User user) { + Transporter transporter = new Transporter(); + transporter.setSupplierCode(dto.getSupplierCode()); + transporter.setPlantCode(dto.getPlantCode()); + transporter.setBpGrouping(dto.getBpGrouping()); + transporter.setSupplierAccountGroup(dto.getSupplierAccountGroup()); + transporter.setTransporterName(dto.getTransporterName()); + transporter.setTransporterFirstName(dto.getTransporterFirstName()); + transporter.setTransporterMiddleName(dto.getTransporterMiddleName()); + transporter.setTransporterLastName(dto.getTransporterLastName()); + transporter.setLegalEntity(dto.getLegalEntity()); + transporter.setPermanentAccountNumber(dto.getPermanentAccountNumber()); + transporter.setStreet(dto.getStreet()); + transporter.setHouseNumber(dto.getHouseNumber()); + transporter.setDistrict(dto.getDistrict()); + transporter.setDifferentCity(dto.getDifferentCity()); + transporter.setPostalCode(dto.getPostalCode()); + transporter.setCity(dto.getCity()); + transporter.setState(dto.getState()); + transporter.setCountry(dto.getCountry()); + transporter.setMobileNumber(dto.getMobileNumber()); + transporter.setEmailId(dto.getEmailId()); + transporter.setGstn(dto.getGstn()); + transporter.setTaxRegime(dto.getTaxRegime()); + transporter.setStatus(dto.getStatus()); + transporter.setShortCode(dto.getShortCode()); + transporter.setTaxCodeDesc(dto.getTaxCodeDesc()); + transporter.setTaxRate(dto.getTaxRate()); + transporter.setCreatedDate(dto.getCreatedDate()); + transporter.setUpdationDate(dto.getUpdationDate()); + transporter.setCreatedBy(user.getUserId()); + transporter.setLastUpdatedBy(user.getUserId()); + return transporter; + } + + /** + * Updates an existing Transporter entity from a TransporterUpdateDTO. + * + * @param transporter the existing Transporter entity + * @param dto the TransporterUpdateDTO + */ + public void updateEntity(Transporter transporter, TransporterUpdateDTO dto) { + transporter.setPlantCode(dto.getPlantCode()); + transporter.setBpGrouping(dto.getBpGrouping()); + transporter.setSupplierAccountGroup(dto.getSupplierAccountGroup()); + transporter.setTransporterName(dto.getTransporterName()); + transporter.setTransporterFirstName(dto.getTransporterFirstName()); + transporter.setTransporterMiddleName(dto.getTransporterMiddleName()); + transporter.setTransporterLastName(dto.getTransporterLastName()); + transporter.setUserId(dto.getUserId()); + transporter.setLegalEntity(dto.getLegalEntity()); + transporter.setPermanentAccountNumber(dto.getPermanentAccountNumber()); + transporter.setStreet(dto.getStreet()); + transporter.setHouseNumber(dto.getHouseNumber()); + transporter.setDistrict(dto.getDistrict()); + transporter.setDifferentCity(dto.getDifferentCity()); + transporter.setPostalCode(dto.getPostalCode()); + transporter.setCity(dto.getCity()); + transporter.setState(dto.getState()); + transporter.setCountry(dto.getCountry()); + transporter.setMobileNumber(dto.getMobileNumber()); + transporter.setEmailId(dto.getEmailId()); + transporter.setGstn(dto.getGstn()); + transporter.setTaxRegime(dto.getTaxRegime()); + transporter.setStatus(dto.getStatus()); + transporter.setShortCode(dto.getShortCode()); + transporter.setTaxCodeDesc(dto.getTaxCodeDesc()); + transporter.setTaxRate(dto.getTaxRate()); + transporter.setLastUpdatedBy(dto.getLastUpdatedBy()); + transporter.setUpdationDate(dto.getUpdationDate()); + transporter.setCreatedDate(dto.getCreatedDate()); + } + + /** + * Converts a TransporterMasterDto to a TransporterUpdateDTO. + * + * @param dto the TransporterMasterDto + * @param integrationUser the User associated with the integration + * @return the TransporterUpdateDTO + */ + public TransporterUpdateDTO toUpdateDTO(TransporterMasterDto dto, User integrationUser) { + TransporterUpdateDTO updateDTO = new TransporterUpdateDTO(); + updateDTO.setPlantCode(dto.getPlantCode()); + updateDTO.setBpGrouping(dto.getBpGrouping()); + updateDTO.setSupplierAccountGroup(dto.getSupplierAccountGroup()); + updateDTO.setTransporterName(dto.getTransporterName()); + updateDTO.setTransporterFirstName(dto.getTransporterFirstName()); + updateDTO.setTransporterMiddleName(dto.getTransporterMiddleName()); + updateDTO.setTransporterLastName(dto.getTransporterLastName()); + updateDTO.setUserId(integrationUser.getUserId()); + updateDTO.setCreatedDate(dto.getCreatedDate()); + updateDTO.setUpdationDate(dto.getUpdationDate()); + return updateDTO; + } +} diff --git a/src/main/java/com/sahyog/app/inbound/user/mapper/UserMapper.java b/src/main/java/com/sahyog/app/inbound/user/mapper/UserMapper.java new file mode 100644 index 0000000..368dce1 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/mapper/UserMapper.java @@ -0,0 +1,47 @@ +package com.sahyog.app.inbound.user.mapper; + +import org.springframework.stereotype.Component; + +import com.sahyog.app.inbound.user.dto.UserDTO; +import com.sahyog.app.inbound.user.enums.Status; +import com.sahyog.app.inbound.user.model.User; + +@Component +public class UserMapper { + + // Mapping UserDTO to User entity + public static User mapToEntity(UserDTO userDTO) { + User user = new User(); + user.setUserId(userDTO.getUserId()); + user.setUserTypeId(userDTO.getUserTypeId()); + user.setUserName(userDTO.getUserName()); + user.setFirstName(userDTO.getFirstName()); + user.setLastName(userDTO.getLastName()); + user.setEmail(userDTO.getEmail()); + user.setMobile(userDTO.getMobile()); + user.setEmployeeTransCode(userDTO.getEmployeeTransCode()); + user.setAddedChannel(userDTO.getAddedChannel()); + user.setStatus(Status.A); // Enum mapping + user.setCreatedBy(userDTO.getCreatedBy()); + user.setLastUpdatedBy(userDTO.getLastUpdatedBy()); + return user; + } + + // Mapping User entity to UserDTO + public static UserDTO mapToDTO(User user) { + UserDTO userDTO = new UserDTO(); + userDTO.setUserId(user.getUserId()); + userDTO.setUserTypeId(user.getUserTypeId()); + userDTO.setUserName(user.getUserName()); + userDTO.setFirstName(user.getFirstName()); + userDTO.setLastName(user.getLastName()); + userDTO.setEmail(user.getEmail()); + userDTO.setMobile(user.getMobile()); + userDTO.setEmployeeTransCode(user.getEmployeeTransCode()); + userDTO.setAddedChannel(user.getAddedChannel()); + userDTO.setStatus(Status.A); // Enum to String + userDTO.setCreatedBy(user.getCreatedBy()); + userDTO.setLastUpdatedBy(user.getLastUpdatedBy()); + return userDTO; + } +} diff --git a/src/main/java/com/sahyog/app/inbound/user/model/Response.java b/src/main/java/com/sahyog/app/inbound/user/model/Response.java new file mode 100644 index 0000000..d9043bc --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/model/Response.java @@ -0,0 +1,52 @@ +package com.sahyog.app.inbound.user.model; + +import java.time.LocalDateTime; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class Response { + private int status; + private String message; + private T data; + private LocalDateTime timestamp; + + // Predefined static responses for common scenarios + public static final Response SUCCESS = new Response<>(200, "Success", null, LocalDateTime.now()); + public static final Response CREATED = new Response<>(201, "Created", null, LocalDateTime.now()); + public static final Response FAILURE = new Response<>(205, "Failed", null, LocalDateTime.now()); + public static final Response NOT_FOUND = new Response<>(404, "Resource not found", null, LocalDateTime.now()); + public static final Response BAD_REQUEST = new Response<>(400, "Bad Request", null, LocalDateTime.now()); + public static final Response SERVER_ERROR = new Response<>(500, "Server Error", null, LocalDateTime.now()); + + // Custom constructor for success with data + public Response(int statusCode, String message, T data) { + this.status = statusCode; + this.message = message; + this.data = data; + this.timestamp = LocalDateTime.now(); + } + + // Custom constructor for messages without data + public Response(int statusCode, String message) { + this(statusCode, message, null); + } + + // Generic method to create success responses with data + public static Response success(T data) { + return new Response<>(200, "Success", data, LocalDateTime.now()); + } + + // Generic method to create error responses + public static Response error(int statusCode, String message) { + return new Response<>(statusCode, message, null, LocalDateTime.now()); + } +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/model/Role.java b/src/main/java/com/sahyog/app/inbound/user/model/Role.java new file mode 100644 index 0000000..913ac45 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/model/Role.java @@ -0,0 +1,61 @@ +package com.sahyog.app.inbound.user.model; + +import java.time.LocalDateTime; + +import com.sahyog.app.inbound.user.enums.RoleType; +import com.sahyog.app.inbound.user.enums.Status; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "rolemaster", indexes = { +// @Index(name = "uk_role_name", columnList = "role_name", unique = true), +// @Index(name = "idx_role_status", columnList = "status") +}) +public class Role { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "role_id", nullable = false, updatable = false) + private int roleId; + + @Column(name = "role_name", length = 30, nullable = false) + private String roleName; + + @Column(name = "rode_description", length = 50, nullable = false) + private String roleDescription; + + @Column(name = "usertype_id", nullable = false) + private short userTypeId; + + + @Enumerated(EnumType.STRING) + @Column(name = "status", length = 1, nullable = false) + private Status status; + + @Column(name = "created_by", nullable = false) + private int createdBy; + + @Column(name = "last_updated_by", nullable = false) + private int lastUpdatedBy; + +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/model/Transporter.java b/src/main/java/com/sahyog/app/inbound/user/model/Transporter.java new file mode 100644 index 0000000..d476a64 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/model/Transporter.java @@ -0,0 +1,135 @@ +package com.sahyog.app.inbound.user.model; + + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +import java.time.LocalDate; +import java.time.LocalDateTime; +@Setter +@Getter +@NoArgsConstructor +@AllArgsConstructor +@ToString +@Entity +@Table(name = "transportermaster", indexes = { + @Index(name = "idx_supplier_code", columnList = "supplier_code"), + @Index(name = "idx_transporter_status", columnList = "status"), + @Index(name = "idx_transporter_plant_code", columnList = "plant_code") +}) +public class Transporter { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "transporter_id", nullable = false, updatable = false) + private int transporterId; + + @Column(name = "plant_id", nullable = false) + private short plantId; + + @Column(name = "plant_code", length = 4, nullable = false) + private String plantCode; + + @Column(name="user_id") + private int userId; + + @Column(name = "BP_GROUPING") + private String bpGrouping; + + @Column(name = "transporter_code", length = 20) + private String transporterCode; + + + @Column(name = "supplier_code", length = 20) + private String supplierCode; + + @Column(name = "supplier_account_group", length = 20) + private String supplierAccountGroup; + + @Column(name = "transporter_name", length = 100, nullable = false) + private String transporterName; + + @Column(name = "transporter_fname", length = 40, nullable = false) + private String transporterFirstName; + + @Column(name = "transporter_mname", length = 30, nullable = false) + private String transporterMiddleName; + + @Column(name = "transporter_lname", length = 30, nullable = false) + private String transporterLastName; + + @Column(name = "legal_entity", length = 100) + private String legalEntity; + + @Column(name = "permanent_account_number", length = 10) + private String permanentAccountNumber; + + @Column(name = "street", length = 40) + private String street; + + @Column(name = "house_number", length = 10) + private String houseNumber; + + @Column(name = "district", length = 40) + private String district; + + @Column(name = "different_city", length = 40) + private String differentCity; + + @Column(name = "postal_code", length = 10) + private String postalCode; + + @Column(name = "city", length = 40) + private String city; + + @Column(name = "country", length = 40) + private String country; + + @Column(name = "state", length = 40) + private String state; + + @Column(name = "mobile_number", length = 10) + private String mobileNumber; + + @Column(name = "email_id", length = 50) + private String emailId; + + @Column(name = "gstn", length = 40) + private String gstn; + + @Column(name = "tax_regime", length = 10) + private String taxRegime; + + @Column(name = "short_code", length = 40) + private String shortCode; + + @Column(name = "created_date") + private LocalDate createdDate; + + @Column(name = "updation_date") + private LocalDate updationDate; + + @Column(name = "tax_code_desc") + private String taxCodeDesc; + + @Column(name = "tax_rate") + private Integer taxRate; + + @Column(name = "status", length = 1, nullable = false) + private String status; + + @Column(name = "created_by", nullable = false) + private int createdBy; + + @Column(name = "last_updated_by", nullable = false) + private int lastUpdatedBy; + + + + +} + diff --git a/src/main/java/com/sahyog/app/inbound/user/model/User.java b/src/main/java/com/sahyog/app/inbound/user/model/User.java new file mode 100644 index 0000000..dc44937 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/model/User.java @@ -0,0 +1,70 @@ +package com.sahyog.app.inbound.user.model; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +import java.time.LocalDateTime; + +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import com.sahyog.app.inbound.user.enums.Status; + + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@ToString +@Entity +@Table(name = "usermaster") +public class User { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "user_id", nullable = false, updatable = false) + private Integer userId; + + @Column(name="usertype_id") + private Integer userTypeId; + + @Column(name = "user_name", length = 80, nullable = false) + private String userName; + + @Column(name = "user_fname", length = 40, nullable = false) + private String firstName; + + @Column(name = "user_lname", length = 40) + private String lastName; + + @Column(name = "user_email", length = 40, nullable = false, unique = true) + private String email; + + @Column(name = "user_mobile", length = 10) + private String mobile; + + @Column(name = "user_emp_trans_code", length = 20) + private String employeeTransCode; + + @Column(name = "user_added_channel", length = 1, nullable = false) + private String addedChannel; + + @Enumerated(EnumType.STRING) + @Column(name = "status", length = 1, nullable = false) + private Status status; // Typically a char field like 'A' or 'I' + + @Column(name = "created_by", nullable = false) + private Integer createdBy; + + @Column(name = "last_updated_by", nullable = false) + private Integer lastUpdatedBy; + + +} + + diff --git a/src/main/java/com/sahyog/app/inbound/user/model/UserRole.java b/src/main/java/com/sahyog/app/inbound/user/model/UserRole.java new file mode 100644 index 0000000..a3a5a59 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/model/UserRole.java @@ -0,0 +1,48 @@ +package com.sahyog.app.inbound.user.model; + + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import java.time.LocalDateTime; + +import com.sahyog.app.inbound.user.enums.Status; +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "userrole") + +public class UserRole { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "userrole_id") + private int userRoleId; + + @Column(name = "user_id") + private int userId; + + @Column(name = "role_id") + private int roleId; + + @Enumerated(EnumType.STRING) + @Column(name = "status", length = 1, nullable = false) + private Status status; + + @Column(name = "created_by", nullable = false) + private int createdBy; + + @Column(name = "last_updated_by", nullable = false) + private int lastUpdatedBy; + +} + diff --git a/src/main/java/com/sahyog/app/inbound/user/model/UserType.java b/src/main/java/com/sahyog/app/inbound/user/model/UserType.java new file mode 100644 index 0000000..4b2c4e5 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/model/UserType.java @@ -0,0 +1,53 @@ +package com.sahyog.app.inbound.user.model; + +import com.sahyog.app.inbound.user.enums.Status; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "usertypemaster") +public class UserType { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "usertype_id", nullable = false, updatable = false) + private Integer userTypeId; + + @Column(name = "usertype_name", length = 255, unique = true) + private String usertypeName; // Ensure this matches the repository method + + @Column(name = "usertype_description", length = 255) + private String description; + + @Enumerated(EnumType.STRING) + @Column(name = "status", length = 1) + private Status status; + + @Column(name = "created_by", nullable = false) + private Integer createdBy; + + @Column(name = "last_updated_by", nullable = false) + private Integer lastUpdatedBy; + + // getters and setters +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/repository/RoleRepository.java b/src/main/java/com/sahyog/app/inbound/user/repository/RoleRepository.java new file mode 100644 index 0000000..b4d8734 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/repository/RoleRepository.java @@ -0,0 +1,14 @@ +package com.sahyog.app.inbound.user.repository; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.sahyog.app.inbound.user.model.Role; + +public interface RoleRepository extends JpaRepository { + + List findByUserTypeId(Integer userTypeId); + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/repository/TransporterRepository.java b/src/main/java/com/sahyog/app/inbound/user/repository/TransporterRepository.java new file mode 100644 index 0000000..8fe394f --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/repository/TransporterRepository.java @@ -0,0 +1,17 @@ +package com.sahyog.app.inbound.user.repository; + + +import java.util.Optional; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.sahyog.app.inbound.user.model.Transporter; + + +@Repository +public interface TransporterRepository extends JpaRepository { + + Optional findBySupplierCode(String supplierCode); + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/repository/UserRepository.java b/src/main/java/com/sahyog/app/inbound/user/repository/UserRepository.java new file mode 100644 index 0000000..bf323bb --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/repository/UserRepository.java @@ -0,0 +1,32 @@ +package com.sahyog.app.inbound.user.repository; + +import java.util.List; +import java.util.Optional; + +import org.springdoc.core.converters.models.Pageable; +import org.springframework.data.domain.Page; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import com.sahyog.app.inbound.user.enums.Status; +import com.sahyog.app.inbound.user.model.User; +import com.sahyog.app.inbound.user.model.UserType; + +@Repository +public interface UserRepository extends JpaRepository { + + + User findByUserTypeId(Integer userTypeId); + + List findByStatusIn(List statuses); + + List findByStatus(Status status); + + User findByEmployeeTransCode(String employeeTransCode); + + @Query(value="SELECT user_Id, usertype_id, user_name, user_fname, user_lname, user_email, user_mobile, " + + "user_emp_trans_code, user_added_channel, created_by, last_updated_by, status FROM UserMaster u " + + "WHERE u.status = 'A' and u.user_name = :userName", nativeQuery = true) + User getUserIDByUserName(String userName); +} diff --git a/src/main/java/com/sahyog/app/inbound/user/repository/UserRoleRepository.java b/src/main/java/com/sahyog/app/inbound/user/repository/UserRoleRepository.java new file mode 100644 index 0000000..caaeb50 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/repository/UserRoleRepository.java @@ -0,0 +1,23 @@ +package com.sahyog.app.inbound.user.repository; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import com.sahyog.app.inbound.user.model.UserRole; + +import feign.Param; + +@Repository +public interface UserRoleRepository extends JpaRepository { + +// @Query(value = "SELECT ur.UserRole_id, ur.status, ur.user_id FROM userrole ur WHERE ur.user_id = :userId AND ur.role_id = :roleId", nativeQuery = true) + Optional findByUserIdAndRoleId(@Param("userId") int userId, @Param("roleId") int roleId); + + // Another example: Find all roles by userId (as JPQL query) + @Query("SELECT ur FROM UserRole ur WHERE ur.userId = :userId") + List findAllRolesByUserId(@Param("userId") int userId); +} diff --git a/src/main/java/com/sahyog/app/inbound/user/repository/UserTypeRepository.java b/src/main/java/com/sahyog/app/inbound/user/repository/UserTypeRepository.java new file mode 100644 index 0000000..9ee2a9e --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/repository/UserTypeRepository.java @@ -0,0 +1,18 @@ +package com.sahyog.app.inbound.user.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import com.sahyog.app.inbound.user.model.UserType; + +import feign.Param; + +@Repository +public interface UserTypeRepository extends JpaRepository { + +// @Query("SELECT u FROM usertypemaster1 WHERE LOWER(usertype_name) = LOWER(:usertypeName)") + UserType findByUsertypeName(@Param("usertypeName") String usertypeName); +// UserType findByUsertypeName(String usertypeName); // Correct the method name + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/service/RoleService.java b/src/main/java/com/sahyog/app/inbound/user/service/RoleService.java new file mode 100644 index 0000000..09e9fc8 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/service/RoleService.java @@ -0,0 +1,26 @@ +package com.sahyog.app.inbound.user.service; + +import java.util.List; + +import com.sahyog.app.inbound.user.dto.RoleDTO; +import com.sahyog.app.inbound.user.model.Role; + +public interface RoleService { + +// Role createRole(RoleDTO roleDTO); +// +// List getAllRoles(); +// +// Role getRoleById(int id); +// +// Role updateRole(int id, RoleDTO roleDTO); +// +// void deleteRole(int id); +// +// List getRolesByUserTypeId(int userTypeId); + +// List getRolesByUserTypeId(int userTypeId); + + + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/service/TransporterService.java b/src/main/java/com/sahyog/app/inbound/user/service/TransporterService.java new file mode 100644 index 0000000..be63943 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/service/TransporterService.java @@ -0,0 +1,29 @@ +package com.sahyog.app.inbound.user.service; + +import java.util.List; + +import org.springframework.http.ResponseEntity; + +import com.sahyog.app.inbound.user.dto.TransporterMasterDto; +import com.sahyog.app.inbound.user.dto.TransporterUpdateDTO; + + +public interface TransporterService { + + +// ResponseEntity updateTransporter(Long transporterId, TransporterUpdateDTO transporterUpdateDTO); + +// boolean updateTransporterBySupplier(String supplier, TransporterUpdateDTO transporterUpdateDTO); + +// boolean updateTransporters(List transporterUpdateDTOList); + + void processTransporters(List dtos); + + boolean updateTransporters(List transporterUpdateDTOList); + + ResponseEntity updateTransporter(int transporterId, TransporterUpdateDTO transporterUpdateDTO); + + + + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/service/UserRoleService.java b/src/main/java/com/sahyog/app/inbound/user/service/UserRoleService.java new file mode 100644 index 0000000..7c5504d --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/service/UserRoleService.java @@ -0,0 +1,14 @@ +package com.sahyog.app.inbound.user.service; + +import com.sahyog.app.inbound.user.dto.UserRoleDTO; + +public interface UserRoleService { + + + UserRoleDTO createUserRole(UserRoleDTO userRoleDTO, Integer userTypeId); + + void assignRolesToUser(Integer userId, Integer userTypeId); + + + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/service/UserService.java b/src/main/java/com/sahyog/app/inbound/user/service/UserService.java new file mode 100644 index 0000000..7daa4e9 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/service/UserService.java @@ -0,0 +1,38 @@ +package com.sahyog.app.inbound.user.service; + + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.domain.Page; +import org.springframework.http.ResponseEntity; + +import com.sahyog.app.inbound.user.dto.UserDTO; +import com.sahyog.app.inbound.user.dto.UserUpdateDTO; +import com.sahyog.app.inbound.user.model.User; + +public interface UserService { + + +// List createUsers(List userDTOs); + +// ResponseEntity updateUser(String userEmpTransCode, UserUpdateDTO userUpdateDTO); + + List getActiveUsers(); + + List getUsersByStatus(List status); + + List createInternalUsers(List userDTOs); + + Page getAllUsers(int page, int size); + + List createUsers(List userDTOs); + + ResponseEntity updateUser(String employeeTransCode, UserUpdateDTO userUpdateDTO); + + /** + * Retrieves User based on Name passed. + */ + UserDTO getUserIDByUserName(String userName); + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/service/UserTypeService.java b/src/main/java/com/sahyog/app/inbound/user/service/UserTypeService.java new file mode 100644 index 0000000..453ab6a --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/service/UserTypeService.java @@ -0,0 +1,21 @@ +package com.sahyog.app.inbound.user.service; + +import java.util.List; + +import com.sahyog.app.inbound.user.dto.UserTypeDTO; +import com.sahyog.app.inbound.user.model.UserType; + +public interface UserTypeService { + + List getAllUserTypes(); +// + UserType getUserTypeById(short id); +// +//// UserType updateUserType(Long id, UserType userTypeDetails); +// + void updateUserTypeStatus(short userTypeId); +// + UserType createUserType(UserTypeDTO userTypeDTO); + + +} diff --git a/src/main/java/com/sahyog/app/inbound/user/serviceImpl/RoleServiceImpl.java b/src/main/java/com/sahyog/app/inbound/user/serviceImpl/RoleServiceImpl.java new file mode 100644 index 0000000..36198c6 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/serviceImpl/RoleServiceImpl.java @@ -0,0 +1,112 @@ +package com.sahyog.app.inbound.user.serviceImpl; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.sahyog.app.inbound.user.dto.RoleDTO; +import com.sahyog.app.inbound.user.mapper.RoleMapper; +import com.sahyog.app.inbound.user.model.Role; +import com.sahyog.app.inbound.user.model.User; +import com.sahyog.app.inbound.user.model.UserType; +import com.sahyog.app.inbound.user.repository.RoleRepository; +import com.sahyog.app.inbound.user.repository.UserRepository; +import com.sahyog.app.inbound.user.repository.UserRoleRepository; +import com.sahyog.app.inbound.user.repository.UserTypeRepository; +import com.sahyog.app.inbound.user.service.RoleService; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; +@Service +public class RoleServiceImpl implements RoleService { + + @Autowired + private RoleRepository roleRepository; + + @Autowired + private RoleMapper roleMapper; + + @Autowired + private UserRepository userRepository; + + @Autowired + private UserRoleRepository userRoleRepository; + + @Autowired + private UserTypeRepository userTypeRepository; +// +// @Override +// public List getRolesByUserTypeId(int userTypeId) { +// List roles = roleRepository.findByUserTypeId(userTypeId); +// return roleMapper.mapToDTOList(roles); +// } + +// @Override +// public Role createRole(RoleDTO roleDTO) { +// UserType userType = userTypeRepository.findById(roleDTO.getUserType().getUserTypeId()) +// .orElseThrow(() -> new IllegalArgumentException("Invalid UserType ID")); +// User createdBy = userRepository.findById(roleDTO.getCreatedBy().getUserId()) +// .orElseThrow(() -> new IllegalArgumentException("Invalid CreatedBy User ID")); +// User lastUpdatedBy = userRepository.findById(roleDTO.getLastUpdatedBy().getUserId()) +// .orElseThrow(() -> new IllegalArgumentException("Invalid LastUpdatedBy User ID")); +// +// Role role = roleMapper.toEntity(roleDTO, userType, createdBy, lastUpdatedBy); +// return roleRepository.save(role); +// } +// +// @Override +// public List getRolesByUserTypeId(int userTypeId) { +// return roleRepository.findByUserTypeId(userTypeId); +// } +// +// +// @Override +// public List getAllRoles() { +// return roleRepository.findAll(); +// } +// +// +// @Override +// public Role getRoleById(int id) { +// return roleRepository.findById(id) +// .orElseThrow(() -> new IllegalArgumentException("Role not found")); +// } +// +// +// @Override +// public Role updateRole(int id, RoleDTO roleDTO) { +// Role existingRole = roleRepository.findById(id) +// .orElseThrow(() -> new IllegalArgumentException("Role not found")); +// +// UserType userType = userTypeRepository.findById(roleDTO.getUserType().getUserTypeId() +// ) +// .orElseThrow(() -> new IllegalArgumentException("Invalid UserType ID")); +// User createdBy = userRepository.findById(roleDTO.getCreatedBy().getUserId()) +// .orElseThrow(() -> new IllegalArgumentException("Invalid CreatedBy User ID")); +// User lastUpdatedBy = userRepository.findById(roleDTO.getLastUpdatedBy().getUserId()) +// .orElseThrow(() -> new IllegalArgumentException("Invalid LastUpdatedBy User ID")); +// +// existingRole.setRoleName(roleDTO.getRoleName()); +// existingRole.setRoleDescription(roleDTO.getRoleDescription()); +// existingRole.setUserType(userType); +// existingRole.setStatus(roleDTO.getStatus()); +// existingRole.setLastUpdatedBy(lastUpdatedBy); +//// existingRole.setLastUpdatedOn(LocalDateTime.now()); +// +// return roleRepository.save(existingRole); +// } +// +// +// @Override +// public void deleteRole(int id) { +// Role role = roleRepository.findById(id) +// .orElseThrow(() -> new IllegalArgumentException("Role not found")); +// roleRepository.delete(role); +// } +// + + + + +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/serviceImpl/TransporterServiceImpl.java b/src/main/java/com/sahyog/app/inbound/user/serviceImpl/TransporterServiceImpl.java new file mode 100644 index 0000000..0e7b578 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/serviceImpl/TransporterServiceImpl.java @@ -0,0 +1,353 @@ +package com.sahyog.app.inbound.user.serviceImpl; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + +import com.sahyog.app.inbound.user.dto.TransporterMasterDto; +import com.sahyog.app.inbound.user.dto.TransporterUpdateDTO; +import com.sahyog.app.inbound.user.dto.UserDTO; +import com.sahyog.app.inbound.user.enums.Status; +import com.sahyog.app.inbound.user.exception.TransporterProcessingException; +import com.sahyog.app.inbound.user.mapper.TransporterMapper; +import com.sahyog.app.inbound.user.mapper.UserMapper; +import com.sahyog.app.inbound.user.model.Transporter; +import com.sahyog.app.inbound.user.model.User; +import com.sahyog.app.inbound.user.model.UserType; +import com.sahyog.app.inbound.user.repository.TransporterRepository; +import com.sahyog.app.inbound.user.repository.UserRepository; +import com.sahyog.app.inbound.user.repository.UserTypeRepository; +import com.sahyog.app.inbound.user.service.TransporterService; +import com.sahyog.app.inbound.user.service.UserService; + +import jakarta.transaction.Transactional; + +@Service("TransporterService") +public class TransporterServiceImpl implements TransporterService { + + private static final Logger log = LoggerFactory.getLogger(TransporterServiceImpl.class); + + @Autowired + private TransporterRepository transporterRepository; + + @Autowired + private UserService userService; + + @Autowired + private UserRepository userRepository; + + @Autowired + private UserTypeRepository userTypeRepository; + + @Autowired + private TransporterMapper transporterMapper; + + @Autowired + private UserMapper userMapper; + + @Transactional + @Override + public void processTransporters(List transporterMasterDtos) { + log.info("Processing {} transporter records.", transporterMasterDtos.size()); + // Fetch the user based on userTypeId (IntegrationUser) + String usertypeName="INTGUSER"; + User user = fetchUserByUserTypeName(usertypeName); + + try { + // Prepare a list of UserDTOs for all transporters + List userDTOs = transporterMasterDtos.stream() + .map(this::prepareUserDTO) + .collect(Collectors.toList()); + + // Create users and get their IDs + List userIds = userService.createUsers(userDTOs); + + // Map supplier codes to user IDs + Map supplierToUserIdMap = new HashMap<>(); + for (int i = 0; i < transporterMasterDtos.size(); i++) { + supplierToUserIdMap.put(transporterMasterDtos.get(i).getSupplierCode(), userIds.get(i)); + } + + // Process each transporter + for (TransporterMasterDto dto : transporterMasterDtos) { + int userId = supplierToUserIdMap.get(dto.getSupplierCode()); + + // Check for existing transporter + Optional existingTransporter = transporterRepository.findBySupplierCode(dto.getSupplierCode()); + + if (existingTransporter.isPresent()) { + log.warn("Transporter with supplier code {} already exists. Updating.", dto.getSupplierCode()); + // Update existing transporter + boolean updated = updateTransporters(List.of(prepareTransporterUpdateDTO(dto, user))); + if (!updated) { + log.error("Failed to update transporter with supplier code: {}", dto.getSupplierCode()); + } + continue; // Skip saving a new transporter, since we updated the existing one + } + + // Create and save transporter + Transporter transporter = convertToEntity(dto, user); + transporter.setUserId(userId); + transporterRepository.save(transporter); + } + + log.info("Successfully processed and saved all transporter records."); + } catch (Exception e) { + log.error("Error processing transporter records: {}", e.getMessage(), e); + throw new TransporterProcessingException("Failed to process transporter data.", e); + } + } + + // Move this method to a dedicated repository or service class if needed + private User fetchUserByUserTypeName(String usertypeName) { + log.debug("Fetching user by usertype_name: {}", usertypeName); + + UserType userType = userTypeRepository.findByUsertypeName(usertypeName); + if (userType == null) { + log.error("UserType not found: {}", usertypeName); + throw new IllegalStateException("UserType '" + usertypeName + "' not found"); + } + + Integer userTypeId = userType.getUserTypeId(); + User user = userRepository.findByUserTypeId(userTypeId); + if (user == null) { + log.error("No user found for UserTypeId: {}", userTypeId); + throw new IllegalStateException("No user found for userTypeId: " + userTypeId); + } + + log.debug("User fetched: {}", user); + return user; + } + + + private TransporterUpdateDTO prepareTransporterUpdateDTO(TransporterMasterDto dto, User user) { + TransporterUpdateDTO updateDTO = new TransporterUpdateDTO(); + updateDTO.setSupplierCode(dto.getSupplierCode()); + updateDTO.setTransporterCode(dto.getTransporterCode()); + updateDTO.setPlantCode(dto.getPlantCode()); + updateDTO.setBpGrouping(dto.getBpGrouping()); + updateDTO.setSupplierAccountGroup(dto.getSupplierAccountGroup()); + updateDTO.setTransporterName(dto.getTransporterName()); + updateDTO.setTransporterFirstName(dto.getTransporterFirstName()); + updateDTO.setTransporterMiddleName(dto.getTransporterMiddleName()); + updateDTO.setTransporterLastName(dto.getTransporterLastName()); + updateDTO.setLegalEntity(dto.getLegalEntity()); + updateDTO.setPermanentAccountNumber(dto.getPermanentAccountNumber()); + updateDTO.setStreet(dto.getStreet()); + updateDTO.setHouseNumber(dto.getHouseNumber()); + updateDTO.setDistrict(dto.getDistrict()); + updateDTO.setDifferentCity(dto.getDifferentCity()); + updateDTO.setPostalCode(dto.getPostalCode()); + updateDTO.setCity(dto.getCity()); + updateDTO.setState(dto.getState()); + updateDTO.setCountry(dto.getCountry()); + updateDTO.setMobileNumber(dto.getMobileNumber()); + updateDTO.setEmailId(dto.getEmailId()); + updateDTO.setGstn(dto.getGstn()); + updateDTO.setTaxRegime(dto.getTaxRegime()); + updateDTO.setStatus(dto.getStatus()); + updateDTO.setShortCode(dto.getShortCode()); + updateDTO.setTaxCodeDesc(dto.getTaxCodeDesc()); + updateDTO.setCreatedDate(dto.getCreatedDate()); + updateDTO.setUpdationDate(dto.getUpdationDate()); + updateDTO.setTaxRate(dto.getTaxRate()); + updateDTO.setCreatedBy(user.getUserId()); + updateDTO.setLastUpdatedBy(user.getUserId()); + + return updateDTO; + } + + + + private UserDTO prepareUserDTO(TransporterMasterDto dto) { + log.debug("Preparing UserDTO for supplier code: {}", dto.getSupplierCode()); + + String usertypeName="Transporter"; + UserType userType = userTypeRepository.findByUsertypeName(usertypeName); + if (userType == null) { + throw new IllegalStateException("UserType 'Transporter' not found"); + } + + UserDTO userDTO = new UserDTO(); + userDTO.setUserTypeId(userType.getUserTypeId()); + userDTO.setUserName(dto.getTransporterName()); + userDTO.setFirstName(dto.getTransporterFirstName()); + userDTO.setLastName(dto.getTransporterLastName()); + userDTO.setEmail(dto.getEmailId()); + userDTO.setMobile(dto.getMobileNumber()); + userDTO.setEmployeeTransCode(dto.getSupplierCode()); + userDTO.setAddedChannel("B"); + userDTO.setStatus(Status.A); + userDTO.setCreatedBy(dto.getCreatedBy()); + userDTO.setLastUpdatedBy(dto.getLastUpdatedBy()); + + return userDTO; + } + + private Transporter convertToEntity(TransporterMasterDto dto, User user) { + log.info("Converting TransporterRequestDto to Transporter entity for supplier code: {}", dto.getSupplierCode()); + + Transporter transporter = new Transporter(); + transporter.setSupplierCode(dto.getSupplierCode()); + transporter.setPlantCode(dto.getPlantCode()); + transporter.setTransporterCode(dto.getTransporterCode()); + transporter.setBpGrouping(dto.getBpGrouping()); + transporter.setSupplierAccountGroup(dto.getSupplierAccountGroup()); + transporter.setTransporterName(dto.getTransporterName()); + transporter.setTransporterFirstName(dto.getTransporterFirstName()); + transporter.setTransporterMiddleName(dto.getTransporterMiddleName()); + transporter.setTransporterLastName(dto.getTransporterLastName()); + transporter.setLegalEntity(dto.getLegalEntity()); + transporter.setPermanentAccountNumber(dto.getPermanentAccountNumber()); + transporter.setStreet(dto.getStreet()); + transporter.setHouseNumber(dto.getHouseNumber()); + transporter.setDistrict(dto.getDistrict()); + transporter.setDifferentCity(dto.getDifferentCity()); + transporter.setPostalCode(dto.getPostalCode()); + transporter.setCity(dto.getCity()); + transporter.setState(dto.getState()); + transporter.setCountry(dto.getCountry()); + transporter.setMobileNumber(dto.getMobileNumber()); + transporter.setEmailId(dto.getEmailId()); + transporter.setGstn(dto.getGstn()); + transporter.setTaxRegime(dto.getTaxRegime()); + transporter.setStatus(dto.getStatus()); + transporter.setShortCode(dto.getShortCode()); + transporter.setCreatedDate(dto.getCreatedDate()); + transporter.setUpdationDate(dto.getUpdationDate()); + transporter.setTaxCodeDesc(dto.getTaxCodeDesc()); + transporter.setTaxRate(dto.getTaxRate()); + transporter.setCreatedBy(user.getUserId()); + transporter.setLastUpdatedBy(user.getUserId()); + + return transporter; + } + + @Override + public ResponseEntity updateTransporter(int transporterId, TransporterUpdateDTO transporterUpdateDTO) { + Optional existingTransporter = transporterRepository.findById(transporterId); + + if (existingTransporter.isPresent()) { + Transporter transporter = existingTransporter.get(); + updateTransporterFields(transporter, transporterUpdateDTO); + transporterRepository.save(transporter); + return ResponseEntity.status(HttpStatus.OK).body("Transporter updated successfully."); + } else { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Transporter not found with ID: " + transporterId); + } + } + + private void updateTransporterFields(Transporter transporter, TransporterUpdateDTO dto) { + transporter.setPlantCode(dto.getPlantCode()); + transporter.setBpGrouping(dto.getBpGrouping()); + transporter.setTransporterCode(dto.getTransporterCode()); + transporter.setSupplierAccountGroup(dto.getSupplierAccountGroup()); + transporter.setTransporterName(dto.getTransporterName()); + transporter.setTransporterFirstName(dto.getTransporterFirstName()); + transporter.setTransporterMiddleName(dto.getTransporterMiddleName()); + transporter.setTransporterLastName(dto.getTransporterLastName()); + transporter.setUserId(dto.getUserId()); + transporter.setLegalEntity(dto.getLegalEntity()); + transporter.setPermanentAccountNumber(dto.getPermanentAccountNumber()); + transporter.setStreet(dto.getStreet()); + transporter.setHouseNumber(dto.getHouseNumber()); + transporter.setDistrict(dto.getDistrict()); + transporter.setDifferentCity(dto.getDifferentCity()); + transporter.setPostalCode(dto.getPostalCode()); + transporter.setCity(dto.getCity()); + transporter.setState(dto.getState()); + transporter.setCountry(dto.getCountry()); + transporter.setMobileNumber(dto.getMobileNumber()); + transporter.setEmailId(dto.getEmailId()); + transporter.setGstn(dto.getGstn()); + transporter.setTaxRegime(dto.getTaxRegime()); + transporter.setStatus(dto.getStatus()); + transporter.setShortCode(dto.getShortCode()); + transporter.setTaxCodeDesc(dto.getTaxCodeDesc()); + transporter.setTaxRate(dto.getTaxRate()); + transporter.setLastUpdatedBy(dto.getLastUpdatedBy()); + transporter.setUpdationDate(dto.getUpdationDate()); + transporter.setCreatedDate(dto.getCreatedDate()); + } + + @Transactional + @Override + public boolean updateTransporters(List transporterUpdateDTOList) { + boolean allUpdatesSuccessful = true; + List skippedSuppliers = new ArrayList<>(); // To track skipped suppliers + + for (TransporterUpdateDTO dto : transporterUpdateDTOList) { + try { + Optional existingTransporterOpt = transporterRepository.findBySupplierCode(dto.getSupplierCode()); + + if (existingTransporterOpt.isPresent()) { + Transporter transporter = existingTransporterOpt.get(); + + // Set userId + Integer userId = dto.getUserId(); + transporter.setUserId(userId); + + // Update transporter fields from DTO + updateTransporterFromDTO(transporter, dto); + + // Save the updated transporter + transporterRepository.save(transporter); + + log.info("Transporter with supplier {} updated successfully.", dto.getSupplierCode()); + } else { + log.warn("Transporter with supplier {} not found. Skipping update.", dto.getSupplierCode()); + skippedSuppliers.add(dto.getSupplierCode()); + } + } catch (Exception e) { + log.error("Error updating transporter with supplier {}: {}", dto.getSupplierCode(), e.getMessage()); + allUpdatesSuccessful = false; + } + } + + if (!skippedSuppliers.isEmpty()) { + log.warn("Updates skipped for suppliers: {}", skippedSuppliers); + } + + return allUpdatesSuccessful; + } + + private void updateTransporterFromDTO(Transporter transporter, TransporterUpdateDTO dto) { + transporter.setPlantCode(dto.getPlantCode()); + transporter.setBpGrouping(dto.getBpGrouping()); + transporter.setSupplierAccountGroup(dto.getSupplierAccountGroup()); + transporter.setTransporterName(dto.getTransporterName()); + transporter.setTransporterFirstName(dto.getTransporterFirstName()); + transporter.setTransporterMiddleName(dto.getTransporterMiddleName()); + transporter.setTransporterLastName(dto.getTransporterLastName()); + transporter.setLegalEntity(dto.getLegalEntity()); + transporter.setPermanentAccountNumber(dto.getPermanentAccountNumber()); + transporter.setStreet(dto.getStreet()); + transporter.setHouseNumber(dto.getHouseNumber()); + transporter.setDistrict(dto.getDistrict()); + transporter.setDifferentCity(dto.getDifferentCity()); + transporter.setPostalCode(dto.getPostalCode()); + transporter.setCity(dto.getCity()); + transporter.setState(dto.getState()); + transporter.setCountry(dto.getCountry()); + transporter.setMobileNumber(dto.getMobileNumber()); + transporter.setEmailId(dto.getEmailId()); + transporter.setGstn(dto.getGstn()); + transporter.setTaxRegime(dto.getTaxRegime()); + transporter.setStatus(dto.getStatus()); + transporter.setShortCode(dto.getShortCode()); + transporter.setTaxCodeDesc(dto.getTaxCodeDesc()); + transporter.setTaxRate(dto.getTaxRate()); + transporter.setLastUpdatedBy(dto.getLastUpdatedBy()); + } + +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/serviceImpl/UserRoleServiceImpl.java b/src/main/java/com/sahyog/app/inbound/user/serviceImpl/UserRoleServiceImpl.java new file mode 100644 index 0000000..1a04dfe --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/serviceImpl/UserRoleServiceImpl.java @@ -0,0 +1,101 @@ +package com.sahyog.app.inbound.user.serviceImpl; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.sahyog.app.inbound.user.dto.UserRoleDTO; +import com.sahyog.app.inbound.user.enums.Status; +import com.sahyog.app.inbound.user.model.Role; +import com.sahyog.app.inbound.user.model.UserRole; +import com.sahyog.app.inbound.user.repository.RoleRepository; +import com.sahyog.app.inbound.user.repository.UserRepository; +import com.sahyog.app.inbound.user.repository.UserRoleRepository; +import com.sahyog.app.inbound.user.service.UserRoleService; + +import jakarta.transaction.Transactional; +import java.util.Optional; +@Service +public class UserRoleServiceImpl implements UserRoleService { + + private static final Logger log = LoggerFactory.getLogger(UserRoleServiceImpl.class); + + + @Autowired + private UserRoleRepository userRoleRepository; + + @Autowired + private UserRepository userRepository; + + @Autowired + private RoleRepository roleRepository; // Inject the role repository to fetch roles based on userTypeId + + @Override + @Transactional + public void assignRolesToUser(Integer userId, Integer userTypeId) { + // Fetch the roles associated with the given userTypeId + List roles = roleRepository.findByUserTypeId(userTypeId); + + // Check if roles are found for the given userTypeId + if (roles.isEmpty()) { + log.debug("No roles found for userTypeId: {}", userTypeId); + return; // Exit if no roles are found + } + + // Iterate over the roles and assign them to the user + for (Role role : roles) { + UserRoleDTO userRoleDTO = new UserRoleDTO(); + userRoleDTO.setUserId(userId); + userRoleDTO.setRoleId(role.getRoleId()); + userRoleDTO.setStatus(Status.A); // Set the role as active + + // Call createUserRole to assign each role to the user + createUserRole(userRoleDTO, userTypeId); + } + } + + @Override + @Transactional + public UserRoleDTO createUserRole(UserRoleDTO userRoleDTO, Integer userTypeId) { + // Fetch the roles associated with the userTypeId + List roles = roleRepository.findByUserTypeId(userTypeId); + + // Validate the roles fetched (check for null or empty roles) + if (roles.isEmpty()) { + log.debug("No roles found for userTypeId: {}", userTypeId); + return userRoleDTO; // Return the DTO without assigning any roles + } + + // User ID of the logged-in user (this would be fetched dynamically in a real-world scenario) + int loggedInUserId = 1; + + // Loop over the roles and assign them to the user + for (Role role : roles) { + // Check if the user already has this role assigned + Optional existingUserRole = userRoleRepository.findByUserIdAndRoleId(userRoleDTO.getUserId(), role.getRoleId()); + + if (existingUserRole.isPresent()) { + log.debug("User {} already has role {} assigned.", userRoleDTO.getUserId(), role.getRoleId()); + continue; // Skip assigning this role if it's already assigned + } + + // Create a new UserRole entity + UserRole newUserRole = new UserRole(); + newUserRole.setUserId(userRoleDTO.getUserId()); + newUserRole.setRoleId(role.getRoleId()); + newUserRole.setStatus(Status.A); + newUserRole.setCreatedBy(loggedInUserId); + newUserRole.setLastUpdatedBy(loggedInUserId); // Set the logged-in user as the updater + + // Save the new UserRole entity to the repository (database) + userRoleRepository.save(newUserRole); + log.debug("Assigned role {} to user {}", role.getRoleId(), userRoleDTO.getUserId()); + } + + // Return the DTO after roles are assigned + return userRoleDTO; + } +} diff --git a/src/main/java/com/sahyog/app/inbound/user/serviceImpl/UserServiceImpl.java b/src/main/java/com/sahyog/app/inbound/user/serviceImpl/UserServiceImpl.java new file mode 100644 index 0000000..3098d69 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/serviceImpl/UserServiceImpl.java @@ -0,0 +1,244 @@ +package com.sahyog.app.inbound.user.serviceImpl; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + +import com.sahyog.app.inbound.user.dto.UserDTO; +import com.sahyog.app.inbound.user.dto.UserUpdateDTO; +import com.sahyog.app.inbound.user.enums.Status; +import com.sahyog.app.inbound.user.exception.UserAlreadyExistsException; +import com.sahyog.app.inbound.user.model.User; +import com.sahyog.app.inbound.user.model.UserType; +import com.sahyog.app.inbound.user.repository.UserRepository; +import com.sahyog.app.inbound.user.repository.UserTypeRepository; +import com.sahyog.app.inbound.user.service.UserRoleService; +import com.sahyog.app.inbound.user.service.UserService; + +import jakarta.transaction.Transactional; + +@Service +@Transactional +public class UserServiceImpl implements UserService { + + private static final Logger log = LoggerFactory.getLogger(UserServiceImpl.class); + + @Autowired + private UserRepository userRepository; + + @Autowired + private UserRoleService userRoleService; + + @Autowired + private UserTypeRepository userTypeRepository; + + @Override + public List createUsers(List userDTOs) { + log.info("Creating users: {}", userDTOs); + List createdUserIds = new ArrayList<>(); + int loggedInUserId = getLoggedInUserId(); + + for (UserDTO userDTO : userDTOs) { + log.debug("Processing user DTO: {}", userDTO); + + User existingUser = userRepository.findByEmployeeTransCode(userDTO.getEmployeeTransCode()); + if (existingUser != null) { + log.info("User already exists with EmpTransCode: {}. Skipping creation.", userDTO.getEmployeeTransCode()); + createdUserIds.add(existingUser.getUserId()); + } else { + try { + User newUser = createUser(userDTO, loggedInUserId); + User savedUser = userRepository.save(newUser); + userRoleService.assignRolesToUser(savedUser.getUserId(), savedUser.getUserTypeId()); + createdUserIds.add(savedUser.getUserId()); + log.info("User created successfully with ID: {}", savedUser.getUserId()); + } catch (Exception e) { + log.error("Error creating user with EmpTransCode: {}", userDTO.getEmployeeTransCode(), e); +// throw new UserCreationException("Error creating user with EmpTransCode: " + userDTO.getEmployeeTransCode(), e); + } + } + } + + return createdUserIds; + } + + @Transactional + @Override + public List createInternalUsers(List userDTOs) { + log.info("Starting creation of internal users. Total users to process: {}", userDTOs.size()); + List createdUserIds = new ArrayList<>(); + int loggedInUserId = getLoggedInUserId(); + + for (UserDTO userDTO : userDTOs) { + log.debug("Processing UserDTO: {}", userDTO); + + // Check if the user already exists + User existingUser = userRepository.findByEmployeeTransCode(userDTO.getEmployeeTransCode()); + if (existingUser != null) { + log.warn("User with EmpTransCode {} already exists. Aborting creation for this user.", userDTO.getEmployeeTransCode()); + throw new UserAlreadyExistsException("User with EmpTransCode " + userDTO.getEmployeeTransCode() + " already exists."); + } + + try { + // Create a new user + User newUser = createUser(userDTO, loggedInUserId); + User savedUser = userRepository.save(newUser); + createdUserIds.add(savedUser.getUserId()); + log.info("User created successfully with ID: {} and EmpTransCode: {}", savedUser.getUserId(), userDTO.getEmployeeTransCode()); + } catch (Exception e) { + log.error("Error occurred while creating user with EmpTransCode: {}", userDTO.getEmployeeTransCode(), e); + throw e; // Rethrow to ensure transaction rollback + } + } + + log.info("Finished creating internal users. Total users created: {}", createdUserIds.size()); + return createdUserIds; + } + + @Override + public ResponseEntity updateUser(String employeeTransCode, UserUpdateDTO userUpdateDTO) { + log.info("Updating user with EmpTransCode: {}", employeeTransCode); + + User existingUser = userRepository.findByEmployeeTransCode(employeeTransCode); + if (existingUser != null) { + log.debug("Found existing user: {}", existingUser); + if (!existingUser.getEmployeeTransCode().equals(employeeTransCode)) { + log.warn("EmpTransCode mismatch for update. Provided: {}, Expected: {}", employeeTransCode, existingUser.getEmployeeTransCode()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body("Provided userEmpTransCode does not match the existing user."); + } + + try { + existingUser.setUserName(userUpdateDTO.getUserName()); + existingUser.setFirstName(userUpdateDTO.getFirstName()); + existingUser.setLastName(userUpdateDTO.getLastName()); + existingUser.setEmail(userUpdateDTO.getEmailId()); + existingUser.setMobile(userUpdateDTO.getPhoneNumber()); + existingUser.setAddedChannel(userUpdateDTO.getAddedChannel()); + existingUser.setStatus(userUpdateDTO.getStatus()); +// existingUser.setUpdationDate(LocalDateTime.now()); + existingUser.setLastUpdatedBy(getLoggedInUserId()); + + userRepository.save(existingUser); + log.info("User updated successfully: {}", existingUser); + return ResponseEntity.status(HttpStatus.OK).body("User updated successfully."); + } catch (Exception e) { + log.error("Error updating user with EmpTransCode: {}", employeeTransCode, e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error updating user."); + } + } else { + log.warn("No user found with EmpTransCode: {}", employeeTransCode); + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body("User not found with userEmpTransCode: " + employeeTransCode); + } + } + + private User fetchUserByUserTypeName(String usertypeName) { + log.debug("Fetching user by UserTypeName: {}", usertypeName); + + UserType userType = userTypeRepository.findByUsertypeName(usertypeName); + if (userType == null) { + log.error("UserType not found: {}", usertypeName); + throw new IllegalStateException("UserType '" + usertypeName + "' not found"); + } + + Integer userTypeId = userType.getUserTypeId(); + User user = userRepository.findByUserTypeId(userTypeId); + if (user == null) { + log.error("No user found for UserTypeId: {}", userTypeId); + throw new IllegalStateException("No user found for userTypeId: " + userTypeId); + } + + log.debug("User fetched: {}", user); + return user; + } + + @Override + public List getActiveUsers() { + log.info("Fetching all active users"); + List activeUsers = userRepository.findByStatus(Status.A); + log.info("Found {} active users", activeUsers.size()); + return activeUsers; + } + + @Override + public List getUsersByStatus(List statusFilters) { + log.info("Fetching users by status: {}", statusFilters); + + List statuses = statusFilters.stream() + .map(status -> Status.valueOf(status.toUpperCase())) + .collect(Collectors.toList()); + + List users = userRepository.findByStatusIn(statuses); + log.info("Found {} users for statuses: {}", users.size(), statuses); + return users; + } + + @Override + public Page getAllUsers(int page, int size) { + log.info("Fetching all users with pagination - Page: {}, Size: {}", page, size); + + Page users = userRepository.findAll(PageRequest.of(page, size)); + log.info("Fetched {} users on page {}", users.getTotalElements(), page); + return users; + } + + private int getLoggedInUserId() { + // Replace with the actual logic to fetch the logged-in user's ID + int userId = 1; // Example fallback + log.debug("Logged-in user ID: {}", userId); + return userId; + } + + private User createUser(UserDTO userDTO, int loggedInUserId) { + User newUser = new User(); + newUser.setUserName(userDTO.getUserName()); + newUser.setFirstName(userDTO.getFirstName()); + newUser.setLastName(userDTO.getLastName()); + newUser.setUserTypeId(userDTO.getUserTypeId()); + newUser.setMobile(userDTO.getMobile()); + newUser.setEmployeeTransCode(userDTO.getEmployeeTransCode()); + newUser.setEmail(userDTO.getEmail()); + newUser.setStatus(Status.A); // Active status + newUser.setAddedChannel(userDTO.getAddedChannel()); +// newUser.setCreatedDate(LocalDateTime.now()); +// newUser.setUpdationDate(LocalDateTime.now()); + + if ("F".equalsIgnoreCase(userDTO.getAddedChannel())) { + newUser.setCreatedBy(loggedInUserId); + newUser.setLastUpdatedBy(loggedInUserId); + } else { + User integrationUser = fetchUserByUserTypeName("INTGUSER"); + newUser.setCreatedBy(integrationUser.getUserId()); + newUser.setLastUpdatedBy(integrationUser.getUserId()); + } + return newUser; + } + + @Override + public UserDTO getUserIDByUserName(String userName) { + + UserDTO usDTO = new UserDTO(); + try { + // fetch CodeMaster object + User usEntity = userRepository.getUserIDByUserName(userName); + if (null != usEntity) { + BeanUtils.copyProperties(usEntity, usDTO); + } + } catch (Exception e) { + log.error("Unexpected error occurred: {}", e.getMessage(), e); + } + + return usDTO; + } +} diff --git a/src/main/java/com/sahyog/app/inbound/user/serviceImpl/UserTypeServiceImpl.java b/src/main/java/com/sahyog/app/inbound/user/serviceImpl/UserTypeServiceImpl.java new file mode 100644 index 0000000..2a5c838 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/serviceImpl/UserTypeServiceImpl.java @@ -0,0 +1,106 @@ +package com.sahyog.app.inbound.user.serviceImpl; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.sahyog.app.inbound.user.dto.UserTypeDTO; +import com.sahyog.app.inbound.user.enums.Status; +import com.sahyog.app.inbound.user.exception.CustomException; +import com.sahyog.app.inbound.user.model.UserType; +import com.sahyog.app.inbound.user.repository.UserTypeRepository; +import com.sahyog.app.inbound.user.service.UserTypeService; + + +@Service +public class UserTypeServiceImpl implements UserTypeService { + + Logger logger = LoggerFactory.getLogger(UserTypeServiceImpl.class); + + int loggedInUserId = getLoggedInUserId(); + + @Autowired + private UserTypeRepository userTypeRepository; + + @Override + public List getAllUserTypes() { + return userTypeRepository.findAll(); + } + + private int getLoggedInUserId() { + // TODO Auto-generated method stub + return 1; + } + + @Override + public UserType getUserTypeById(short userTypeId) { + return userTypeRepository.findById(userTypeId) + .orElseThrow(() -> new RuntimeException("User type not found with ID: " + userTypeId)); + } + + + + @Override + public void updateUserTypeStatus(short userTypeId) { + // Retrieve the UserType by ID + Optional userTypeOptional = userTypeRepository.findById(userTypeId); + + if (userTypeOptional.isPresent()) { + UserType userType = userTypeOptional.get(); + + // Toggle the status + if (userType.getStatus() == Status.A) { + userType.setStatus(Status.I); + } else if (userType.getStatus() == Status.I) { + userType.setStatus(Status.A); + } + userType.setLastUpdatedBy(loggedInUserId); // Retrieve logged-in user ID appropriately + + // Save the updated UserType + userTypeRepository.save(userType); + } else { + throw new RuntimeException("UserType with ID " + userTypeId + " not found."); + } + } + + @Override + public UserType createUserType(UserTypeDTO userTypeDTO) { + + + logger.info("Starting createUserType method. Input UserTypeDTO: {}", userTypeDTO); + + try { + UserType newUserType = new UserType(); + newUserType.setUsertypeName("Akash"); + newUserType.setDescription("Dummy"); + newUserType.setStatus(Status.A); + newUserType.setCreatedBy(1); + newUserType.setLastUpdatedBy(1); +// newUserType.setUsertypeName(userTypeDTO.getUsertypeName()); +// newUserType.setDescription(userTypeDTO.getDescription()); +// newUserType.setStatus(userTypeDTO.getStatus()); +// newUserType.setCreatedBy(1); +// newUserType.setLastUpdatedBy(1); + + UserType savedUserType = userTypeRepository.save(newUserType); + + logger.info("UserType created successfully with ID: {}", savedUserType.getUserTypeId()); + return savedUserType; + } catch (Exception e) { + logger.error("Error occurred while creating UserType: {}", e.getMessage(), e); + throw new RuntimeException("Failed to create UserType", e); + } + } + + + + + + + +} \ No newline at end of file diff --git a/src/main/java/com/sahyog/app/inbound/user/utils/UserConstants.java b/src/main/java/com/sahyog/app/inbound/user/utils/UserConstants.java new file mode 100644 index 0000000..0978203 --- /dev/null +++ b/src/main/java/com/sahyog/app/inbound/user/utils/UserConstants.java @@ -0,0 +1,12 @@ +package com.sahyog.app.inbound.user.utils; + +import com.sahyog.app.inbound.user.enums.Status; + +public class UserConstants { + public static final String INTEGRATION_USER_TYPE = "INTGUSER"; + public static final String DEFAULT_ADDED_CHANNEL = "B"; + public static final int DEFAULT_LOGGED_IN_USER_ID = 1; + public static final String CHANNEL_F = "F"; + public static final Status ACTIVE_STATUS = Status.A; + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..443eca0 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,59 @@ +spring.application.name=inbound-user-service + +# =============================== +# Database Configuration +# =============================== +spring.datasource.url=jdbc:mysql://46.28.44.130:3306/user_service?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC +#spring.datasource.url=jdbc:mysql://localhost:3306/user_service?useSSL=false&serverTimezone=UTC +spring.datasource.username=inter +spring.datasource.password=Interwork@2025 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect + +server.port= ${SERVER_PORT:9093} +server.error.whitelabel.enabled=false + +# JPA / Hibernate Settings +spring.jpa.hibernate.ddl-auto=update +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.format_sql=true +spring.jpa.properties.hibernate.use_sql_comments=true + +# Batch Processing (Optional for better performance with bulk inserts/updates) +spring.jpa.properties.hibernate.jdbc.batch_size=20 +spring.jpa.properties.hibernate.order_inserts=true +spring.jpa.properties.hibernate.order_updates=true + +# =============================== +# Logging Configuration +# =============================== +logging.level.root=INFO +logging.level.com.sahyog=DEBUG +logging.level.org.hibernate.SQL=DEBUG +logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE + +# Log file output +logging.file.name=/var/log/inbound-user-service/user_service.log # Change path as needed + +# Log rotation settings +logging.logback.rollingpolicy.file-name-pattern=/var/log/inbound-user-service/user_service.%d{yyyy-MM-dd}.%i.log.gz +logging.logback.rollingpolicy.max-file-size=10MB +logging.logback.rollingpolicy.total-size-cap=1GB +logging.logback.rollingpolicy.max-history=7 + +# =============================== +# HikariCP (Connection Pool) Configuration +# =============================== +spring.datasource.hikari.maximum-pool-size=10 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.idle-timeout=30000 +spring.datasource.hikari.max-lifetime=1800000 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.pool-name=HikariPool + +# =============================== +# Additional Configurations +# =============================== +# Management endpoints +management.endpoints.web.exposure.include=health,info +management.endpoint.health.show-details=always diff --git a/src/test/java/com/sahyog/app/inbound/user/InboundUserServiceApplicationTests.java b/src/test/java/com/sahyog/app/inbound/user/InboundUserServiceApplicationTests.java new file mode 100644 index 0000000..0f4c7da --- /dev/null +++ b/src/test/java/com/sahyog/app/inbound/user/InboundUserServiceApplicationTests.java @@ -0,0 +1,13 @@ +package com.sahyog.app.inbound.user; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class InboundUserServiceApplicationTests { + + @Test + void contextLoads() { + } + +}