Merge branch 'dev' into dev2

Author: xukki241

.github/workflows/ci.yml

@@ -0,0 +1,117 @@
+name: CI
+
+on:
+  push:
+    branches: [main, dev, shift]
+  pull_request:
+    branches: [main, dev]
+
+# Cancel redundant runs when a new push is made to the same branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  frontend:
+    name: Frontend (Lint & Build)
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: frontend
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: frontend/package-lock.json
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint:ci
+
+      - name: Build
+        run: npm run build
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: frontend-dist
+          path: frontend/dist
+          retention-days: 7
+
+  backend:
+    name: Backend (Build & Test)
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: backend
+
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD: test1234
+          MYSQL_DATABASE: smalltrend_test
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mysqladmin ping -h localhost"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+
+    env:
+      DB_URL: jdbc:mysql://localhost:3306/smalltrend_test?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC&createDatabaseIfNotExist=true
+      DB_USERNAME: root
+      DB_PASSWORD: test1234
+      JWT_SECRET: 5367566B59703373367639792F423F4528482B4D6251655468576D5A71347437
+      CLOUDINARY_CLOUD_NAME: ci_dummy
+      CLOUDINARY_API_KEY: "000000000000000"
+      CLOUDINARY_API_SECRET: ci_dummy_secret
+      SPRING_SQL_INIT_MODE: never
+      SPRING_JPA_DDL_AUTO: create-drop
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Java 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: "17"
+          distribution: "temurin"
+          cache: "maven"
+
+      - name: Make Maven wrapper executable
+        run: chmod +x mvnw
+
+      - name: Compile (skip tests)
+        run: ./mvnw -B compile -DskipTests
+
+      - name: Run tests + JaCoCo coverage
+        run: ./mvnw -B verify
+
+      - name: Upload JaCoCo coverage report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: jacoco-report
+          path: backend/target/site/jacoco
+          retention-days: 7
+
+      - name: Upload JUnit test results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: junit-test-results
+          path: backend/target/surefire-reports
+          retention-days: 7

README.md

@@ -2,9 +2,8 @@
 
 Hệ thống POS (Point of Sale) hiện đại giúp quản lý toàn diện các hoạt động của cửa hàng tạp hóa/siêu thị mini, từ bán hàng, quản lý kho, nhân sự, khách hàng đến báo cáo thống kê.
 
