Activity log filters, staff role, chat fix

backend/src/main/java/com/petshop/backend/controller/ActivityLogController.java

@@ -2,7 +2,9 @@ package com.petshop.backend.controller;
 
 import com.petshop.backend.dto.activity.ActivityLogResponse;
 import com.petshop.backend.service.ActivityLogService;
+import java.time.LocalDate;
 import java.util.List;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,8 +28,10 @@ public class ActivityLogController {
             @RequestParam(defaultValue = "2000") int limit,
             @RequestParam(required = false) Long storeId,
             @RequestParam(required = false) String role,
-            @RequestParam(required = false) String search) {
+            @RequestParam(required = false) String search,
+            @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
+            @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate) {
         int safeLimit = Math.min(Math.max(1, limit), 10000);
-        return ResponseEntity.ok(activityLogService.getLogs(safeLimit, storeId, role, search));
+        return ResponseEntity.ok(activityLogService.getLogs(safeLimit, storeId, role, search, startDate, endDate));
     }
 }

backend/src/main/java/com/petshop/backend/service/ActivityLogService.java

@@ -15,6 +15,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -52,6 +53,11 @@ public class ActivityLogService {
             entry.setStoreNameSnapshot(store != null ? store.getStoreName() : null);
             entry.setActivity(activity.trim());
             activityLogRepository.save(entry);
+            log.info("[ACTIVITY] {} | {} | {} | {}",
+                    entry.getRoleSnapshot(),
+                    entry.getUsernameSnapshot(),
+                    entry.getStoreNameSnapshot() != null ? entry.getStoreNameSnapshot() : "no store",
+                    entry.getActivity());
         } catch (Exception ex) {
             log.warn("Failed to persist activity log", ex);
         }
@@ -65,7 +71,7 @@ public class ActivityLogService {
     }
 
     @Transactional(readOnly = true)
-    public List<ActivityLogResponse> getLogs(int limit, Long storeId, String role, String search) {
+    public List<ActivityLogResponse> getLogs(int limit, Long storeId, String role, String search, LocalDate startDate, LocalDate endDate) {
         Specification<ActivityLog> spec = (root, query, cb) -> {
             List<Predicate> predicates = new ArrayList<>();
 
@@ -87,6 +93,14 @@ public class ActivityLogService {
                 predicates.add(searchPredicate);
             }
 
+            if (startDate != null) {
+                predicates.add(cb.greaterThanOrEqualTo(root.get("logTimestamp"), startDate.atStartOfDay()));
+            }
+
+            if (endDate != null) {
+                predicates.add(cb.lessThan(root.get("logTimestamp"), endDate.plusDays(1).atStartOfDay()));
+            }
+
             return cb.and(predicates.toArray(new Predicate[0]));
         };
 
@@ -96,9 +110,14 @@ public class ActivityLogService {
                 .toList();
     }
 
+    @Transactional(readOnly = true)
+    public List<ActivityLogResponse> getLogs(int limit, Long storeId, String role, String search) {
+        return getLogs(limit, storeId, role, search, null, null);
+    }
+
     @Transactional(readOnly = true)
     public List<ActivityLogResponse> getLogs(int limit) {
-        return getLogs(limit, null, null, null);
+        return getLogs(limit, null, null, null, null, null);
     }
 
     private ActivityLogResponse toResponse(ActivityLog entry) {