harbor test v

Reviewed-on: #13

.gitea/workflows/sgeupdated.yml

@@ -3,14 +3,13 @@ name: sgeUpdated CI/CD
 on:
   pull_request:
     types:
-      - opened    # When a new PR is created
-      - closed    # When a PR is merged or manually closed
+      - closed     # Fires when a PR is closed (either merged or manually closed)
     branches:
-      - main      # The target branch of the PR
+      - main       # Only when PR targets main
 
 jobs:
   deploy:
-    if: github.event.pull_request.merged == true || github.event.action == 'opened'
+    if: github.event.pull_request.merged == true    # Run only if the PR was merged (not just closed)
     runs-on: ubuntu-latest
 
     steps:
@@ -24,7 +23,7 @@ jobs:
       - name: Run deploy script on server
         run: |
           ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF'
-            echo "✅ PR event detected — running deploy script..."
+            echo "✅ PR merged into main — running deploy script.."
             cd /home/ubuntu/Bgreen/sgeUpdated
             ./deploy.sh
           EOF

config.conf

@@ -0,0 +1,24 @@
+# SGE Application Configuration
+# This file contains configuration for both backend and frontend
+
+# Database Configuration
+SPRING_DATASOURCE_URL=jdbc:postgresql://bgreen-database:5432/sge
+SPRING_DATASOURCE_USERNAME=sge
+SPRING_DATASOURCE_PASSWORD=147
+
+# Server Configuration
+SERVER_PORT=8080
+
+# Mail Configuration
+MAIL_HOSTNAME=mail.spacemail.com
+MAIL_SMTP_PORT=465
+MAIL_ADDRESS=info@blc-css.com
+MAIL_PASSWORD=123456Bb@
+
+# React Application Configuration
+# API Configuration
+API_PROTOCOL=http
+API_HOST=bgreen-backend
+
+# Application URLs
+APP_SURVEY_BASE_URL=https://bgreen.blc-css.com

deploy.sh

@@ -0,0 +1,110 @@
+#!/bin/bash
+set -euo pipefail
+
+cd /home/ubuntu/Bgreen/sgeUpdated
+
+# -----------------------
+# Harbor settings
+# -----------------------
+HARBOR_REGISTRY="10.150.1.166"
+HARBOR_PROJECT="bgreen"
+
+BACKEND_IMAGE_REPO="${HARBOR_REGISTRY}/${HARBOR_PROJECT}/bgreen-backend"
+FRONTEND_IMAGE_REPO="${HARBOR_REGISTRY}/${HARBOR_PROJECT}/bgreen-frontend"
+
+# Tag images with git commit (better than latest; enables rollback)
+VERSION="$(git rev-parse --short HEAD)"
+
+echo "📦 Fetching latest changes from origin/main..."
+git fetch myfork main
+
+# Detect which files changed between local HEAD and the latest remote version
+CHANGED_FILES=$(git diff --name-only HEAD myfork/main || true)
+
+if [ -z "$CHANGED_FILES" ]; then
+  echo "✅ No file changes detected between HEAD and origin/main."
+else
+  echo "🪶 Changed files:"
+  echo "$CHANGED_FILES"
+fi
+
+# Update to the latest version
+git reset --hard myfork/main
+
+BACKEND_CHANGED=false
+FRONTEND_CHANGED=false
+
+# Check if backend folder changed (excluding README.md)
+if echo "$CHANGED_FILES" | grep "^sge-backend/" | grep -qv "README.md$"; then
+  BACKEND_CHANGED=true
+fi
+
+# Check if frontend folder changed (excluding README.md)
+if echo "$CHANGED_FILES" | grep "^sge-frontend/" | grep -qv "README.md$"; then
+  FRONTEND_CHANGED=true
+fi
+
+# -----------------------
+# Backend section
+# -----------------------
+if [ "$BACKEND_CHANGED" = true ]; then
+  echo "⚡ Backend changes detected."
+
+  cd sge-backend
+  echo "Running Maven build..."
+  /opt/apache-maven-3.9.11/bin/mvn clean install -DskipTests
+
+  echo "🐳 Building backend Docker image..."
+  docker build -t "${BACKEND_IMAGE_REPO}:${VERSION}" .
+
+  echo "📤 Pushing backend image to Harbor..."
+  docker push "${BACKEND_IMAGE_REPO}:${VERSION}"
+
+  echo "📥 Pulling backend image from Harbor (to ensure registry is source of truth)..."
+  docker pull "${BACKEND_IMAGE_REPO}:${VERSION}"
+
+  cd ..
+
+  echo "🚀 Recreating backend container using Harbor image..."
+  VERSION="$VERSION" docker compose up -d bgreen-backend
+
+else
+  echo "✅ No backend changes."
+fi
+
+# -----------------------
+# Frontend section
+# -----------------------
+if [ "$FRONTEND_CHANGED" = true ]; then
+  echo "⚡ Frontend changes detected."
+  cd sge-frontend
+
+  # Check if package.json or package-lock.json changed
+  if echo "$CHANGED_FILES" | grep -qE "^sge-frontend/(package\.json|package-lock\.json)$"; then
+    echo "📦 package.json changed. Running 'npm install' and 'npm run build'..."
+    npm install
+    npm run build
+  else
+    echo "📦 only code changes. Running 'npm run build'..."
+    npm run build
+  fi
+
+  echo "🐳 Building frontend Docker image..."
+  docker build -t "${FRONTEND_IMAGE_REPO}:${VERSION}" .
+
+  echo "📤 Pushing frontend image to Harbor..."
+  docker push "${FRONTEND_IMAGE_REPO}:${VERSION}"
+
+  echo "📥 Pulling frontend image from Harbor (to ensure registry is source of truth)..."
+  docker pull "${FRONTEND_IMAGE_REPO}:${VERSION}"
+
+  cd ..
+
+  echo "🚀 Recreating frontend container using Harbor image..."
+  VERSION="$VERSION" docker compose up -d bgreen-frontend
+
+else
+  echo "✅ No frontend changes."
+fi
+
+echo "✅ Deployment complete."

