.gitignore

@@ -23,3 +23,4 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 
+/.idea/

userService/.gitattributes

@@ -0,0 +1,2 @@
+/mvnw text eol=lf
+*.cmd text eol=crlf

userService/.gitignore

@@ -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/

userService/.mvn/wrapper/maven-wrapper.properties

@@ -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.12/apache-maven-3.9.12-bin.zip

userService/README.md

@@ -0,0 +1,100 @@
+# 🚀 USER SERVICE - QUICK START
+
+## 📦 Struktura projektu
+
+```
+userService/
+├── src/
+│   ├── main/
+│   │   ├── java/pl/dmcs/userservice/
+│   │   │   ├── controller/      # REST endpoints
+│   │   │   ├── service/         # Logika biznesowa
+│   │   │   ├── repository/      # Dostęp do BD
+│   │   │   ├── model/           # Encje JPA
+│   │   │   ├── dto/             # Data Transfer Objects
+│   │   │   ├── mapper/          # MapStruct mapery
+│   │   │   ├── exception/       # Global Exception Handler
+│   │   │   └── validation/      # Custom validators
+│   │   └── resources/
+│   │       ├── application.properties
+│   │       └── db/migration/    # Flyway migrations
+│   └── test/
+│       └── java/pl/dmcs/userservice/
+│           ├── controller/      # Testy REST API
+│           ├── dto/             # Testy walidacji DTO
+│           ├── validation/      # Testy walidatorów
+│           └── test/            # Test utilities (TestDataGenerator)
+└── pom.xml
+```
+
+---
+
+## 🗄️ Baza danych
+
+### PostgreSQL
+- **Host**: localhost
+- **Port**: 5432
+- **Database**: user_service_db
+- **User**: postgres
+- **Password**: password
+
+### Migracje (Flyway)
+```
+V1__Initial_schema.sql           → Tworzenie tabel
+```
+
+---
+
+## 🔍 REST API
+
+### User Endpoints
+
+| Metoda | Endpoint | Opis |
+|--------|----------|------|
+| `POST` | `/api/user` | Tworzenie użytkownika |
+| `GET` | `/api/user` | Pobranie wszystkich |
+| `GET` | `/api/user/{id}` | Pobranie po ID |
+| `PUT` | `/api/user/{id}` | Pełna aktualizacja |
+| `PATCH` | `/api/user/{id}` | Częściowa aktualizacja |
+| `DELETE` | `/api/user/{id}` | Usunięcie |
+
+### Transport Endpoints
+
+| Metoda | Endpoint | Opis |
+|--------|----------|------|
+| `POST` | `/api/transport/courier/{courierId}` | Dodaj transport |
+| `GET` | `/api/transport` | Wszystkie transporty |
+| `GET` | `/api/transport/{id}` | Po ID |
+| `PUT` | `/api/transport/{id}` | Aktualizacja |
+| `DELETE` | `/api/transport/{id}` | Usunięcie |
+
+---
+
+## ✅ Walidacja
+
+### Phone Number
+- ✅ TYLKO format `+48XXXXXXXXX` (9 cyfr)
+
+### User Types
+- `CUSTOMER` - Klient
+- `COURIER` - Kurier
+- `ADMIN` - Administrator
+
+### Transport Types
+- `CAR`, `BIKE`, `VAN`, `TRUCK`, `SCOOTER`
+
+---
+
+## 🛠️ Technologie
+
+- **Java 21**
+- **Spring Boot 4.0.3**
+- **PostgreSQL 17**
+- **Flyway** (migracje)
+- **MapStruct** (mapowanie)
+- **Lombok** (boilerplate)
+- **JUnit 5** (testy)
+- **MockMvc** (testy REST)
+- **Faker** (test data)
+
+---

userService/mvnw

@@ -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-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -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 "$@"

userService/mvnw.cmd

@@ -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-<version>,maven-mvnd-<version>-<platform>}/<hash>
+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"

userService/pom.xml

@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>4.0.3</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>pl.dmcs</groupId>
+    <artifactId>userService</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>userService</name>
+    <description>userService</description>
+    <url/>
+    <licenses>
+        <license/>
+    </licenses>
+    <developers>
+        <developer/>
+    </developers>
+    <scm>
+        <connection/>
+        <developerConnection/>
+        <tag/>
+        <url/>
+    </scm>
+    <properties>
+        <java.version>21</java.version>
+        <spring-cloud.version>2025.1.0</spring-cloud.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-flyway</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-database-postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.libphonenumber</groupId>
+            <artifactId>libphonenumber</artifactId>
+            <version>8.13.47</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>1.5.5.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.javafaker</groupId>
+            <artifactId>javafaker</artifactId>
+            <version>1.0.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test-autoconfigure</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers-postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
+            <version>4.0.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </path>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>1.5.5.Final</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

userService/src/main/java/pl/dmcs/userservice/UserServiceApplication.java

@@ -0,0 +1,13 @@
+package pl.dmcs.userservice;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class UserServiceApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(UserServiceApplication.class, args);
+    }
+
+}

userService/src/main/java/pl/dmcs/userservice/config/SecurityConfig.java

@@ -0,0 +1,34 @@
+package pl.dmcs.userservice.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.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig {
+
+    /**
+     * Konfiguracja bezpieczeństwa
+     * Umożliwia dostęp do wszystkich endpointów API bez autentykacji (dev mode)
+     * Gdy Keycloak będzie gotowy, zmień permitAll() na: .requestMatchers("/user/**", "/transport/**").authenticated()
+     */
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http
+            .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+            .authorizeHttpRequests(authz -> authz
+                // Pozwól na dostęp bez autentykacji (DEV MODE)
+                .requestMatchers("/api/user/**", "/api/transport/**").permitAll()
+                // Wszystkie inne żądania wymagają autentykacji
+                .anyRequest().authenticated()
+            )
+            .csrf(csrf -> csrf.disable())  // Wyłącz CSRF dla REST API
+            .cors(cors -> {});  // Włącz CORS
+
+        return http.build();
+    }
+}

userService/src/main/java/pl/dmcs/userservice/controller/TransportController.java

