Clean-up

src/main/java/com/superfintech/superpayment/controller/PaymentController.java

@@ -8,7 +8,11 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 @RequestMapping("/payment")

src/main/java/com/superfintech/superpayment/entity/Company.java

@@ -1,12 +1,13 @@
 package com.superfintech.superpayment.entity;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.GenericGenerator;
 
-import java.util.List;
-
 @Data
 @Entity
 @EqualsAndHashCode
@@ -16,10 +17,8 @@ public class Company {
     @GeneratedValue(strategy = GenerationType.UUID)
     @GenericGenerator(name = "uuid")
     private String id;
-    private String name;
 
-    @ElementCollection(targetClass = Payment.class, fetch = FetchType.EAGER)
-    List<Payment> payments;
+    private String name;
 
     private boolean deleted;
 }

src/main/java/com/superfintech/superpayment/service/PaymentService.java

@@ -57,7 +57,6 @@ private boolean savePayment(Payment payment) {
     }
 
     public Page<Payment> getAllPayments(int pageNumber, int pageSize) {
-        // Ensure non-negative page numbers and a minimum page size of 1
         int safePageNumber = Math.max(pageNumber, 0);
         int safePageSize = Math.max(pageSize, 1);
 

src/test/java/com/superfintech/superpayment/controller/BackofficeControllerTest.java

@@ -21,7 +21,9 @@
 import static org.mockito.Mockito.when;
 import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
 
 @WebMvcTest(BackofficeController.class)
 public class BackofficeControllerTest {

src/test/java/com/superfintech/superpayment/service/PaymentServiceTest.java

@@ -20,9 +20,16 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.argThat;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @SpringBootTest
 public class PaymentServiceTest {

src/test/java/com/superfintech/superpayment/service/VoucherTransactionVerifierTest.java

@@ -1,6 +1,5 @@
 package com.superfintech.superpayment.service;
 
-import com.superfintech.superpayment.service.VoucherTransactionVerifier;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;