From 90672db55126d9bcf5d7be0add70064d3f5f258e Mon Sep 17 00:00:00 2001
From: wluyima <wyclif@openmrs.org>
Date: Tue, 7 Jan 2025 12:07:22 +0300
Subject: [PATCH] OZ-667: Changed kafka topic names to have emr and erp
 prefixes

---
 docker/.env                                 | 2 +-
 docker/docker-compose-streaming-common.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/.env b/docker/.env
index e7c7db0..97b0323 100644
--- a/docker/.env
+++ b/docker/.env
@@ -60,7 +60,7 @@ ODOO_ANALYTICS_TABLES='databasechangelog,account_account,product_category,sale_o
 ANALYTICS_KAFKA_URL=kafka:9092
 
 # Kafka
-CREATE_TOPICS=openmrs.openmrs.drug_order,openmrs.openmrs.appointment_service,openmrs.openmrs.appointment_service_type,openmrs.openmrs.care_setting,openmrs.openmrs.concept,openmrs.openmrs.concept_set,openmrs.openmrs.concept_answer,openmrs.openmrs.concept_name,openmrs.openmrs.concept_reference_map,openmrs.openmrs.concept_reference_source,openmrs.openmrs.concept_reference_term,openmrs.openmrs.conditions,openmrs.openmrs.encounter,openmrs.openmrs.encounter_diagnosis,openmrs.openmrs.encounter_type,openmrs.openmrs.location,openmrs.openmrs.location_tag_map,openmrs.openmrs.location_tag,openmrs.openmrs.form,openmrs.openmrs.obs,openmrs.openmrs.order_type,openmrs.openmrs.orders,openmrs.openmrs.patient,openmrs.openmrs.patient_appointment,openmrs.openmrs.patient_appointment_provider,openmrs.openmrs.patient_identifier,openmrs.openmrs.patient_identifier_type,openmrs.openmrs.patient_program,openmrs.openmrs.program,openmrs.openmrs.person,openmrs.openmrs.person_attribute,openmrs.openmrs.person_attribute_type,openmrs.openmrs.person_name,openmrs.openmrs.person_address,openmrs.openmrs.visit_type,openmrs.openmrs.visit,openmrs.openmrs.visit_attribute,openmrs.openmrs.visit_attribute_type,odoo.public.sale_order,odoo.public.sale_order_line,odoo.public.res_partner,odoo.public.product_product,odoo.public.product_template,odoo.public.ir_model_data
+CREATE_TOPICS=emr.openmrs.drug_order,emr.openmrs.appointment_service,emr.openmrs.appointment_service_type,emr.openmrs.care_setting,emr.openmrs.concept,emr.openmrs.concept_set,emr.openmrs.concept_answer,emr.openmrs.concept_name,emr.openmrs.concept_reference_map,emr.openmrs.concept_reference_source,emr.openmrs.concept_reference_term,emr.openmrs.conditions,emr.openmrs.encounter,emr.openmrs.encounter_diagnosis,emr.openmrs.encounter_type,emr.openmrs.location,emr.openmrs.location_tag_map,emr.openmrs.location_tag,emr.openmrs.form,emr.openmrs.obs,emr.openmrs.order_type,emr.openmrs.orders,emr.openmrs.patient,emr.openmrs.patient_appointment,emr.openmrs.patient_appointment_provider,emr.openmrs.patient_identifier,emr.openmrs.patient_identifier_type,emr.openmrs.patient_program,emr.openmrs.program,emr.openmrs.person,emr.openmrs.person_attribute,emr.openmrs.person_attribute_type,emr.openmrs.person_name,emr.openmrs.person_address,emr.openmrs.visit_type,emr.openmrs.visit,emr.openmrs.visit_attribute,emr.openmrs.visit_attribute_type,erp.public.sale_order,erp.public.sale_order_line,erp.public.res_partner,erp.public.product_product,erp.public.product_template,erp.public.ir_model_data
 
 # Postgres
 POSTGRES_USER=postgres
diff --git a/docker/docker-compose-streaming-common.yaml b/docker/docker-compose-streaming-common.yaml
index 4968ddc..ca39129 100644
--- a/docker/docker-compose-streaming-common.yaml
+++ b/docker/docker-compose-streaming-common.yaml
@@ -84,7 +84,7 @@ services:
       - CONNECT_MYSQL_PASSWORD=${CONNECT_MYSQL_PASSWORD:-${CONNECT_MYSQL_PASSWORD}}
       - CONNECT_MYSQL_PORT=${CONNECT_MYSQL_PORT:-${CONNECT_MYSQL_PORT}}
       - CONNECT_MYSQL_SERVER_ID=37991
-      - CONNECT_MYSQL_SERVER_NAME=openmrs
+      - CONNECT_MYSQL_SERVER_NAME=emr
       - CONNECT_MYSQL_INCLUDE_LIST=openmrs
       - CONNECT_TABLE_EXCLUDE_LIST=openmrs.audit_log
       - CONNECT_MYSQL_HISTROY_TOPIC=dbhistory.openmrs
@@ -93,7 +93,7 @@ services:
       - CONNECT_ODOO_DB_USERNAME=${CONNECT_ODOO_DB_USERNAME:-${POSTGRES_USER}}
       - CONNECT_ODOO_DB_PASSWORD=${CONNECT_ODOO_DB_PASSWORD:-${POSTGRES_PASSWORD}}
       - CONNECT_ODOO_DB_PORT=${CONNECT_ODOO_DB_PORT:-5432}
-      - CONNECT_ODOO_DB_SERVER_NAME=odoo
+      - CONNECT_ODOO_DB_SERVER_NAME=erp
       - CONNECT_ODOO_DB_INCLUDE_LIST=odoo
 
   connect-setup:
@@ -129,7 +129,7 @@ services:
          condition: service_started
        kafka-setup:
          condition: service_completed_successfully
-    labels: 
+    labels:
       - kompose.service.group=flink-manager
     environment:
       - ANALYTICS_SOURCE_TABLES_PATH=/analytics/source-tables