deploy.sh.save

@@ -0,0 +1,69 @@
+#!/bin/bash
+set -euo pipefail
+
+export GIT_SSH_COMMAND="ssh -i ~/.ssh/deploy_id_rsa -o StrictHostKeyC
+
+cd /home/ubuntu/Bgreen/sgeUpdated
+
+echo "📦 Fetching latest changes from origin/main..."
+git fetch origin main
+
+# Detect which files changed between local HEAD and the latest remote version
+CHANGED_FILES=$(git diff --name-only HEAD origin/main || true)
+
+if [ -z "$CHANGED_FILES" ]; then
+  echo "✅ No file changes detected between HEAD and origin/main."
+else
+  echo "🪶 Changed files:"
+  echo "$CHANGED_FILES"
+fi
+
+# Update to the latest version
+git reset --hard origin/main
+
+BACKEND_CHANGED=false
+FRONTEND_CHANGED=false
+
+# Check if backend folder changed
+if echo "$CHANGED_FILES" | grep -q "^sge-backend/"; then
+  BACKEND_CHANGED=true
+fi
+
+# Check if frontend folder changed
+if echo "$CHANGED_FILES" | grep -q "^sge-frontend/"; then
+  FRONTEND_CHANGED=true
+fi
+
+# -----------------------
+# Backend section
+# -----------------------
+if [ "$BACKEND_CHANGED" = true ]; then
+  echo "⚡ Backend changes detected."
+  cd sge-backend
+  echo "Running Maven build..."
+  /opt/apache-maven-3.9.11/bin/mvn clean install -DskipTests
+  cd ..
+  echo "Rebuilding backend Docker container..."
+  docker compose up -d --build bgreen-backend
+else
+  echo "✅ No backend changes."
+fi
+
+# -----------------------
+# Frontend section
+# -----------------------
+if [ "$FRONTEND_CHANGED" = true ]; then
+  echo "⚡ Frontend changes detected."
+  cd sge-frontend
+  echo "Running npm build..."
+  npm install
+  npm run build
+  cd ..
+  echo "Rebuilding frontend Docker container..."
+  docker compose up -d --build bgreen-frontend
+else
+  echo "✅ No frontend changes."
+fi
+
+echo "✅ Deployment complete."
+

sge-backend/pom.xml

@@ -11,7 +11,7 @@
     </parent>
     <groupId>com.sgs</groupId>
     <artifactId>sgs</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
     <name>sgs</name>
     <description>SGS project for Spring Boot</description>
     <properties>

sge-backend/src/main/java/com/sgs/SgsApplication.java

@@ -187,7 +187,7 @@ public class SgsApplication implements CommandLineRunner {
         admin.setFirstName("Seda");
         admin.setLastName("Kemikli");
         admin.setEmail("seda.kemikli@blc-css.com");
-        admin.setPhoneNumber("11111111");
+        admin.setPhoneNumber("11111511");
         admin.setPassword(passwordEncoder.encode("admin"));
         // if (organizations.size() == 1) {
         // admin.setOrganizations(organizations);

sge-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sgs-web",
-  "version": "1.0.2",
+  "version": "1.0.1",
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.13.8",