diff --git a/taskmanager-spring-data-rest/.gitignore b/taskmanager-spring-data-rest/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/taskmanager-spring-data-rest/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/taskmanager-spring-data-rest/build.gradle b/taskmanager-spring-data-rest/build.gradle new file mode 100644 index 0000000..db66dc7 --- /dev/null +++ b/taskmanager-spring-data-rest/build.gradle @@ -0,0 +1,44 @@ +plugins { + id 'org.springframework.boot' version '2.6.4' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'com.scaler' +version = '0.0.1-SNAPSHOT' +//sourceCompatibility = '17' +//targetCompatibility= '17' + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-data-rest' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springdoc:springdoc-openapi-data-rest:1.6.6' + implementation 'org.springdoc:springdoc-openapi-ui:1.6.6' + compileOnly 'org.projectlombok:lombok' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + runtimeOnly 'com.h2database:h2' + annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +//tasks.named('test') { +// useJUnitPlatform() +//} + +java{ + toolchain{ + languageVersion = JavaLanguageVersion.of(17) + } +} diff --git a/taskmanager-spring-data-rest/gradle/wrapper/gradle-wrapper.jar b/taskmanager-spring-data-rest/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 Binary files /dev/null and b/taskmanager-spring-data-rest/gradle/wrapper/gradle-wrapper.jar differ diff --git a/taskmanager-spring-data-rest/gradle/wrapper/gradle-wrapper.properties b/taskmanager-spring-data-rest/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..41dfb87 --- /dev/null +++ b/taskmanager-spring-data-rest/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/taskmanager-spring-data-rest/gradlew b/taskmanager-spring-data-rest/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/taskmanager-spring-data-rest/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/taskmanager-spring-data-rest/gradlew.bat b/taskmanager-spring-data-rest/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/taskmanager-spring-data-rest/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/taskmanager-spring-data-rest/settings.gradle b/taskmanager-spring-data-rest/settings.gradle new file mode 100644 index 0000000..f331409 --- /dev/null +++ b/taskmanager-spring-data-rest/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'taskmanager-spring-data-rest' diff --git a/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/TaskmanagerSpringDataRestApplication.java b/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/TaskmanagerSpringDataRestApplication.java new file mode 100644 index 0000000..3b54e08 --- /dev/null +++ b/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/TaskmanagerSpringDataRestApplication.java @@ -0,0 +1,13 @@ +package com.scaler.taskmanagerspringdatarest; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TaskmanagerSpringDataRestApplication { + + public static void main(String[] args) { + SpringApplication.run(TaskmanagerSpringDataRestApplication.class, args); + } + +} diff --git a/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/notes/NotesEntity.java b/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/notes/NotesEntity.java new file mode 100644 index 0000000..abec675 --- /dev/null +++ b/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/notes/NotesEntity.java @@ -0,0 +1,30 @@ +package com.scaler.taskmanagerspringdatarest.notes; + +import com.scaler.taskmanagerspringdatarest.tasks.TasksEntity; +import lombok.Getter; +import lombok.Setter; +import org.springframework.data.rest.core.annotation.RestResource; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; + +@Getter +@Setter +@Entity(name = "notes") +public class NotesEntity { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; + + @Column(nullable = false) + private String body; + +// Not sure if this is the right way to do it... +// @NotNull +// @ManyToOne +// @JoinColumn(name = "task_id") +// @RestResource(path = "tasks", rel="tasks") +// private TasksEntity task; + +} diff --git a/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/notes/NotesRepository.java b/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/notes/NotesRepository.java new file mode 100644 index 0000000..5ffd5eb --- /dev/null +++ b/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/notes/NotesRepository.java @@ -0,0 +1,9 @@ +package com.scaler.taskmanagerspringdatarest.notes; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.rest.core.annotation.RepositoryRestResource; + +@RepositoryRestResource(collectionResourceRel = "notes", path = "notes") +public interface NotesRepository extends JpaRepository { + +} diff --git a/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/tasks/TasksEntity.java b/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/tasks/TasksEntity.java new file mode 100644 index 0000000..f0f08ec --- /dev/null +++ b/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/tasks/TasksEntity.java @@ -0,0 +1,37 @@ +package com.scaler.taskmanagerspringdatarest.tasks; + +import com.scaler.taskmanagerspringdatarest.notes.NotesEntity; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import java.time.LocalDate; +import java.util.List; + + +@Getter +@Entity(name = "tasks") +public class TasksEntity { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; + + @Column(nullable = false) + private String name; + + private LocalDate dueDate; + + private Boolean status; + + @OneToMany + private List notes; + + + public void setName(String name){ + this.name = name; + this.dueDate = LocalDate.now().plusDays(7L); + this.status = false; + } +} + diff --git a/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/tasks/TasksRepository.java b/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/tasks/TasksRepository.java new file mode 100644 index 0000000..319bf07 --- /dev/null +++ b/taskmanager-spring-data-rest/src/main/java/com/scaler/taskmanagerspringdatarest/tasks/TasksRepository.java @@ -0,0 +1,9 @@ +package com.scaler.taskmanagerspringdatarest.tasks; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.rest.core.annotation.RepositoryRestResource; + +@RepositoryRestResource(collectionResourceRel = "tasks", path = "tasks") +public interface TasksRepository extends JpaRepository { + +} diff --git a/taskmanager-spring-data-rest/src/main/resources/application.yaml b/taskmanager-spring-data-rest/src/main/resources/application.yaml new file mode 100644 index 0000000..461ae60 --- /dev/null +++ b/taskmanager-spring-data-rest/src/main/resources/application.yaml @@ -0,0 +1,15 @@ +server: + port: 8081 +spring: + datasource: + url: "jdbc:h2:file:./test.db" + driver-class-name: org.h2.Driver + jpa: + hibernate: + ddl-auto: update # dangerous for production + +logging: + level: + org: + hibernate: + SQL: DEBUG diff --git a/taskmanager-spring-data-rest/src/test/java/com/scaler/taskmanagerspringdatarest/TaskmanagerSpringDataRestApplicationTests.java b/taskmanager-spring-data-rest/src/test/java/com/scaler/taskmanagerspringdatarest/TaskmanagerSpringDataRestApplicationTests.java new file mode 100644 index 0000000..b62bc17 --- /dev/null +++ b/taskmanager-spring-data-rest/src/test/java/com/scaler/taskmanagerspringdatarest/TaskmanagerSpringDataRestApplicationTests.java @@ -0,0 +1,13 @@ +package com.scaler.taskmanagerspringdatarest; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TaskmanagerSpringDataRestApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/taskmanager/README.md b/taskmanager/README.md index aa2cd3e..462c584 100644 --- a/taskmanager/README.md +++ b/taskmanager/README.md @@ -20,15 +20,15 @@ task manager + notes support ---- API Endpoints (REST URLs) -GET /tasks get all tasks ✅ -GET /tasks/{id} get a task by id -DELETE /tasks/{id} delete task by id -PATCH /tasks/{id} update details of a task -POST /tasks create a new task ✅ - -GET /tasks/{id}/notes show all notes of a task -POST /tasks/{id}/notes add notes to a task -DELETE /tasks/{id}/notes/{nid} delete a note from a task +GET /tasks get all tasks ✅ +GET /tasks/{id} get a task by id ✅ +DELETE /tasks/{id} delete task by id ✅ +PATCH /tasks/{id} update details of a task ✅ +POST /tasks create a new task ✅ + +GET /tasks/{id}/notes show all notes of a task ✅ +POST /tasks/{id}/notes add notes to a task ✅ +DELETE /tasks/{id}/notes/{nid} delete a note from a task ✅ ---- "idempotent" diff --git a/taskmanager/build.gradle b/taskmanager/build.gradle index 79e1823..d735491 100644 --- a/taskmanager/build.gradle +++ b/taskmanager/build.gradle @@ -6,7 +6,7 @@ plugins { group = 'com.scaler' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '17' +//sourceCompatibility = '17' configurations { compileOnly { @@ -21,6 +21,8 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.6.6' + implementation 'org.springdoc:springdoc-openapi-ui:1.6.6' compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'com.h2database:h2' @@ -33,3 +35,9 @@ dependencies { tasks.named('test') { useJUnitPlatform() } + +java{ + toolchain{ + languageVersion = JavaLanguageVersion.of(17) + } +} diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/QueryConstants.java b/taskmanager/src/main/java/com/scaler/taskmanager/QueryConstants.java new file mode 100644 index 0000000..b6947fe --- /dev/null +++ b/taskmanager/src/main/java/com/scaler/taskmanager/QueryConstants.java @@ -0,0 +1,11 @@ +package com.scaler.taskmanager; + +public interface QueryConstants { + + String FETCH_NOTES_BY_TASKID = "SELECT new com.scaler.taskmanager.notes.NotesResponseBody(" + + "notes.id, notes.body, notes.task.id) FROM NoteEntity notes " + + "WHERE notes.task.id = :taskId" ; + + String DELETE_NOTES_BY_TASKID = "DELETE FROM NoteEntity notes " + + "WHERE notes.task.id = :taskId" ; +} diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/notes/CreateNoteRequestBody.java b/taskmanager/src/main/java/com/scaler/taskmanager/notes/CreateNoteRequestBody.java new file mode 100644 index 0000000..9487d51 --- /dev/null +++ b/taskmanager/src/main/java/com/scaler/taskmanager/notes/CreateNoteRequestBody.java @@ -0,0 +1,12 @@ +package com.scaler.taskmanager.notes; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class CreateNoteRequestBody { + + private String body; + +} diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/notes/NoteEntity.java b/taskmanager/src/main/java/com/scaler/taskmanager/notes/NoteEntity.java index 1ddc244..8e57030 100644 --- a/taskmanager/src/main/java/com/scaler/taskmanager/notes/NoteEntity.java +++ b/taskmanager/src/main/java/com/scaler/taskmanager/notes/NoteEntity.java @@ -10,9 +10,12 @@ @AllArgsConstructor @NoArgsConstructor @Getter -@Entity(name = "notes") +@Entity +@Table(name = "notes") public class NoteEntity { - @Id @GeneratedValue(strategy = GenerationType.SEQUENCE) + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) Long id; @Column(nullable = false) @@ -20,4 +23,9 @@ public class NoteEntity { @ManyToOne TaskEntity task; + + public NoteEntity(String body, TaskEntity task){ + this.body = body; + this.task = task; + } } diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesController.java b/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesController.java new file mode 100644 index 0000000..98f8d54 --- /dev/null +++ b/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesController.java @@ -0,0 +1,61 @@ +package com.scaler.taskmanager.notes; + +import com.scaler.taskmanager.Constants; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.net.URI; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping(path = "/tasks/{id}/notes") +public class NotesController { + + @Autowired + NotesService notesService; + + @PostMapping(path = "") + ResponseEntity createNotes(@PathVariable Long id, @RequestBody CreateNoteRequestBody requestBody){ + NotesResponseBody responseBody = notesService.addNote(requestBody, id); + return null != responseBody ? ResponseEntity.created( + URI.create(Constants.BASE_URL + "/notes/" + responseBody.getId()) + ).body(responseBody) : ResponseEntity.notFound().build(); + } + + @GetMapping(path = "") + ResponseEntity> getNotesByTaskId(@PathVariable Long id){ + List response = notesService.getNotesByTask(id); + return !response.isEmpty() ? ResponseEntity.ok(response) : ResponseEntity.notFound().build(); + } + + @PutMapping(path = "/{noteid}") + ResponseEntity updateNote(@PathVariable Long id, @PathVariable Long noteid, @RequestBody CreateNoteRequestBody requestBody){ + NotesResponseBody response = notesService.updateNote(requestBody, noteid, id); + return null != response ?ResponseEntity.accepted().body(response) : ResponseEntity.notFound().build(); + } + + @DeleteMapping(path = "") + ResponseEntity deleteNotesByTask(@PathVariable Long id){ + boolean removed = notesService.deleteByTask(id); + if(!removed) + return ResponseEntity.notFound().build(); + else + return ResponseEntity.accepted().body(id); + } + + + @DeleteMapping(path = "/{noteid}") + ResponseEntity> deleteParticularNoteForTask(@PathVariable Long id, @PathVariable Long noteid){ + boolean removed = notesService.delete(noteid, id); + if(!removed) + return ResponseEntity.notFound().build(); + else{ + Map response = new HashMap<>(); + response.put(id, noteid); + return ResponseEntity.accepted().body(response); + } + } +} diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesRepository.java b/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesRepository.java index 507770a..ee6c6ec 100644 --- a/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesRepository.java +++ b/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesRepository.java @@ -1,4 +1,22 @@ package com.scaler.taskmanager.notes; -public class NotesRepository { +import com.scaler.taskmanager.Constants; +import com.scaler.taskmanager.QueryConstants; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface NotesRepository extends JpaRepository { + + @Query(value = QueryConstants.FETCH_NOTES_BY_TASKID) + List fetchAllByTaskId(@Param(value = "taskId") Long taskId); + + @Query(value = QueryConstants.DELETE_NOTES_BY_TASKID) + void deleteByTaskId(@Param(value = "taskId") Long taskId); + + } diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesResponseBody.java b/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesResponseBody.java new file mode 100644 index 0000000..ead0f7a --- /dev/null +++ b/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesResponseBody.java @@ -0,0 +1,18 @@ +package com.scaler.taskmanager.notes; + +import lombok.*; + + +@Getter +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class NotesResponseBody { + + private Long id; + + private String body; + + private Long taskId; + +} diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesService.java b/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesService.java new file mode 100644 index 0000000..e96589d --- /dev/null +++ b/taskmanager/src/main/java/com/scaler/taskmanager/notes/NotesService.java @@ -0,0 +1,73 @@ +package com.scaler.taskmanager.notes; + +import com.scaler.taskmanager.tasks.TasksRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class NotesService { + + @Autowired + private NotesRepository notesRepository; + + @Autowired + private TasksRepository tasksRepository; + + + List getNotesByTask(Long taskId){ + return notesRepository.fetchAllByTaskId(taskId); + } + + public NotesResponseBody addNote(CreateNoteRequestBody request, Long taskId){ + if(tasksRepository.existsById(taskId)) + return convertFromEntity(notesRepository.save(convertFromCreateRequestBody(request, taskId))); + else + return null; + } + + public NotesResponseBody updateNote(CreateNoteRequestBody request, Long noteId, Long taskId){ + if(tasksRepository.existsById(taskId)) + if(notesRepository.existsById(noteId)) + return convertFromEntity(notesRepository.save(new NoteEntity(noteId, request.getBody(), tasksRepository.getById(taskId)))); + + return null; + } + + + + public NotesResponseBody convertFromEntity(NoteEntity entity){ + return new NotesResponseBody.NotesResponseBodyBuilder(). + id(entity.getId()). + body(entity.getBody()). + taskId(entity.getTask().getId()).build(); + } + + public NoteEntity convertFromCreateRequestBody(CreateNoteRequestBody requestBody, Long taskId){ + return new NoteEntity(requestBody.getBody(), tasksRepository.getById(taskId)); + } + + + public boolean delete(Long id, Long taskId) { + if(notesRepository.fetchAllByTaskId(taskId).size() > 0) + if(notesRepository.existsById(id)) { + notesRepository.deleteById(id); + return true; + } + + return false; + } + + public boolean deleteByTask(Long id){ + + if(notesRepository.fetchAllByTaskId(id).size() > 0) { + notesRepository.deleteAllByIdInBatch(notesRepository.fetchAllByTaskId(id).stream().map(NotesResponseBody::getId).collect(Collectors.toList())); + return true; + } + + return false; + } +} + diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TaskEntity.java b/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TaskEntity.java index 28c40f4..113ff83 100644 --- a/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TaskEntity.java +++ b/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TaskEntity.java @@ -11,7 +11,8 @@ @AllArgsConstructor @NoArgsConstructor @Getter -@Entity(name = "tasks") +@Entity +@Table(name = "tasks") public class TaskEntity { public TaskEntity(String name) { diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TaskResponseBody.java b/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TaskResponseBody.java new file mode 100644 index 0000000..9737252 --- /dev/null +++ b/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TaskResponseBody.java @@ -0,0 +1,21 @@ +package com.scaler.taskmanager.tasks; + +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDate; + + +@Getter +@Builder +public class TaskResponseBody { + + private Long id; + + private String name; + + private LocalDate dueDate; + + private Boolean status; + +} diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TasksController.java b/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TasksController.java index 91835e3..d6aab72 100644 --- a/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TasksController.java +++ b/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TasksController.java @@ -1,26 +1,33 @@ package com.scaler.taskmanager.tasks; import com.scaler.taskmanager.Constants; +import com.scaler.taskmanager.notes.CreateNoteRequestBody; +import com.scaler.taskmanager.notes.NotesResponseBody; +import com.scaler.taskmanager.notes.NotesService; import org.springframework.http.ResponseEntity; -import org.springframework.scheduling.config.Task; import org.springframework.web.bind.annotation.*; import java.net.URI; -import java.net.http.HttpResponse; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RequestMapping("/tasks") @RestController public class TasksController { private TasksService tasksService; - public TasksController(TasksService tasksService) { + private NotesService notesService; + + public TasksController(TasksService tasksService, NotesService notesService) { this.tasksService = tasksService; + this.notesService = notesService; } @GetMapping("") ResponseEntity> getAllTasks() { - return ResponseEntity.ok(tasksService.getAllTasks()); + List response = tasksService.getAllTasks(); + return !response.isEmpty() ? ResponseEntity.ok(response) : ResponseEntity.notFound().build(); } @PostMapping("") @@ -32,4 +39,21 @@ ResponseEntity createTask(@RequestBody CreateTaskRequestBody body) { URI.create(Constants.BASE_URL + "/tasks/" + savedTask.id) ).body(savedTask); } + + @PutMapping(path = "") + ResponseEntity updateTask(@RequestBody UpdateTaskRequestBody requestBody){ + TaskResponseBody response = tasksService.updateTask(requestBody); + return null != response ? ResponseEntity.accepted().body(response) : ResponseEntity.notFound().build(); + } + + + @DeleteMapping(path = "/{id}") + ResponseEntity deleteTask(@PathVariable Long id){ + boolean removed = tasksService.delete(id); + if(!removed) + return ResponseEntity.notFound().build(); + else + return ResponseEntity.accepted().body(id); + } + } diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TasksService.java b/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TasksService.java index e4f7911..a68c737 100644 --- a/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TasksService.java +++ b/taskmanager/src/main/java/com/scaler/taskmanager/tasks/TasksService.java @@ -1,6 +1,9 @@ package com.scaler.taskmanager.tasks; +import com.scaler.taskmanager.notes.NotesRepository; +import com.scaler.taskmanager.notes.NotesResponseBody; +import com.scaler.taskmanager.notes.NotesService; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; @@ -10,8 +13,14 @@ public class TasksService { private TasksRepository tasksRepo; - public TasksService(TasksRepository tasksRepo) { + private NotesRepository notesRepository; + + private NotesService notesService; + + public TasksService(TasksRepository tasksRepo, NotesRepository notesRepository, NotesService notesService) { this.tasksRepo = tasksRepo; + this.notesRepository = notesRepository; + this.notesService = notesService; } List getAllTasks() { @@ -24,4 +33,32 @@ TaskEntity addNewTask(String taskName) { return savedTask; } + + TaskResponseBody updateTask(UpdateTaskRequestBody requestBody){ + return tasksRepo.existsById(requestBody.getId()) ? convertFromEntity(tasksRepo.save(convertFromUpdateRequestBody(requestBody))) + : null; + } + + TaskEntity convertFromUpdateRequestBody(UpdateTaskRequestBody requestBody){ + return new TaskEntity(requestBody.getId(), requestBody.getName(), requestBody.getDueDate(), requestBody.getStatus()); + } + + TaskResponseBody convertFromEntity(TaskEntity entity){ + return TaskResponseBody.builder(). + id(entity.getId()). + name(entity.getName()). + dueDate(entity.getDueDate()). + status(entity.getStatus()). + build(); + } + + + public boolean delete(Long id) { + if(tasksRepo.existsById(id)){ + tasksRepo.deleteById(id); + notesService.deleteByTask(id); + return true; + }else + return false; + } } diff --git a/taskmanager/src/main/java/com/scaler/taskmanager/tasks/UpdateTaskRequestBody.java b/taskmanager/src/main/java/com/scaler/taskmanager/tasks/UpdateTaskRequestBody.java new file mode 100644 index 0000000..48a6e6c --- /dev/null +++ b/taskmanager/src/main/java/com/scaler/taskmanager/tasks/UpdateTaskRequestBody.java @@ -0,0 +1,20 @@ +package com.scaler.taskmanager.tasks; + +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + +@Getter +@Setter +public class UpdateTaskRequestBody { + + private Long id; + + private String name; + + private LocalDate dueDate; + + private Boolean status; + +} diff --git a/taskmanager/src/main/resources/application.yaml b/taskmanager/src/main/resources/application.yaml index 0079873..2666666 100644 --- a/taskmanager/src/main/resources/application.yaml +++ b/taskmanager/src/main/resources/application.yaml @@ -12,4 +12,4 @@ logging: level: org: hibernate: - SQL: DEBUG \ No newline at end of file + SQL: DEBUG