Feature/visa tests

pom.xml

@@ -154,6 +154,11 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/org/example/visacasemanagementsystem/VisaCaseManagementSystemApplication.java

@@ -1,55 +1,12 @@
 package org.example.visacasemanagementsystem;
 
-import org.example.visacasemanagementsystem.user.UserAuthorization;
-import org.example.visacasemanagementsystem.user.entity.User;
-import org.example.visacasemanagementsystem.user.repository.UserRepository;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @SpringBootApplication
-@EnableJpaAuditing
 public class VisaCaseManagementSystemApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(VisaCaseManagementSystemApplication.class, args);
     }
-
-    @Bean
-    public CommandLineRunner initData(UserRepository userRepository) {
-        return args -> {
-            // Skapa en vanlig användare (Applicant)
-            if (userRepository.findByEmail("user@test.com").isEmpty()) {
-                User user = new User();
-                user.setFullName("USER");
-                user.setEmail("user@test.com");
-                user.setPassword("password"); // Notera: Du behöver sätta lösenord om din entitet kräver det
-                user.setUserAuthorization(UserAuthorization.USER);
-                userRepository.save(user);
-                System.out.println("Testanvändare skapad med ID: " + user.getId());
-
-                User admin = new User();
-                admin.setFullName("ADMIN");
-                admin.setEmail("user@test.com2");
-                admin.setPassword("password"); // Notera: Du behöver sätta lösenord om din entitet kräver det
-                admin.setUserAuthorization(UserAuthorization.ADMIN);
-                userRepository.save(admin);
-                System.out.println("Test-admin skapad med ID: " + admin.getId());
-            }
-
-            // Skapa en admin (Handler)
-            if (userRepository.findByEmail("admin@test.com").isEmpty()) {
-                User sysadmin = new User();
-                sysadmin.setFullName("SYSTEM ADMIN");
-                sysadmin.setEmail("admin@test.com");
-                sysadmin.setPassword("password");
-                sysadmin.setUserAuthorization(UserAuthorization.SYSADMIN);
-                userRepository.save(sysadmin);
-                System.out.println("Test-sysadmin skapad med ID: " + sysadmin.getId());
-            }
-        };
-    }
-
 }

src/main/java/org/example/visacasemanagementsystem/config/DataInitializer.java

@@ -0,0 +1,47 @@
+package org.example.visacasemanagementsystem.config;
+
+import org.example.visacasemanagementsystem.user.UserAuthorization;
+import org.example.visacasemanagementsystem.user.entity.User;
+import org.example.visacasemanagementsystem.user.repository.UserRepository;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class DataInitializer{
+
+    @Bean
+    public CommandLineRunner initData(UserRepository userRepository) {
+        return args -> {
+
+            if (userRepository.findByEmail("user@test.com").isEmpty()) {
+                User user = new User();
+                user.setFullName("USER");
+                user.setEmail("user@test.com");
+                user.setPassword("password");
+                user.setUserAuthorization(UserAuthorization.USER);
+                userRepository.save(user);
+                System.out.println("Testanvändare skapad med ID: " + user.getId());
+
+                User admin = new User();
+                admin.setFullName("ADMIN");
+                admin.setEmail("user@test.com2");
+                admin.setPassword("password");
+                admin.setUserAuthorization(UserAuthorization.ADMIN);
+                userRepository.save(admin);
+                System.out.println("Test-admin skapad med ID: " + admin.getId());
+            }
+
+            if (userRepository.findByEmail("admin@test.com").isEmpty()) {
+                User sysadmin = new User();
+                sysadmin.setFullName("SYSTEM ADMIN");
+                sysadmin.setEmail("admin@test.com");
+                sysadmin.setPassword("password");
+                sysadmin.setUserAuthorization(UserAuthorization.SYSADMIN);
+                userRepository.save(sysadmin);
+                System.out.println("Test-sysadmin skapad med ID: " + sysadmin.getId());
+            }
+        };
+    }
+
+}

src/main/java/org/example/visacasemanagementsystem/config/JpaConfig.java

@@ -0,0 +1,9 @@
+package org.example.visacasemanagementsystem.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
+@Configuration
+@EnableJpaAuditing
+public class JpaConfig {
+}

src/main/resources/templates/visa/details.html

@@ -227,7 +227,7 @@ <h3>Comments</h3>
                 <strong th:text="${comment.authorName}">Admin</strong> •
                 <span th:text="${#temporals.format(comment.createdAt, 'MMM dd, HH:mm')}">Oct 27, 14:00</span>
             </div>
-            <div class="comment-text" th:text="${comment.content}">This is a comment</div>
+            <div class="comment-text" th:text="${comment.text}">This is a comment</div>
         </div>
 
         <div th:if="${#lists.isEmpty(comments)}" style="color: #999; padding: 20px 0;">

src/test/java/org/example/visacasemanagementsystem/visa/VisaServiceIntegrationTest.java

