debug: update DB migration & schema; test updates for patient controller and encounter service

Author: DeveloperWilliams

src/main/resources/db/migration/V1__init.sql

@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS observations (
     encounter_id BIGINT NULL,
     code VARCHAR(50) NOT NULL,
     display_name VARCHAR(200) NOT NULL,
-    value VARCHAR(500) NOT NULL,
+    "value" VARCHAR(500) NOT NULL,
     unit VARCHAR(50) NULL,
     effective_date_time TIMESTAMP NOT NULL,
     created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,

src/main/resources/db/schema.sql

@@ -33,7 +33,7 @@ CREATE TABLE IF NOT EXISTS observations (
     encounter_id BIGINT NULL,
     code VARCHAR(50) NOT NULL,
     display_name VARCHAR(200) NOT NULL,
-    value VARCHAR(500) NOT NULL,
+    "value" VARCHAR(500) NOT NULL,
     unit VARCHAR(50) NULL,
     effective_date_time TIMESTAMP NOT NULL,
     created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,

src/test/java/com/countyhospital/healthapi/controller/PatientControllerTest.java

@@ -52,7 +52,7 @@ class PatientControllerTest {
     private PatientRequest patientRequest;
 
     @BeforeEach
-    void setUp() {
+    public void setUp() {
         patient = new Patient("PAT-001", "John", "Doe", 
                              LocalDate.of(1985, 5, 15), "MALE");
         patient.setId(1L);

src/test/java/com/countyhospital/healthapi/service/EncounterServiceTest.java

@@ -1,33 +1,36 @@
 package com.countyhospital.healthapi.service;
 
-import com.countyhospital.healthapi.common.exception.BusinessException;
-import com.countyhospital.healthapi.common.exception.ResourceNotFoundException;
-import com.countyhospital.healthapi.common.exception.ValidationException;
-import com.countyhospital.healthapi.encounter.domain.Encounter;
-import com.countyhospital.healthapi.encounter.repository.EncounterRepository;
-import com.countyhospital.healthapi.encounter.service.EncounterServiceImpl;
-import com.countyhospital.healthapi.patient.domain.Patient;
-import com.countyhospital.healthapi.patient.service.PatientService;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import static org.mockito.ArgumentMatchers.any;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import com.countyhospital.healthapi.common.exception.BusinessException;
+import com.countyhospital.healthapi.common.exception.ResourceNotFoundException;
+import com.countyhospital.healthapi.common.exception.ValidationException;
+import com.countyhospital.healthapi.encounter.domain.Encounter;
+import com.countyhospital.healthapi.encounter.repository.EncounterRepository;
+import com.countyhospital.healthapi.encounter.service.EncounterServiceImpl;
+import com.countyhospital.healthapi.patient.domain.Patient;
+import com.countyhospital.healthapi.patient.service.PatientService;
 
 @ExtendWith(MockitoExtension.class)
 class EncounterServiceTest {
@@ -155,11 +158,11 @@ void whenGetEncountersByPatientId_thenReturnEncounters() {
 
     @Test
     void whenGetEncountersByPatientIdWithPagination_thenReturnPage() {
-        // Given
-        Pageable pageable = PageRequest.of(0, 10);
-        Page<Encounter> encounterPage = new PageImpl<>(Arrays.asList(encounter1, encounter2));
-        when(patientService.getPatientById(1L)).thenReturn(patient);
-       // when(encounterRepository.findAll(any(), eq(pageable))).thenReturn(encounterPage);
+    // Given
+    Pageable pageable = PageRequest.of(0, 10);
+    when(patientService.getPatientById(1L)).thenReturn(patient);
+    // when(encounterRepository.findAll(any(), eq(pageable))).thenReturn(new PageImpl<>(Arrays.asList(encounter1, encounter2)));
+    when(encounterRepository.findByPatientId(1L)).thenReturn(Arrays.asList(encounter1, encounter2));
 
         // When
         Page<Encounter> result = encounterService.getEncountersByPatientId(1L, pageable);