Merge pull request #2 from salieri009/feature/assignment-implementation

Implement UTS ISD Assignment 2: Features 01-04, Dockerization, CI/CD

Author: salieri009

.dockerignore

@@ -0,0 +1,13 @@
+target/
+.git/
+.github/
+docs/
+node_modules/
+src/main/webapp/assets/ts/
+*.log
+*.db
+*.sqlite
+*.sqlite3
+.env
+.env.*
+*.legacy

.github/workflows/ci.yml

@@ -17,20 +17,16 @@ on:
     # {Run on pushes to feature branches, but not main}
 
 env:
-  JAVA_VERSION: '17'
-  MAVEN_VERSION: '3.9.5'
+  JAVA_VERSION: '11'
 
 jobs:
-  # {CI Job: Build and Test}
   ci:
     name: CI - Build and Test
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        # {Test on multiple Java versions if needed}
-        java-version: ['17']
-        # {Add more versions like '11', '21' if you need to test compatibility}
+        java-version: ['11']
 
     steps:
       - name: Checkout code

.github/workflows/deploy.yml

@@ -1,30 +1,83 @@
-name: Deploy
+name: Build & Deploy
 
 on:
   push:
-    branches: [ main ]
-    tags:
-      - 'v*'
+    branches: [main]
+    tags: ['v*']
 
 jobs:
-  deploy:
+  # ── 1. Build WAR ─────────────────────────────────────────────────────────────
+  build:
+    name: Build WAR
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')
-    
+
     steps:
-    - uses: actions/checkout@v3
-    
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-    
-    - name: Build WAR file
-      run: mvn clean package -DskipTests
-    
-    - name: Deploy to staging
-      run: |
-        echo "Deployment would occur here"
-        echo "Built WAR: target/*.war"
-        # Add actual deployment steps (e.g., SCP, Docker push, etc.)
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Build WAR (skip tests — tests run in CI)
+        run: mvn -B clean package -DskipTests
+
+      - name: Upload WAR artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: iot-bay-war
+          path: target/iot-bay.war
+          retention-days: 1
+
+  # ── 2. Build & Push Docker image to GHCR ────────────────────────────────────
+  docker:
+    name: Docker Build & Push
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download WAR artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: iot-bay-war
+          path: target/
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=sha,prefix=sha-,format=short
+            type=semver,pattern={{version}}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

Dockerfile

@@ -0,0 +1,39 @@
+# ── Build Stage ──────────────────────────────────────────────────────────────
+FROM maven:3.9-eclipse-temurin-11 AS builder
+
+WORKDIR /build
+
+# Cache dependency layer separately from source
+COPY pom.xml .
+RUN mvn dependency:go-offline -B -q
+
+COPY src/ ./src/
+RUN mvn clean package -DskipTests -B -q
+
+# ── Runtime Stage ─────────────────────────────────────────────────────────────
+FROM tomcat:9.0-jdk11-openjdk-slim
+
+LABEL maintainer="IoTBay Team <iotbay@example.com>"
+
+# Remove default Tomcat webapps (security hardening)
+RUN rm -rf /usr/local/tomcat/webapps/ROOT \
+           /usr/local/tomcat/webapps/examples \
+           /usr/local/tomcat/webapps/host-manager \
+           /usr/local/tomcat/webapps/manager
+
+# Deploy WAR as ROOT (serves at /)
+COPY --from=builder /build/target/iot-bay.war \
+     /usr/local/tomcat/webapps/ROOT.war
+
+# SQLite data directory — mount a named volume here for persistence
+RUN mkdir -p /opt/iotbay/data
+VOLUME ["/opt/iotbay/data"]
+
+# Environment variables (override at runtime)
+ENV IOTBAY_DB_PATH=/opt/iotbay/data/iotbay.db
+ENV APP_ENV=production
+ENV IOTBAY_JWT_SECRET=""
+
+EXPOSE 8080
+
+CMD ["catalina.sh", "run"]

docker-compose.yml

@@ -0,0 +1,27 @@
+version: '3.8'
+
+services:
+  app:
+    image: ghcr.io/salieri009/iotbay:latest
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080"
+    volumes:
+      - iotbay-data:/opt/iotbay/data
+    environment:
+      - IOTBAY_DB_PATH=/opt/iotbay/data/iotbay.db
+      - APP_ENV=production
+      - IOTBAY_JWT_SECRET=${IOTBAY_JWT_SECRET:-changeme-in-production}
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
+
+volumes:
+  iotbay-data:
+    driver: local

pom.xml

@@ -11,8 +11,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <jettyVersion>9.4.12.v20180830</jettyVersion>
   </properties>
 

src/main/java/CheckDB.java

@@ -2,7 +2,7 @@
 
 public class CheckDB {
     public static void main(String[] args) {
-        String url = "jdbc:sqlite:D:/UTS/IoTBayPersonnel/IoTBay/iotbay.db";
+        String url = config.AppConfig.getDbUrl();
         System.out.println("Checking DB at: " + url);
 
         try (Connection conn = DriverManager.getConnection(url)) {

src/main/java/config/AppConfig.java

@@ -38,4 +38,20 @@ public static int getIntProperty(String key, int defaultValue) {
             return defaultValue;
         }
     }
+
+    /**
+     * Returns the SQLite JDBC URL.
+     * Priority: IOTBAY_DB_PATH env var > db.path property > fallback.
+     */
+    public static String getDbUrl() {
+        String envPath = System.getenv("IOTBAY_DB_PATH");
+        if (envPath != null && !envPath.trim().isEmpty()) {
+            return "jdbc:sqlite:" + envPath.trim();
+        }
+        String propPath = properties.getProperty("db.path");
+        if (propPath != null && !propPath.trim().isEmpty()) {
+            return "jdbc:sqlite:" + propPath.trim();
+        }
+        return "jdbc:sqlite:./iotbay.db";
+    }
 }

src/main/java/controller/BrowsePageController.java

@@ -91,9 +91,24 @@ else if (categoryIdParam != null && !categoryIdParam.trim().isEmpty()) {
                     products = productDAO.getAllProducts();
                 }
             }
-            // Handle keyword search
+            // Handle combined keyword + category search
             else if (keyword != null && !keyword.trim().isEmpty()) {
-                products = productDAO.getProductsByName(keyword.trim());
+                if (categoryId != null) {
+                    products = productDAO.searchByNameAndCategory(keyword.trim(), categoryId);
+                    request.setAttribute("categoryId", categoryId);
+                } else if (categoryParam != null && !categoryParam.trim().isEmpty()) {
+                    try {
+                        dao.CategoryDAO catDAO = new dao.CategoryDAO();
+                        model.Category cat = catDAO.getCategoryByName(categoryParam.trim());
+                        Integer cid = cat != null ? cat.getId() : null;
+                        products = productDAO.searchByNameAndCategory(keyword.trim(), cid);
+                        request.setAttribute("category", categoryParam.trim());
+                    } catch (SQLException e) {
+                        products = productDAO.getProductsByName(keyword.trim());
+                    }
+                } else {
+                    products = productDAO.searchByNameAndCategory(keyword.trim(), null);
+                }
                 request.setAttribute("keyword", keyword);
             }
             // Default: get all products