fixed Test Classes (#85)

* fixed 4 Test Classes

* add application-test.yml and fixed all test classes

---------

Co-authored-by: anuragsharma <anurag.s@gmail.com>
Co-authored-by: Akshay Mathur <akshay.mathur@statusneo.com>

Author: 3 people

web-backend/src/main/java/com/statusneo/vms/service/GraphEmailService.java

@@ -22,6 +22,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -41,14 +42,17 @@
  * Service responsible for handling all email communications in the Visitor Management System.
  */
 @Service
-@Profile({"prod", "default", "sqlite"})
+@Profile({"prod", "default", "sqlite", "test"})
 public class GraphEmailService implements EmailService {
 
     private static final Logger logger = LoggerFactory.getLogger(GraphEmailService.class);
 
     private final RestClient restClient;
     private final OAuth2AuthorizedClientManager authorizedClientManager;
 
+    @Value("${graph.api.base-url}")
+    private String graphApiBaseUrl;
+
     @Autowired
     public GraphEmailService(OAuth2AuthorizedClientManager authorizedClientManager,
                              RestClient restClient) {
@@ -72,7 +76,7 @@ public String getAccessToken() {
     @Override
     public boolean sendEmail(Email email) {
         String accessToken = getAccessToken();
-        String endpointUsers = String.format("https://graph.microsoft.com/v1.0/users/%s/sendMail", email.from());
+        String endpointUsers = String.format("%s/users/%s/sendMail", graphApiBaseUrl, email.from());
 
         Map<String, Object> emailData = new HashMap<>();
         Map<String, Object> message = new HashMap<>();

web-backend/src/main/java/com/statusneo/vms/service/NotificationService.java

@@ -46,14 +46,17 @@ public class NotificationService {
 
     private final EmailService emailService;
     private final TemplateEngine templateEngine;
+    private final String systemFrom;
 
     // Use the env-backed VMS_SYSTEM_EMAIL (fallback to vms.system-email or default noreply)
-    @Value("${VMS_SYSTEM_EMAIL:${vms.system-email:noreply@company.com}}")
-    private String systemFrom;
-
-    public NotificationService(EmailService emailService, TemplateEngine templateEngine) {
+    public NotificationService(
+            EmailService emailService,
+            TemplateEngine templateEngine,
+            @Value("${VMS_SYSTEM_EMAIL:${vms.system-email:noreply@company.com}}") String systemFrom
+    ) {
         this.emailService = emailService;
         this.templateEngine = templateEngine;
+        this.systemFrom = systemFrom;
     }
 
     public void sendVisitorConfirmationEmail(Visitor visitor) {

web-backend/src/main/java/com/statusneo/vms/service/OtpService.java

@@ -71,7 +71,7 @@ public OtpService(OtpRepository otpRepository, EmailService emailService,
          this.systemFrom = systemFrom;
      }
 
-     private static final int OTP_EXPIRATION_MINUTES = 10;
+     private static final int OTP_EXPIRATION_MINUTES = 3;
      private static final int MAX_OTP_ATTEMPTS = 2;
      private static final int MAX_RESEND_COUNT = 2;
      private static final int RESEND_COOLDOWN_MINUTES = 2;

web-backend/src/main/java/com/statusneo/vms/service/ScheduledTasks.java

@@ -26,20 +26,23 @@
 import org.springframework.stereotype.Component;
 
 @Component
-@Profile("prod")
+@Profile({"prod","test"})
 public class ScheduledTasks {
 
     private final ExcelService excelService;
     private final GraphDirectoryService graphDirectoryService;
 
     private static final Logger log = LoggerFactory.getLogger(ScheduledTasks.class);
 
-
     public ScheduledTasks(ExcelService excelService, GraphDirectoryService graphDirectoryService) {
         this.excelService = excelService;
         this.graphDirectoryService = graphDirectoryService;
     }
 
+    @Scheduled(
+            fixedRateString = "${vms.scheduled.report.rate:43200000}",
+            initialDelayString = "${vms.scheduled.report.initialDelay:PT2H}"
+    )
     @Scheduled(fixedRateString = "${vms.scheduled.report.rate:43200000}", initialDelayString = "PT2H") // Runs every 12 hours by default
     public void sendVisitorReport() {
         excelService.sendVisitorReport();

web-backend/src/main/java/com/statusneo/vms/service/VisitService.java

@@ -56,23 +56,6 @@ public VisitService(OtpService otpService, VisitorRepository visitorRepository,
         this.visitRepository = visitRepository;
     }
 
-
-    // Send OTP
-//        notificationService.sendOtp(visitor.getEmail(), visitor.getOtp());
-//    }
-//
-//    @Transactional
-//    public Visitor saveVisitor(Visitor visitor) {
-//        Visitor savedVisitor = visitorRepository.save(visitor);
-//        emailService.sendVisitorEmail(savedVisitor);
-//        otpService.sendOtp(savedVisitor.getEmail());
-//        return savedVisitor;
-//    }
-
-
-//        return otpService.sendOtp(visit.getVisitor().getEmail(), visit);
-//    }
-
     /**
      * Registers a new visit and generates an OTP for visitor verification.
      * The OTP is associated with the visit and sent to the visitor's email.

web-backend/src/main/java/com/statusneo/vms/service/WiremockMailServiceImpl.java

@@ -47,8 +47,7 @@ vms:
   sync:
     onstartup:
       enabled: false
-wiremock:
-  server:
-    port: 8081
-mail:
-  url: http://localhost:${wiremock.server.port}/v1.0/users/%s/sendMail
+
+graph:
+  api:
+    base-url: https://graph.microsoft.com/v1.0

web-backend/src/main/resources/application.yml

@@ -2,14 +2,13 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
+import org.springframework.test.context.ActiveProfiles;
 
-@Import(TestcontainersConfiguration.class)
 @SpringBootTest
+@ActiveProfiles("test")
 class VmsApplicationTests {
 
 	@Test
 	void contextLoads() {
 	}
-
 }

web-backend/src/test/java/com/statusneo/vms/VmsApplicationTests.java

@@ -0,0 +1,18 @@
+package com.statusneo.vms.config;
+import com.statusneo.vms.service.EmailService;
+import com.statusneo.vms.service.GraphDirectoryService;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import static org.mockito.Mockito.mock;
+
+@TestConfiguration
+public class TestConfig {
+    @Bean
+    public GraphDirectoryService graphDirectoryService() {
+        return mock(GraphDirectoryService.class);
+    }
+    @Bean
+    public EmailService emailService() {
+        return mock(EmailService.class);
+    }
+}

web-backend/src/test/java/com/statusneo/vms/config/TestConfig.java

@@ -1,15 +1,14 @@
 package com.statusneo.vms.service;
 
-import com.statusneo.vms.TestcontainersConfiguration;
 import com.statusneo.vms.model.Visitor;
 import com.statusneo.vms.repository.VisitorRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -19,9 +18,11 @@
 @SpringBootTest
 @Disabled("Enable this test with real credentials and configuration for full integration testing.")
 @ActiveProfiles("test")
-@Import(TestcontainersConfiguration.class)
 class ExcelServiceITest {
 
+    @MockitoBean
+    private EmailService emailService;
+
     @Autowired
     private ExcelService excelService;