diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 71aa4a8..85e02d6 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -16,7 +16,7 @@ jobs: uses: s4u/setup-maven-action@v1.12.0 with: checkout-fetch-depth: 0 - java-version: 19 + java-version: 17 maven-version: 3.9.0 java-distribution: "temurin" diff --git a/.gitignore b/.gitignore index e69de29..7439191 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,36 @@ +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/ + +### database ### +db_data/ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..12fbe1e --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# 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. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/README.md b/README.md index 0b57a76..d8da472 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # 🏟️ BattleArena API -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=your-org_battlearena-api&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=your-org_battlearena-api) -[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=your-org_battlearena-api&metric=coverage)](https://sonarcloud.io/summary/new_code?id=your-org_battlearena-api) -[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=your-org_battlearena-api&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=your-org_battlearena-api) -[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=your-org_battlearena-api&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=your-org_battlearena-api) -[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=your-org_battlearena-api&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=your-org_battlearena-api) -[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=your-org_battlearena-api&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=your-org_battlearena-api) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=mayademcom_battlearena-api&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=mayademcom_battlearena-api) +[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=mayademcom_battlearena-api&metric=coverage)](https://sonarcloud.io/summary/new_code?id=mayademcom_battlearena-api) +[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=mayademcom_battlearena-api&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=mayademcom_battlearena-api) +[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=mayademcom_battlearena-api&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=mayademcom_battlearena-api) +[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=mayademcom_battlearena-api&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=mayademcom_battlearena-api) +[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=mayademcom_battlearena-api&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=mayademcom_battlearena-api) **A competitive gaming platform backend built with Spring Boot** @@ -14,13 +14,15 @@ BattleArena is a multiplayer gaming backend system where warriors can battle, bu ## 🎯 Project Overview ### What We're Building + - **Warrior Management**: Player registration, authentication, and profiles - **Battle System**: Real-time competitive matches with ranking -- **Alliance Network**: Social features for building warrior connections +- **Alliance Network**: Social features for building warrior connections - **Arena Leaderboards**: Global and friend-based rankings - **Battle Analytics**: Performance tracking and statistics ### Learning Objectives + - **Spring Boot Development**: REST API design and implementation - **Database Mastery**: PostgreSQL, complex queries, views, and functions - **Modern Patterns**: Service layers, DTOs, and clean architecture @@ -41,6 +43,7 @@ BattleArena is a multiplayer gaming backend system where warriors can battle, bu ## 🚀 Quick Start ### Prerequisites + - Java 17 or higher - Maven 3.6+ - Docker and Docker Compose @@ -48,12 +51,14 @@ BattleArena is a multiplayer gaming backend system where warriors can battle, bu - Your favorite IDE (IntelliJ IDEA recommended) ### 1. Clone the Repository + ```bash git clone cd battlearena-api ``` ### 2. Start the Database + ```bash # Start PostgreSQL in Docker docker-compose up -d @@ -63,6 +68,7 @@ docker-compose logs db ``` ### 3. Run the Application + ```bash # Using Maven ./mvnw spring-boot:run @@ -72,6 +78,7 @@ docker-compose logs db ``` ### 4. Verify Setup + ```bash # Check application status curl http://localhost:8080/api/health @@ -92,6 +99,7 @@ Our database includes these main entities: - **notifications**: System alerts and messages ### Advanced Database Features + - **Views**: `battle_results`, `warrior_statistics`, `arena_leaderboard` - **Functions**: ELO rating calculations, statistics computations - **Triggers**: Automatic warrior stats updates @@ -100,6 +108,7 @@ Our database includes these main entities: ## 🔧 Development Workflow ### Daily Routine + ```bash # Morning sync git pull origin main @@ -113,7 +122,9 @@ docker-compose down ``` ### Database Updates + When someone adds new database changes: + ```bash # Get latest schema changes git pull origin main @@ -127,6 +138,7 @@ docker-compose up -d ## 🔧 Development Workflow ### Daily Routine + ```bash # Morning sync git pull origin main @@ -140,7 +152,9 @@ docker-compose down ``` ### Database Updates + When someone adds new database changes: + ```bash # Get latest schema changes git pull origin main @@ -156,6 +170,7 @@ docker-compose up -d We use [Conventional Commits](https://www.conventionalcommits.org/) for clear and standardized commit messages. #### Commit Message Format + ``` [optional scope]: @@ -165,6 +180,7 @@ We use [Conventional Commits](https://www.conventionalcommits.org/) for clear an ``` #### Types + - **feat**: A new feature for the user - **fix**: A bug fix - **docs**: Documentation only changes @@ -174,6 +190,7 @@ We use [Conventional Commits](https://www.conventionalcommits.org/) for clear an - **chore**: Changes to build process or auxiliary tools #### Examples + ```bash # New feature git commit -m "feat(auth): add JWT token validation" @@ -192,6 +209,7 @@ git commit -m "feat(auth)!: replace basic auth with JWT" ``` #### Scopes (Optional) + - `auth`: Authentication related - `battle`: Battle system features - `alliance`: Social features @@ -200,6 +218,7 @@ git commit -m "feat(auth)!: replace basic auth with JWT" - `config`: Configuration changes ### Creating New Features + 1. Create feature branch: `git checkout -b feat/warrior-achievements` 2. Implement changes (database + code) 3. Use conventional commits for all changes @@ -247,6 +266,7 @@ battlearena-api/ ## 🔌 API Endpoints ### Warrior Management + ``` POST /api/warriors/register # Create new warrior account POST /api/warriors/login # Authenticate warrior @@ -256,6 +276,7 @@ PUT /api/warriors/password # Change password ``` ### Battle System + ``` POST /api/battles # Start new battle POST /api/battles/{id}/result # Submit battle score @@ -265,6 +286,7 @@ GET /api/warriors/statistics # Personal stats ``` ### Social Features + ``` GET /api/warriors/search # Find other warriors POST /api/alliances/request # Send friend request @@ -276,16 +298,19 @@ DELETE /api/alliances/{id} # Remove alliance ## 📚 Learning Resources ### Spring Boot + - [Spring Boot Official Docs](https://spring.io/projects/spring-boot) - [Building REST APIs with Spring Boot](https://spring.io/guides/tutorials/rest/) - [Spring Data JPA Reference](https://spring.io/projects/spring-data-jpa) ### Database + - [PostgreSQL Tutorial](https://www.postgresql.org/docs/15/tutorial.html) - [Database Design Principles](https://www.postgresql.org/docs/15/ddl.html) - [SQL Performance Tips](https://www.postgresql.org/docs/15/performance-tips.html) ### Tools + - [Docker Compose Documentation](https://docs.docker.com/compose/) - [Postman API Testing](https://learning.postman.com/docs/getting-started/introduction/) - [Git Workflow Guide](https://www.atlassian.com/git/tutorials/comparing-workflows) @@ -297,15 +322,18 @@ DELETE /api/alliances/{id} # Remove alliance We use SonarCloud for continuous code quality inspection. All pull requests are automatically analyzed and must pass quality gates before merging. #### Quality Gates + - **Coverage**: Minimum 80% test coverage - **Duplications**: Less than 3% duplicated code - **Maintainability**: Rating A -- **Reliability**: Rating A +- **Reliability**: Rating A - **Security**: Rating A - **Security Hotspots**: All reviewed #### GitHub Actions Workflow + Our CI/CD pipeline automatically: + - Runs unit tests on every push - Performs SonarCloud analysis on PRs - Prevents merging if quality gates fail @@ -313,16 +341,18 @@ Our CI/CD pipeline automatically: - Updates quality badges #### Local SonarCloud Analysis (Optional) + ```bash # Run analysis locally (requires SONAR_TOKEN) ./mvnw clean verify sonar:sonar \ - -Dsonar.projectKey=your-org_battlearena-api \ + -Dsonar.projectKey=mayademcom_battlearena-api \ -Dsonar.organization=your-org \ -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.login=$SONAR_TOKEN ``` #### Quality Guidelines + - Write meaningful unit tests for service layers - Keep methods under 20 lines when possible - Avoid code duplication - use helper methods @@ -331,13 +361,15 @@ Our CI/CD pipeline automatically: - Add JavaDoc comments for public APIs #### SonarCloud Dashboard -View detailed quality reports: [SonarCloud Project Dashboard](https://sonarcloud.io/project/overview?id=your-org_battlearena-api) + +View detailed quality reports: [SonarCloud Project Dashboard](https://sonarcloud.io/project/overview?id=mayademcom_battlearena-api) ## 🚨 Troubleshooting ### Common Issues **Database Connection Failed** + ```bash # Check if database is running docker-compose ps @@ -350,6 +382,7 @@ docker-compose logs db ``` **Application Won't Start** + ```bash # Check Java version java -version @@ -362,6 +395,7 @@ java -version ``` **Port Already in Use** + ```bash # Check what's using port 8080 lsof -i :8080 @@ -377,6 +411,7 @@ server.port=8081 ## 🤝 Contributing ### Code Review Guidelines + - All code must be reviewed by at least one team member - All PRs must pass SonarCloud quality gates - GitHub Actions must pass (tests + quality checks) @@ -385,6 +420,7 @@ server.port=8081 - Include database migrations if schema changes ### Coding Standards + - Follow SonarCloud quality guidelines (see Code Quality section) - Use meaningful variable and method names - Add comments for complex business logic @@ -393,6 +429,7 @@ server.port=8081 - Write unit tests for service layer methods ### Pull Request Process + ```bash # Feature development with conventional commits git checkout -b feat/alliance-system @@ -403,13 +440,14 @@ git push origin feat/alliance-system # Create Pull Request in GitHub # ✅ GitHub Actions (CI) must pass -# ✅ SonarCloud quality gates must pass +# ✅ SonarCloud quality gates must pass # ✅ Code review approval required # ✅ All tests must pass # After approval, merge to main ``` ### Git Workflow Best Practices + - Use descriptive branch names: `feat/warrior-stats`, `fix/login-bug` - Keep commits small and focused - Write clear commit messages using conventional format @@ -431,6 +469,6 @@ Ready to build the ultimate battle arena? Let's create something amazing togethe **Project Team**: Backend Engineering Interns **Duration**: 8 weeks -**Goal**: Build production-ready gaming platform backend +**Goal**: Build production-ready gaming platform backend -*May the best warrior win! ⚔️* \ No newline at end of file +_May the best warrior win! ⚔️_ diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/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.2 +# +# 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:]' +} + +# 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 <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.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${0##*/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 +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : 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.2 +@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) { "/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_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::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 +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -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" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..49bdd49 --- /dev/null +++ b/pom.xml @@ -0,0 +1,86 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.5.4 + + + com.mayadem + battlearena.api + 0.0.1-SNAPSHOT + battlearena.api + Demo project for Spring Boot + + + + + + + + + + + + + + + 17 + mayademcom + mayademcom_battlearena-api + ./target/site/jacoco-aggregate/jacoco.xml + + **/database/** + **/database/**, **/*Application.java,**/config/**,**/dto/**,**/entity/** + src/test/java/**, **/database/** + src/test/java + https://sonarcloud.io + target/classes + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.postgresql + postgresql + runtime + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.springframework.boot + spring-boot-starter-security + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/sonar-project_properties b/sonar-project_properties deleted file mode 100644 index afa9243..0000000 --- a/sonar-project_properties +++ /dev/null @@ -1,36 +0,0 @@ -# SonarCloud Project Configuration - -# Project identification -sonar.projectKey=your-org_battlearena-api -sonar.organization=your-org - -# Project metadata -sonar.projectName=BattleArena API -sonar.projectDescription=A competitive gaming platform backend built with Spring Boot - -# Source and test directories -sonar.sources=src/main/java -sonar.tests=src/test/java - -# Java version -sonar.java.source=17 - -# Code coverage -sonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml -sonar.java.coveragePlugin=jacoco - -# Exclude files from analysis -sonar.exclusions=**/*Application.java,**/config/**,**/dto/**,**/entity/** - -# Test exclusions -sonar.test.exclusions=**/*Test.java,**/*IT.java - -# Quality gate thresholds -sonar.qualitygate.wait=true - -# Language specific settings -sonar.java.binaries=target/classes -sonar.java.test.binaries=target/test-classes - -# Additional settings -sonar.sourceEncoding=UTF-8 \ No newline at end of file diff --git a/src/main/java/com/mayadem/battlearena/api/Application.java b/src/main/java/com/mayadem/battlearena/api/Application.java new file mode 100644 index 0000000..8cbcb85 --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/Application.java @@ -0,0 +1,13 @@ +package com.mayadem.battlearena.api; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} diff --git a/src/main/java/com/mayadem/battlearena/api/config/SecurityConfig.java b/src/main/java/com/mayadem/battlearena/api/config/SecurityConfig.java new file mode 100644 index 0000000..31fd45b --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/config/SecurityConfig.java @@ -0,0 +1,34 @@ +package com.mayadem.battlearena.api.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.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +public class SecurityConfig { + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http + + .csrf(csrf -> csrf.disable()) + + + .authorizeHttpRequests(auth -> auth + + .requestMatchers("/api/warriors/register").permitAll() + + .anyRequest().authenticated() + ); + + return http.build(); + } +} \ No newline at end of file diff --git a/src/main/java/com/mayadem/battlearena/api/controller/HealthController.java b/src/main/java/com/mayadem/battlearena/api/controller/HealthController.java new file mode 100644 index 0000000..a2e2fd2 --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/controller/HealthController.java @@ -0,0 +1,26 @@ +package com.mayadem.battlearena.api.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.mayadem.battlearena.api.dto.HealthStatusDto; +import com.mayadem.battlearena.api.service.HealthService; + +@RestController +@RequestMapping("/api") +public class HealthController { + + private final HealthService healthService; + + + public HealthController(HealthService healthService) { + this.healthService = healthService; + } + + @GetMapping("/health") + public HealthStatusDto healthCheck() { + + return healthService.getHealthStatus(); + } +} \ No newline at end of file diff --git a/src/main/java/com/mayadem/battlearena/api/controller/WarriorController.java b/src/main/java/com/mayadem/battlearena/api/controller/WarriorController.java new file mode 100644 index 0000000..a4cd401 --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/controller/WarriorController.java @@ -0,0 +1,33 @@ +package com.mayadem.battlearena.api.controller; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.mayadem.battlearena.api.dto.WarriorRegistrationRequest; +import com.mayadem.battlearena.api.dto.WarriorResponse; +import com.mayadem.battlearena.api.service.WarriorService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping("/api/warriors") +public class WarriorController { + + private final WarriorService warriorService; + + + public WarriorController(WarriorService warriorService) { + this.warriorService = warriorService; + } + + @PostMapping("/register") + public ResponseEntity registerWarrior(@Valid @RequestBody WarriorRegistrationRequest request) { + + WarriorResponse response = warriorService.registerWarrior(request); + return new ResponseEntity<>(response, HttpStatus.CREATED); + } +} \ No newline at end of file diff --git a/src/main/java/com/mayadem/battlearena/api/dto/ErrorResponseDto.java b/src/main/java/com/mayadem/battlearena/api/dto/ErrorResponseDto.java new file mode 100644 index 0000000..e0e3007 --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/dto/ErrorResponseDto.java @@ -0,0 +1,23 @@ +package com.mayadem.battlearena.api.dto; + +import java.time.Instant; + +public class ErrorResponseDto { + private final int status; + private final String error; + private final String message; + private final Instant timestamp; + + public ErrorResponseDto(int status, String error, String message) { + this.status = status; + this.error = error; + this.message = message; + this.timestamp = Instant.now(); + } + + + public int getStatus() { return status; } + public String getError() { return error; } + public String getMessage() { return message; } + public Instant getTimestamp() { return timestamp; } +} \ No newline at end of file diff --git a/src/main/java/com/mayadem/battlearena/api/dto/HealthStatusDto.java b/src/main/java/com/mayadem/battlearena/api/dto/HealthStatusDto.java new file mode 100644 index 0000000..4e1cdf3 --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/dto/HealthStatusDto.java @@ -0,0 +1,38 @@ +package com.mayadem.battlearena.api.dto; + +import java.time.Instant; + + +public class HealthStatusDto { + + private String status; + private String application; + private String version; + private String database; + private Instant timestamp; + + public HealthStatusDto(String status, String database) { + this.status = status; + this.database = database; + this.application = "BattleArena API"; + this.version = "1.0.0"; + this.timestamp = Instant.now(); + } + + + public String getStatus() { + return status; + } + public String getApplication() { + return application; + } + public String getVersion() { + return version; + } + public String getDatabase() { + return database; + } + public Instant getTimestamp() { + return timestamp; + } +} diff --git a/src/main/java/com/mayadem/battlearena/api/dto/WarriorRegistrationRequest.java b/src/main/java/com/mayadem/battlearena/api/dto/WarriorRegistrationRequest.java new file mode 100644 index 0000000..68780f7 --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/dto/WarriorRegistrationRequest.java @@ -0,0 +1,47 @@ +package com.mayadem.battlearena.api.dto; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class WarriorRegistrationRequest { + + + @NotBlank(message = "Username cannot be empty.") + private String username; + + + @NotBlank(message = "Email cannot be empty.") + @Email(message = "Please provide a valid email address.") + private String email; + + + @NotBlank(message = "Password cannot be empty.") + @Size(min = 8, message = "Password must be at least 8 characters long.") + private String password; + + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/src/main/java/com/mayadem/battlearena/api/dto/WarriorResponse.java b/src/main/java/com/mayadem/battlearena/api/dto/WarriorResponse.java new file mode 100644 index 0000000..65af36d --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/dto/WarriorResponse.java @@ -0,0 +1,36 @@ +package com.mayadem.battlearena.api.dto; + +import com.mayadem.battlearena.api.entity.Warrior; +import java.sql.Timestamp; + +// Bu DTO, şifre gibi hassas bilgileri içermez. +public class WarriorResponse { + + private Long id; + private String username; + private String email; + private String displayName; + private Timestamp createdAt; + + public Long getId() { return id; } + public String getUsername() { return username; } + public String getEmail() { return email; } + public String getDisplayName() { return displayName; } + public Timestamp getCreatedAt() { return createdAt; } + + /** + + * için kullanılır. Bu, çok yaygın ve temiz bir yöntemdir. + * @param warrior Veritabanından gelen Warrior nesnesi. + * @return Dış dünyaya gösterilmeye hazır, güvenli DTO. + */ + public static WarriorResponse fromEntity(Warrior warrior) { + WarriorResponse response = new WarriorResponse(); + response.id = warrior.getId(); + response.username = warrior.getUsername(); + response.email = warrior.getEmail(); + response.displayName = warrior.getDisplayName(); + response.createdAt = warrior.getCreatedAt(); + return response; + } +} \ No newline at end of file diff --git a/src/main/java/com/mayadem/battlearena/api/entity/Warrior.java b/src/main/java/com/mayadem/battlearena/api/entity/Warrior.java new file mode 100644 index 0000000..3dc7746 --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/entity/Warrior.java @@ -0,0 +1,177 @@ +package com.mayadem.battlearena.api.entity; + +import jakarta.persistence.*; +import java.sql.Timestamp; + +@Entity +@Table(name = "warriors") +public class Warrior { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "username", unique = true, nullable = false, length = 50) + private String username; + + @Column(name = "email", unique = true, nullable = false, length = 255) + private String email; + + @Column(name = "password", nullable = false, length = 255) + private String password; + + @Column(name = "display_name", length = 100) + private String displayName; + + @Column(name = "total_battles", columnDefinition = "INTEGER DEFAULT 0") + private int totalBattles; + + @Column(name = "victories", columnDefinition = "INTEGER DEFAULT 0") + private int victories; + + @Column(name = "defeats", columnDefinition = "INTEGER DEFAULT 0") + private int defeats; + + @Column(name = "best_score", columnDefinition = "INTEGER DEFAULT 0") + private int bestScore; + + @Column(name = "rank_points", columnDefinition = "INTEGER DEFAULT 1000") + private int rankPoints; + + @Column(name = "created_at", updatable = false) + private Timestamp createdAt; + + @Column(name = "updated_at") + private Timestamp updatedAt; + + @Column(name = "last_login") + private Timestamp lastLogin; + + @Column(name = "is_active", columnDefinition = "BOOLEAN DEFAULT TRUE") + private boolean isActive; + + @PrePersist + protected void onCreate() { + createdAt = new Timestamp(System.currentTimeMillis()); + updatedAt = new Timestamp(System.currentTimeMillis()); + } + + @PreUpdate + protected void onUpdate() { + updatedAt = new Timestamp(System.currentTimeMillis()); + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public int getTotalBattles() { + return totalBattles; + } + + public void setTotalBattles(int totalBattles) { + this.totalBattles = totalBattles; + } + + public int getVictories() { + return victories; + } + + public void setVictories(int victories) { + this.victories = victories; + } + + public int getDefeats() { + return defeats; + } + + public void setDefeats(int defeats) { + this.defeats = defeats; + } + + public int getBestScore() { + return bestScore; + } + + public void setBestScore(int bestScore) { + this.bestScore = bestScore; + } + + public int getRankPoints() { + return rankPoints; + } + + public void setRankPoints(int rankPoints) { + this.rankPoints = rankPoints; + } + + public Timestamp getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Timestamp createdAt) { + this.createdAt = createdAt; + } + + public Timestamp getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Timestamp updatedAt) { + this.updatedAt = updatedAt; + } + + public Timestamp getLastLogin() { + return lastLogin; + } + + public void setLastLogin(Timestamp lastLogin) { + this.lastLogin = lastLogin; + } + + public boolean isIsActive() { + return isActive; + } + + public void setIsActive(boolean isActive) { + this.isActive = isActive; + } + + +} diff --git a/src/main/java/com/mayadem/battlearena/api/exception/DuplicateResourceException.java b/src/main/java/com/mayadem/battlearena/api/exception/DuplicateResourceException.java new file mode 100644 index 0000000..363aab2 --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/exception/DuplicateResourceException.java @@ -0,0 +1,8 @@ +package com.mayadem.battlearena.api.exception; + + +public class DuplicateResourceException extends RuntimeException { + public DuplicateResourceException(String message) { + super(message); + } +} diff --git a/src/main/java/com/mayadem/battlearena/api/exception/GlobalExceptionHandler.java b/src/main/java/com/mayadem/battlearena/api/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..7651303 --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/exception/GlobalExceptionHandler.java @@ -0,0 +1,25 @@ +package com.mayadem.battlearena.api.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import com.mayadem.battlearena.api.dto.ErrorResponseDto; + +@ControllerAdvice +public class GlobalExceptionHandler { + + + @ExceptionHandler(DuplicateResourceException.class) + public ResponseEntity handleDuplicateResource(DuplicateResourceException ex) { + + ErrorResponseDto errorResponse = new ErrorResponseDto( + HttpStatus.CONFLICT.value(), + "Conflict", + ex.getMessage() + ); + + return new ResponseEntity<>(errorResponse, HttpStatus.CONFLICT); + } +} diff --git a/src/main/java/com/mayadem/battlearena/api/repository/WarriorRepository.java b/src/main/java/com/mayadem/battlearena/api/repository/WarriorRepository.java new file mode 100644 index 0000000..b1ac9fe --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/repository/WarriorRepository.java @@ -0,0 +1,17 @@ +package com.mayadem.battlearena.api.repository; + +import com.mayadem.battlearena.api.entity.Warrior; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface WarriorRepository extends JpaRepository { + + + Optional findByUsername(String username); + + + Optional findByEmail(String email); +} \ No newline at end of file diff --git a/src/main/java/com/mayadem/battlearena/api/service/HealthService.java b/src/main/java/com/mayadem/battlearena/api/service/HealthService.java new file mode 100644 index 0000000..f74cbfc --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/service/HealthService.java @@ -0,0 +1,41 @@ +package com.mayadem.battlearena.api.service; + +import java.sql.Connection; + +import javax.sql.DataSource; + +import org.springframework.stereotype.Service; + +import com.mayadem.battlearena.api.dto.HealthStatusDto; + +@Service +public class HealthService { + + private final DataSource dataSource; + + + public HealthService(DataSource dataSource) { + this.dataSource = dataSource; + } + + public HealthStatusDto getHealthStatus() { + String appStatus = "UP"; + String dbStatus; + + try (Connection connection = dataSource.getConnection()) { + + if (connection.isValid(1)) { + dbStatus = "Connected"; + } else { + dbStatus = "Connection Invalid"; + appStatus = "DOWN"; + } + } catch (Exception e) { + + dbStatus = "Disconnected: " + e.getMessage(); + appStatus = "DOWN"; + } + + return new HealthStatusDto(appStatus, dbStatus); + } +} diff --git a/src/main/java/com/mayadem/battlearena/api/service/WarriorService.java b/src/main/java/com/mayadem/battlearena/api/service/WarriorService.java new file mode 100644 index 0000000..f0c38e9 --- /dev/null +++ b/src/main/java/com/mayadem/battlearena/api/service/WarriorService.java @@ -0,0 +1,53 @@ +package com.mayadem.battlearena.api.service; + +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import com.mayadem.battlearena.api.dto.WarriorRegistrationRequest; +import com.mayadem.battlearena.api.dto.WarriorResponse; +import com.mayadem.battlearena.api.entity.Warrior; +import com.mayadem.battlearena.api.exception.DuplicateResourceException; +import com.mayadem.battlearena.api.repository.WarriorRepository; + +@Service +public class WarriorService { + + private final WarriorRepository warriorRepository; + private final PasswordEncoder passwordEncoder; + + + public WarriorService(WarriorRepository warriorRepository, PasswordEncoder passwordEncoder) { + this.warriorRepository = warriorRepository; + this.passwordEncoder = passwordEncoder; + } + + public WarriorResponse registerWarrior(WarriorRegistrationRequest request) { + + if (warriorRepository.findByUsername(request.getUsername()).isPresent()) { + + throw new DuplicateResourceException("Username '" + request.getUsername() + "' is already taken."); +} + + + if (warriorRepository.findByEmail(request.getEmail()).isPresent()) { + + throw new DuplicateResourceException("Email '" + request.getEmail() + "' is already registered."); +} + + Warrior newWarrior = new Warrior(); + newWarrior.setUsername(request.getUsername()); + newWarrior.setEmail(request.getEmail()); + + + newWarrior.setPassword(passwordEncoder.encode(request.getPassword())); + + + newWarrior.setDisplayName(request.getUsername()); + + + Warrior savedWarrior = warriorRepository.save(newWarrior); + + + return WarriorResponse.fromEntity(savedWarrior); + } +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties new file mode 100644 index 0000000..119807c --- /dev/null +++ b/src/main/resources/application-dev.properties @@ -0,0 +1,9 @@ +#Set detailed logging for our own code +logging.levelcom.mayadem.battlearena=DEBUG + +#Log the SQL statements themselves +logging.level.org.hibernate.SQL=DEBUG + +#Show and format SQL for easy debugging +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.format_sql=true diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 0000000..2dc5ae0 --- /dev/null +++ b/src/main/resources/application-prod.properties @@ -0,0 +1,6 @@ +#Set standart logging level to INFO for our code +logging.level.com.mayadem.battlearena=INFO + +#Do NOT show SQL in production logs for security and performance +spring.jpa.show-sql=false +spring.jpa.properties.hibernate.format_sql=false diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..f470984 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,21 @@ +# Server Port +server.port=8080 + +# Active Profile (dev, prod) +spring.profiles.active=dev + +# Application Info +spring.application.name=BattleArena API +info.app.name=@spring.application.name@ +info.app.version=@project.version@ + +# Common Logging Configuration +logging.level.org.springframework.web=INFO +logging.pattern.console=%d{HH:mm:ss.SSS} [%15.15t] %-5level %-40.40logger{39} : %msg%n + +# Common Database Configuration +spring.datasource.url=jdbc:postgresql://localhost:5432/battlearena +spring.datasource.username=mayadem +spring.datasource.password=mayadem123 +spring.jpa.hibernate.ddl-auto=update +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect diff --git a/src/test/java/com/mayadem/battlearena/api/ApplicationTests.java b/src/test/java/com/mayadem/battlearena/api/ApplicationTests.java new file mode 100644 index 0000000..a43f674 --- /dev/null +++ b/src/test/java/com/mayadem/battlearena/api/ApplicationTests.java @@ -0,0 +1,13 @@ +package com.mayadem.battlearena.api; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ApplicationTests { + + @Test + void contextLoads() { + } + +}