Index: .gitattributes =================================================================== --- .gitattributes (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ .gitattributes (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf Index: .gitignore =================================================================== --- .gitignore (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ .gitignore (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,33 @@ +HELP.md +target/ +.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ Index: .mvn/wrapper/maven-wrapper.properties =================================================================== --- .mvn/wrapper/maven-wrapper.properties (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ .mvn/wrapper/maven-wrapper.properties (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip Index: mvnw =================================================================== --- mvnw (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ mvnw (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" Index: mvnw.cmd =================================================================== --- mvnw.cmd (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ mvnw.cmd (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" Index: pom.xml =================================================================== --- pom.xml (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ pom.xml (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,72 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.5.14 + + + medora + medora5 + 0.0.1-SNAPSHOT + medora5 + medora5 + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web + + + + org.postgresql + postgresql + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + Index: src/main/java/medora/Medora5Application.java =================================================================== --- src/main/java/medora/Medora5Application.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/Medora5Application.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,13 @@ +package medora.medora5; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Medora5Application { + + public static void main(String[] args) { + SpringApplication.run(Medora5Application.class, args); + } + +} Index: src/main/java/medora/config/CorsFilter.java =================================================================== --- src/main/java/medora/config/CorsFilter.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/config/CorsFilter.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,42 @@ +package medora.config; + +import org.springframework.stereotype.Component; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; + +@Component +public class CorsFilter implements Filter { + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException { + + HttpServletRequest httpRequest = (HttpServletRequest) request; + HttpServletResponse httpResponse = (HttpServletResponse) response; + + // Add CORS headers + String origin = httpRequest.getHeader("Origin"); + if (origin != null && (origin.equals("http://localhost:3000") || origin.equals("http://localhost:3001"))) { + httpResponse.setHeader("Access-Control-Allow-Origin", origin); + } + httpResponse.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS"); + httpResponse.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization"); + httpResponse.setHeader("Access-Control-Allow-Credentials", "true"); + httpResponse.setHeader("Access-Control-Max-Age", "3600"); + + // Handle preflight requests + if ("OPTIONS".equalsIgnoreCase(httpRequest.getMethod())) { + httpResponse.setStatus(HttpServletResponse.SC_OK); + return; + } + + chain.doFilter(request, response); + } +} Index: src/main/java/medora/config/SecurityConfig.java =================================================================== --- src/main/java/medora/config/SecurityConfig.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/config/SecurityConfig.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,23 @@ +package medora.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +@EnableWebSecurity +public class SecurityConfig { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http + .csrf(csrf -> csrf.disable()) + .authorizeHttpRequests(auth -> auth + .anyRequest().permitAll() + ); + + return http.build(); + } +} Index: src/main/java/medora/config/WebConfig.java =================================================================== --- src/main/java/medora/config/WebConfig.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/config/WebConfig.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,30 @@ +package medora.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.nio.file.Path; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + Path uploadPath = Path.of("uploads").toAbsolutePath().normalize(); + registry + .addResourceHandler("/uploads/**") + .addResourceLocations(uploadPath.toUri().toString() + "/"); + } + + @Bean + public ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder) { + return builder + .featuresToDisable(SerializationFeature.FAIL_ON_EMPTY_BEANS) + .build(); + } +} Index: src/main/java/medora/models/converter/BloodTypeConverter.java =================================================================== --- src/main/java/medora/models/converter/BloodTypeConverter.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/converter/BloodTypeConverter.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,19 @@ +package medora.models.converter; + +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; +import medora.models.enums.BloodType; + +@Converter(autoApply = true) +public class BloodTypeConverter implements AttributeConverter { + + @Override + public String convertToDatabaseColumn(BloodType attribute) { + return attribute == null ? null : attribute.getValue(); + } + + @Override + public BloodType convertToEntityAttribute(String dbData) { + return dbData == null ? null : BloodType.fromValue(dbData); + } +} Index: src/main/java/medora/models/domain/Admin.java =================================================================== --- src/main/java/medora/models/domain/Admin.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Admin.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,41 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import jakarta.validation.constraints.Pattern; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "admin") +public class Admin { + + @Id + @Column(name = "admin_id") + private Long adminId; + + @Column(name = "username", nullable = false, unique = true) + private String username; + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "lastname", nullable = false) + private String lastname; + + @Pattern(regexp = ".*@adminmedora.*") + @Column(name = "email", nullable = false, unique = true) + private String email; + + public Admin() {} + + public Admin(Long adminId, String username, String name, String lastname, String email) { + this.adminId = adminId; + this.username = username; + this.name = name; + this.lastname = lastname; + this.email = email; + } +} Index: src/main/java/medora/models/domain/Allergies.java =================================================================== --- src/main/java/medora/models/domain/Allergies.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Allergies.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,36 @@ +package medora.models.domain; + + + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import medora.models.enums.AllergySeverity; + +@Getter +@Setter +@Entity +@Table(name = "allergies") +public class Allergies { + + @Id + @Column(name = "allergy_id") + private Long allergyId; + + @NotBlank + @Column(name = "name", nullable = false, unique = true) + private String name; + + @Enumerated(EnumType.STRING) + @Column(name = "allergy_severity", nullable = false) + private AllergySeverity allergySeverity; + + public Allergies() {} + + public Allergies(Long allergyId, String name, AllergySeverity allergySeverity) { + this.allergyId = allergyId; + this.name = name; + this.allergySeverity = allergySeverity; + } +} Index: src/main/java/medora/models/domain/AllergyPrescriptionRestriction.java =================================================================== --- src/main/java/medora/models/domain/AllergyPrescriptionRestriction.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/AllergyPrescriptionRestriction.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,33 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.AllergyPrescriptionRestrictionId; + +@Getter +@Setter +@Entity +@Table(name = "allergy_prescription_restrictions") +@IdClass(AllergyPrescriptionRestrictionId.class) +public class AllergyPrescriptionRestriction { + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "allergy_id", nullable = false) + private Allergies allergy; + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "restriction_id", nullable = false) + private PrescriptionRestriction restriction; + + public AllergyPrescriptionRestriction() {} + + public AllergyPrescriptionRestriction(Allergies allergy, + PrescriptionRestriction restriction) { + this.allergy = allergy; + this.restriction = restriction; + } +} Index: src/main/java/medora/models/domain/Appointment.java =================================================================== --- src/main/java/medora/models/domain/Appointment.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Appointment.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,57 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.enums.AppointmentStatus; + +import java.time.LocalDate; +import java.time.LocalTime; + +@Getter +@Setter +@Entity +@Table(name = "appointments") +public class Appointment { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "appointment_seq") + @SequenceGenerator(name = "appointment_seq", sequenceName = "appointment_id_seq", allocationSize = 1) + @Column(name = "appointment_id") + private Long appointmentId; + + @Column(name = "appointment_date", nullable = false) + private LocalDate appointmentDate; + + @Column(name = "appointment_time", nullable = false) + private LocalTime appointmentTime; + + @Enumerated(EnumType.STRING) + @Column(name = "status", nullable = false) + private AppointmentStatus status; + + @ManyToOne(optional = false) + @JoinColumn(name = "patient_id", nullable = false) + private Patient patient; + + @ManyToOne(optional = false) + @JoinColumn(name = "doctor_id", nullable = false) + private Doctors doctor; + + public Appointment() {} + + public Appointment(Long appointmentId, + LocalDate appointmentDate, + LocalTime appointmentTime, + AppointmentStatus status, + Patient patient, + Doctors doctor) { + + this.appointmentId = appointmentId; + this.appointmentDate = appointmentDate; + this.appointmentTime = appointmentTime; + this.status = status; + this.patient = patient; + this.doctor = doctor; + } +} Index: src/main/java/medora/models/domain/Billing.java =================================================================== --- src/main/java/medora/models/domain/Billing.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Billing.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,61 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import medora.models.enums.PaymentStatus; + +import java.math.BigDecimal; +import java.time.LocalDate; + +@Getter +@Setter +@Entity +@Table(name = "billing") +public class Billing { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bill_seq") + @SequenceGenerator(name = "bill_seq", sequenceName = "bill_id_seq", allocationSize = 1) + @Column(name = "bill_id") + private Long billId; + + @DecimalMin(value = "0.0") + @Column(name = "total_cost", nullable = false) + private BigDecimal totalCost; + + @Enumerated(EnumType.STRING) + @Column(name = "payment_status", nullable = false) + private PaymentStatus paymentStatus; + + @Column(name = "payment_date") + private LocalDate paymentDate; + + @ManyToOne(optional = false) + @JoinColumn(name = "record_id", nullable = false) + private MedicalRecord medicalRecord; + + @ManyToOne(optional = false) + @JoinColumn(name = "admin_id", nullable = false) + private Admin admin; + + public Billing() {} + + public Billing(Long billId, + BigDecimal totalCost, + PaymentStatus paymentStatus, + LocalDate paymentDate, + MedicalRecord medicalRecord, + Admin admin) { + + this.billId = billId; + this.totalCost = totalCost; + this.paymentStatus = paymentStatus; + this.paymentDate = paymentDate; + this.medicalRecord = medicalRecord; + this.admin = admin; + } +} Index: src/main/java/medora/models/domain/BillingLabTests.java =================================================================== --- src/main/java/medora/models/domain/BillingLabTests.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/BillingLabTests.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.BillingLabTestId; + +@Getter +@Setter +@Entity +@Table(name = "billing_lab_tests") +@IdClass(BillingLabTestId.class) +public class BillingLabTests { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "bill_id", nullable = false) + private Billing billing; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "test_id", nullable = false) + private LabTests labTest; + + public BillingLabTests() { + } + + public BillingLabTests(Billing billing, LabTests labTest) { + this.billing = billing; + this.labTest = labTest; + } +} Index: src/main/java/medora/models/domain/BillingProcedures.java =================================================================== --- src/main/java/medora/models/domain/BillingProcedures.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/BillingProcedures.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.BillingProcedureId; + +@Getter +@Setter +@Entity +@Table(name = "billing_procedures") +@IdClass(BillingProcedureId.class) +public class BillingProcedures { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "bill_id", nullable = false) + private Billing billing; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "procedure_id", nullable = false) + private Procedure procedure; + + public BillingProcedures() { + } + + public BillingProcedures(Billing billing, Procedure procedure) { + this.billing = billing; + this.procedure = procedure; + } +} Index: src/main/java/medora/models/domain/DepartmentProcedure.java =================================================================== --- src/main/java/medora/models/domain/DepartmentProcedure.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/DepartmentProcedure.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.DepartmentProcedureId; + +@Getter +@Setter +@Entity +@Table(name = "department_procedures") +@IdClass(DepartmentProcedureId.class) +public class DepartmentProcedure { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "department_id", nullable = false) + private Departments department; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "procedure_id", nullable = false) + private Procedure procedure; + + public DepartmentProcedure() { + } + + public DepartmentProcedure(Departments department, Procedure procedure) { + this.department = department; + this.procedure = procedure; + } +} Index: src/main/java/medora/models/domain/Departments.java =================================================================== --- src/main/java/medora/models/domain/Departments.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Departments.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,25 @@ +package medora.models.domain; +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "departments") +public class Departments { + + @Id + @Column(name = "department_id") + private Long departmentId; + + @Column(name = "department_name", nullable = false, unique = true) + private String departmentName; + + public Departments() {} + + public Departments(Long departmentId, String departmentName) { + this.departmentId = departmentId; + this.departmentName = departmentName; + } +} Index: src/main/java/medora/models/domain/Diagnosis.java =================================================================== --- src/main/java/medora/models/domain/Diagnosis.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Diagnosis.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,47 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "diagnosis") +public class Diagnosis { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "diagnosis_seq") + @SequenceGenerator(name = "diagnosis_seq", sequenceName = "diagnosis_id_seq", allocationSize = 1) + @Column(name = "diagnosis_id") + private Long diagnosisId; + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "description") + private String description; + + @ManyToOne(optional = false) + @JoinColumn(name = "patient_id", nullable = false) + private Patient patient; + + @ManyToOne(optional = false) + @JoinColumn(name = "doctor_id", nullable = false) + private Doctors doctor; + + public Diagnosis() {} + + public Diagnosis(Long diagnosisId, + String name, + String description, + Patient patient, + Doctors doctor) { + + this.diagnosisId = diagnosisId; + this.name = name; + this.description = description; + this.patient = patient; + this.doctor = doctor; + } +} Index: src/main/java/medora/models/domain/DiagnosisProcedure.java =================================================================== --- src/main/java/medora/models/domain/DiagnosisProcedure.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/DiagnosisProcedure.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.DiagnosisProcedureId; + +@Getter +@Setter +@Entity +@Table(name = "diagnosis_procedures") +@IdClass(DiagnosisProcedureId.class) +public class DiagnosisProcedure { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "diagnosis_id", nullable = false) + private Diagnosis diagnosis; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "procedure_id", nullable = false) + private Procedure procedure; + + public DiagnosisProcedure() { + } + + public DiagnosisProcedure(Diagnosis diagnosis, Procedure procedure) { + this.diagnosis = diagnosis; + this.procedure = procedure; + } +} Index: src/main/java/medora/models/domain/DiagnosisSymptoms.java =================================================================== --- src/main/java/medora/models/domain/DiagnosisSymptoms.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/DiagnosisSymptoms.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,33 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.DiagnosisSymptomId; + +@Getter +@Setter +@Entity +@Table(name = "diagnosis_symptoms") +@IdClass(DiagnosisSymptomId.class) +public class DiagnosisSymptoms { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "diagnosis_id", nullable = false) + private Diagnosis diagnosis; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "symptom_id", nullable = false) + private Symptoms symptom; + + public DiagnosisSymptoms() { + } + + public DiagnosisSymptoms(Diagnosis diagnosis, Symptoms symptom) { + this.diagnosis = diagnosis; + this.symptom = symptom; + } +} Index: src/main/java/medora/models/domain/DoctorLevel.java =================================================================== --- src/main/java/medora/models/domain/DoctorLevel.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/DoctorLevel.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,25 @@ +package medora.models.domain; +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "doctor_level") +public class DoctorLevel { + + @Id + @Column(name = "level_id") + private Long levelId; + + @Column(nullable = false, unique = true) + private String level; + + public DoctorLevel() {} + + public DoctorLevel(Long levelId, String level) { + this.levelId = levelId; + this.level = level; + } +} Index: src/main/java/medora/models/domain/DoctorMedicalRecord.java =================================================================== --- src/main/java/medora/models/domain/DoctorMedicalRecord.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/DoctorMedicalRecord.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.DoctorMedicalRecordId; + +@Getter +@Setter +@Entity +@Table(name = "doctor_medical_records") +@IdClass(DoctorMedicalRecordId.class) +public class DoctorMedicalRecord { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "doctor_id", nullable = false) + private Doctors doctor; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "record_id", nullable = false) + private MedicalRecord medicalRecord; + + public DoctorMedicalRecord() { + } + + public DoctorMedicalRecord(Doctors doctor, MedicalRecord medicalRecord) { + this.doctor = doctor; + this.medicalRecord = medicalRecord; + } +} Index: src/main/java/medora/models/domain/DoctorSpecialization.java =================================================================== --- src/main/java/medora/models/domain/DoctorSpecialization.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/DoctorSpecialization.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,25 @@ +package medora.models.domain; +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "doctor_specialization") +public class DoctorSpecialization { + + @Id + @Column(name = "specialization_id") + private Long specializationId; + + @Column(name = "specialization_name", nullable = false, unique = true) + private String specializationName; + + public DoctorSpecialization() {} + + public DoctorSpecialization(Long specializationId, String specializationName) { + this.specializationId = specializationId; + this.specializationName = specializationName; + } +} Index: src/main/java/medora/models/domain/Doctors.java =================================================================== --- src/main/java/medora/models/domain/Doctors.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Doctors.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,52 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "doctors") +public class Doctors { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "doctor_seq") + @SequenceGenerator(name = "doctor_seq", sequenceName = "doctor_id_seq", allocationSize = 1) + @Column(name = "doctor_id") + private Long doctorId; + + @Column(name = "first_name", nullable = false) + private String firstName; + + @Column(name = "last_name", nullable = false) + private String lastName; + + @Column(name = "email_address", nullable = false, unique = true) + private String emailAddress; + + @ManyToOne(optional = false) + @JoinColumn(name = "level_id", nullable = false) + private DoctorLevel level; + + @ManyToOne(optional = false) + @JoinColumn(name = "specialization_id", nullable = false) + private DoctorSpecialization specialization; + + @ManyToOne(optional = false) + @JoinColumn(name = "department_id", nullable = false) + private Departments department; + + public Doctors() {} + + public Doctors(Long doctorId, String firstName, String lastName, String emailAddress, + DoctorLevel level, DoctorSpecialization specialization, Departments department) { + this.doctorId = doctorId; + this.firstName = firstName; + this.lastName = lastName; + this.emailAddress = emailAddress; + this.level = level; + this.specialization = specialization; + this.department = department; + } +} Index: src/main/java/medora/models/domain/LabResults.java =================================================================== --- src/main/java/medora/models/domain/LabResults.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/LabResults.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,45 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + +@Getter +@Setter +@Entity +@Table(name = "lab_results") +public class LabResults { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "result_seq") + @SequenceGenerator(name = "result_seq", sequenceName = "result_id_seq", allocationSize = 1) + @Column(name = "result_id") + private Long resultId; + + @NotBlank + @Column(name = "results", nullable = false, columnDefinition = "TEXT") + private String results; + + @Column(name = "result_date", nullable = false) + private LocalDate resultDate; + + @ManyToOne(optional = false) + @JoinColumn(name = "test_id", nullable = false) + private LabTests labTest; + + public LabResults() {} + + public LabResults(Long resultId, + String results, + LocalDate resultDate, + LabTests labTest) { + + this.resultId = resultId; + this.results = results; + this.resultDate = resultDate; + this.labTest = labTest; + } +} Index: src/main/java/medora/models/domain/LabTechnician.java =================================================================== --- src/main/java/medora/models/domain/LabTechnician.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/LabTechnician.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,41 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import jakarta.validation.constraints.Pattern; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "lab_technician") +public class LabTechnician { + + @Id + @Column(name = "technician_id") + private Long technicianId; + + @Column(name = "username", nullable = false, unique = true) + private String username; + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "lastname", nullable = false) + private String lastname; + + @Pattern(regexp = ".*@labmedora.*") + @Column(name = "email", nullable = false, unique = true) + private String email; + + public LabTechnician() {} + + public LabTechnician(Long technicianId, String username, String name, String lastname, String email) { + this.technicianId = technicianId; + this.username = username; + this.name = name; + this.lastname = lastname; + this.email = email; + } +} Index: src/main/java/medora/models/domain/LabTests.java =================================================================== --- src/main/java/medora/models/domain/LabTests.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/LabTests.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,47 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +import java.math.BigDecimal; + +@Getter +@Setter +@Entity +@Table(name = "lab_tests") +public class LabTests { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "test_seq") + @SequenceGenerator(name = "test_seq", sequenceName = "test_id_seq", allocationSize = 1) + @Column(name = "test_id") + private Long testId; + + @NotBlank + @Column(name = "test_name", nullable = false) + private String testName; + + @Column(name = "description") + private String description; + + @DecimalMin(value = "0.0") + @Column(name = "cost", nullable = false) + private BigDecimal cost; + + public LabTests() {} + + public LabTests(Long testId, + String testName, + String description, + BigDecimal cost) { + + this.testId = testId; + this.testName = testName; + this.description = description; + this.cost = cost; + } +} Index: src/main/java/medora/models/domain/MedicalRecord.java =================================================================== --- src/main/java/medora/models/domain/MedicalRecord.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/MedicalRecord.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,30 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "medical_records") +public class MedicalRecord { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "record_seq") + @SequenceGenerator(name = "record_seq", sequenceName = "record_id_seq", allocationSize = 1) + @Column(name = "record_id") + private Long recordId; + + @ManyToOne(optional = false) + @JoinColumn(name = "patient_id", nullable = false) + private Patient patient; + + public MedicalRecord() {} + + public MedicalRecord(Long recordId, Patient patient) { + this.recordId = recordId; + this.patient = patient; + } +} Index: src/main/java/medora/models/domain/MedicalRecordAllergies.java =================================================================== --- src/main/java/medora/models/domain/MedicalRecordAllergies.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/MedicalRecordAllergies.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,43 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.MedicalRecordAllergyId; + +@Getter +@Setter +@Entity +@Table(name = "medical_record_allergies") +@IdClass(MedicalRecordAllergyId.class) +public class MedicalRecordAllergies { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "record_id", nullable = false) + private MedicalRecord medicalRecord; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "allergy_id", nullable = false) + private Allergies allergy; + + @Column(name = "reaction") + private String reaction; + + @Column(name = "severity") + private String severity; + + public MedicalRecordAllergies() { + } + + public MedicalRecordAllergies(MedicalRecord medicalRecord, + Allergies allergy, + String reaction, + String severity) { + this.medicalRecord = medicalRecord; + this.allergy = allergy; + this.reaction = reaction; + this.severity = severity; + } +} Index: src/main/java/medora/models/domain/MedicalRecordLabResults.java =================================================================== --- src/main/java/medora/models/domain/MedicalRecordLabResults.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/MedicalRecordLabResults.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.MedicalRecordLabResultId; + +@Getter +@Setter +@Entity +@Table(name = "medical_record_lab_results") +@IdClass(MedicalRecordLabResultId.class) +public class MedicalRecordLabResults { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "record_id", nullable = false) + private MedicalRecord medicalRecord; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "result_id", nullable = false) + private LabResults labResult; + + public MedicalRecordLabResults() { + } + + public MedicalRecordLabResults(MedicalRecord medicalRecord, LabResults labResult) { + this.medicalRecord = medicalRecord; + this.labResult = labResult; + } +} Index: src/main/java/medora/models/domain/MedicalRecordProcedureResults.java =================================================================== --- src/main/java/medora/models/domain/MedicalRecordProcedureResults.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/MedicalRecordProcedureResults.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.MedicalRecordProcedureResultId; + +@Getter +@Setter +@Entity +@Table(name = "medical_record_procedure_results") +@IdClass(MedicalRecordProcedureResultId.class) +public class MedicalRecordProcedureResults { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "record_id", nullable = false) + private MedicalRecord medicalRecord; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "result_id", nullable = false) + private ProcedureResults procedureResult; + + public MedicalRecordProcedureResults() { + } + + public MedicalRecordProcedureResults(MedicalRecord medicalRecord, ProcedureResults procedureResult) { + this.medicalRecord = medicalRecord; + this.procedureResult = procedureResult; + } +} Index: src/main/java/medora/models/domain/MedicalRecordProcedures.java =================================================================== --- src/main/java/medora/models/domain/MedicalRecordProcedures.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/MedicalRecordProcedures.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.MedicalRecordProcedureId; + +@Getter +@Setter +@Entity +@Table(name = "medical_record_procedures") +@IdClass(MedicalRecordProcedureId.class) +public class MedicalRecordProcedures { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "record_id", nullable = false) + private MedicalRecord medicalRecord; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "procedure_id", nullable = false) + private Procedure procedure; + + public MedicalRecordProcedures() { + } + + public MedicalRecordProcedures(MedicalRecord medicalRecord, Procedure procedure) { + this.medicalRecord = medicalRecord; + this.procedure = procedure; + } +} Index: src/main/java/medora/models/domain/MedicalRecordSymptoms.java =================================================================== --- src/main/java/medora/models/domain/MedicalRecordSymptoms.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/MedicalRecordSymptoms.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,35 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.MedicalRecordSymptomId; + +@Getter +@Setter +@Entity +@Table(name = "medical_record_symptoms") +@IdClass(MedicalRecordSymptomId.class) +public class MedicalRecordSymptoms { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "record_id", nullable = false) + private MedicalRecord medicalRecord; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + private Symptoms symptom; + + @Column(name = "severity") + private String severity; + + public MedicalRecordSymptoms() { + } + + public MedicalRecordSymptoms(MedicalRecord medicalRecord, Symptoms symptom, String severity) { + this.medicalRecord = medicalRecord; + this.symptom = symptom; + this.severity = severity; + } +} Index: src/main/java/medora/models/domain/MedicalReport.java =================================================================== --- src/main/java/medora/models/domain/MedicalReport.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/MedicalReport.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,53 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; +import java.util.List; +import java.util.ArrayList; + +@Getter +@Setter +@Entity +@Table(name = "medical_report") +public class MedicalReport { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "medical_report_seq") + @SequenceGenerator(name = "medical_report_seq", sequenceName = "medical_report_id_seq", initialValue = 100000, allocationSize = 1) + @Column(name = "report_id") + private Long reportId; + + @NotBlank + @Column(name = "description", nullable = false, columnDefinition = "TEXT") + private String description; + + @Column(name = "report_date", nullable = false) + private LocalDate reportDate; + + @ManyToOne(optional = false) + @JoinColumn(name = "record_id", nullable = false) + private MedicalRecord medicalRecord; + + @ManyToOne(optional = false) + @JoinColumn(name = "doctor_id", nullable = false) + private Doctors doctor; + + public MedicalReport() {} + + public MedicalReport(Long reportId, + String description, + LocalDate reportDate, + MedicalRecord medicalRecord, + Doctors doctor) { + + this.reportId = reportId; + this.description = description; + this.reportDate = reportDate; + this.medicalRecord = medicalRecord; + this.doctor = doctor; + } +} Index: src/main/java/medora/models/domain/MedicalReportLabResults.java =================================================================== --- src/main/java/medora/models/domain/MedicalReportLabResults.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/MedicalReportLabResults.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.MedicalReportLabResultId; + +@Getter +@Setter +@Entity +@Table(name = "medical_report_lab_results") +@IdClass(MedicalReportLabResultId.class) +public class MedicalReportLabResults { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "report_id", nullable = false) + private MedicalReport medicalReport; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "result_id", nullable = false) + private LabResults labResult; + + public MedicalReportLabResults() { + } + + public MedicalReportLabResults(MedicalReport medicalReport, LabResults labResult) { + this.medicalReport = medicalReport; + this.labResult = labResult; + } +} Index: src/main/java/medora/models/domain/Patient.java =================================================================== --- src/main/java/medora/models/domain/Patient.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Patient.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,79 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.enums.BloodType; +import medora.models.enums.Gender; +import com.fasterxml.jackson.annotation.JsonIgnore; + +import java.time.LocalDate; +import java.util.List; + +@Getter +@Setter +@Entity +@Table(name = "patients") + +public class Patient { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "patient_seq") + @SequenceGenerator(name = "patient_seq", sequenceName = "patient_id_seq", allocationSize = 1) + @Column(name = "patient_id") + private Long patientId; + + @Column(name = "first_name", nullable = false) + private String firstName; + + @Column(name = "last_name", nullable = false) + private String lastName; + + @Column(name = "email_address", unique = true) + private String emailAddress; + + @Column(name = "date_of_birth", nullable = false) + private LocalDate dateOfBirth; + + @Convert(converter = medora.models.converter.BloodTypeConverter.class) + @Column(name = "blood_type") + private BloodType bloodType; + + @Enumerated(EnumType.STRING) + @Column(name = "gender") + private Gender gender; + + @Column(name = "phone_number") + private String phoneNumber; + + @Column(name = "embg", nullable = false, unique = true) + private String embg; + + @OneToMany(mappedBy = "patient", cascade = CascadeType.ALL, orphanRemoval = true) + @JsonIgnore + private List medicalRecords; + + public Patient() {} + + public Patient(Long patientId, + String firstName, + String lastName, + String emailAddress, + LocalDate dateOfBirth, + BloodType bloodType, + Gender gender, + String phoneNumber, + String embg) { + + this.patientId = patientId; + this.firstName = firstName; + this.lastName = lastName; + this.emailAddress = emailAddress; + this.dateOfBirth = dateOfBirth; + this.bloodType = bloodType; + this.gender = gender; + this.phoneNumber = phoneNumber; + this.embg = embg; + } +} Index: src/main/java/medora/models/domain/PatientAllergy.java =================================================================== --- src/main/java/medora/models/domain/PatientAllergy.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/PatientAllergy.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.PatientAllergyId; + +@Getter +@Setter +@Entity +@Table(name = "patient_allergies") +@IdClass(PatientAllergyId.class) +public class PatientAllergy { + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "patient_id", nullable = false) + private Patient patient; + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "allergy_id", nullable = false) + private Allergies allergy; + + public PatientAllergy() {} + + public PatientAllergy(Patient patient, Allergies allergy) { + this.patient = patient; + this.allergy = allergy; + } +} Index: src/main/java/medora/models/domain/PatientSymptoms.java =================================================================== --- src/main/java/medora/models/domain/PatientSymptoms.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/PatientSymptoms.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,31 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.PatientSymptomsId; + +@Getter +@Setter +@Entity +@Table(name = "patient_symptoms") +@IdClass(PatientSymptomsId.class) +public class PatientSymptoms { + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "patient_id", nullable = false) + private Patient patient; + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "symptom_id", nullable = false) + private Symptoms symptom; + + public PatientSymptoms() {} + + public PatientSymptoms(Patient patient, Symptoms symptom) { + this.patient = patient; + this.symptom = symptom; + } +} Index: src/main/java/medora/models/domain/PerformedLabTests.java =================================================================== --- src/main/java/medora/models/domain/PerformedLabTests.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/PerformedLabTests.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,60 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + +@Getter +@Setter +@Entity +@Table(name = "performed_lab_tests") +public class PerformedLabTests { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "performed_test_seq") + @SequenceGenerator(name = "performed_test_seq", sequenceName = "performed_test_id_seq", allocationSize = 1) + @Column(name = "performed_test_id") + private Long performedTestId; + + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "test_id", nullable = false) + private LabTests labTest; + + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "patient_id", nullable = false) + private Patient patient; + + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "doctor_id", nullable = false) + private Doctors doctor; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "technician_id") + private LabTechnician technician; + + @Column(name = "test_date", nullable = false) + private LocalDate testDate; + + private String notes; + + public PerformedLabTests() { + } + + public PerformedLabTests(Long performedTestId, + LabTests labTest, + Patient patient, + Doctors doctor, + LabTechnician technician, + LocalDate testDate, + String notes) { + this.performedTestId = performedTestId; + this.labTest = labTest; + this.patient = patient; + this.doctor = doctor; + this.technician = technician; + this.testDate = testDate; + this.notes = notes; + } +} Index: src/main/java/medora/models/domain/PerformedProcedures.java =================================================================== --- src/main/java/medora/models/domain/PerformedProcedures.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/PerformedProcedures.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,60 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + +@Getter +@Setter +@Entity +@Table(name = "performed_procedures") +public class PerformedProcedures { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "performed_id_seq") + @SequenceGenerator(name = "performed_id_seq", sequenceName = "performed_procedures_performed_id_seq", allocationSize = 1) + @Column(name = "performed_id") + private Long performedId; + + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "procedure_id", nullable = false) + private Procedure procedure; + + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "doctor_id", nullable = false) + private Doctors doctor; + + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "patient_id", nullable = false) + private Patient patient; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "diagnosis_id") + private Diagnosis diagnosis; + + @Column(name = "procedure_date", nullable = false) + private LocalDate procedureDate; + + private String notes; + + public PerformedProcedures() { + } + + public PerformedProcedures(Long performedId, + Procedure procedure, + Doctors doctor, + Patient patient, + Diagnosis diagnosis, + LocalDate procedureDate, + String notes) { + this.performedId = performedId; + this.procedure = procedure; + this.doctor = doctor; + this.patient = patient; + this.diagnosis = diagnosis; + this.procedureDate = procedureDate; + this.notes = notes; + } +} Index: src/main/java/medora/models/domain/PrescriptionMedicalRecord.java =================================================================== --- src/main/java/medora/models/domain/PrescriptionMedicalRecord.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/PrescriptionMedicalRecord.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,52 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.PrescriptionMedicalRecordId; + +@Getter +@Setter +@Entity +@Table(name = "prescription_medical_records") +@IdClass(PrescriptionMedicalRecordId.class) +public class PrescriptionMedicalRecord { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "prescription_id", nullable = false) + private Prescriptions prescription; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "record_id", nullable = false) + private MedicalRecord medicalRecord; + + @Column(nullable = false) + private String dosage; + + @Column(nullable = false) + private String frequency; + + @Column(nullable = false) + private String duration; + + private String notes; + + public PrescriptionMedicalRecord() { + } + + public PrescriptionMedicalRecord(Prescriptions prescription, + MedicalRecord medicalRecord, + String dosage, + String frequency, + String duration, + String notes) { + this.prescription = prescription; + this.medicalRecord = medicalRecord; + this.dosage = dosage; + this.frequency = frequency; + this.duration = duration; + this.notes = notes; + } +} Index: src/main/java/medora/models/domain/PrescriptionRestriction.java =================================================================== --- src/main/java/medora/models/domain/PrescriptionRestriction.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/PrescriptionRestriction.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,35 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "prescription_restriction") +public class PrescriptionRestriction { + + @Id + @Column(name = "restriction_id") + private Long restrictionId; + + @NotBlank + @Column(name = "description", nullable = false) + private String description; + + @ManyToOne(optional = false) + @JoinColumn(name = "prescription_id", nullable = false) + private Prescriptions prescription; + + public PrescriptionRestriction() {} + + public PrescriptionRestriction(Long restrictionId, + String description, + Prescriptions prescription) { + this.restrictionId = restrictionId; + this.description = description; + this.prescription = prescription; + } +} Index: src/main/java/medora/models/domain/Prescriptions.java =================================================================== --- src/main/java/medora/models/domain/Prescriptions.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Prescriptions.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,29 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "prescriptions") +public class Prescriptions { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "prescription_seq") + @SequenceGenerator(name = "prescription_seq", sequenceName = "prescription_id_seq", allocationSize = 1) + @Column(name = "prescription_id") + private Long prescriptionId; + + @Column(name = "medication_name", nullable = false) + private String medicationName; + + public Prescriptions() {} + + public Prescriptions(Long prescriptionId, String medicationName) { + this.prescriptionId = prescriptionId; + this.medicationName = medicationName; + } +} Index: src/main/java/medora/models/domain/Procedure.java =================================================================== --- src/main/java/medora/models/domain/Procedure.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Procedure.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,46 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +import java.math.BigDecimal; + +@Getter +@Setter +@Entity +@Table(name = "procedures") +public class Procedure { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "procedure_seq") + @SequenceGenerator(name = "procedure_seq", sequenceName = "procedure_id_seq", allocationSize = 1) + @Column(name = "procedure_id") + private Long procedureId; + + @NotBlank + @Column(name = "procedure_type", nullable = false) + private String procedureType; + + @Column(name = "description", columnDefinition = "TEXT") + private String description; + + @DecimalMin(value = "0.0") + @Column(name = "cost", nullable = false) + private BigDecimal cost; + + public Procedure() {} + + public Procedure(Long procedureId, + String procedureType, + String description, + BigDecimal cost) { + + this.procedureId = procedureId; + this.procedureType = procedureType; + this.description = description; + this.cost = cost; + } +} Index: src/main/java/medora/models/domain/ProcedureResults.java =================================================================== --- src/main/java/medora/models/domain/ProcedureResults.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/ProcedureResults.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,45 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + +@Getter +@Setter +@Entity +@Table(name = "procedure_results") +public class ProcedureResults { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "result_seq") + @SequenceGenerator(name = "result_seq", sequenceName = "procedure_results_result_id_seq", allocationSize = 1) + @Column(name = "result_id") + private Long resultId; + + @Column(name = "result_description") + private String resultDescription; + + @Column(name = "result_date", nullable = false) + private LocalDate resultDate; + + @ManyToOne(optional = false) + @JoinColumn(name = "procedure_id", nullable = false) + private Procedure procedure; + + public ProcedureResults() {} + + public ProcedureResults(Long resultId, + String resultDescription, + LocalDate resultDate, + Procedure procedure) { + + this.resultId = resultId; + this.resultDescription = resultDescription; + this.resultDate = resultDate; + this.procedure = procedure; + } +} Index: src/main/java/medora/models/domain/Referrals.java =================================================================== --- src/main/java/medora/models/domain/Referrals.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Referrals.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,58 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + +@Getter +@Setter +@Entity +@Table(name = "referrals") +public class Referrals { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "referral_seq") + @SequenceGenerator(name = "referral_seq", sequenceName = "referral_id_seq", allocationSize = 1) + @Column(name = "referral_id") + private Long referralId; + + @NotBlank + @Column(name = "reason", nullable = false) + private String reason; + + @Column(name = "referral_date", nullable = false) + private LocalDate referralDate; + + @ManyToOne(optional = false) + @JoinColumn(name = "record_id", nullable = false) + private MedicalRecord medicalRecord; + + @ManyToOne(optional = false) + @JoinColumn(name = "from_doctor_id", nullable = false) + private Doctors fromDoctor; + + @ManyToOne(optional = false) + @JoinColumn(name = "to_doctor_id", nullable = false) + private Doctors toDoctor; + + public Referrals() {} + + public Referrals(Long referralId, + String reason, + LocalDate referralDate, + MedicalRecord medicalRecord, + Doctors fromDoctor, + Doctors toDoctor) { + + this.referralId = referralId; + this.reason = reason; + this.referralDate = referralDate; + this.medicalRecord = medicalRecord; + this.fromDoctor = fromDoctor; + this.toDoctor = toDoctor; + } +} Index: src/main/java/medora/models/domain/ReportAllergy.java =================================================================== --- src/main/java/medora/models/domain/ReportAllergy.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/ReportAllergy.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,30 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "report_allergy") +@IdClass(medora.models.domain.id.ReportAllergyId.class) +public class ReportAllergy { + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "report_id", nullable = false) + private MedicalReport report; + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "allergy_id", nullable = false) + private Allergies allergy; + + public ReportAllergy() {} + + public ReportAllergy(MedicalReport report, Allergies allergy) { + this.report = report; + this.allergy = allergy; + } +} Index: src/main/java/medora/models/domain/ReportDiagnosis.java =================================================================== --- src/main/java/medora/models/domain/ReportDiagnosis.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/ReportDiagnosis.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,30 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "report_diagnosis") +@IdClass(medora.models.domain.id.ReportDiagnosisId.class) +public class ReportDiagnosis { + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "report_id", nullable = false) + private MedicalReport report; + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "diagnosis_id", nullable = false) + private Diagnosis diagnosis; + + public ReportDiagnosis() {} + + public ReportDiagnosis(MedicalReport report, Diagnosis diagnosis) { + this.report = report; + this.diagnosis = diagnosis; + } +} Index: src/main/java/medora/models/domain/ReportPrescription.java =================================================================== --- src/main/java/medora/models/domain/ReportPrescription.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/ReportPrescription.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,30 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "report_prescription") +@IdClass(medora.models.domain.id.ReportPrescriptionId.class) +public class ReportPrescription { + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "report_id", nullable = false) + private MedicalReport report; + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "prescription_id", nullable = false) + private Prescriptions prescription; + + public ReportPrescription() {} + + public ReportPrescription(MedicalReport report, Prescriptions prescription) { + this.report = report; + this.prescription = prescription; + } +} Index: src/main/java/medora/models/domain/ReportSymptom.java =================================================================== --- src/main/java/medora/models/domain/ReportSymptom.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/ReportSymptom.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,30 @@ +package medora.models.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "report_symptom") +@IdClass(medora.models.domain.id.ReportSymptomId.class) +public class ReportSymptom { + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "report_id", nullable = false) + private MedicalReport report; + + @Id + @ManyToOne(optional = false) + @JoinColumn(name = "symptom_id", nullable = false) + private Symptoms symptom; + + public ReportSymptom() {} + + public ReportSymptom(MedicalReport report, Symptoms symptom) { + this.report = report; + this.symptom = symptom; + } +} Index: src/main/java/medora/models/domain/SpecializationProcedure.java =================================================================== --- src/main/java/medora/models/domain/SpecializationProcedure.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/SpecializationProcedure.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,33 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import medora.models.domain.id.SpecializationProcedureId; + +@Getter +@Setter +@Entity +@Table(name = "specialization_procedures") +@IdClass(SpecializationProcedureId.class) +public class SpecializationProcedure { + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "specialization_id", nullable = false) + private DoctorSpecialization specialization; + + @Id + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "procedure_id", nullable = false) + private Procedure procedure; + + public SpecializationProcedure() { + } + + public SpecializationProcedure(DoctorSpecialization specialization, Procedure procedure) { + this.specialization = specialization; + this.procedure = procedure; + } +} Index: src/main/java/medora/models/domain/Symptoms.java =================================================================== --- src/main/java/medora/models/domain/Symptoms.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/Symptoms.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,33 @@ +package medora.models.domain; + + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "symptoms") +public class Symptoms { + + @Id + @Column(name = "symptom_id") + private Long symptomId; + + @NotBlank + @Column(name = "name", nullable = false, unique = true) + private String name; + + @Column(name = "description") + private String description; + + public Symptoms() {} + + public Symptoms(Long symptomId, String name, String description) { + this.symptomId = symptomId; + this.name = name; + this.description = description; + } +} Index: src/main/java/medora/models/domain/id/AllergyPrescriptionRestrictionId.java =================================================================== --- src/main/java/medora/models/domain/id/AllergyPrescriptionRestrictionId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/AllergyPrescriptionRestrictionId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,31 @@ +package medora.models.domain.id; + + +import java.io.Serializable; +import java.util.Objects; + +public class AllergyPrescriptionRestrictionId implements Serializable { + + private Long allergy; + private Long restriction; + + public AllergyPrescriptionRestrictionId() {} + + public AllergyPrescriptionRestrictionId(Long allergy, Long restriction) { + this.allergy = allergy; + this.restriction = restriction; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof AllergyPrescriptionRestrictionId that)) return false; + return Objects.equals(allergy, that.allergy) + && Objects.equals(restriction, that.restriction); + } + + @Override + public int hashCode() { + return Objects.hash(allergy, restriction); + } +} Index: src/main/java/medora/models/domain/id/BillingLabTestId.java =================================================================== --- src/main/java/medora/models/domain/id/BillingLabTestId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/BillingLabTestId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class BillingLabTestId implements Serializable { + + private Long billing; + private Long labTest; + + public BillingLabTestId() { + } + + public BillingLabTestId(Long billing, Long labTest) { + this.billing = billing; + this.labTest = labTest; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof BillingLabTestId that)) return false; + + return Objects.equals(billing, that.billing) + && Objects.equals(labTest, that.labTest); + } + + @Override + public int hashCode() { + return Objects.hash(billing, labTest); + } +} Index: src/main/java/medora/models/domain/id/BillingProcedureId.java =================================================================== --- src/main/java/medora/models/domain/id/BillingProcedureId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/BillingProcedureId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class BillingProcedureId implements Serializable { + + private Long billing; + private Long procedure; + + public BillingProcedureId() { + } + + public BillingProcedureId(Long billing, Long procedure) { + this.billing = billing; + this.procedure = procedure; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof BillingProcedureId that)) return false; + + return Objects.equals(billing, that.billing) + && Objects.equals(procedure, that.procedure); + } + + @Override + public int hashCode() { + return Objects.hash(billing, procedure); + } +} Index: src/main/java/medora/models/domain/id/DepartmentProcedureId.java =================================================================== --- src/main/java/medora/models/domain/id/DepartmentProcedureId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/DepartmentProcedureId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class DepartmentProcedureId implements Serializable { + + private Long department; + private Long procedure; + + public DepartmentProcedureId() { + } + + public DepartmentProcedureId(Long department, Long procedure) { + this.department = department; + this.procedure = procedure; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof DepartmentProcedureId that)) return false; + + return Objects.equals(department, that.department) + && Objects.equals(procedure, that.procedure); + } + + @Override + public int hashCode() { + return Objects.hash(department, procedure); + } +} Index: src/main/java/medora/models/domain/id/DiagnosisProcedureId.java =================================================================== --- src/main/java/medora/models/domain/id/DiagnosisProcedureId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/DiagnosisProcedureId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class DiagnosisProcedureId implements Serializable { + + private Long diagnosis; + private Long procedure; + + public DiagnosisProcedureId() { + } + + public DiagnosisProcedureId(Long diagnosis, Long procedure) { + this.diagnosis = diagnosis; + this.procedure = procedure; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof DiagnosisProcedureId that)) return false; + + return Objects.equals(diagnosis, that.diagnosis) + && Objects.equals(procedure, that.procedure); + } + + @Override + public int hashCode() { + return Objects.hash(diagnosis, procedure); + } +} Index: src/main/java/medora/models/domain/id/DiagnosisSymptomId.java =================================================================== --- src/main/java/medora/models/domain/id/DiagnosisSymptomId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/DiagnosisSymptomId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,31 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class DiagnosisSymptomId implements Serializable { + + private Long diagnosis; + private Long symptom; + + public DiagnosisSymptomId() { + } + + public DiagnosisSymptomId(Long diagnosis, Long symptom) { + this.diagnosis = diagnosis; + this.symptom = symptom; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof DiagnosisSymptomId that)) return false; + return Objects.equals(diagnosis, that.diagnosis) + && Objects.equals(symptom, that.symptom); + } + + @Override + public int hashCode() { + return Objects.hash(diagnosis, symptom); + } +} Index: src/main/java/medora/models/domain/id/DoctorMedicalRecordId.java =================================================================== --- src/main/java/medora/models/domain/id/DoctorMedicalRecordId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/DoctorMedicalRecordId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class DoctorMedicalRecordId implements Serializable { + + private Long doctor; + private Long medicalRecord; + + public DoctorMedicalRecordId() { + } + + public DoctorMedicalRecordId(Long doctor, Long medicalRecord) { + this.doctor = doctor; + this.medicalRecord = medicalRecord; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof DoctorMedicalRecordId that)) return false; + + return Objects.equals(doctor, that.doctor) + && Objects.equals(medicalRecord, that.medicalRecord); + } + + @Override + public int hashCode() { + return Objects.hash(doctor, medicalRecord); + } +} Index: src/main/java/medora/models/domain/id/MedicalRecordAllergyId.java =================================================================== --- src/main/java/medora/models/domain/id/MedicalRecordAllergyId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/MedicalRecordAllergyId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class MedicalRecordAllergyId implements Serializable { + + private Long medicalRecord; + private Long allergy; + + public MedicalRecordAllergyId() { + } + + public MedicalRecordAllergyId(Long medicalRecord, Long allergy) { + this.medicalRecord = medicalRecord; + this.allergy = allergy; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MedicalRecordAllergyId that)) return false; + + return Objects.equals(medicalRecord, that.medicalRecord) + && Objects.equals(allergy, that.allergy); + } + + @Override + public int hashCode() { + return Objects.hash(medicalRecord, allergy); + } +} Index: src/main/java/medora/models/domain/id/MedicalRecordLabResultId.java =================================================================== --- src/main/java/medora/models/domain/id/MedicalRecordLabResultId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/MedicalRecordLabResultId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class MedicalRecordLabResultId implements Serializable { + + private Long medicalRecord; + private Long labResult; + + public MedicalRecordLabResultId() { + } + + public MedicalRecordLabResultId(Long medicalRecord, Long labResult) { + this.medicalRecord = medicalRecord; + this.labResult = labResult; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MedicalRecordLabResultId that)) return false; + + return Objects.equals(medicalRecord, that.medicalRecord) + && Objects.equals(labResult, that.labResult); + } + + @Override + public int hashCode() { + return Objects.hash(medicalRecord, labResult); + } +} Index: src/main/java/medora/models/domain/id/MedicalRecordProcedureId.java =================================================================== --- src/main/java/medora/models/domain/id/MedicalRecordProcedureId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/MedicalRecordProcedureId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class MedicalRecordProcedureId implements Serializable { + + private Long medicalRecord; + private Long procedure; + + public MedicalRecordProcedureId() { + } + + public MedicalRecordProcedureId(Long medicalRecord, Long procedure) { + this.medicalRecord = medicalRecord; + this.procedure = procedure; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MedicalRecordProcedureId that)) return false; + + return Objects.equals(medicalRecord, that.medicalRecord) + && Objects.equals(procedure, that.procedure); + } + + @Override + public int hashCode() { + return Objects.hash(medicalRecord, procedure); + } +} Index: src/main/java/medora/models/domain/id/MedicalRecordProcedureResultId.java =================================================================== --- src/main/java/medora/models/domain/id/MedicalRecordProcedureResultId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/MedicalRecordProcedureResultId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class MedicalRecordProcedureResultId implements Serializable { + + private Long medicalRecord; + private Long procedureResult; + + public MedicalRecordProcedureResultId() { + } + + public MedicalRecordProcedureResultId(Long medicalRecord, Long procedureResult) { + this.medicalRecord = medicalRecord; + this.procedureResult = procedureResult; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MedicalRecordProcedureResultId that)) return false; + + return Objects.equals(medicalRecord, that.medicalRecord) + && Objects.equals(procedureResult, that.procedureResult); + } + + @Override + public int hashCode() { + return Objects.hash(medicalRecord, procedureResult); + } +} Index: src/main/java/medora/models/domain/id/MedicalRecordSymptomId.java =================================================================== --- src/main/java/medora/models/domain/id/MedicalRecordSymptomId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/MedicalRecordSymptomId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class MedicalRecordSymptomId implements Serializable { + + private Long medicalRecord; + private Long symptom; + + public MedicalRecordSymptomId() { + } + + public MedicalRecordSymptomId(Long medicalRecord, Long symptom) { + this.medicalRecord = medicalRecord; + this.symptom = symptom; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MedicalRecordSymptomId that)) return false; + + return Objects.equals(medicalRecord, that.medicalRecord) + && Objects.equals(symptom, that.symptom); + } + + @Override + public int hashCode() { + return Objects.hash(medicalRecord, symptom); + } +} Index: src/main/java/medora/models/domain/id/MedicalReportLabResultId.java =================================================================== --- src/main/java/medora/models/domain/id/MedicalReportLabResultId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/MedicalReportLabResultId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class MedicalReportLabResultId implements Serializable { + + private Long medicalReport; + private Long labResult; + + public MedicalReportLabResultId() { + } + + public MedicalReportLabResultId(Long medicalReport, Long labResult) { + this.medicalReport = medicalReport; + this.labResult = labResult; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MedicalReportLabResultId that)) return false; + + return Objects.equals(medicalReport, that.medicalReport) + && Objects.equals(labResult, that.labResult); + } + + @Override + public int hashCode() { + return Objects.hash(medicalReport, labResult); + } +} Index: src/main/java/medora/models/domain/id/PatientAllergyId.java =================================================================== --- src/main/java/medora/models/domain/id/PatientAllergyId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/PatientAllergyId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,31 @@ +package medora.models.domain.id; + + +import java.io.Serializable; +import java.util.Objects; + +public class PatientAllergyId implements Serializable { + + private Long patient; + private Long allergy; + + public PatientAllergyId() {} + + public PatientAllergyId(Long patient, Long allergy) { + this.patient = patient; + this.allergy = allergy; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof PatientAllergyId that)) return false; + return Objects.equals(patient, that.patient) + && Objects.equals(allergy, that.allergy); + } + + @Override + public int hashCode() { + return Objects.hash(patient, allergy); + } +} Index: src/main/java/medora/models/domain/id/PatientSymptomsId.java =================================================================== --- src/main/java/medora/models/domain/id/PatientSymptomsId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/PatientSymptomsId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,30 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class PatientSymptomsId implements Serializable { + + private Long patient; + private Long symptom; + + public PatientSymptomsId() {} + + public PatientSymptomsId(Long patient, Long symptom) { + this.patient = patient; + this.symptom = symptom; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof PatientSymptomsId that)) return false; + return Objects.equals(patient, that.patient) + && Objects.equals(symptom, that.symptom); + } + + @Override + public int hashCode() { + return Objects.hash(patient, symptom); + } +} Index: src/main/java/medora/models/domain/id/PrescriptionMedicalRecordId.java =================================================================== --- src/main/java/medora/models/domain/id/PrescriptionMedicalRecordId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/PrescriptionMedicalRecordId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,32 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class PrescriptionMedicalRecordId implements Serializable { + + private Long prescription; + private Long medicalRecord; + + public PrescriptionMedicalRecordId() { + } + + public PrescriptionMedicalRecordId(Long prescription, Long medicalRecord) { + this.prescription = prescription; + this.medicalRecord = medicalRecord; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof PrescriptionMedicalRecordId that)) return false; + + return Objects.equals(prescription, that.prescription) + && Objects.equals(medicalRecord, that.medicalRecord); + } + + @Override + public int hashCode() { + return Objects.hash(prescription, medicalRecord); + } +} Index: src/main/java/medora/models/domain/id/ReportAllergyId.java =================================================================== --- src/main/java/medora/models/domain/id/ReportAllergyId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/ReportAllergyId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,29 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class ReportAllergyId implements Serializable { + private Long report; + private Long allergy; + + public ReportAllergyId() {} + + public ReportAllergyId(Long report, Long allergy) { + this.report = report; + this.allergy = allergy; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ReportAllergyId that = (ReportAllergyId) o; + return Objects.equals(report, that.report) && Objects.equals(allergy, that.allergy); + } + + @Override + public int hashCode() { + return Objects.hash(report, allergy); + } +} Index: src/main/java/medora/models/domain/id/ReportDiagnosisId.java =================================================================== --- src/main/java/medora/models/domain/id/ReportDiagnosisId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/ReportDiagnosisId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,29 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class ReportDiagnosisId implements Serializable { + private Long report; + private Long diagnosis; + + public ReportDiagnosisId() {} + + public ReportDiagnosisId(Long report, Long diagnosis) { + this.report = report; + this.diagnosis = diagnosis; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ReportDiagnosisId that = (ReportDiagnosisId) o; + return Objects.equals(report, that.report) && Objects.equals(diagnosis, that.diagnosis); + } + + @Override + public int hashCode() { + return Objects.hash(report, diagnosis); + } +} Index: src/main/java/medora/models/domain/id/ReportPrescriptionId.java =================================================================== --- src/main/java/medora/models/domain/id/ReportPrescriptionId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/ReportPrescriptionId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,29 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class ReportPrescriptionId implements Serializable { + private Long report; + private Long prescription; + + public ReportPrescriptionId() {} + + public ReportPrescriptionId(Long report, Long prescription) { + this.report = report; + this.prescription = prescription; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ReportPrescriptionId that = (ReportPrescriptionId) o; + return Objects.equals(report, that.report) && Objects.equals(prescription, that.prescription); + } + + @Override + public int hashCode() { + return Objects.hash(report, prescription); + } +} Index: src/main/java/medora/models/domain/id/ReportSymptomId.java =================================================================== --- src/main/java/medora/models/domain/id/ReportSymptomId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/ReportSymptomId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,29 @@ +package medora.models.domain.id; + +import java.io.Serializable; +import java.util.Objects; + +public class ReportSymptomId implements Serializable { + private Long report; + private Long symptom; + + public ReportSymptomId() {} + + public ReportSymptomId(Long report, Long symptom) { + this.report = report; + this.symptom = symptom; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ReportSymptomId that = (ReportSymptomId) o; + return Objects.equals(report, that.report) && Objects.equals(symptom, that.symptom); + } + + @Override + public int hashCode() { + return Objects.hash(report, symptom); + } +} Index: src/main/java/medora/models/domain/id/SpecializationProcedureId.java =================================================================== --- src/main/java/medora/models/domain/id/SpecializationProcedureId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/domain/id/SpecializationProcedureId.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,34 @@ +package medora.models.domain.id; + + + +import java.io.Serializable; +import java.util.Objects; + +public class SpecializationProcedureId implements Serializable { + + private Long specialization; + private Long procedure; + + public SpecializationProcedureId() { + } + + public SpecializationProcedureId(Long specialization, Long procedure) { + this.specialization = specialization; + this.procedure = procedure; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof SpecializationProcedureId that)) return false; + + return Objects.equals(specialization, that.specialization) + && Objects.equals(procedure, that.procedure); + } + + @Override + public int hashCode() { + return Objects.hash(specialization, procedure); + } +} Index: src/main/java/medora/models/enums/AllergySeverity.java =================================================================== --- src/main/java/medora/models/enums/AllergySeverity.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/enums/AllergySeverity.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,8 @@ +package medora.models.enums; + +public enum AllergySeverity { + LOW, + MEDIUM, + HIGH, + CRITICAL +} Index: src/main/java/medora/models/enums/AppointmentStatus.java =================================================================== --- src/main/java/medora/models/enums/AppointmentStatus.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/enums/AppointmentStatus.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,8 @@ +package medora.models.enums; + +public enum AppointmentStatus { + SCHEDULED, + COMPLETED, + CANCELLED, + IN_PROGRESS +} Index: src/main/java/medora/models/enums/BloodType.java =================================================================== --- src/main/java/medora/models/enums/BloodType.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/enums/BloodType.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,31 @@ +package medora.models.enums; + +public enum BloodType { + A_POS("A+"), + A_NEG("A-"), + B_POS("B+"), + B_NEG("B-"), + AB_POS("AB+"), + AB_NEG("AB-"), + O_POS("O+"), + O_NEG("O-"); + + private final String value; + + BloodType(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static BloodType fromValue(String value) { + for (BloodType b : values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Invalid blood type: " + value); + } +} Index: src/main/java/medora/models/enums/Gender.java =================================================================== --- src/main/java/medora/models/enums/Gender.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/enums/Gender.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,6 @@ +package medora.models.enums; + +public enum Gender { + MALE, + FEMALE +} Index: src/main/java/medora/models/enums/PaymentStatus.java =================================================================== --- src/main/java/medora/models/enums/PaymentStatus.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/java/medora/models/enums/PaymentStatus.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,7 @@ +package medora.models.enums; + +public enum PaymentStatus { + PENDING, + PAID, + CANCELLED +} Index: src/main/resources/application.properties =================================================================== --- src/main/resources/application.properties (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/main/resources/application.properties (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,1 @@ +spring.application.name=medora5 Index: src/test/java/medora/Medora5ApplicationTests.java =================================================================== --- src/test/java/medora/Medora5ApplicationTests.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) +++ src/test/java/medora/Medora5ApplicationTests.java (revision 500b5beb173aa165bb5ff80d5a89107eddc43c03) @@ -0,0 +1,13 @@ +package medora.medora5; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class Medora5ApplicationTests { + + @Test + void contextLoads() { + } + +}