CFTunnels/Get tunnels.bru

@@ -0,0 +1,11 @@
+meta {
+  name: Get tunnels
+  type: http
+  seq: 4
+}
+
+get {
+  url: {{base_url}}/cloudflare/tunnels
+  body: none
+  auth: none
+}

CFTunnels/Tunnel.bru

@@ -0,0 +1,11 @@
+meta {
+  name: Tunnel
+  type: http
+  seq: 5
+}
+
+get {
+  url: {{base_url}}/cloudflare/tunnel/{{tunnel_id}}
+  body: none
+  auth: none
+}

CFTunnels/Write ingress.bru

@@ -0,0 +1,19 @@
+meta {
+  name: Write ingress
+  type: http
+  seq: 2
+}
+
+put {
+  url: {{base_url}}/cloudflare/tunnel/{{tunnel_id}}/add
+  body: json
+  auth: none
+}
+
+body:json {
+  {
+    "service": "http://192.168.0.100:3457",
+    "hostname": "random.hithomelabs.com",
+    "originRequest": {}
+  }
+}

CFTunnels/bruno.json

@@ -0,0 +1,9 @@
+{
+  "version": "1",
+  "name": "CFTunnels",
+  "type": "collection",
+  "ignore": [
+    "node_modules",
+    ".git"
+  ]
+}

CFTunnels/delete mapping.bru

@@ -0,0 +1,19 @@
+meta {
+  name: delete mapping
+  type: http
+  seq: 3
+}
+
+put {
+  url: {{base_url}}/cloudflare/tunnel/{{tunnel_id}}/delete
+  body: json
+  auth: none
+}
+
+body:json {
+  {
+    "service": "http://192.168.0.100:6000",
+    "hostname": "random.hithomelabs.com",
+    "originRequest": {}
+  }
+}

CFTunnels/environments/CFTunnels Local.bru

@@ -0,0 +1,4 @@
+vars {
+  tunnel_id: 50df9101-f625-4618-b7c5-100338a57124
+  base_url: http://localhost:8080
+}

CFTunnels/environments/CFTunnels.bru

@@ -0,0 +1,4 @@
+vars {
+  tunnel_id: 50df9101-f625-4618-b7c5-100338a57124
+  base_url: https://testcf.hithomelabs.com
+}

src/main/java/com/hithomelabs/CFTunnels/Controllers/TunnelController.java

@@ -10,6 +10,7 @@ import com.hithomelabs.CFTunnels.Entity.User;
 import com.hithomelabs.CFTunnels.Headers.AuthKeyEmailHeader;
 import com.hithomelabs.CFTunnels.Models.Config;
 import com.hithomelabs.CFTunnels.Models.Ingress;
+import com.hithomelabs.CFTunnels.Models.PaginationRequest;
 import com.hithomelabs.CFTunnels.Models.TunnelResponse;
 import com.hithomelabs.CFTunnels.Models.TunnelsResponse;
 import com.hithomelabs.CFTunnels.Repositories.UserRepository;
@@ -21,7 +22,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.error.ErrorController;
 import org.springframework.dao.DataAccessException;
