diff --git a/src/main/java/net/hackyourfuture/tickettrackingsystem/controller/TicketController.java b/src/main/java/net/hackyourfuture/tickettrackingsystem/controller/TicketController.java
index ab22ba9..e8287c3 100644
--- a/src/main/java/net/hackyourfuture/tickettrackingsystem/controller/TicketController.java
+++ b/src/main/java/net/hackyourfuture/tickettrackingsystem/controller/TicketController.java
@@ -2,6 +2,7 @@
 
 import net.hackyourfuture.tickettrackingsystem.dto.ticket.TicketRequest;
 import net.hackyourfuture.tickettrackingsystem.dto.ticket.TicketResponse;
+import net.hackyourfuture.tickettrackingsystem.model.Ticket;
 import net.hackyourfuture.tickettrackingsystem.service.TicketService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +27,14 @@ public ResponseEntity<List<TicketResponse>> getAll() {
         return ResponseEntity.ok(service.getAll());
     }
 
+    @GetMapping("/search")
+    public ResponseEntity<List<Ticket>> search(
+            @RequestParam(required = false) String status,
+            @RequestParam(required = false) String text
+    ) {
+        return ResponseEntity.ok(service.search(status, text));
+    }
+
     @GetMapping("/{id}")
     public ResponseEntity<TicketResponse> getById(@PathVariable Long id) {
         return ResponseEntity.ok(service.getById(id));
diff --git a/src/main/java/net/hackyourfuture/tickettrackingsystem/repository/TicketRepository.java b/src/main/java/net/hackyourfuture/tickettrackingsystem/repository/TicketRepository.java
index 010603c..251d23f 100644
--- a/src/main/java/net/hackyourfuture/tickettrackingsystem/repository/TicketRepository.java
+++ b/src/main/java/net/hackyourfuture/tickettrackingsystem/repository/TicketRepository.java
@@ -83,7 +83,7 @@ public List<Ticket> findAll() {
     // -----------------------------
     // SEARCH (text + status)
     // -----------------------------
-    public List<Ticket> search(String text, String status) {
+    public List<Ticket> search(String status, String text) {
         StringBuilder sql = new StringBuilder("SELECT * FROM tickets WHERE 1=1 ");
         List<Object> params = new java.util.ArrayList<>();
 
diff --git a/src/main/java/net/hackyourfuture/tickettrackingsystem/service/TicketService.java b/src/main/java/net/hackyourfuture/tickettrackingsystem/service/TicketService.java
index 9155da8..52ee109 100644
--- a/src/main/java/net/hackyourfuture/tickettrackingsystem/service/TicketService.java
+++ b/src/main/java/net/hackyourfuture/tickettrackingsystem/service/TicketService.java
@@ -31,7 +31,9 @@ public TicketService(
         this.users = users;
         this.email = email;
     }
-
+    public List<Ticket> search(String status, String text) {
+        return tickets.search(status, text);
+    }
     public TicketResponse create(TicketRequest req) {
         Ticket t = new Ticket(
                 null,