@@ -0,0 +1,87 @@
+
+package pl.dmcs.userservice.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import pl.dmcs.userservice.dto.request.TransportRequest;
+import pl.dmcs.userservice.dto.response.TransportResponse;
+import pl.dmcs.userservice.mapper.TransportMapper;
+import pl.dmcs.userservice.model.Transport;
+import pl.dmcs.userservice.service.TransportService;
+import jakarta.validation.Valid;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/api/transport")
+public class TransportController {
+
+    private final TransportService transportService;
+    private final TransportMapper transportMapper;
+
+    @Autowired
+    public TransportController(TransportService transportService, TransportMapper transportMapper) {
+        this.transportService = transportService;
+        this.transportMapper = transportMapper;
+    }
+
+    @GetMapping
+    public ResponseEntity<List<TransportResponse>> getAllTransports() {
+        List<Transport> transports = transportService.getAllTransports();
+        List<TransportResponse> responses = transports.stream()
+                .map(transportMapper::toResponse)
+                .collect(Collectors.toList());
+        return ResponseEntity.ok(responses);
+    }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<TransportResponse> getTransportById(@PathVariable UUID id) {
+        Transport transport = transportService.getTransportById(id);
+        return ResponseEntity.ok(transportMapper.toResponse(transport));
+    }
+
+    @GetMapping("/courier/{courierId}")
+    public ResponseEntity<List<TransportResponse>> getTransportsByCourierId(@PathVariable UUID courierId) {
+        List<Transport> transports = transportService.getTransportsByCourierId(courierId);
+        List<TransportResponse> responses = transports.stream()
+                .map(transportMapper::toResponse)
+                .collect(Collectors.toList());
+        return ResponseEntity.ok(responses);
+    }
+
+    @PostMapping("/courier/{courierId}")
+    public ResponseEntity<TransportResponse> createTransport(
+            @PathVariable UUID courierId,
+            @Valid @RequestBody TransportRequest request) {
+        Transport transport = transportMapper.toEntity(request);
+        Transport createdTransport = transportService.createTransport(courierId, transport);
+        return ResponseEntity.status(HttpStatus.CREATED).body(transportMapper.toResponse(createdTransport));
+    }
+
+    @PutMapping("/{id}")
+    public ResponseEntity<TransportResponse> updateTransport(
+            @PathVariable UUID id,
+            @Valid @RequestBody TransportRequest request) {
+        Transport updatedTransport = transportService.updateTransport(id, request);
+        return ResponseEntity.ok(transportMapper.toResponse(updatedTransport));
+    }
+
+    @PatchMapping("/{id}")
+    public ResponseEntity<TransportResponse> partialUpdateTransport(
+            @PathVariable UUID id,
+            @Valid @RequestBody TransportRequest request) {
+        Transport updatedTransport = transportService.updateTransport(id, request);
+        return ResponseEntity.ok(transportMapper.toResponse(updatedTransport));
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteTransport(@PathVariable UUID id) {
+        transportService.deleteTransport(id);
+        return ResponseEntity.noContent().build();
+    }
+}
+

userService/src/main/java/pl/dmcs/userservice/controller/UserController.java

@@ -0,0 +1,75 @@
+package pl.dmcs.userservice.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import pl.dmcs.userservice.dto.request.UpdateUserRequest;
+import pl.dmcs.userservice.dto.request.UserRequest;
+import pl.dmcs.userservice.dto.response.UserResponse;
+import pl.dmcs.userservice.mapper.UserMapper;
+import pl.dmcs.userservice.model.User;
+import pl.dmcs.userservice.service.UserService;
+import jakarta.validation.Valid;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/api/user")
+public class UserController {
+
+    private final UserService userService;
+    private final UserMapper userMapper;
+
+    @Autowired
+    public UserController(UserService userService, UserMapper userMapper) {
+        this.userService = userService;
+        this.userMapper = userMapper;
+    }
+
+    @GetMapping
+    public ResponseEntity<List<UserResponse>> getAllUsers() {
+        List<User> users = userService.getAllUsers();
+        List<UserResponse> responses = users.stream()
+                .map(userMapper::toResponse)
+                .collect(Collectors.toList());
+        return ResponseEntity.ok(responses);
+    }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<UserResponse> getUserById(@PathVariable UUID id) {
+        User user = userService.getUserById(id);
+        return ResponseEntity.ok(userMapper.toResponse(user));
+    }
+
+    @PostMapping
+    public ResponseEntity<UserResponse> createUser(@Valid @RequestBody UserRequest request) {
+        User user = userMapper.toEntity(request);
+        User createdUser = userService.createUser(user);
+        return ResponseEntity.status(HttpStatus.CREATED).body(userMapper.toResponse(createdUser));
+    }
+
+    @PutMapping("/{id}")
+    public ResponseEntity<UserResponse> updateUser(
+            @PathVariable UUID id,
+            @Valid @RequestBody UserRequest request) {
+        User updatedUser = userService.updateUserWithPut(id, request);
+        return ResponseEntity.ok(userMapper.toResponse(updatedUser));
+    }
+
+    @PatchMapping("/{id}")
+    public ResponseEntity<UserResponse> partialUpdateUser(
+            @PathVariable UUID id,
+            @Valid @RequestBody UpdateUserRequest request) {
+        User updatedUser = userService.updateUserWithPatch(id, request);
+        return ResponseEntity.ok(userMapper.toResponse(updatedUser));
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteUser(@PathVariable UUID id) {
+        userService.deleteUser(id);
+        return ResponseEntity.noContent().build();
+    }
+}

userService/src/main/java/pl/dmcs/userservice/dto/ErrorResponse.java

@@ -0,0 +1,35 @@
+package pl.dmcs.userservice.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ErrorResponse {
+    private int status;
+    private String message;
+    private String error;
+    private LocalDateTime timestamp;
+    private String path;
+    private List<FieldError> fieldErrors;
+
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    public static class FieldError {
+        private String field;
+        private String message;
+        private Object rejectedValue;
+    }
+}
+

userService/src/main/java/pl/dmcs/userservice/dto/request/TransportRequest.java

@@ -0,0 +1,45 @@
+package pl.dmcs.userservice.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import jakarta.validation.constraints.*;
+import pl.dmcs.userservice.model.TransportType;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class TransportRequest {
+
+    @NotNull(message = "Typ transportu nie może być pusty")
+    private TransportType transportType;
+
+    @NotBlank(message = "Marka pojazdu nie może być pusta")
+    private String brand;
+
+    @NotBlank(message = "Model pojazdu nie może być pusty")
+    private String model;
+
+    @NotBlank(message = "Typ paliwa nie może być pusty")
+    private String fuelType;
+
+    @NotNull(message = "Objętość bagażnika nie może być pusta")
+    @Positive(message = "Objętość bagażnika musi być większa od 0")
+    private Double trunkVolume;
+
+    @NotNull(message = "Pojemność ładunku nie może być pusta")
+    @Positive(message = "Pojemność ładunku musi być większa od 0")
+    private Double cargoCapacity;
+
+    @NotNull(message = "Spalanie nie może być puste")
+    @Positive(message = "Spalanie musi być większe od 0")
+    private Double consumption;
+
+    @NotBlank(message = "Numer rejestracyjny nie może być pusty")
+    private String licensePlate;
+
+    private String color;
+}
+

userService/src/main/java/pl/dmcs/userservice/dto/request/UpdateUserRequest.java

@@ -0,0 +1,36 @@
+package pl.dmcs.userservice.dto.request;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import pl.dmcs.userservice.model.UserType;
+import pl.dmcs.userservice.validation.ValidPhoneNumber;
+
+/**
+ * DTO dla PATCH - wszystkie pola OPCJONALNE
+ * Może się zmienić tylko firstName, reszta zostaje bez zmian
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpdateUserRequest {
+
+    @Size(min = 2, max = 100, message = "Imię musi mieć od 2 do 100 znaków")
+    private String firstName;
+
+    @Size(min = 2, max = 100, message = "Nazwisko musi mieć od 2 do 100 znaków")
+    private String lastName;
+
+    @Email(message = "Email musi być prawidłowy")
+    private String email;
+
+    @ValidPhoneNumber
+    private String phoneNumber;
+
+    private UserType userType;
+}
+

userService/src/main/java/pl/dmcs/userservice/dto/request/UserRequest.java

@@ -0,0 +1,36 @@
+package pl.dmcs.userservice.dto.request;
+
+import pl.dmcs.userservice.model.UserType;
+import pl.dmcs.userservice.validation.ValidPhoneNumber;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import jakarta.validation.constraints.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserRequest {
+
+    @NotBlank(message = "Imię nie może być puste")
+    @Size(min = 2, max = 100, message = "Imię musi mieć od 2 do 100 znaków")
+    private String firstName;
+
+    @NotBlank(message = "Nazwisko nie może być puste")
+    @Size(min = 2, max = 100, message = "Nazwisko musi mieć od 2 do 100 znaków")
+    private String lastName;
+
+    @NotBlank(message = "Email nie może być pusty")
+    @Email(message = "Email musi być prawidłowy")
+    private String email;
+
+    @NotBlank(message = "Numer telefonu nie może być pusty")
+    @ValidPhoneNumber
+    private String phoneNumber;
+
+    @NotNull(message = "Typ użytkownika nie może być pusty")
+    private UserType userType;
+}
+

userService/src/main/java/pl/dmcs/userservice/dto/response/TransportResponse.java

@@ -0,0 +1,27 @@
+package pl.dmcs.userservice.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import pl.dmcs.userservice.model.TransportType;
+import java.util.UUID;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class TransportResponse {
+    private UUID id;
+    private UUID courierId;
+    private TransportType transportType;
+    private String brand;
+    private String model;
+    private String fuelType;
+    private Double trunkVolume;
+    private Double cargoCapacity;
+    private Double consumption;
+    private String licensePlate;
+    private String color;
+}
+

userService/src/main/java/pl/dmcs/userservice/dto/response/UserResponse.java

@@ -0,0 +1,22 @@
+package pl.dmcs.userservice.dto.response;
+
+import pl.dmcs.userservice.model.UserType;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import java.util.UUID;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class UserResponse {
+    private UUID id;
+    private String firstName;
+    private String lastName;
+    private String email;
+    private String phoneNumber;
+    private UserType userType;
+}
+

userService/src/main/java/pl/dmcs/userservice/exception/GlobalExceptionHandler.java

@@ -0,0 +1,147 @@
+package pl.dmcs.userservice.exception;
+
+import org.jspecify.annotations.NonNull;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+import pl.dmcs.userservice.dto.ErrorResponse;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@ControllerAdvice
+public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<ErrorResponse> handleResourceNotFoundException(
+            ResourceNotFoundException ex,
+            WebRequest request) {
+
+        ErrorResponse errorResponse = ErrorResponse.builder()
+                .status(HttpStatus.NOT_FOUND.value())
+                .message(ex.getMessage())
+                .error("Resource Not Found")
+                .timestamp(LocalDateTime.now())
+                .path(request.getDescription(false).replace("uri=", ""))
+                .build();
+
+        return new ResponseEntity<>(errorResponse, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(InvalidOperationException.class)
+    public ResponseEntity<ErrorResponse> handleInvalidOperationException(
+            InvalidOperationException ex,
+            WebRequest request) {
+
+        ErrorResponse errorResponse = ErrorResponse.builder()
+                .status(HttpStatus.BAD_REQUEST.value())
+                .message(ex.getMessage())
+                .error("Invalid Operation")
+                .timestamp(LocalDateTime.now())
+                .path(request.getDescription(false).replace("uri=", ""))
+                .build();
+
+        return new ResponseEntity<>(errorResponse, HttpStatus.BAD_REQUEST);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleMethodArgumentNotValid(
+            MethodArgumentNotValidException ex,
+            @NonNull HttpHeaders headers,
+            @NonNull HttpStatusCode status,
+            WebRequest request) {
+
+        List<ErrorResponse.FieldError> fieldErrors = new ArrayList<>();
+        ex.getBindingResult().getAllErrors().forEach(error -> {
+            String fieldName = ((FieldError) error).getField();
+            String errorMessage = error.getDefaultMessage();
+            Object rejectedValue = ((FieldError) error).getRejectedValue();
+
+            fieldErrors.add(ErrorResponse.FieldError.builder()
+                    .field(fieldName)
+                    .message(errorMessage)
+                    .rejectedValue(rejectedValue)
+                    .build());
+        });
+
+        ErrorResponse errorResponse = ErrorResponse.builder()
+                .status(HttpStatus.BAD_REQUEST.value())
+                .message("Validation failed")
+                .error("Validation Error")
+                .timestamp(LocalDateTime.now())
+                .path(request.getDescription(false).replace("uri=", ""))
+                .fieldErrors(fieldErrors)
+                .build();
+
+        return new ResponseEntity<>(errorResponse, HttpStatus.BAD_REQUEST);
+    }
+
+    @ExceptionHandler(DataIntegrityViolationException.class)
+    public ResponseEntity<ErrorResponse> handleDataIntegrityViolationException(
+            DataIntegrityViolationException ex,
+            WebRequest request) {
+
+        String message = ex.getMostSpecificCause().getMessage();
+        String errorMessage = "Operacja narusza ograniczenia bazy danych";
+        String fieldName = null;
+
+        if (message.contains("users_email_key")) {
+            errorMessage = "Email musi być unikalny - taki email już istnieje";
+            fieldName = "email";
+        } else if (message.contains("users_phone_number_key")) {
+            errorMessage = "Numer telefonu musi być unikalny - taki numer już istnieje";
+            fieldName = "phoneNumber";
+        } else if (message.contains("unique constraint")) {
+            errorMessage = "Wartość musi być unikalna - takie dane już istnieją";
+        } else if (message.contains("not-null constraint")) {
+            errorMessage = "To pole nie może być puste";
+        } else if (message.contains("foreign key constraint")) {
+            errorMessage = "Referencja do powiązanego rekordu jest nieprawidłowa";
+        }
+
+        List<ErrorResponse.FieldError> fieldErrors = new ArrayList<>();
+        if (fieldName != null) {
+            fieldErrors.add(ErrorResponse.FieldError.builder()
+                    .field(fieldName)
+                    .message(errorMessage)
+                    .build());
+        }
+
+        ErrorResponse errorResponse = ErrorResponse.builder()
+                .status(HttpStatus.BAD_REQUEST.value())
+                .message(errorMessage)
+                .error("Data Integrity Violation")
+                .timestamp(LocalDateTime.now())
+                .path(request.getDescription(false).replace("uri=", ""))
+                .fieldErrors(fieldErrors.isEmpty() ? null : fieldErrors)
+                .build();
+
+        return new ResponseEntity<>(errorResponse, HttpStatus.BAD_REQUEST);
+    }
+
+    @ExceptionHandler(Exception.class)
+    public ResponseEntity<ErrorResponse> handleGlobalException(
+            Exception ex,
+            WebRequest request) {
+
+        ErrorResponse errorResponse = ErrorResponse.builder()
+                .status(HttpStatus.INTERNAL_SERVER_ERROR.value())
+                .message("Internal Server Error")
+                .error(ex.getClass().getSimpleName())
+                .timestamp(LocalDateTime.now())
+                .path(request.getDescription(false).replace("uri=", ""))
+                .build();
+
+        return new ResponseEntity<>(errorResponse, HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+}
+

userService/src/main/java/pl/dmcs/userservice/exception/InvalidOperationException.java

@@ -0,0 +1,9 @@
+package pl.dmcs.userservice.exception;
+
+public class InvalidOperationException extends RuntimeException {
+    public InvalidOperationException(String message) {
+        super(message);
+    }
+
+}
+

userService/src/main/java/pl/dmcs/userservice/exception/ResourceNotFoundException.java

@@ -0,0 +1,18 @@
+package pl.dmcs.userservice.exception;
+
+import lombok.Getter;
+
+@Getter
+public class ResourceNotFoundException extends RuntimeException {
+    private final String resourceName;
+    private final String fieldName;
+    private final Object fieldValue;
+
+    public ResourceNotFoundException(String resourceName, String fieldName, Object fieldValue) {
+        super(String.format("%s nie znaleziony: %s = %s", resourceName, fieldName, fieldValue));
+        this.resourceName = resourceName;
+        this.fieldName = fieldName;
+        this.fieldValue = fieldValue;
+    }
+}
+

userService/src/main/java/pl/dmcs/userservice/mapper/TransportMapper.java

@@ -0,0 +1,22 @@
+package pl.dmcs.userservice.mapper;
+
+import org.mapstruct.BeanMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.NullValuePropertyMappingStrategy;
+import pl.dmcs.userservice.dto.request.TransportRequest;
+import pl.dmcs.userservice.dto.response.TransportResponse;
+import pl.dmcs.userservice.model.Transport;
+
+@Mapper(componentModel = "spring")
+public interface TransportMapper {
+
+    Transport toEntity(TransportRequest dto);
+
+    @Mapping(source = "courier.id", target = "courierId")
+    TransportResponse toResponse(Transport entity);
+
+    @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
+    void updateEntityFromDto(TransportRequest dto, @MappingTarget Transport entity);
+}

userService/src/main/java/pl/dmcs/userservice/mapper/UserMapper.java

@@ -0,0 +1,24 @@
+package pl.dmcs.userservice.mapper;
+
+import org.mapstruct.BeanMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.NullValuePropertyMappingStrategy;
+import pl.dmcs.userservice.dto.request.UpdateUserRequest;
+import pl.dmcs.userservice.dto.request.UserRequest;
+import pl.dmcs.userservice.dto.response.UserResponse;
+import pl.dmcs.userservice.model.User;
+
+@Mapper(componentModel = "spring")
+public interface UserMapper {
+
+    User toEntity(UserRequest dto);
+
+    UserResponse toResponse(User entity);
+
+    @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
+    void updateEntityFromDto(UserRequest dto, @MappingTarget User entity);
+
+    @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
+    void updateEntityFromDto(UpdateUserRequest dto, @MappingTarget User entity);
+}

userService/src/main/java/pl/dmcs/userservice/model/ControlledEntity.java

@@ -0,0 +1,34 @@
+package pl.dmcs.userservice.model;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+
+import java.time.Instant;
+import java.util.UUID;
+
+@MappedSuperclass
+@Getter @Setter
+public abstract class ControlledEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    @Column(columnDefinition = "uuid", updatable = false, nullable = false)
+    private UUID id;
+
+    @CreationTimestamp
+    @Column(name = "created_at", updatable = false)
+    private Instant createdAt;
+
+    @UpdateTimestamp
+    @Column(name = "updated_at")
+    private Instant updatedAt;
+
+    @Column(name = "created_by")
+    private String createdBy;
+
+    @Column(name = "updated_by")
+    private String updatedBy;
+}

userService/src/main/java/pl/dmcs/userservice/model/Transport.java

@@ -0,0 +1,37 @@
+package pl.dmcs.userservice.model;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "transports")
+@Getter @Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Transport extends ControlledEntity {
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "courier_id", nullable = false)
+    private User courier;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private TransportType transportType;
+
+    private String brand;
+    private String model;
+
+    private String fuelType;
+
+    private Double trunkVolume;
+    private Double cargoCapacity;
+
+    private Double consumption;
+
+    private String licensePlate;
+    private String color;
+}
+

userService/src/main/java/pl/dmcs/userservice/model/TransportType.java

@@ -0,0 +1,9 @@
+package pl.dmcs.userservice.model;
+
+public enum TransportType {
+    BIKE,
+    SCOOTER,
+    CAR,
+    VAN,
+    TRUCK
+}

userService/src/main/java/pl/dmcs/userservice/model/User.java

@@ -0,0 +1,28 @@
+package pl.dmcs.userservice.model;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import java.util.List;
+
+@Entity
+@Table(name = "users")
+@Getter @Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class User extends ControlledEntity {
+
+    private String firstName;
+    private String lastName;
+    private String phoneNumber;
+    private String email;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private UserType userType;
+
+    @OneToMany(mappedBy = "courier", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<Transport> transports;
+}

userService/src/main/java/pl/dmcs/userservice/model/UserType.java

@@ -0,0 +1,8 @@
+package pl.dmcs.userservice.model;
+
+public enum UserType {
+    CUSTOMER,   // Klient
+    COURIER,    // Kurier
+    ADMIN       // Administrator
+}
+

userService/src/main/java/pl/dmcs/userservice/repository/TransportRepository.java

@@ -0,0 +1,11 @@
+package pl.dmcs.userservice.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import pl.dmcs.userservice.model.Transport;
+import java.util.List;
+import java.util.UUID;
+
+public interface TransportRepository extends JpaRepository<Transport, UUID> {
+    List<Transport> findByCourierId(UUID courierId);
+}
+

userService/src/main/java/pl/dmcs/userservice/repository/UserRepository.java

@@ -0,0 +1,8 @@
+package pl.dmcs.userservice.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import pl.dmcs.userservice.model.User;
+import java.util.UUID;
+
+public interface UserRepository extends JpaRepository<User, UUID> {
+}

userService/src/main/java/pl/dmcs/userservice/service/TransportService.java

@@ -0,0 +1,78 @@
+package pl.dmcs.userservice.service;
+
+import jakarta.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import pl.dmcs.userservice.dto.request.TransportRequest;
+import pl.dmcs.userservice.exception.InvalidOperationException;
+import pl.dmcs.userservice.exception.ResourceNotFoundException;
+import pl.dmcs.userservice.mapper.TransportMapper;
+import pl.dmcs.userservice.model.Transport;
+import pl.dmcs.userservice.model.User;
+import pl.dmcs.userservice.model.UserType;
+import pl.dmcs.userservice.repository.TransportRepository;
+import pl.dmcs.userservice.repository.UserRepository;
+
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class TransportService {
+    private final TransportRepository transportRepository;
+    private final UserRepository userRepository;
+    private final TransportMapper transportMapper;
+
+    @Autowired
+    public TransportService(TransportRepository transportRepository, UserRepository userRepository, TransportMapper transportMapper) {
+        this.transportRepository = transportRepository;
+        this.userRepository = userRepository;
+        this.transportMapper = transportMapper;
+    }
+
+    public List<Transport> getAllTransports() {
+        return transportRepository.findAll();
+    }
+
+    public Transport getTransportById(UUID id) {
+        return transportRepository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException("Transport", "id", id));
+    }
+
+    public List<Transport> getTransportsByCourierId(UUID courierId) {
+        User courier = userRepository.findById(courierId)
+                .orElseThrow(() -> new ResourceNotFoundException("Courier", "id", courierId));
+
+        if (courier.getUserType() != UserType.COURIER) {
+            throw new InvalidOperationException("Użytkownik o id " + courierId + " nie jest kurierem");
+        }
+
+        return transportRepository.findByCourierId(courierId);
+    }
+
+    @Transactional
+    public Transport createTransport(UUID courierId, Transport transport) {
+        User courier = userRepository.findById(courierId)
+                .orElseThrow(() -> new ResourceNotFoundException("Courier", "id", courierId));
+
+        if (courier.getUserType() != UserType.COURIER) {
+            throw new InvalidOperationException("Użytkownik o id " + courierId + " nie jest kurierem");
+        }
+
+        transport.setCourier(courier);
+        return transportRepository.save(transport);
+    }
+
+    @Transactional
+    public Transport updateTransport(UUID id, TransportRequest updateRequest) {
+        Transport existingTransport = getTransportById(id);
+        transportMapper.updateEntityFromDto(updateRequest, existingTransport);
+        return transportRepository.save(existingTransport);
+    }
+
+    @Transactional
+    public void deleteTransport(UUID id) {
+        getTransportById(id);
+        transportRepository.deleteById(id);
+    }
+}
+

userService/src/main/java/pl/dmcs/userservice/service/UserService.java

@@ -0,0 +1,60 @@
+package pl.dmcs.userservice.service;
+
+import jakarta.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import pl.dmcs.userservice.dto.request.UpdateUserRequest;
+import pl.dmcs.userservice.dto.request.UserRequest;
+import pl.dmcs.userservice.exception.ResourceNotFoundException;
+import pl.dmcs.userservice.mapper.UserMapper;
+import pl.dmcs.userservice.model.User;
+import pl.dmcs.userservice.repository.UserRepository;
+
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class UserService {
+    private final UserRepository userRepository;
+    private final UserMapper userMapper;
+
+    @Autowired
+    public UserService(UserRepository userRepository, UserMapper userMapper) {
+        this.userRepository = userRepository;
+        this.userMapper = userMapper;
+    }
+
+    public List<User> getAllUsers() {
+        return userRepository.findAll();
+    }
+
+    public User getUserById(UUID id) {
+        return userRepository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException("User", "id", id));
+    }
+
+    @Transactional
+    public User createUser(User user) {
+        return userRepository.save(user);
+    }
+
+    @Transactional
+    public User updateUserWithPut(UUID id, UserRequest updateRequest) {
+        User existingUser = getUserById(id);
+        userMapper.updateEntityFromDto(updateRequest, existingUser);
+        return userRepository.save(existingUser);
+    }
+
+    @Transactional
+    public User updateUserWithPatch(UUID id, UpdateUserRequest updateRequest) {
+        User existingUser = getUserById(id);
+        userMapper.updateEntityFromDto(updateRequest, existingUser);
+        return userRepository.save(existingUser);
+    }
+
+    @Transactional
+    public void deleteUser(UUID id) {
+        getUserById(id);
+        userRepository.deleteById(id);
+    }
+}

userService/src/main/java/pl/dmcs/userservice/validation/PhoneNumberValidator.java

@@ -0,0 +1,20 @@
+package pl.dmcs.userservice.validation;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+public class PhoneNumberValidator implements ConstraintValidator<ValidPhoneNumber, String> {
+
+    private static final String POLISH_PATTERN = "^\\+48\\d{9}$";
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext context) {
+        if (value == null || value.isBlank()) {
+            return true;
+        }
+
+        String cleanedValue = value.replaceAll("\\s+", "");
+        return cleanedValue.matches(POLISH_PATTERN);
+    }
+}
+

userService/src/main/java/pl/dmcs/userservice/validation/ValidPhoneNumber.java

@@ -0,0 +1,16 @@
+package pl.dmcs.userservice.validation;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import java.lang.annotation.*;
+
+@Documented
+@Constraint(validatedBy = PhoneNumberValidator.class)
+@Target({ElementType.FIELD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ValidPhoneNumber {
+    String message() default "Numer telefonu musi być prawidłowym polskim numerem (+48 lub 0 i 9 cyfr)";
+    Class<?>[] groups() default {};
+    Class<? extends Payload>[] payload() default {};
+}
+

userService/src/main/resources/application.properties

@@ -0,0 +1,29 @@
+server.port=8081
+spring.application.name=user-service
+
+spring.datasource.url=jdbc:postgresql://localhost:5432/user_service_db
+spring.datasource.username=postgres
+spring.datasource.password=postgres
+
+spring.jpa.hibernate.ddl-auto=validate
+spring.jpa.show-sql=true
+
+spring.flyway.enabled=true
+spring.flyway.locations=classpath:db/migration
+spring.flyway.baselineOnMigrate=true
+spring.flyway.clean-on-validation-error=true
+
+
+# spring.jpa.hibernate.ddl-auto=validate
+# spring.jpa.show-sql=false
+# spring.flyway.clean-on-validation-error=false
+
+eureka.client.service-url.defaultZone=http://localhost:8761/eureka/
+eureka.instance.prefer-ip-address=true
+eureka.client.enabled=false
+
+logging.level.root=INFO
+logging.level.pl.dmcs.userservice=DEBUG
+logging.level.org.springframework.web=DEBUG
+logging.level.org.springframework.security=DEBUG
+logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss} - %msg%n

userService/src/main/resources/db/migration/V1__Initial_schema.sql

@@ -0,0 +1,36 @@
+CREATE TABLE users (
+    id UUID PRIMARY KEY,
+    first_name VARCHAR(100) NOT NULL,
+    last_name VARCHAR(100) NOT NULL,
+    phone_number VARCHAR(20) UNIQUE NOT NULL,
+    email VARCHAR(100) UNIQUE NOT NULL,
+    user_type VARCHAR(20) NOT NULL CHECK (user_type IN ('CUSTOMER', 'COURIER', 'ADMIN')),
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    created_by VARCHAR(100),
+    updated_by VARCHAR(100)
+);
+
+CREATE TABLE transports (
+    id UUID PRIMARY KEY,
+    courier_id UUID NOT NULL,
+    transport_type VARCHAR(100) NOT NULL CHECK (transport_type IN ('CAR', 'BIKE', 'VAN', 'TRUCK', 'SCOOTER')),
+    brand VARCHAR(100),
+    model VARCHAR(100),
+    fuel_type VARCHAR(50),
+    trunk_volume DOUBLE PRECISION,
+    cargo_capacity DOUBLE PRECISION,
+    consumption DOUBLE PRECISION,
+    license_plate VARCHAR(20) UNIQUE,
+    color VARCHAR(50),
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    created_by VARCHAR(100),
+    updated_by VARCHAR(100),
+    FOREIGN KEY (courier_id) REFERENCES users(id) ON DELETE CASCADE
+);
+
+CREATE INDEX idx_users_user_type ON users(user_type);
+CREATE INDEX idx_users_email ON users(email);
+CREATE INDEX idx_transports_courier_id ON transports(courier_id);
+CREATE INDEX idx_transports_license_plate ON transports(license_plate);

userService/src/main/resources/db/migration/V2__Insert_test_data.sql

@@ -0,0 +1,16 @@
+TRUNCATE TABLE transports CASCADE;
+TRUNCATE TABLE users CASCADE;
+
+INSERT INTO users (id, first_name, last_name, email, phone_number, user_type, created_at, updated_at, created_by, updated_by) VALUES
+('550e8400-e29b-41d4-a716-446655440000', 'Jan', 'Kowalski', 'jan.kowalski@example.com', '+48501234567', 'CUSTOMER', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SYSTEM', 'SYSTEM'),
+('550e8400-e29b-41d4-a716-446655440001', 'Anna', 'Nowak', 'anna.nowak@example.com', '+48601234567', 'CUSTOMER', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SYSTEM', 'SYSTEM'),
+('550e8400-e29b-41d4-a716-446655440002', 'Piotr', 'Lewandowski', 'piotr.lewandowski@example.com', '+48701234567', 'COURIER', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SYSTEM', 'SYSTEM'),
+('550e8400-e29b-41d4-a716-446655440003', 'Marta', 'Wiśniewska', 'marta.wisniewska@example.com', '+48801234567', 'COURIER', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SYSTEM', 'SYSTEM'),
+('550e8400-e29b-41d4-a716-446655440004', 'Admin', 'User', 'admin@example.com', '+48121234567', 'ADMIN', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SYSTEM', 'SYSTEM');
+
+INSERT INTO transports (id, courier_id, transport_type, brand, model, fuel_type, trunk_volume, cargo_capacity, consumption, license_plate, color, created_at, updated_at, created_by, updated_by) VALUES
+('650e8400-e29b-41d4-a716-446655440000', '550e8400-e29b-41d4-a716-446655440002', 'TRUCK', 'Volvo', 'FH16', 'diesel', 25000.0, 5000.0, 8.5, 'WX0001', 'biały', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SYSTEM', 'SYSTEM'),
+('650e8400-e29b-41d4-a716-446655440001', '550e8400-e29b-41d4-a716-446655440002', 'CAR', 'Mercedes', 'Sprinter', 'diesel', 12000.0, 2000.0, 7.5, 'WX0002', 'czarny', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SYSTEM', 'SYSTEM'),
+('650e8400-e29b-41d4-a716-446655440002', '550e8400-e29b-41d4-a716-446655440003', 'BIKE', 'Specialized', 'Turbo', 'electric', 50.0, 30.0, 0.0, 'WX0003', 'czerwony', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SYSTEM', 'SYSTEM'),
+('650e8400-e29b-41d4-a716-446655440003', '550e8400-e29b-41d4-a716-446655440003', 'VAN', 'Ford', 'Transit', 'petrol', 8000.0, 1500.0, 9.0, 'WX0004', 'biały', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SYSTEM', 'SYSTEM');
+

userService/src/test/java/pl/dmcs/userservice/TestUserServiceApplication.java

@@ -0,0 +1,11 @@
+package pl.dmcs.userservice;
+
+import org.springframework.boot.SpringApplication;
+
+public class TestUserServiceApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.from(UserServiceApplication::main).with(TestcontainersConfiguration.class).run(args);
+    }
+
+}

userService/src/test/java/pl/dmcs/userservice/TestcontainersConfiguration.java

@@ -0,0 +1,18 @@
+package pl.dmcs.userservice;
+
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.context.annotation.Bean;
+import org.testcontainers.postgresql.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
+
+@TestConfiguration(proxyBeanMethods = false)
+class TestcontainersConfiguration {
+
+    @Bean
+    @ServiceConnection
+    PostgreSQLContainer postgresContainer() {
+        return new PostgreSQLContainer(DockerImageName.parse("postgres:n-1"));
+    }
+
+}

userService/src/test/java/pl/dmcs/userservice/controller/TransportControllerTest.java

@@ -0,0 +1,277 @@
+package pl.dmcs.userservice.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import pl.dmcs.userservice.dto.request.TransportRequest;
+import pl.dmcs.userservice.dto.request.UserRequest;
+import pl.dmcs.userservice.model.UserType;
+import pl.dmcs.userservice.test.TestDataGenerator;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.hamcrest.Matchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@Transactional
+@DisplayName("TransportController - Testy REST API")
+class TransportControllerTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    private TransportRequest validTransportRequest;
+    private String courierId;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        UserRequest courierRequest = TestDataGenerator.generateValidCourierRequest();
+
+        var response = mockMvc.perform(post("/api/user")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(courierRequest)))
+                .andExpect(status().isCreated())
+                .andReturn();
+
+        courierId = objectMapper.readTree(response.getResponse().getContentAsString()).get("id").asText();
+        validTransportRequest = TestDataGenerator.generateValidTransportRequest();
+    }
+
+    @Nested
+    @DisplayName("POST /api/transport/courier/{courierId} - Tworzenie transportu")
+    class CreateTransportTests {
+
+        @Test
+        @DisplayName("Powinno utworzyć transport dla prawidłowego kuriera")
+        void shouldCreateTransportForValidCourier() throws Exception {
+            mockMvc.perform(post("/api/transport/courier/" + courierId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isCreated())
+                    .andExpect(jsonPath("$.id").isString())
+                    .andExpect(jsonPath("$.courierId").value(courierId))
+                    .andExpect(jsonPath("$.transportType").value(validTransportRequest.getTransportType().toString()))
+                    .andExpect(jsonPath("$.brand").value(validTransportRequest.getBrand()))
+                    .andExpect(jsonPath("$.model").value(validTransportRequest.getModel()))
+                    .andExpect(jsonPath("$.trunkVolume").value(validTransportRequest.getTrunkVolume()));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 400 gdy transportType jest null")
+        void shouldReturn400WhenTransportTypeIsNull() throws Exception {
+            validTransportRequest.setTransportType(null);
+
+            mockMvc.perform(post("/api/transport/courier/" + courierId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.fieldErrors[0].field").value("transportType"));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 400 gdy brand jest pusty")
+        void shouldReturn400WhenBrandIsEmpty() throws Exception {
+            validTransportRequest.setBrand("");
+
+            mockMvc.perform(post("/api/transport/courier/" + courierId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.fieldErrors[0].field").value("brand"));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 400 gdy trunkVolume <= 0")
+        void shouldReturn400WhenTrunkVolumeIsZero() throws Exception {
+            validTransportRequest.setTrunkVolume(0.0);
+
+            mockMvc.perform(post("/api/transport/courier/" + courierId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.fieldErrors[*].field", hasItem("trunkVolume")))
+                    .andExpect(jsonPath("$.fieldErrors[*].message", hasItem(containsString("większa od 0"))));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 400 gdy cargoCapacity <= 0")
+        void shouldReturn400WhenCargoCapacityIsNegative() throws Exception {
+            validTransportRequest.setCargoCapacity(-100.0);
+
+            mockMvc.perform(post("/api/transport/courier/" + courierId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.fieldErrors[*].field", hasItem("cargoCapacity")));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 404 gdy kurier nie istnieje")
+        void shouldReturn404WhenCourierNotFound() throws Exception {
+            mockMvc.perform(post("/api/transport/courier/" + UUID.randomUUID())
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isNotFound());
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 400 gdy użytkownik nie jest kurierem")
+        void shouldReturn400WhenUserIsNotCourier() throws Exception {
+            UserRequest customerRequest = TestDataGenerator.generateValidUserRequest(UserType.CUSTOMER);
+
+            var response = mockMvc.perform(post("/api/user")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(customerRequest)))
+                    .andExpect(status().isCreated())
+                    .andReturn();
+
+            String customerId = objectMapper.readTree(response.getResponse().getContentAsString()).get("id").asText();
+
+            mockMvc.perform(post("/api/transport/courier/" + customerId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.status").value(400))
+                    .andExpect(jsonPath("$.error").value("Invalid Operation"));
+        }
+    }
+
+    @Nested
+    @DisplayName("GET /api/transport - Pobieranie transportów")
+    class GetTransportTests {
+
+        private String transportId;
+
+        @BeforeEach
+        void createTransport() throws Exception {
+            var response = mockMvc.perform(post("/api/transport/courier/" + courierId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isCreated())
+                    .andReturn();
+
+            transportId = objectMapper.readTree(response.getResponse().getContentAsString()).get("id").asText();
+        }
+
+        @Test
+        @DisplayName("Powinno pobrać listę wszystkich transportów")
+        void shouldGetAllTransports() throws Exception {
+            mockMvc.perform(get("/api/transport"))
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$", isA(List.class)));
+        }
+
+        @Test
+        @DisplayName("Powinno pobrać transport po ID")
+        void shouldGetTransportById() throws Exception {
+            mockMvc.perform(get("/api/transport/" + transportId))
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$.id").value(transportId))
+                    .andExpect(jsonPath("$.brand").value(validTransportRequest.getBrand()))
+                    .andExpect(jsonPath("$.courierId").value(courierId));
+        }
+
+        @Test
+        @DisplayName("Powinno pobrać transporty konkretnego kuriera")
+        void shouldGetTransportsByCourierId() throws Exception {
+            mockMvc.perform(get("/api/transport/courier/" + courierId))
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$", isA(List.class)))
+                    .andExpect(jsonPath("$[0].courierId").value(courierId));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 404 gdy transport nie istnieje")
+        void shouldReturn404WhenTransportNotFound() throws Exception {
+            mockMvc.perform(get("/api/transport/" + UUID.randomUUID()))
+                    .andExpect(status().isNotFound())
+                    .andExpect(jsonPath("$.status").value(404))
+                    .andExpect(jsonPath("$.error").value("Resource Not Found"));
+        }
+    }
+
+    @Nested
+    @DisplayName("PUT /api/transport/{id} - Aktualizacja transportu")
+    class UpdateTransportTests {
+
+        private String transportId;
+
+        @BeforeEach
+        void createTransport() throws Exception {
+            var response = mockMvc.perform(post("/api/transport/courier/" + courierId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isCreated())
+                    .andReturn();
+
+            transportId = objectMapper.readTree(response.getResponse().getContentAsString()).get("id").asText();
+        }
+
+        @Test
+        @DisplayName("Powinno zaktualizować transport")
+        void shouldUpdateTransport() throws Exception {
+            validTransportRequest.setColor("czarny");
+            validTransportRequest.setConsumption(9.2);
+
+            mockMvc.perform(put("/api/transport/" + transportId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$.color").value("czarny"))
+                    .andExpect(jsonPath("$.consumption").value(9.2));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 404 gdy transport nie istnieje")
+        void shouldReturn404WhenTransportNotFound() throws Exception {
+            mockMvc.perform(put("/api/transport/" + UUID.randomUUID())
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isNotFound());
+        }
+    }
+
+    @Nested
+    @DisplayName("DELETE /api/transport/{id} - Usunięcie transportu")
+    class DeleteTransportTests {
+
+        private String transportId;
+
+        @BeforeEach
+        void createTransport() throws Exception {
+            var response = mockMvc.perform(post("/api/transport/courier/" + courierId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validTransportRequest)))
+                    .andExpect(status().isCreated())
+                    .andReturn();
+
+            transportId = objectMapper.readTree(response.getResponse().getContentAsString()).get("id").asText();
+        }
+
+        @Test
+        @DisplayName("Powinno usunąć transport (204 No Content)")
+        void shouldDeleteTransport() throws Exception {
+            mockMvc.perform(delete("/api/transport/" + transportId))
+                    .andExpect(status().isNoContent());
+
+            mockMvc.perform(get("/api/transport/" + transportId))
+                    .andExpect(status().isNotFound());
+        }
+    }
+}
+

userService/src/test/java/pl/dmcs/userservice/controller/UserControllerTest.java

@@ -0,0 +1,303 @@
+package pl.dmcs.userservice.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import pl.dmcs.userservice.dto.request.UpdateUserRequest;
+import pl.dmcs.userservice.dto.request.UserRequest;
+import pl.dmcs.userservice.test.TestDataGenerator;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.hamcrest.Matchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@Transactional
+@DisplayName("UserController - Testy REST API")
+class UserControllerTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    private UserRequest validUserRequest;
+
+    @BeforeEach
+    void setUp() {
+        validUserRequest = TestDataGenerator.generateValidCustomerRequest();
+    }
+
+    @Nested
+    @DisplayName("POST /api/user - Tworzenie użytkownika")
+    class CreateUserTests {
+
+        @Test
+        @DisplayName("Powinno utworzyć użytkownika z prawidłowymi danymi")
+        void shouldCreateUserWithValidData() throws Exception {
+            mockMvc.perform(post("/api/user")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validUserRequest)))
+                    .andExpect(status().isCreated())
+                    .andExpect(jsonPath("$.id").isString())
+                    .andExpect(jsonPath("$.firstName").value(validUserRequest.getFirstName()))
+                    .andExpect(jsonPath("$.lastName").value(validUserRequest.getLastName()))
+                    .andExpect(jsonPath("$.email").value(validUserRequest.getEmail()))
+                    .andExpect(jsonPath("$.phoneNumber").value(validUserRequest.getPhoneNumber()))
+                    .andExpect(jsonPath("$.userType").value(validUserRequest.getUserType().toString()));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 400 gdy firstName ma <2 znaki")
+        void shouldReturn400WhenFirstNameTooShort() throws Exception {
+            validUserRequest.setFirstName("A");
+
+            mockMvc.perform(post("/api/user")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validUserRequest)))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.fieldErrors[*].field", hasItem("firstName")))
+                    .andExpect(jsonPath("$.fieldErrors[*].message", hasItem(containsString("2 do 100"))));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 400 gdy email jest nieprawidłowy")
+        void shouldReturn400WhenEmailIsInvalid() throws Exception {
+            validUserRequest.setEmail("invalid-email");
+
+            mockMvc.perform(post("/api/user")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validUserRequest)))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.fieldErrors[0].field").value("email"))
+                    .andExpect(jsonPath("$.fieldErrors[0].message").value("Email musi być prawidłowy"));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 400 gdy numer telefonu jest nieprawidłowy")
+        void shouldReturn400WhenPhoneNumberIsInvalid() throws Exception {
+            validUserRequest.setPhoneNumber("123456");
+
+            mockMvc.perform(post("/api/user")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validUserRequest)))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.fieldErrors[0].field").value("phoneNumber"))
+                    .andExpect(jsonPath("$.fieldErrors[0].message").value("Numer telefonu musi być prawidłowym polskim numerem (+48 lub 0 i 9 cyfr)"));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 400 gdy numer telefonu nie polski")
+        void shouldReturn400WhenPhoneNumberNotPolish() throws Exception {
+            validUserRequest.setPhoneNumber("+33123456789");
+
+            mockMvc.perform(post("/api/user")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validUserRequest)))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.fieldErrors[0].field").value("phoneNumber"));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 400 gdy userType jest null")
+        void shouldReturn400WhenUserTypeIsNull() throws Exception {
+            validUserRequest.setUserType(null);
+
+            mockMvc.perform(post("/api/user")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validUserRequest)))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.fieldErrors[0].field").value("userType"));
+        }
+    }
+
+    @Nested
+    @DisplayName("GET /api/user - Pobieranie użytkowników")
+    class GetUserTests {
+
+        private String userId;
+        private UserRequest request;
+
+        @BeforeEach
+        void createUser() throws Exception {
+            request = TestDataGenerator.generateValidCustomerRequest();
+
+            var response = mockMvc.perform(post("/api/user")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(request)))
+                    .andExpect(status().isCreated())
+                    .andReturn();
+
+            userId = objectMapper.readTree(response.getResponse().getContentAsString()).get("id").asText();
+        }
+
+        @Test
+        @DisplayName("Powinno pobrać listę wszystkich użytkowników")
+        void shouldGetAllUsers() throws Exception {
+            mockMvc.perform(get("/api/user"))
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$", isA(List.class)))
+                    .andExpect(jsonPath("$", hasSize(greaterThanOrEqualTo(1))));
+        }
+
+        @Test
+        @DisplayName("Powinno pobrać użytkownika po ID")
+        void shouldGetUserById() throws Exception {
+            mockMvc.perform(get("/api/user/" + userId))
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$.id").value(userId))
+                    .andExpect(jsonPath("$.firstName").value(request.getFirstName()))
+                    .andExpect(jsonPath("$.userType").value(request.getUserType().toString()));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 404 gdy użytkownik nie istnieje")
+        void shouldReturn404WhenUserNotFound() throws Exception {
+            mockMvc.perform(get("/api/user/" + UUID.randomUUID()))
+                    .andExpect(status().isNotFound())
+                    .andExpect(jsonPath("$.status").value(404))
+                    .andExpect(jsonPath("$.error").value("Resource Not Found"))
+                    .andExpect(jsonPath("$.message").value(containsString("User")));
+        }
+    }
+
+    @Nested
+    @DisplayName("PUT /api/user/{id} - Aktualizacja użytkownika")
+    class UpdateUserTests {
+
+        private String userId;
+
+        @BeforeEach
+        void createUser() throws Exception {
+            UserRequest request = TestDataGenerator.generateValidCustomerRequest();
+
+            var response = mockMvc.perform(post("/api/user")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(request)))
+                    .andExpect(status().isCreated())
+                    .andReturn();
+
+            userId = objectMapper.readTree(response.getResponse().getContentAsString()).get("id").asText();
+        }
+
+        @Test
+        @DisplayName("Powinno zaktualizować użytkownika (PUT)")
+        void shouldUpdateUser() throws Exception {
+            UserRequest updateRequest = TestDataGenerator.generateValidCustomerRequest();
+            updateRequest.setFirstName("Anna");
+            updateRequest.setLastName("Nowak");
+
+            mockMvc.perform(put("/api/user/" + userId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(updateRequest)))
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$.firstName").value("Anna"))
+                    .andExpect(jsonPath("$.lastName").value("Nowak"));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 400 gdy dane walidacji są nieprawidłowe")
+        void shouldReturn400OnInvalidUpdate() throws Exception {
+            validUserRequest.setEmail("invalid");
+
+            mockMvc.perform(put("/api/user/" + userId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validUserRequest)))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.fieldErrors[0].field").value("email"));
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 404 gdy użytkownik nie istnieje")
+        void shouldReturn404WhenUserNotFound() throws Exception {
+            mockMvc.perform(put("/api/user/" + UUID.randomUUID())
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(validUserRequest)))
+                    .andExpect(status().isNotFound());
+        }
+    }
+
+    @Nested
+    @DisplayName("PATCH /api/user/{id} - Częściowa aktualizacja")
+    class PatchUserTests {
+
+        private String userId;
+
+        @BeforeEach
+        void createUser() throws Exception {
+            UserRequest request = TestDataGenerator.generateValidCustomerRequest();
+
+            var response = mockMvc.perform(post("/api/user")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(request)))
+                    .andExpect(status().isCreated())
+                    .andReturn();
+
+            userId = objectMapper.readTree(response.getResponse().getContentAsString()).get("id").asText();
+        }
+
+        @Test
+        @DisplayName("Powinno zaktualizować tylko firstName (PATCH)")
+        void shouldPartiallyUpdateUser() throws Exception {
+            UpdateUserRequest partialRequest = new UpdateUserRequest();
+            partialRequest.setFirstName("Marian");
+
+            mockMvc.perform(patch("/api/user/" + userId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(partialRequest)))
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$.firstName").value("Marian"))
+                    .andExpect(jsonPath("$.lastName").isNotEmpty());
+        }
+    }
+
+    @Nested
+    @DisplayName("DELETE /api/user/{id} - Usunięcie użytkownika")
+    class DeleteUserTests {
+
+        private String userId;
+
+        @BeforeEach
+        void createUser() throws Exception {
+            UserRequest request = TestDataGenerator.generateValidCustomerRequest();
+
+            var response = mockMvc.perform(post("/api/user")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(request)))
+                    .andExpect(status().isCreated())
+                    .andReturn();
+
+            userId = objectMapper.readTree(response.getResponse().getContentAsString()).get("id").asText();
+        }
+
+        @Test
+        @DisplayName("Powinno usunąć użytkownika (204 No Content)")
+        void shouldDeleteUser() throws Exception {
+            mockMvc.perform(delete("/api/user/" + userId))
+                    .andExpect(status().isNoContent());
+
+            mockMvc.perform(get("/api/user/" + userId))
+                    .andExpect(status().isNotFound());
+        }
+
+        @Test
+        @DisplayName("Powinno zwrócić 404 gdy użytkownik nie istnieje")
+        void shouldReturn404WhenUserNotFound() throws Exception {
+            mockMvc.perform(delete("/api/user/" + UUID.randomUUID()))
+                    .andExpect(status().isNotFound());
+        }
+    }
+}

userService/src/test/java/pl/dmcs/userservice/dto/UserRequestValidationTest.java

@@ -0,0 +1,207 @@
+package pl.dmcs.userservice.dto;
+
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import pl.dmcs.userservice.dto.request.UserRequest;
+import pl.dmcs.userservice.model.UserType;
+
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@DisplayName("UserRequest DTO - Walidacja pól")
+@Transactional
+class UserRequestValidationTest {
+
+    private Validator validator;
+
+    @BeforeEach
+    void setUp() {
+        ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+        validator = factory.getValidator();
+    }
+
+    private UserRequest createValidRequest() {
+        UserRequest request = new UserRequest();
+        request.setFirstName("Jan");
+        request.setLastName("Kowalski");
+        request.setEmail("jan@example.com");
+        request.setPhoneNumber("+48123456789");
+        request.setUserType(UserType.CUSTOMER);
+        return request;
+    }
+
+    @Nested
+    @DisplayName("firstName walidacja")
+    class FirstNameValidation {
+
+        @Test
+        @DisplayName("firstName prawidłowy")
+        void shouldBeValidWithCorrectFirstName() {
+            UserRequest request = createValidRequest();
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.isEmpty());
+        }
+
+        @Test
+        @DisplayName("firstName pusty")
+        void shouldFailWhenFirstNameIsEmpty() {
+            UserRequest request = createValidRequest();
+            request.setFirstName("");
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("firstName")));
+        }
+
+        @Test
+        @DisplayName("firstName za krótki (<2)")
+        void shouldFailWhenFirstNameTooShort() {
+            UserRequest request = createValidRequest();
+            request.setFirstName("A");
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("firstName")));
+        }
+
+        @Test
+        @DisplayName("firstName za długi (>100)")
+        void shouldFailWhenFirstNameTooLong() {
+            UserRequest request = createValidRequest();
+            request.setFirstName("A".repeat(101));
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("firstName")));
+        }
+    }
+
+    @Nested
+    @DisplayName("email walidacja")
+    class EmailValidation {
+
+        @Test
+        @DisplayName("email prawidłowy")
+        void shouldBeValidWithCorrectEmail() {
+            UserRequest request = createValidRequest();
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.isEmpty());
+        }
+
+        @Test
+        @DisplayName("email bez @")
+        void shouldFailWhenEmailInvalid() {
+            UserRequest request = createValidRequest();
+            request.setEmail("invalid.email");
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("email")));
+        }
+
+        @Test
+        @DisplayName("email pusty")
+        void shouldFailWhenEmailIsEmpty() {
+            UserRequest request = createValidRequest();
+            request.setEmail("");
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("email")));
+        }
+    }
+
+    @Nested
+    @DisplayName("phoneNumber walidacja")
+    class PhoneNumberValidation {
+
+        @Test
+        @DisplayName("numer polski +48")
+        void shouldBeValidWithPolishNumberPlus48() {
+            UserRequest request = createValidRequest();
+            request.setPhoneNumber("+48123456789");
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.isEmpty());
+        }
+
+        @Test
+        @DisplayName("numer polski 0")
+        void shouldBeValidWithPolishNumberZero() {
+            UserRequest request = createValidRequest();
+            request.setPhoneNumber("0123456789");
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertFalse(violations.isEmpty());
+        }
+
+        @Test
+        @DisplayName("numer nie polski")
+        void shouldFailWhenNumberNotPolish() {
+            UserRequest request = createValidRequest();
+            request.setPhoneNumber("+33123456789");
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("phoneNumber")));
+        }
+
+        @Test
+        @DisplayName("numer za krótki")
+        void shouldFailWhenNumberTooShort() {
+            UserRequest request = createValidRequest();
+            request.setPhoneNumber("123456");
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("phoneNumber")));
+        }
+
+        @Test
+        @DisplayName("numer pusty")
+        void shouldFailWhenNumberIsEmpty() {
+            UserRequest request = createValidRequest();
+            request.setPhoneNumber("");
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("phoneNumber")));
+        }
+    }
+
+    @Nested
+    @DisplayName("userType walidacja")
+    class UserTypeValidation {
+
+        @Test
+        @DisplayName("userType CUSTOMER")
+        void shouldBeValidWithCustomerType() {
+            UserRequest request = createValidRequest();
+            request.setUserType(UserType.CUSTOMER);
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.isEmpty());
+        }
+
+        @Test
+        @DisplayName("userType COURIER")
+        void shouldBeValidWithCourierType() {
+            UserRequest request = createValidRequest();
+            request.setUserType(UserType.COURIER);
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.isEmpty());
+        }
+
+        @Test
+        @DisplayName("userType null")
+        void shouldFailWhenUserTypeIsNull() {
+            UserRequest request = createValidRequest();
+            request.setUserType(null);
+
+            Set<ConstraintViolation<UserRequest>> violations = validator.validate(request);
+            assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("userType")));
+        }
+    }
+}
+

userService/src/test/java/pl/dmcs/userservice/test/TestDataGenerator.java

@@ -0,0 +1,73 @@
+package pl.dmcs.userservice.test;
+
+import com.github.javafaker.Faker;
+import pl.dmcs.userservice.dto.request.UserRequest;
+import pl.dmcs.userservice.dto.request.TransportRequest;
+import pl.dmcs.userservice.model.UserType;
+import pl.dmcs.userservice.model.TransportType;
+
+public class TestDataGenerator {
+
+    private static final Faker faker = new Faker();
+
+    // Prawidłowe polskie prefiksy operatorów komórkowych
+    private static final String[] VALID_POLISH_PREFIXES = {
+            "50", "51", "53", "60", "66", "69", "72", "73", "78", "79", "88"
+    };
+
+    public static String generateValidPolishPhoneNumber() {
+        String prefix = VALID_POLISH_PREFIXES[faker.random().nextInt(VALID_POLISH_PREFIXES.length)];
+        long remainingDigits = faker.random().nextLong(10000000);
+        String paddedDigits = String.format("%07d", remainingDigits);
+
+        return "+48" + prefix + paddedDigits;
+    }
+
+    public static String generateUniqueEmail() {
+        return faker.internet().emailAddress();
+    }
+    public static String generateFirstName() {
+        return faker.name().firstName();
+    }
+    public static String generateLastName() {
+        return faker.name().lastName();
+    }
+
+    public static String generateUniqueLicensePlate() {
+        String letters = faker.letterify("??").toUpperCase();
+        String numbers = faker.numerify("####");
+        return letters + numbers;
+    }
+
+    public static UserRequest generateValidUserRequest(UserType userType) {
+        UserRequest request = new UserRequest();
+        request.setFirstName(generateFirstName());
+        request.setLastName(generateLastName());
+        request.setEmail(generateUniqueEmail());
+        request.setPhoneNumber(generateValidPolishPhoneNumber());
+        request.setUserType(userType);
+        return request;
+    }
+
+    public static UserRequest generateValidCustomerRequest() {
+        return generateValidUserRequest(UserType.CUSTOMER);
+    }
+
+    public static UserRequest generateValidCourierRequest() {
+        return generateValidUserRequest(UserType.COURIER);
+    }
+
+    public static TransportRequest generateValidTransportRequest() {
+        TransportRequest request = new TransportRequest();
+        request.setTransportType(TransportType.TRUCK);
+        request.setBrand(faker.company().name());
+        request.setModel(faker.commerce().productName());
+        request.setFuelType(faker.options().option("diesel", "petrol", "lpg", "electric"));
+        request.setTrunkVolume(faker.random().nextDouble() * 30000 + 1000);
+        request.setCargoCapacity(faker.random().nextDouble() * 10000 + 500);
+        request.setConsumption(faker.random().nextDouble() * 15 + 5);
+        request.setLicensePlate(generateUniqueLicensePlate());
+        request.setColor(faker.color().name());
+        return request;
+    }
+}

userService/src/test/java/pl/dmcs/userservice/validation/PhoneNumberValidatorTest.java

@@ -0,0 +1,76 @@
+package pl.dmcs.userservice.validation;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import jakarta.validation.ConstraintValidatorContext;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+
+@DisplayName("PhoneNumberValidator - Walidacja numerów telefonów polskich")
+class PhoneNumberValidatorTest {
+
+    private PhoneNumberValidator validator;
+    private ConstraintValidatorContext context;
+
+    @BeforeEach
+    void setUp() {
+        validator = new PhoneNumberValidator();
+        context = mock(ConstraintValidatorContext.class);
+    }
+
+    @Test
+    @DisplayName("Powinno zaakceptować numer z +48 bez spacji")
+    void shouldAcceptPolishNumberWithPlusPrefix() {
+        assertTrue(validator.isValid("+48123456789", context));
+    }
+
+    @Test
+    @DisplayName("Powinno zaakceptować numer z +48 ze spacjami")
+    void shouldAcceptPolishNumberWithPlusPrefixAndSpaces() {
+        assertTrue(validator.isValid("+48 123 456 789", context));
+    }
+
+    @ParameterizedTest
+    @DisplayName("Powinno odrzucić numery z za mało cyframi")
+    @ValueSource(strings = {"123", "12345", "+48123", "0123"})
+    void shouldRejectNumberWithTooFewDigits(String phoneNumber) {
+        assertFalse(validator.isValid(phoneNumber, context));
+    }
+
+    @ParameterizedTest
+    @DisplayName("Powinno odrzucić numery nie polskie")
+    @ValueSource(strings = {"+33123456789", "+44123456789", "+1234567890"})
+    void shouldRejectNonPolishNumbers(String phoneNumber) {
+        assertFalse(validator.isValid(phoneNumber, context));
+    }
+
+    @Test
+    @DisplayName("Powinno zaakceptować null (walidacja @NotBlank obsługuje to)")
+    void shouldAcceptNullValue() {
+        assertTrue(validator.isValid(null, context));
+    }
+
+    @Test
+    @DisplayName("Powinno zaakceptować pusty string (walidacja @NotBlank obsługuje to)")
+    void shouldAcceptEmptyString() {
+        assertTrue(validator.isValid("", context));
+    }
+
+    @Test
+    @DisplayName("Powinno odrzucić numer bez prefiksu")
+    void shouldRejectNumberWithoutPrefix() {
+        assertFalse(validator.isValid("123456789", context));
+    }
+
+    @Test
+    @DisplayName("Powinno odrzucić numer z niepolskim kodem kraju")
+    void shouldRejectWithInvalidCountryCode() {
+        assertFalse(validator.isValid("+12123456789", context));
+    }
+}
+