@@ -0,0 +1,158 @@
+package org.example.visacasemanagementsystem.visa;
+
+import org.example.visacasemanagementsystem.audit.AuditEventType;
+import org.example.visacasemanagementsystem.audit.service.AuditService;
+import org.example.visacasemanagementsystem.user.UserAuthorization;
+import org.example.visacasemanagementsystem.user.entity.User;
+import org.example.visacasemanagementsystem.user.repository.UserRepository;
+import org.example.visacasemanagementsystem.visa.dto.CreateVisaDTO;
+import org.example.visacasemanagementsystem.visa.dto.UpdateVisaDTO;
+import org.example.visacasemanagementsystem.visa.entity.Visa;
+import org.example.visacasemanagementsystem.visa.repository.VisaRepository;
+import org.example.visacasemanagementsystem.visa.service.VisaService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest
+@Transactional
+@ActiveProfiles("test")
+class VisaServiceIntegrationTest {
+
+    @Autowired
+    private VisaService visaService;
+    @Autowired
+    private VisaRepository visaRepository;
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private AuditService auditService;
+
+    @Test
+    void applyForVisa_shouldSaveVisa_WhenDataIsValid() {
+        // Arrange
+       User user = createAndSaveValidUser();
+
+        CreateVisaDTO dto = new CreateVisaDTO(
+                VisaType.STUDY, "Swedish", "PASS-INT-123",
+                LocalDate.now().plusDays(30),
+                user.getId()
+        );
+
+        // Act
+        visaService.applyForVisa(dto, user.getId());
+
+        // Assert
+        var savedVisas = visaRepository.findAll();
+        assertThat(savedVisas).hasSize(1);
+        assertThat(savedVisas.get(0).getPassportNumber()).isEqualTo("PASS-INT-123");
+        assertThat(auditService.findAll()).isNotEmpty();
+
+    }
+
+    @Test
+    void updateVisa_shouldUpdateVisaAndResetStatus_WhenUserIsAuthorized() {
+        // Arrange
+        User user  = createAndSaveValidUser();
+
+        Visa visa = new Visa();
+        visa.setApplicant(user);
+        visa.setVisaStatus(VisaStatus.INCOMPLETE);
+        visa.setPassportNumber("OLD-PASS");
+        visa.setNationality("Swedish");
+        visa.setVisaType(VisaType.STUDY);
+        visa.setTravelDate(LocalDate.now().plusMonths(2));
+
+        visa.setStatusInformation("Please fix upload a clearer image of your passport");
+        visa = visaRepository.save(visa);
+
+        UpdateVisaDTO dto = new UpdateVisaDTO(
+                visa.getId(), VisaType.TOURIST, VisaStatus.SUBMITTED,
+                "Swedish", "NEW-PASS-999", LocalDate.now().plusMonths(1), null
+        );
+
+        // Act
+        visaService.updateVisa(visa.getId(), dto, user.getId());
+
+        // Assert
+      Visa updatedVisa = visaRepository.findById(visa.getId()).get();
+
+      assertThat(updatedVisa.getPassportNumber()).isEqualTo("NEW-PASS-999");
+      assertThat(updatedVisa.getVisaType()).isEqualTo(VisaType.TOURIST);
+      assertThat(updatedVisa.getVisaStatus()).isEqualTo(VisaStatus.SUBMITTED);
+      assertThat(updatedVisa.getStatusInformation()).isNull();
+
+        var logs = auditService.findAll();
+
+        Visa finalVisa = visa;
+        assertThat(logs)
+                .as("Check that an update log exists in the audit DTO list")
+                .anyMatch(log ->
+                        log.visaCaseId() != null &&
+                                log.visaCaseId().equals(finalVisa.getId()) &&
+                                log.auditEventType() == AuditEventType.UPDATED
+                );
+
+    }
+
+    @Test
+    void assignHandler_shouldAssignAdminToVisa_AndChangeStatusToAssigned() {
+        // Arrange
+        User admin = new User();
+        admin.setFullName("Test Admin");
+        admin.setEmail("admin@test2.com");
+        admin.setPassword("password123");
+        admin.setUserAuthorization(UserAuthorization.ADMIN);
+        admin = userRepository.save(admin);
+
+        User applicant = createAndSaveValidUser();
+
+        Visa visa = new Visa();
+        visa.setApplicant(applicant);
+        visa.setVisaStatus(VisaStatus.INCOMPLETE);
+        visa.setNationality("Swedish");
+        visa.setPassportNumber("PASS123");
+        visa.setVisaType(VisaType.STUDY);
+        visa.setTravelDate(LocalDate.now().plusMonths(1));
+        visa = visaRepository.save(visa);
+
+        // Act
+        visaService.assignHandler(visa.getId(), admin.getId());
+
+        // Assert
+      Visa updatedVisa = visaRepository.findById(visa.getId()).orElseThrow();
+
+      assertThat(updatedVisa.getHandler()).isNotNull();
+      assertThat(updatedVisa.getHandler().getId()).isEqualTo(admin.getId());
+      assertThat(updatedVisa.getVisaStatus()).isEqualTo(VisaStatus.ASSIGNED);
+
+        var logs = auditService.findAll();
+        User finalAdmin = admin;
+        assertThat(logs).anyMatch(log ->
+                log.visaCaseId().equals(updatedVisa.getId()) &&
+                        log.userId().equals(finalAdmin.getId()) &&
+                        log.auditEventType() == AuditEventType.ASSIGNED &&
+                        log.description().contains("Test Admin")
+        );
+    }
+
+
+    private User createAndSaveValidUser() {
+        User user = new User();
+        user.setFullName("Test User");
+        user.setEmail(java.util.UUID.randomUUID() + "@test.com"); // Unik mail varje gång
+        user.setPassword("password");
+        user.setUserAuthorization(UserAuthorization.USER);
+        return userRepository.save(user);
+    }
+
+
+
+}