added integration with frontend and python backend

src/main/java/com/cs102/attendance/config/SecurityConfig.java

@@ -0,0 +1,23 @@
+package com.cs102.attendance.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+public class SecurityConfig {
+
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        http
+            .csrf(csrf -> csrf.disable()) // Disable CSRF for simplicity
+            .authorizeHttpRequests(auth -> auth
+                .requestMatchers("/call-face-recognition").permitAll()
+                .anyRequest().authenticated()
+            )
+            .httpBasic(Customizer.withDefaults()); // or formLogin/custom config
+        return http.build();
+    }
+}

src/main/java/com/cs102/attendance/controller/FastApiCallerController.java

@@ -1,12 +1,15 @@
-// FastApiCallerController.java
 package com.cs102.attendance.controller;
 
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.cs102.attendance.service.FastApiCallerService;
 
 @RestController
+@CrossOrigin(origins = "https://cs-102-vert.vercel.app/") 
 public class FastApiCallerController {
 
     private final FastApiCallerService fastApiCallerService;
@@ -15,13 +18,13 @@ public class FastApiCallerController {
         this.fastApiCallerService = fastApiCallerService;
     }
 
-    @GetMapping("/call-face-recognition")
-    public String callFaceRecognition() {
+    @PostMapping("/call-face-recognition")
+    public String callFaceRecognition(@RequestParam("image") MultipartFile imageFile) {
         try {
-            return fastApiCallerService.callFaceRecognition();
+            return fastApiCallerService.callFaceRecognitionWithImage(imageFile);
         } catch (Exception e) {
             e.printStackTrace();
-            return "Error calling face-recognition API";
+            return "Error processing image: " + e.getMessage();
         }
     }
 }

src/main/java/com/cs102/attendance/controller/HealthController.java

@@ -1,49 +1,49 @@
-package com.cs102.attendance.controller;
+// package com.cs102.attendance.controller;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.http.ResponseEntity;
+// import org.springframework.web.bind.annotation.GetMapping;
+// import org.springframework.web.bind.annotation.RequestMapping;
+// import org.springframework.web.bind.annotation.RestController;
 
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
+// import javax.sql.DataSource;
+// import java.sql.Connection;
+// import java.sql.SQLException;
+// import java.util.HashMap;
+// import java.util.Map;
 
-@RestController
-@RequestMapping("/api/health")
-public class HealthController {
+// @RestController
+// @RequestMapping("/api/health")
+// public class HealthController {
 
-    @Autowired
-    private DataSource dataSource;
+//     @Autowired
+//     private DataSource dataSource;
 
-    @GetMapping("/database")
-    public ResponseEntity<Map<String, Object>> checkDatabaseConnection() {
-        Map<String, Object> response = new HashMap<>();
+//     @GetMapping("/database")
+//     public ResponseEntity<Map<String, Object>> checkDatabaseConnection() {
+//         Map<String, Object> response = new HashMap<>();
         
-        try (Connection connection = dataSource.getConnection()) {
-            // Test the connection
-            boolean isValid = connection.isValid(5); // 5 second timeout
+//         try (Connection connection = dataSource.getConnection()) {
+//             // Test the connection
+//             boolean isValid = connection.isValid(5); // 5 second timeout
             
-            if (isValid) {
-                response.put("status", "UP");
-                response.put("database", "Connected");
-                response.put("url", connection.getMetaData().getURL());
-                response.put("driver", connection.getMetaData().getDriverName());
-                response.put("version", connection.getMetaData().getDatabaseProductVersion());
-                return ResponseEntity.ok(response);
-            } else {
-                response.put("status", "DOWN");
-                response.put("database", "Connection invalid");
-                return ResponseEntity.status(503).body(response);
-            }
-        } catch (SQLException e) {
-            response.put("status", "DOWN");
-            response.put("database", "Connection failed");
-            response.put("error", e.getMessage());
-            return ResponseEntity.status(503).body(response);
-        }
-    }
-} 
+//             if (isValid) {
+//                 response.put("status", "UP");
+//                 response.put("database", "Connected");
+//                 response.put("url", connection.getMetaData().getURL());
+//                 response.put("driver", connection.getMetaData().getDriverName());
+//                 response.put("version", connection.getMetaData().getDatabaseProductVersion());
+//                 return ResponseEntity.ok(response);
+//             } else {
+//                 response.put("status", "DOWN");
+//                 response.put("database", "Connection invalid");
+//                 return ResponseEntity.status(503).body(response);
+//             }
+//         } catch (SQLException e) {
+//             response.put("status", "DOWN");
+//             response.put("database", "Connection failed");
+//             response.put("error", e.getMessage());
+//             return ResponseEntity.status(503).body(response);
+//         }
+//     }
+// } 

src/main/java/com/cs102/attendance/controller/TestController.java

@@ -1,75 +1,75 @@
-package com.cs102.attendance.controller;
+// package com.cs102.attendance.controller;
 
-import com.cs102.attendance.entity.TestConnection;
-import com.cs102.attendance.repository.TestConnectionRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+// import com.cs102.attendance.entity.TestConnection;
+// import com.cs102.attendance.repository.TestConnectionRepository;
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.http.ResponseEntity;
+// import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+// import java.util.HashMap;
+// import java.util.List;
+// import java.util.Map;
 
-@RestController
-@RequestMapping("/api/test")
-public class TestController {
+// @RestController
+// @RequestMapping("/api/test")
+// public class TestController {
 
-    @Autowired
-    private TestConnectionRepository testConnectionRepository;
+//     @Autowired
+//     private TestConnectionRepository testConnectionRepository;
 
-    @GetMapping("/database-operations")
-    public ResponseEntity<Map<String, Object>> testDatabaseOperations() {
-        Map<String, Object> response = new HashMap<>();
+//     @GetMapping("/database-operations")
+//     public ResponseEntity<Map<String, Object>> testDatabaseOperations() {
+//         Map<String, Object> response = new HashMap<>();
         
-        try {
-            // Test 1: Simple query
-            Integer queryResult = testConnectionRepository.testQuery();
-            response.put("simpleQuery", queryResult == 1 ? "PASS" : "FAIL");
+//         try {
+//             // Test 1: Simple query
+//             Integer queryResult = testConnectionRepository.testQuery();
+//             response.put("simpleQuery", queryResult == 1 ? "PASS" : "FAIL");
             
-            // Test 2: Insert operation
-            TestConnection testEntity = new TestConnection("Connection test from Spring Boot");
-            TestConnection saved = testConnectionRepository.save(testEntity);
-            response.put("insertOperation", saved.getId() != null ? "PASS" : "FAIL");
+//             // Test 2: Insert operation
+//             TestConnection testEntity = new TestConnection("Connection test from Spring Boot");
+//             TestConnection saved = testConnectionRepository.save(testEntity);
+//             response.put("insertOperation", saved.getId() != null ? "PASS" : "FAIL");
             
-            // Test 3: Read operation
-            List<TestConnection> allRecords = testConnectionRepository.findAll();
-            response.put("readOperation", !allRecords.isEmpty() ? "PASS" : "FAIL");
-            response.put("recordCount", allRecords.size());
+//             // Test 3: Read operation
+//             List<TestConnection> allRecords = testConnectionRepository.findAll();
+//             response.put("readOperation", !allRecords.isEmpty() ? "PASS" : "FAIL");
+//             response.put("recordCount", allRecords.size());
             
-            // Test 4: Delete operation
-            testConnectionRepository.deleteById(saved.getId());
-            response.put("deleteOperation", "PASS");
+//             // Test 4: Delete operation
+//             testConnectionRepository.deleteById(saved.getId());
+//             response.put("deleteOperation", "PASS");
             
-            response.put("overallStatus", "SUCCESS");
-            response.put("message", "All database operations completed successfully");
+//             response.put("overallStatus", "SUCCESS");
+//             response.put("message", "All database operations completed successfully");
             
-            return ResponseEntity.ok(response);
-        } catch (Exception e) {
-            response.put("overallStatus", "FAILED");
-            response.put("error", e.getMessage());
-            response.put("errorClass", e.getClass().getSimpleName());
-            return ResponseEntity.status(500).body(response);
-        }
-    }
+//             return ResponseEntity.ok(response);
+//         } catch (Exception e) {
+//             response.put("overallStatus", "FAILED");
+//             response.put("error", e.getMessage());
+//             response.put("errorClass", e.getClass().getSimpleName());
+//             return ResponseEntity.status(500).body(response);
+//         }
+//     }
     
-    @PostMapping("/insert-test-data")
-    public ResponseEntity<TestConnection> insertTestData(@RequestParam(defaultValue = "Test message") String message) {
-        try {
-            TestConnection testEntity = new TestConnection(message);
-            TestConnection saved = testConnectionRepository.save(testEntity);
-            return ResponseEntity.ok(saved);
-        } catch (Exception e) {
-            return ResponseEntity.status(500).build();
-        }
-    }
+//     @PostMapping("/insert-test-data")
+//     public ResponseEntity<TestConnection> insertTestData(@RequestParam(defaultValue = "Test message") String message) {
+//         try {
+//             TestConnection testEntity = new TestConnection(message);
+//             TestConnection saved = testConnectionRepository.save(testEntity);
+//             return ResponseEntity.ok(saved);
+//         } catch (Exception e) {
+//             return ResponseEntity.status(500).build();
+//         }
+//     }
     
-    @GetMapping("/all-test-data")
-    public ResponseEntity<List<TestConnection>> getAllTestData() {
-        try {
-            List<TestConnection> allRecords = testConnectionRepository.findAll();
-            return ResponseEntity.ok(allRecords);
-        } catch (Exception e) {
-            return ResponseEntity.status(500).build();
-        }
-    }
-} 
+//     @GetMapping("/all-test-data")
+//     public ResponseEntity<List<TestConnection>> getAllTestData() {
+//         try {
+//             List<TestConnection> allRecords = testConnectionRepository.findAll();
+//             return ResponseEntity.ok(allRecords);
+//         } catch (Exception e) {
+//             return ResponseEntity.status(500).build();
+//         }
+//     }
+// } 

src/main/java/com/cs102/attendance/entity/TestConnection.java

@@ -1,53 +1,53 @@
-package com.cs102.attendance.entity;
+// package com.cs102.attendance.entity;
 
-import jakarta.persistence.*;
-import java.time.LocalDateTime;
+// import jakarta.persistence.*;
+// import java.time.LocalDateTime;
 
-@Entity
-@Table(name = "test_connections")
-public class TestConnection {
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    
-    @Column(name = "test_message")
-    private String testMessage;
-    
-    @Column(name = "created_at")
-    private LocalDateTime createdAt;
-    
-    public TestConnection() {
-        this.createdAt = LocalDateTime.now();
-    }
-    
-    public TestConnection(String testMessage) {
-        this.testMessage = testMessage;
-        this.createdAt = LocalDateTime.now();
-    }
-    
-    // Getters and setters
-    public Long getId() {
-        return id;
-    }
-    
-    public void setId(Long id) {
-        this.id = id;
-    }
-    
-    public String getTestMessage() {
-        return testMessage;
-    }
-    
-    public void setTestMessage(String testMessage) {
-        this.testMessage = testMessage;
-    }
-    
-    public LocalDateTime getCreatedAt() {
-        return createdAt;
-    }
-    
-    public void setCreatedAt(LocalDateTime createdAt) {
-        this.createdAt = createdAt;
-    }
-} 
+// @Entity
+// @Table(name = "test_connections")
+// public class TestConnection {
+    
+//     @Id
+//     @GeneratedValue(strategy = GenerationType.IDENTITY)
+//     private Long id;
+    
+//     @Column(name = "test_message")
+//     private String testMessage;
+    
+//     @Column(name = "created_at")
+//     private LocalDateTime createdAt;
+    
+//     public TestConnection() {
+//         this.createdAt = LocalDateTime.now();
+//     }
+    
+//     public TestConnection(String testMessage) {
+//         this.testMessage = testMessage;
+//         this.createdAt = LocalDateTime.now();
+//     }
+    
+//     // Getters and setters
+//     public Long getId() {
+//         return id;
+//     }
+    
+//     public void setId(Long id) {
+//         this.id = id;
+//     }
+    
+//     public String getTestMessage() {
+//         return testMessage;
+//     }
+    
+//     public void setTestMessage(String testMessage) {
+//         this.testMessage = testMessage;
+//     }
+    
+//     public LocalDateTime getCreatedAt() {
+//         return createdAt;
+//     }
+    
+//     public void setCreatedAt(LocalDateTime createdAt) {
+//         this.createdAt = createdAt;
+//     }
+// } 

src/main/java/com/cs102/attendance/repository/TestConnectionRepository.java

@@ -1,13 +1,13 @@
-package com.cs102.attendance.repository;
+// package com.cs102.attendance.repository;
 
-import com.cs102.attendance.entity.TestConnection;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
+// import com.cs102.attendance.entity.TestConnection;
+// import org.springframework.data.jpa.repository.JpaRepository;
+// import org.springframework.data.jpa.repository.Query;
+// import org.springframework.stereotype.Repository;
 
-@Repository
-public interface TestConnectionRepository extends JpaRepository<TestConnection, Long> {
+// @Repository
+// public interface TestConnectionRepository extends JpaRepository<TestConnection, Long> {
     
-    @Query(value = "SELECT 1", nativeQuery = true)
-    Integer testQuery();
-} 
+//     @Query(value = "SELECT 1", nativeQuery = true)
+//     Integer testQuery();
+// } 

src/main/java/com/cs102/attendance/service/FastApiCallerService.java

@@ -1,42 +1,50 @@
-// FastApiCallerService.java
 package com.cs102.attendance.service;
 
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
 
 @Service
 public class FastApiCallerService {
 
+    private final RestTemplate restTemplate;
     private static final String FASTAPI_URL = "https://kevansoon-java-facerecognition-endpoint.hf.space/face-recognition";
 
-    private final HttpClient httpClient;
-    private final ObjectMapper objectMapper;
-
     public FastApiCallerService() {
-        this.httpClient = HttpClient.newHttpClient();
-        this.objectMapper = new ObjectMapper();
+        this.restTemplate = new RestTemplate(new SimpleClientHttpRequestFactory());
     }
 
-    public String callFaceRecognition() throws Exception {
-        HttpRequest request = HttpRequest.newBuilder()
-                .GET()
-                .uri(URI.create(FASTAPI_URL))
-                .build();
+    public String callFaceRecognitionWithImage(MultipartFile image) throws Exception {
+        // Wrap MultipartFile bytes with filename
+        ByteArrayResource imageAsResource = new ByteArrayResource(image.getBytes()) {
+            @Override
+            public String getFilename() {
+                return image.getOriginalFilename();
+            }
+        };
+
+        // Prepare multipart form data
+        LinkedMultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        body.add("image", imageAsResource);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+        HttpEntity<LinkedMultiValueMap<String, Object>> requestEntity = new HttpEntity<>(body, headers);
 
-        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        ResponseEntity<String> response = restTemplate.postForEntity(FASTAPI_URL, requestEntity, String.class);
 
-        if (response.statusCode() == 200) {
-            JsonNode jsonNode = objectMapper.readTree(response.body());
-            return jsonNode.path("result").asText();
+        if (response.getStatusCode().is2xxSuccessful()) {
+            return response.getBody();  // Or parse JSON if needed
         } else {
-            throw new RuntimeException("Failed to call FastAPI: HTTP " + response.statusCode());
+            throw new RuntimeException("Failed to call FastAPI: HTTP " + response.getStatusCodeValue());
         }
     }
 }

src/test/java/com/cs102/attendance/Cs102AttendanceProjectApplicationTests.java

@@ -1,50 +1,50 @@
-package com.cs102.attendance;
+// package com.cs102.attendance;
 
-import com.cs102.attendance.repository.TestConnectionRepository;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
+// import com.cs102.attendance.repository.TestConnectionRepository;
+// import org.junit.jupiter.api.Test;
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.boot.test.context.SpringBootTest;
 
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
+// import javax.sql.DataSource;
+// import java.sql.Connection;
+// import java.sql.SQLException;
 
-import static org.junit.jupiter.api.Assertions.*;
+// import static org.junit.jupiter.api.Assertions.*;
 
-@SpringBootTest
-class Cs102AttendanceProjectApplicationTests {
+// @SpringBootTest
+// class Cs102AttendanceProjectApplicationTests {
 
-	@Autowired
-	private DataSource dataSource;
+// 	@Autowired
+// 	private DataSource dataSource;
 
-	@Autowired
-	private TestConnectionRepository testConnectionRepository;
+// 	@Autowired
+// 	private TestConnectionRepository testConnectionRepository;
 
-	@Test
-	void contextLoads() {
-	}
+// 	@Test
+// 	void contextLoads() {
+// 	}
 
-	@Test
-	void testDatabaseConnection() throws SQLException {
-		// Test that we can get a connection from the DataSource
-		try (Connection connection = dataSource.getConnection()) {
-			assertNotNull(connection, "Database connection should not be null");
-			assertTrue(connection.isValid(5), "Database connection should be valid");
+// 	@Test
+// 	void testDatabaseConnection() throws SQLException {
+// 		// Test that we can get a connection from the DataSource
+// 		try (Connection connection = dataSource.getConnection()) {
+// 			assertNotNull(connection, "Database connection should not be null");
+// 			assertTrue(connection.isValid(5), "Database connection should be valid");
 			
-			// Print connection details for verification
-			System.out.println("Database URL: " + connection.getMetaData().getURL());
-			System.out.println("Database Driver: " + connection.getMetaData().getDriverName());
-			System.out.println("Database Version: " + connection.getMetaData().getDatabaseProductVersion());
-		}
-	}
-
-	@Test
-	void testRepositoryConnection() {
-		// Test that the repository can execute queries
-		assertDoesNotThrow(() -> {
-			Integer result = testConnectionRepository.testQuery();
-			assertEquals(1, result, "Test query should return 1");
-		}, "Repository test query should not throw an exception");
-	}
-
-}
+// 			// Print connection details for verification
+// 			System.out.println("Database URL: " + connection.getMetaData().getURL());
+// 			System.out.println("Database Driver: " + connection.getMetaData().getDriverName());
+// 			System.out.println("Database Version: " + connection.getMetaData().getDatabaseProductVersion());
+// 		}
+// 	}
+
+// 	@Test
+// 	void testRepositoryConnection() {
+// 		// Test that the repository can execute queries
+// 		assertDoesNotThrow(() -> {
+// 			Integer result = testConnectionRepository.testQuery();
+// 			assertEquals(1, result, "Test query should return 1");
+// 		}, "Repository test query should not throw an exception");
+// 	}
+
+// }

src/test/java/com/cs102/attendance/controller/TestControllerTest.java

@@ -1,69 +1,69 @@
-package com.cs102.attendance.controller;
+// package com.cs102.attendance.controller;
 
-import com.cs102.attendance.entity.TestConnection;
-import com.cs102.attendance.repository.TestConnectionRepository;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
+// import com.cs102.attendance.entity.TestConnection;
+// import com.cs102.attendance.repository.TestConnectionRepository;
+// import org.junit.jupiter.api.Test;
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+// import org.springframework.test.context.bean.override.mockito.MockitoBean;
+// import org.springframework.http.MediaType;
+// import org.springframework.test.web.servlet.MockMvc;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+// import static org.mockito.ArgumentMatchers.any;
+// import static org.mockito.Mockito.when;
+// import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+// import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
-@WebMvcTest(TestController.class)
-public class TestControllerTest {
+// @WebMvcTest(TestController.class)
+// public class TestControllerTest {
 
-    @Autowired
-    private MockMvc mockMvc;
+//     @Autowired
+//     private MockMvc mockMvc;
 
-    @MockitoBean
-    private TestConnectionRepository testConnectionRepository;
+//     @MockitoBean
+//     private TestConnectionRepository testConnectionRepository;
 
-    @Test
-    public void testInsertTestDataWithDefaultMessage() throws Exception {
-        // Given
-        TestConnection mockSavedEntity = new TestConnection("Test message");
-        mockSavedEntity.setId(1L);
-        when(testConnectionRepository.save(any(TestConnection.class))).thenReturn(mockSavedEntity);
+//     @Test
+//     public void testInsertTestDataWithDefaultMessage() throws Exception {
+//         // Given
+//         TestConnection mockSavedEntity = new TestConnection("Test message");
+//         mockSavedEntity.setId(1L);
+//         when(testConnectionRepository.save(any(TestConnection.class))).thenReturn(mockSavedEntity);
 
-        // When & Then
-        mockMvc.perform(post("/api/test/insert-test-data")
-                .contentType(MediaType.APPLICATION_JSON))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.id").value(1L))
-                .andExpect(jsonPath("$.message").value("Test message"));
-    }
+//         // When & Then
+//         mockMvc.perform(post("/api/test/insert-test-data")
+//                 .contentType(MediaType.APPLICATION_JSON))
+//                 .andExpect(status().isOk())
+//                 .andExpect(jsonPath("$.id").value(1L))
+//                 .andExpect(jsonPath("$.message").value("Test message"));
+//     }
 
-    @Test
-    public void testInsertTestDataWithCustomMessage() throws Exception {
-        // Given
-        String customMessage = "Custom test message";
-        TestConnection mockSavedEntity = new TestConnection(customMessage);
-        mockSavedEntity.setId(2L);
-        when(testConnectionRepository.save(any(TestConnection.class))).thenReturn(mockSavedEntity);
+//     @Test
+//     public void testInsertTestDataWithCustomMessage() throws Exception {
+//         // Given
+//         String customMessage = "Custom test message";
+//         TestConnection mockSavedEntity = new TestConnection(customMessage);
+//         mockSavedEntity.setId(2L);
+//         when(testConnectionRepository.save(any(TestConnection.class))).thenReturn(mockSavedEntity);
 
-        // When & Then
-        mockMvc.perform(post("/api/test/insert-test-data")
-                .param("message", customMessage)
-                .contentType(MediaType.APPLICATION_JSON))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.id").value(2L))
-                .andExpect(jsonPath("$.message").value(customMessage));
-    }
+//         // When & Then
+//         mockMvc.perform(post("/api/test/insert-test-data")
+//                 .param("message", customMessage)
+//                 .contentType(MediaType.APPLICATION_JSON))
+//                 .andExpect(status().isOk())
+//                 .andExpect(jsonPath("$.id").value(2L))
+//                 .andExpect(jsonPath("$.message").value(customMessage));
+//     }
 
-    @Test
-    public void testInsertTestDataWithException() throws Exception {
-        // Given
-        when(testConnectionRepository.save(any(TestConnection.class)))
-                .thenThrow(new RuntimeException("Database error"));
+//     @Test
+//     public void testInsertTestDataWithException() throws Exception {
+//         // Given
+//         when(testConnectionRepository.save(any(TestConnection.class)))
+//                 .thenThrow(new RuntimeException("Database error"));
 
-        // When & Then
-        mockMvc.perform(post("/api/test/insert-test-data")
-                .contentType(MediaType.APPLICATION_JSON))
-                .andExpect(status().isInternalServerError());
-    }
-} 
+//         // When & Then
+//         mockMvc.perform(post("/api/test/insert-test-data")
+//                 .contentType(MediaType.APPLICATION_JSON))
+//                 .andExpect(status().isInternalServerError());
+//     }
+// } 

video-object-detection/main.js

@@ -61,6 +61,37 @@ const COLOURS = [
 ];
 
 // Function to send canvas image to Gradio API
+// async function sendCanvasImageToAPI(canvas) {
+//   return new Promise((resolve, reject) => {
+//     canvas.toBlob(async (blob) => {
+//       if (!blob) {
+//         reject("Failed to get Blob from canvas");
+//         return;
+//       }
+
+//       const file1 = new File([blob], "detected.png", { type: "image/png" });
+
+//       try {
+//         // Fetch image from URL and convert to Blob
+//         const response = await fetch("https://qvnhhditkzzeudppuezf.supabase.co/storage/v1/object/public/post-images/post-images/1752289670997-kevan.jpg");
+//         const frame2Blob = await response.blob();
+//         const file2 = new File([frame2Blob], "frame2.jpg", { type: frame2Blob.type });
+
+//         const client = await Client.connect("MiniAiLive/FaceRecognition-LivenessDetection-Demo");
+
+//         // Send canvas image as frame1, URL image as frame2
+//         const result = await client.predict("/face_compare", {
+//           frame1: file1,
+//           frame2: file2,
+//         });
+//         resolve(result);
+//       } catch (err) {
+//         reject(err);
+//       }
+//     }, "image/png");
+//   });
+// }
+
 async function sendCanvasImageToAPI(canvas) {
   return new Promise((resolve, reject) => {
     canvas.toBlob(async (blob) => {
@@ -69,21 +100,23 @@ async function sendCanvasImageToAPI(canvas) {
         return;
       }
 
-      const file1 = new File([blob], "detected.png", { type: "image/png" });
+      const file = new File([blob], "detected.png", { type: "image/png" });
 
       try {
-        // Fetch image from URL and convert to Blob
-        const response = await fetch("https://qvnhhditkzzeudppuezf.supabase.co/storage/v1/object/public/post-images/post-images/1752289670997-kevan.jpg");
-        const frame2Blob = await response.blob();
-        const file2 = new File([frame2Blob], "frame2.jpg", { type: frame2Blob.type });
-
-        const client = await Client.connect("MiniAiLive/FaceRecognition-LivenessDetection-Demo");
+        const formData = new FormData();
+        formData.append("image", file);
 
-        // Send canvas image as frame1, URL image as frame2
-        const result = await client.predict("/face_compare", {
-          frame1: file1,
-          frame2: file2,
+        const response = await fetch("http://localhost:8080/call-face-recognition", {
+          method: "POST",
+          body: formData,
         });
+
+        if (!response.ok) {
+          reject("Failed to send image: " + response.statusText);
+          return;
+        }
+
+        const result = await response.text(); // or JSON if backend returns JSON
         resolve(result);
       } catch (err) {
         reject(err);
@@ -92,6 +125,7 @@ async function sendCanvasImageToAPI(canvas) {
   });
 }
 
+
 // Variables to store current bounding box and label elements
 let currentBoxElement = null;
 let currentLabelElement = null;
@@ -135,15 +169,19 @@ function renderBox([xmin, ymin, xmax, ymax, score, id], [w, h]) {
   if (!hasSent) {
     hasSent = true;
     sendCanvasImageToAPI(canvas)
-      .then((result) => {
-        console.log("API result:", result);
-
-        const str = result.data[0]; // Access first element in array
-        const startIndex = str.indexOf("Similarity");
-        const slicedStr = startIndex !== -1 ? str.slice(startIndex) : "";
-        const decimalMatch = slicedStr.match(/<td>(0?\.\d+)<\/td>/);
-        const decimalNumber = decimalMatch ? parseFloat(decimalMatch[1]) : null;
-        console.log("Similarity decimal:", decimalNumber);
+      .then((response) => {
+        
+        const responseObj = JSON.parse(response); 
+        const confidenceStr = responseObj.result; // "0.982708"
+
+        // Extract decimal part only:
+        // const decimalPart = confidenceStr.slice(confidenceStr.indexOf('.') + 1);
+        // console.log(decimalPart);  // e.g., "982708"
+
+        // Convert to float for comparison
+        const decimalNumber = parseFloat(confidenceStr);
+        console.log(decimalNumber);
+        
 
         if (decimalNumber !== null && decimalNumber > 0.80) {
           // --- MODIFICATION START ---