From 3ce60bae3b2b10961d5996ad37424187521e6603 Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Tue, 22 Oct 2024 13:52:10 +0300 Subject: [PATCH 01/26] Worked on Headers --- frontend/src/components/common/PatientHeader.js | 6 +++--- .../resultsViewer/results-viewer.styles.scss | 17 +++++++++++++++++ .../patient/resultsViewer/results-viewer.tsx | 10 +++++----- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/common/PatientHeader.js b/frontend/src/components/common/PatientHeader.js index 6a293d23dd..6f366c1b6b 100644 --- a/frontend/src/components/common/PatientHeader.js +++ b/frontend/src/components/common/PatientHeader.js @@ -32,7 +32,7 @@ const PatientHeader = (props) => { {id ? (
- +
{ />
- +
{patientName ? patientName : lastName + " " + firstName}
@@ -137,7 +137,7 @@ const PatientHeader = (props) => { ) : (
- + = () => { <> - + = () => { return ( <> - + {intl.formatMessage({ id: "home.label" })} @@ -116,7 +116,7 @@ const RoutedResultsViewer: React.FC = () => { - +
@@ -127,7 +127,7 @@ const RoutedResultsViewer: React.FC = () => { - + = () => { {roots?.length ? ( - + Date: Mon, 28 Oct 2024 15:55:57 +0300 Subject: [PATCH 02/26] added sample service test class --- .../daoimpl/SampleHumanDAOImpl.java | 2 +- .../org/openelisglobal/AppTestConfig.java | 173 ++++++++ .../sample/SampleServiceTest.java | 404 ++++++++++++++++++ 3 files changed, 578 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/openelisglobal/sample/SampleServiceTest.java diff --git a/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java b/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java index 36684fdae4..35ea8536e1 100644 --- a/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java +++ b/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java @@ -145,7 +145,7 @@ public List getSamplesForPatient(String patientID) throws LIMSRuntimeExc + " sampleHuman.sampleId = sample.id and sampleHuman.patientId = :patientId order by" + " sample.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, Sample.class); - query.setParameter("patientId", Integer.parseInt(patientID)); + query.setParameter("patientId", patientID); samples = query.list(); } catch (HibernateException e) { LogEvent.logError(e); diff --git a/src/test/java/org/openelisglobal/AppTestConfig.java b/src/test/java/org/openelisglobal/AppTestConfig.java index c790fd6441..d3400f8eca 100644 --- a/src/test/java/org/openelisglobal/AppTestConfig.java +++ b/src/test/java/org/openelisglobal/AppTestConfig.java @@ -7,19 +7,43 @@ import java.util.List; import lombok.NonNull; import org.openelisglobal.audittrail.dao.AuditTrailService; +import org.openelisglobal.common.services.IStatusService; import org.openelisglobal.common.util.Versioning; import org.openelisglobal.dataexchange.fhir.service.FhirPersistanceService; +import org.openelisglobal.dataexchange.service.order.ElectronicOrderService; import org.openelisglobal.externalconnections.service.BasicAuthenticationDataService; import org.openelisglobal.externalconnections.service.ExternalConnectionService; import org.openelisglobal.internationalization.MessageUtil; import org.openelisglobal.localization.dao.LocalizationDAO; import org.openelisglobal.localization.service.LocalizationServiceImpl; +import org.openelisglobal.note.service.NoteService; +import org.openelisglobal.referral.service.ReferralResultService; +import org.openelisglobal.referral.service.ReferralSetService; + +import org.openelisglobal.notification.service.AnalysisNotificationConfigService; +import org.openelisglobal.notification.service.TestNotificationConfigService; +import org.openelisglobal.observationhistory.service.ObservationHistoryService; +import org.openelisglobal.observationhistorytype.service.ObservationHistoryTypeService; +import org.openelisglobal.organization.service.OrganizationService; +import org.openelisglobal.program.service.ImmunohistochemistrySampleService; +import org.openelisglobal.program.service.PathologySampleService; +import org.openelisglobal.program.service.ProgramSampleService; +import org.openelisglobal.provider.service.ProviderService; +import org.openelisglobal.referral.service.ReferralService; +import org.openelisglobal.requester.service.RequesterTypeService; +import org.openelisglobal.requester.service.SampleRequesterService; +import org.openelisglobal.sampleorganization.service.SampleOrganizationService; +import org.openelisglobal.sampleqaevent.service.SampleQaEventService; import org.openelisglobal.siteinformation.service.SiteInformationService; +import org.openelisglobal.statusofsample.service.StatusOfSampleService; import org.openelisglobal.test.dao.TestDAO; +import org.openelisglobal.test.service.TestSectionService; import org.openelisglobal.test.service.TestServiceImpl; import org.openelisglobal.testresult.service.TestResultService; import org.openelisglobal.typeofsample.service.TypeOfSampleService; import org.openelisglobal.typeofsample.service.TypeOfSampleTestService; +import org.openelisglobal.userrole.service.UserRoleService; +import org.springframework.beans.factory.UnsatisfiedDependencyException; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -51,8 +75,13 @@ "org.openelisglobal.systemusermodule.daoimpl", "org.openelisglobal.systemusermodule.service", "org.openelisglobal.login.service", "org.openelisglobal.view", "org.openelisglobal.search.service", "org.openelisglobal.sample.daoimpl", "org.openelisglobal.common.util", + "org.openelisglobal.login.service", "org.openelisglobal.view", "org.openelisglobal.search.service", + "org.openelisglobal.sample", "org.openelisglobal.sampleitem.", "org.openelisglobal.analysis", "org.openelisglobal.result.service", + "org.openelisglobal.result.daoimpl", "org.openelisglobal.resultlimit", "org.openelisglobal.resultlimits", + "org.openelisglobal.typeoftestresult", "org.openelisglobal.samplehuman", "org.openelisglobal.role", }, excludeFilters = { @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.patient.controller.*"), + @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.sample.controller.*"), @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.dictionary.controller.*.java"), @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.config.*"), @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.fhir.*"), @@ -91,6 +120,138 @@ public BasicAuthenticationDataService basicAuthDataService() { return mock(BasicAuthenticationDataService.class); } + @Bean() + @Profile("test") + public NoteService noteServiceoteService() { + return mock(NoteService.class); + } + + @Bean() + @Profile("test") + public SampleQaEventService sampleQaEventService() { + return mock(SampleQaEventService.class); + } + + @Bean() + @Profile("test") + public SampleRequesterService sampleRequesterService() { + return mock(SampleRequesterService.class); + } + + @Bean() + @Profile("test") + public RequesterTypeService requesterTypeService() { + return mock(RequesterTypeService.class); + } + + @Bean() + @Profile("test") + public OrganizationService organizationService() { + return mock(OrganizationService.class); + } + + @Bean() + @Profile("test") + public BasicAuthenticationDataService basicAuthenticationDataService() { + return mock(BasicAuthenticationDataService.class); + } + + @Bean() + @Profile("test") + public ObservationHistoryService observationHistoryService() { + return mock(ObservationHistoryService.class); + } + + @Bean() + @Profile("test") + public TestSectionService testSectionService() { + return mock(TestSectionService.class); + } + + @Bean() + @Profile("test") + public ProviderService providerService() { + return mock(ProviderService.class); + } + + @Bean() + @Profile("test") + public UserRoleService userRoleService() { + return mock(UserRoleService.class); + } + + @Bean() + @Profile("test") + public TestNotificationConfigService testNotificationConfigService() { + return mock(TestNotificationConfigService.class); + } + + @Bean() + @Profile("test") + public UnsatisfiedDependencyException unsatisfiedDependencyException() { + return mock(UnsatisfiedDependencyException.class); + } + + @Bean() + @Profile("test") + public ElectronicOrderService electronicOrderService() { + return mock(ElectronicOrderService.class); + } + + @Bean() + @Profile("test") + public AnalysisNotificationConfigService analysisNotificationConfigService() { + return mock(AnalysisNotificationConfigService.class); + } + + @Bean() + @Profile("test") + public PathologySampleService pathologySampleService() { + return mock(PathologySampleService.class); + } + + @Bean() + @Profile("test") + public ImmunohistochemistrySampleService immunohistochemistrySampleService() { + return mock(ImmunohistochemistrySampleService.class); + } + + @Bean() + @Profile("test") + public ProgramSampleService programSampleService() { + return mock(ProgramSampleService.class); + } + + @Bean() + @Profile("test") + public ObservationHistoryTypeService observationHistoryTypeService() { + return mock(ObservationHistoryTypeService.class); + } + + @Bean() + @Profile("test") + public SampleOrganizationService sampleOrganizationService() { + return mock(SampleOrganizationService.class); + } + + @Bean() + @Profile("test") + public ReferralResultService ReferralResultService() { + return mock(ReferralResultService.class); + } + + @Bean() + @Profile("test") + public ReferralService referralService() { + return mock(ReferralService.class); + } + + @Bean() + @Profile("test") + public ReferralSetService ReferralSetService() { + return mock(ReferralSetService.class); + } + @Bean() @Profile("test") public TestServiceImpl testServiceImpl() { @@ -168,6 +329,18 @@ public MappingJackson2HttpMessageConverter jsonConverter() { return jsonConverter; } + @Bean() + @Profile("test") + public IStatusService iStatusService() { + return mock(IStatusService.class); + } + + @Bean() + @Profile("test") + public StatusOfSampleService statusOfSampleService() { + return mock(StatusOfSampleService.class); + } + @Override public void configureMessageConverters(@NonNull List> converters) { WebMvcConfigurer.super.configureMessageConverters(converters); diff --git a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java new file mode 100644 index 0000000000..2c4afa83e7 --- /dev/null +++ b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java @@ -0,0 +1,404 @@ +package org.openelisglobal.sample; + +import java.sql.Timestamp; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.sql.Date; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.List; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.openelisglobal.BaseWebContextSensitiveTest; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.patient.service.PatientService; +import org.openelisglobal.patient.valueholder.Patient; +import org.openelisglobal.person.service.PersonService; +import org.openelisglobal.person.valueholder.Person; +import org.openelisglobal.sample.service.SampleService; +import org.openelisglobal.sample.valueholder.Sample; +import org.openelisglobal.samplehuman.dao.SampleHumanDAO; +import org.openelisglobal.samplehuman.service.SampleHumanService; +import org.openelisglobal.samplehuman.valueholder.SampleHuman; +import org.springframework.beans.factory.annotation.Autowired; + +public class SampleServiceTest extends BaseWebContextSensitiveTest { + + @Autowired + PersonService personService; + + @Autowired + PatientService patientService; + + @Autowired + SampleService sampleService; + + @Autowired + SampleHumanService sampleHumanService; + + SampleHumanDAO sampleHumanDAO; + + + @Before + public void init() throws Exception { + + patientService.deleteAll(patientService.getAll()); + personService.deleteAll(personService.getAll()); + sampleService.deleteAll(sampleService.getAll()); + sampleHumanService.deleteAll(sampleHumanService.getAll()); + } + + @After + public void tearDown() { + patientService.deleteAll(patientService.getAll()); + personService.deleteAll(personService.getAll()); + sampleService.deleteAll(sampleService.getAll()); + sampleHumanService.deleteAll(sampleHumanService.getAll()); + } + + private Sample createSample(String receivedTimestamp, String accessionNumber) throws ParseException { + + DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + java.util.Date date = dateFormat.parse(receivedTimestamp); + long time = date.getTime(); + Timestamp doc = new Timestamp(time); + + Sample sample = new Sample(); + sample.setReceivedTimestamp(doc); + sample.setAccessionNumber(accessionNumber); + + return sample; + } + + @Test + public void createSample_shouldCreateNewSample() throws Exception { + Date enteredDate = Date.valueOf("2024-06-13"); + String receivedTimestamp = "13/06/2024"; + String accessionNumber = "123"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + + Assert.assertEquals(0, sampleService.getAll().size()); + // save person to the DB + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.get(sampleId); + + Assert.assertEquals(1, sampleService.getAll().size()); + Assert.assertEquals(accessionNumber, savedSample.getAccessionNumber()); + Assert.assertEquals("2024-06-13 00:00:00.0", savedSample.getReceivedTimestamp().toString()); + } + + @Test + public void getAccessionNumber_shouldReturnAccessionNumber() throws Exception { + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + + Assert.assertEquals(0, sampleService.getAll().size()); + // save person to the DB + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.get(sampleId); + Assert.assertEquals(accessionNumber, savedSample.getAccessionNumber()); + } + + @Test + public void getSampleByAccessionNumber_shouldReturnSampleByAccessionNumber() throws Exception { + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + + Assert.assertEquals(0, sampleService.getAll().size()); + // save person to the DB + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.getSampleByAccessionNumber(accessionNumber); + Assert.assertEquals("2024-06-03 00:00:00.0", savedSample.getReceivedTimestamp().toString()); + } + + + @Test + public void insertDataWithAccessionNumber_shouldReturnsampleWithInsertedData() throws Exception { + Sample sample = new Sample(); + Date enteredDate = Date.valueOf("2024-06-03"); + DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + java.util.Date date = dateFormat.parse("03/06/2024"); + long time = date.getTime(); + Timestamp doc = new Timestamp(time); + sample.setAccessionNumber("43"); + sample.setReceivedTimestamp(doc); + sample.setEnteredDate(enteredDate); + + String sampId = sampleService.insert(sample); + Sample savedSample = sampleService.getSampleByAccessionNumber("43"); + savedSample.setEnumName("HIV4"); + sampleService.update(savedSample); + + Assert.assertEquals("HIV4", savedSample.getEnumName()); + + } + + @Test + public void getOrderedDate_shouldReturnOrderedDate()throws Exception{ + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.get(sampleId); + Assert.assertEquals("2024-06-03 00:00:00.0", sampleService.getOrderedDate(savedSample).toString()); + } + + @Test + public void getSamplesReceivedOn_shouldReturnSamplesOnDate()throws Exception{ + Date enteredDate = Date.valueOf("2024-06-03"); + Date recievedDate= Date.valueOf("2024-06-04"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + samp.setReceivedDate(recievedDate); + + String sampleId = sampleService.insert(samp); + int receivedSamples = sampleService.getSamplesReceivedOn("04/06/2024").size(); + Assert.assertEquals(1, receivedSamples); + } + + // @Test + // public void getSamplesForPatient_shouldReturnSamplesForPatient() throws Exception { + + // Date enteredDate = Date.valueOf("2024-06-03"); + // String receivedTimestamp = "03/06/2024"; + // String accessionNumber = "12"; + // Sample samp = createSample(receivedTimestamp, accessionNumber); + // samp.setEnteredDate(enteredDate); + // String sampleId = sampleService.insert(samp); + + // Person person = new Person(); + // person.setFirstName("kasozi"); + // person.setLastName("paulaaa"); + // personService.save(person); + + // DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + // java.util.Date date = dateFormat.parse("03/06/2024"); + // long time = date.getTime(); + // Timestamp dob = new Timestamp(time); + + // Patient pat= new Patient(); + // pat.setPerson(person); + // pat.setBirthDate(dob); + // pat.setGender("M"); + // String patId = patientService.insert(pat); + + + // SampleHuman human = new SampleHuman(); + // human.setSampleId(sampleId); + // human.setPatientId(patId); + // String humanId = sampleHumanService.insert(human); + + // Assert.assertEquals(1, sampleHumanService.getSamplesForPatient(patId).size()); + + // } + + @Test + public void getReceivedDateForDisplay_shouldReturnReceivedDateForDisplay()throws Exception{ + Date enteredDate = Date.valueOf("2024-06-03"); + Date recievedDate= Date.valueOf("2024-06-04"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + samp.setReceivedDate(recievedDate); + samp.setReceivedDateForDisplay("04/06/2024"); + + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.get(sampleId); + + Assert.assertEquals("04/06/2024", sampleService.getReceivedDateForDisplay(savedSample)); + } + + @Test + public void getReceived24HourTimeForDisplay_shouldReturnReceived24HourTimeForDisplay()throws Exception{ + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.get(sampleId); + Assert.assertEquals("00:00", sampleService.getReceived24HourTimeForDisplay(savedSample)); + } + + @Test + public void getReceivedTimeForDisplay_shouldReturnReceivedTimeForDisplay()throws Exception{ + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + samp.setReceivedDateForDisplay("04/06/2024"); + + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.get(sampleId); + + Assert.assertEquals("00:00", sampleService.getReceivedTimeForDisplay(savedSample)); + } + + @Test + public void isConfirmationSample_shouldReturnisConfirmationSample()throws Exception{ + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + samp.setIsConfirmation(true); + + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.get(sampleId); + + assertFalse(sampleService.isConfirmationSample(null)); + assertTrue(sampleService.isConfirmationSample(savedSample)); + } + + @Test + public void getReceivedDateWithTwoYearDisplay_shouldReturnReceivedDateWithTwoYearDisplay()throws Exception{ + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.get(sampleId); + Assert.assertEquals("03/06/24", sampleService.getReceivedDateWithTwoYearDisplay(savedSample)); + } + + @Test + public void getConfirmationSamplesReceivedInDateRange_shouldReturnConfirmationSamplesReceivedInDateRange()throws Exception{ + Date recievedDateStart = Date.valueOf("2024-06-03"); + Date recievedDateEnd = Date.valueOf("2024-06-04"); + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + samp.setIsConfirmation(true); + + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.get(sampleId); + Assert.assertEquals(1, sampleService.getConfirmationSamplesReceivedInDateRange(recievedDateStart, recievedDateEnd).size()); + } + + @Test + public void getSamplesCollectedOn_shouldReturnSamplesCollected() throws Exception { + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "123"; + String collectionDate="03/06/2024"; + + Date enteredDate2 = Date.valueOf("2024-06-04"); + String receivedTimestamp2 = "03/06/2024"; + String accessionNumber2 = "312"; + + DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + java.util.Date date = dateFormat.parse(collectionDate); + long time = date.getTime(); + Timestamp doc = new Timestamp(time); + + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + samp.setCollectionDate(doc); + String sampleId = sampleService.insert(samp); + + + DateFormat dateFormat2 = new SimpleDateFormat("dd/MM/yyyy"); + java.util.Date date2 = dateFormat2.parse(collectionDate); + long time2 = date2.getTime(); + Timestamp doc2 = new Timestamp(time2); + + Sample samp2 = createSample(receivedTimestamp2, accessionNumber2); + samp2.setEnteredDate(enteredDate2); + samp2.setCollectionDate(doc2); + String sampleId2 = sampleService.insert(samp2); + Assert.assertEquals(2, sampleService.getSamplesCollectedOn(collectionDate).size()); + } + + @Test + public void getLargestAccessionNumber_shouldReturnLargestAccessionNumber() throws Exception { + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "123"; + + Date enteredDate2 = Date.valueOf("2024-06-04"); + String receivedTimestamp2 = "03/06/2024"; + String accessionNumber2 = "312"; + + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + String sampleId = sampleService.insert(samp); + + Sample samp2 = createSample(receivedTimestamp2, accessionNumber2); + samp2.setEnteredDate(enteredDate2); + String sampleId2 = sampleService.insert(samp2); + Assert.assertEquals(accessionNumber2, sampleService.getLargestAccessionNumber()); + } + + @Test + public void getSamplesReceivedInDateRange_shouldReturnSamplesReceivedInDateRange()throws Exception{ + String recievedDateStart = "03/06/2024"; + String recievedDateEnd = "04/06/2024"; + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.get(sampleId); + Assert.assertEquals(1, sampleService.getSamplesReceivedInDateRange(recievedDateStart, recievedDateEnd).size()); + } + + @Test + public void getSamplesByAccessionRange_shouldReturnSamplesByAccessionRange() throws Exception { + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "123"; + + Date enteredDate2 = Date.valueOf("2024-06-04"); + String receivedTimestamp2 = "03/06/2024"; + String accessionNumber2 = "312"; + + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + String sampleId = sampleService.insert(samp); + + Sample samp2 = createSample(receivedTimestamp2, accessionNumber2); + samp2.setEnteredDate(enteredDate2); + String sampleId2 = sampleService.insert(samp2); + Assert.assertEquals(2, sampleService.getSamplesByAccessionRange(accessionNumber, accessionNumber2).size()); + } + + @Test + public void getId_shouldReturnId()throws Exception{ + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + + String sampleId = sampleService.insert(samp); + Sample savedSample = sampleService.get(sampleId); + Assert.assertEquals(sampleId, sampleService.getId(savedSample)); + } + } From 6f242433cce30f9ee8cfb093b8dd16cdbc4397a6 Mon Sep 17 00:00:00 2001 From: josephbate Date: Mon, 28 Oct 2024 20:22:31 +0300 Subject: [PATCH 03/26] formatting fix --- .../daoimpl/SampleHumanDAOImpl.java | 2 +- .../org/openelisglobal/AppTestConfig.java | 15 ++- .../sample/SampleServiceTest.java | 92 +++++++++---------- 3 files changed, 51 insertions(+), 58 deletions(-) diff --git a/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java b/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java index 35ea8536e1..36684fdae4 100644 --- a/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java +++ b/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java @@ -145,7 +145,7 @@ public List getSamplesForPatient(String patientID) throws LIMSRuntimeExc + " sampleHuman.sampleId = sample.id and sampleHuman.patientId = :patientId order by" + " sample.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, Sample.class); - query.setParameter("patientId", patientID); + query.setParameter("patientId", Integer.parseInt(patientID)); samples = query.list(); } catch (HibernateException e) { LogEvent.logError(e); diff --git a/src/test/java/org/openelisglobal/AppTestConfig.java b/src/test/java/org/openelisglobal/AppTestConfig.java index d3400f8eca..58b807c5eb 100644 --- a/src/test/java/org/openelisglobal/AppTestConfig.java +++ b/src/test/java/org/openelisglobal/AppTestConfig.java @@ -17,9 +17,6 @@ import org.openelisglobal.localization.dao.LocalizationDAO; import org.openelisglobal.localization.service.LocalizationServiceImpl; import org.openelisglobal.note.service.NoteService; -import org.openelisglobal.referral.service.ReferralResultService; -import org.openelisglobal.referral.service.ReferralSetService; - import org.openelisglobal.notification.service.AnalysisNotificationConfigService; import org.openelisglobal.notification.service.TestNotificationConfigService; import org.openelisglobal.observationhistory.service.ObservationHistoryService; @@ -29,7 +26,9 @@ import org.openelisglobal.program.service.PathologySampleService; import org.openelisglobal.program.service.ProgramSampleService; import org.openelisglobal.provider.service.ProviderService; +import org.openelisglobal.referral.service.ReferralResultService; import org.openelisglobal.referral.service.ReferralService; +import org.openelisglobal.referral.service.ReferralSetService; import org.openelisglobal.requester.service.RequesterTypeService; import org.openelisglobal.requester.service.SampleRequesterService; import org.openelisglobal.sampleorganization.service.SampleOrganizationService; @@ -74,11 +73,11 @@ "org.openelisglobal.systemusermodule.service", "org.openelisglobal.rolemodule.service", "org.openelisglobal.systemusermodule.daoimpl", "org.openelisglobal.systemusermodule.service", "org.openelisglobal.login.service", "org.openelisglobal.view", "org.openelisglobal.search.service", - "org.openelisglobal.sample.daoimpl", "org.openelisglobal.common.util", - "org.openelisglobal.login.service", "org.openelisglobal.view", "org.openelisglobal.search.service", - "org.openelisglobal.sample", "org.openelisglobal.sampleitem.", "org.openelisglobal.analysis", "org.openelisglobal.result.service", - "org.openelisglobal.result.daoimpl", "org.openelisglobal.resultlimit", "org.openelisglobal.resultlimits", - "org.openelisglobal.typeoftestresult", "org.openelisglobal.samplehuman", + "org.openelisglobal.sample.daoimpl", "org.openelisglobal.common.util", "org.openelisglobal.login.service", + "org.openelisglobal.view", "org.openelisglobal.search.service", "org.openelisglobal.sample", + "org.openelisglobal.sampleitem.", "org.openelisglobal.analysis", "org.openelisglobal.result.service", + "org.openelisglobal.result.daoimpl", "org.openelisglobal.resultlimit", "org.openelisglobal.resultlimits", + "org.openelisglobal.typeoftestresult", "org.openelisglobal.samplehuman", "org.openelisglobal.role", }, excludeFilters = { @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.patient.controller.*"), @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.sample.controller.*"), diff --git a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java index 2c4afa83e7..5ef7b6d46c 100644 --- a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java +++ b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java @@ -1,22 +1,18 @@ package org.openelisglobal.sample; -import java.sql.Timestamp; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.sql.Date; +import java.sql.Timestamp; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.List; - import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.openelisglobal.BaseWebContextSensitiveTest; -import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.patient.service.PatientService; import org.openelisglobal.patient.valueholder.Patient; import org.openelisglobal.person.service.PersonService; @@ -30,7 +26,7 @@ public class SampleServiceTest extends BaseWebContextSensitiveTest { - @Autowired + @Autowired PersonService personService; @Autowired @@ -38,13 +34,12 @@ public class SampleServiceTest extends BaseWebContextSensitiveTest { @Autowired SampleService sampleService; - + @Autowired SampleHumanService sampleHumanService; SampleHumanDAO sampleHumanDAO; - @Before public void init() throws Exception { @@ -56,7 +51,7 @@ public void init() throws Exception { @After public void tearDown() { - patientService.deleteAll(patientService.getAll()); + // patientService.deleteAll(patientService.getAll()); personService.deleteAll(personService.getAll()); sampleService.deleteAll(sampleService.getAll()); sampleHumanService.deleteAll(sampleHumanService.getAll()); @@ -68,7 +63,7 @@ private Sample createSample(String receivedTimestamp, String accessionNumber) th java.util.Date date = dateFormat.parse(receivedTimestamp); long time = date.getTime(); Timestamp doc = new Timestamp(time); - + Sample sample = new Sample(); sample.setReceivedTimestamp(doc); sample.setAccessionNumber(accessionNumber); @@ -124,30 +119,29 @@ public void getSampleByAccessionNumber_shouldReturnSampleByAccessionNumber() thr Assert.assertEquals("2024-06-03 00:00:00.0", savedSample.getReceivedTimestamp().toString()); } - @Test public void insertDataWithAccessionNumber_shouldReturnsampleWithInsertedData() throws Exception { - Sample sample = new Sample(); - Date enteredDate = Date.valueOf("2024-06-03"); - DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); - java.util.Date date = dateFormat.parse("03/06/2024"); - long time = date.getTime(); - Timestamp doc = new Timestamp(time); - sample.setAccessionNumber("43"); - sample.setReceivedTimestamp(doc); - sample.setEnteredDate(enteredDate); - - String sampId = sampleService.insert(sample); - Sample savedSample = sampleService.getSampleByAccessionNumber("43"); - savedSample.setEnumName("HIV4"); - sampleService.update(savedSample); - - Assert.assertEquals("HIV4", savedSample.getEnumName()); - + Sample sample = new Sample(); + Date enteredDate = Date.valueOf("2024-06-03"); + DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + java.util.Date date = dateFormat.parse("03/06/2024"); + long time = date.getTime(); + Timestamp doc = new Timestamp(time); + sample.setAccessionNumber("43"); + sample.setReceivedTimestamp(doc); + sample.setEnteredDate(enteredDate); + + String sampId = sampleService.insert(sample); + Sample savedSample = sampleService.getSampleByAccessionNumber("43"); + savedSample.setEnumName("HIV4"); + sampleService.update(savedSample); + + Assert.assertEquals("HIV4", savedSample.getEnumName()); + } @Test - public void getOrderedDate_shouldReturnOrderedDate()throws Exception{ + public void getOrderedDate_shouldReturnOrderedDate() throws Exception { Date enteredDate = Date.valueOf("2024-06-03"); String receivedTimestamp = "03/06/2024"; String accessionNumber = "12"; @@ -160,9 +154,9 @@ public void getOrderedDate_shouldReturnOrderedDate()throws Exception{ } @Test - public void getSamplesReceivedOn_shouldReturnSamplesOnDate()throws Exception{ + public void getSamplesReceivedOn_shouldReturnSamplesOnDate() throws Exception { Date enteredDate = Date.valueOf("2024-06-03"); - Date recievedDate= Date.valueOf("2024-06-04"); + Date recievedDate = Date.valueOf("2024-06-04"); String receivedTimestamp = "03/06/2024"; String accessionNumber = "12"; Sample samp = createSample(receivedTimestamp, accessionNumber); @@ -176,7 +170,7 @@ public void getSamplesReceivedOn_shouldReturnSamplesOnDate()throws Exception{ // @Test // public void getSamplesForPatient_shouldReturnSamplesForPatient() throws Exception { - + // Date enteredDate = Date.valueOf("2024-06-03"); // String receivedTimestamp = "03/06/2024"; // String accessionNumber = "12"; @@ -194,12 +188,11 @@ public void getSamplesReceivedOn_shouldReturnSamplesOnDate()throws Exception{ // long time = date.getTime(); // Timestamp dob = new Timestamp(time); - // Patient pat= new Patient(); + // Patient pat = new Patient(); // pat.setPerson(person); // pat.setBirthDate(dob); // pat.setGender("M"); // String patId = patientService.insert(pat); - // SampleHuman human = new SampleHuman(); // human.setSampleId(sampleId); @@ -211,9 +204,9 @@ public void getSamplesReceivedOn_shouldReturnSamplesOnDate()throws Exception{ // } @Test - public void getReceivedDateForDisplay_shouldReturnReceivedDateForDisplay()throws Exception{ + public void getReceivedDateForDisplay_shouldReturnReceivedDateForDisplay() throws Exception { Date enteredDate = Date.valueOf("2024-06-03"); - Date recievedDate= Date.valueOf("2024-06-04"); + Date recievedDate = Date.valueOf("2024-06-04"); String receivedTimestamp = "03/06/2024"; String accessionNumber = "12"; Sample samp = createSample(receivedTimestamp, accessionNumber); @@ -223,12 +216,12 @@ public void getReceivedDateForDisplay_shouldReturnReceivedDateForDisplay()throws String sampleId = sampleService.insert(samp); Sample savedSample = sampleService.get(sampleId); - + Assert.assertEquals("04/06/2024", sampleService.getReceivedDateForDisplay(savedSample)); } @Test - public void getReceived24HourTimeForDisplay_shouldReturnReceived24HourTimeForDisplay()throws Exception{ + public void getReceived24HourTimeForDisplay_shouldReturnReceived24HourTimeForDisplay() throws Exception { Date enteredDate = Date.valueOf("2024-06-03"); String receivedTimestamp = "03/06/2024"; String accessionNumber = "12"; @@ -241,7 +234,7 @@ public void getReceived24HourTimeForDisplay_shouldReturnReceived24HourTimeForDis } @Test - public void getReceivedTimeForDisplay_shouldReturnReceivedTimeForDisplay()throws Exception{ + public void getReceivedTimeForDisplay_shouldReturnReceivedTimeForDisplay() throws Exception { Date enteredDate = Date.valueOf("2024-06-03"); String receivedTimestamp = "03/06/2024"; String accessionNumber = "12"; @@ -251,12 +244,12 @@ public void getReceivedTimeForDisplay_shouldReturnReceivedTimeForDisplay()throws String sampleId = sampleService.insert(samp); Sample savedSample = sampleService.get(sampleId); - + Assert.assertEquals("00:00", sampleService.getReceivedTimeForDisplay(savedSample)); } @Test - public void isConfirmationSample_shouldReturnisConfirmationSample()throws Exception{ + public void isConfirmationSample_shouldReturnisConfirmationSample() throws Exception { Date enteredDate = Date.valueOf("2024-06-03"); String receivedTimestamp = "03/06/2024"; String accessionNumber = "12"; @@ -272,7 +265,7 @@ public void isConfirmationSample_shouldReturnisConfirmationSample()throws Except } @Test - public void getReceivedDateWithTwoYearDisplay_shouldReturnReceivedDateWithTwoYearDisplay()throws Exception{ + public void getReceivedDateWithTwoYearDisplay_shouldReturnReceivedDateWithTwoYearDisplay() throws Exception { Date enteredDate = Date.valueOf("2024-06-03"); String receivedTimestamp = "03/06/2024"; String accessionNumber = "12"; @@ -285,7 +278,8 @@ public void getReceivedDateWithTwoYearDisplay_shouldReturnReceivedDateWithTwoYea } @Test - public void getConfirmationSamplesReceivedInDateRange_shouldReturnConfirmationSamplesReceivedInDateRange()throws Exception{ + public void getConfirmationSamplesReceivedInDateRange_shouldReturnConfirmationSamplesReceivedInDateRange() + throws Exception { Date recievedDateStart = Date.valueOf("2024-06-03"); Date recievedDateEnd = Date.valueOf("2024-06-04"); Date enteredDate = Date.valueOf("2024-06-03"); @@ -297,7 +291,8 @@ public void getConfirmationSamplesReceivedInDateRange_shouldReturnConfirmationSa String sampleId = sampleService.insert(samp); Sample savedSample = sampleService.get(sampleId); - Assert.assertEquals(1, sampleService.getConfirmationSamplesReceivedInDateRange(recievedDateStart, recievedDateEnd).size()); + Assert.assertEquals(1, + sampleService.getConfirmationSamplesReceivedInDateRange(recievedDateStart, recievedDateEnd).size()); } @Test @@ -305,7 +300,7 @@ public void getSamplesCollectedOn_shouldReturnSamplesCollected() throws Exceptio Date enteredDate = Date.valueOf("2024-06-03"); String receivedTimestamp = "03/06/2024"; String accessionNumber = "123"; - String collectionDate="03/06/2024"; + String collectionDate = "03/06/2024"; Date enteredDate2 = Date.valueOf("2024-06-04"); String receivedTimestamp2 = "03/06/2024"; @@ -321,7 +316,6 @@ public void getSamplesCollectedOn_shouldReturnSamplesCollected() throws Exceptio samp.setCollectionDate(doc); String sampleId = sampleService.insert(samp); - DateFormat dateFormat2 = new SimpleDateFormat("dd/MM/yyyy"); java.util.Date date2 = dateFormat2.parse(collectionDate); long time2 = date2.getTime(); @@ -355,7 +349,7 @@ public void getLargestAccessionNumber_shouldReturnLargestAccessionNumber() throw } @Test - public void getSamplesReceivedInDateRange_shouldReturnSamplesReceivedInDateRange()throws Exception{ + public void getSamplesReceivedInDateRange_shouldReturnSamplesReceivedInDateRange() throws Exception { String recievedDateStart = "03/06/2024"; String recievedDateEnd = "04/06/2024"; Date enteredDate = Date.valueOf("2024-06-03"); @@ -390,7 +384,7 @@ public void getSamplesByAccessionRange_shouldReturnSamplesByAccessionRange() thr } @Test - public void getId_shouldReturnId()throws Exception{ + public void getId_shouldReturnId() throws Exception { Date enteredDate = Date.valueOf("2024-06-03"); String receivedTimestamp = "03/06/2024"; String accessionNumber = "12"; @@ -401,4 +395,4 @@ public void getId_shouldReturnId()throws Exception{ Sample savedSample = sampleService.get(sampleId); Assert.assertEquals(sampleId, sampleService.getId(savedSample)); } - } +} From 76ab36e61c4ec36041a8c56200aaccc678644c48 Mon Sep 17 00:00:00 2001 From: josephbate Date: Mon, 28 Oct 2024 23:52:28 +0300 Subject: [PATCH 04/26] formating fix --- .../sample/SampleServiceTest.java | 67 +++++++++---------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java index 5ef7b6d46c..1ae2ac5c53 100644 --- a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java +++ b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java @@ -14,14 +14,11 @@ import org.junit.Test; import org.openelisglobal.BaseWebContextSensitiveTest; import org.openelisglobal.patient.service.PatientService; -import org.openelisglobal.patient.valueholder.Patient; import org.openelisglobal.person.service.PersonService; -import org.openelisglobal.person.valueholder.Person; import org.openelisglobal.sample.service.SampleService; import org.openelisglobal.sample.valueholder.Sample; import org.openelisglobal.samplehuman.dao.SampleHumanDAO; import org.openelisglobal.samplehuman.service.SampleHumanService; -import org.openelisglobal.samplehuman.valueholder.SampleHuman; import org.springframework.beans.factory.annotation.Autowired; public class SampleServiceTest extends BaseWebContextSensitiveTest { @@ -169,37 +166,39 @@ public void getSamplesReceivedOn_shouldReturnSamplesOnDate() throws Exception { } // @Test - // public void getSamplesForPatient_shouldReturnSamplesForPatient() throws Exception { - - // Date enteredDate = Date.valueOf("2024-06-03"); - // String receivedTimestamp = "03/06/2024"; - // String accessionNumber = "12"; - // Sample samp = createSample(receivedTimestamp, accessionNumber); - // samp.setEnteredDate(enteredDate); - // String sampleId = sampleService.insert(samp); - - // Person person = new Person(); - // person.setFirstName("kasozi"); - // person.setLastName("paulaaa"); - // personService.save(person); - - // DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); - // java.util.Date date = dateFormat.parse("03/06/2024"); - // long time = date.getTime(); - // Timestamp dob = new Timestamp(time); - - // Patient pat = new Patient(); - // pat.setPerson(person); - // pat.setBirthDate(dob); - // pat.setGender("M"); - // String patId = patientService.insert(pat); - - // SampleHuman human = new SampleHuman(); - // human.setSampleId(sampleId); - // human.setPatientId(patId); - // String humanId = sampleHumanService.insert(human); - - // Assert.assertEquals(1, sampleHumanService.getSamplesForPatient(patId).size()); + // public void getSamplesForPatient_shouldReturnSamplesForPatient() throws + // Exception { + + // Date enteredDate = Date.valueOf("2024-06-03"); + // String receivedTimestamp = "03/06/2024"; + // String accessionNumber = "12"; + // Sample samp = createSample(receivedTimestamp, accessionNumber); + // samp.setEnteredDate(enteredDate); + // String sampleId = sampleService.insert(samp); + + // Person person = new Person(); + // person.setFirstName("kasozi"); + // person.setLastName("paulaaa"); + // personService.save(person); + + // DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + // java.util.Date date = dateFormat.parse("03/06/2024"); + // long time = date.getTime(); + // Timestamp dob = new Timestamp(time); + + // Patient pat = new Patient(); + // pat.setPerson(person); + // pat.setBirthDate(dob); + // pat.setGender("M"); + // String patId = patientService.insert(pat); + + // SampleHuman human = new SampleHuman(); + // human.setSampleId(sampleId); + // human.setPatientId(patId); + // String humanId = sampleHumanService.insert(human); + + // Assert.assertEquals(1, + // sampleHumanService.getSamplesForPatient(patId).size()); // } From a61232356303a81c54d9ad933491b75863ae385a Mon Sep 17 00:00:00 2001 From: Saksham Gupta Date: Tue, 29 Oct 2024 11:51:43 +0530 Subject: [PATCH 05/26] Improve styling for the AutoComplete Component --- frontend/src/components/admin/reflexTests/ReflexStyles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/admin/reflexTests/ReflexStyles.css b/frontend/src/components/admin/reflexTests/ReflexStyles.css index 52aa9858d8..3d96e7aaea 100644 --- a/frontend/src/components/admin/reflexTests/ReflexStyles.css +++ b/frontend/src/components/admin/reflexTests/ReflexStyles.css @@ -26,9 +26,9 @@ body { margin-left: 0px; overflow-y: auto; padding-left: 0px; - width: 30%; + width: 100%; z-index: 10; - position: absolute; + position: relative; background-color: #ffffff; } From 317bf9ee069f47411c40f8ff89d1cae5067072b0 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Tue, 29 Oct 2024 11:04:47 +0300 Subject: [PATCH 06/26] minor fixes --- docker-compose.yml | 4 +- frontend/cypress/e2e/dashboard.cy.js | 2 +- .../admin/reflexTests/ReflexStyles.css | 7 +++- .../src/components/common/AutoComplete.js | 38 ++++++++++--------- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f06475c127..18ecc1fe85 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -67,7 +67,7 @@ services: fhir.openelis.org: container_name: external-fhir-api - image: hapiproject/hapi:v6.6.0-tomcat + image: itechuw/openelis-global-2-fhir:develop depends_on: - database - certs @@ -106,7 +106,7 @@ services: tty: true proxy: - image: nginx:1.15-alpine + image: itechuw/openelis-global-2-proxy:develop container_name: openelisglobal-proxy ports: - 80:80 diff --git a/frontend/cypress/e2e/dashboard.cy.js b/frontend/cypress/e2e/dashboard.cy.js index dad22382e6..52bdb1855d 100644 --- a/frontend/cypress/e2e/dashboard.cy.js +++ b/frontend/cypress/e2e/dashboard.cy.js @@ -38,7 +38,7 @@ describe("Pathology Dashboard", function () { it("Validate the Status of Order", () => { cy.fixture("DashBoard").then((order) => { - // dashboard.validateOrderStatus(order.labNo, 4); + // dashboard.validateOrderStatus(order.labNo, 4); }); }); }); diff --git a/frontend/src/components/admin/reflexTests/ReflexStyles.css b/frontend/src/components/admin/reflexTests/ReflexStyles.css index 3d96e7aaea..20fa3226e6 100644 --- a/frontend/src/components/admin/reflexTests/ReflexStyles.css +++ b/frontend/src/components/admin/reflexTests/ReflexStyles.css @@ -28,10 +28,15 @@ body { padding-left: 0px; width: 100%; z-index: 10; - position: relative; + position: absolute; background-color: #ffffff; } +.suggestions-container { + position: relative; + width: 100%; +} + .suggestions li { padding: 0.5rem; z-index: 99 !important; diff --git a/frontend/src/components/common/AutoComplete.js b/frontend/src/components/common/AutoComplete.js index 5680a7312a..debe13c90d 100644 --- a/frontend/src/components/common/AutoComplete.js +++ b/frontend/src/components/common/AutoComplete.js @@ -88,24 +88,26 @@ function AutoComplete(props) { if (showSuggestions && userInput) { if (filteredSuggestions.length) { suggestionsListComponent = ( -
    - {filteredSuggestions.map((suggestion, index) => { - let className; - // Flag the active suggestion with a class - if (index === activeSuggestion) { - className = "suggestion-active"; - } - return ( -
  • onClick(e, suggestion.id, suggestion)} - > - {suggestion.value} -
    • - ); - })} -
+
+
    + {filteredSuggestions.map((suggestion, index) => { + let className; + // Flag the active suggestion with a class + if (index === activeSuggestion) { + className = "suggestion-active"; + } + return ( +
  • onClick(e, suggestion.id, suggestion)} + > + {suggestion.value} +
    • + ); + })} +
+
); } else { suggestionsListComponent = ( From ddeb0f9d7da237453747c4cd7c71cf4ddf91fcfe Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Tue, 29 Oct 2024 11:12:09 +0300 Subject: [PATCH 07/26] fix ci build --- frontend/src/components/common/AutoComplete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/common/AutoComplete.js b/frontend/src/components/common/AutoComplete.js index debe13c90d..1cb61892d2 100644 --- a/frontend/src/components/common/AutoComplete.js +++ b/frontend/src/components/common/AutoComplete.js @@ -88,7 +88,7 @@ function AutoComplete(props) { if (showSuggestions && userInput) { if (filteredSuggestions.length) { suggestionsListComponent = ( -
+
    {filteredSuggestions.map((suggestion, index) => { let className; From 0139b2b4a494d720145fe571eeb51a4e397b057c Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Tue, 29 Oct 2024 12:18:49 +0300 Subject: [PATCH 08/26] fix sample service integration tests --- .../patient/PatientServiceTest.java | 6 +- .../sample/SampleServiceTest.java | 87 +++++++++---------- .../hibernate/test-hibernate.cfg.xml | 10 +++ 3 files changed, 56 insertions(+), 47 deletions(-) diff --git a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java index d4741b9281..fdba8566f4 100644 --- a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java +++ b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java @@ -142,7 +142,8 @@ public void deletePatient_shouldRemovePatient() throws Exception { @Test public void createPatientType_shouldCreateNewPatientType() throws Exception { PatientType patientType = new PatientType(); - patientType.setDescription("Test Type"); + patientType.setDescription("Test Type Description"); + patientType.setType("Test Type"); Assert.assertEquals(0, patientTypeService.getAllPatientTypes().size()); @@ -150,7 +151,8 @@ public void createPatientType_shouldCreateNewPatientType() throws Exception { PatientType savedPatientType = patientTypeService.get(patientTypeId); Assert.assertEquals(1, patientTypeService.getAllPatientTypes().size()); - Assert.assertEquals("Test Type", savedPatientType.getDescription()); + Assert.assertEquals("Test Type Description", savedPatientType.getDescription()); + Assert.assertEquals("Test Type", savedPatientType.getType()); } @Test diff --git a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java index 1ae2ac5c53..0b1e9a05bb 100644 --- a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java +++ b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java @@ -14,11 +14,13 @@ import org.junit.Test; import org.openelisglobal.BaseWebContextSensitiveTest; import org.openelisglobal.patient.service.PatientService; +import org.openelisglobal.patient.valueholder.Patient; import org.openelisglobal.person.service.PersonService; +import org.openelisglobal.person.valueholder.Person; import org.openelisglobal.sample.service.SampleService; import org.openelisglobal.sample.valueholder.Sample; -import org.openelisglobal.samplehuman.dao.SampleHumanDAO; import org.openelisglobal.samplehuman.service.SampleHumanService; +import org.openelisglobal.samplehuman.valueholder.SampleHuman; import org.springframework.beans.factory.annotation.Autowired; public class SampleServiceTest extends BaseWebContextSensitiveTest { @@ -35,23 +37,20 @@ public class SampleServiceTest extends BaseWebContextSensitiveTest { @Autowired SampleHumanService sampleHumanService; - SampleHumanDAO sampleHumanDAO; - @Before public void init() throws Exception { - + sampleHumanService.deleteAll(sampleHumanService.getAll()); + sampleService.deleteAll(sampleService.getAll()); patientService.deleteAll(patientService.getAll()); personService.deleteAll(personService.getAll()); - sampleService.deleteAll(sampleService.getAll()); - sampleHumanService.deleteAll(sampleHumanService.getAll()); } @After public void tearDown() { - // patientService.deleteAll(patientService.getAll()); - personService.deleteAll(personService.getAll()); - sampleService.deleteAll(sampleService.getAll()); sampleHumanService.deleteAll(sampleHumanService.getAll()); + sampleService.deleteAll(sampleService.getAll()); + patientService.deleteAll(patientService.getAll()); + personService.deleteAll(personService.getAll()); } private Sample createSample(String receivedTimestamp, String accessionNumber) throws ParseException { @@ -165,42 +164,40 @@ public void getSamplesReceivedOn_shouldReturnSamplesOnDate() throws Exception { Assert.assertEquals(1, receivedSamples); } - // @Test - // public void getSamplesForPatient_shouldReturnSamplesForPatient() throws - // Exception { - - // Date enteredDate = Date.valueOf("2024-06-03"); - // String receivedTimestamp = "03/06/2024"; - // String accessionNumber = "12"; - // Sample samp = createSample(receivedTimestamp, accessionNumber); - // samp.setEnteredDate(enteredDate); - // String sampleId = sampleService.insert(samp); - - // Person person = new Person(); - // person.setFirstName("kasozi"); - // person.setLastName("paulaaa"); - // personService.save(person); - - // DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); - // java.util.Date date = dateFormat.parse("03/06/2024"); - // long time = date.getTime(); - // Timestamp dob = new Timestamp(time); - - // Patient pat = new Patient(); - // pat.setPerson(person); - // pat.setBirthDate(dob); - // pat.setGender("M"); - // String patId = patientService.insert(pat); - - // SampleHuman human = new SampleHuman(); - // human.setSampleId(sampleId); - // human.setPatientId(patId); - // String humanId = sampleHumanService.insert(human); - - // Assert.assertEquals(1, - // sampleHumanService.getSamplesForPatient(patId).size()); - - // } + @Test + public void getSamplesForPatient_shouldReturnSamplesForPatient() throws ParseException { + + Date enteredDate = Date.valueOf("2024-06-03"); + String receivedTimestamp = "03/06/2024"; + String accessionNumber = "12"; + Sample samp = createSample(receivedTimestamp, accessionNumber); + samp.setEnteredDate(enteredDate); + String sampleId = sampleService.insert(samp); + + Person person = new Person(); + person.setFirstName("kasozi"); + person.setLastName("paulaaa"); + personService.save(person); + + DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + java.util.Date date = dateFormat.parse("03/06/2024"); + long time = date.getTime(); + Timestamp dob = new Timestamp(time); + + Patient pat = new Patient(); + pat.setPerson(person); + pat.setBirthDate(dob); + pat.setGender("M"); + String patId = patientService.insert(pat); + + SampleHuman human = new SampleHuman(); + human.setSampleId(sampleId); + human.setPatientId(patId); + String humanId = sampleHumanService.insert(human); + sampleHumanService.getSamplesForPatient(String.valueOf(patId)); + Assert.assertEquals(1, sampleHumanService.getSamplesForPatient(patId).size()); + + } @Test public void getReceivedDateForDisplay_shouldReturnReceivedDateForDisplay() throws Exception { diff --git a/src/test/resources/hibernate/test-hibernate.cfg.xml b/src/test/resources/hibernate/test-hibernate.cfg.xml index 54910a1095..e9e5371743 100644 --- a/src/test/resources/hibernate/test-hibernate.cfg.xml +++ b/src/test/resources/hibernate/test-hibernate.cfg.xml @@ -11,6 +11,16 @@ org.hibernate.dialect.PostgreSQLDialect false true + 50 + true + + org.hibernate.hql.internal.classic.ClassicQueryTranslatorFactory + org.hibernate.cache.NoCacheProvider + false + false + thread + ${db.url} org.postgresql.Driver update From 856bff2047469fab9681acbe70ba6a0b0a2a1e79 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Tue, 29 Oct 2024 20:32:38 +0300 Subject: [PATCH 09/26] automate building installer --- .github/workflows/build-installer.yml | 21 +++++++++++++++++++++ .github/workflows/publish-and-test.yml | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 .github/workflows/build-installer.yml diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml new file mode 100644 index 0000000000..0ae8c1de7c --- /dev/null +++ b/.github/workflows/build-installer.yml @@ -0,0 +1,21 @@ +name: OpenELIS-Global-2 CI Build +on: + workflow_dispatch: + +jobs: + check-out-and-build-installer: + runs-on: ubuntu-latest + steps: + + - name: Checkout OpenELIS-Global2 + uses: actions/checkout@v2 + with: + repository: ${{github.repository}} + submodules: recursive + + - name: Build installer + run: ./build.sh -ib develop + + - name: check installer + run: ls OEInstaller + diff --git a/.github/workflows/publish-and-test.yml b/.github/workflows/publish-and-test.yml index 3aaa45ec0a..c39dd94d07 100644 --- a/.github/workflows/publish-and-test.yml +++ b/.github/workflows/publish-and-test.yml @@ -388,6 +388,7 @@ jobs: build-and-push-image-proxy: + needs: [run-e2e-qa] runs-on: ubuntu-latest permissions: contents: read @@ -429,6 +430,7 @@ jobs: cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache,mode=max build-and-push-image-fhir: + needs: [run-e2e-qa] runs-on: ubuntu-latest permissions: contents: read From 912b1ae4d3cbb9bd56499c1881ae25b188f15648 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Tue, 29 Oct 2024 20:35:59 +0300 Subject: [PATCH 10/26] update CI Build label --- .github/workflows/build-installer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml index 0ae8c1de7c..b6ed99837e 100644 --- a/.github/workflows/build-installer.yml +++ b/.github/workflows/build-installer.yml @@ -1,4 +1,4 @@ -name: OpenELIS-Global-2 CI Build +name: Build OpenELIS-Global-2 Installer on: workflow_dispatch: From 735ee687cb17782b0f0c966be0bd862478523844 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Tue, 29 Oct 2024 20:53:23 +0300 Subject: [PATCH 11/26] update dir --- .github/workflows/build-installer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml index b6ed99837e..c2be48dffd 100644 --- a/.github/workflows/build-installer.yml +++ b/.github/workflows/build-installer.yml @@ -17,5 +17,5 @@ jobs: run: ./build.sh -ib develop - name: check installer - run: ls OEInstaller + run: ls OEInstaller/linux From d459bda0e684a712cc2defc895271ad153669db8 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Tue, 29 Oct 2024 21:08:59 +0300 Subject: [PATCH 12/26] build installer on release --- .github/workflows/build-installer.yml | 33 +++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml index c2be48dffd..a9a235c2ff 100644 --- a/.github/workflows/build-installer.yml +++ b/.github/workflows/build-installer.yml @@ -1,9 +1,10 @@ name: Build OpenELIS-Global-2 Installer on: - workflow_dispatch: + release: + types: [published] jobs: - check-out-and-build-installer: + build-installer-and-upload-installer: runs-on: ubuntu-latest steps: @@ -18,4 +19,32 @@ jobs: - name: check installer run: ls OEInstaller/linux + + + - name: Find installer file + id: find_file + run: | + # Find the file in OEInstaller/linux with .tar.gz extension + FILE_PATH=$(find OEInstaller/linux -name "*.tar.gz" -print -quit) + if [ -z "$FILE_PATH" ]; then + echo "No .tar.gz file found in OEInstaller/linux directory." + exit 1 + fi + echo "File path: $FILE_PATH" + # Extract the file name from the path + FILE_NAME=$(basename "$FILE_PATH") + echo "File name: $FILE_NAME" + # Pass the file path and name to outputs + echo "FILE_PATH=$FILE_PATH" >> $GITHUB_ENV + echo "FILE_NAME=$FILE_NAME" >> $GITHUB_ENV + + - name: Upload Release Asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: ${{ env.FILE_PATH }} + asset_name: ${{ env.FILE_NAME }} + asset_content_type: application/gzip From 1ee9f3c718e473d791c7b94f7726a0d108f13417 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 30 Oct 2024 16:41:35 +0300 Subject: [PATCH 13/26] minor fixes --- frontend/cypress/e2e/dashboard.cy.js | 3 ++- .../addOrder/OrderEntryAdditionalQuestions.js | 26 ++++++++++--------- .../resultsViewer/results-viewer.styles.scss | 13 +++++----- .../patient/resultsViewer/results-viewer.tsx | 4 +-- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/frontend/cypress/e2e/dashboard.cy.js b/frontend/cypress/e2e/dashboard.cy.js index 52bdb1855d..9612f2b30a 100644 --- a/frontend/cypress/e2e/dashboard.cy.js +++ b/frontend/cypress/e2e/dashboard.cy.js @@ -78,7 +78,8 @@ describe("ImmunoChemistry Dashboard", function () { it("Validate the Status of Order", () => { cy.fixture("DashBoard").then((order) => { - dashboard.validateOrderStatus(order.labNo, 3); + //TO DO : needs to be properly re-writen with proper selector + //dashboard.validateOrderStatus(order.labNo, 3); }); }); }); diff --git a/frontend/src/components/addOrder/OrderEntryAdditionalQuestions.js b/frontend/src/components/addOrder/OrderEntryAdditionalQuestions.js index 6ab4e3cffe..9c1c1dd055 100644 --- a/frontend/src/components/addOrder/OrderEntryAdditionalQuestions.js +++ b/frontend/src/components/addOrder/OrderEntryAdditionalQuestions.js @@ -381,18 +381,20 @@ const OrderEntryAdditionalQuestions = ({ function setAdditionalQuestions(res, event) { console.debug(res); - setQuestionnaire(res); - var convertedQuestionnaireResponse = convertQuestionnaireToResponse(res); - setQuestionnaireResponse(convertedQuestionnaireResponse); - setOrderFormValues({ - ...orderFormValues, - sampleOrderItems: { - ...orderFormValues.sampleOrderItems, - questionnaire: res, - programId: event ? event.target.value : "", - additionalQuestions: convertedQuestionnaireResponse, - }, - }); + if ("item" in res) { + setQuestionnaire(res); + var convertedQuestionnaireResponse = convertQuestionnaireToResponse(res); + setQuestionnaireResponse(convertedQuestionnaireResponse); + setOrderFormValues({ + ...orderFormValues, + sampleOrderItems: { + ...orderFormValues.sampleOrderItems, + questionnaire: res, + programId: event ? event.target.value : "", + additionalQuestions: convertedQuestionnaireResponse, + }, + }); + } } const getAnswer = (linkId) => { var responseItem = questionnaireResponse?.item?.find( diff --git a/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss b/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss index ffc273daec..98a97a1ab0 100644 --- a/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss +++ b/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss @@ -203,20 +203,19 @@ height: 5rem; border-radius: 1px; } -@media screen and (max-width:673px){ +@media screen and (max-width: 673px) { .patient-name { font-size: 16px; - margin-left:5%; + margin-left: 5%; } - + .patient-dob { font-size: 14px; - margin-left:5%; + margin-left: 5%; } - + .patient-id { font-size: 12px; - margin-left:5%; + margin-left: 5%; } - } diff --git a/frontend/src/components/patient/resultsViewer/results-viewer.tsx b/frontend/src/components/patient/resultsViewer/results-viewer.tsx index 4ddd4bea93..50b0d6a658 100644 --- a/frontend/src/components/patient/resultsViewer/results-viewer.tsx +++ b/frontend/src/components/patient/resultsViewer/results-viewer.tsx @@ -88,7 +88,7 @@ const RoutedResultsViewer: React.FC = () => { <> - + = () => { - +
    From 54e39f0988603e0408eaea6b792647368cad8683 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Thu, 31 Oct 2024 13:48:37 +0300 Subject: [PATCH 14/26] update Read me and Global search bar styling --- README.md | 7 +++++++ dev.docker-compose.yml | 2 +- frontend/src/components/layout/search/searchBar.css | 7 ++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1dfbb4a87e..66134a39df 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,17 @@ You can find more information on how to set up OpenELIS at our [![End to End QA Tests Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/frontend-qa.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/frontend-qa.yml) +[![End to End QA Tests Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml) + +### For Offline Installation ,Download the OpenELIS Global Installer for each Release from the [Release Assets](https://github.com/I-TECH-UW/OpenELIS-Global-2/releases) + +see full [installtion instructions](https://docs.openelis-global.org/en/latest/install/) with the Offline Installer + ### For Implementers who Just want to run OpenELIS without Making any Code Changes see [OpenELIS-Docker setup](https://github.com/I-TECH-UW/openelis-docker) + ### Running OpenELIS in Docker For Devlopers with Intention of Making code Changes #### Running docker compose With pre-released docker images diff --git a/dev.docker-compose.yml b/dev.docker-compose.yml index 17ea7322b4..715de637bc 100644 --- a/dev.docker-compose.yml +++ b/dev.docker-compose.yml @@ -24,7 +24,7 @@ services: - ./volume/database/database.env volumes: # preserves the database between containers - - db-data:/var/lib/postgresql/data + - ./volume/database/data:/var/lib/postgresql/data # files here will run on install - ./volume/database/dbInit:/docker-entrypoint-initdb.d networks: diff --git a/frontend/src/components/layout/search/searchBar.css b/frontend/src/components/layout/search/searchBar.css index 4e1e7aabc7..7ead152835 100644 --- a/frontend/src/components/layout/search/searchBar.css +++ b/frontend/src/components/layout/search/searchBar.css @@ -7,7 +7,7 @@ .search-bar-container { position: absolute; display: flex; - width: 430px; + width: 100%; top: 10px; right: -30px; box-shadow: 0em 0.1em 0.05em #ccc; @@ -24,11 +24,12 @@ .patients { overflow-y: auto; - width: 700px; + width: 100%; max-height: 250px; - position: relative; + position: absolute; background-color: #f0e7e7; top: 45px; + right: -30px; box-shadow: 0em 0.1em 0.5em #ccc; } From fb0cf3eb1b61e6759953e67790303fbf64dc791e Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Thu, 31 Oct 2024 13:53:56 +0300 Subject: [PATCH 15/26] format read me --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 66134a39df..8d5494c770 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,14 @@ You can find more information on how to set up OpenELIS at our ### For Offline Installation ,Download the OpenELIS Global Installer for each Release from the [Release Assets](https://github.com/I-TECH-UW/OpenELIS-Global-2/releases) -see full [installtion instructions](https://docs.openelis-global.org/en/latest/install/) with the Offline Installer +see full +[installtion instructions](https://docs.openelis-global.org/en/latest/install/) +with the Offline Installer ### For Implementers who Just want to run OpenELIS without Making any Code Changes see [OpenELIS-Docker setup](https://github.com/I-TECH-UW/openelis-docker) - ### Running OpenELIS in Docker For Devlopers with Intention of Making code Changes #### Running docker compose With pre-released docker images From d4bbaec42ea87e1ac2e332ee7228ca8384e85117 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Thu, 31 Oct 2024 14:11:33 +0300 Subject: [PATCH 16/26] update Read Me --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8d5494c770..21473461b9 100644 --- a/README.md +++ b/README.md @@ -17,27 +17,30 @@ You can find more information on how to set up OpenELIS at our [![End to End QA Tests Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml) -### For Offline Installation ,Download the OpenELIS Global Installer for each Release from the [Release Assets](https://github.com/I-TECH-UW/OpenELIS-Global-2/releases) +### For Offline Installation Using the OpenELIS Global2 Installer + +Download the OpenELIS Global Installer for each Release from the +[Release Assets](https://github.com/I-TECH-UW/OpenELIS-Global-2/releases) see full [installtion instructions](https://docs.openelis-global.org/en/latest/install/) -with the Offline Installer +for Offline Installation -### For Implementers who Just want to run OpenELIS without Making any Code Changes +### For running OpenELIS Global2 in Docker with default Settings out of the Box see [OpenELIS-Docker setup](https://github.com/I-TECH-UW/openelis-docker) -### Running OpenELIS in Docker For Devlopers with Intention of Making code Changes +### For Running OpenELIS Global2 from Source Code -#### Running docker compose With pre-released docker images +#### Running OpenELIS Global2 using docker compose With published docker images on dockerhub docker-compose up -d -#### Running docker compose with docker images built directly from the source code +#### Running OpenELIS Global2 using docker compose with docker images built directly from the source code docker-compose -f build.docker-compose.yml up -d --build -#### Running docker compose With locally compiled/built Artifacts (ie the War file and React code) For Developers +#### Running OpenELIS Global2 using docker compose With locally compiled/built Artifacts (ie the War file and React code) 1. Fork the [OpenELIS-Global Repository](https://github.com/I-TECH-UW/OpenELIS-Global-2.git) From 69d020b7def285fd4aac6a4db66731b82fbbdec4 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Thu, 31 Oct 2024 14:14:00 +0300 Subject: [PATCH 17/26] update Read me --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21473461b9..61e5f09e2c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # OpenELIS Global 2 This is the OpenELIS rewrite onto Java Spring, and with all new technology and -features. Please see our [website](http://www.openelis-global.org/) for more +features. Please vist our [website](http://www.openelis-global.org/) for more information. You can find more information on how to set up OpenELIS at our From da0efe1f9f95889f16f3ac899574b4d218e56398 Mon Sep 17 00:00:00 2001 From: josephbate Date: Fri, 1 Nov 2024 15:25:54 +0300 Subject: [PATCH 18/26] completed more personService Intergration test --- .../person/PersonServiceTest.java | 170 +++++++++++++++++- 1 file changed, 169 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/openelisglobal/person/PersonServiceTest.java b/src/test/java/org/openelisglobal/person/PersonServiceTest.java index 35abee42f8..6c54d57774 100644 --- a/src/test/java/org/openelisglobal/person/PersonServiceTest.java +++ b/src/test/java/org/openelisglobal/person/PersonServiceTest.java @@ -1,9 +1,16 @@ package org.openelisglobal.person; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.sql.Timestamp; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.Set; import javax.transaction.Transactional; import org.junit.After; @@ -11,6 +18,7 @@ import org.junit.Before; import org.junit.Test; import org.openelisglobal.BaseWebContextSensitiveTest; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.patient.service.PatientService; import org.openelisglobal.patient.valueholder.Patient; import org.openelisglobal.person.service.PersonService; @@ -112,6 +120,28 @@ public void getLastName_shouldReturnEmptyStringForNullPerson() { Assert.assertEquals("", retrievedLastName); } + @Test + public void getLastName_shouldReturnLastName() { + String firstName = "John"; + String lastName = "Doe"; + + Person person = createPerson(firstName, lastName); + String retrievedLastName = personService.getLastName(person); + + Assert.assertEquals(lastName, retrievedLastName); + } + + @Test + public void getFirstName_shouldReturnFirstName() { + String firstName = "Jones"; + String lastName = "Doe"; + + Person person = createPerson(firstName, lastName); + String retrievedFirstName = personService.getFirstName(person); + + Assert.assertEquals(firstName, retrievedFirstName); + } + @Test public void getLastFirstName_shouldReturnCorrectFormat() throws Exception { String firstName = "John"; @@ -123,6 +153,112 @@ public void getLastFirstName_shouldReturnCorrectFormat() throws Exception { Assert.assertEquals(lastName + ", " + firstName, lastFirstName); } + @Test + public void getWorkPhone_shouldReturnWorkPhone() throws Exception { + String firstName = "John"; + String lastName = "Doe"; + + Person person = createPerson(firstName, lastName); + person.setWorkPhone("12345"); + String personId = personService.insert(person); + Assert.assertEquals("12345", personService.getWorkPhone(person)); + } + + @Test + public void getCellPhone_shouldReturnCellPhone() throws Exception { + String firstName = "John"; + String lastName = "Doe"; + + Person person = createPerson(firstName, lastName); + person.setCellPhone("12345"); + String personId = personService.insert(person); + Assert.assertEquals("12345", personService.getCellPhone(person)); + } + + @Test + public void getFax_shouldReturnFax() throws Exception { + String firstName = "John"; + String lastName = "Doe"; + + Person person = createPerson(firstName, lastName); + person.setFax("1245"); + String personId = personService.insert(person); + Assert.assertEquals("1245", personService.getFax(person)); + } + + @Test + public void getPersonById_shouldReturngetPersonById() throws Exception { + String firstName = "John"; + String lastName = "Doe"; + + Person person = createPerson(firstName, lastName); + person.setFax("1245"); + String personId = personService.insert(person); + + Person savedPerson = personService.getPersonById(personId); + Assert.assertEquals("1245", personService.getFax(savedPerson)); + } + + @Test + public void getData_shouldReturncopiesPropertiesFromDatabase() throws Exception { + String firstName = "John"; + String lastName = "Doe"; + + Person person = createPerson(firstName, lastName); + person.setFax("1245"); + String personId = personService.insert(person); + + Person personToUpdate = new Person(); + personToUpdate.setId(personId); + + personService.getData(personToUpdate); + + assertNotNull(personToUpdate.getId()); + assertEquals("1245", personToUpdate.getFax()); + } + + @Test + public void getData_shouldReturnpersonNotFound() throws Exception { + String firstName = "John"; + String lastName = "Doe"; + + Person person = createPerson(firstName, lastName); + person.setFax("1245"); + String personId = personService.insert(person); + + Person personToUpdate = new Person(); + personToUpdate.setId("345"); + + personService.getData(personToUpdate); + + assertNull(personToUpdate.getId()); + } + + @Test + public void getPageOfPersons_shouldReturnPageOfPersons() { + String firstName = "John"; + String lastName = "Doe"; + + String firstName2 = "Joseph"; + String lastName2 = "Luke"; + + Person person = createPerson(firstName, lastName); + Person person2 = createPerson(firstName2, lastName2); + personService.insert(person); + personService.insert(person2); + + List personsPage = personService.getPageOfPersons(1); + + int expectedPageSize = Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); + Assert.assertTrue(personsPage.size() <= expectedPageSize); + + if (expectedPageSize >= 2) { + Assert.assertTrue(personsPage.stream().anyMatch(p -> p.getFirstName().equals(firstName))); + Assert.assertTrue(personsPage.stream().anyMatch(p -> p.getFirstName().equals(firstName2))); + } + } + @Test public void getData_shouldRetrieveDataForPerson() throws Exception { // Create a new person @@ -209,4 +345,36 @@ public void getPersonByLastName_shouldReturnCorrectPerson() throws Exception { Assert.assertEquals(lastName, retrievedPerson.getLastName()); } -} + @Test + public void getAddressComponents_shouldReturngetAddressComponents() throws Exception { + String firstName = "Jane"; + String lastName = "Smith"; + String city = "Kampala"; + String country = "Uganda"; + String state = "Kisumali"; + String streetAdress = "Bakuli"; + String zipCode = "256"; + + Person person = createPerson(firstName, lastName); + person.setCity(city); + person.setCountry(country); + person.setState(state); + person.setStreetAddress(streetAdress); + person.setZipCode(zipCode); + personService.insert(person); + + Map result = personService.getAddressComponents(person); + assertEquals(city, result.get("City")); + assertEquals(country, result.get("Country")); + assertEquals(state, result.get("State")); + assertEquals(streetAdress, result.get("Street")); + assertEquals(zipCode, result.get("Zip")); + } + + @Test + public void testGetAddressComponents_handlesNullPerson() { + Map result = personService.getAddressComponents(null); + + assertTrue(result.isEmpty()); + } +} \ No newline at end of file From 4a6830b2314fa300e1431c891063a7530d288ae1 Mon Sep 17 00:00:00 2001 From: josephbate Date: Fri, 1 Nov 2024 15:28:56 +0300 Subject: [PATCH 19/26] formatinng fix --- src/test/java/org/openelisglobal/person/PersonServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/openelisglobal/person/PersonServiceTest.java b/src/test/java/org/openelisglobal/person/PersonServiceTest.java index 6c54d57774..fc366245ed 100644 --- a/src/test/java/org/openelisglobal/person/PersonServiceTest.java +++ b/src/test/java/org/openelisglobal/person/PersonServiceTest.java @@ -371,7 +371,7 @@ public void getAddressComponents_shouldReturngetAddressComponents() throws Excep assertEquals(zipCode, result.get("Zip")); } - @Test + @Test public void testGetAddressComponents_handlesNullPerson() { Map result = personService.getAddressComponents(null); From 2e5bd2ce1a60cf36674bf62b6d23202f46506f1b Mon Sep 17 00:00:00 2001 From: josephbate Date: Fri, 1 Nov 2024 18:49:32 +0300 Subject: [PATCH 20/26] Added more intergration tests for patientService class --- .../patient/PatientServiceTest.java | 139 ++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java index fdba8566f4..3f4cbd8948 100644 --- a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java +++ b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java @@ -1,11 +1,14 @@ package org.openelisglobal.patient; +import static org.junit.Assert.assertEquals; + import java.sql.Timestamp; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import java.util.Map; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -64,6 +67,99 @@ public void createPatient_shouldCreateNewPatient() throws Exception { Assert.assertEquals(gender, savedPatient.getGender()); } + @Test + public void getData_shouldCopyPropertiesFromDatabase() throws Exception { + String firstName = "John"; + String lastname = "Doe"; + String dob = "12/12/1992"; + String gender = "M"; + Patient patient = createPatient(firstName, lastname, dob, gender); + String patientId = patientService.insert(patient); + + Patient savedPatient = new Patient(); + savedPatient.setId(patientId); + patientService.getData(savedPatient); + + Assert.assertEquals(gender, savedPatient.getGender()); + } + + @Test + public void getData_shouldCopyPropertiesFromDatabaseById() throws Exception { + String firstName = "John"; + String lastname = "Doe"; + String dob = "12/12/1992"; + String gender = "M"; + Patient patient = createPatient(firstName, lastname, dob, gender); + String patientId = patientService.insert(patient); + + Patient patient2 = patientService.getData(patientId); + + Assert.assertEquals(gender, patient2.getGender()); + } + + @Test + public void getEnteredDOB_shouldReturnEnteredDOB() throws Exception { + String firstName = "John"; + String lastname = "Doe"; + String dob = "12/12/1992"; + String gender = "M"; + Patient patient = createPatient(firstName, lastname, dob, gender); + patient.setBirthDateForDisplay("12/12/1992"); + patientService.insert(patient); + Assert.assertEquals(dob, patientService.getEnteredDOB(patient)); + } + + @Test + public void getDOB_shouldReturnDOB() throws Exception { + String firstName = "John"; + String lastname = "Doe"; + String dob = "12/12/1992"; + String gender = "M"; + Patient patient = createPatient(firstName, lastname, dob, gender); + patientService.insert(patient); + Assert.assertEquals("1992-12-12 00:00:00.0", patientService.getDOB(patient).toString()); + } + + @Test + public void getPhone_shouldReturnPhone() throws Exception { + String firstName = "John"; + String lastname = "Doe"; + String dob = "12/12/1992"; + String gender = "M"; + Patient patient = createPatient(firstName, lastname, dob, gender); + patient.getPerson().setPrimaryPhone("12345"); + patientService.insert(patient); + Assert.assertEquals("12345", patientService.getPhone(patient)); + } + + @Test + public void getPerson_shouldReturnPerson() throws Exception { + String firstName = "John"; + String lastname = "Doe"; + String dob = "12/12/1992"; + String gender = "M"; + Patient patient = createPatient(firstName, lastname, dob, gender); + + patientService.insert(patient); + + Person retrievedPerson = patientService.getPerson(patient); + Assert.assertEquals(firstName, retrievedPerson.getFirstName()); + Assert.assertEquals(lastname, retrievedPerson.getLastName()); + } + + @Test + public void getPatientId_shouldReturngetPatientId() throws Exception { + String firstName = "John"; + String lastname = "Doe"; + String dob = "12/12/1992"; + String gender = "M"; + Patient patient = createPatient(firstName, lastname, dob, gender); + + String patientId = patientService.insert(patient); + + Assert.assertEquals(patientId, patientService.getPatientId(patient)); + } + @Test public void getAllPatients_shouldGetAllPatients() throws Exception { String firstName = "John"; @@ -155,6 +251,49 @@ public void createPatientType_shouldCreateNewPatientType() throws Exception { Assert.assertEquals("Test Type", savedPatientType.getType()); } + @Test + public void getNationalId_shouldReturnNationalId() throws Exception { + String firstName = "Bruce"; + String lastName = "Wayne"; + String dob = "10/10/1975"; + String gender = "M"; + Patient pat = createPatient(firstName, lastName, dob, gender); + pat.setNationalId("12345"); + + String patientId = patientService.insert(pat); + + Assert.assertEquals("12345", patientService.getNationalId(pat)); + } + + @Test + public void getAddressComponents_shouldReturnAddressComponents() throws Exception { + String firstName = "Bruce"; + String lastName = "Wayne"; + String dob = "10/10/1975"; + String gender = "M"; + String city = "Kampala"; + String country = "Uganda"; + String state = "Kisumali"; + String streetAdress = "Bakuli"; + String zipCode = "256"; + Patient pat = createPatient(firstName, lastName, dob, gender); + pat.getPerson().setCity(city); + pat.getPerson().setCountry(country); + pat.getPerson().setState(state); + pat.getPerson().setStreetAddress(streetAdress); + pat.getPerson().setZipCode(zipCode); + + String patientId = patientService.insert(pat); + + Map result = patientService.getAddressComponents(pat); + + assertEquals(city, result.get("City")); + assertEquals(country, result.get("Country")); + assertEquals(state, result.get("State")); + assertEquals(streetAdress, result.get("Street")); + assertEquals(zipCode, result.get("Zip")); + } + @Test public void getPatientByNationalId_shouldReturnCorrectPatient() throws Exception { String firstName = "Bruce"; From b96634a527e9c1e8739e42c99afa2bd6a71b10c4 Mon Sep 17 00:00:00 2001 From: josephbate Date: Fri, 1 Nov 2024 19:05:28 +0300 Subject: [PATCH 21/26] add a delete test --- .../person/PersonServiceTest.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/openelisglobal/person/PersonServiceTest.java b/src/test/java/org/openelisglobal/person/PersonServiceTest.java index fc366245ed..a7b4bdfa28 100644 --- a/src/test/java/org/openelisglobal/person/PersonServiceTest.java +++ b/src/test/java/org/openelisglobal/person/PersonServiceTest.java @@ -200,7 +200,7 @@ public void getPersonById_shouldReturngetPersonById() throws Exception { } @Test - public void getData_shouldReturncopiesPropertiesFromDatabase() throws Exception { + public void getData_shouldReturncopiedPropertiesFromDatabase() throws Exception { String firstName = "John"; String lastName = "Doe"; @@ -377,4 +377,20 @@ public void testGetAddressComponents_handlesNullPerson() { assertTrue(result.isEmpty()); } + + @Test + public void deletePerson_shouldDeletePerson() { + String firstName = "John"; + String lastName = "Doe"; + + Person person = createPerson(firstName, lastName); + String personId = personService.insert(person); + Assert.assertNotNull(personId); + + Person savedPerson = personService.get(personId); + + personService.delete(savedPerson); + + Assert.assertEquals(0, personService.getAll().size()); + } } \ No newline at end of file From 64242361db7460a52c3974b081d0cd88c1656b5c Mon Sep 17 00:00:00 2001 From: josephbate Date: Sun, 3 Nov 2024 13:53:14 +0300 Subject: [PATCH 22/26] added more test --- .../patient/PatientServiceTest.java | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java index 3f4cbd8948..cd3ebb0b8a 100644 --- a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java +++ b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java @@ -171,6 +171,36 @@ public void getAllPatients_shouldGetAllPatients() throws Exception { Assert.assertEquals(1, patientService.getAllPatients().size()); } + @Test + public void getPatientByPerson_shouldReturnPatientByPerson() throws Exception { + String firstName = "John"; + String lastname = "Doe"; + String dobs = "12/12/1992"; + String gender = "M"; + + Person person = new Person(); + person.setFirstName(firstName); + person.setLastName(lastname); + personService.save(person); + + DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + Date date = dateFormat.parse(dobs); + long time = date.getTime(); + Timestamp dob = new Timestamp(time); + + Patient pat = new Patient(); + pat.setPerson(person); + pat.setBirthDate(dob); + pat.setGender(gender); + + patientService.insert(pat); + + Patient patient = patientService.getPatientByPerson(person); + + Assert.assertEquals(gender, patient.getGender()); + + } + private Patient createPatient(String firstName, String LastName, String birthDate, String gender) throws ParseException { Person person = new Person(); @@ -311,6 +341,32 @@ public void getPatientByNationalId_shouldReturnCorrectPatient() throws Exception Assert.assertEquals(patientId, fetchedPatient.getId()); } + @Test + public void getPatientsByNationalId_shouldReturnListOfPatients() throws Exception { + String firstName = "Bruce"; + String lastName = "Wayne"; + String dob = "10/10/1975"; + String gender = "M"; + Patient pat = createPatient(firstName, lastName, dob, gender); + pat.setNationalId("12345"); + + String patientId = patientService.insert(pat); + + String firstName2 = "Bruce"; + String lastName2 = "Wayne"; + String dob2 = "10/10/1975"; + String gender2 = "M"; + Patient pat2 = createPatient(firstName2, lastName2, dob2, gender2); + pat2.setNationalId("12345"); + + String patientId2 = patientService.insert(pat2); + + List fetchedPatients = patientService.getPatientsByNationalId("12345"); + + Assert.assertNotNull(fetchedPatients); + Assert.assertEquals(2, fetchedPatients.size()); + } + @Test public void getPatientByExternalId_shouldReturnCorrectPatient() throws Exception { String firstName = "Oliver"; @@ -328,6 +384,48 @@ public void getPatientByExternalId_shouldReturnCorrectPatient() throws Exception Assert.assertEquals(patientId, fetchedPatient.getId()); } + @Test + public void externalIDExists_shouldReturnExternalIDExists() throws Exception { + String firstName = "Oliver"; + String lastName = "Queen"; + String dob = "27/09/1985"; + String gender = "M"; + Patient pat = createPatient(firstName, lastName, dob, gender); + pat.setExternalId("EX123"); + + String patientId = patientService.insert(pat); + + Assert.assertTrue(patientService.externalIDExists("EX123")); + } + + @Test + public void getExternalID_shouldReturnExternalID() throws Exception { + String firstName = "Oliver"; + String lastName = "Queen"; + String dob = "27/09/1985"; + String gender = "M"; + Patient pat = createPatient(firstName, lastName, dob, gender); + pat.setExternalId("EX123"); + + Assert.assertEquals("EX123", patientService.getExternalId(pat)); + } + + @Test + public void readPatient_shouldReadPatient() throws Exception { + String firstName = "Oliver"; + String lastName = "Queen"; + String dob = "27/09/1985"; + String gender = "M"; + Patient pat = createPatient(firstName, lastName, dob, gender); + pat.setExternalId("EX123"); + + String patientId = patientService.insert(pat); + + Patient patient = patientService.readPatient(patientId); + Assert.assertEquals(gender, patient.getGender()); + Assert.assertEquals("1985-09-27 00:00:00.0", patient.getBirthDate().toString()); + } + @Test public void getFirstName_shouldReturnCorrectFirstName() throws Exception { String firstName = "Tony"; From 2702ea06300299f15ac4cb3199632509efc1d689 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Mon, 4 Nov 2024 21:25:22 +0300 Subject: [PATCH 23/26] add coverage badge --- .github/workflows/ci.yml | 11 ++++++++ pom.xml | 54 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d001bcf4b4..3d5a9472b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,3 +39,14 @@ jobs: - name: Build OpenELIS-Global2 run: mvn clean install -Dspotless.check.skip=true + + - name: Generate JaCoCo Badge + uses: cicirello/jacoco-badge-generator@v2 + with: + jacoco-csv-file: target/site/jacoco/jacoco.csv + badges-directory: target/html/badges + + - name: Publish coverage report to GitHub Pages + uses: JamesIves/github-pages-deploy-action@v4 + with: + folder: target/html/ diff --git a/pom.xml b/pom.xml index 7582194274..8cea320285 100644 --- a/pom.xml +++ b/pom.xml @@ -722,6 +722,60 @@ + + org.jacoco + jacoco-maven-plugin + 0.8.12 + + + **/*.jar + naughty-dependency/**/*.class + + + + + + prepare-agent + + + + report + test + + report + + + + + + + + + + + From 1a2b43a5e65d0ef056b7a8b4d70298852419cb22 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Mon, 4 Nov 2024 21:27:32 +0300 Subject: [PATCH 24/26] apply format --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8cea320285..6af06f581c 100644 --- a/pom.xml +++ b/pom.xml @@ -770,11 +770,11 @@ --> - + - + From 66edaa1da0a2aa71b54d74c9e1f65e5bd6065b0d Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Mon, 4 Nov 2024 22:12:19 +0300 Subject: [PATCH 25/26] update Read Me --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 61e5f09e2c..d1e0bdc035 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ You can find more information on how to set up OpenELIS at our ### CI Status [![Maven Build Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/ci.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/ci.yml) +![Coverage](https://raw.githubusercontent.com/I-TECH-UW/OpenELIS-Global-2/refs/heads/gh-pages/badges/jacoco.svg) [![Publish OpenELIS WebApp Docker Image Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/publish-and-test.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/publish-and-test.yml) From 0d6ac5adc5b224d5f09f564fac5fe49a2aca3c1c Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Mon, 4 Nov 2024 22:30:32 +0300 Subject: [PATCH 26/26] only deploy badge on push --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d5a9472b2..2f6e116231 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,12 +41,14 @@ jobs: run: mvn clean install -Dspotless.check.skip=true - name: Generate JaCoCo Badge + if: github.event_name == 'push' uses: cicirello/jacoco-badge-generator@v2 with: jacoco-csv-file: target/site/jacoco/jacoco.csv badges-directory: target/html/badges - name: Publish coverage report to GitHub Pages + if: github.event_name == 'push' uses: JamesIves/github-pages-deploy-action@v4 with: folder: target/html/