commit d6ca0497805cfb68c3fa9a10775179fbe527dde8 Author: Flook Date: Tue Apr 15 07:56:31 2025 +0700 Fix: add frontend as normal folder instead of submodule diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..eb143a3 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,68 @@ +kind: pipeline +type: docker +name: default + +steps: + - name: Build Backend (Spring Boot) + image: maven:3.9-eclipse-temurin-17 + commands: + - cd employee-service + - mvn clean package -DskipTests + + - name: Build Frontend (React) + image: node:20-alpine + commands: + - cd frontend + - npm install + - npm run build + + - name: Build Full Stack via Docker Compose + image: docker:24.0.5-cli + volumes: + - name: dockersock + path: /var/run/docker.sock + commands: + - docker compose -f docker-compose.yml build + + - name: Run SonarQube Scan + image: sonarsource/sonar-scanner-cli + environment: + SONAR_HOST_URL: + from_secret: SCANNER_HOST_URL + SONAR_LOGIN: + from_secret: SCANNER_LOGIN + SONAR_TOKEN: + from_secret: SCANNER_TOKEN + commands: + - mkdir -p /tmp/.scannerwork + - chmod -R 777 /tmp/.scannerwork + - > + sonar-scanner + -Dsonar.login=$SONAR_LOGIN + -Dsonar.token=$SONAR_TOKEN + -Dsonar.host.url=$SONAR_HOST_URL + -Dsonar.projectKey=crud_app + -Dsonar.projectName=crud_app + -Dsonar.working.directory=/tmp/.scannerwork + -Dsonar.modules=frontend,employee-service + -Dfrontend.sonar.projectBaseDir=frontend + -Dfrontend.sonar.sources=src + -Dfrontend.sonar.exclusions=**/node_modules/** + -Demployee-service.sonar.projectBaseDir=employee-service + -Demployee-service.sonar.sources=src/main/java + -Demployee-service.sonar.java.binaries=employee-service/target/classes + + - name: Deploy to Server + image: curlimages/curl:latest + environment: + WEBHOOK_URL: + from_secret: WEBHOOK_URL + WEBHOOK_SECRET: + from_secret: WEBHOOK_SECRET + commands: + - 'curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $WEBHOOK_SECRET" -d "{\"branch\":\"master\"}" "$WEBHOOK_URL"' + +volumes: + - name: dockersock + host: + path: /var/run/docker.sock diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ac6d75 --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +# === Node/React (frontend) === +frontend/node_modules/ +frontend/dist/ +frontend/.vite/ +frontend/.env +frontend/.env.* + +# === Java/Spring Boot (employee-service) === +employee-service/target/ +employee-service/.classpath +employee-service/.project +employee-service/.settings/ +employee-service/.env +employee-service/*.iml + +# === IDE Files === +.idea/ +*.iml +.vscode/ + +# === OS Files === +.DS_Store +Thumbs.db + +# === Logs === +*.log +logs/ +**/logs/ + +# === Docker-related === +*.pid +*.tar +docker-compose.override.yml + +# === Test Reports === +**/test-output/ +**/coverage/ +**/jacoco.exec + +# === Misc === +*.bak +*.swp +*.swo diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..6b019da --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM postgres:15 + +COPY init-scripts/*.sql /docker-entrypoint-initdb.d/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..59069a1 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,83 @@ +services: + postgres: + container_name: ms_pg_sql + build: . + environment: + POSTGRES_USER: admin + POSTGRES_PASSWORD: 123 + PGDATA: /var/lib/postgresql/data + POSTGRES_DB: employee_service + volumes: + - postgres:/var/lib/postgresql/data + ports: + - 5432:5432 + networks: + - microservice-net + restart: unless-stopped + + pgadmin: + container_name: ms_pgadmin + image: dpage/pgadmin4 + environment: + PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-pgadmin@pgadmin.org} + PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD:-admin} + PGADMIN_CONFIG_SERVER_MODE: 'False' + volumes: + - pgadmin:/var/lib/pgadmin + ports: + - 8180:80 + networks: + - microservice-net + restart: unless-stopped + + employee-service: + build: + context: ./employee-service + dockerfile: Dockerfile + container_name: ms_employee_service + environment: + SPRING_DATASOURCE_URL: jdbc:postgresql://ms_pg_sql:5432/employee_service + SPRING_DATASOURCE_USERNAME: admin + SPRING_DATASOURCE_PASSWORD: 123 + ports: + - "8080:8080" + depends_on: + - postgres + networks: + - microservice-net + restart: unless-stopped + + frontend: + build: + context: ./frontend + dockerfile: Dockerfile + container_name: ms_frontend + ports: + - "80" # ตรงนี้แม้จะดูเหมือนจะ conflict กับ web แต่ใช้ network ภายใน (ไม่ต้องแมพพอร์ต) + depends_on: + - employee-service + networks: + - microservice-net + restart: unless-stopped + + web: + build: + context: ./nginx + dockerfile: Dockerfile + container_name: ms_web + ports: + - "80:80" # แมพพอร์ตให้ใช้งานจากนอก container ได้ + depends_on: + - frontend + - employee-service + networks: + - microservice-net + restart: unless-stopped + +networks: + microservice-net: + driver: bridge + +volumes: + postgres: + pgadmin: diff --git a/employee-service/.gitattributes b/employee-service/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/employee-service/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/employee-service/.gitignore b/employee-service/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/employee-service/.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/ diff --git a/employee-service/.mvn/wrapper/maven-wrapper.properties b/employee-service/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/employee-service/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/employee-service/Dockerfile b/employee-service/Dockerfile new file mode 100644 index 0000000..8447bc1 --- /dev/null +++ b/employee-service/Dockerfile @@ -0,0 +1,11 @@ +# ===== Stage 1: Build JAR ===== +FROM eclipse-temurin:21-jdk-alpine AS builder +WORKDIR /app +COPY . . +RUN ./mvnw clean package -DskipTests + +# ===== Stage 2: Run Spring Boot ===== +FROM eclipse-temurin:21-jdk-alpine +WORKDIR /app +COPY --from=builder /app/target/*.jar app.jar +ENTRYPOINT ["java", "-jar", "app.jar"] diff --git a/employee-service/mvnw b/employee-service/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/employee-service/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/employee-service/mvnw.cmd b/employee-service/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/employee-service/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/employee-service/pom.xml b/employee-service/pom.xml new file mode 100644 index 0000000..9dbd3d3 --- /dev/null +++ b/employee-service/pom.xml @@ -0,0 +1,92 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.4.4 + + + tech.softwarecraft + employee-service + 0.0.1-SNAPSHOT + employee-service + Employee Service + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-web + + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/employee-service/src/main/java/tech/softwarecraft/employee_service/EmployeeServiceApplication.java b/employee-service/src/main/java/tech/softwarecraft/employee_service/EmployeeServiceApplication.java new file mode 100644 index 0000000..c4dbce6 --- /dev/null +++ b/employee-service/src/main/java/tech/softwarecraft/employee_service/EmployeeServiceApplication.java @@ -0,0 +1,13 @@ +package tech.softwarecraft.employee_service; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class EmployeeServiceApplication { + + public static void main(String[] args) { + SpringApplication.run(EmployeeServiceApplication.class, args); + } + +} diff --git a/employee-service/src/main/java/tech/softwarecraft/employee_service/configuration/DataInitializer.java b/employee-service/src/main/java/tech/softwarecraft/employee_service/configuration/DataInitializer.java new file mode 100644 index 0000000..e5bec1b --- /dev/null +++ b/employee-service/src/main/java/tech/softwarecraft/employee_service/configuration/DataInitializer.java @@ -0,0 +1,65 @@ +package tech.softwarecraft.employee_service.configuration; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import tech.softwarecraft.employee_service.model.Employee; +import tech.softwarecraft.employee_service.repository.EmployeeRepository; + +import java.util.List; + +@Configuration +public class DataInitializer { + + @Bean + public CommandLineRunner initData(EmployeeRepository employeeRepository) { + return args -> { + List employees = List.of( + new Employee(1, "Cy Ganderton", "ganderton@gmail.com", "Quality Control Specialist", "Quality Control Department", true), + new Employee(2, "Hart Hagerty", "hagerty@gmail.com", "Desktop Support Technician", "Desktop Support Department", true), + new Employee(3, "Brice Swyre", "swyre@gmail.com", "Tax Accountant", "Desktop Support Department", false), + new Employee(4, "Grace Lee", "grace.lee@example.com", "Software Engineer", "Data Analysis Department", false), + new Employee(5, "Frank Miller", "frank.miller@example.com", "Project Manager", "Data Analysis Department", true), + new Employee(6, "Alice Johnson", "alice.johnson@company.com", "HR Specialist", "HR Department", false), + new Employee(7, "Charlie Davis", "charlie.davis@business.com", "Software Engineer", "Data Analysis Department", true), + new Employee(8, "Emily Wilson", "emily.wilson@company.com", "Marketing Coordinator", "Marketing Department", false), + new Employee(9, "Henry Clark", "henry.clark@business.com", "HR Specialist", "HR Department", true), + new Employee(10, "Ivy Lewis", "ivy.lewis@example.com", "Software Engineer", "Engineering Department", false), + new Employee(11, "John Doe", "john.doe@company.com", "Marketing Coordinator", "Marketing Department", true), + new Employee(12, "Jane Smith", "jane.smith@business.com", "Data Analyst", "Data Analysis Department", false), + new Employee(13, "Alice Johnson", "alice.johnson@example.com", "Project Manager", "Project Management Department", true), + new Employee(14, "Bob Brown", "bob.brown@company.com", "HR Specialist", "HR Department", false), + new Employee(15, "Charlie Davis", "charlie.davis@business.com", "Software Engineer", "Data Analysis Department", true), + new Employee(16, "Emily Wilson", "emily.wilson@company.com", "Marketing Coordinator", "Marketing Department", false), + new Employee(17, "Frank Miller", "frank.miller@business.com", "Project Manager", "Project Management Department", true), + new Employee(18, "Grace Lee", "grace.lee@example.com", "Data Analyst", "Data Analysis Department", false), + new Employee(19, "Henry Clark", "henry.clark@company.com", "Software Engineer", "Engineering Department", true), + new Employee(20, "Ivy Lewis", "ivy.lewis@business.com", "HR Specialist", "HR Department", false), + new Employee(21, "John Doe", "john.doe@example.com", "Marketing Coordinator", "Marketing Department", true), + new Employee(22, "Jane Smith", "jane.smith@company.com", "Data Analyst", "Data Analysis Department", false), + new Employee(23, "Alice Johnson", "alice.johnson@business.com", "Project Manager", "Project Management Department", true), + new Employee(24, "Bob Brown", "bob.brown@example.com", "HR Specialist", "HR Department", false), + new Employee(25, "Charlie Davis", "charlie.davis@company.com", "Software Engineer", "Data Analysis Department", true), + new Employee(26, "Emily Wilson", "emily.wilson@business.com", "Marketing Coordinator", "Marketing Department", false), + new Employee(27, "Frank Miller", "frank.miller@company.com", "Project Manager", "Project Management Department", true), + new Employee(28, "Grace Lee", "grace.lee@business.com", "Data Analyst", "Data Analysis Department", false), + new Employee(29, "Henry Clark", "henry.clark@example.com", "Software Engineer", "Engineering Department", true), + new Employee(30, "Ivy Lewis", "ivy.lewis@company.com", "HR Specialist", "HR Department", false), + new Employee(31, "John Doe", "john.doe@business.com", "Marketing Coordinator", "Marketing Department", true), + new Employee(32, "Jane Smith", "jane.smith@example.com", "Data Analyst", "Data Analysis Department", false), + new Employee(33, "Alice Johnson", "alice.johnson@company.com", "Project Manager", "Project Management Department", true), + new Employee(34, "Bob Brown", "bob.brown@business.com", "HR Specialist", "HR Department", false), + new Employee(35, "Charlie Davis", "charlie.davis@example.com", "Software Engineer", "Data Analysis Department", true), + new Employee(36, "Emily Wilson", "emily.wilson@company.com", "Marketing Coordinator", "Marketing Department", false), + new Employee(37, "Frank Miller", "frank.miller@business.com", "Project Manager", "Project Management Department", true), + new Employee(38, "Grace Lee", "grace.lee@company.com", "Data Analyst", "Data Analysis Department", false), + new Employee(39, "Henry Clark", "henry.clark@business.com", "Software Engineer", "Engineering Department", true), + new Employee(40, "Ivy Lewis", "ivy.lewis@example.com", "HR Specialist", "HR Department", false), + new Employee(41, "John Doe", "john.doe@company.com", "Marketing Coordinator", "Marketing Department", true) + ); + + employeeRepository.saveAll(employees); + }; + } + +} \ No newline at end of file diff --git a/employee-service/src/main/java/tech/softwarecraft/employee_service/controller/EmployeeController.java b/employee-service/src/main/java/tech/softwarecraft/employee_service/controller/EmployeeController.java new file mode 100644 index 0000000..d540893 --- /dev/null +++ b/employee-service/src/main/java/tech/softwarecraft/employee_service/controller/EmployeeController.java @@ -0,0 +1,51 @@ +package tech.softwarecraft.employee_service.controller; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import tech.softwarecraft.employee_service.model.Employee; +import tech.softwarecraft.employee_service.service.EmployeeService; + +import java.util.List; + +@CrossOrigin("http://localhost") // ถ้า nginx ทำ HTTPS จะเปลี่ยนตาม +@RestController +@RequestMapping("/api/employees") +public class EmployeeController { + + private EmployeeService employeeService; + + public EmployeeController(EmployeeService employeeService) { + this.employeeService = employeeService; + } + + @PostMapping + public ResponseEntity createEmployee(@RequestBody Employee employee) { + return ResponseEntity.ok(employeeService.createEmployee(employee)); + } + + @GetMapping + public List getAllEmployees() { + return employeeService.getAllEmployees(); + } + + @PutMapping("/{id}") + public ResponseEntity updateEmployee(@PathVariable int id, @RequestBody Employee employee) { + System.out.println("Updating employee with id " + id); + return employeeService.updateEmployee(id, employee) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteEmployee(@PathVariable int id) { + if (employeeService.deleteEmployee(id)) { + return ResponseEntity.noContent().build(); + } + return ResponseEntity.notFound().build(); + } + + @GetMapping("/search") + public List searchEmployee(@RequestParam String keyword) { + return employeeService.searchEmployees(keyword); + } +} \ No newline at end of file diff --git a/employee-service/src/main/java/tech/softwarecraft/employee_service/model/Employee.java b/employee-service/src/main/java/tech/softwarecraft/employee_service/model/Employee.java new file mode 100644 index 0000000..3d03f20 --- /dev/null +++ b/employee-service/src/main/java/tech/softwarecraft/employee_service/model/Employee.java @@ -0,0 +1,29 @@ +package tech.softwarecraft.employee_service.model; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "employees", uniqueConstraints = { + @UniqueConstraint(columnNames = "id") +}) +public class Employee { + @Id + @Column(name = "id") + private int id; + @Column(name = "name") + private String name; + @Column(name = "mail") + private String mail; + @Column(name = "job") + private String job; + @Column(name = "department") + private String department; + @Column(name = "active") + private boolean active; +} \ No newline at end of file diff --git a/employee-service/src/main/java/tech/softwarecraft/employee_service/repository/EmployeeRepository.java b/employee-service/src/main/java/tech/softwarecraft/employee_service/repository/EmployeeRepository.java new file mode 100644 index 0000000..1d76db8 --- /dev/null +++ b/employee-service/src/main/java/tech/softwarecraft/employee_service/repository/EmployeeRepository.java @@ -0,0 +1,18 @@ +package tech.softwarecraft.employee_service.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; +import tech.softwarecraft.employee_service.model.Employee; + +import java.util.List; + +@Repository +public interface EmployeeRepository extends JpaRepository { + @Query("SELECT e FROM Employee e WHERE " + + "LOWER(e.name) LIKE LOWER(CONCAT('%', :keyword, '%')) OR " + + "LOWER(e.mail) LIKE LOWER(CONCAT('%', :keyword, '%')) OR " + + "LOWER(e.job) LIKE LOWER(CONCAT('%', :keyword, '%')) OR " + + "LOWER(e.department) LIKE LOWER(CONCAT('%', :keyword, '%'))") + List searchByKeyword(String keyword); +} \ No newline at end of file diff --git a/employee-service/src/main/java/tech/softwarecraft/employee_service/service/EmployeeService.java b/employee-service/src/main/java/tech/softwarecraft/employee_service/service/EmployeeService.java new file mode 100644 index 0000000..d1714e3 --- /dev/null +++ b/employee-service/src/main/java/tech/softwarecraft/employee_service/service/EmployeeService.java @@ -0,0 +1,53 @@ +package tech.softwarecraft.employee_service.service; + +import org.springframework.stereotype.Service; +import tech.softwarecraft.employee_service.model.Employee; +import tech.softwarecraft.employee_service.repository.EmployeeRepository; + +import java.util.List; +import java.util.Optional; + +@Service +public class EmployeeService { + private final EmployeeRepository employeeRepository; + + public EmployeeService(EmployeeRepository employeeRepository) { + this.employeeRepository = employeeRepository; + } + + // Create Employee + public Employee createEmployee(Employee employee) { + return employeeRepository.save(employee); + } + + // Read Employee + public List getAllEmployees() { + return employeeRepository.findAll(); + } + + // Update Employee + public Optional updateEmployee(int id, Employee newData) { + return employeeRepository.findById(id).map(existing ->{ + existing.setName(newData.getName()); + existing.setMail(newData.getMail()); + existing.setJob(newData.getJob()); + existing.setDepartment(newData.getDepartment()); + existing.setActive(newData.isActive()); + return employeeRepository.save(existing); + }); + } + + // Delete Employee + public boolean deleteEmployee(int id) { + if(employeeRepository.existsById(id)) { + employeeRepository.deleteById(id); + return true; + } + return false; + } + + // Search by keyword + public List searchEmployees(String keyword) { + return employeeRepository.searchByKeyword(keyword); + } +} \ No newline at end of file diff --git a/employee-service/src/main/resources/application.yml b/employee-service/src/main/resources/application.yml new file mode 100644 index 0000000..8ee8255 --- /dev/null +++ b/employee-service/src/main/resources/application.yml @@ -0,0 +1,26 @@ +spring: + application: + name: employee-service + + datasource: + url: jdbc:postgresql://ms_pg_sql:5432/employee_service + username: admin + password: 123 + + jpa: + database-platform: org.hibernate.dialect.PostgreSQLDialect + database: postgresql + hibernate: + ddl-auto: create-drop + naming: + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + show-sql: true + +server: + port: 8080 + +logging: + level: + org: + springframework: + security: DEBUG diff --git a/employee-service/src/test/java/tech/softwarecraft/employee_service/EmployeeServiceApplicationTests.java b/employee-service/src/test/java/tech/softwarecraft/employee_service/EmployeeServiceApplicationTests.java new file mode 100644 index 0000000..8dc77f9 --- /dev/null +++ b/employee-service/src/test/java/tech/softwarecraft/employee_service/EmployeeServiceApplicationTests.java @@ -0,0 +1,13 @@ +package tech.softwarecraft.employee_service; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class EmployeeServiceApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/frontend b/frontend new file mode 160000 index 0000000..4a41fac --- /dev/null +++ b/frontend @@ -0,0 +1 @@ +Subproject commit 4a41face169a3e12aba43b4d9cc2bfa3a9a18574 diff --git a/init-scripts/init.sql b/init-scripts/init.sql new file mode 100644 index 0000000..a407e2e --- /dev/null +++ b/init-scripts/init.sql @@ -0,0 +1 @@ +CREATE DATABASE employee_service; \ No newline at end of file diff --git a/nginx/Dockerfile b/nginx/Dockerfile new file mode 100644 index 0000000..6ba02bc --- /dev/null +++ b/nginx/Dockerfile @@ -0,0 +1,4 @@ +FROM nginx:alpine + +# คัดลอก default.conf ลงไปใน nginx container +COPY default.conf /etc/nginx/conf.d/default.conf diff --git a/nginx/default.conf b/nginx/default.conf new file mode 100644 index 0000000..62a8e25 --- /dev/null +++ b/nginx/default.conf @@ -0,0 +1,21 @@ +server { + listen 80; + + location / { + proxy_pass http://ms_frontend:80; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_cache_bypass $http_upgrade; + } + + location /api/ { + proxy_pass http://ms_employee_service:8080; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_cache_bypass $http_upgrade; + } +}