Index: .gitignore =================================================================== --- .gitignore (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ .gitignore (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -1,44 +1,1 @@ -*.java.hsp -*.sonarj -*.sw* -.DS_Store -.settings -.springBeans -bin -build.sh -integration-repo -ivy-cache -jxl.log -jmx.log -derby.log -spring-test/test-output/ -.gradle -argfile* -activemq-data/ - -classes/ -/build -buildSrc/build -/spring-*/build -/spring-core/kotlin-coroutines/build -/framework-bom/build -/integration-tests/build -/src/asciidoc/build -target/ - -# Eclipse artifacts, including WTP generated manifests -.classpath -.project -spring-*/src/main/java/META-INF/MANIFEST.MF - -# IDEA artifacts and output dirs -*.iml -*.ipr -*.iws .idea -out -test-output -atlassian-ide-plugin.xml -.gradletasknamecache - -# Client APP Index: vn/wrapper/MavenWrapperDownloader.java =================================================================== --- .mvn/wrapper/MavenWrapperDownloader.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,118 +1,0 @@ -/* - * Copyright 2007-present 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. - */ - -import java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if (mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if (mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if (!outputFile.getParentFile().exists()) { - if (!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} Index: vn/wrapper/maven-wrapper.properties =================================================================== --- .mvn/wrapper/maven-wrapper.properties (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,2 +1,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar Index: LP.md =================================================================== --- HELP.md (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,25 +1,0 @@ -# Getting Started - -### Reference Documentation - -For further reference, please consider the following sections: - -* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) -* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.4.1/maven-plugin/reference/html/) -* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.4.1/maven-plugin/reference/html/#build-image) -* [Spring Security](https://docs.spring.io/spring-boot/docs/2.4.1/reference/htmlsingle/#boot-features-security) -* [Spring Web](https://docs.spring.io/spring-boot/docs/2.4.1/reference/htmlsingle/#boot-features-developing-web-applications) -* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/2.4.1/reference/htmlsingle/#boot-features-jpa-and-spring-data) - -### Guides - -The following guides illustrate how to use some features concretely: - -* [Securing a Web Application](https://spring.io/guides/gs/securing-web/) -* [Spring Boot and OAuth2](https://spring.io/guides/tutorials/spring-boot-oauth2/) -* [Authenticating a User with LDAP](https://spring.io/guides/gs/authenticating-ldap/) -* [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/) - Index: back_end/.gitignore =================================================================== --- back_end/.gitignore (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/.gitignore (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,44 @@ +*.java.hsp +*.sonarj +*.sw* +.DS_Store +.settings +.springBeans +bin +build.sh +integration-repo +ivy-cache +jxl.log +jmx.log +derby.log +spring-test/test-output/ +.gradle +argfile* +activemq-data/ + +classes/ +/build +buildSrc/build +/spring-*/build +/spring-core/kotlin-coroutines/build +/framework-bom/build +/integration-tests/build +/src/asciidoc/build +target/ + +# Eclipse artifacts, including WTP generated manifests +.classpath +.project +spring-*/src/main/java/META-INF/MANIFEST.MF + +# IDEA artifacts and output dirs +*.iml +*.ipr +*.iws +.idea +out +test-output +atlassian-ide-plugin.xml +.gradletasknamecache + +# Client APP Index: back_end/.mvn/wrapper/MavenWrapperDownloader.java =================================================================== --- back_end/.mvn/wrapper/MavenWrapperDownloader.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/.mvn/wrapper/MavenWrapperDownloader.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present 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. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} Index: back_end/.mvn/wrapper/maven-wrapper.properties =================================================================== --- back_end/.mvn/wrapper/maven-wrapper.properties (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/.mvn/wrapper/maven-wrapper.properties (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar Index: back_end/HELP.md =================================================================== --- back_end/HELP.md (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/HELP.md (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,25 @@ +# Getting Started + +### Reference Documentation + +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.4.1/maven-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.4.1/maven-plugin/reference/html/#build-image) +* [Spring Security](https://docs.spring.io/spring-boot/docs/2.4.1/reference/htmlsingle/#boot-features-security) +* [Spring Web](https://docs.spring.io/spring-boot/docs/2.4.1/reference/htmlsingle/#boot-features-developing-web-applications) +* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/2.4.1/reference/htmlsingle/#boot-features-jpa-and-spring-data) + +### Guides + +The following guides illustrate how to use some features concretely: + +* [Securing a Web Application](https://spring.io/guides/gs/securing-web/) +* [Spring Boot and OAuth2](https://spring.io/guides/tutorials/spring-boot-oauth2/) +* [Authenticating a User with LDAP](https://spring.io/guides/gs/authenticating-ldap/) +* [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/) + Index: back_end/mvnw =================================================================== --- back_end/mvnw (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/mvnw (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,310 @@ +#!/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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven 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)`" +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 + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + 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 $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + 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 + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +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 "$@" Index: back_end/mvnw.cmd =================================================================== --- back_end/mvnw.cmd (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/mvnw.cmd (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,182 @@ +@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 Maven 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 keystroke 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 by 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.5.6/maven-wrapper-0.5.6.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% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%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% Index: back_end/pom.xml =================================================================== --- back_end/pom.xml (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/pom.xml (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,70 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.4.1 + + + it.finki + tinki + 0.0.1-SNAPSHOT + tinki + Easy job finder. + + + 11 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + com.h2database + h2 + runtime + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + Index: back_end/src/main/java/it/finki/tinki/TinkiApplication.java =================================================================== --- back_end/src/main/java/it/finki/tinki/TinkiApplication.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/TinkiApplication.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,14 @@ +package it.finki.tinki; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication +public class TinkiApplication { + + public static void main(String[] args) { + SpringApplication.run(TinkiApplication.class, args); + } + +} Index: back_end/src/main/java/it/finki/tinki/bootstrap/DataHolder.java =================================================================== --- back_end/src/main/java/it/finki/tinki/bootstrap/DataHolder.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/bootstrap/DataHolder.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,114 @@ +package it.finki.tinki.bootstrap; + +import it.finki.tinki.model.Work.Job; +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Users.Account; +import it.finki.tinki.model.enumerator.AccountType; +import it.finki.tinki.repository.*; +import it.finki.tinki.service.AccountService; +import it.finki.tinki.service.WorkService; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import java.text.DateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Component +public class DataHolder { + + SkillRepository skillRepository; + AccountService accountService; + WorkService workService; + MatchRepository matchRepository; + + public DataHolder(SkillRepository skillRepository, + AccountService accountService, + WorkService workService, + MatchRepository matchRepository) { + this.skillRepository = skillRepository; + this.accountService = accountService; + this.workService = workService; + this.matchRepository = matchRepository; + } + + @PostConstruct + public void init(){ + if(this.skillRepository.findAll().size()==0){ + Skill s1 = new Skill("C++"); + Skill s2 = new Skill("Java"); + Skill s3 = new Skill("Python"); + Skill s4 = new Skill("JavaScript"); + Skill s5 = new Skill("React"); + Skill s6 = new Skill("Spring"); + Skill s7 = new Skill("C#"); + Skill s8 = new Skill(".NET"); + Skill s9 = new Skill("NodeJs"); + Skill s0 = new Skill("Go"); + + this.skillRepository.save(s1); + this.skillRepository.save(s2); + this.skillRepository.save(s3); + this.skillRepository.save(s4); + this.skillRepository.save(s5); + this.skillRepository.save(s6); + this.skillRepository.save(s7); + this.skillRepository.save(s8); + this.skillRepository.save(s9); + this.skillRepository.save(s0); + } + + if(!this.accountService.hasData()){ + List lista; + lista = this.skillRepository.findAll(); + + List lista2 = new ArrayList<>(); + lista2.add(this.skillRepository.findById(3L).get()); + lista2.add(this.skillRepository.findById(2L).get()); + lista2.add(this.skillRepository.findById(4L).get()); + lista2.add(this.skillRepository.findById(7L).get()); + lista2.add(this.skillRepository.findById(1L).get()); + lista2.add(this.skillRepository.findById(5L).get()); + lista2.add(this.skillRepository.findById(9L).get()); + lista2.add(this.skillRepository.findById(6L).get()); + + + List lista3 = new ArrayList<>(); + lista3.add(this.skillRepository.findById(3L).get()); + lista3.add(this.skillRepository.findById(2L).get()); + lista3.add(this.skillRepository.findById(4L).get()); + lista3.add(this.skillRepository.findById(7L).get()); + + List allSkills = new ArrayList<>(); + lista.forEach(item -> { + allSkills.add(item.getId()); + }); + + List skills8 = new ArrayList<>(); + lista2.forEach(item -> { + skills8.add(item.getId()); + }); + + List skills4 = new ArrayList<>(); + lista3.forEach(item -> { + skills4.add(item.getId()); + }); + + Account c = this.accountService.registerCompany("company@company", "company", "Co.Co", "Macedonia", "Skopje", "Pero Nakov"); + Account ct = this.accountService.registerCompany("company@co", "company", "Co.Co", "Macedonia", "Skopje", "Pero Nakov"); + Account m = this.accountService.registerTeam("team@team", "team", "TeamRocket", 3); + + this.workService.insertJob("Team Job 1", "Team job 1 requires 3 members!", m.getId() ,1515, allSkills, AccountType.TEAM); + this.workService.insertJob("Team Job 2", "Team job 2 requires 2 members!", m.getId() ,5511, skills4, AccountType.TEAM); + this.workService.insertJob("Company Job 1", "Company job 1 requires 3 members!", c.getId() ,12345, allSkills, AccountType.COMPANY); + this.workService.insertJob("Company Job 2", "Company job 2 requires 3 members!", ct.getId() ,8901, skills8, AccountType.COMPANY); + this.workService.insertInternship("Internship 1", "Opportunity to learn new things!", c.getId() ,5000, skills4, 6, AccountType.COMPANY); + this.workService.insertInternship("Internship 2", "Opportunity to learn new things!", c.getId() ,5000, allSkills, 3, AccountType.COMPANY); + this.workService.insertProject("Project 1", "Project that lasts few days!", m.getId() ,5000, skills8, new Date(), AccountType.TEAM); + this.workService.insertProject("Project 2", "Project that ends soon!", m.getId() ,5000, skills4, new Date(), AccountType.TEAM); + + this.accountService.registerUser("user@user", "user", "Zoki", "Poki", lista3, lista); + } + } +} Index: back_end/src/main/java/it/finki/tinki/helper/Matchmaker.java =================================================================== --- back_end/src/main/java/it/finki/tinki/helper/Matchmaker.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/helper/Matchmaker.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,29 @@ +package it.finki.tinki.helper; + +import it.finki.tinki.model.Skill; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class Matchmaker { + + public static float match(List work, List user){ + + float coef = work.size(); + float k = 0; + + for (Skill skill : work) { + for (Skill value : user) { + if (value.equals(skill)) { + k++; + } + } + } + + System.out.println(k/coef); + + return k/coef; + } + +} Index: back_end/src/main/java/it/finki/tinki/model/Address.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/Address.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/Address.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,26 @@ +package it.finki.tinki.model; + +import lombok.Data; + +import javax.persistence.*; + +@Entity +@Data +public class Address { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + Long id; + + String country; + String city; + String street; + + public Address() {} + + public Address(String country, String city, String street) { + this.country = country; + this.city = city; + this.street = street; + } +} Index: back_end/src/main/java/it/finki/tinki/model/EmbeddedMatchId.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/EmbeddedMatchId.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/EmbeddedMatchId.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,27 @@ +package it.finki.tinki.model; + +import it.finki.tinki.model.Work.Work; +import it.finki.tinki.model.Users.User; +import lombok.Data; + +import javax.persistence.Embeddable; +import javax.persistence.OneToOne; +import java.io.Serializable; + +@Embeddable +@Data +public class EmbeddedMatchId implements Serializable { + + @OneToOne + private Work work; + + @OneToOne + private User user; + + public EmbeddedMatchId(){} + + public EmbeddedMatchId(Work work, User user){ + this.work = work; + this.user = user; + } +} Index: back_end/src/main/java/it/finki/tinki/model/Match.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/Match.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/Match.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,26 @@ +package it.finki.tinki.model; + +import it.finki.tinki.model.enumerator.WorkType; +import lombok.Data; + +import javax.persistence.*; + +@Entity +@Data +public class Match { + + @Id + EmbeddedMatchId embeddedMatchId; + + float coefficient; + + WorkType type; + + public Match(){} + + public Match(EmbeddedMatchId embeddedMatchId, float coefficient, WorkType type) { + this.embeddedMatchId = embeddedMatchId; + this.coefficient = coefficient; + this.type = type; + } +} Index: back_end/src/main/java/it/finki/tinki/model/Skill.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/Skill.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/Skill.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,25 @@ +package it.finki.tinki.model; + +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +@Data +public class Skill { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + Long id; + + String name; + + public Skill(){} + + public Skill(String name) { + this.name = name; + } +} Index: back_end/src/main/java/it/finki/tinki/model/Users/Account.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/Users/Account.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/Users/Account.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,38 @@ +package it.finki.tinki.model.Users; + +import com.sun.istack.NotNull; +import it.finki.tinki.model.enumerator.AccountType; +import lombok.Data; + +import javax.persistence.*; + +@Entity +@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) +@Data +public abstract class Account { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + Long id; + + @Column(unique = true) + @NotNull + String email; + + @NotNull + String password; + + @NotNull + String name; + + AccountType accountType; + + public Account(){} + + public Account(String email, String password, String name, AccountType accountType) { + this.email = email; + this.password = password; + this.name = name; + this.accountType = accountType; + } +} Index: back_end/src/main/java/it/finki/tinki/model/Users/Company.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/Users/Company.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/Users/Company.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,23 @@ +package it.finki.tinki.model.Users; + +import it.finki.tinki.model.Address; +import it.finki.tinki.model.enumerator.AccountType; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.OneToOne; + +@Entity +@Data +public class Company extends Account{ + + @OneToOne + Address address; + + public Company(){} + + public Company(String email, String password, String name, AccountType accountType, Address address) { + super(email, password, name, accountType); + this.address = address; + } +} Index: back_end/src/main/java/it/finki/tinki/model/Users/Team.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/Users/Team.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/Users/Team.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,20 @@ +package it.finki.tinki.model.Users; + +import it.finki.tinki.model.enumerator.AccountType; +import lombok.Data; + +import javax.persistence.Entity; + +@Entity +@Data +public class Team extends Account { + + int members; + + public Team(){} + + public Team(String email, String password, String name, AccountType accountType, int members) { + super(email, password, name, accountType); + this.members = members; + } +} Index: back_end/src/main/java/it/finki/tinki/model/Users/User.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/Users/User.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/Users/User.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,35 @@ +package it.finki.tinki.model.Users; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.enumerator.AccountType; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.ManyToMany; +import java.util.List; + +@Entity(name = "users") +@Data +public class User extends Account{ + + String surname; + + @ManyToMany + List retainedSkills; + + @ManyToMany + List skillsToLearn; + + public User(){} + + public User(String email, String password, String name, AccountType accountType, String surname, List retainedSkills, List skillsToLearn) { + super(email, password, name, accountType); + this.surname = surname; + this.retainedSkills = retainedSkills; + this.skillsToLearn = skillsToLearn; + } + + public String toString(){ + return ""; + } +} Index: back_end/src/main/java/it/finki/tinki/model/Work/Internship.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/Work/Internship.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/Work/Internship.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,26 @@ +package it.finki.tinki.model.Work; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Users.Account; +import lombok.Data; + +import javax.persistence.*; +import java.util.List; + +@Entity +@Data +public class Internship extends Work { + + @ManyToMany(fetch = FetchType.EAGER) + List skillsTrained; + + int openSpots; + + public Internship(){} + + public Internship(String title, String description, Account account, int salary, List skillsTrained, int openSpots) { + super(title, description, account, salary); + this.skillsTrained = skillsTrained; + this.openSpots = openSpots; + } +} Index: back_end/src/main/java/it/finki/tinki/model/Work/Job.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/Work/Job.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/Work/Job.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,23 @@ +package it.finki.tinki.model.Work; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Users.Account; +import lombok.Data; + +import javax.persistence.*; +import java.util.List; + +@Entity +@Data +public class Job extends Work { + + @ManyToMany(fetch = FetchType.EAGER) + List skillsRequired; + + public Job(){} + + public Job(String title, String description, Account account, int salary, List skillsRequired) { + super(title, description, account, salary); + this.skillsRequired = skillsRequired; + } +} Index: back_end/src/main/java/it/finki/tinki/model/Work/Project.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/Work/Project.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/Work/Project.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,27 @@ +package it.finki.tinki.model.Work; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Users.Account; +import lombok.Data; + +import javax.persistence.*; +import java.util.Date; +import java.util.List; + +@Entity +@Data +public class Project extends Work { + + @ManyToMany(fetch = FetchType.EAGER) + List skillsRequired; + + Date validUntil; + + public Project(){} + + public Project(String title, String description, Account account, int salary, List skillsRequired, Date validUntil) { + super(title, description, account, salary); + this.skillsRequired = skillsRequired; + this.validUntil = validUntil; + } +} Index: back_end/src/main/java/it/finki/tinki/model/Work/Work.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/Work/Work.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/Work/Work.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,33 @@ +package it.finki.tinki.model.Work; + +import it.finki.tinki.model.Users.Account; +import lombok.Data; + +import javax.persistence.*; + +@Entity +@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) +@Data +public abstract class Work { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + Long id; + + String title; + String description; + + @ManyToOne(targetEntity = Account.class) + Account account; + + int salary; + + public Work(){} + + public Work(String title, String description, Account account, int salary) { + this.title = title; + this.description = description; + this.account = account; + this.salary = salary; + } +} Index: back_end/src/main/java/it/finki/tinki/model/dto/AccountLoginDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/AccountLoginDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/AccountLoginDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,11 @@ +package it.finki.tinki.model.dto; + +import it.finki.tinki.model.enumerator.AccountType; +import lombok.Data; + +@Data +public class AccountLoginDTO { + private String email; + private String password; + private AccountType type; +} Index: back_end/src/main/java/it/finki/tinki/model/dto/edit/work/InternshipEditDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/edit/work/InternshipEditDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/edit/work/InternshipEditDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,8 @@ +package it.finki.tinki.model.dto.edit.work; + +import lombok.Data; + +@Data +public class InternshipEditDTO extends WorkEditDTO{ + int openSpots; +} Index: back_end/src/main/java/it/finki/tinki/model/dto/edit/work/WorkEditDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/edit/work/WorkEditDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/edit/work/WorkEditDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,11 @@ +package it.finki.tinki.model.dto.edit.work; + +import lombok.Data; + +@Data +public class WorkEditDTO { + String title; + String description; + Long accountId; + int salary; +} Index: back_end/src/main/java/it/finki/tinki/model/dto/register/account/AccountRegisterDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/register/account/AccountRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/register/account/AccountRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,10 @@ +package it.finki.tinki.model.dto.register.account; + +import lombok.Data; + +@Data +public class AccountRegisterDTO { + String email; + String password; + String name; +} Index: back_end/src/main/java/it/finki/tinki/model/dto/register/account/CompanyRegisterDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/register/account/CompanyRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/register/account/CompanyRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,10 @@ +package it.finki.tinki.model.dto.register.account; + +import lombok.Data; + +@Data +public class CompanyRegisterDTO extends AccountRegisterDTO { + String country; + String city; + String street; +} Index: back_end/src/main/java/it/finki/tinki/model/dto/register/account/TeamRegisterDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/register/account/TeamRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/register/account/TeamRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,8 @@ +package it.finki.tinki.model.dto.register.account; + +import lombok.Data; + +@Data +public class TeamRegisterDTO extends AccountRegisterDTO { + int members; +} Index: back_end/src/main/java/it/finki/tinki/model/dto/register/account/UserRegisterDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/register/account/UserRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/register/account/UserRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,12 @@ +package it.finki.tinki.model.dto.register.account; + +import lombok.Data; + +import java.util.List; + +@Data +public class UserRegisterDTO extends AccountRegisterDTO { + String surname; + List retainedSkills; + List skillsToLearn; +} Index: back_end/src/main/java/it/finki/tinki/model/dto/register/work/InternshipRegisterDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/register/work/InternshipRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/register/work/InternshipRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,11 @@ +package it.finki.tinki.model.dto.register.work; + +import lombok.Data; + +import java.util.List; + +@Data +public class InternshipRegisterDTO extends WorkRegisterDTO { + int openSpots; + List skillsTrained; +} Index: back_end/src/main/java/it/finki/tinki/model/dto/register/work/JobRegisterDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/register/work/JobRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/register/work/JobRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,10 @@ +package it.finki.tinki.model.dto.register.work; + +import lombok.Data; + +import java.util.List; + +@Data +public class JobRegisterDTO extends WorkRegisterDTO{ + List skillsRequired; +} Index: back_end/src/main/java/it/finki/tinki/model/dto/register/work/ProjectRegisterDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/register/work/ProjectRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/register/work/ProjectRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,12 @@ +package it.finki.tinki.model.dto.register.work; + +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class ProjectRegisterDTO extends WorkRegisterDTO { + Date validUntil; + List skillsRequired; +} Index: back_end/src/main/java/it/finki/tinki/model/dto/register/work/WorkRegisterDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/register/work/WorkRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/register/work/WorkRegisterDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,13 @@ +package it.finki.tinki.model.dto.register.work; + +import it.finki.tinki.model.enumerator.AccountType; +import lombok.Data; + +@Data +public class WorkRegisterDTO { + String title; + String description; + Long accountId; + int salary; + AccountType type; +} Index: back_end/src/main/java/it/finki/tinki/model/dto/response/account/CompanyResponseDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/response/account/CompanyResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/response/account/CompanyResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,22 @@ +package it.finki.tinki.model.dto.response.account; + +import it.finki.tinki.model.Address; +import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; +import it.finki.tinki.model.dto.response.work.JobResponseDTO; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class CompanyResponseDTO extends LoginResponseDTO { + private Address address; + private List jobs; + private List internships; + + public CompanyResponseDTO(){ + super(); + this.jobs = new ArrayList<>(); + this.internships = new ArrayList<>(); + } +} Index: back_end/src/main/java/it/finki/tinki/model/dto/response/account/LoginResponseDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/response/account/LoginResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/response/account/LoginResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,17 @@ +package it.finki.tinki.model.dto.response.account; + +import it.finki.tinki.model.enumerator.AccountType; +import lombok.Data; + +@Data +public class LoginResponseDTO { + private Long id; + private String email; + private String name; + private AccountType type; + private String error; + + public LoginResponseDTO() { + this.error = "Invalid username or password!"; + } +} Index: back_end/src/main/java/it/finki/tinki/model/dto/response/account/TeamResponseDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/response/account/TeamResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/response/account/TeamResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,21 @@ +package it.finki.tinki.model.dto.response.account; + +import it.finki.tinki.model.dto.response.work.JobResponseDTO; +import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class TeamResponseDTO extends LoginResponseDTO { + private int members; + private List jobs; + private List projects; + + public TeamResponseDTO(){ + super(); + this.jobs = new ArrayList<>(); + this.projects = new ArrayList<>(); + } +} Index: back_end/src/main/java/it/finki/tinki/model/dto/response/account/UserResponseDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/response/account/UserResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/response/account/UserResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,28 @@ +package it.finki.tinki.model.dto.response.account; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; +import it.finki.tinki.model.dto.response.work.JobResponseDTO; +import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class UserResponseDTO extends LoginResponseDTO { + private String surname; + private List retained; + private List toLearn; + private List jobs; + private List internships; + private List projects; + + public UserResponseDTO(){ + retained = new ArrayList<>(); + toLearn = new ArrayList<>(); + jobs = new ArrayList<>(); + internships = new ArrayList<>(); + projects = new ArrayList<>(); + } +} Index: back_end/src/main/java/it/finki/tinki/model/dto/response/work/InternshipResponseDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/response/work/InternshipResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/response/work/InternshipResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,29 @@ +package it.finki.tinki.model.dto.response.work; + +import it.finki.tinki.model.Address; +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Work.Internship; +import it.finki.tinki.model.Users.Company; +import lombok.Data; + +import java.util.List; + +@Data +public class InternshipResponseDTO extends WorkResponseDTO { + int salary; + int openSpots; + Address accountAddress; + List skillsTrained; + + public InternshipResponseDTO(){ + super("Internship!"); + } + + public InternshipResponseDTO(Internship internship){ + super(internship.getId(), internship.getTitle(), internship.getDescription(), internship.getSalary(), internship.getAccount()); + this.salary = internship.getSalary(); + this.openSpots = internship.getOpenSpots(); + this.accountAddress = ((Company) internship.getAccount()).getAddress(); + this.skillsTrained = internship.getSkillsTrained(); + } +} Index: back_end/src/main/java/it/finki/tinki/model/dto/response/work/JobResponseDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/response/work/JobResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/response/work/JobResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,34 @@ +package it.finki.tinki.model.dto.response.work; + +import it.finki.tinki.model.Address; +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Work.Job; +import it.finki.tinki.model.Users.Company; +import it.finki.tinki.model.Users.Team; +import it.finki.tinki.model.enumerator.AccountType; +import lombok.Data; + +import java.util.List; + +@Data +public class JobResponseDTO extends WorkResponseDTO { + Address accountAddress; + int members; + List skillsRequired; + + public JobResponseDTO(){ + super("Job!"); + } + + public JobResponseDTO(Job job){ + super(job.getId(), job.getTitle(), job.getDescription(), job.getSalary(), job.getAccount()); + this.skillsRequired = job.getSkillsRequired(); + if(job.getAccount().getAccountType()==AccountType.COMPANY){ + this.accountAddress = ((Company) job.getAccount()).getAddress(); + this.members = 0; + }else{ + this.members = ((Team) job.getAccount()).getMembers(); + this.accountAddress = null; + } + } +} Index: back_end/src/main/java/it/finki/tinki/model/dto/response/work/ProjectResponseDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/response/work/ProjectResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/response/work/ProjectResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,27 @@ +package it.finki.tinki.model.dto.response.work; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Work.Project; +import it.finki.tinki.model.Users.Team; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class ProjectResponseDTO extends WorkResponseDTO { + int members; + Date validUntil; + List skillsRequired; + + public ProjectResponseDTO(){ + super("Project!"); + } + + public ProjectResponseDTO(Project project){ + super(project.getId(), project.getTitle(), project.getDescription(), project.getSalary(), project.getAccount()); + this.members = ((Team) project.getAccount()).getMembers(); + this.validUntil = project.getValidUntil(); + this.skillsRequired = project.getSkillsRequired(); + } +} Index: back_end/src/main/java/it/finki/tinki/model/dto/response/work/WorkResponseDTO.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/dto/response/work/WorkResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/dto/response/work/WorkResponseDTO.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,36 @@ +package it.finki.tinki.model.dto.response.work; + +import it.finki.tinki.model.Users.Account; +import it.finki.tinki.model.enumerator.AccountType; +import lombok.Data; + +@Data +public class WorkResponseDTO { + Long id; + String title; + String description; + int salary; + String accountEmail; + String accountName; + Long accountId; + AccountType accountType; + String error; + + WorkResponseDTO(){} + + WorkResponseDTO(String item){ + this.error = "Error registering " + item; + } + + WorkResponseDTO(Long id, String title, String description, int salary, Account account){ + this.error = null; + this.id = id; + this.title = title; + this.description = description; + this.salary = salary; + this.accountId = account.getId(); + this.accountEmail = account.getEmail(); + this.accountName = account.getName(); + this.accountType = account.getAccountType(); + } +} Index: back_end/src/main/java/it/finki/tinki/model/enumerator/AccountType.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/enumerator/AccountType.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/enumerator/AccountType.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,7 @@ +package it.finki.tinki.model.enumerator; + +public enum AccountType { + USER, + TEAM, + COMPANY +} Index: back_end/src/main/java/it/finki/tinki/model/enumerator/WorkType.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/enumerator/WorkType.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/enumerator/WorkType.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,7 @@ +package it.finki.tinki.model.enumerator; + +public enum WorkType { + JOB, + INTERNSHIP, + PROJECT +} Index: back_end/src/main/java/it/finki/tinki/model/exception/InvalidArgumentsException.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/exception/InvalidArgumentsException.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/exception/InvalidArgumentsException.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,7 @@ +package it.finki.tinki.model.exception; + +public class InvalidArgumentsException extends RuntimeException{ + public InvalidArgumentsException(){ + super("Invalid arguments entered!"); + } +} Index: back_end/src/main/java/it/finki/tinki/model/exception/SkillNotFoundException.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/exception/SkillNotFoundException.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/exception/SkillNotFoundException.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,7 @@ +package it.finki.tinki.model.exception; + +public class SkillNotFoundException extends RuntimeException{ + public SkillNotFoundException(Long id){ + super(String.format("Skill with id: %d was not found!", id)); + } +} Index: back_end/src/main/java/it/finki/tinki/model/exception/UserExistsException.java =================================================================== --- back_end/src/main/java/it/finki/tinki/model/exception/UserExistsException.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/model/exception/UserExistsException.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,8 @@ +package it.finki.tinki.model.exception; + + +public class UserExistsException extends RuntimeException{ + public UserExistsException(){ + super("User with that email already exists!"); + } +} Index: back_end/src/main/java/it/finki/tinki/repository/AddressRepository.java =================================================================== --- back_end/src/main/java/it/finki/tinki/repository/AddressRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/repository/AddressRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,9 @@ +package it.finki.tinki.repository; + +import it.finki.tinki.model.Address; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface AddressRepository extends JpaRepository { +} Index: back_end/src/main/java/it/finki/tinki/repository/CompanyRepository.java =================================================================== --- back_end/src/main/java/it/finki/tinki/repository/CompanyRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/repository/CompanyRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,14 @@ +package it.finki.tinki.repository; + +import it.finki.tinki.model.Users.Company; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface CompanyRepository extends JpaRepository { + Company findByEmailAndPassword(String email, String password); + Optional findByEmail(String email); + Optional findByIdAndEmail(Long id, String email); +} Index: back_end/src/main/java/it/finki/tinki/repository/InternshipRepository.java =================================================================== --- back_end/src/main/java/it/finki/tinki/repository/InternshipRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/repository/InternshipRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,16 @@ +package it.finki.tinki.repository; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Work.Internship; +import it.finki.tinki.model.Work.Job; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface InternshipRepository extends JpaRepository { + List findAllByAccount_Id(Long accountId); + List findAllByTitleContainsOrDescriptionContains(String title, String description); + List findAllBySkillsTrainedContaining(Skill skill); +} Index: back_end/src/main/java/it/finki/tinki/repository/JobRepository.java =================================================================== --- back_end/src/main/java/it/finki/tinki/repository/JobRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/repository/JobRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,16 @@ +package it.finki.tinki.repository; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Work.Job; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Set; + +@Repository +public interface JobRepository extends JpaRepository{ + List findAllByAccount_Id(Long accountId); + List findAllByTitleContainsOrDescriptionContains(String title, String description); + List findAllBySkillsRequiredContaining(Skill skill); +} Index: back_end/src/main/java/it/finki/tinki/repository/MatchRepository.java =================================================================== --- back_end/src/main/java/it/finki/tinki/repository/MatchRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/repository/MatchRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,16 @@ +package it.finki.tinki.repository; + +import it.finki.tinki.model.EmbeddedMatchId; +import it.finki.tinki.model.Match; +import it.finki.tinki.model.Users.User; +import it.finki.tinki.model.enumerator.WorkType; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface MatchRepository extends JpaRepository { + List findAllByEmbeddedMatchIdUserAndTypeOrderByCoefficientDesc(User user, WorkType type); + List deleteAllByEmbeddedMatchId_User_Id(Long userId); +} Index: back_end/src/main/java/it/finki/tinki/repository/ProjectRepository.java =================================================================== --- back_end/src/main/java/it/finki/tinki/repository/ProjectRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/repository/ProjectRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,16 @@ +package it.finki.tinki.repository; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Work.Job; +import it.finki.tinki.model.Work.Project; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface ProjectRepository extends JpaRepository { + List findAllByAccount_Id(Long accountId); + List findAllByTitleContainsOrDescriptionContains(String title, String description); + List findAllBySkillsRequiredContaining(Skill skill); +} Index: back_end/src/main/java/it/finki/tinki/repository/SkillRepository.java =================================================================== --- back_end/src/main/java/it/finki/tinki/repository/SkillRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/repository/SkillRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,14 @@ +package it.finki.tinki.repository; + +import it.finki.tinki.model.Skill; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +@Repository +public interface SkillRepository extends JpaRepository { + Optional findById(Long id); + List findAllByNameContaining(String text); +} Index: back_end/src/main/java/it/finki/tinki/repository/TeamRepository.java =================================================================== --- back_end/src/main/java/it/finki/tinki/repository/TeamRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/repository/TeamRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,15 @@ +package it.finki.tinki.repository; + +import it.finki.tinki.model.Users.Company; +import it.finki.tinki.model.Users.Team; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface TeamRepository extends JpaRepository { + Team findByEmailAndPassword(String email, String password); + Optional findByEmail(String email); + Optional findByIdAndEmail(Long id, String email); +} Index: back_end/src/main/java/it/finki/tinki/repository/UserRepository.java =================================================================== --- back_end/src/main/java/it/finki/tinki/repository/UserRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/repository/UserRepository.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,14 @@ +package it.finki.tinki.repository; + +import it.finki.tinki.model.Users.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface UserRepository extends JpaRepository { + User findByEmailAndPassword(String email, String password); + Optional findByEmail(String email); + Optional findByIdAndEmail(Long id, String email); +} Index: back_end/src/main/java/it/finki/tinki/service/AccountService.java =================================================================== --- back_end/src/main/java/it/finki/tinki/service/AccountService.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/service/AccountService.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,24 @@ +package it.finki.tinki.service; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Users.Account; +import it.finki.tinki.model.Users.Company; +import it.finki.tinki.model.Users.Team; +import it.finki.tinki.model.Users.User; +import it.finki.tinki.model.enumerator.AccountType; + +import java.util.List; +import java.util.Optional; + +public interface AccountService { + boolean hasData(); + Account findUser(String email, String password, AccountType type); + Account registerUser(String email, String password, String name, String surname, List retainedSkills, List skillsToLearn); + Account registerTeam(String email, String password, String name, int members); + Account registerCompany(String email, String password, String name, String country, String city, String street); + Account findByIdAndType(Long accId, AccountType type); + User editUser(Long id, String email, String name, String surname, List retainedSkills, List skillsToLearn); + Company editCompany(Long id, String email, String name, String country, String city, String street); + Team editTeam(Long id, String email, String name, int members); + Optional findByIdAndEmail(Long id, String email, AccountType type); +} Index: back_end/src/main/java/it/finki/tinki/service/BuilderService.java =================================================================== --- back_end/src/main/java/it/finki/tinki/service/BuilderService.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/service/BuilderService.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,12 @@ +package it.finki.tinki.service; + +import it.finki.tinki.model.Users.Account; +import it.finki.tinki.model.dto.response.account.CompanyResponseDTO; +import it.finki.tinki.model.dto.response.account.TeamResponseDTO; +import it.finki.tinki.model.dto.response.account.UserResponseDTO; + +public interface BuilderService { + UserResponseDTO buildUserResponseDTO(Account a1); + CompanyResponseDTO buildCompanyResponseDTO(Account a1); + TeamResponseDTO buildTeamResponseDTO(Account a1); +} Index: back_end/src/main/java/it/finki/tinki/service/MatchmakerService.java =================================================================== --- back_end/src/main/java/it/finki/tinki/service/MatchmakerService.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/service/MatchmakerService.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,19 @@ +package it.finki.tinki.service; + +import it.finki.tinki.model.Match; +import it.finki.tinki.model.Work.Internship; +import it.finki.tinki.model.Work.Job; +import it.finki.tinki.model.Work.Project; +import it.finki.tinki.model.Users.User; + +import java.util.List; + +public interface MatchmakerService { + List getMatchingInternshipsForUser(User user); + List getMatchingJobsForUser(User user); + List getMatchingProjectsForUser(User user); + void setUpUserJobMatches(Job job, User user); + void setUpUserProjectMatches(Project project, User user); + void setUpUserInternshipMatches(Internship internship, User user); + List removeByUserId(Long userId); +} Index: back_end/src/main/java/it/finki/tinki/service/SkillService.java =================================================================== --- back_end/src/main/java/it/finki/tinki/service/SkillService.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/service/SkillService.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,11 @@ +package it.finki.tinki.service; + +import it.finki.tinki.model.Skill; + +import java.util.List; + +public interface SkillService { + List returnSkillsBasedOnId(List skillIds); + List returnBasedOnText(String text); + List findAll(); +} Index: back_end/src/main/java/it/finki/tinki/service/WorkService.java =================================================================== --- back_end/src/main/java/it/finki/tinki/service/WorkService.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/service/WorkService.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,30 @@ +package it.finki.tinki.service; + +import it.finki.tinki.model.Work.Internship; +import it.finki.tinki.model.Work.Job; +import it.finki.tinki.model.Work.Project; +import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; +import it.finki.tinki.model.dto.response.work.JobResponseDTO; +import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; +import it.finki.tinki.model.enumerator.AccountType; + +import java.util.Date; +import java.util.List; + +public interface WorkService { + List getAllJobsByAccount(Long accId); + List getAllInternshipsByAccount(Long accId); + List getAllProjectsByAccount(Long accId); + Job insertJob(String title, String description, Long accId, int salary, List skillsRequired, AccountType type); + Internship insertInternship(String title, String description, Long adccId, int salary, List skillsTrained, int openSpots, AccountType type); + Project insertProject(String title, String description, Long adccId, int salary, List skillsRequired, Date validUntil, AccountType type); + Job editJob(Long id, String title, String description, int salary); + Internship editInternship(Long id, String title, String description, int salary, int openSpots); + Project editProject(Long id, String title, String description, int salary); + List fullTextJobSearch(String text); + List fullTextInternshipSearch(String text); + List fullTextProjectSearch(String text); + Job getJobById(Long id); + Internship getInternshipById(Long id); + Project getProjectById(Long id); +} Index: back_end/src/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java =================================================================== --- back_end/src/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,255 @@ +package it.finki.tinki.service.impl; + +import it.finki.tinki.model.Address; +import it.finki.tinki.model.Work.Internship; +import it.finki.tinki.model.Work.Job; +import it.finki.tinki.model.Work.Project; +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Users.Account; +import it.finki.tinki.model.Users.Company; +import it.finki.tinki.model.Users.Team; +import it.finki.tinki.model.Users.User; +import it.finki.tinki.model.enumerator.AccountType; +import it.finki.tinki.model.exception.InvalidArgumentsException; +import it.finki.tinki.model.exception.UserExistsException; +import it.finki.tinki.repository.*; +import it.finki.tinki.service.AccountService; +import it.finki.tinki.service.MatchmakerService; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +@Service +public class AccountServiceImpl implements AccountService { + + AddressRepository addressRepository; + UserRepository userRepository; + TeamRepository teamRepository; + CompanyRepository companyRepository; + JobRepository jobRepository; + ProjectRepository projectRepository; + InternshipRepository internshipRepository; + MatchmakerService matchmakerService; + + public AccountServiceImpl(AddressRepository addressRepository, + UserRepository userRepository, + TeamRepository teamRepository, + CompanyRepository companyRepository, + MatchmakerService matchmakerService, + JobRepository jobRepository, + ProjectRepository projectRepository, + InternshipRepository internshipRepository) { + this.addressRepository = addressRepository; + this.userRepository = userRepository; + this.teamRepository = teamRepository; + this.companyRepository = companyRepository; + this.jobRepository = jobRepository; + this.projectRepository = projectRepository; + this.internshipRepository = internshipRepository; + this.matchmakerService = matchmakerService; + } + + + @Override + public boolean hasData() { + + List users = this.userRepository.findAll(); + List companies = this.companyRepository.findAll(); + List teams = this.teamRepository.findAll(); + + return users.size() > 0 || companies.size() > 0 || teams.size() > 0; + } + + @Override + public Account findUser(String email, String password, AccountType type) { + + if(type.equals(AccountType.USER)){ + User u1 = this.userRepository.findByEmailAndPassword(email, password); + return u1; + } + else if(type.equals(AccountType.TEAM)){ + Team t1 = this.teamRepository.findByEmailAndPassword(email, password); + return t1; + } + else if(type.equals(AccountType.COMPANY)){ + Company c1 = this.companyRepository.findByEmailAndPassword(email, password); + return c1; + } + + return null; + } + + public Account registerUser(String email, String password, String name, String surname, List retainedSkills, List skillsToLearn){ + if(email==null || email.isEmpty() || password==null || password.isEmpty() || name==null || name.isEmpty() || surname==null || surname.isEmpty()){ + throw new InvalidArgumentsException(); + } + + if(this.userRepository.findByEmail(email).isPresent()){ + throw new UserExistsException(); + } + + User u = new User(email, password, name, AccountType.USER, surname, retainedSkills, skillsToLearn); + User ru = this.userRepository.save(u); + + setUpUser(ru); + + return ru; + } + + public Account registerTeam(String email, String password, String name, int members){ + if(email==null || email.isEmpty() || password==null || password.isEmpty() || name==null || name.isEmpty()){ + throw new InvalidArgumentsException(); + } + + if(this.teamRepository.findByEmail(email).isPresent()){ + throw new UserExistsException(); + } + + Team t = new Team(email, password, name, AccountType.TEAM, members); + return this.teamRepository.save(t); + } + + public Account registerCompany(String email, String password, String name, String country, String city, String street){ + if(email==null || email.isEmpty() || password==null || password.isEmpty() || name==null || name.isEmpty() + || country==null || country.isEmpty() || city==null || city.isEmpty() || street==null || street.isEmpty()){ + throw new InvalidArgumentsException(); + } + + System.out.println(email); + + if(this.companyRepository.findByEmail(email).isPresent()){ + throw new UserExistsException(); + } + + Address a = new Address(country, city, street); + this.addressRepository.save(a); + Company c = new Company(email, password, name, AccountType.COMPANY, a); + return this.companyRepository.save(c); + } + + public Account findByIdAndType(Long id, AccountType type){ + switch (type){ + case COMPANY: + return this.companyRepository.findById(id).get(); + case TEAM: + return this.teamRepository.findById(id).get(); + case USER: + return this.userRepository.findById(id).get(); + } + + return null; + } + + public Optional findByIdAndEmail(Long id, String email, AccountType accountType){ + + switch (accountType){ + case USER: + return this.userRepository.findByIdAndEmail(id, email); + case TEAM: + return this.teamRepository.findByIdAndEmail(id, email); + case COMPANY: + return this.companyRepository.findByIdAndEmail(id, email); + } + + return Optional.empty(); + } + + public User editUser(Long id, String email, String name, String surname, List retainedSkills, List skillsToLearn){ + if(email==null || email.isEmpty() || name==null || name.isEmpty() || surname==null || surname.isEmpty()){ + throw new InvalidArgumentsException(); + } + + User u = this.userRepository.findById(id).get(); + Optional t = this.userRepository.findByEmail(email); + + if(t.isPresent() && !t.get().equals(u)){ + throw new UserExistsException(); + } + + u.setEmail(email); + u.setName(name); + u.setSurname(surname); + u.setRetainedSkills(retainedSkills); + u.setSkillsToLearn(skillsToLearn); + + User m = this.userRepository.save(u); + + setUpUser(m); + + return m; + } + + public Company editCompany(Long id, String email, String name, String country, String city, String street){ + if(email==null || email.isEmpty() || name==null || name.isEmpty() + || country==null || country.isEmpty() || city==null || city.isEmpty() || street==null || street.isEmpty()){ + throw new InvalidArgumentsException(); + } + + Company c = this.companyRepository.findById(id).get(); + Optional t = this.companyRepository.findByEmail(email); + + if(t.isPresent() && !t.get().equals(c)){ + throw new UserExistsException(); + } + + c.setEmail(email); + c.setName(name); + + Address ad = c.getAddress(); + ad.setCountry(country); + ad.setCity(city); + ad.setStreet(street); + + this.addressRepository.save(ad); + return this.companyRepository.save(c); + } + + public Team editTeam(Long id, String email, String name, int members){ + if(email==null || email.isEmpty() || name==null || name.isEmpty()){ + throw new InvalidArgumentsException(); + } + + Team t = this.teamRepository.findById(id).get(); + Optional tt = this.teamRepository.findByEmail(email); + + if(tt.isPresent() && !tt.get().equals(t)){ + throw new UserExistsException(); + } + + t.setEmail(email); + t.setName(name); + t.setMembers(members); + + return this.teamRepository.save(t); + } + + + private void setUpUser(User u){ + + this.matchmakerService.removeByUserId(u.getId()); + + List jobs = this.jobRepository.findAll(); + List projects = this.projectRepository.findAll(); + List internships = this.internshipRepository.findAll(); + + if(jobs.size()!=0){ + for (Job job : jobs) { + this.matchmakerService.setUpUserJobMatches(job, u); + } + } + + if(projects.size()!=0){ + for (Project project : projects) { + this.matchmakerService.setUpUserProjectMatches(project, u); + } + } + + if(internships.size()!=0){ + for(Internship internship : internships){ + this.matchmakerService.setUpUserInternshipMatches(internship, u); + } + } + } +} Index: back_end/src/main/java/it/finki/tinki/service/impl/BuilderServiceImpl.java =================================================================== --- back_end/src/main/java/it/finki/tinki/service/impl/BuilderServiceImpl.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/service/impl/BuilderServiceImpl.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,127 @@ +package it.finki.tinki.service.impl; + +import it.finki.tinki.model.Users.Account; +import it.finki.tinki.model.Users.Company; +import it.finki.tinki.model.Users.Team; +import it.finki.tinki.model.Users.User; +import it.finki.tinki.model.Work.Internship; +import it.finki.tinki.model.Work.Job; +import it.finki.tinki.model.Work.Project; +import it.finki.tinki.model.dto.response.account.CompanyResponseDTO; +import it.finki.tinki.model.dto.response.account.TeamResponseDTO; +import it.finki.tinki.model.dto.response.account.UserResponseDTO; +import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; +import it.finki.tinki.model.dto.response.work.JobResponseDTO; +import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; +import it.finki.tinki.model.enumerator.AccountType; +import it.finki.tinki.service.BuilderService; +import it.finki.tinki.service.MatchmakerService; +import it.finki.tinki.service.WorkService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class BuilderServiceImpl implements BuilderService { + + MatchmakerService matchmakerService; + WorkService workService; + + public BuilderServiceImpl(MatchmakerService matchmakerService, WorkService workService) { + this.matchmakerService = matchmakerService; + this.workService = workService; + } + + @Override + public UserResponseDTO buildUserResponseDTO(Account a1) { + UserResponseDTO uDto = new UserResponseDTO(); + + uDto.setError(null); + + uDto.setId(a1.getId()); + uDto.setEmail(a1.getEmail()); + uDto.setName(a1.getName()); + uDto.setType(AccountType.USER); + uDto.setSurname(((User) a1).getSurname()); + + uDto.setRetained(((User) a1).getRetainedSkills()); + uDto.setToLearn(((User) a1).getSkillsToLearn()); + + List matchedJobs = this.matchmakerService.getMatchingJobsForUser((User) a1); + List matchedProjects = this.matchmakerService.getMatchingProjectsForUser((User) a1); + List matchedInternships = this.matchmakerService.getMatchingInternshipsForUser((User) a1); + + matchedJobs.forEach(job -> { + JobResponseDTO dto = new JobResponseDTO(job); + uDto.getJobs().add(dto); + }); + + matchedProjects.forEach(project -> { + ProjectResponseDTO dto = new ProjectResponseDTO(project); + uDto.getProjects().add(dto); + }); + + matchedInternships.forEach(internship -> { + InternshipResponseDTO dto = new InternshipResponseDTO(internship); + uDto.getInternships().add(dto); + }); + + return uDto; + } + + @Override + public CompanyResponseDTO buildCompanyResponseDTO(Account a1) { + CompanyResponseDTO cDto = new CompanyResponseDTO(); + + cDto.setError(null); + + cDto.setId(a1.getId()); + cDto.setEmail(a1.getEmail()); + cDto.setName(a1.getName()); + cDto.setType(AccountType.COMPANY); + cDto.setAddress(((Company) a1).getAddress()); + + List jobs = this.workService.getAllJobsByAccount(a1.getId()); + List internships = this.workService.getAllInternshipsByAccount(a1.getId()); + + jobs.forEach(job -> { + JobResponseDTO dto = new JobResponseDTO(job); + cDto.getJobs().add(dto); + }); + + internships.forEach(internship -> { + InternshipResponseDTO dto = new InternshipResponseDTO(internship); + cDto.getInternships().add(dto); + }); + + return cDto; + } + + @Override + public TeamResponseDTO buildTeamResponseDTO(Account a1) { + TeamResponseDTO tDto = new TeamResponseDTO(); + + tDto.setError(null); + + tDto.setId(a1.getId()); + tDto.setEmail(a1.getEmail()); + tDto.setName(a1.getName()); + tDto.setType(AccountType.TEAM); + tDto.setMembers(((Team) a1).getMembers()); + + List jobs = this.workService.getAllJobsByAccount(a1.getId()); + List projects = this.workService.getAllProjectsByAccount(a1.getId()); + + jobs.forEach(job -> { + JobResponseDTO dto = new JobResponseDTO(job); + tDto.getJobs().add(dto); + }); + + projects.forEach(project -> { + ProjectResponseDTO dto = new ProjectResponseDTO(project); + tDto.getProjects().add(dto); + }); + + return tDto; + } +} Index: back_end/src/main/java/it/finki/tinki/service/impl/MatchmakerServiceImpl.java =================================================================== --- back_end/src/main/java/it/finki/tinki/service/impl/MatchmakerServiceImpl.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/service/impl/MatchmakerServiceImpl.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,132 @@ +package it.finki.tinki.service.impl; + +import it.finki.tinki.helper.Matchmaker; +import it.finki.tinki.model.EmbeddedMatchId; +import it.finki.tinki.model.Work.Internship; +import it.finki.tinki.model.Work.Job; +import it.finki.tinki.model.Work.Project; +import it.finki.tinki.model.Match; +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Users.User; +import it.finki.tinki.model.enumerator.WorkType; +import it.finki.tinki.repository.InternshipRepository; +import it.finki.tinki.repository.JobRepository; +import it.finki.tinki.repository.MatchRepository; +import it.finki.tinki.repository.ProjectRepository; +import it.finki.tinki.service.MatchmakerService; +import org.springframework.stereotype.Service; + +import javax.transaction.Transactional; +import java.util.ArrayList; +import java.util.List; + + +@Service +public class MatchmakerServiceImpl implements MatchmakerService { + + MatchRepository matchRepository; + JobRepository jobRepository; + InternshipRepository internshipRepository; + ProjectRepository projectRepository; + + public MatchmakerServiceImpl(MatchRepository matchRepository, + JobRepository jobRepository, + InternshipRepository internshipRepository, + ProjectRepository projectRepository) { + this.matchRepository = matchRepository; + this.jobRepository = jobRepository; + this.internshipRepository = internshipRepository; + this.projectRepository = projectRepository; + } + + @Override + public List getMatchingInternshipsForUser(User user) { + List matches = this.matchRepository.findAllByEmbeddedMatchIdUserAndTypeOrderByCoefficientDesc(user, WorkType.INTERNSHIP); + + List internships = new ArrayList<>(); + if(matches.size()!=0){ + matches.forEach(match -> { + internships.add((Internship) match.getEmbeddedMatchId().getWork()); + }); + } + + return internships; + } + + @Override + public List getMatchingJobsForUser(User user) { + List matches = this.matchRepository.findAllByEmbeddedMatchIdUserAndTypeOrderByCoefficientDesc(user, WorkType.JOB); + + List jobs = new ArrayList<>(); + if(matches.size()!=0) { + matches.forEach(match -> { + jobs.add((Job) match.getEmbeddedMatchId().getWork()); + }); + } + + return jobs; + } + + @Override + public List getMatchingProjectsForUser(User user) { + List matches = this.matchRepository.findAllByEmbeddedMatchIdUserAndTypeOrderByCoefficientDesc(user, WorkType.PROJECT); + + List projects = new ArrayList<>(); + if(matches.size()!=0) { + matches.forEach(match -> { + projects.add((Project) match.getEmbeddedMatchId().getWork()); + }); + } + + return projects; + } + + @Override + public void setUpUserJobMatches(Job job, User user) { + List jobSkill = job.getSkillsRequired(); + List userSkill = user.getRetainedSkills(); + + float coef = Matchmaker.match(jobSkill, userSkill); + + if(coef!=0){ + EmbeddedMatchId embeddedMatchId = new EmbeddedMatchId(job, user); + Match m = new Match(embeddedMatchId, coef, WorkType.JOB); + this.matchRepository.save(m); + } + } + + @Override + public void setUpUserProjectMatches(Project project, User user) { + List projectSkills = project.getSkillsRequired(); + List userSkill = user.getRetainedSkills(); + + float coef = Matchmaker.match(projectSkills, userSkill); + + if(coef!=0){ + EmbeddedMatchId embeddedMatchId = new EmbeddedMatchId(project, user); + Match m = new Match(embeddedMatchId, coef, WorkType.PROJECT); + this.matchRepository.save(m); + } + } + + @Override + public void setUpUserInternshipMatches(Internship internship, User user) { + List internshipSkills = internship.getSkillsTrained(); + List userSkill = user.getSkillsToLearn(); + + float coef = Matchmaker.match(internshipSkills, userSkill); + + if(coef!=0){ + EmbeddedMatchId embeddedMatchId = new EmbeddedMatchId(internship, user); + Match m = new Match(embeddedMatchId, coef, WorkType.INTERNSHIP); + this.matchRepository.save(m); + } + } + + @Transactional + @Override + public List removeByUserId(Long userId) { + return this.matchRepository.deleteAllByEmbeddedMatchId_User_Id(userId); + } + +} Index: back_end/src/main/java/it/finki/tinki/service/impl/SkillServiceImpl.java =================================================================== --- back_end/src/main/java/it/finki/tinki/service/impl/SkillServiceImpl.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/service/impl/SkillServiceImpl.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,40 @@ +package it.finki.tinki.service.impl; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.repository.SkillRepository; +import it.finki.tinki.service.SkillService; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class SkillServiceImpl implements SkillService { + + SkillRepository skillRepository; + + public SkillServiceImpl(SkillRepository skillRepository) { + this.skillRepository = skillRepository; + } + + @Override + public List returnSkillsBasedOnId(List skillIds) { + + List list = new ArrayList<>(); + + skillIds.forEach(skill -> { + this.skillRepository.findById(skill).ifPresent(list::add); + }); + + return list; + } + + public List returnBasedOnText(String text){ + return this.skillRepository.findAllByNameContaining(text); + } + + @Override + public List findAll() { + return this.skillRepository.findAll(); + } +} Index: back_end/src/main/java/it/finki/tinki/service/impl/WorkServiceImpl.java =================================================================== --- back_end/src/main/java/it/finki/tinki/service/impl/WorkServiceImpl.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/service/impl/WorkServiceImpl.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,241 @@ +package it.finki.tinki.service.impl; + +import it.finki.tinki.model.Users.User; +import it.finki.tinki.model.Work.Internship; +import it.finki.tinki.model.Work.Job; +import it.finki.tinki.model.Work.Project; +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Users.Account; +import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; +import it.finki.tinki.model.dto.response.work.JobResponseDTO; +import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; +import it.finki.tinki.model.enumerator.AccountType; +import it.finki.tinki.repository.*; +import it.finki.tinki.service.AccountService; +import it.finki.tinki.service.MatchmakerService; +import it.finki.tinki.service.SkillService; +import it.finki.tinki.service.WorkService; +import org.springframework.stereotype.Service; + +import java.util.*; + +@Service +public class WorkServiceImpl implements WorkService { + + JobRepository jobRepository; + InternshipRepository internshipRepository; + ProjectRepository projectRepository; + MatchRepository matchRepository; + MatchmakerService matchmakerService; + SkillService skillService; + AccountService accountService; + UserRepository userRepository; + + public WorkServiceImpl(JobRepository jobRepository, + InternshipRepository internshipRepository, + ProjectRepository projectRepository, + MatchRepository matchRepository, + SkillService skillService, + AccountService accountService, + UserRepository userRepository, + MatchmakerService matchmakerService) { + this.jobRepository = jobRepository; + this.internshipRepository = internshipRepository; + this.projectRepository = projectRepository; + this.matchRepository = matchRepository; + this.skillService = skillService; + this.accountService = accountService; + this.userRepository = userRepository; + this.matchmakerService = matchmakerService; + } + + @Override + public List getAllJobsByAccount(Long accId) { + return this.jobRepository.findAllByAccount_Id(accId); + } + + @Override + public List getAllInternshipsByAccount(Long accId) { + return this.internshipRepository.findAllByAccount_Id(accId); + } + + @Override + public List getAllProjectsByAccount(Long accId) { + return this.projectRepository.findAllByAccount_Id(accId); + } + + @Override + public Job insertJob(String title, String description, Long adccId, int salary, List skillsRequired, AccountType type) { + List skills = this.skillService.returnSkillsBasedOnId(skillsRequired); + Account account = this.accountService.findByIdAndType(adccId, type); + Job j = new Job(title, description, account, salary, skills); + Job jb = this.jobRepository.save(j); + + List users = this.userRepository.findAll(); + + users.forEach(user -> { + this.matchmakerService.setUpUserJobMatches(jb, user); + }); + + return jb; + } + + @Override + public Internship insertInternship(String title, String description, Long adccId, int salary, List skillsTrained, int openSpots, AccountType type) { + List skills = this.skillService.returnSkillsBasedOnId(skillsTrained); + Account account = this.accountService.findByIdAndType(adccId, type); + Internship j = new Internship(title, description, account, salary, skills, openSpots); + Internship jb = this.internshipRepository.save(j); + + List users = this.userRepository.findAll(); + + users.forEach(user -> { + this.matchmakerService.setUpUserInternshipMatches(jb, user); + }); + + return jb; + } + + @Override + public Project insertProject(String title, String description, Long adccId, int salary, List skillsRequired, Date validUntil, AccountType type) { + List skills = this.skillService.returnSkillsBasedOnId(skillsRequired); + Account account = this.accountService.findByIdAndType(adccId, type); + Project j = new Project(title, description, account, salary, skills, validUntil); + Project jb = this.projectRepository.save(j); + + List users = this.userRepository.findAll(); + + users.forEach(user -> { + this.matchmakerService.setUpUserProjectMatches(jb, user); + }); + + return jb; + } + + @Override + public Job editJob(Long id, String title, String description, int salary) { + Job j = this.jobRepository.findById(id).get(); + + j.setTitle(title); + j.setDescription(description); + j.setSalary(salary); + + return this.jobRepository.save(j); + } + + @Override + public Internship editInternship(Long id, String title, String description, int salary, int openSpots) { + Internship j = this.internshipRepository.findById(id).get(); + + j.setTitle(title); + j.setDescription(description); + j.setSalary(salary); + j.setOpenSpots(openSpots); + + return this.internshipRepository.save(j); + } + + @Override + public Project editProject(Long id, String title, String description, int salary) { + Project j = this.projectRepository.findById(id).get(); + + j.setTitle(title); + j.setDescription(description); + j.setSalary(salary); + + return this.projectRepository.save(j); + } + + @Override + public List fullTextJobSearch(String text) { + List skills = this.skillService.returnBasedOnText(text); + + List jobs = this.jobRepository.findAllByTitleContainsOrDescriptionContains(text,text); + List sjob = new ArrayList<>(); + + skills.forEach(skill -> { + sjob.addAll(this.jobRepository.findAllBySkillsRequiredContaining(skill)); + }); + + sjob.forEach(job -> { + if(!jobs.contains(job)){ + jobs.add(job); + } + }); + + List jobs2 = new ArrayList<>(); + + jobs.forEach(job -> { + jobs2.add(new JobResponseDTO(job)); + }); + + return jobs2; + } + + @Override + public List fullTextInternshipSearch(String text) { + List skills = this.skillService.returnBasedOnText(text); + + List jobs = this.internshipRepository.findAllByTitleContainsOrDescriptionContains(text,text); + List sjob = new ArrayList<>(); + + skills.forEach(skill -> { + sjob.addAll(this.internshipRepository.findAllBySkillsTrainedContaining(skill)); + }); + + sjob.forEach(job -> { + if(!jobs.contains(job)){ + jobs.add(job); + } + }); + + List jobs2 = new ArrayList<>(); + + jobs.forEach(job -> { + jobs2.add(new InternshipResponseDTO(job)); + }); + + return jobs2; + } + + @Override + public List fullTextProjectSearch(String text) { + List skills = this.skillService.returnBasedOnText(text); + + List jobs = this.projectRepository.findAllByTitleContainsOrDescriptionContains(text,text); + List sjob = new ArrayList<>(); + + skills.forEach(skill -> { + sjob.addAll(this.projectRepository.findAllBySkillsRequiredContaining(skill)); + }); + + sjob.forEach(job -> { + if(!jobs.contains(job)){ + jobs.add(job); + } + }); + + List jobs2 = new ArrayList<>(); + + jobs.forEach(job -> { + jobs2.add(new ProjectResponseDTO(job)); + }); + + return jobs2; + } + + @Override + public Job getJobById(Long id) { + return this.jobRepository.findById(id).get(); + } + + @Override + public Internship getInternshipById(Long id) { + return this.internshipRepository.findById(id).get(); + } + + @Override + public Project getProjectById(Long id) { + return this.projectRepository.findById(id).get(); + } +} Index: back_end/src/main/java/it/finki/tinki/web/controller/AccountEditController.java =================================================================== --- back_end/src/main/java/it/finki/tinki/web/controller/AccountEditController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/web/controller/AccountEditController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,83 @@ +package it.finki.tinki.web.controller; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Users.Company; +import it.finki.tinki.model.Users.Team; +import it.finki.tinki.model.Users.User; +import it.finki.tinki.model.dto.register.account.CompanyRegisterDTO; +import it.finki.tinki.model.dto.register.account.TeamRegisterDTO; +import it.finki.tinki.model.dto.register.account.UserRegisterDTO; +import it.finki.tinki.model.dto.response.account.CompanyResponseDTO; +import it.finki.tinki.model.dto.response.account.TeamResponseDTO; +import it.finki.tinki.model.dto.response.account.UserResponseDTO; +import it.finki.tinki.model.enumerator.AccountType; +import it.finki.tinki.service.AccountService; +import it.finki.tinki.service.BuilderService; +import it.finki.tinki.service.SkillService; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Optional; + +@RestController +@CrossOrigin(origins = "http://localhost:3000") +@RequestMapping(path = "/api/edit/account") +public class AccountEditController { + + AccountService accountService; + SkillService skillService; + BuilderService builderService; + + public AccountEditController(AccountService accountService, SkillService skillService, BuilderService builderService) { + this.accountService = accountService; + this.skillService = skillService; + this.builderService = builderService; + } + + @PostMapping(path = "/user/{id}/{email}") + public UserResponseDTO editUser(@PathVariable(name = "id") Long id, + @PathVariable(name = "email") String email, + @RequestBody UserRegisterDTO body){ + + Optional a = this.accountService.findByIdAndEmail(id, email, AccountType.USER); + + if(a.isPresent()){ + List retained = this.skillService.returnSkillsBasedOnId(body.getRetainedSkills()); + List toLearn = this.skillService.returnSkillsBasedOnId(body.getSkillsToLearn()); + User u = this.accountService.editUser(id, body.getEmail(), body.getName(), body.getSurname(), retained, toLearn); + return this.builderService.buildUserResponseDTO(u); + } + + return new UserResponseDTO(); + } + + @PostMapping(path = "/company/{id}/{email}") + public CompanyResponseDTO editCompany(@PathVariable(name = "id") Long id, + @PathVariable(name = "email") String email, + @RequestBody CompanyRegisterDTO body){ + + Optional a = this.accountService.findByIdAndEmail(id, email, AccountType.COMPANY); + + if(a.isPresent()){ + Company c = this.accountService.editCompany(id, body.getEmail(), body.getName(), body.getCountry(), body.getCity(), body.getStreet()); + return this.builderService.buildCompanyResponseDTO(c); + } + + return new CompanyResponseDTO(); + } + + @PostMapping(path = "/team/{id}/{email}") + public TeamResponseDTO editTeam(@PathVariable(name = "id") Long id, + @PathVariable(name = "email") String email, + @RequestBody TeamRegisterDTO body){ + + Optional a = this.accountService.findByIdAndEmail(id, email, AccountType.TEAM); + + if(a.isPresent()){ + Team t = this.accountService.editTeam(id, body.getEmail(), body.getName(), body.getMembers()); + return this.builderService.buildTeamResponseDTO(t); + } + + return new TeamResponseDTO(); + } +} Index: back_end/src/main/java/it/finki/tinki/web/controller/AccountRegisterController.java =================================================================== --- back_end/src/main/java/it/finki/tinki/web/controller/AccountRegisterController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/web/controller/AccountRegisterController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,76 @@ +package it.finki.tinki.web.controller; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Users.Account; +import it.finki.tinki.model.dto.register.account.CompanyRegisterDTO; +import it.finki.tinki.model.dto.register.account.TeamRegisterDTO; +import it.finki.tinki.model.dto.register.account.UserRegisterDTO; +import it.finki.tinki.service.AccountService; +import it.finki.tinki.service.SkillService; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +@CrossOrigin(origins = "http://localhost:3000") +@RequestMapping("/api/register") +public class AccountRegisterController { + + AccountService accountService; + SkillService skillService; + + public AccountRegisterController(AccountService accountService, SkillService skillService) { + this.accountService = accountService; + this.skillService = skillService; + } + + @RequestMapping(path = "/user", method = RequestMethod.POST) + private Map registerUser(@RequestBody UserRegisterDTO body){ + + List retained = this.skillService.returnSkillsBasedOnId(body.getRetainedSkills()); + List toLearn = this.skillService.returnSkillsBasedOnId(body.getSkillsToLearn()); + Account k = this.accountService.registerUser(body.getEmail(), body.getPassword(), body.getName(), body.getSurname(), retained, toLearn); + Map response = new HashMap<>(); + + if(k==null){ + response.put("error", "There was an error when trying to register user."); + }else{ + response.put("success", "Registration completed successfully."); + } + + return response; + } + + @RequestMapping(path = "/team", method = RequestMethod.POST) + private Map registerTeam(@RequestBody TeamRegisterDTO body){ + + Account k = this.accountService.registerTeam(body.getEmail(), body.getPassword(), body.getName(), body.getMembers()); + Map response = new HashMap<>(); + + if(k==null){ + response.put("error", "There was an error when trying to register team."); + }else{ + response.put("success", "Registration completed successfully."); + } + + return response; + } + + @RequestMapping(path = "/company", method = RequestMethod.POST) + private Map registerCompany(@RequestBody CompanyRegisterDTO body){ + + Account k = this.accountService.registerCompany(body.getEmail(), + body.getPassword(), body.getName(), body.getCountry(), body.getCity(), body.getStreet()); + Map response = new HashMap<>(); + + if(k==null){ + response.put("error", "There was an error when trying to register company."); + }else{ + response.put("success", "Registration completed successfully."); + } + + return response; + } +} Index: back_end/src/main/java/it/finki/tinki/web/controller/LoginController.java =================================================================== --- back_end/src/main/java/it/finki/tinki/web/controller/LoginController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/web/controller/LoginController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,46 @@ +package it.finki.tinki.web.controller; + +import it.finki.tinki.model.Users.Account; +import it.finki.tinki.model.Users.Team; +import it.finki.tinki.model.Users.User; +import it.finki.tinki.model.dto.*; +import it.finki.tinki.model.dto.response.account.LoginResponseDTO; +import it.finki.tinki.service.AccountService; +import it.finki.tinki.service.BuilderService; +import it.finki.tinki.service.WorkService; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.server.ResponseStatusException; + +import java.util.List; + +@RestController +@CrossOrigin(origins = "http://localhost:3000") +@RequestMapping("/api") +public class LoginController { + + AccountService accountService; + BuilderService builderService; + + public LoginController(AccountService accountService, BuilderService builderService) { + this.accountService = accountService; + this.builderService = builderService; + } + + @PostMapping(path = "/login") + public LoginResponseDTO loginProcess(@RequestBody AccountLoginDTO body) throws ResponseStatusException { + + Account a1 = accountService.findUser(body.getEmail(), body.getPassword(), body.getType()); + + if(a1!=null){ + if(a1.getClass().equals(User.class)){ + return this.builderService.buildUserResponseDTO(a1); + }else if(a1.getClass().equals(Team.class)){ + return this.builderService.buildTeamResponseDTO(a1); + }else{ + return this.builderService.buildCompanyResponseDTO(a1); + } + } + + return new LoginResponseDTO(); + } +} Index: back_end/src/main/java/it/finki/tinki/web/controller/SearchController.java =================================================================== --- back_end/src/main/java/it/finki/tinki/web/controller/SearchController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/web/controller/SearchController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,36 @@ +package it.finki.tinki.web.controller; + +import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; +import it.finki.tinki.model.dto.response.work.JobResponseDTO; +import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; +import it.finki.tinki.service.WorkService; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@CrossOrigin("http://localhost:3000") +@RequestMapping("/api/search") +public class SearchController { + + WorkService workService; + + public SearchController(WorkService workService) { + this.workService = workService; + } + + @GetMapping(path = "/job") + public List jobRes(@RequestParam(name = "text") String text){ + return this.workService.fullTextJobSearch(text); + } + + @GetMapping(path = "/internship") + public List internshipRes(@RequestParam(name = "text") String text){ + return this.workService.fullTextInternshipSearch(text); + } + + @GetMapping(path = "/project") + public List projectRes(@RequestParam(name = "text") String text){ + return this.workService.fullTextProjectSearch(text); + } +} Index: back_end/src/main/java/it/finki/tinki/web/controller/SkillController.java =================================================================== --- back_end/src/main/java/it/finki/tinki/web/controller/SkillController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/web/controller/SkillController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,24 @@ +package it.finki.tinki.web.controller; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.service.SkillService; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@CrossOrigin("http://localhost:3000") +@RequestMapping("/api/skills") +public class SkillController { + + SkillService skillService; + + public SkillController(SkillService skillService) { + this.skillService = skillService; + } + + @GetMapping() + public List returnSkills(){ + return this.skillService.findAll(); + } +} Index: back_end/src/main/java/it/finki/tinki/web/controller/WorkEditController.java =================================================================== --- back_end/src/main/java/it/finki/tinki/web/controller/WorkEditController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/web/controller/WorkEditController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,79 @@ +package it.finki.tinki.web.controller; + +import it.finki.tinki.model.Work.Internship; +import it.finki.tinki.model.Work.Job; +import it.finki.tinki.model.Work.Project; +import it.finki.tinki.model.dto.edit.work.InternshipEditDTO; +import it.finki.tinki.model.dto.edit.work.WorkEditDTO; +import it.finki.tinki.model.dto.register.work.InternshipRegisterDTO; +import it.finki.tinki.model.dto.register.work.JobRegisterDTO; +import it.finki.tinki.model.dto.register.work.ProjectRegisterDTO; +import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; +import it.finki.tinki.model.dto.response.work.JobResponseDTO; +import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; +import it.finki.tinki.service.WorkService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@CrossOrigin(origins = "http://localhost:3000") +@RequestMapping("/api/edit/work") +public class WorkEditController { + + WorkService workService; + + public WorkEditController(WorkService workService) { + this.workService = workService; + } + + @PostMapping("/job/{id}") + public JobResponseDTO editJob(@PathVariable Long id, + @RequestBody WorkEditDTO body){ + + Job j = this.workService.getJobById(id); + + if(body.getAccountId().equals(j.getAccount().getId())) { + Job k = this.workService.editJob(id, body.getTitle(), body.getDescription(), body.getSalary()); + if(k!=null){ + return new JobResponseDTO(k); + } + } + + return new JobResponseDTO(); + } + + @PostMapping("/internship/{id}") + public InternshipResponseDTO editInternship(@PathVariable Long id, + @RequestBody InternshipEditDTO body){ + + Internship i = this.workService.getInternshipById(id); + + if(body.getAccountId().equals(i.getAccount().getId())){ + Internship k = this.workService.editInternship(id, body.getTitle(), body.getDescription(), body.getSalary(), body.getOpenSpots()); + if(k!=null){ + return new InternshipResponseDTO(k); + } + } + + return new InternshipResponseDTO(); + } + + @PostMapping("/project/{id}") + public ProjectResponseDTO editProject(@PathVariable Long id, + @RequestBody WorkEditDTO body){ + + Project p = this.workService.getProjectById(id); + + if(body.getAccountId().equals(p.getAccount().getId())) { + Project k = this.workService.editProject(id, body.getTitle(), body.getDescription(), body.getSalary()); + if(k!=null){ + return new ProjectResponseDTO(k); + } + } + + return new ProjectResponseDTO(); + } +} Index: back_end/src/main/java/it/finki/tinki/web/controller/WorkRegisterController.java =================================================================== --- back_end/src/main/java/it/finki/tinki/web/controller/WorkRegisterController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/java/it/finki/tinki/web/controller/WorkRegisterController.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,62 @@ +package it.finki.tinki.web.controller; + +import it.finki.tinki.model.Users.Account; +import it.finki.tinki.model.Work.Internship; +import it.finki.tinki.model.Work.Job; +import it.finki.tinki.model.Work.Project; +import it.finki.tinki.model.dto.register.work.InternshipRegisterDTO; +import it.finki.tinki.model.dto.register.work.JobRegisterDTO; +import it.finki.tinki.model.dto.register.work.ProjectRegisterDTO; +import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; +import it.finki.tinki.model.dto.response.work.JobResponseDTO; +import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; +import it.finki.tinki.model.enumerator.AccountType; +import it.finki.tinki.service.WorkService; +import org.springframework.web.bind.annotation.*; + +@RestController +@CrossOrigin(origins = "http://localhost:3000") +@RequestMapping(path = "/api/register/work") +public class WorkRegisterController { + + WorkService workService; + + public WorkRegisterController(WorkService workService) { + this.workService = workService; + } + + @PostMapping("/job") + public JobResponseDTO registerJob(@RequestBody JobRegisterDTO body){ + + if(body.getType() != AccountType.USER){ + Job j = this.workService.insertJob(body.getTitle(), + body.getDescription(), body.getAccountId(), body.getSalary(), body.getSkillsRequired(), body.getType()); + return new JobResponseDTO(j); + } + + return new JobResponseDTO(); + } + + @PostMapping("/internship") + public InternshipResponseDTO registerInternship(@RequestBody InternshipRegisterDTO body){ + if(body.getType() == AccountType.COMPANY){ + Internship j = this.workService.insertInternship(body.getTitle(), + body.getDescription(), body.getAccountId(), body.getSalary(), body.getSkillsTrained(), body.getOpenSpots(), body.getType()); + return new InternshipResponseDTO(j); + } + + return new InternshipResponseDTO(); + } + + @PostMapping("/project") + public ProjectResponseDTO registerProject(@RequestBody ProjectRegisterDTO body){ + + if(body.getType() == AccountType.TEAM){ + Project j = this.workService.insertProject(body.getTitle(), + body.getDescription(), body.getAccountId(), body.getSalary(), body.getSkillsRequired(), body.getValidUntil(), body.getType()); + return new ProjectResponseDTO(j); + } + + return new ProjectResponseDTO(); + } +} Index: back_end/src/main/resources/application-h2.properties =================================================================== --- back_end/src/main/resources/application-h2.properties (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/resources/application-h2.properties (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,10 @@ +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.driver-class-name=org.h2.Driver + +spring.datasource.username=sa +spring.datasource.password= + +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect + +spring.h2.console.enabled=true +spring.h2.console.path=/h2 Index: back_end/src/main/resources/application-prod.properties =================================================================== --- back_end/src/main/resources/application-prod.properties (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/resources/application-prod.properties (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,9 @@ +spring.datasource.url=jdbc:postgresql://localhost:5432/tinki + +spring.datasource.username=tinki +spring.datasource.password=. + +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQL10Dialect + +spring.h2.console.enabled=true +spring.jpa.hibernate.ddl-auto=update Index: back_end/src/main/resources/application.properties =================================================================== --- back_end/src/main/resources/application.properties (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/main/resources/application.properties (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,9 @@ +server.port=9090 + +spring.profiles.active=prod + +spring.jpa.properties.hibernate.show_sql=true +spring.jpa.properties.hibernate.use_sql_comments=true +spring.jpa.properties.hibernate.format_sql=true + +logging.level.org.hibernate.type=trace Index: back_end/src/test/java/it/finki/tinki/TinkiApplicationTests.java =================================================================== --- back_end/src/test/java/it/finki/tinki/TinkiApplicationTests.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ back_end/src/test/java/it/finki/tinki/TinkiApplicationTests.java (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,13 @@ +package it.finki.tinki; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TinkiApplicationTests { + + @Test + void contextLoads() { + } + +} Index: client_app/client_app.iml =================================================================== --- client_app/client_app.iml (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ client_app/client_app.iml (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,9 @@ + + + + + + + + + Index: client_app/public/index.html =================================================================== --- client_app/public/index.html (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ client_app/public/index.html (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -3,5 +3,5 @@ - + @@ -10,5 +10,5 @@ content="Web site created using create-react-app" /> - React App + Tinki Index: client_app/src/components/account_edit/company_edit.js =================================================================== --- client_app/src/components/account_edit/company_edit.js (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ client_app/src/components/account_edit/company_edit.js (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -86,5 +86,5 @@ - Register + Confirm Index: client_app/src/components/account_edit/team_edit.js =================================================================== --- client_app/src/components/account_edit/team_edit.js (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ client_app/src/components/account_edit/team_edit.js (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -77,5 +77,5 @@ - Register + Confirm Index: client_app/src/components/account_edit/user_edit.js =================================================================== --- client_app/src/components/account_edit/user_edit.js (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ client_app/src/components/account_edit/user_edit.js (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -118,5 +118,5 @@
- + Index: client_app/src/components/template/header.js =================================================================== --- client_app/src/components/template/header.js (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ client_app/src/components/template/header.js (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -2,5 +2,5 @@ import {Link} from "react-router-dom"; import {Menu, MenuItem } from "semantic-ui-react"; - +import logo from "../../assets/logo.png"; const HeaderComp = (props) => { @@ -8,4 +8,9 @@ return( + +
+ +
+ Register User @@ -26,4 +31,9 @@ return( + +
+ +
+ Profile @@ -43,4 +53,9 @@ return( + +
+ +
+ Profile @@ -60,4 +75,9 @@ return( + +
+ +
+ Profile Index: client_app/src/components/work_edit/edit_internship.js =================================================================== --- client_app/src/components/work_edit/edit_internship.js (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ client_app/src/components/work_edit/edit_internship.js (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -88,5 +88,5 @@ - + Index: client_app/src/components/work_edit/edit_job.js =================================================================== --- client_app/src/components/work_edit/edit_job.js (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ client_app/src/components/work_edit/edit_job.js (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -86,5 +86,5 @@ - + Index: client_app/src/components/work_edit/edit_project.js =================================================================== --- client_app/src/components/work_edit/edit_project.js (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ client_app/src/components/work_edit/edit_project.js (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -82,5 +82,5 @@ - + Index: nw =================================================================== --- mvnw (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,310 +1,0 @@ -#!/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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven 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)`" -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 - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - fi - 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 $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - 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 - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -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 "$@" Index: nw.cmd =================================================================== --- mvnw.cmd (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,182 +1,0 @@ -@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 Maven 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 keystroke 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 by 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.5.6/maven-wrapper-0.5.6.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% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%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% Index: m.xml =================================================================== --- pom.xml (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,70 +1,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.4.1 - - - it.finki - tinki - 0.0.1-SNAPSHOT - tinki - Easy job finder. - - - 11 - - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-web - - - - com.h2database - h2 - runtime - - - org.postgresql - postgresql - runtime - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - Index: postgre_ddl/DDL.txt =================================================================== --- postgre_ddl/DDL.txt (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) +++ postgre_ddl/DDL.txt (revision 81c9e25dae0f2026f49495317f0a77aa642eb4fa) @@ -0,0 +1,223 @@ +CREATE DATABASE tinki; + +CREATE USER tinki WITH PASSWORD '.'; + +ALTER DATABASE tinki OWNER TO tinki; + +-- public.address definition + +-- Drop table + +-- DROP TABLE public.address; + +CREATE TABLE public.address ( + id bigserial NOT NULL, + city varchar(255) NULL, + country varchar(255) NULL, + street varchar(255) NULL, + CONSTRAINT address_pkey PRIMARY KEY (id) +); + + +-- public.internship definition + +-- Drop table + +-- DROP TABLE public.internship; + +CREATE TABLE public.internship ( + id int8 NOT NULL, + description varchar(255) NULL, + salary int4 NOT NULL, + title varchar(255) NULL, + account_id int8 NULL, + open_spots int4 NOT NULL, + CONSTRAINT internship_pkey PRIMARY KEY (id) +); + + +-- public.job definition + +-- Drop table + +-- DROP TABLE public.job; + +CREATE TABLE public.job ( + id int8 NOT NULL, + description varchar(255) NULL, + salary int4 NOT NULL, + title varchar(255) NULL, + account_id int8 NULL, + CONSTRAINT job_pkey PRIMARY KEY (id) +); + + +-- public.project definition + +-- Drop table + +-- DROP TABLE public.project; + +CREATE TABLE public.project ( + id int8 NOT NULL, + description varchar(255) NULL, + salary int4 NOT NULL, + title varchar(255) NULL, + account_id int8 NULL, + valid_until timestamp NULL, + CONSTRAINT project_pkey PRIMARY KEY (id) +); + + +-- public.skill definition + +-- Drop table + +-- DROP TABLE public.skill; + +CREATE TABLE public.skill ( + id bigserial NOT NULL, + "name" varchar(255) NULL, + CONSTRAINT skill_pkey PRIMARY KEY (id) +); + + +-- public.team definition + +-- Drop table + +-- DROP TABLE public.team; + +CREATE TABLE public.team ( + id int8 NOT NULL, + account_type int4 NULL, + email varchar(255) NULL, + "name" varchar(255) NULL, + "password" varchar(255) NULL, + members int4 NOT NULL, + CONSTRAINT team_pkey PRIMARY KEY (id), + CONSTRAINT uk_40rwssq6p5ns2btjpdjesrs7 UNIQUE (email) +); + + +-- public.users definition + +-- Drop table + +-- DROP TABLE public.users; + +CREATE TABLE public.users ( + id int8 NOT NULL, + account_type int4 NULL, + email varchar(255) NULL, + "name" varchar(255) NULL, + "password" varchar(255) NULL, + surname varchar(255) NULL, + CONSTRAINT uk_6dotkott2kjsp8vw4d0m25fb7 UNIQUE (email), + CONSTRAINT users_pkey PRIMARY KEY (id) +); + + +-- public.company definition + +-- Drop table + +-- DROP TABLE public.company; + +CREATE TABLE public.company ( + id int8 NOT NULL, + account_type int4 NULL, + email varchar(255) NULL, + "name" varchar(255) NULL, + "password" varchar(255) NULL, + address_id int8 NULL, + CONSTRAINT company_pkey PRIMARY KEY (id), + CONSTRAINT uk_bma9lv19ba3yjwf12a34xord3 UNIQUE (email), + CONSTRAINT fkgfifm4874ce6mecwj54wdb3ma FOREIGN KEY (address_id) REFERENCES address(id) +); + + +-- public.internship_skills_trained definition + +-- Drop table + +-- DROP TABLE public.internship_skills_trained; + +CREATE TABLE public.internship_skills_trained ( + internship_id int8 NOT NULL, + skills_trained_id int8 NOT NULL, + CONSTRAINT fkaffo89daxg10hnaoiq2q4dj0f FOREIGN KEY (internship_id) REFERENCES internship(id), + CONSTRAINT fks4c3ng84ax1cj4cm3pmdjljos FOREIGN KEY (skills_trained_id) REFERENCES skill(id) +); + + +-- public.job_skills_required definition + +-- Drop table + +-- DROP TABLE public.job_skills_required; + +CREATE TABLE public.job_skills_required ( + job_id int8 NOT NULL, + skills_required_id int8 NOT NULL, + CONSTRAINT fk8shkwbrkfqf595ejsx1awyqm5 FOREIGN KEY (skills_required_id) REFERENCES skill(id), + CONSTRAINT fkd9624v3iv0b875ekie7xixq61 FOREIGN KEY (job_id) REFERENCES job(id) +); + + +-- public."match" definition + +-- Drop table + +-- DROP TABLE public."match"; + +CREATE TABLE public."match" ( + coefficient float4 NOT NULL, + "type" int4 NULL, + user_id int8 NOT NULL, + work_id int8 NOT NULL, + CONSTRAINT match_pkey PRIMARY KEY (user_id, work_id), + CONSTRAINT fkcvroh7plwfu0pp9inhs51i1w6 FOREIGN KEY (user_id) REFERENCES users(id) +); + + +-- public.project_skills_required definition + +-- Drop table + +-- DROP TABLE public.project_skills_required; + +CREATE TABLE public.project_skills_required ( + project_id int8 NOT NULL, + skills_required_id int8 NOT NULL, + CONSTRAINT fkbpxfe2agmbrnt5s9bljjpyl15 FOREIGN KEY (project_id) REFERENCES project(id), + CONSTRAINT fkhavvnnjpwbo99mwvr9fp2akgj FOREIGN KEY (skills_required_id) REFERENCES skill(id) +); + + +-- public.users_retained_skills definition + +-- Drop table + +-- DROP TABLE public.users_retained_skills; + +CREATE TABLE public.users_retained_skills ( + users_id int8 NOT NULL, + retained_skills_id int8 NOT NULL, + CONSTRAINT fk173wmfmh98upsm5nroy742ivh FOREIGN KEY (retained_skills_id) REFERENCES skill(id), + CONSTRAINT fkcva0reqw29kym3pp492jwnnq9 FOREIGN KEY (users_id) REFERENCES users(id) +); + + +-- public.users_skills_to_learn definition + +-- Drop table + +-- DROP TABLE public.users_skills_to_learn; + +CREATE TABLE public.users_skills_to_learn ( + users_id int8 NOT NULL, + skills_to_learn_id int8 NOT NULL, + CONSTRAINT fkn0j449kx3g55p2fqudar6n8q5 FOREIGN KEY (users_id) REFERENCES users(id), + CONSTRAINT fkochtgvcbv6gru34o2bp38uss7 FOREIGN KEY (skills_to_learn_id) REFERENCES skill(id) +); Index: c/main/java/it/finki/tinki/TinkiApplication.java =================================================================== --- src/main/java/it/finki/tinki/TinkiApplication.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,14 +1,0 @@ -package it.finki.tinki; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; - -@SpringBootApplication -public class TinkiApplication { - - public static void main(String[] args) { - SpringApplication.run(TinkiApplication.class, args); - } - -} Index: c/main/java/it/finki/tinki/bootstrap/DataHolder.java =================================================================== --- src/main/java/it/finki/tinki/bootstrap/DataHolder.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,114 +1,0 @@ -package it.finki.tinki.bootstrap; - -import it.finki.tinki.model.Work.Job; -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Users.Account; -import it.finki.tinki.model.enumerator.AccountType; -import it.finki.tinki.repository.*; -import it.finki.tinki.service.AccountService; -import it.finki.tinki.service.WorkService; -import org.springframework.stereotype.Component; - -import javax.annotation.PostConstruct; -import java.text.DateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -@Component -public class DataHolder { - - SkillRepository skillRepository; - AccountService accountService; - WorkService workService; - MatchRepository matchRepository; - - public DataHolder(SkillRepository skillRepository, - AccountService accountService, - WorkService workService, - MatchRepository matchRepository) { - this.skillRepository = skillRepository; - this.accountService = accountService; - this.workService = workService; - this.matchRepository = matchRepository; - } - - @PostConstruct - public void init(){ - if(this.skillRepository.findAll().size()==0){ - Skill s1 = new Skill("C++"); - Skill s2 = new Skill("Java"); - Skill s3 = new Skill("Python"); - Skill s4 = new Skill("JavaScript"); - Skill s5 = new Skill("React"); - Skill s6 = new Skill("Spring"); - Skill s7 = new Skill("C#"); - Skill s8 = new Skill(".NET"); - Skill s9 = new Skill("NodeJs"); - Skill s0 = new Skill("Go"); - - this.skillRepository.save(s1); - this.skillRepository.save(s2); - this.skillRepository.save(s3); - this.skillRepository.save(s4); - this.skillRepository.save(s5); - this.skillRepository.save(s6); - this.skillRepository.save(s7); - this.skillRepository.save(s8); - this.skillRepository.save(s9); - this.skillRepository.save(s0); - } - - List lista; - lista = this.skillRepository.findAll(); - - List lista2 = new ArrayList<>(); - lista2.add(this.skillRepository.findById(3L).get()); - lista2.add(this.skillRepository.findById(2L).get()); - lista2.add(this.skillRepository.findById(4L).get()); - lista2.add(this.skillRepository.findById(7L).get()); - lista2.add(this.skillRepository.findById(1L).get()); - lista2.add(this.skillRepository.findById(5L).get()); - lista2.add(this.skillRepository.findById(9L).get()); - lista2.add(this.skillRepository.findById(6L).get()); - - - List lista3 = new ArrayList<>(); - lista3.add(this.skillRepository.findById(3L).get()); - lista3.add(this.skillRepository.findById(2L).get()); - lista3.add(this.skillRepository.findById(4L).get()); - lista3.add(this.skillRepository.findById(7L).get()); - - List allSkills = new ArrayList<>(); - lista.forEach(item -> { - allSkills.add(item.getId()); - }); - - List skills8 = new ArrayList<>(); - lista2.forEach(item -> { - skills8.add(item.getId()); - }); - - List skills4 = new ArrayList<>(); - lista3.forEach(item -> { - skills4.add(item.getId()); - }); - - Account c = this.accountService.registerCompany("company@company", "company", "Co.Co", "Macedonia", "Skopje", "Pero Nakov"); - Account ct = this.accountService.registerCompany("company@co", "company", "Co.Co", "Macedonia", "Skopje", "Pero Nakov"); - Account m = this.accountService.registerTeam("team@team", "team", "TeamRocket", 3); - - this.workService.insertJob("Team Job 1", "Team job 1 requires 3 members!", m.getId() ,1515, allSkills, AccountType.TEAM); - this.workService.insertJob("Team Job 2", "Team job 2 requires 2 members!", m.getId() ,5511, skills4, AccountType.TEAM); - this.workService.insertJob("Company Job 1", "Company job 1 requires 3 members!", c.getId() ,12345, allSkills, AccountType.COMPANY); - this.workService.insertJob("Company Job 2", "Company job 2 requires 3 members!", ct.getId() ,8901, skills8, AccountType.COMPANY); - this.workService.insertInternship("Internship 1", "Opportunity to learn new things!", c.getId() ,5000, skills4, 6, AccountType.COMPANY); - this.workService.insertInternship("Internship 2", "Opportunity to learn new things!", c.getId() ,5000, allSkills, 3, AccountType.COMPANY); - this.workService.insertProject("Project 1", "Project that lasts few days!", m.getId() ,5000, skills8, new Date(), AccountType.TEAM); - this.workService.insertProject("Project 2", "Project that ends soon!", m.getId() ,5000, skills4, new Date(), AccountType.TEAM); - - this.accountService.registerUser("user@user", "user", "Zoki", "Poki", lista3, lista); - - } - -} Index: c/main/java/it/finki/tinki/helper/Matchmaker.java =================================================================== --- src/main/java/it/finki/tinki/helper/Matchmaker.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,29 +1,0 @@ -package it.finki.tinki.helper; - -import it.finki.tinki.model.Skill; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -public class Matchmaker { - - public static float match(List work, List user){ - - float coef = work.size(); - float k = 0; - - for (Skill skill : work) { - for (Skill value : user) { - if (value.equals(skill)) { - k++; - } - } - } - - System.out.println(k/coef); - - return k/coef; - } - -} Index: c/main/java/it/finki/tinki/model/Address.java =================================================================== --- src/main/java/it/finki/tinki/model/Address.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,26 +1,0 @@ -package it.finki.tinki.model; - -import lombok.Data; - -import javax.persistence.*; - -@Entity -@Data -public class Address { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - Long id; - - String country; - String city; - String street; - - public Address() {} - - public Address(String country, String city, String street) { - this.country = country; - this.city = city; - this.street = street; - } -} Index: c/main/java/it/finki/tinki/model/EmbeddedMatchId.java =================================================================== --- src/main/java/it/finki/tinki/model/EmbeddedMatchId.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,27 +1,0 @@ -package it.finki.tinki.model; - -import it.finki.tinki.model.Work.Work; -import it.finki.tinki.model.Users.User; -import lombok.Data; - -import javax.persistence.Embeddable; -import javax.persistence.OneToOne; -import java.io.Serializable; - -@Embeddable -@Data -public class EmbeddedMatchId implements Serializable { - - @OneToOne - private Work work; - - @OneToOne - private User user; - - public EmbeddedMatchId(){} - - public EmbeddedMatchId(Work work, User user){ - this.work = work; - this.user = user; - } -} Index: c/main/java/it/finki/tinki/model/Match.java =================================================================== --- src/main/java/it/finki/tinki/model/Match.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,26 +1,0 @@ -package it.finki.tinki.model; - -import it.finki.tinki.model.enumerator.WorkType; -import lombok.Data; - -import javax.persistence.*; - -@Entity -@Data -public class Match { - - @Id - EmbeddedMatchId embeddedMatchId; - - float coefficient; - - WorkType type; - - public Match(){} - - public Match(EmbeddedMatchId embeddedMatchId, float coefficient, WorkType type) { - this.embeddedMatchId = embeddedMatchId; - this.coefficient = coefficient; - this.type = type; - } -} Index: c/main/java/it/finki/tinki/model/Skill.java =================================================================== --- src/main/java/it/finki/tinki/model/Skill.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,25 +1,0 @@ -package it.finki.tinki.model; - -import lombok.Data; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; - -@Entity -@Data -public class Skill { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - Long id; - - String name; - - public Skill(){} - - public Skill(String name) { - this.name = name; - } -} Index: c/main/java/it/finki/tinki/model/Users/Account.java =================================================================== --- src/main/java/it/finki/tinki/model/Users/Account.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,38 +1,0 @@ -package it.finki.tinki.model.Users; - -import com.sun.istack.NotNull; -import it.finki.tinki.model.enumerator.AccountType; -import lombok.Data; - -import javax.persistence.*; - -@Entity -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -@Data -public abstract class Account { - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - Long id; - - @Column(unique = true) - @NotNull - String email; - - @NotNull - String password; - - @NotNull - String name; - - AccountType accountType; - - public Account(){} - - public Account(String email, String password, String name, AccountType accountType) { - this.email = email; - this.password = password; - this.name = name; - this.accountType = accountType; - } -} Index: c/main/java/it/finki/tinki/model/Users/Company.java =================================================================== --- src/main/java/it/finki/tinki/model/Users/Company.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,23 +1,0 @@ -package it.finki.tinki.model.Users; - -import it.finki.tinki.model.Address; -import it.finki.tinki.model.enumerator.AccountType; -import lombok.Data; - -import javax.persistence.Entity; -import javax.persistence.OneToOne; - -@Entity -@Data -public class Company extends Account{ - - @OneToOne - Address address; - - public Company(){} - - public Company(String email, String password, String name, AccountType accountType, Address address) { - super(email, password, name, accountType); - this.address = address; - } -} Index: c/main/java/it/finki/tinki/model/Users/Team.java =================================================================== --- src/main/java/it/finki/tinki/model/Users/Team.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,20 +1,0 @@ -package it.finki.tinki.model.Users; - -import it.finki.tinki.model.enumerator.AccountType; -import lombok.Data; - -import javax.persistence.Entity; - -@Entity -@Data -public class Team extends Account { - - int members; - - public Team(){} - - public Team(String email, String password, String name, AccountType accountType, int members) { - super(email, password, name, accountType); - this.members = members; - } -} Index: c/main/java/it/finki/tinki/model/Users/User.java =================================================================== --- src/main/java/it/finki/tinki/model/Users/User.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,35 +1,0 @@ -package it.finki.tinki.model.Users; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.enumerator.AccountType; -import lombok.Data; - -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import java.util.List; - -@Entity -@Data -public class User extends Account{ - - String surname; - - @ManyToMany - List retainedSkills; - - @ManyToMany - List skillsToLearn; - - public User(){} - - public User(String email, String password, String name, AccountType accountType, String surname, List retainedSkills, List skillsToLearn) { - super(email, password, name, accountType); - this.surname = surname; - this.retainedSkills = retainedSkills; - this.skillsToLearn = skillsToLearn; - } - - public String toString(){ - return ""; - } -} Index: c/main/java/it/finki/tinki/model/Work/Internship.java =================================================================== --- src/main/java/it/finki/tinki/model/Work/Internship.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,26 +1,0 @@ -package it.finki.tinki.model.Work; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Users.Account; -import lombok.Data; - -import javax.persistence.*; -import java.util.List; - -@Entity -@Data -public class Internship extends Work { - - @ManyToMany(fetch = FetchType.EAGER) - List skillsTrained; - - int openSpots; - - public Internship(){} - - public Internship(String title, String description, Account account, int salary, List skillsTrained, int openSpots) { - super(title, description, account, salary); - this.skillsTrained = skillsTrained; - this.openSpots = openSpots; - } -} Index: c/main/java/it/finki/tinki/model/Work/Job.java =================================================================== --- src/main/java/it/finki/tinki/model/Work/Job.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,23 +1,0 @@ -package it.finki.tinki.model.Work; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Users.Account; -import lombok.Data; - -import javax.persistence.*; -import java.util.List; - -@Entity -@Data -public class Job extends Work { - - @ManyToMany(fetch = FetchType.EAGER) - List skillsRequired; - - public Job(){} - - public Job(String title, String description, Account account, int salary, List skillsRequired) { - super(title, description, account, salary); - this.skillsRequired = skillsRequired; - } -} Index: c/main/java/it/finki/tinki/model/Work/Project.java =================================================================== --- src/main/java/it/finki/tinki/model/Work/Project.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,27 +1,0 @@ -package it.finki.tinki.model.Work; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Users.Account; -import lombok.Data; - -import javax.persistence.*; -import java.util.Date; -import java.util.List; - -@Entity -@Data -public class Project extends Work { - - @ManyToMany(fetch = FetchType.EAGER) - List skillsRequired; - - Date validUntil; - - public Project(){} - - public Project(String title, String description, Account account, int salary, List skillsRequired, Date validUntil) { - super(title, description, account, salary); - this.skillsRequired = skillsRequired; - this.validUntil = validUntil; - } -} Index: c/main/java/it/finki/tinki/model/Work/Work.java =================================================================== --- src/main/java/it/finki/tinki/model/Work/Work.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,33 +1,0 @@ -package it.finki.tinki.model.Work; - -import it.finki.tinki.model.Users.Account; -import lombok.Data; - -import javax.persistence.*; - -@Entity -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -@Data -public abstract class Work { - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - Long id; - - String title; - String description; - - @ManyToOne(targetEntity = Account.class) - Account account; - - int salary; - - public Work(){} - - public Work(String title, String description, Account account, int salary) { - this.title = title; - this.description = description; - this.account = account; - this.salary = salary; - } -} Index: c/main/java/it/finki/tinki/model/dto/AccountLoginDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/AccountLoginDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,11 +1,0 @@ -package it.finki.tinki.model.dto; - -import it.finki.tinki.model.enumerator.AccountType; -import lombok.Data; - -@Data -public class AccountLoginDTO { - private String email; - private String password; - private AccountType type; -} Index: c/main/java/it/finki/tinki/model/dto/edit/work/InternshipEditDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/edit/work/InternshipEditDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,8 +1,0 @@ -package it.finki.tinki.model.dto.edit.work; - -import lombok.Data; - -@Data -public class InternshipEditDTO extends WorkEditDTO{ - int openSpots; -} Index: c/main/java/it/finki/tinki/model/dto/edit/work/WorkEditDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/edit/work/WorkEditDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,11 +1,0 @@ -package it.finki.tinki.model.dto.edit.work; - -import lombok.Data; - -@Data -public class WorkEditDTO { - String title; - String description; - Long accountId; - int salary; -} Index: c/main/java/it/finki/tinki/model/dto/register/account/AccountRegisterDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/register/account/AccountRegisterDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,10 +1,0 @@ -package it.finki.tinki.model.dto.register.account; - -import lombok.Data; - -@Data -public class AccountRegisterDTO { - String email; - String password; - String name; -} Index: c/main/java/it/finki/tinki/model/dto/register/account/CompanyRegisterDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/register/account/CompanyRegisterDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,10 +1,0 @@ -package it.finki.tinki.model.dto.register.account; - -import lombok.Data; - -@Data -public class CompanyRegisterDTO extends AccountRegisterDTO { - String country; - String city; - String street; -} Index: c/main/java/it/finki/tinki/model/dto/register/account/TeamRegisterDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/register/account/TeamRegisterDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,8 +1,0 @@ -package it.finki.tinki.model.dto.register.account; - -import lombok.Data; - -@Data -public class TeamRegisterDTO extends AccountRegisterDTO { - int members; -} Index: c/main/java/it/finki/tinki/model/dto/register/account/UserRegisterDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/register/account/UserRegisterDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,12 +1,0 @@ -package it.finki.tinki.model.dto.register.account; - -import lombok.Data; - -import java.util.List; - -@Data -public class UserRegisterDTO extends AccountRegisterDTO { - String surname; - List retainedSkills; - List skillsToLearn; -} Index: c/main/java/it/finki/tinki/model/dto/register/work/InternshipRegisterDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/register/work/InternshipRegisterDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,11 +1,0 @@ -package it.finki.tinki.model.dto.register.work; - -import lombok.Data; - -import java.util.List; - -@Data -public class InternshipRegisterDTO extends WorkRegisterDTO { - int openSpots; - List skillsTrained; -} Index: c/main/java/it/finki/tinki/model/dto/register/work/JobRegisterDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/register/work/JobRegisterDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,10 +1,0 @@ -package it.finki.tinki.model.dto.register.work; - -import lombok.Data; - -import java.util.List; - -@Data -public class JobRegisterDTO extends WorkRegisterDTO{ - List skillsRequired; -} Index: c/main/java/it/finki/tinki/model/dto/register/work/ProjectRegisterDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/register/work/ProjectRegisterDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,12 +1,0 @@ -package it.finki.tinki.model.dto.register.work; - -import lombok.Data; - -import java.util.Date; -import java.util.List; - -@Data -public class ProjectRegisterDTO extends WorkRegisterDTO { - Date validUntil; - List skillsRequired; -} Index: c/main/java/it/finki/tinki/model/dto/register/work/WorkRegisterDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/register/work/WorkRegisterDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,13 +1,0 @@ -package it.finki.tinki.model.dto.register.work; - -import it.finki.tinki.model.enumerator.AccountType; -import lombok.Data; - -@Data -public class WorkRegisterDTO { - String title; - String description; - Long accountId; - int salary; - AccountType type; -} Index: c/main/java/it/finki/tinki/model/dto/response/account/CompanyResponseDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/response/account/CompanyResponseDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,22 +1,0 @@ -package it.finki.tinki.model.dto.response.account; - -import it.finki.tinki.model.Address; -import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; -import it.finki.tinki.model.dto.response.work.JobResponseDTO; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -@Data -public class CompanyResponseDTO extends LoginResponseDTO { - private Address address; - private List jobs; - private List internships; - - public CompanyResponseDTO(){ - super(); - this.jobs = new ArrayList<>(); - this.internships = new ArrayList<>(); - } -} Index: c/main/java/it/finki/tinki/model/dto/response/account/LoginResponseDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/response/account/LoginResponseDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,17 +1,0 @@ -package it.finki.tinki.model.dto.response.account; - -import it.finki.tinki.model.enumerator.AccountType; -import lombok.Data; - -@Data -public class LoginResponseDTO { - private Long id; - private String email; - private String name; - private AccountType type; - private String error; - - public LoginResponseDTO() { - this.error = "Invalid username or password!"; - } -} Index: c/main/java/it/finki/tinki/model/dto/response/account/TeamResponseDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/response/account/TeamResponseDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,21 +1,0 @@ -package it.finki.tinki.model.dto.response.account; - -import it.finki.tinki.model.dto.response.work.JobResponseDTO; -import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -@Data -public class TeamResponseDTO extends LoginResponseDTO { - private int members; - private List jobs; - private List projects; - - public TeamResponseDTO(){ - super(); - this.jobs = new ArrayList<>(); - this.projects = new ArrayList<>(); - } -} Index: c/main/java/it/finki/tinki/model/dto/response/account/UserResponseDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/response/account/UserResponseDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,28 +1,0 @@ -package it.finki.tinki.model.dto.response.account; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; -import it.finki.tinki.model.dto.response.work.JobResponseDTO; -import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -@Data -public class UserResponseDTO extends LoginResponseDTO { - private String surname; - private List retained; - private List toLearn; - private List jobs; - private List internships; - private List projects; - - public UserResponseDTO(){ - retained = new ArrayList<>(); - toLearn = new ArrayList<>(); - jobs = new ArrayList<>(); - internships = new ArrayList<>(); - projects = new ArrayList<>(); - } -} Index: c/main/java/it/finki/tinki/model/dto/response/work/InternshipResponseDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/response/work/InternshipResponseDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,29 +1,0 @@ -package it.finki.tinki.model.dto.response.work; - -import it.finki.tinki.model.Address; -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Work.Internship; -import it.finki.tinki.model.Users.Company; -import lombok.Data; - -import java.util.List; - -@Data -public class InternshipResponseDTO extends WorkResponseDTO { - int salary; - int openSpots; - Address accountAddress; - List skillsTrained; - - public InternshipResponseDTO(){ - super("Internship!"); - } - - public InternshipResponseDTO(Internship internship){ - super(internship.getId(), internship.getTitle(), internship.getDescription(), internship.getSalary(), internship.getAccount()); - this.salary = internship.getSalary(); - this.openSpots = internship.getOpenSpots(); - this.accountAddress = ((Company) internship.getAccount()).getAddress(); - this.skillsTrained = internship.getSkillsTrained(); - } -} Index: c/main/java/it/finki/tinki/model/dto/response/work/JobResponseDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/response/work/JobResponseDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,34 +1,0 @@ -package it.finki.tinki.model.dto.response.work; - -import it.finki.tinki.model.Address; -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Work.Job; -import it.finki.tinki.model.Users.Company; -import it.finki.tinki.model.Users.Team; -import it.finki.tinki.model.enumerator.AccountType; -import lombok.Data; - -import java.util.List; - -@Data -public class JobResponseDTO extends WorkResponseDTO { - Address accountAddress; - int members; - List skillsRequired; - - public JobResponseDTO(){ - super("Job!"); - } - - public JobResponseDTO(Job job){ - super(job.getId(), job.getTitle(), job.getDescription(), job.getSalary(), job.getAccount()); - this.skillsRequired = job.getSkillsRequired(); - if(job.getAccount().getAccountType()==AccountType.COMPANY){ - this.accountAddress = ((Company) job.getAccount()).getAddress(); - this.members = 0; - }else{ - this.members = ((Team) job.getAccount()).getMembers(); - this.accountAddress = null; - } - } -} Index: c/main/java/it/finki/tinki/model/dto/response/work/ProjectResponseDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/response/work/ProjectResponseDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,27 +1,0 @@ -package it.finki.tinki.model.dto.response.work; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Work.Project; -import it.finki.tinki.model.Users.Team; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -@Data -public class ProjectResponseDTO extends WorkResponseDTO { - int members; - Date validUntil; - List skillsRequired; - - public ProjectResponseDTO(){ - super("Project!"); - } - - public ProjectResponseDTO(Project project){ - super(project.getId(), project.getTitle(), project.getDescription(), project.getSalary(), project.getAccount()); - this.members = ((Team) project.getAccount()).getMembers(); - this.validUntil = project.getValidUntil(); - this.skillsRequired = project.getSkillsRequired(); - } -} Index: c/main/java/it/finki/tinki/model/dto/response/work/WorkResponseDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/response/work/WorkResponseDTO.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,36 +1,0 @@ -package it.finki.tinki.model.dto.response.work; - -import it.finki.tinki.model.Users.Account; -import it.finki.tinki.model.enumerator.AccountType; -import lombok.Data; - -@Data -public class WorkResponseDTO { - Long id; - String title; - String description; - int salary; - String accountEmail; - String accountName; - Long accountId; - AccountType accountType; - String error; - - WorkResponseDTO(){} - - WorkResponseDTO(String item){ - this.error = "Error registering " + item; - } - - WorkResponseDTO(Long id, String title, String description, int salary, Account account){ - this.error = null; - this.id = id; - this.title = title; - this.description = description; - this.salary = salary; - this.accountId = account.getId(); - this.accountEmail = account.getEmail(); - this.accountName = account.getName(); - this.accountType = account.getAccountType(); - } -} Index: c/main/java/it/finki/tinki/model/enumerator/AccountType.java =================================================================== --- src/main/java/it/finki/tinki/model/enumerator/AccountType.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,7 +1,0 @@ -package it.finki.tinki.model.enumerator; - -public enum AccountType { - USER, - TEAM, - COMPANY -} Index: c/main/java/it/finki/tinki/model/enumerator/WorkType.java =================================================================== --- src/main/java/it/finki/tinki/model/enumerator/WorkType.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,7 +1,0 @@ -package it.finki.tinki.model.enumerator; - -public enum WorkType { - JOB, - INTERNSHIP, - PROJECT -} Index: c/main/java/it/finki/tinki/model/exception/InvalidArgumentsException.java =================================================================== --- src/main/java/it/finki/tinki/model/exception/InvalidArgumentsException.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,7 +1,0 @@ -package it.finki.tinki.model.exception; - -public class InvalidArgumentsException extends RuntimeException{ - public InvalidArgumentsException(){ - super("Invalid arguments entered!"); - } -} Index: c/main/java/it/finki/tinki/model/exception/SkillNotFoundException.java =================================================================== --- src/main/java/it/finki/tinki/model/exception/SkillNotFoundException.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,7 +1,0 @@ -package it.finki.tinki.model.exception; - -public class SkillNotFoundException extends RuntimeException{ - public SkillNotFoundException(Long id){ - super(String.format("Skill with id: %d was not found!", id)); - } -} Index: c/main/java/it/finki/tinki/model/exception/UserExistsException.java =================================================================== --- src/main/java/it/finki/tinki/model/exception/UserExistsException.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,8 +1,0 @@ -package it.finki.tinki.model.exception; - - -public class UserExistsException extends RuntimeException{ - public UserExistsException(){ - super("User with that email already exists!"); - } -} Index: c/main/java/it/finki/tinki/repository/AddressRepository.java =================================================================== --- src/main/java/it/finki/tinki/repository/AddressRepository.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,9 +1,0 @@ -package it.finki.tinki.repository; - -import it.finki.tinki.model.Address; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface AddressRepository extends JpaRepository { -} Index: c/main/java/it/finki/tinki/repository/CompanyRepository.java =================================================================== --- src/main/java/it/finki/tinki/repository/CompanyRepository.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,14 +1,0 @@ -package it.finki.tinki.repository; - -import it.finki.tinki.model.Users.Company; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -@Repository -public interface CompanyRepository extends JpaRepository { - Company findByEmailAndPassword(String email, String password); - Optional findByEmail(String email); - Optional findByIdAndEmail(Long id, String email); -} Index: c/main/java/it/finki/tinki/repository/InternshipRepository.java =================================================================== --- src/main/java/it/finki/tinki/repository/InternshipRepository.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,16 +1,0 @@ -package it.finki.tinki.repository; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Work.Internship; -import it.finki.tinki.model.Work.Job; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface InternshipRepository extends JpaRepository { - List findAllByAccount_Id(Long accountId); - List findAllByTitleContainsOrDescriptionContains(String title, String description); - List findAllBySkillsTrainedContaining(Skill skill); -} Index: c/main/java/it/finki/tinki/repository/JobRepository.java =================================================================== --- src/main/java/it/finki/tinki/repository/JobRepository.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,16 +1,0 @@ -package it.finki.tinki.repository; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Work.Job; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Set; - -@Repository -public interface JobRepository extends JpaRepository{ - List findAllByAccount_Id(Long accountId); - List findAllByTitleContainsOrDescriptionContains(String title, String description); - List findAllBySkillsRequiredContaining(Skill skill); -} Index: c/main/java/it/finki/tinki/repository/MatchRepository.java =================================================================== --- src/main/java/it/finki/tinki/repository/MatchRepository.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,16 +1,0 @@ -package it.finki.tinki.repository; - -import it.finki.tinki.model.EmbeddedMatchId; -import it.finki.tinki.model.Match; -import it.finki.tinki.model.Users.User; -import it.finki.tinki.model.enumerator.WorkType; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface MatchRepository extends JpaRepository { - List findAllByEmbeddedMatchIdUserAndTypeOrderByCoefficientDesc(User user, WorkType type); - List deleteAllByEmbeddedMatchId_User_Id(Long userId); -} Index: c/main/java/it/finki/tinki/repository/ProjectRepository.java =================================================================== --- src/main/java/it/finki/tinki/repository/ProjectRepository.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,16 +1,0 @@ -package it.finki.tinki.repository; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Work.Job; -import it.finki.tinki.model.Work.Project; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface ProjectRepository extends JpaRepository { - List findAllByAccount_Id(Long accountId); - List findAllByTitleContainsOrDescriptionContains(String title, String description); - List findAllBySkillsRequiredContaining(Skill skill); -} Index: c/main/java/it/finki/tinki/repository/SkillRepository.java =================================================================== --- src/main/java/it/finki/tinki/repository/SkillRepository.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,14 +1,0 @@ -package it.finki.tinki.repository; - -import it.finki.tinki.model.Skill; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -@Repository -public interface SkillRepository extends JpaRepository { - Optional findById(Long id); - List findAllByNameContaining(String text); -} Index: c/main/java/it/finki/tinki/repository/TeamRepository.java =================================================================== --- src/main/java/it/finki/tinki/repository/TeamRepository.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,15 +1,0 @@ -package it.finki.tinki.repository; - -import it.finki.tinki.model.Users.Company; -import it.finki.tinki.model.Users.Team; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -@Repository -public interface TeamRepository extends JpaRepository { - Team findByEmailAndPassword(String email, String password); - Optional findByEmail(String email); - Optional findByIdAndEmail(Long id, String email); -} Index: c/main/java/it/finki/tinki/repository/UserRepository.java =================================================================== --- src/main/java/it/finki/tinki/repository/UserRepository.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,14 +1,0 @@ -package it.finki.tinki.repository; - -import it.finki.tinki.model.Users.User; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -@Repository -public interface UserRepository extends JpaRepository { - User findByEmailAndPassword(String email, String password); - Optional findByEmail(String email); - Optional findByIdAndEmail(Long id, String email); -} Index: c/main/java/it/finki/tinki/service/AccountService.java =================================================================== --- src/main/java/it/finki/tinki/service/AccountService.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,23 +1,0 @@ -package it.finki.tinki.service; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Users.Account; -import it.finki.tinki.model.Users.Company; -import it.finki.tinki.model.Users.Team; -import it.finki.tinki.model.Users.User; -import it.finki.tinki.model.enumerator.AccountType; - -import java.util.List; -import java.util.Optional; - -public interface AccountService { - Account findUser(String email, String password, AccountType type); - Account registerUser(String email, String password, String name, String surname, List retainedSkills, List skillsToLearn); - Account registerTeam(String email, String password, String name, int members); - Account registerCompany(String email, String password, String name, String country, String city, String street); - Account findByIdAndType(Long accId, AccountType type); - User editUser(Long id, String email, String name, String surname, List retainedSkills, List skillsToLearn); - Company editCompany(Long id, String email, String name, String country, String city, String street); - Team editTeam(Long id, String email, String name, int members); - Optional findByIdAndEmail(Long id, String email, AccountType type); -} Index: c/main/java/it/finki/tinki/service/BuilderService.java =================================================================== --- src/main/java/it/finki/tinki/service/BuilderService.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,12 +1,0 @@ -package it.finki.tinki.service; - -import it.finki.tinki.model.Users.Account; -import it.finki.tinki.model.dto.response.account.CompanyResponseDTO; -import it.finki.tinki.model.dto.response.account.TeamResponseDTO; -import it.finki.tinki.model.dto.response.account.UserResponseDTO; - -public interface BuilderService { - UserResponseDTO buildUserResponseDTO(Account a1); - CompanyResponseDTO buildCompanyResponseDTO(Account a1); - TeamResponseDTO buildTeamResponseDTO(Account a1); -} Index: c/main/java/it/finki/tinki/service/MatchmakerService.java =================================================================== --- src/main/java/it/finki/tinki/service/MatchmakerService.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,19 +1,0 @@ -package it.finki.tinki.service; - -import it.finki.tinki.model.Match; -import it.finki.tinki.model.Work.Internship; -import it.finki.tinki.model.Work.Job; -import it.finki.tinki.model.Work.Project; -import it.finki.tinki.model.Users.User; - -import java.util.List; - -public interface MatchmakerService { - List getMatchingInternshipsForUser(User user); - List getMatchingJobsForUser(User user); - List getMatchingProjectsForUser(User user); - void setUpUserJobMatches(Job job, User user); - void setUpUserProjectMatches(Project project, User user); - void setUpUserInternshipMatches(Internship internship, User user); - List removeByUserId(Long userId); -} Index: c/main/java/it/finki/tinki/service/SkillService.java =================================================================== --- src/main/java/it/finki/tinki/service/SkillService.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,11 +1,0 @@ -package it.finki.tinki.service; - -import it.finki.tinki.model.Skill; - -import java.util.List; - -public interface SkillService { - List returnSkillsBasedOnId(List skillIds); - List returnBasedOnText(String text); - List findAll(); -} Index: c/main/java/it/finki/tinki/service/WorkService.java =================================================================== --- src/main/java/it/finki/tinki/service/WorkService.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,30 +1,0 @@ -package it.finki.tinki.service; - -import it.finki.tinki.model.Work.Internship; -import it.finki.tinki.model.Work.Job; -import it.finki.tinki.model.Work.Project; -import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; -import it.finki.tinki.model.dto.response.work.JobResponseDTO; -import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; -import it.finki.tinki.model.enumerator.AccountType; - -import java.util.Date; -import java.util.List; - -public interface WorkService { - List getAllJobsByAccount(Long accId); - List getAllInternshipsByAccount(Long accId); - List getAllProjectsByAccount(Long accId); - Job insertJob(String title, String description, Long accId, int salary, List skillsRequired, AccountType type); - Internship insertInternship(String title, String description, Long adccId, int salary, List skillsTrained, int openSpots, AccountType type); - Project insertProject(String title, String description, Long adccId, int salary, List skillsRequired, Date validUntil, AccountType type); - Job editJob(Long id, String title, String description, int salary); - Internship editInternship(Long id, String title, String description, int salary, int openSpots); - Project editProject(Long id, String title, String description, int salary); - List fullTextJobSearch(String text); - List fullTextInternshipSearch(String text); - List fullTextProjectSearch(String text); - Job getJobById(Long id); - Internship getInternshipById(Long id); - Project getProjectById(Long id); -} Index: c/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java =================================================================== --- src/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,243 +1,0 @@ -package it.finki.tinki.service.impl; - -import it.finki.tinki.model.Address; -import it.finki.tinki.model.Work.Internship; -import it.finki.tinki.model.Work.Job; -import it.finki.tinki.model.Work.Project; -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Users.Account; -import it.finki.tinki.model.Users.Company; -import it.finki.tinki.model.Users.Team; -import it.finki.tinki.model.Users.User; -import it.finki.tinki.model.enumerator.AccountType; -import it.finki.tinki.model.exception.InvalidArgumentsException; -import it.finki.tinki.model.exception.UserExistsException; -import it.finki.tinki.repository.*; -import it.finki.tinki.service.AccountService; -import it.finki.tinki.service.MatchmakerService; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -@Service -public class AccountServiceImpl implements AccountService { - - AddressRepository addressRepository; - UserRepository userRepository; - TeamRepository teamRepository; - CompanyRepository companyRepository; - JobRepository jobRepository; - ProjectRepository projectRepository; - InternshipRepository internshipRepository; - MatchmakerService matchmakerService; - - public AccountServiceImpl(AddressRepository addressRepository, - UserRepository userRepository, - TeamRepository teamRepository, - CompanyRepository companyRepository, - MatchmakerService matchmakerService, - JobRepository jobRepository, - ProjectRepository projectRepository, - InternshipRepository internshipRepository) { - this.addressRepository = addressRepository; - this.userRepository = userRepository; - this.teamRepository = teamRepository; - this.companyRepository = companyRepository; - this.jobRepository = jobRepository; - this.projectRepository = projectRepository; - this.internshipRepository = internshipRepository; - this.matchmakerService = matchmakerService; - } - - @Override - public Account findUser(String email, String password, AccountType type) { - - if(type.equals(AccountType.USER)){ - User u1 = this.userRepository.findByEmailAndPassword(email, password); - return u1; - } - else if(type.equals(AccountType.TEAM)){ - Team t1 = this.teamRepository.findByEmailAndPassword(email, password); - return t1; - } - else if(type.equals(AccountType.COMPANY)){ - Company c1 = this.companyRepository.findByEmailAndPassword(email, password); - return c1; - } - - return null; - } - - public Account registerUser(String email, String password, String name, String surname, List retainedSkills, List skillsToLearn){ - if(email==null || email.isEmpty() || password==null || password.isEmpty() || name==null || name.isEmpty() || surname==null || surname.isEmpty()){ - throw new InvalidArgumentsException(); - } - - if(this.userRepository.findByEmail(email).isPresent()){ - throw new UserExistsException(); - } - - User u = new User(email, password, name, AccountType.USER, surname, retainedSkills, skillsToLearn); - User ru = this.userRepository.save(u); - - setUpUser(ru); - - return ru; - } - - public Account registerTeam(String email, String password, String name, int members){ - if(email==null || email.isEmpty() || password==null || password.isEmpty() || name==null || name.isEmpty()){ - throw new InvalidArgumentsException(); - } - - if(this.teamRepository.findByEmail(email).isPresent()){ - throw new UserExistsException(); - } - - Team t = new Team(email, password, name, AccountType.TEAM, members); - return this.teamRepository.save(t); - } - - public Account registerCompany(String email, String password, String name, String country, String city, String street){ - if(email==null || email.isEmpty() || password==null || password.isEmpty() || name==null || name.isEmpty() - || country==null || country.isEmpty() || city==null || city.isEmpty() || street==null || street.isEmpty()){ - throw new InvalidArgumentsException(); - } - - System.out.println(email); - - if(this.companyRepository.findByEmail(email).isPresent()){ - throw new UserExistsException(); - } - - Address a = new Address(country, city, street); - this.addressRepository.save(a); - Company c = new Company(email, password, name, AccountType.COMPANY, a); - return this.companyRepository.save(c); - } - - public Account findByIdAndType(Long id, AccountType type){ - switch (type){ - case COMPANY: - return this.companyRepository.findById(id).get(); - case TEAM: - return this.teamRepository.findById(id).get(); - case USER: - return this.userRepository.findById(id).get(); - } - - return null; - } - - public Optional findByIdAndEmail(Long id, String email, AccountType accountType){ - - switch (accountType){ - case USER: - return this.userRepository.findByIdAndEmail(id, email); - case TEAM: - return this.teamRepository.findByIdAndEmail(id, email); - case COMPANY: - return this.companyRepository.findByIdAndEmail(id, email); - } - - return Optional.empty(); - } - - public User editUser(Long id, String email, String name, String surname, List retainedSkills, List skillsToLearn){ - if(email==null || email.isEmpty() || name==null || name.isEmpty() || surname==null || surname.isEmpty()){ - throw new InvalidArgumentsException(); - } - - User u = this.userRepository.findById(id).get(); - Optional t = this.userRepository.findByEmail(email); - - if(t.isPresent() && !t.get().equals(u)){ - throw new UserExistsException(); - } - - u.setEmail(email); - u.setName(name); - u.setSurname(surname); - u.setRetainedSkills(retainedSkills); - u.setSkillsToLearn(skillsToLearn); - - User m = this.userRepository.save(u); - - setUpUser(m); - - return m; - } - - public Company editCompany(Long id, String email, String name, String country, String city, String street){ - if(email==null || email.isEmpty() || name==null || name.isEmpty() - || country==null || country.isEmpty() || city==null || city.isEmpty() || street==null || street.isEmpty()){ - throw new InvalidArgumentsException(); - } - - Company c = this.companyRepository.findById(id).get(); - Optional t = this.companyRepository.findByEmail(email); - - if(t.isPresent() && !t.get().equals(c)){ - throw new UserExistsException(); - } - - c.setEmail(email); - c.setName(name); - - Address ad = c.getAddress(); - ad.setCountry(country); - ad.setCity(city); - ad.setStreet(street); - - this.addressRepository.save(ad); - return this.companyRepository.save(c); - } - - public Team editTeam(Long id, String email, String name, int members){ - if(email==null || email.isEmpty() || name==null || name.isEmpty()){ - throw new InvalidArgumentsException(); - } - - Team t = this.teamRepository.findById(id).get(); - Optional tt = this.teamRepository.findByEmail(email); - - if(tt.isPresent() && !tt.get().equals(t)){ - throw new UserExistsException(); - } - - t.setEmail(email); - t.setName(name); - t.setMembers(members); - - return this.teamRepository.save(t); - } - - - private void setUpUser(User u){ - - this.matchmakerService.removeByUserId(u.getId()); - - List jobs = this.jobRepository.findAll(); - List projects = this.projectRepository.findAll(); - List internships = this.internshipRepository.findAll(); - - if(jobs.size()!=0){ - for (Job job : jobs) { - this.matchmakerService.setUpUserJobMatches(job, u); - } - } - - if(projects.size()!=0){ - for (Project project : projects) { - this.matchmakerService.setUpUserProjectMatches(project, u); - } - } - - if(internships.size()!=0){ - for(Internship internship : internships){ - this.matchmakerService.setUpUserInternshipMatches(internship, u); - } - } - } -} Index: c/main/java/it/finki/tinki/service/impl/BuilderServiceImpl.java =================================================================== --- src/main/java/it/finki/tinki/service/impl/BuilderServiceImpl.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,127 +1,0 @@ -package it.finki.tinki.service.impl; - -import it.finki.tinki.model.Users.Account; -import it.finki.tinki.model.Users.Company; -import it.finki.tinki.model.Users.Team; -import it.finki.tinki.model.Users.User; -import it.finki.tinki.model.Work.Internship; -import it.finki.tinki.model.Work.Job; -import it.finki.tinki.model.Work.Project; -import it.finki.tinki.model.dto.response.account.CompanyResponseDTO; -import it.finki.tinki.model.dto.response.account.TeamResponseDTO; -import it.finki.tinki.model.dto.response.account.UserResponseDTO; -import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; -import it.finki.tinki.model.dto.response.work.JobResponseDTO; -import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; -import it.finki.tinki.model.enumerator.AccountType; -import it.finki.tinki.service.BuilderService; -import it.finki.tinki.service.MatchmakerService; -import it.finki.tinki.service.WorkService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class BuilderServiceImpl implements BuilderService { - - MatchmakerService matchmakerService; - WorkService workService; - - public BuilderServiceImpl(MatchmakerService matchmakerService, WorkService workService) { - this.matchmakerService = matchmakerService; - this.workService = workService; - } - - @Override - public UserResponseDTO buildUserResponseDTO(Account a1) { - UserResponseDTO uDto = new UserResponseDTO(); - - uDto.setError(null); - - uDto.setId(a1.getId()); - uDto.setEmail(a1.getEmail()); - uDto.setName(a1.getName()); - uDto.setType(AccountType.USER); - uDto.setSurname(((User) a1).getSurname()); - - uDto.setRetained(((User) a1).getRetainedSkills()); - uDto.setToLearn(((User) a1).getSkillsToLearn()); - - List matchedJobs = this.matchmakerService.getMatchingJobsForUser((User) a1); - List matchedProjects = this.matchmakerService.getMatchingProjectsForUser((User) a1); - List matchedInternships = this.matchmakerService.getMatchingInternshipsForUser((User) a1); - - matchedJobs.forEach(job -> { - JobResponseDTO dto = new JobResponseDTO(job); - uDto.getJobs().add(dto); - }); - - matchedProjects.forEach(project -> { - ProjectResponseDTO dto = new ProjectResponseDTO(project); - uDto.getProjects().add(dto); - }); - - matchedInternships.forEach(internship -> { - InternshipResponseDTO dto = new InternshipResponseDTO(internship); - uDto.getInternships().add(dto); - }); - - return uDto; - } - - @Override - public CompanyResponseDTO buildCompanyResponseDTO(Account a1) { - CompanyResponseDTO cDto = new CompanyResponseDTO(); - - cDto.setError(null); - - cDto.setId(a1.getId()); - cDto.setEmail(a1.getEmail()); - cDto.setName(a1.getName()); - cDto.setType(AccountType.COMPANY); - cDto.setAddress(((Company) a1).getAddress()); - - List jobs = this.workService.getAllJobsByAccount(a1.getId()); - List internships = this.workService.getAllInternshipsByAccount(a1.getId()); - - jobs.forEach(job -> { - JobResponseDTO dto = new JobResponseDTO(job); - cDto.getJobs().add(dto); - }); - - internships.forEach(internship -> { - InternshipResponseDTO dto = new InternshipResponseDTO(internship); - cDto.getInternships().add(dto); - }); - - return cDto; - } - - @Override - public TeamResponseDTO buildTeamResponseDTO(Account a1) { - TeamResponseDTO tDto = new TeamResponseDTO(); - - tDto.setError(null); - - tDto.setId(a1.getId()); - tDto.setEmail(a1.getEmail()); - tDto.setName(a1.getName()); - tDto.setType(AccountType.TEAM); - tDto.setMembers(((Team) a1).getMembers()); - - List jobs = this.workService.getAllJobsByAccount(a1.getId()); - List projects = this.workService.getAllProjectsByAccount(a1.getId()); - - jobs.forEach(job -> { - JobResponseDTO dto = new JobResponseDTO(job); - tDto.getJobs().add(dto); - }); - - projects.forEach(project -> { - ProjectResponseDTO dto = new ProjectResponseDTO(project); - tDto.getProjects().add(dto); - }); - - return tDto; - } -} Index: c/main/java/it/finki/tinki/service/impl/MatchmakerServiceImpl.java =================================================================== --- src/main/java/it/finki/tinki/service/impl/MatchmakerServiceImpl.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,132 +1,0 @@ -package it.finki.tinki.service.impl; - -import it.finki.tinki.helper.Matchmaker; -import it.finki.tinki.model.EmbeddedMatchId; -import it.finki.tinki.model.Work.Internship; -import it.finki.tinki.model.Work.Job; -import it.finki.tinki.model.Work.Project; -import it.finki.tinki.model.Match; -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Users.User; -import it.finki.tinki.model.enumerator.WorkType; -import it.finki.tinki.repository.InternshipRepository; -import it.finki.tinki.repository.JobRepository; -import it.finki.tinki.repository.MatchRepository; -import it.finki.tinki.repository.ProjectRepository; -import it.finki.tinki.service.MatchmakerService; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.util.ArrayList; -import java.util.List; - - -@Service -public class MatchmakerServiceImpl implements MatchmakerService { - - MatchRepository matchRepository; - JobRepository jobRepository; - InternshipRepository internshipRepository; - ProjectRepository projectRepository; - - public MatchmakerServiceImpl(MatchRepository matchRepository, - JobRepository jobRepository, - InternshipRepository internshipRepository, - ProjectRepository projectRepository) { - this.matchRepository = matchRepository; - this.jobRepository = jobRepository; - this.internshipRepository = internshipRepository; - this.projectRepository = projectRepository; - } - - @Override - public List getMatchingInternshipsForUser(User user) { - List matches = this.matchRepository.findAllByEmbeddedMatchIdUserAndTypeOrderByCoefficientDesc(user, WorkType.INTERNSHIP); - - List internships = new ArrayList<>(); - if(matches.size()!=0){ - matches.forEach(match -> { - internships.add((Internship) match.getEmbeddedMatchId().getWork()); - }); - } - - return internships; - } - - @Override - public List getMatchingJobsForUser(User user) { - List matches = this.matchRepository.findAllByEmbeddedMatchIdUserAndTypeOrderByCoefficientDesc(user, WorkType.JOB); - - List jobs = new ArrayList<>(); - if(matches.size()!=0) { - matches.forEach(match -> { - jobs.add((Job) match.getEmbeddedMatchId().getWork()); - }); - } - - return jobs; - } - - @Override - public List getMatchingProjectsForUser(User user) { - List matches = this.matchRepository.findAllByEmbeddedMatchIdUserAndTypeOrderByCoefficientDesc(user, WorkType.PROJECT); - - List projects = new ArrayList<>(); - if(matches.size()!=0) { - matches.forEach(match -> { - projects.add((Project) match.getEmbeddedMatchId().getWork()); - }); - } - - return projects; - } - - @Override - public void setUpUserJobMatches(Job job, User user) { - List jobSkill = job.getSkillsRequired(); - List userSkill = user.getRetainedSkills(); - - float coef = Matchmaker.match(jobSkill, userSkill); - - if(coef!=0){ - EmbeddedMatchId embeddedMatchId = new EmbeddedMatchId(job, user); - Match m = new Match(embeddedMatchId, coef, WorkType.JOB); - this.matchRepository.save(m); - } - } - - @Override - public void setUpUserProjectMatches(Project project, User user) { - List projectSkills = project.getSkillsRequired(); - List userSkill = user.getRetainedSkills(); - - float coef = Matchmaker.match(projectSkills, userSkill); - - if(coef!=0){ - EmbeddedMatchId embeddedMatchId = new EmbeddedMatchId(project, user); - Match m = new Match(embeddedMatchId, coef, WorkType.PROJECT); - this.matchRepository.save(m); - } - } - - @Override - public void setUpUserInternshipMatches(Internship internship, User user) { - List internshipSkills = internship.getSkillsTrained(); - List userSkill = user.getSkillsToLearn(); - - float coef = Matchmaker.match(internshipSkills, userSkill); - - if(coef!=0){ - EmbeddedMatchId embeddedMatchId = new EmbeddedMatchId(internship, user); - Match m = new Match(embeddedMatchId, coef, WorkType.INTERNSHIP); - this.matchRepository.save(m); - } - } - - @Transactional - @Override - public List removeByUserId(Long userId) { - return this.matchRepository.deleteAllByEmbeddedMatchId_User_Id(userId); - } - -} Index: c/main/java/it/finki/tinki/service/impl/SkillServiceImpl.java =================================================================== --- src/main/java/it/finki/tinki/service/impl/SkillServiceImpl.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,40 +1,0 @@ -package it.finki.tinki.service.impl; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.repository.SkillRepository; -import it.finki.tinki.service.SkillService; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -@Service -public class SkillServiceImpl implements SkillService { - - SkillRepository skillRepository; - - public SkillServiceImpl(SkillRepository skillRepository) { - this.skillRepository = skillRepository; - } - - @Override - public List returnSkillsBasedOnId(List skillIds) { - - List list = new ArrayList<>(); - - skillIds.forEach(skill -> { - this.skillRepository.findById(skill).ifPresent(list::add); - }); - - return list; - } - - public List returnBasedOnText(String text){ - return this.skillRepository.findAllByNameContaining(text); - } - - @Override - public List findAll() { - return this.skillRepository.findAll(); - } -} Index: c/main/java/it/finki/tinki/service/impl/WorkServiceImpl.java =================================================================== --- src/main/java/it/finki/tinki/service/impl/WorkServiceImpl.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,241 +1,0 @@ -package it.finki.tinki.service.impl; - -import it.finki.tinki.model.Users.User; -import it.finki.tinki.model.Work.Internship; -import it.finki.tinki.model.Work.Job; -import it.finki.tinki.model.Work.Project; -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Users.Account; -import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; -import it.finki.tinki.model.dto.response.work.JobResponseDTO; -import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; -import it.finki.tinki.model.enumerator.AccountType; -import it.finki.tinki.repository.*; -import it.finki.tinki.service.AccountService; -import it.finki.tinki.service.MatchmakerService; -import it.finki.tinki.service.SkillService; -import it.finki.tinki.service.WorkService; -import org.springframework.stereotype.Service; - -import java.util.*; - -@Service -public class WorkServiceImpl implements WorkService { - - JobRepository jobRepository; - InternshipRepository internshipRepository; - ProjectRepository projectRepository; - MatchRepository matchRepository; - MatchmakerService matchmakerService; - SkillService skillService; - AccountService accountService; - UserRepository userRepository; - - public WorkServiceImpl(JobRepository jobRepository, - InternshipRepository internshipRepository, - ProjectRepository projectRepository, - MatchRepository matchRepository, - SkillService skillService, - AccountService accountService, - UserRepository userRepository, - MatchmakerService matchmakerService) { - this.jobRepository = jobRepository; - this.internshipRepository = internshipRepository; - this.projectRepository = projectRepository; - this.matchRepository = matchRepository; - this.skillService = skillService; - this.accountService = accountService; - this.userRepository = userRepository; - this.matchmakerService = matchmakerService; - } - - @Override - public List getAllJobsByAccount(Long accId) { - return this.jobRepository.findAllByAccount_Id(accId); - } - - @Override - public List getAllInternshipsByAccount(Long accId) { - return this.internshipRepository.findAllByAccount_Id(accId); - } - - @Override - public List getAllProjectsByAccount(Long accId) { - return this.projectRepository.findAllByAccount_Id(accId); - } - - @Override - public Job insertJob(String title, String description, Long adccId, int salary, List skillsRequired, AccountType type) { - List skills = this.skillService.returnSkillsBasedOnId(skillsRequired); - Account account = this.accountService.findByIdAndType(adccId, type); - Job j = new Job(title, description, account, salary, skills); - Job jb = this.jobRepository.save(j); - - List users = this.userRepository.findAll(); - - users.forEach(user -> { - this.matchmakerService.setUpUserJobMatches(jb, user); - }); - - return jb; - } - - @Override - public Internship insertInternship(String title, String description, Long adccId, int salary, List skillsTrained, int openSpots, AccountType type) { - List skills = this.skillService.returnSkillsBasedOnId(skillsTrained); - Account account = this.accountService.findByIdAndType(adccId, type); - Internship j = new Internship(title, description, account, salary, skills, openSpots); - Internship jb = this.internshipRepository.save(j); - - List users = this.userRepository.findAll(); - - users.forEach(user -> { - this.matchmakerService.setUpUserInternshipMatches(jb, user); - }); - - return jb; - } - - @Override - public Project insertProject(String title, String description, Long adccId, int salary, List skillsRequired, Date validUntil, AccountType type) { - List skills = this.skillService.returnSkillsBasedOnId(skillsRequired); - Account account = this.accountService.findByIdAndType(adccId, type); - Project j = new Project(title, description, account, salary, skills, validUntil); - Project jb = this.projectRepository.save(j); - - List users = this.userRepository.findAll(); - - users.forEach(user -> { - this.matchmakerService.setUpUserProjectMatches(jb, user); - }); - - return jb; - } - - @Override - public Job editJob(Long id, String title, String description, int salary) { - Job j = this.jobRepository.findById(id).get(); - - j.setTitle(title); - j.setDescription(description); - j.setSalary(salary); - - return this.jobRepository.save(j); - } - - @Override - public Internship editInternship(Long id, String title, String description, int salary, int openSpots) { - Internship j = this.internshipRepository.findById(id).get(); - - j.setTitle(title); - j.setDescription(description); - j.setSalary(salary); - j.setOpenSpots(openSpots); - - return this.internshipRepository.save(j); - } - - @Override - public Project editProject(Long id, String title, String description, int salary) { - Project j = this.projectRepository.findById(id).get(); - - j.setTitle(title); - j.setDescription(description); - j.setSalary(salary); - - return this.projectRepository.save(j); - } - - @Override - public List fullTextJobSearch(String text) { - List skills = this.skillService.returnBasedOnText(text); - - List jobs = this.jobRepository.findAllByTitleContainsOrDescriptionContains(text,text); - List sjob = new ArrayList<>(); - - skills.forEach(skill -> { - sjob.addAll(this.jobRepository.findAllBySkillsRequiredContaining(skill)); - }); - - sjob.forEach(job -> { - if(!jobs.contains(job)){ - jobs.add(job); - } - }); - - List jobs2 = new ArrayList<>(); - - jobs.forEach(job -> { - jobs2.add(new JobResponseDTO(job)); - }); - - return jobs2; - } - - @Override - public List fullTextInternshipSearch(String text) { - List skills = this.skillService.returnBasedOnText(text); - - List jobs = this.internshipRepository.findAllByTitleContainsOrDescriptionContains(text,text); - List sjob = new ArrayList<>(); - - skills.forEach(skill -> { - sjob.addAll(this.internshipRepository.findAllBySkillsTrainedContaining(skill)); - }); - - sjob.forEach(job -> { - if(!jobs.contains(job)){ - jobs.add(job); - } - }); - - List jobs2 = new ArrayList<>(); - - jobs.forEach(job -> { - jobs2.add(new InternshipResponseDTO(job)); - }); - - return jobs2; - } - - @Override - public List fullTextProjectSearch(String text) { - List skills = this.skillService.returnBasedOnText(text); - - List jobs = this.projectRepository.findAllByTitleContainsOrDescriptionContains(text,text); - List sjob = new ArrayList<>(); - - skills.forEach(skill -> { - sjob.addAll(this.projectRepository.findAllBySkillsRequiredContaining(skill)); - }); - - sjob.forEach(job -> { - if(!jobs.contains(job)){ - jobs.add(job); - } - }); - - List jobs2 = new ArrayList<>(); - - jobs.forEach(job -> { - jobs2.add(new ProjectResponseDTO(job)); - }); - - return jobs2; - } - - @Override - public Job getJobById(Long id) { - return this.jobRepository.findById(id).get(); - } - - @Override - public Internship getInternshipById(Long id) { - return this.internshipRepository.findById(id).get(); - } - - @Override - public Project getProjectById(Long id) { - return this.projectRepository.findById(id).get(); - } -} Index: c/main/java/it/finki/tinki/web/controller/AccountEditController.java =================================================================== --- src/main/java/it/finki/tinki/web/controller/AccountEditController.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,83 +1,0 @@ -package it.finki.tinki.web.controller; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Users.Company; -import it.finki.tinki.model.Users.Team; -import it.finki.tinki.model.Users.User; -import it.finki.tinki.model.dto.register.account.CompanyRegisterDTO; -import it.finki.tinki.model.dto.register.account.TeamRegisterDTO; -import it.finki.tinki.model.dto.register.account.UserRegisterDTO; -import it.finki.tinki.model.dto.response.account.CompanyResponseDTO; -import it.finki.tinki.model.dto.response.account.TeamResponseDTO; -import it.finki.tinki.model.dto.response.account.UserResponseDTO; -import it.finki.tinki.model.enumerator.AccountType; -import it.finki.tinki.service.AccountService; -import it.finki.tinki.service.BuilderService; -import it.finki.tinki.service.SkillService; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Optional; - -@RestController -@CrossOrigin(origins = "http://localhost:3000") -@RequestMapping(path = "/api/edit/account") -public class AccountEditController { - - AccountService accountService; - SkillService skillService; - BuilderService builderService; - - public AccountEditController(AccountService accountService, SkillService skillService, BuilderService builderService) { - this.accountService = accountService; - this.skillService = skillService; - this.builderService = builderService; - } - - @PostMapping(path = "/user/{id}/{email}") - public UserResponseDTO editUser(@PathVariable(name = "id") Long id, - @PathVariable(name = "email") String email, - @RequestBody UserRegisterDTO body){ - - Optional a = this.accountService.findByIdAndEmail(id, email, AccountType.USER); - - if(a.isPresent()){ - List retained = this.skillService.returnSkillsBasedOnId(body.getRetainedSkills()); - List toLearn = this.skillService.returnSkillsBasedOnId(body.getSkillsToLearn()); - User u = this.accountService.editUser(id, body.getEmail(), body.getName(), body.getSurname(), retained, toLearn); - return this.builderService.buildUserResponseDTO(u); - } - - return new UserResponseDTO(); - } - - @PostMapping(path = "/company/{id}/{email}") - public CompanyResponseDTO editCompany(@PathVariable(name = "id") Long id, - @PathVariable(name = "email") String email, - @RequestBody CompanyRegisterDTO body){ - - Optional a = this.accountService.findByIdAndEmail(id, email, AccountType.COMPANY); - - if(a.isPresent()){ - Company c = this.accountService.editCompany(id, body.getEmail(), body.getName(), body.getCountry(), body.getCity(), body.getStreet()); - return this.builderService.buildCompanyResponseDTO(c); - } - - return new CompanyResponseDTO(); - } - - @PostMapping(path = "/team/{id}/{email}") - public TeamResponseDTO editTeam(@PathVariable(name = "id") Long id, - @PathVariable(name = "email") String email, - @RequestBody TeamRegisterDTO body){ - - Optional a = this.accountService.findByIdAndEmail(id, email, AccountType.TEAM); - - if(a.isPresent()){ - Team t = this.accountService.editTeam(id, body.getEmail(), body.getName(), body.getMembers()); - return this.builderService.buildTeamResponseDTO(t); - } - - return new TeamResponseDTO(); - } -} Index: c/main/java/it/finki/tinki/web/controller/AccountRegisterController.java =================================================================== --- src/main/java/it/finki/tinki/web/controller/AccountRegisterController.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,76 +1,0 @@ -package it.finki.tinki.web.controller; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Users.Account; -import it.finki.tinki.model.dto.register.account.CompanyRegisterDTO; -import it.finki.tinki.model.dto.register.account.TeamRegisterDTO; -import it.finki.tinki.model.dto.register.account.UserRegisterDTO; -import it.finki.tinki.service.AccountService; -import it.finki.tinki.service.SkillService; -import org.springframework.web.bind.annotation.*; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@RestController -@CrossOrigin(origins = "http://localhost:3000") -@RequestMapping("/api/register") -public class AccountRegisterController { - - AccountService accountService; - SkillService skillService; - - public AccountRegisterController(AccountService accountService, SkillService skillService) { - this.accountService = accountService; - this.skillService = skillService; - } - - @RequestMapping(path = "/user", method = RequestMethod.POST) - private Map registerUser(@RequestBody UserRegisterDTO body){ - - List retained = this.skillService.returnSkillsBasedOnId(body.getRetainedSkills()); - List toLearn = this.skillService.returnSkillsBasedOnId(body.getSkillsToLearn()); - Account k = this.accountService.registerUser(body.getEmail(), body.getPassword(), body.getName(), body.getSurname(), retained, toLearn); - Map response = new HashMap<>(); - - if(k==null){ - response.put("error", "There was an error when trying to register user."); - }else{ - response.put("success", "Registration completed successfully."); - } - - return response; - } - - @RequestMapping(path = "/team", method = RequestMethod.POST) - private Map registerTeam(@RequestBody TeamRegisterDTO body){ - - Account k = this.accountService.registerTeam(body.getEmail(), body.getPassword(), body.getName(), body.getMembers()); - Map response = new HashMap<>(); - - if(k==null){ - response.put("error", "There was an error when trying to register team."); - }else{ - response.put("success", "Registration completed successfully."); - } - - return response; - } - - @RequestMapping(path = "/company", method = RequestMethod.POST) - private Map registerCompany(@RequestBody CompanyRegisterDTO body){ - - Account k = this.accountService.registerCompany(body.getEmail(), - body.getPassword(), body.getName(), body.getCountry(), body.getCity(), body.getStreet()); - Map response = new HashMap<>(); - - if(k==null){ - response.put("error", "There was an error when trying to register company."); - }else{ - response.put("success", "Registration completed successfully."); - } - - return response; - } -} Index: c/main/java/it/finki/tinki/web/controller/LoginController.java =================================================================== --- src/main/java/it/finki/tinki/web/controller/LoginController.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,46 +1,0 @@ -package it.finki.tinki.web.controller; - -import it.finki.tinki.model.Users.Account; -import it.finki.tinki.model.Users.Team; -import it.finki.tinki.model.Users.User; -import it.finki.tinki.model.dto.*; -import it.finki.tinki.model.dto.response.account.LoginResponseDTO; -import it.finki.tinki.service.AccountService; -import it.finki.tinki.service.BuilderService; -import it.finki.tinki.service.WorkService; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.server.ResponseStatusException; - -import java.util.List; - -@RestController -@CrossOrigin(origins = "http://localhost:3000") -@RequestMapping("/api") -public class LoginController { - - AccountService accountService; - BuilderService builderService; - - public LoginController(AccountService accountService, BuilderService builderService) { - this.accountService = accountService; - this.builderService = builderService; - } - - @PostMapping(path = "/login") - public LoginResponseDTO loginProcess(@RequestBody AccountLoginDTO body) throws ResponseStatusException { - - Account a1 = accountService.findUser(body.getEmail(), body.getPassword(), body.getType()); - - if(a1!=null){ - if(a1.getClass().equals(User.class)){ - return this.builderService.buildUserResponseDTO(a1); - }else if(a1.getClass().equals(Team.class)){ - return this.builderService.buildTeamResponseDTO(a1); - }else{ - return this.builderService.buildCompanyResponseDTO(a1); - } - } - - return new LoginResponseDTO(); - } -} Index: c/main/java/it/finki/tinki/web/controller/SearchController.java =================================================================== --- src/main/java/it/finki/tinki/web/controller/SearchController.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,36 +1,0 @@ -package it.finki.tinki.web.controller; - -import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; -import it.finki.tinki.model.dto.response.work.JobResponseDTO; -import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; -import it.finki.tinki.service.WorkService; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@CrossOrigin("http://localhost:3000") -@RequestMapping("/api/search") -public class SearchController { - - WorkService workService; - - public SearchController(WorkService workService) { - this.workService = workService; - } - - @GetMapping(path = "/job") - public List jobRes(@RequestParam(name = "text") String text){ - return this.workService.fullTextJobSearch(text); - } - - @GetMapping(path = "/internship") - public List internshipRes(@RequestParam(name = "text") String text){ - return this.workService.fullTextInternshipSearch(text); - } - - @GetMapping(path = "/project") - public List projectRes(@RequestParam(name = "text") String text){ - return this.workService.fullTextProjectSearch(text); - } -} Index: c/main/java/it/finki/tinki/web/controller/SkillController.java =================================================================== --- src/main/java/it/finki/tinki/web/controller/SkillController.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,24 +1,0 @@ -package it.finki.tinki.web.controller; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.service.SkillService; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@CrossOrigin("http://localhost:3000") -@RequestMapping("/api/skills") -public class SkillController { - - SkillService skillService; - - public SkillController(SkillService skillService) { - this.skillService = skillService; - } - - @GetMapping() - public List returnSkills(){ - return this.skillService.findAll(); - } -} Index: c/main/java/it/finki/tinki/web/controller/WorkEditController.java =================================================================== --- src/main/java/it/finki/tinki/web/controller/WorkEditController.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,79 +1,0 @@ -package it.finki.tinki.web.controller; - -import it.finki.tinki.model.Work.Internship; -import it.finki.tinki.model.Work.Job; -import it.finki.tinki.model.Work.Project; -import it.finki.tinki.model.dto.edit.work.InternshipEditDTO; -import it.finki.tinki.model.dto.edit.work.WorkEditDTO; -import it.finki.tinki.model.dto.register.work.InternshipRegisterDTO; -import it.finki.tinki.model.dto.register.work.JobRegisterDTO; -import it.finki.tinki.model.dto.register.work.ProjectRegisterDTO; -import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; -import it.finki.tinki.model.dto.response.work.JobResponseDTO; -import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; -import it.finki.tinki.service.WorkService; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import java.util.HashMap; -import java.util.Map; - -@RestController -@CrossOrigin(origins = "http://localhost:3000") -@RequestMapping("/api/edit/work") -public class WorkEditController { - - WorkService workService; - - public WorkEditController(WorkService workService) { - this.workService = workService; - } - - @PostMapping("/job/{id}") - public JobResponseDTO editJob(@PathVariable Long id, - @RequestBody WorkEditDTO body){ - - Job j = this.workService.getJobById(id); - - if(body.getAccountId().equals(j.getAccount().getId())) { - Job k = this.workService.editJob(id, body.getTitle(), body.getDescription(), body.getSalary()); - if(k!=null){ - return new JobResponseDTO(k); - } - } - - return new JobResponseDTO(); - } - - @PostMapping("/internship/{id}") - public InternshipResponseDTO editInternship(@PathVariable Long id, - @RequestBody InternshipEditDTO body){ - - Internship i = this.workService.getInternshipById(id); - - if(body.getAccountId().equals(i.getAccount().getId())){ - Internship k = this.workService.editInternship(id, body.getTitle(), body.getDescription(), body.getSalary(), body.getOpenSpots()); - if(k!=null){ - return new InternshipResponseDTO(k); - } - } - - return new InternshipResponseDTO(); - } - - @PostMapping("/project/{id}") - public ProjectResponseDTO editProject(@PathVariable Long id, - @RequestBody WorkEditDTO body){ - - Project p = this.workService.getProjectById(id); - - if(body.getAccountId().equals(p.getAccount().getId())) { - Project k = this.workService.editProject(id, body.getTitle(), body.getDescription(), body.getSalary()); - if(k!=null){ - return new ProjectResponseDTO(k); - } - } - - return new ProjectResponseDTO(); - } -} Index: c/main/java/it/finki/tinki/web/controller/WorkRegisterController.java =================================================================== --- src/main/java/it/finki/tinki/web/controller/WorkRegisterController.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,62 +1,0 @@ -package it.finki.tinki.web.controller; - -import it.finki.tinki.model.Users.Account; -import it.finki.tinki.model.Work.Internship; -import it.finki.tinki.model.Work.Job; -import it.finki.tinki.model.Work.Project; -import it.finki.tinki.model.dto.register.work.InternshipRegisterDTO; -import it.finki.tinki.model.dto.register.work.JobRegisterDTO; -import it.finki.tinki.model.dto.register.work.ProjectRegisterDTO; -import it.finki.tinki.model.dto.response.work.InternshipResponseDTO; -import it.finki.tinki.model.dto.response.work.JobResponseDTO; -import it.finki.tinki.model.dto.response.work.ProjectResponseDTO; -import it.finki.tinki.model.enumerator.AccountType; -import it.finki.tinki.service.WorkService; -import org.springframework.web.bind.annotation.*; - -@RestController -@CrossOrigin(origins = "http://localhost:3000") -@RequestMapping(path = "/api/register/work") -public class WorkRegisterController { - - WorkService workService; - - public WorkRegisterController(WorkService workService) { - this.workService = workService; - } - - @PostMapping("/job") - public JobResponseDTO registerJob(@RequestBody JobRegisterDTO body){ - - if(body.getType() != AccountType.USER){ - Job j = this.workService.insertJob(body.getTitle(), - body.getDescription(), body.getAccountId(), body.getSalary(), body.getSkillsRequired(), body.getType()); - return new JobResponseDTO(j); - } - - return new JobResponseDTO(); - } - - @PostMapping("/internship") - public InternshipResponseDTO registerInternship(@RequestBody InternshipRegisterDTO body){ - if(body.getType() == AccountType.COMPANY){ - Internship j = this.workService.insertInternship(body.getTitle(), - body.getDescription(), body.getAccountId(), body.getSalary(), body.getSkillsTrained(), body.getOpenSpots(), body.getType()); - return new InternshipResponseDTO(j); - } - - return new InternshipResponseDTO(); - } - - @PostMapping("/project") - public ProjectResponseDTO registerProject(@RequestBody ProjectRegisterDTO body){ - - if(body.getType() == AccountType.TEAM){ - Project j = this.workService.insertProject(body.getTitle(), - body.getDescription(), body.getAccountId(), body.getSalary(), body.getSkillsRequired(), body.getValidUntil(), body.getType()); - return new ProjectResponseDTO(j); - } - - return new ProjectResponseDTO(); - } -} Index: c/main/resources/application.properties =================================================================== --- src/main/resources/application.properties (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,19 +1,0 @@ -server.port=9090 - -spring.datasource.url=jdbc:h2:mem:testdb -spring.datasource.driver-class-name=org.h2.Driver - -spring.datasource.username=sa -spring.datasource.password= - -spring.jpa.database-platform=org.hibernate.dialect.H2Dialect - -spring.h2.console.enabled=true -spring.h2.console.path=/h2 - -spring.jpa.properties.hibernate.show_sql=true -spring.jpa.properties.hibernate.use_sql_comments=true -spring.jpa.properties.hibernate.format_sql=true - -logging.level.org.hibernate.type=trace -spring.jpa.hibernate.ddl-auto=create Index: c/test/java/it/finki/tinki/TinkiApplicationTests.java =================================================================== --- src/test/java/it/finki/tinki/TinkiApplicationTests.java (revision 6729ba51f1105d56935c5cae90757ade1cac2082) +++ (revision ) @@ -1,13 +1,0 @@ -package it.finki.tinki; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class TinkiApplicationTests { - - @Test - void contextLoads() { - } - -}