OZ-348: Add logging configuration & remove openmrs suffix from openmr…

…s base url.
ozone-his · Jan 30, 2024 · 4f24c70 · 4f24c70
1 parent 9a8421d
commit 4f24c70
Show file tree

Hide file tree

Showing 19 changed files with 43 additions and 27 deletions.
diff --git a/...n/resources/camel/obs/obs-to-customer.xml → src/main/resources/camel/obs-to-customer.xml b/...n/resources/camel/obs/obs-to-customer.xml → src/main/resources/camel/obs-to-customer.xml
diff --git a/...ources/camel/obs/obs-to-odoo-resource.xml → .../resources/camel/obs-to-odoo-resource.xml b/...ources/camel/obs/obs-to-odoo-resource.xml → .../resources/camel/obs-to-odoo-resource.xml
diff --git a/...s/camel/orders/odoo-cancel-quotations.xml → ...esources/camel/odoo-cancel-quotations.xml b/...s/camel/orders/odoo-cancel-quotations.xml → ...esources/camel/odoo-cancel-quotations.xml
diff --git a/...rces/camel/orders/odoo-get-quotations.xml → ...n/resources/camel/odoo-get-quotations.xml b/...rces/camel/orders/odoo-get-quotations.xml → ...n/resources/camel/odoo-get-quotations.xml
diff --git a/...urces/camel/orders/odoo-order-handler.xml → ...in/resources/camel/odoo-order-handler.xml b/...urces/camel/orders/odoo-order-handler.xml → ...in/resources/camel/odoo-order-handler.xml
diff --git a/...rders/odoo-process-dc-or-voided-order.xml → ...camel/odoo-process-dc-or-voided-order.xml b/...rders/odoo-process-dc-or-voided-order.xml → ...camel/odoo-process-dc-or-voided-order.xml
diff --git a/...s/camel/orders/odoo-process-new-order.xml → ...esources/camel/odoo-process-new-order.xml b/...s/camel/orders/odoo-process-new-order.xml → ...esources/camel/odoo-process-new-order.xml
diff --git a/...urces/camel/orders/odoo-process-order.xml → ...in/resources/camel/odoo-process-order.xml b/...urces/camel/orders/odoo-process-order.xml → ...in/resources/camel/odoo-process-order.xml
diff --git a/...el/orders/odoo-process-revision-order.xml → ...ces/camel/odoo-process-revision-order.xml b/...el/orders/odoo-process-revision-order.xml → ...ces/camel/odoo-process-revision-order.xml
diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties
@@ -147,5 +147,19 @@ logging.level.odoo-process-person-address=${openmrs.eip.log.level}
 logging.level.convert-to-concept-uuid-if-is-mapping=${openmrs.eip.log.level}
 logging.level.obs-captured-on-form-rule=${openmrs.eip.log.level}
 logging.level.patient-uuid-to-odoo-customer=${openmrs.eip.log.level}
+logging.level.obs-to-odoo-resource=${openmrs.eip.log.level}
+logging.level.obs-to-customer=${openmrs.eip.log.level}
+logging.level.odoo-cancel-quotations=${openmrs.eip.log.level}
+logging.level.odoo-get-draft-quotations=${openmrs.eip.log.level}
+logging.level.odoo-get-external-id-map=${openmrs.eip.log.level}
+logging.level.odoo-get-order-line=${openmrs.eip.log.level}
+logging.level.odoo-get-quotations=${openmrs.eip.log.level}
+logging.level.odoo-manage-order-line=${openmrs.eip.log.level}
+logging.level.odoo-manage-quotation=${openmrs.eip.log.level}
+logging.level.odoo-order-handler=${openmrs.eip.log.level}
+logging.level.odoo-process-dc-or-voided-order=${openmrs.eip.log.level}
+logging.level.odoo-process-new-order=${openmrs.eip.log.level}
+logging.level.odoo-process-order=${openmrs.eip.log.level}
+logging.level.odoo-process-revision-order=${openmrs.eip.log.level}
 logging.level.get-hsu-id=${openmrs.eip.log.level}
 # ----------------------------------------------------------------------------------------------------------------------