-import org.springframework.http.*;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.http.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.GrantedAuthority;
@@ -108,12 +112,21 @@ public class TunnelController implements ErrorController {
 
     @PreAuthorize("hasAnyRole('USER')")
     @GetMapping("/requests")
-    public ResponseEntity<Map<String,Object>> getAllRequests() {
+    public ResponseEntity<Map<String,Object>> getAllRequests(
+            @RequestParam(required = false) Request.RequestStatus status,
+            @ModelAttribute PaginationRequest paginationRequest) {
         try {
-            List<Request> requests = mappingRequestService.getAllRequests();
+            Sort sort = paginationRequest.getSort() != null && paginationRequest.getSort().length > 0
+                    ? Sort.by(paginationRequest.getSort())
+                    : Sort.by("id");
+            Pageable pageable = PageRequest.of(paginationRequest.getPage(), paginationRequest.getSize(), sort);
+            Page<Request> requests = mappingRequestService.getAllRequests(status, pageable);
             Map<String, Object> jsonResponse = new HashMap<>();
             jsonResponse.put("status", "success");
-            jsonResponse.put("data", requests);
+            jsonResponse.put("data", requests.getContent());
+            jsonResponse.put("currentPage", requests.getNumber());
+            jsonResponse.put("totalItems", requests.getTotalElements());
+            jsonResponse.put("totalPages", requests.getTotalPages());
             return ResponseEntity.ok(jsonResponse);
         } catch (DataAccessException e) {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();

src/main/java/com/hithomelabs/CFTunnels/Models/PaginationRequest.java

@@ -0,0 +1,14 @@
+package com.hithomelabs.CFTunnels.Models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PaginationRequest {
+    private int page = 0;
+    private int size = 10;
+    private String[] sort = {"id"};
+}

src/main/java/com/hithomelabs/CFTunnels/Services/MappingRequestService.java

@@ -11,6 +11,8 @@ import com.hithomelabs.CFTunnels.Repositories.RequestRepository;
 import com.hithomelabs.CFTunnels.Repositories.TunnelRepository;
 import com.hithomelabs.CFTunnels.Repositories.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.stereotype.Service;
@@ -59,8 +61,11 @@ public class MappingRequestService {
         return createRequest(mapping, user);
     }
 
-    public List<Request> getAllRequests() {
-        return requestRepository.findAll();
+    public Page<Request> getAllRequests(Request.RequestStatus status, Pageable pageable) {
+        if (status != null) {
+            return requestRepository.findByStatus(status, pageable);
+        }
+        return requestRepository.findAll(pageable);
     }
 
     public User mapUser(OidcUser oidcUser){

src/main/resources/application-local.properties

@@ -7,6 +7,4 @@ management.endpoint.health.show-details=always
 logging.level.org.hibernate.SQL=DEBUG
 debug=true
 
-spring.jpa.hibernate.ddl-auto=create-drop
-spring.jpa.show-sql=true
 spring.datasource.url=jdbc:postgresql://localhost:5432/cftunnel

src/test/java/com/hithomelabs/CFTunnels/Controllers/TunnelControllerTest.java

@@ -5,7 +5,6 @@ import com.hithomelabs.CFTunnels.Config.AuthoritiesToGroupMapping;
 import com.hithomelabs.CFTunnels.Config.CloudflareConfig;
 import com.hithomelabs.CFTunnels.Config.RestTemplateConfig;
 import com.hithomelabs.CFTunnels.Headers.AuthKeyEmailHeader;
-import com.hithomelabs.CFTunnels.Entity.Request;
 import com.hithomelabs.CFTunnels.Entity.Tunnel;
 import com.hithomelabs.CFTunnels.Models.Authorities;
 import com.hithomelabs.CFTunnels.Models.Config;
@@ -205,22 +204,44 @@ class TunnelControllerTest {
     }
 
     @Test
-    @DisplayName("should return list of requests")
+    @DisplayName("should return list of requests with pagination")
     void getAllRequests_Success() throws Exception {
         List<com.hithomelabs.CFTunnels.Entity.Request> requests = Arrays.asList(
                 createTestRequest(UUID.randomUUID(), com.hithomelabs.CFTunnels.Entity.Request.RequestStatus.PENDING),
                 createTestRequest(UUID.randomUUID(), com.hithomelabs.CFTunnels.Entity.Request.RequestStatus.APPROVED)
         );
+        Page<com.hithomelabs.CFTunnels.Entity.Request> page = new PageImpl<>(requests, PageRequest.of(0, 10), 2);
         
-        when(mappingRequestService.getAllRequests()).thenReturn(requests);
+        when(mappingRequestService.getAllRequests(any(), any(PageRequest.class))).thenReturn(page);
 
         mockMvc.perform(get("/cloudflare/requests")
-                        .with(oauth2Login().oauth2User(buildOidcUser("username", Groups.GITEA_USER))))
+                        .with(oauth2Login().oauth2User(buildOidcUser("username", Groups.GITEA_USER)))
+                        .param("page", "0")
+                        .param("size", "10"))
                 .andExpect(status().isOk())
                 .andExpect(MockMvcResultMatchers.content().contentType(MediaType.APPLICATION_JSON))
                 .andExpect(jsonPath("$.status").value("success"))
                 .andExpect(jsonPath("$.data").isArray())
-                .andExpect(jsonPath("$.data.length()").value(2));
+                .andExpect(jsonPath("$.totalItems").value(2))
+                .andExpect(jsonPath("$.totalPages").value(1));
+    }
+
+    @Test
+    @DisplayName("should filter requests by status")
+    void getAllRequests_WithStatusFilter() throws Exception {
+        List<com.hithomelabs.CFTunnels.Entity.Request> requests = List.of(
+                createTestRequest(UUID.randomUUID(), com.hithomelabs.CFTunnels.Entity.Request.RequestStatus.PENDING)
+        );
+        Page<com.hithomelabs.CFTunnels.Entity.Request> page = new PageImpl<>(requests, PageRequest.of(0, 10), 1);
+        
+        when(mappingRequestService.getAllRequests(eq(com.hithomelabs.CFTunnels.Entity.Request.RequestStatus.PENDING), any(PageRequest.class))).thenReturn(page);
+
+        mockMvc.perform(get("/cloudflare/requests")
+                        .with(oauth2Login().oauth2User(buildOidcUser("username", Groups.GITEA_USER)))
+                        .param("status", "PENDING"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.status").value("success"))
+                .andExpect(jsonPath("$.data[0].status").value("PENDING"));
     }
 
     @Test
@@ -243,6 +264,13 @@ class TunnelControllerTest {
                 .andExpect(jsonPath("$.status").value("PENDING"));
     }
 
+    private com.hithomelabs.CFTunnels.Entity.Request createTestRequest(UUID id, com.hithomelabs.CFTunnels.Entity.Request.RequestStatus status) {
+        com.hithomelabs.CFTunnels.Entity.Request request = new com.hithomelabs.CFTunnels.Entity.Request();
+        request.setId(id);
+        request.setStatus(status);
+        return request;
+    }
+
     @Test
     @DisplayName("should approve mapping request successfully")
     void approveMappingRequest_Success() throws Exception {
@@ -409,13 +437,6 @@ class TunnelControllerTest {
                 .andExpect(jsonPath("$.data.result.config.ingress[*].hostname", hasItem("random.hithomelabs.com")));
     }
 
-    private Request createTestRequest(UUID id, Request.RequestStatus status) {
-        Request request = new Request();
-        request.setId(id);
-        request.setStatus(status);
-        return request;
-    }
-
     @Test
     void deleteTunnelConfiguration() throws Exception {