diff --git a/back_end/crud/.gitignore b/back_end/crud/.gitignore new file mode 100644 index 0000000..1b6985c --- /dev/null +++ b/back_end/crud/.gitignore @@ -0,0 +1,5 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/back_end/crud/HELP.md b/back_end/crud/HELP.md new file mode 100644 index 0000000..731f0e2 --- /dev/null +++ b/back_end/crud/HELP.md @@ -0,0 +1,15 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/bookmarks/) +* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) + diff --git a/back_end/crud/crud.iml b/back_end/crud/crud.iml new file mode 100644 index 0000000..34529b6 --- /dev/null +++ b/back_end/crud/crud.iml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/back_end/crud/gradle/wrapper/gradle-wrapper.jar b/back_end/crud/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf Binary files /dev/null and b/back_end/crud/gradle/wrapper/gradle-wrapper.jar differ diff --git a/back_end/crud/gradle/wrapper/gradle-wrapper.properties b/back_end/crud/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..f4d7b2b --- /dev/null +++ b/back_end/crud/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/back_end/crud/mvnw b/back_end/crud/mvnw new file mode 100644 index 0000000..8b9da3b --- /dev/null +++ b/back_end/crud/mvnw @@ -0,0 +1,286 @@ +#!/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 +# +# 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + 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 + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + 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 + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + wget "$jarUrl" -O "$wrapperJarPath" + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + curl -o "$wrapperJarPath" "$jarUrl" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/back_end/crud/mvnw.cmd b/back_end/crud/mvnw.cmd new file mode 100644 index 0000000..fef5a8f --- /dev/null +++ b/back_end/crud/mvnw.cmd @@ -0,0 +1,161 @@ +@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 https://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 Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" +FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + echo Found %WRAPPER_JAR% +) else ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" + echo Finished downloading %WRAPPER_JAR% +) +@REM End of extension + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/back_end/crud/pom.xml b/back_end/crud/pom.xml new file mode 100644 index 0000000..4194219 --- /dev/null +++ b/back_end/crud/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.6.RELEASE + + + com.example + crud + 0.0.1-SNAPSHOT + crud + coding-challenge code + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + com.h2database + h2 + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + + diff --git a/back_end/crud/settings.gradle.kts b/back_end/crud/settings.gradle.kts new file mode 100644 index 0000000..3a72f97 --- /dev/null +++ b/back_end/crud/settings.gradle.kts @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/5.4.1/userguide/multi_project_builds.html + */ + +rootProject.name = "crud" diff --git a/back_end/crud/src/main/java/crud/CrudApplication.java b/back_end/crud/src/main/java/crud/CrudApplication.java new file mode 100644 index 0000000..72a4f17 --- /dev/null +++ b/back_end/crud/src/main/java/crud/CrudApplication.java @@ -0,0 +1,24 @@ +package crud; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@SpringBootApplication +public class CrudApplication { + + public WebMvcConfigurer corsConfigurer() { + return new WebMvcConfigurer() { + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/api").allowedOrigins("http://localhost:8080"); + } + }; + } + + public static void main(String... args) { + + SpringApplication.run(CrudApplication.class, args); + } +} diff --git a/back_end/crud/src/main/java/crud/CrudController.java b/back_end/crud/src/main/java/crud/CrudController.java new file mode 100644 index 0000000..852e1ae --- /dev/null +++ b/back_end/crud/src/main/java/crud/CrudController.java @@ -0,0 +1,64 @@ +package crud; + +import java.util.List; + +import net.bytebuddy.implementation.bytecode.Throw; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; + +@CrossOrigin(origins = "http://localhost:8080", maxAge = 3600) +@RestController +public class CrudController { + private final UsersRepository userRepository; + + CrudController(UsersRepository userRepository) { + + this.userRepository = userRepository; + } + + @CrossOrigin + @GetMapping("/api/users") + List all() { return userRepository.findAll(); } + + @CrossOrigin + @RequestMapping(value = "/api/users", method = RequestMethod.POST, + consumes = MediaType.APPLICATION_JSON_VALUE) + Users createUser(@RequestBody Users theNewUser) { + String token = CrudUtils.generateToken(); + theNewUser.setToken(token); + return userRepository.save(theNewUser); + } + + @CrossOrigin + @PutMapping("/api/users/{id}") + Users updateUser(@RequestBody Users newUser, @PathVariable Long id) { + + return userRepository.findById(id) + .map(users -> { + users.setJob(newUser.getJob()); + users.setPassword(newUser.getPassword()); + users.setFirst_name(newUser.getFirst_name()); + users.setLast_name(newUser.getLast_name()); + users.setEmail(newUser.getEmail()); + users.setAvatar(newUser.getAvatar()); + return userRepository.save(users); + }) + .orElseGet(() -> { + newUser.setId(id); + return userRepository.save(newUser); + }); + } + + @CrossOrigin + @GetMapping("/api/users/{id}") + Users getUser(@PathVariable Long id) { + + return userRepository.findById(id) + .orElseThrow(() -> new UsersNotFoundException(id)); + } + + @CrossOrigin + @DeleteMapping("/api/users/{id}") + void deleteUser(@PathVariable Long id) { userRepository.deleteById(id); } + +} diff --git a/back_end/crud/src/main/java/crud/CrudUtils.java b/back_end/crud/src/main/java/crud/CrudUtils.java new file mode 100644 index 0000000..d4c4f06 --- /dev/null +++ b/back_end/crud/src/main/java/crud/CrudUtils.java @@ -0,0 +1,21 @@ +package crud; + +import java.util.List; +import java.util.Random; + +public class CrudUtils { + + public static String generateToken() { + Random random = new Random(); + int tokenLength = 15; + String allChars = "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPPQRSTUVWXYZ"; + String token = ""; + + for (int x=0; x { +} diff --git a/back_end/crud/src/main/java/crud/SampleData.java b/back_end/crud/src/main/java/crud/SampleData.java new file mode 100644 index 0000000..8999f82 --- /dev/null +++ b/back_end/crud/src/main/java/crud/SampleData.java @@ -0,0 +1,25 @@ +package crud; + +import lombok.extern.slf4j.Slf4j; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@Slf4j +public class SampleData { + @Bean + CommandLineRunner initDatabase(UsersRepository repository) { + return args -> { + log.info("Preloading " + repository.save(new Users("Developer", "Password1", + "Spongebob","Squarepants", "spongebob@abc.com", + "http://thriving.childrenshospital.org/wp-content/uploads/2011/09/spongebob3.jpg", + "1ke9rjabKJHaelk"))); + log.info("Preloading " + repository.save(new Users("Developer", "Password1", + "Patrick", "Star", "patrick@abc.com", + "https://images-na.ssl-images-amazon.com/images/I/51q4JlgqJBL._SY355_.jpg", + "MLwiff(&KJHDSus"))); + }; + } +} diff --git a/back_end/crud/src/main/java/crud/Users.java b/back_end/crud/src/main/java/crud/Users.java new file mode 100644 index 0000000..bbdbf5e --- /dev/null +++ b/back_end/crud/src/main/java/crud/Users.java @@ -0,0 +1,49 @@ +package crud; + +import lombok.Data; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +@Data +@Entity +public class Users { + + @Id + @GeneratedValue + private Long id; + + @Column + @CreationTimestamp + public Date createdAt; + + @Column + @UpdateTimestamp + public Date updatedAt; + + private String job; + private String password; + private String first_name; + private String last_name; + private String email; + private String avatar; + private String token; + + Users() {} + + Users(String job, String password, String first_name, + String last_name, String email, String avatar, String token) { + this.job = job; + this.password = password; + this.first_name = first_name; + this.last_name = last_name; + this.email = email; + this.avatar = avatar; + this.token = token; + } +} diff --git a/back_end/crud/src/main/java/crud/UsersNotFoundAdvice.java b/back_end/crud/src/main/java/crud/UsersNotFoundAdvice.java new file mode 100644 index 0000000..e37f41a --- /dev/null +++ b/back_end/crud/src/main/java/crud/UsersNotFoundAdvice.java @@ -0,0 +1,18 @@ +package crud; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ControllerAdvice +public class UsersNotFoundAdvice { + + @ResponseBody + @ExceptionHandler(UsersNotFoundException.class) + @ResponseStatus(HttpStatus.NOT_FOUND) + String UsersNotFoundAdvice(UsersNotFoundException ex) { + return ex.getMessage(); + } +} diff --git a/back_end/crud/src/main/java/crud/UsersNotFoundException.java b/back_end/crud/src/main/java/crud/UsersNotFoundException.java new file mode 100644 index 0000000..721fa96 --- /dev/null +++ b/back_end/crud/src/main/java/crud/UsersNotFoundException.java @@ -0,0 +1,8 @@ +package crud; + +public class UsersNotFoundException extends RuntimeException { + + UsersNotFoundException(Long id) { + super("Not found: User with ID " + id); + } +} diff --git a/back_end/crud/src/main/java/crud/UsersRepository.java b/back_end/crud/src/main/java/crud/UsersRepository.java new file mode 100644 index 0000000..028ef7c --- /dev/null +++ b/back_end/crud/src/main/java/crud/UsersRepository.java @@ -0,0 +1,6 @@ +package crud; + +import org.springframework.data.jpa.repository.JpaRepository; + +interface UsersRepository extends JpaRepository { +} diff --git a/back_end/crud/src/main/resources/application.properties b/back_end/crud/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/back_end/crud/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/back_end/crud/src/test/java/crud/CrudApplicationTests.java b/back_end/crud/src/test/java/crud/CrudApplicationTests.java new file mode 100644 index 0000000..2b252d7 --- /dev/null +++ b/back_end/crud/src/test/java/crud/CrudApplicationTests.java @@ -0,0 +1,14 @@ +package crud; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class CrudApplicationTests { + @Test + public void contextLoads() { + } +} diff --git a/front_end/accounts.css b/front_end/accounts.css new file mode 100644 index 0000000..6cb8d82 --- /dev/null +++ b/front_end/accounts.css @@ -0,0 +1,29 @@ + +/* Set height of the grid so .sidenav can be 100% (adjust if needed) */ +.row.content {height: 1500px} + +/* Set gray background color and 100% height */ +.sidenav { + background-color: #f1f1f1; + height: 100%; +} + +/* Set black background color, white text and some padding */ +footer { + background-color: #555; + color: white; + padding: 15px; +} + +/* On small screens, set height to 'auto' for sidenav and grid */ +@media screen and (max-width: 767px) { + .sidenav { + height: auto; + padding: 15px; + } + .row.content {height: auto;} +} + +.no-bullets { + list-style: none; +} diff --git a/front_end/accounts.html b/front_end/accounts.html new file mode 100644 index 0000000..c3087ca --- /dev/null +++ b/front_end/accounts.html @@ -0,0 +1,77 @@ + + + + Coding Challenge + + + + + + + + + + + + + + +
+
+
+