diff --git a/src/main/resources/eip-odoo-openmrs.properties b/src/main/resources/eip-odoo-openmrs.properties
@@ -50,7 +50,19 @@ odoo.enable.extra.customer.details.route=${ODOO_ENABLE_EXTRA_CUSTOMER_FIELDS_ROU
 
 # Used to turn on or off the route that allows to sync extra patient details like weight as part of the customer quotation
 odoo.enable.extra.quotation.details.route=${ODOO_ENABLE_EXTRA_QUOTATION_FIELDS_ROUTE}
-#----------------------------------------------------------------------------------------------------------------------
+
+# Camel route to be invoked via the direct component via the direct component to process obs events to manage resources
+# in odoo
+obs.to.odoo.resource.handler.route=obs-to-customer
+
+# Comma-separated list of Obs question and answer mappings, note that you can provider multiple answers separated by a
+# charet(^) character, questions and answers are separated by a colon e.g. obs-qn-1:obs-ans-a^obs-ans-b:obs-qn-2,true
+odoo.obs.concept.question.answer.mappings=
+
+# Camel endpoint to be called when processing an obs event to decide if the associated patient should be added to odoo
+# or not
+obs.to.customer.decision.rule.endpoint=
+# ----------------------------------------------------------------------------------------------------------------------
 
 # *********************** Configuration of the OpenMRS Web App *********************************************************
 #
@@ -60,7 +72,7 @@ openmrs.username=${OPENMRS_USER}
 openmrs.password=${OPENMRS_PASSWORD}
 
 # OpenMRS base url
-openmrs.baseUrl=${OPENMRS_URL}/openmrs
+openmrs.baseUrl=${OPENMRS_URL}
 
 # The results encounter type for all patient result observations
 results.encounterType.uuid=${OPENMRS_RESULTS_ENCOUNTER_TYPE_UUID}

diff --git a/.../route/orders/BaseOrderOdooRouteTest.java → ...openmrs/route/BaseOrderOdooRouteTest.java b/.../route/orders/BaseOrderOdooRouteTest.java → ...openmrs/route/BaseOrderOdooRouteTest.java
@@ -1,6 +1,5 @@
-package com.ozonehis.eip.odooopenmrs.route.orders;
+package com.ozonehis.eip.odooopenmrs.route;
 
-import com.ozonehis.eip.odooopenmrs.route.BaseOdooRouteTest;
 import org.springframework.test.context.TestPropertySource;
 
 @TestPropertySource(

diff --git a/...mrs/route/obs/ObsToCustomerRouteTest.java → ...openmrs/route/ObsToCustomerRouteTest.java b/...mrs/route/obs/ObsToCustomerRouteTest.java → ...openmrs/route/ObsToCustomerRouteTest.java
@@ -1,12 +1,10 @@
-package com.ozonehis.eip.odooopenmrs.route.obs;
+package com.ozonehis.eip.odooopenmrs.route;
 
 import static java.util.Collections.singletonMap;
 import static org.openmrs.eip.mysql.watcher.WatcherConstants.PROP_EVENT;
 import static org.springframework.test.context.support.TestPropertySourceUtils.addInlinedPropertiesToEnvironment;
 
 import ch.qos.logback.classic.Level;
-import com.ozonehis.eip.odooopenmrs.route.BaseOdooRouteTest;
-import com.ozonehis.eip.odooopenmrs.route.OdooTestConstants;
 import java.util.HashMap;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
@@ -39,7 +37,7 @@ public class ObsToCustomerRouteTest extends BaseOdooRouteTest {
 
     @BeforeEach
     public void setup() throws Exception {
-        loadXmlRoutesInCamelDirectory("obs/obs-to-customer.xml");
+        loadXmlRoutesInCamelDirectory("obs-to-customer.xml");
 
         mockTestRuleEndpoint.reset();
         mockPatientUuidToCustomerEndpoint.reset();

diff --git a/...route/obs/ObsToOdooResourceRouteTest.java → ...mrs/route/ObsToOdooResourceRouteTest.java b/...route/obs/ObsToOdooResourceRouteTest.java → ...mrs/route/ObsToOdooResourceRouteTest.java
@@ -1,4 +1,4 @@
-package com.ozonehis.eip.odooopenmrs.route.obs;
+package com.ozonehis.eip.odooopenmrs.route;
 
 import static java.util.Collections.singleton;
 import static java.util.Collections.singletonMap;
@@ -9,8 +9,6 @@
 import static org.openmrs.eip.mysql.watcher.WatcherConstants.PROP_EVENT;
 
 import ch.qos.logback.classic.Level;
-import com.ozonehis.eip.odooopenmrs.route.BaseOdooRouteTest;
-import com.ozonehis.eip.odooopenmrs.route.OdooTestConstants;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -79,7 +77,7 @@ public class ObsToOdooResourceRouteTest extends BaseOdooRouteTest {
 
     @BeforeEach
     public void setup() throws Exception {
-        loadXmlRoutesInCamelDirectory("obs/obs-to-odoo-resource.xml");
+        loadXmlRoutesInCamelDirectory("obs-to-odoo-resource.xml");
 
         mockObsToOdooResHandlerEndpoint.reset();
         mockConvertToConceptUuidEndpoint.reset();

diff --git a/...ute/orders/OdooOrderHandlerRouteTest.java → ...nmrs/route/OdooOrderHandlerRouteTest.java b/...ute/orders/OdooOrderHandlerRouteTest.java → ...nmrs/route/OdooOrderHandlerRouteTest.java
@@ -1,4 +1,4 @@
-package com.ozonehis.eip.odooopenmrs.route.orders;
+package com.ozonehis.eip.odooopenmrs.route;
 
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
@@ -9,7 +9,6 @@
 import static org.openmrs.eip.mysql.watcher.WatcherConstants.PROP_EVENT;
 
 import ch.qos.logback.classic.Level;
-import com.ozonehis.eip.odooopenmrs.route.OdooTestConstants;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.camel.EndpointInject;
@@ -37,7 +36,7 @@ public class OdooOrderHandlerRouteTest extends BaseOrderOdooRouteTest {
 
     @BeforeEach
     public void setup() throws Exception {
-        loadXmlRoutesInCamelDirectory("orders/odoo-order-handler.xml");
+        loadXmlRoutesInCamelDirectory("odoo-order-handler.xml");
 
         mockFetchResourceEndpoint.reset();
         mockExtIdMapEndpoint.reset();

diff --git a/...essDiscontinueOrVoidedOrderRouteTest.java → ...essDiscontinueOrVoidedOrderRouteTest.java b/...essDiscontinueOrVoidedOrderRouteTest.java → ...essDiscontinueOrVoidedOrderRouteTest.java
@@ -1,6 +1,5 @@
-package com.ozonehis.eip.odooopenmrs.route.orders;
+package com.ozonehis.eip.odooopenmrs.route;
 
-import com.ozonehis.eip.odooopenmrs.route.OdooTestConstants;
 import java.util.Collections;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
@@ -29,7 +28,7 @@ public class OdooProcessDiscontinueOrVoidedOrderRouteTest extends BaseOrderOdooR
 
     @BeforeEach
     public void setup() throws Exception {
-        loadXmlRoutesInCamelDirectory("orders/odoo-process-dc-or-voided-order.xml");
+        loadXmlRoutesInCamelDirectory("odoo-process-dc-or-voided-order.xml");
 
         mockManageOrderLineEndpoint.reset();
         mockManageQuotationEndpoint.reset();

diff --git a/.../orders/OdooProcessNewOrderRouteTest.java → ...s/route/OdooProcessNewOrderRouteTest.java b/.../orders/OdooProcessNewOrderRouteTest.java → ...s/route/OdooProcessNewOrderRouteTest.java
@@ -1,10 +1,9 @@
-package com.ozonehis.eip.odooopenmrs.route.orders;
+package com.ozonehis.eip.odooopenmrs.route;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.openmrs.eip.mysql.watcher.WatcherConstants.PROP_EVENT;
 
 import ch.qos.logback.classic.Level;
-import com.ozonehis.eip.odooopenmrs.route.OdooTestConstants;
 import java.util.Collections;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
@@ -28,7 +27,7 @@ public class OdooProcessNewOrderRouteTest extends BaseOrderOdooRouteTest {
 
     @BeforeEach
     public void setup() throws Exception {
-        loadXmlRoutesInCamelDirectory("orders/odoo-process-new-order.xml");
+        loadXmlRoutesInCamelDirectory("odoo-process-new-order.xml");
 
         mockManageOrderLineEndpoint.reset();
 

diff --git a/...ute/orders/OdooProcessOrderRouteTest.java → ...nmrs/route/OdooProcessOrderRouteTest.java b/...ute/orders/OdooProcessOrderRouteTest.java → ...nmrs/route/OdooProcessOrderRouteTest.java
@@ -1,4 +1,4 @@
-package com.ozonehis.eip.odooopenmrs.route.orders;
+package com.ozonehis.eip.odooopenmrs.route;
 
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
@@ -7,7 +7,6 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import ch.qos.logback.classic.Level;
-import com.ozonehis.eip.odooopenmrs.route.OdooTestConstants;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.camel.EndpointInject;
@@ -76,7 +75,7 @@ public class OdooProcessOrderRouteTest extends BaseOrderOdooRouteTest {
 
     @BeforeEach
     public void setup() throws Exception {
-        loadXmlRoutesInCamelDirectory("orders/odoo-process-order.xml");
+        loadXmlRoutesInCamelDirectory("odoo-process-order.xml");
 
         mockFetchResourceEndpoint.reset();
         mockPatientHandlerEndpoint.reset();

diff --git a/...rs/OdooProcessRevisionOrderRouteTest.java → ...te/OdooProcessRevisionOrderRouteTest.java b/...rs/OdooProcessRevisionOrderRouteTest.java → ...te/OdooProcessRevisionOrderRouteTest.java
@@ -1,7 +1,6 @@
-package com.ozonehis.eip.odooopenmrs.route.orders;
+package com.ozonehis.eip.odooopenmrs.route;
 
 import ch.qos.logback.classic.Level;
-import com.ozonehis.eip.odooopenmrs.route.OdooTestConstants;
 import java.util.Collections;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
@@ -31,7 +30,7 @@ public class OdooProcessRevisionOrderRouteTest extends BaseOrderOdooRouteTest {
 
     @BeforeEach
     public void setup() throws Exception {
-        loadXmlRoutesInCamelDirectory("orders/odoo-process-revision-order.xml");
+        loadXmlRoutesInCamelDirectory("odoo-process-revision-order.xml");
 
         mockManageOrderLineEndpoint.reset();