From eedf4904b70962215873877823388f03b67f1a20 Mon Sep 17 00:00:00 2001
From: ruhanga <ruhanganathan@gmail.com>
Date: Fri, 26 Jul 2024 15:38:04 +0300
Subject: [PATCH] [#272]: Fix tests for Billable Services Domain

---
 api-2.4/pom.xml                               | 44 +++++++++++++++-
 .../api/billing/BillableServiceCsvParser.java |  7 ++-
 .../api/billing/CashPointCsvParser.java       |  2 +-
 .../api/billing/ServicePricesCsvParser.java   |  2 +-
 .../BillableServiceLoaderIntegrationTest.java | 50 +++++++++++--------
 ...inBaseModuleContextSensitive_2_4_test.java |  5 ++
 .../src/test/resources/test-hibernate.cfg.xml | 13 +++++
 .../billableservices/services.csv             |  8 +--
 .../resources/testdata/test-concepts-2.4.xml  |  2 +-
 9 files changed, 101 insertions(+), 32 deletions(-)
 create mode 100644 api-2.4/src/test/resources/test-hibernate.cfg.xml

diff --git a/api-2.4/pom.xml b/api-2.4/pom.xml
index 0a1be91b..fe1eee13 100644
--- a/api-2.4/pom.xml
+++ b/api-2.4/pom.xml
@@ -16,7 +16,9 @@
 
     <properties>
         <openmrsPlatformVersion>${openmrsVersion2.4}</openmrsPlatformVersion>
+        <datafilterVersion>2.2.0</datafilterVersion>
         <billingVersion>1.1.0</billingVersion>
+        <stockmanagementVersion>2.0.0</stockmanagementVersion>
     </properties>
 
     <dependencies>
@@ -71,6 +73,46 @@
             <version>${billingVersion}</version>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>stockmanagement-api</artifactId>
+			<version>${stockmanagementVersion}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+            <groupId>org.openmrs.module</groupId>
+            <artifactId>datafilter-api</artifactId>
+            <version>${datafilterVersion}</version>
+            <scope>test</scope>
+        </dependency>
+		
+		<dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <version>1.7.1</version>
+            <exclusions>
+				<exclusion>
+					<artifactId>mockito-all</artifactId>
+					<groupId>org.mockito</groupId>
+				</exclusion>
+			</exclusions>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>1.7.1</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
+	    </dependency>
     </dependencies>
-
 </project>
diff --git a/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/BillableServiceCsvParser.java b/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/BillableServiceCsvParser.java
index 5f496e85..4e8b5500 100644
--- a/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/BillableServiceCsvParser.java
+++ b/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/BillableServiceCsvParser.java
@@ -9,6 +9,7 @@
 import org.openmrs.module.initializer.api.CsvLine;
 import org.openmrs.module.initializer.api.CsvParser;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 @OpenmrsProfile(modules = { "billing:1.1.0 - 9.*" })
 public class BillableServiceCsvParser extends CsvParser<BillableService, BaseLineProcessor<BillableService>> {
@@ -18,7 +19,7 @@ public class BillableServiceCsvParser extends CsvParser<BillableService, BaseLin
     private final BillableServicesLineProcessor billableServicesLineProcessor;
 
     @Autowired
-    public BillableServiceCsvParser(IBillableItemsService billableItemsService, BillableServicesLineProcessor billableServicesLineProcessor) {
+    public BillableServiceCsvParser(@Qualifier("billableItemsService") IBillableItemsService billableItemsService, BillableServicesLineProcessor billableServicesLineProcessor) {
         super(billableServicesLineProcessor);
         this.billableItemsService = billableItemsService;
         this.billableServicesLineProcessor = billableServicesLineProcessor;
@@ -47,7 +48,9 @@ public BillableService bootstrap(CsvLine line) throws IllegalArgumentException {
 
     @Override
     public BillableService save(BillableService instance) {
-        return billableItemsService.save(instance);
+    	BillableService entity = billableItemsService.save(instance);
+    	System.out.println("aaaaaaaaaaaa   :" + entity + "  :  " + entity.getBillableServiceId());
+    	return entity;
     }
 
     @Override
diff --git a/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/CashPointCsvParser.java b/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/CashPointCsvParser.java
index 72062b4d..465cfab8 100644
--- a/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/CashPointCsvParser.java
+++ b/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/CashPointCsvParser.java
@@ -17,7 +17,7 @@ public class CashPointCsvParser extends CsvParser<CashPoint, BaseLineProcessor<C
 	private final ICashPointService iCashPointService;
 	
 	@Autowired
-	public CashPointCsvParser(@Qualifier("iCashPointService") ICashPointService iCashPointService,
+	public CashPointCsvParser(@Qualifier("cashierCashPointService") ICashPointService iCashPointService,
 	    CashPointsLineProcessor processor) {
 		super(processor);
 		this.iCashPointService = iCashPointService;
diff --git a/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/ServicePricesCsvParser.java b/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/ServicePricesCsvParser.java
index bfd58cb0..a245c050 100644
--- a/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/ServicePricesCsvParser.java
+++ b/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/ServicePricesCsvParser.java
@@ -17,7 +17,7 @@ public class ServicePricesCsvParser extends CsvParser<PaymentMode, BaseLineProce
 	private final IPaymentModeService paymentModeService;
 	
 	@Autowired
-	public ServicePricesCsvParser(@Qualifier("paymentModeService") IPaymentModeService paymentModeService,
+	public ServicePricesCsvParser(@Qualifier("cashierPaymentModeService") IPaymentModeService paymentModeService,
 	    ServicePricesLineProcessor processor) {
 		super(processor);
 		this.paymentModeService = paymentModeService;
diff --git a/api-2.4/src/test/java/org/openmrs/module/initializer/api/BillableServiceLoaderIntegrationTest.java b/api-2.4/src/test/java/org/openmrs/module/initializer/api/BillableServiceLoaderIntegrationTest.java
index c36ce552..9e686b18 100644
--- a/api-2.4/src/test/java/org/openmrs/module/initializer/api/BillableServiceLoaderIntegrationTest.java
+++ b/api-2.4/src/test/java/org/openmrs/module/initializer/api/BillableServiceLoaderIntegrationTest.java
@@ -37,7 +37,8 @@ public class BillableServiceLoaderIntegrationTest extends DomainBaseModuleContex
 	public void setup() {
 		executeDataSet("testdata/test-concepts-2.4.xml");
 		{
-			Concept concept = conceptService.getConceptByUuid("164949AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+			// To be edited
+			Concept concept = conceptService.getConceptByUuid("3f6f6c92-8d5c-4a9e-bb1c-d3e00e4f8b71");
 			
 			BillableService service = new BillableService();
 			service.setUuid("a0f7d8a1-4fa2-418c-aa8a-9b358f43d605");
@@ -47,6 +48,21 @@ public void setup() {
 			service.setServiceStatus(BillableServiceStatus.ENABLED);
 			billableItemsService.save(service);
 		}
+		
+		{
+			// To be retired
+			Concept concept = conceptService.getConceptByUuid("550e8400-e29b-41d4-a716-446655440000");
+			
+			BillableService service = new BillableService();
+			service.setUuid("16435ab4-27c3-4d91-b21e-52819bd654d8");
+			service.setName("Nutrition");
+			service.setShortName("NUC");
+			service.setVoided(false);
+			service.setConcept(concept);
+			service.setServiceType(concept);
+			service.setServiceStatus(BillableServiceStatus.ENABLED);
+			billableItemsService.save(service);
+		}
 	}
 	
 	@Test
@@ -59,38 +75,28 @@ public void load_shouldLoadBillableServicesAccordingToCsvFiles() {
 			BillableService service = billableItemsService.getByUuid("44ebd6cd-04ad-4eba-8ce1-0de4564bfd17");
 			Assert.assertNotNull(service);
 			Assert.assertNotNull(service.getServiceType());
-			Assert.assertEquals(conceptService.getConceptByUuid("1592AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"),
-			    service.getConcept());
+			Assert.assertEquals("Antenatal Care", service.getName());
+			Assert.assertEquals(conceptService.getConceptByUuid("d4b4b6ef-6f3e-43a4-a3b9-9c56f3a1e2d8").getId(),
+			    service.getConcept().getId());
 			Assert.assertEquals(BillableServiceStatus.ENABLED, service.getServiceStatus());
 		}
 		
 		// Verify edition
 		{
-			BillableService service = billableItemsService.getByUuid("16435ab4-27c3-4d91-b21e-52819bd654d8");
-			service.setName("Nutrition counseling updated");
-			service.setServiceStatus(BillableServiceStatus.DISABLED);
-			billableItemsService.save(service);
-			
-			BillableService updatedService = billableItemsService.getByUuid("16435ab4-27c3-4d91-b21e-52819bd654d8");
-			Assert.assertEquals("Nutrition counseling updated", updatedService.getName());
-			Assert.assertEquals(BillableServiceStatus.DISABLED, updatedService.getServiceStatus());
+			BillableService service = billableItemsService.getByUuid("a0f7d8a1-4fa2-418c-aa8a-9b358f43d605");
+			Assert.assertNotNull(service);
+			Assert.assertNotNull(service.getServiceType());
+			Assert.assertEquals("Orthopedic Modified", service.getName());
+			Assert.assertEquals(conceptService.getConceptByUuid("3f6f6c92-8d5c-4a9e-bb1c-d3e00e4f8b71").getId(),
+			    service.getConcept().getId());
+			Assert.assertEquals(BillableServiceStatus.DISABLED, service.getServiceStatus());
 		}
 		
 		// Verify retirement
 		{
 			BillableService service = billableItemsService.getByUuid("16435ab4-27c3-4d91-b21e-52819bd654d8");
-			service.setServiceStatus(BillableServiceStatus.DISABLED);
-			billableItemsService.save(service);
-			
-			BillableService retiredService = billableItemsService.getByUuid("16435ab4-27c3-4d91-b21e-52819bd654d8");
-			Assert.assertEquals(BillableServiceStatus.DISABLED, retiredService.getServiceStatus());
-			
-			// Unretire the entity
-			retiredService.setServiceStatus(BillableServiceStatus.ENABLED);
-			billableItemsService.save(retiredService);
+			Assert.assertTrue(service.getVoided());
 			
-			BillableService unretiredService = billableItemsService.getByUuid("16435ab4-27c3-4d91-b21e-52819bd654d8");
-			Assert.assertEquals(BillableServiceStatus.ENABLED, unretiredService.getServiceStatus());
 		}
 	}
 }
diff --git a/api-2.4/src/test/java/org/openmrs/module/initializer/api/DomainBaseModuleContextSensitive_2_4_test.java b/api-2.4/src/test/java/org/openmrs/module/initializer/api/DomainBaseModuleContextSensitive_2_4_test.java
index f44fc776..8f92eb69 100644
--- a/api-2.4/src/test/java/org/openmrs/module/initializer/api/DomainBaseModuleContextSensitive_2_4_test.java
+++ b/api-2.4/src/test/java/org/openmrs/module/initializer/api/DomainBaseModuleContextSensitive_2_4_test.java
@@ -34,4 +34,9 @@ public DomainBaseModuleContextSensitive_2_4_test() {
 	public void updateSearchIndex() {
 		// to prevent Data Filter's 'Illegal Record Access'
 	}
+	
+	@Override
+	public void revertContextMocks() {
+		
+	}
 }
diff --git a/api-2.4/src/test/resources/test-hibernate.cfg.xml b/api-2.4/src/test/resources/test-hibernate.cfg.xml
new file mode 100644
index 00000000..e8d4e48f
--- /dev/null
+++ b/api-2.4/src/test/resources/test-hibernate.cfg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE hibernate-configuration PUBLIC
+"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+    <session-factory>
+        <!-- Billing -->
+        <mapping resource="Bill.hbm.xml"/>
+        <mapping resource="Cashier.hbm.xml"/>
+        <mapping resource="SequentialReceiptNumberGenerator.hbm.xml"/>
+    </session-factory>
+</hibernate-configuration>
diff --git a/api-2.4/src/test/resources/testAppDataDir/configuration/billableservices/services.csv b/api-2.4/src/test/resources/testAppDataDir/configuration/billableservices/services.csv
index 9c3a38be..8c054336 100644
--- a/api-2.4/src/test/resources/testAppDataDir/configuration/billableservices/services.csv
+++ b/api-2.4/src/test/resources/testAppDataDir/configuration/billableservices/services.csv
@@ -1,4 +1,4 @@
-Uuid, Service Name, Short Name, Concept, Service Type, Service Status
-44ebd6cd-04ad-4eba-8ce1-0de4564bfd17, Antenatal Care, ANTC, 1592AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, Antenatal Services, Enabled
-a0f7d8a1-4fa2-418c-aa8a-9b358f43d605, Orthopedic Therapy Modified, OTHS Modified, 164949AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, Orthopedic Services, Enabled
-16435ab4-27c3-4d91-b21e-52819bd654d8, Nutrition counseling, NUC, 1380AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, Nutrition Counselling, Enabled
\ No newline at end of file
+Uuid, Void/Retire, Service Name, Short Name, Concept, Service Type, Service Status
+44ebd6cd-04ad-4eba-8ce1-0de4564bfd17,, Antenatal Care, ANTC, d4b4b6ef-6f3e-43a4-a3b9-9c56f3a1e2d8, Antenatal Services, Enabled
+a0f7d8a1-4fa2-418c-aa8a-9b358f43d605,, Orthopedic Modified, OTHS Modified, 3f6f6c92-8d5c-4a9e-bb1c-d3e00e4f8b71, Orthopedic Services, Disabled
+16435ab4-27c3-4d91-b21e-52819bd654d8,true, Nutrition, NUC, 550e8400-e29b-41d4-a716-446655440000, Nutrition Services, Disabled
\ No newline at end of file
diff --git a/api-2.4/src/test/resources/testdata/test-concepts-2.4.xml b/api-2.4/src/test/resources/testdata/test-concepts-2.4.xml
index 26678308..0bd5e557 100644
--- a/api-2.4/src/test/resources/testdata/test-concepts-2.4.xml
+++ b/api-2.4/src/test/resources/testdata/test-concepts-2.4.xml
@@ -4,7 +4,7 @@
   <concept CONCEPT_ID="6002" UUID="3f6f6c92-8d5c-4a9e-bb1c-d3e00e4f8b71" RETIRED="false" DATE_CREATED="2019-12-11 16:59:47.0" DATE_CHANGED="2019-12-11 16:59:47.0" IS_SET="false" DATATYPE_ID="3" CLASS_ID="11" CHANGED_BY="1" CREATOR="1"/>
   <concept CONCEPT_ID="6003" UUID="d4b4b6ef-6f3e-43a4-a3b9-9c56f3a1e2d8" RETIRED="false" DATE_CREATED="2019-12-11 16:59:47.0" DATE_CHANGED="2019-12-11 16:59:47.0" IS_SET="false" DATATYPE_ID="3" CLASS_ID="11" CHANGED_BY="1" CREATOR="1"/>
   
-  <concept_name CONCEPT_NAME_ID="7001" CONCEPT_ID="6001" NAME="Nutrition Counselling" LOCALE="en" DATE_CREATED="2019-12-11 16:59:47.0" CREATOR="1" VOIDED="false" CONCEPT_NAME_TYPE="FULLY_SPECIFIED" LOCALE_PREFERRED="true" UUID="4421da0d-42d0-410d-8ffd-47ec6f155d8f"/>
+  <concept_name CONCEPT_NAME_ID="7001" CONCEPT_ID="6001" NAME="Nutrition Services" LOCALE="en" DATE_CREATED="2019-12-11 16:59:47.0" CREATOR="1" VOIDED="false" CONCEPT_NAME_TYPE="FULLY_SPECIFIED" LOCALE_PREFERRED="true" UUID="4421da0d-42d0-410d-8ffd-47ec6f155d8f"/>
   <concept_name CONCEPT_NAME_ID="7002" CONCEPT_ID="6002" NAME="Orthopedic Services" LOCALE="en" DATE_CREATED="2019-12-11 16:59:47.0" CREATOR="1" VOIDED="false" CONCEPT_NAME_TYPE="FULLY_SPECIFIED" LOCALE_PREFERRED="true" UUID="276c5861-cd46-429f-9665-e067ddeca8e3"/>
   <concept_name CONCEPT_NAME_ID="7003" CONCEPT_ID="6003" NAME="Antenatal Services" LOCALE="en" DATE_CREATED="2019-12-11 16:59:47.0" CREATOR="1" VOIDED="false" CONCEPT_NAME_TYPE="FULLY_SPECIFIED" LOCALE_PREFERRED="false" UUID="e2b05c0e-cd0b-4e8b-b3a1-d8eecf3babb9"/>
 </dataset>