Basic CURD Application

+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
+ + + + +
+
+ + + + +
+
+ + +
+
+ +

  SEARCH RESULTS

+
+ +
+

+
+
+
+ + + + + \ No newline at end of file diff --git a/front_end/accounts.js b/front_end/accounts.js new file mode 100644 index 0000000..04bbcf5 --- /dev/null +++ b/front_end/accounts.js @@ -0,0 +1,150 @@ +$(document).ready(function(){ + + $('#listUsers').click(function(){ + var page = $('#usersPage').val(); + if (!page) { + page = 1; + } + $.ajax({ + type:'GET', + url:'https://reqres.in/api/users', + data: 'page=' + page, + contentType: "application/json; charset=utf-8", + dataType: 'json', + success: function(result, stataus, xhr){ + $('#tempResults').text(JSON.stringify(result)); + } + }).done(function (data) { + }); + }); + + $('#getUser').click(function(){ + var userId = $('#userId').val(); + if (!userId) { + userId = 1; + } + $.ajax({ + type:'GET', + url:'https://reqres.in/api/users/' + userId, + contentType: "application/json; charset=utf-8", + dataType: 'json', + success: function(result, stataus, xhr){ + if (xhr.status == 404) { + $('#tempResults').text('{}'); + } else { + $('#tempResults').text(JSON.stringify(result)); + } + } + }).done(function (data) { + }); + }); + + $('#listResource').click(function(){ + var resourcePage = $('#resourcePage').val(); + if (!resourcePage) { + resourcePage = 1; + } + $.ajax({ + type:'GET', + url:'https://reqres.in/api/unknown', + data: 'page=' + resourcePage, + contentType: "application/json; charset=utf-8", + dataType: 'json', + success: function(result, stataus, xhr){ + $('#tempResults').text(JSON.stringify(result)); + } + }).done(function (data) { + }); + }); + + $('#getResource').click(function(){ + var resourceId = $('#resourceId').val(); + if (!resourceId) { + resourceId = 1; + } + $.ajax({ + type:'GET', + url:'https://reqres.in/api/users/' + resourceId, + contentType: "application/json; charset=utf-8", + dataType: 'json', + success: function(result, stataus, xhr){ + $('#tempResults').text(JSON.stringify(result)); + } + }).done(function (data) { + }); + }); + + $.fn.get_create_update_payload = function(name, job) { + var payload = {}; + if (name) { + $.extend(payload, {"name": name}); + } + if (job) { + $.extend(payload, {"job": job}); + } + return JSON.stringify(payload); + }; + + $('#createUser').click(function(){ + var payload = $.fn.get_create_update_payload($('#createName').val(), $('#createJob').val()); + $.ajax({ + type:'POST', + url:'https://reqres.in/api/users', + contentType: "application/json; charset=utf-8", + dataType: 'json', + data: payload, + success: function(result, stataus, xhr){ + $('#tempResults').text(JSON.stringify(result)); + } + }).done(function (data) { + }); + }); + + $('#updateUser').click(function(){ + var payload = $.fn.get_create_update_payload($('#updateName').val(), $('#updateJob').val()); + var userId = $('#updateUserId').val(); + $.ajax({ + type:'PUT', + url:'https://reqres.in/api/users/' + userId, + contentType: "application/json; charset=utf-8", + dataType: 'json', + data: payload, + success: function(result, stataus, xhr){ + $('#tempResults').text(JSON.stringify(result)); + } + }).done(function (data) { + }); + }); + + $('#updatePatchUser').click(function(){ + var payload = $.fn.get_create_update_payload($('#updatePatchName').val(), $('#updatePatchJob').val()); + var userId = $('#updatePatchUserId').val(); + $.ajax({ + type:'PATCH', + url:'https://reqres.in/api/users/' + userId, + contentType: "application/json; charset=utf-8", + dataType: 'json', + data: payload, + success: function(result, stataus, xhr){ + $('#tempResults').text(JSON.stringify(result)); + } + }).done(function (data) { + }); + }); + + $('#deleteUser').click(function(){ + var userId = $('#deleteUserId').val(); + $.ajax({ + type:'DELETE', + url:'https://reqres.in/api/users/' + userId, + contentType: "application/json; charset=utf-8", + dataType: 'json', + success: function(result, stataus, xhr){ + if (xhr.status == 204) { + $('#tempResults').text('{}'); + } + } + }).done(function (data) { + }); + }); +}); \ No newline at end of file diff --git a/front_end/utils.js b/front_end/utils.js new file mode 100644 index 0000000..e69de29 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..2dc81e8 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +Django>=2.2.2 +pytest>=4.6.0 +requests>=2.22.0 \ No newline at end of file