diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/New_configuration.launch b/New_configuration.launch new file mode 100644 index 0000000..0331994 --- /dev/null +++ b/New_configuration.launch @@ -0,0 +1,2 @@ + + diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f69b466 --- /dev/null +++ b/build.gradle @@ -0,0 +1,25 @@ +plugins { + id 'org.springframework.boot' version '2.5.2' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'com.ibs' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '1.8' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + runtimeOnly 'com.h2database:h2' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +test { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..05679dc --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..744e882 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed 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 +# +# https://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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MSYS* | MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..20110d1 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'air-aider-master-data-service' diff --git a/src/main/java/com/ibs/airaidermasterdataservice/AirAiderMasterDataServiceApplication.java b/src/main/java/com/ibs/airaidermasterdataservice/AirAiderMasterDataServiceApplication.java new file mode 100644 index 0000000..30bce71 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/AirAiderMasterDataServiceApplication.java @@ -0,0 +1,13 @@ +package com.ibs.airaidermasterdataservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AirAiderMasterDataServiceApplication { + + public static void main(String[] args) { + SpringApplication.run(AirAiderMasterDataServiceApplication.class, args); + } + +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/LoadDatabase.java b/src/main/java/com/ibs/airaidermasterdataservice/LoadDatabase.java new file mode 100644 index 0000000..0573075 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/LoadDatabase.java @@ -0,0 +1,59 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.context.annotation.Configuration; + +import com.ibs.airaidermasterdataservice.entity.AirportDetailsEntity; +import com.ibs.airaidermasterdataservice.entity.AirportEntity; +import com.ibs.airaidermasterdataservice.repository.AirportDetailsRepository; +import com.ibs.airaidermasterdataservice.repository.AirportRepository; +import com.ibs.airaidermasterdataservice.service.AirportMasterDataServiceImpl; +import com.ibs.airaidermasterdataservice.util.AirAiderCommonConstants.LangCodes; + +/** + * @author 91940 + * + */ +@Configuration +public class LoadDatabase implements CommandLineRunner { + + @Autowired + AirportRepository airportRepository; + + @Autowired + AirportDetailsRepository airportDetailsRepository; + + /* + * @see org.springframework.boot.CommandLineRunner#run(java.lang.String[]) + */Í + @Override + public void run(String... args) throws Exception { + + AirportEntity airportEntity1 = new AirportEntity(); + airportEntity1.setAirportCode("AAA"); + airportEntity1.setCityId(123); + + airportRepository.save(airportEntity1); + + + AirportEntity airportEntity2 = new AirportEntity(); + airportEntity2.setCityId(234); + airportEntity2.setAirportCode("BBB"); + + airportRepository.save(airportEntity2); + + + AirportDetailsEntity airportDetailsEntity = new AirportDetailsEntity(); + airportDetailsEntity.setLangCode(LangCodes.EN); + airportDetailsEntity.setAirportName("calicut"); + airportDetailsEntity.setAirportId(1); + + airportDetailsRepository.save(airportDetailsEntity); + + } + +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/controller/AirportMasterDataController.java b/src/main/java/com/ibs/airaidermasterdataservice/controller/AirportMasterDataController.java new file mode 100644 index 0000000..45413f6 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/controller/AirportMasterDataController.java @@ -0,0 +1,33 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.ibs.airaidermasterdataservice.model.MasterDataRequestModel; +import com.ibs.airaidermasterdataservice.model.MasterDataResponseModel; +import com.ibs.airaidermasterdataservice.service.MasterDataService; + +/** + * @author 91940 + * + */ +@RestController +@RequestMapping("/airport") +public class AirportMasterDataController { + + @Autowired + private MasterDataService masterDataService; + + + @PostMapping("/fetchmasterdata") + MasterDataResponseModel fetchMasterData(@RequestBody MasterDataRequestModel masterDataRequestModel) { + return masterDataService.fetchMasterData(masterDataRequestModel); + + } +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/entity/AirportDetailsEntity.java b/src/main/java/com/ibs/airaidermasterdataservice/entity/AirportDetailsEntity.java new file mode 100644 index 0000000..ab99294 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/entity/AirportDetailsEntity.java @@ -0,0 +1,90 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.entity; + +import javax.persistence.Column; + +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import com.ibs.airaidermasterdataservice.util.AirAiderCommonConstants.LangCodes; + +import static com.ibs.airaidermasterdataservice.util.AirAiderCommonConstants.LangCodes; +/** + * @author 91940 + * + */ +@Entity +@Table(name = "AIR_AIDER_AIRPORT_DETAILS") +public class AirportDetailsEntity { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name="AIRPORT_DETAIL_ID") + private int airportdDetailId; + + @Column(name="AIRPORT_ID") + private int airportId; + + @Column(name="AIRPORT_NAME") + private String airportName; + + + @Column(name = "LANG_CODE") + private LangCodes langCode; + + /** + * @return the langCode + */ + public LangCodes getLangCode() { + return langCode; + } + /** + * @param langCode the langCode to set + */ + public void setLangCode(LangCodes langCode) { + this.langCode = langCode; + } + /** + * @return the airportdDetailId + */ + public int getAirportdDetailId() { + return airportdDetailId; + } + /** + * @param airportdDetailId the airportdDetailId to set + */ + public void setAirportdDetailId(int airportdDetailId) { + this.airportdDetailId = airportdDetailId; + } + /** + * @return the airportId + */ + public int getAirportId() { + return airportId; + } + /** + * @param airportId the airportId to set + */ + public void setAirportId(int airportId) { + this.airportId = airportId; + } + /** + * @return the airportName + */ + public String getAirportName() { + return airportName; + } + /** + * @param airportName the airportName to set + */ + public void setAirportName(String airportName) { + this.airportName = airportName; + } +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/entity/AirportEntity.java b/src/main/java/com/ibs/airaidermasterdataservice/entity/AirportEntity.java new file mode 100644 index 0000000..320e7ff --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/entity/AirportEntity.java @@ -0,0 +1,73 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.entity; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +/** + * @author Sthuthi + * + */ +@Entity +@Table(name = "AIR_AIDER_AIRPORT") +public class AirportEntity { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "AIRPORT_ID") + private int airportId; + + @Column(name = "CITY_ID") + private int cityId; + + @Column(name = "AIRPORT_CODE") + private String airportCode; + + /** + * @return the airportCodeConstants + */ + public String getAirportCode() { + return airportCode; + } + + /** + * @param string the airportCodeConstants to set + */ + public void setAirportCode(String string) { + this.airportCode = string; + } + + /** + * @return the airportId + */ + public int getAirportId() { + return airportId; + } + + /** + * @param airportId the airportId to set + */ + public void setAirportId(int airportId) { + this.airportId = airportId; + } + + /** + * @return the cityId + */ + public int getCityId() { + return cityId; + } + + /** + * @param cityId the cityId to set + */ + public void setCityId(int cityId) { + this.cityId = cityId; + } +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/entity/CityDetailsEntity.java b/src/main/java/com/ibs/airaidermasterdataservice/entity/CityDetailsEntity.java new file mode 100644 index 0000000..cdcd0fc --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/entity/CityDetailsEntity.java @@ -0,0 +1,89 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.entity; + +import javax.persistence.Column; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +import static com.ibs.airaidermasterdataservice.util.AirAiderCommonConstants.LangCodes; + + +/** + * @author 91940 + * + */ +public class CityDetailsEntity { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "CITY_DETAIL_ID") + private int cityDetailId; + + @Column(name = "CITY_ID") + private int cityId; + @Column(name = "CITY_NAME") + private String cityName; + + @Column(name = "LANG_CODE") + private LangCodes langCode; + + /** + * @return the cityDetailId + */ + public int getCityDetailId() { + return cityDetailId; + } + + /** + * @param cityDetailId the cityDetailId to set + */ + public void setCityDetailId(int cityDetailId) { + this.cityDetailId = cityDetailId; + } + + /** + * @return the cityId + */ + public int getCityId() { + return cityId; + } + + /** + * @param cityId the cityId to set + */ + public void setCityId(int cityId) { + this.cityId = cityId; + } + + /** + * @return the cityName + */ + public String getCityName() { + return cityName; + } + + /** + * @param cityName the cityName to set + */ + public void setCityName(String cityName) { + this.cityName = cityName; + } + + /** + * @return the langCode + */ + public LangCodes getLangCode() { + return langCode; + } + + /** + * @param langCode the langCode to set + */ + public void setLangCode(LangCodes langCode) { + this.langCode = langCode; + } + +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/entity/CityEntity.java b/src/main/java/com/ibs/airaidermasterdataservice/entity/CityEntity.java new file mode 100644 index 0000000..0e5dab9 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/entity/CityEntity.java @@ -0,0 +1,73 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.entity; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +/** + * @author 91940 + * + */ +@Entity +@Table(name = "AIR_AIDER_CITY") +public class CityEntity { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "CITY_ID") + private int cityId; + + @Column(name = "COUNTRY_ID") + private int countryId; + + @Column(name = "CITY_CODE") + private String cityCode; + + /** + * @return the cityCode + */ + public String getCityCode() { + return cityCode; + } + + /** + * @param cityCode the cityCode to set + */ + public void setCityCode(String cityCode) { + this.cityCode = cityCode; + } + + /** + * @return the cityId + */ + public int getCityId() { + return cityId; + } + + /** + * @param cityId the cityId to set + */ + public void setCityId(int cityId) { + this.cityId = cityId; + } + + /** + * @return the countryId + */ + public int getCountryId() { + return countryId; + } + + /** + * @param countryId the countryId to set + */ + public void setCountryId(int countryId) { + this.countryId = countryId; + } +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/model/AirportDetailsModel.java b/src/main/java/com/ibs/airaidermasterdataservice/model/AirportDetailsModel.java new file mode 100644 index 0000000..f265f95 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/model/AirportDetailsModel.java @@ -0,0 +1,92 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.model; + +import com.ibs.airaidermasterdataservice.entity.AirportDetailsEntity; +import com.ibs.airaidermasterdataservice.util.AirAiderCommonConstants.LangCodes; + +/** + * @author 91940 + * + */ + +public class AirportDetailsModel { + + private int airportdDetailId; + + private int airportId; + + private String airportName; + + private LangCodes langCode; + + /** + * @return the langCode + */ + public LangCodes getLangCode() { + return langCode; + } + + /** + * @param langCode the langCode to set + */ + public void setLangCode(LangCodes langCode) { + this.langCode = langCode; + } + + /** + * @return the airportdDetailId + */ + public int getAirportdDetailId() { + return airportdDetailId; + } + + /** + * @param airportdDetailId the airportdDetailId to set + */ + public void setAirportdDetailId(int airportdDetailId) { + this.airportdDetailId = airportdDetailId; + } + + /** + * @return the airportId + */ + public int getAirportId() { + return airportId; + } + + /** + * @param airportId the airportId to set + */ + public void setAirportId(int airportId) { + this.airportId = airportId; + } + + /** + * @return the airportName + */ + public String getAirportName() { + return airportName; + } + + /** + * @param airportName the airportName to set + */ + public void setAirportName(String airportName) { + this.airportName = airportName; + } + + public static AirportDetailsModel entityToModel(AirportDetailsEntity airportDetailsEntity) { + + AirportDetailsModel airportDetailsModel = new AirportDetailsModel(); + + airportDetailsModel.setAirportdDetailId(airportDetailsEntity.getAirportdDetailId()); + airportDetailsModel.setAirportId(airportDetailsEntity.getAirportId()); + airportDetailsModel.setAirportName(airportDetailsEntity.getAirportName()); + airportDetailsModel.setLangCode(airportDetailsEntity.getLangCode()); + + return airportDetailsModel; + + } +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/model/MasterDataRequestModel.java b/src/main/java/com/ibs/airaidermasterdataservice/model/MasterDataRequestModel.java new file mode 100644 index 0000000..31f4ac4 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/model/MasterDataRequestModel.java @@ -0,0 +1,41 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.model; + +import java.util.Set; + +/** + * @author 91940 + * + */ +public class MasterDataRequestModel { + + private String queryId; + private Set airportCodeSet; + /** + * @return the queryId + */ + public String getQueryId() { + return queryId; + } + /** + * @param queryId the queryId to set + */ + public void setQueryId(String queryId) { + this.queryId = queryId; + } + /** + * @return the airportCodeSet + */ + public Set getAirportCodeSet() { + return airportCodeSet; + } + /** + * @param airportCodeSet the airportCodeSet to set + */ + public void setAirportCodeSet(Set airportCodeSet) { + this.airportCodeSet = airportCodeSet; + } + +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/model/MasterDataResponseModel.java b/src/main/java/com/ibs/airaidermasterdataservice/model/MasterDataResponseModel.java new file mode 100644 index 0000000..029e2e7 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/model/MasterDataResponseModel.java @@ -0,0 +1,45 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.model; + +import java.util.Map; + +/** + * @author 91940 + * + */ +public class MasterDataResponseModel { + + private String queryId; + private Map airportDetails; + + /** + * @return the queryId + */ + public String getQueryId() { + return queryId; + } + + /** + * @param queryId the queryId to set + */ + public void setQueryId(String queryId) { + this.queryId = queryId; + } + + /** + * @return the airportDetails + */ + public Map getAirportDetails() { + return airportDetails; + } + + /** + * @param airportDetails the airportDetails to set + */ + public void setAirportDetails(Map airportDetails) { + this.airportDetails = airportDetails; + } + +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/repository/AirportDetailsRepository.java b/src/main/java/com/ibs/airaidermasterdataservice/repository/AirportDetailsRepository.java new file mode 100644 index 0000000..8d13485 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/repository/AirportDetailsRepository.java @@ -0,0 +1,19 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.ibs.airaidermasterdataservice.entity.AirportDetailsEntity; + +/** + * @author 91940 + * + */ +@Repository +public interface AirportDetailsRepository extends JpaRepository { + AirportDetailsEntity findByAirportId(int airportId); + +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/repository/AirportRepository.java b/src/main/java/com/ibs/airaidermasterdataservice/repository/AirportRepository.java new file mode 100644 index 0000000..27f59a1 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/repository/AirportRepository.java @@ -0,0 +1,22 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.ibs.airaidermasterdataservice.entity.AirportEntity; + +/** + * @author 91940 + * + */ +public interface AirportRepository extends JpaRepository{ + + /** + * @param airportCode + * @return AirportEntity + */ + AirportEntity findByAirportCode(String airportCode); + +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/service/AirportMasterDataService.java b/src/main/java/com/ibs/airaidermasterdataservice/service/AirportMasterDataService.java new file mode 100644 index 0000000..4fa287b --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/service/AirportMasterDataService.java @@ -0,0 +1,18 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.service; + +import java.util.Set; + +import com.ibs.airaidermasterdataservice.model.MasterDataResponseModel; + +/** + * @author 91940 + * + */ +public interface AirportMasterDataService { + + MasterDataResponseModel getAirportDetails(Set airportCodeSet, String queryId); + +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/service/AirportMasterDataServiceImpl.java b/src/main/java/com/ibs/airaidermasterdataservice/service/AirportMasterDataServiceImpl.java new file mode 100644 index 0000000..6686ab8 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/service/AirportMasterDataServiceImpl.java @@ -0,0 +1,56 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.service; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.ibs.airaidermasterdataservice.entity.AirportDetailsEntity; +import com.ibs.airaidermasterdataservice.entity.AirportEntity; +import com.ibs.airaidermasterdataservice.model.AirportDetailsModel; +import com.ibs.airaidermasterdataservice.model.MasterDataResponseModel; +import com.ibs.airaidermasterdataservice.repository.AirportDetailsRepository; +import com.ibs.airaidermasterdataservice.repository.AirportRepository; + +/** + * @author 91940 + * + */ +@Service +public class AirportMasterDataServiceImpl implements AirportMasterDataService { + + @Autowired + AirportDetailsRepository airportDetailsRepository; + + @Autowired + AirportRepository airportRepository; + + /* + * @see com.ibs.airaidermasterdataservice.service.AirportMasterDataService# + * getAirportDetails(java.util.Set, java.lang.String) + */ + @Override + public MasterDataResponseModel getAirportDetails(Set airportCodeSet, String queryId) { + MasterDataResponseModel masterDataResponseModel = new MasterDataResponseModel(); + masterDataResponseModel.setQueryId(queryId); + + Map airportDetailsMap = new HashMap<>(); + + for (String airportCode : airportCodeSet) { + + AirportEntity airportEntity = airportRepository.findByAirportCode(airportCode); + AirportDetailsEntity airportDetailsEntity = airportDetailsRepository.findByAirportId(airportEntity.getAirportId()); + airportDetailsMap.put(airportCode, AirportDetailsModel.entityToModel(airportDetailsEntity)); + } + + masterDataResponseModel.setAirportDetails(airportDetailsMap); + + return masterDataResponseModel; + } + +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/service/MasterDataService.java b/src/main/java/com/ibs/airaidermasterdataservice/service/MasterDataService.java new file mode 100644 index 0000000..83606e7 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/service/MasterDataService.java @@ -0,0 +1,38 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.ibs.airaidermasterdataservice.model.MasterDataRequestModel; +import com.ibs.airaidermasterdataservice.model.MasterDataResponseModel; + +/** + * @author 91940 + * + */ +@Service +public class MasterDataService { + + @Autowired + AirportMasterDataService airportMasterDataService; + +// @Autowired +// MasterDataResponseModel masterDataResponseModel; + + public MasterDataResponseModel fetchMasterData(MasterDataRequestModel masterDataRequestModel) { + MasterDataResponseModel masterDataResponseModel; + + if (masterDataRequestModel.getAirportCodeSet() != null) { + + masterDataResponseModel = airportMasterDataService.getAirportDetails(masterDataRequestModel.getAirportCodeSet(),masterDataRequestModel.getQueryId()); + } else { + masterDataResponseModel = new MasterDataResponseModel(); + } + + return masterDataResponseModel; + + } +} diff --git a/src/main/java/com/ibs/airaidermasterdataservice/util/AirAiderCommonConstants.java b/src/main/java/com/ibs/airaidermasterdataservice/util/AirAiderCommonConstants.java new file mode 100644 index 0000000..b228b75 --- /dev/null +++ b/src/main/java/com/ibs/airaidermasterdataservice/util/AirAiderCommonConstants.java @@ -0,0 +1,17 @@ +/** + * + */ +package com.ibs.airaidermasterdataservice.util; + +/** + * @author 91940 + * + */ +public interface AirAiderCommonConstants { + + enum LangCodes { + EN, + JA + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..fb59f00 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,7 @@ +server: + port: 8080 +spring: + h2: + console: + enabled: true + path: /h2 \ No newline at end of file diff --git a/src/test/java/com/ibs/airaidermasterdataservice/AirAiderMasterDataServiceApplicationTests.java b/src/test/java/com/ibs/airaidermasterdataservice/AirAiderMasterDataServiceApplicationTests.java new file mode 100644 index 0000000..bcbb50d --- /dev/null +++ b/src/test/java/com/ibs/airaidermasterdataservice/AirAiderMasterDataServiceApplicationTests.java @@ -0,0 +1,13 @@ +package com.ibs.airaidermasterdataservice; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class AirAiderMasterDataServiceApplicationTests { + + @Test + void contextLoads() { + } + +}