----
+-  **CI Status**: [![CI Workflow](https://github.com/touchmegit1/SmallTrend/actions/workflows/ci.yml/badge.svg?branch=dev)](https://github.com/touchmegit1/SmallTrend/actions/workflows/ci.yml?query=branch%3Adev)
 
----
 
 ## 🚀 Quick Start - Chạy Dự Án Nhanh Chóng
 
@@ -28,6 +27,12 @@ Hệ thống POS (Point of Sale) hiện đại giúp quản lý toàn diện cá
 
 ### 📦 Setup Backend (3 bước đơn giản)
 
+---
+
+## 📋 CI/CD Pipeline
+
+Dự án sử dụng **GitHub Actions** để tự động test & build. Xem chi tiết tại: [CI_CD_SETUP.md](./CI_CD_SETUP.md)
+
 #### Bước 1: Tạo Database
 ```sql
 CREATE DATABASE smalltrend CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

backend/Dump.java

@@ -0,0 +1,8 @@
+import java.sql.*;
+public class Dump {
+    public static void main(String[] args) throws Exception {
+        Connection c = DriverManager.getConnection("jdbc:mysql://localhost:3306/smalltrend", "root", "");
+        ResultSet rs = c.createStatement().executeQuery("SELECT phone FROM customers");
+        while(rs.next()) System.out.println("PHONE_IN_DB: " + rs.getString(1));
+    }
+}

backend/src/main/java/com/smalltrend/controller/CRM/AdvertisementController.java

@@ -5,60 +5,83 @@
 import com.smalltrend.service.CRM.AdvertisementService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
 
 @RestController
-@RequestMapping("/api/crm/ads")
+@RequestMapping("/api/advertisements")
 @RequiredArgsConstructor
 public class AdvertisementController {
 
-    private final AdvertisementService adService;
+    private final AdvertisementService advertisementService;
 
-    /** GET /api/crm/ads — toàn bộ danh sách (admin) */
-    @GetMapping
-    public ResponseEntity<List<AdvertisementResponse>> getAll() {
-        return ResponseEntity.ok(adService.getAll());
+    /**
+     * Lấy quảng cáo đang active (for homepage)
+     * Không cần authentication
+     */
+    @GetMapping("/active")
+    public ResponseEntity<Map<String, AdvertisementResponse>> getActiveAdvertisements() {
+        return ResponseEntity.ok(advertisementService.getActiveAds());
     }
 
-    /** GET /api/crm/ads/active — 2 quảng cáo đang active (LEFT + RIGHT) */
-    @GetMapping("/active")
-    public ResponseEntity<Map<String, AdvertisementResponse>> getActive() {
-        return ResponseEntity.ok(adService.getActiveAds());
+    /**
+     * Lấy tất cả quảng cáo (admin only)
+     */
+    @GetMapping
+    @PreAuthorize("hasAnyRole('ADMIN', 'MANAGER')")
+    public ResponseEntity<List<AdvertisementResponse>> getAllAdvertisements() {
+        return ResponseEntity.ok(advertisementService.getAll());
     }
 
-    /** GET /api/crm/ads/stats — báo cáo thống kê hợp đồng */
+    /**
+     * Lấy stats của quảng cáo
+     */
     @GetMapping("/stats")
-    public ResponseEntity<Map<String, Object>> getStats() {
-        return ResponseEntity.ok(adService.getStats());
+    @PreAuthorize("hasAnyRole('ADMIN', 'MANAGER')")
+    public ResponseEntity<Map<String, Object>> getAdvertisementStats() {
+        return ResponseEntity.ok(advertisementService.getStats());
     }
 
-    /** POST /api/crm/ads — tạo mới */
-    @PostMapping
-    public ResponseEntity<AdvertisementResponse> create(@RequestBody SaveAdvertisementRequest req) {
-        return ResponseEntity.ok(adService.save(null, req));
+    /**
+     * Tạo hoặc cập nhật quảng cáo
+     */
+    @PostMapping("/{id}")
+    @PreAuthorize("hasAnyRole('ADMIN', 'MANAGER')")
+    public ResponseEntity<AdvertisementResponse> saveAdvertisement(
+            @PathVariable(required = false) Long id,
+            @RequestBody SaveAdvertisementRequest request) {
+        return ResponseEntity.ok(advertisementService.save(id, request));
     }
 
-    /** PUT /api/crm/ads/{id} — cập nhật */
-    @PutMapping("/{id}")
-    public ResponseEntity<AdvertisementResponse> update(
-            @PathVariable Long id,
-            @RequestBody SaveAdvertisementRequest req) {
-        return ResponseEntity.ok(adService.save(id, req));
+    /**
+     * Tạo quảng cáo mới
+     */
+    @PostMapping
+    @PreAuthorize("hasAnyRole('ADMIN', 'MANAGER')")
+    public ResponseEntity<AdvertisementResponse> createAdvertisement(
+            @RequestBody SaveAdvertisementRequest request) {
+        return ResponseEntity.ok(advertisementService.save(null, request));
     }
 
-    /** PATCH /api/crm/ads/{id}/toggle — bật/tắt hiển thị */
-    @PatchMapping("/{id}/toggle")
-    public ResponseEntity<AdvertisementResponse> toggle(@PathVariable Long id) {
-        return ResponseEntity.ok(adService.toggleActive(id));
+    /**
+     * Bật / tắt quảng cáo
+     */
+    @PutMapping("/{id}/toggle")
+    @PreAuthorize("hasAnyRole('ADMIN', 'MANAGER')")
+    public ResponseEntity<AdvertisementResponse> toggleActiveAdvertisement(@PathVariable Long id) {
+        return ResponseEntity.ok(advertisementService.toggleActive(id));
     }
 
-    /** DELETE /api/crm/ads/{id} */
+    /**
+     * Xoá quảng cáo
+     */
     @DeleteMapping("/{id}")
-    public ResponseEntity<Void> delete(@PathVariable Long id) {
-        adService.delete(id);
+    @PreAuthorize("hasAnyRole('ADMIN', 'MANAGER')")
+    public ResponseEntity<Void> deleteAdvertisement(@PathVariable Long id) {
+        advertisementService.delete(id);
         return ResponseEntity.noContent().build();
     }
 }

backend/src/main/java/com/smalltrend/controller/CRM/CouponController.java

@@ -25,6 +25,20 @@ public ResponseEntity<List<CouponResponse>> getAllCoupons() {
         return ResponseEntity.ok(couponService.getAllCoupons());
     }
 
+    @GetMapping("/validate")
+    public ResponseEntity<?> validateCoupon(
+            @RequestParam String code, 
+            @RequestParam(required = false) Integer customerId) {
+        try {
+            CouponResponse coupon = couponService.validateCoupon(code, customerId);
+            return ResponseEntity.ok(coupon);
+        } catch (Exception e) {
+            Map<String, String> error = new HashMap<>();
+            error.put("message", e.getMessage());
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
+        }
+    }
+
     @PostMapping
     public ResponseEntity<?> createCoupon(@RequestBody CreateCouponRequest request) {
         try {

backend/src/main/java/com/smalltrend/controller/CRM/CustomerController.java

@@ -17,34 +17,34 @@
 @RequiredArgsConstructor
 @CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:5175", "http://localhost:3000" })
 public class CustomerController {
-    
+
     private final CustomerService customerService;
-    
+
     @GetMapping("/customers")
     public ResponseEntity<List<CustomerResponse>> getAllCustomers() {
         List<CustomerResponse> customers = customerService.getAllCustomers();
         return ResponseEntity.ok(customers);
     }
 
     @GetMapping("/customers/{id}")
-    public ResponseEntity<CustomerResponse> getCustomerById(@PathVariable Integer id) {
+    public ResponseEntity<CustomerResponse> getCustomerById(@PathVariable("id") Integer id) {
         CustomerResponse customer = customerService.getCustomerById(id);
         return ResponseEntity.ok(customer);
     }
 
     @GetMapping("/customers/phone/{phone}")
-    public ResponseEntity<?> getCustomerByPhone(@PathVariable String phone) {
+    public ResponseEntity<?> getCustomerByPhone(@PathVariable("phone") String phone) {
         try {
             CustomerResponse customer = customerService.getCustomerByPhone(phone);
             return ResponseEntity.ok(customer);
         } catch (Exception e) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                .body(new com.smalltrend.dto.common.MessageResponse(e.getMessage()));
+                    .body(new com.smalltrend.dto.common.MessageResponse(e.getMessage()));
         }
     }
 
     @GetMapping("/customers/search")
-    public ResponseEntity<CustomerResponse> searchCustomerByPhone(@RequestParam String phone) {
+    public ResponseEntity<CustomerResponse> searchCustomerByPhone(@RequestParam("phone") String phone) {
         CustomerResponse customer = customerService.getCustomerByPhone(phone);
         return ResponseEntity.ok(customer);
     }
@@ -57,19 +57,19 @@ public ResponseEntity<CustomerResponse> createCustomer(@RequestBody CreateCustom
 
     @PutMapping("/customers/{id}")
     public ResponseEntity<CustomerResponse> updateCustomer(
-            @PathVariable Integer id,
+            @PathVariable("id") Integer id,
             @RequestBody UpdateCustomerRequest request) {
         CustomerResponse customer = customerService.updateCustomer(
-            id, 
-            request.getName(), 
-            request.getPhone(),
-            request.getLoyaltyPoints()
-        );
+                id,
+                request.getName(),
+                request.getPhone(),
+                request.getLoyaltyPoints(),
+                request.getSpentAmount());
         return ResponseEntity.ok(customer);
     }
 
     @DeleteMapping("/customers/{id}")
-    public ResponseEntity<Void> deleteCustomer(@PathVariable Integer id) {
+    public ResponseEntity<Void> deleteCustomer(@PathVariable("id") Integer id) {
         customerService.deleteCustomer(id);
         return ResponseEntity.noContent().build();
     }

backend/src/main/java/com/smalltrend/controller/CRM/TicketController.java

@@ -32,7 +32,7 @@ public ResponseEntity<List<TicketResponse>> getAllTickets() {
     }
 
     @GetMapping("/tickets/{id}")
-    public ResponseEntity<TicketResponse> getTicketById(@PathVariable Long id) {
+    public ResponseEntity<TicketResponse> getTicketById(@PathVariable("id") Long id) {
         TicketResponse ticket = ticketService.getTicketById(id);
         return ResponseEntity.ok(ticket);
     }
@@ -51,14 +51,14 @@ public ResponseEntity<?> createTicket(@RequestBody CreateTicketRequest request)
 
     @PutMapping("/tickets/{id}")
     public ResponseEntity<TicketResponse> updateTicket(
-            @PathVariable Long id,
+            @PathVariable("id") Long id,
             @RequestBody UpdateTicketRequest request) {
         TicketResponse ticket = ticketService.updateTicket(id, request);
         return ResponseEntity.ok(ticket);
     }
 
     @DeleteMapping("/tickets/{id}")
-    public ResponseEntity<Void> deleteTicket(@PathVariable Long id) {
+    public ResponseEntity<Void> deleteTicket(@PathVariable("id") Long id) {
         ticketService.deleteTicket(id);
         return ResponseEntity.noContent().build();
     }
@@ -67,7 +67,7 @@ public ResponseEntity<Void> deleteTicket(@PathVariable Long id) {
      * Lookup users by role ID — for assigning tickets
      */
     @GetMapping("/tickets/lookup/users-by-role/{roleId}")
-    public ResponseEntity<List<Map<String, Object>>> getUsersByRole(@PathVariable Integer roleId) {
+    public ResponseEntity<List<Map<String, Object>>> getUsersByRole(@PathVariable("roleId") Integer roleId) {
         List<User> users = userRepository.findByRoleId(roleId);
         List<Map<String, Object>> result = users.stream().map(u -> {
             Map<String, Object> map = new HashMap<>();
@@ -86,7 +86,7 @@ public ResponseEntity<List<Map<String, Object>>> getUsersByRole(@PathVariable In
      * Delegates to service to keep transaction open for lazy-loaded collections.
      */
     @GetMapping("/tickets/lookup/variant-by-sku")
-    public ResponseEntity<List<Map<String, Object>>> getVariantBySku(@RequestParam String sku) {
+    public ResponseEntity<List<Map<String, Object>>> getVariantBySku(@RequestParam("sku") String sku) {
         List<Map<String, Object>> result = ticketService.lookupVariantBySku(sku);
         return ResponseEntity.ok(result);
     }