service :

move all services related to dgi

.idea/dataSources.local.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="dataSourceStorageLocal" created-in="IU-211.7628.21" />
+</project>
\ No newline at end of file

src/main/java/com/eksad/masterdata/service/WorkOrderHystrixService.java

@@ -98,11 +98,8 @@ public class WorkOrderHystrixService {
     @Value("${dam.claim.h2}")
     private String claim_url;
 
-    @Value("${dam.cust.purch.h3}")
-    private String cust_purch_url;
-
-    @Value("${dam.masterdata.h3}")
-    private String md_h3_url;
+    @Value("${ddms.h2.service.slave}")
+    private String DDMS_H2_SERVICE_SLAVE;
 
     @Autowired
     Environment env;
@@ -564,7 +561,7 @@ public class WorkOrderHystrixService {
     public String updateClaimC2Number(String ahassID, String code, String userID) {
         String receivingNumber;
         ResponseEntity<String> response = restTemplate.exchange(
-                cust_purch_url
+                DDMS_H2_SERVICE_SLAVE
                         + IntegrasiURI.UPDATE_GENERATE_SEQUENCE.getUri(),
                 HttpMethod.GET,
                 RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -576,7 +573,7 @@ public class WorkOrderHystrixService {
     private PartDTO findPartById(String partID) {
         if (StringUtil.hasValue(partID)) {
             ResponseEntity<ResponsePartGetDTO> response = restTemplate.exchange(
-                    md_h3_url
+                    DDMS_H2_SERVICE_SLAVE
                             + PartURI.PART_GET_BY_ID.getUri(),
                     HttpMethod.GET,
                     RequestUtil.getPreFormattedRequestWithUserPassword(),

src/main/java/com/eksad/masterdata/service/WorkOrderOrafinHystrixService.java

@@ -57,15 +57,12 @@ public class WorkOrderOrafinHystrixService {
     @Autowired
     PullNJBNSCHystrixService pullNJBNSCHystrixService;
 
-    @Value("${dam.cust.purch.h3}")
-    private String cust_purch_url;
+    @Value("${ddms.h2.service.slave}")
+    private String DDMS_H2_SERVICE_SLAVE;
 
     @Value("${dam.receipt.query.h3}")
     private String receipt_query_url;
 
-    @Value("${dam.gigr.h3}")
-    private String gigr_url;
-
     @Value("${dam.receipt.command.h3}")
     private String receipt_command_url;
 
@@ -326,7 +323,7 @@ public class WorkOrderOrafinHystrixService {
         try {
             if (StringUtil.hasValue(salesOrderID)) {
                 ResponseEntity<ResponseSalesOrderGetDTO> resp = restTemplate.exchange(
-                        cust_purch_url +
+                        DDMS_H2_SERVICE_SLAVE +
                                 SalesOrderURI.SALES_ORDER_GET_BY_ID.getUri(),
                         HttpMethod.GET,
                         RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -466,7 +463,7 @@ public class WorkOrderOrafinHystrixService {
         PickSlipDTO ps = new PickSlipDTO();
         if (soID != null && !soID.isEmpty()) {
             ResponseEntity<ResponsePickSlipGetDTO> resp = restTemplate.exchange(
-                    gigr_url +
+                    DDMS_H2_SERVICE_SLAVE +
                             PickSlipURI.PICKSLIP_GET_BY_SALESORDERID.getUri(),
                     HttpMethod.GET,
                     RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -526,7 +523,7 @@ public class WorkOrderOrafinHystrixService {
         String code = "";
         try {
             ResponseEntity<String> response = restTemplate.exchange(
-                    cust_purch_url +
+                    DDMS_H2_SERVICE_SLAVE +
                             SalesOrderURI.SOCOMPLETE.getUri(),
                     HttpMethod.PUT,
                     RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -601,7 +598,7 @@ public class WorkOrderOrafinHystrixService {
         try {
             if (StringUtil.hasValue(woID)) {
                 ResponseEntity<ResponseSalesOrderGetListDTO> resp = restTemplate.exchange(
-                        cust_purch_url +
+                        DDMS_H2_SERVICE_SLAVE +
                                 IntegrasiURI.GET_SO_BY_WO_AND_AHASSCODE.getUri(),
                         HttpMethod.GET,
                         RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -619,7 +616,7 @@ public class WorkOrderOrafinHystrixService {
 
     private List<WorkOrderSOHotlineDTO> getSOHotlineMap(String woID) {
         ResponseEntity<WorkOrderSOHotlineDTO[]> response = restTemplate.exchange(
-                cust_purch_url +
+                DDMS_H2_SERVICE_SLAVE +
                         PartWOHotlineURI.GET_SO_HOTLINE_BY_WOID.getUri(),
                 HttpMethod.GET,
                 RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -636,7 +633,7 @@ public class WorkOrderOrafinHystrixService {
         String status = "";
         try {
             ResponseEntity<String> response = restTemplate.exchange(
-                    cust_purch_url +
+                    DDMS_H2_SERVICE_SLAVE +
                             IntegrasiURI.UPDATE_COMPLETE_SO_BY_WO.getUri(),
                     HttpMethod.PUT,
                     RequestUtil.getPreFormattedRequestWithUserPassword(),

src/main/resources/application-dev.properties

@@ -16,16 +16,16 @@ logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 # SERVICE - SPRINGBOOT
 #-----------------------------------------------------------------------------------------------------------------------
 ## POINTING
-ddms.h2.service.slave           = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8082/}
+ddms.h2.service.slave           = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8081/}
 dam.masterdata.h1               = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/}
 dam.ppn.query.url               = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn}
 dam.receipt.query.h3            = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
-dam.gigr.h3                     = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
+#dam.gigr.h3                     = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
 dam.receipt.command.h3          = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
 dam.masterdata.h2               = ${DAM_MASTERDATA_H2:https://api-uat-b.eksad.com/masterdata-h2/}
-dam.cust.purch.h3               = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
+#dam.cust.purch.h3               = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
 dam.claim.h2                    = ${DAM_CLAIM_H2:https://api-uat-b.eksad.com/claim-h2/}
-dam.masterdata.h3               = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
+#dam.masterdata.h3               = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
 
 # KAFKA
 #-----------------------------------------------------------------------------------------------------------------------

target/classes/application-dev.properties

-server.port=8081
-
-
-#spring.datasource.url = jdbc:postgresql://localhost:5432/postgres
-#spring.datasource.username = postgres
-#spring.datasource.password = password.1
+# DATABASE - POSTGRE
+#-----------------------------------------------------------------------------------------------------------------------
+## Host, Username and Password Setup
 spring.datasource.url           = ${DATASOURCE_URL:jdbc:postgresql://149.129.246.61:1832/ddmsh2_cbr}
 spring.datasource.username      = ${DATASOURCE_USERNAME:ddmsh2app}
 spring.datasource.password      = ${DATASOURCE_PASSWORD:bandungh1h2h3}
+
+## System Config
 spring.jpa.generate-ddl=false
 spring.jpa.hibernate.ddl-auto = none
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-
 spring.jpa.properties.hibernate.format_sql=true
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
-ddms.auth.token=Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiJ9.5BG9SEVOGo_xRhtT8IkyoSy60kPg8HM9Vpvb0TdNew4
+# SERVICE - SPRINGBOOT
+#-----------------------------------------------------------------------------------------------------------------------
+## POINTING
+ddms.h2.service.slave           = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8081/}
+dam.masterdata.h1               = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/}
+dam.ppn.query.url               = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn}
+dam.receipt.query.h3            = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
+#dam.gigr.h3                     = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
+dam.receipt.command.h3          = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
+dam.masterdata.h2               = ${DAM_MASTERDATA_H2:https://api-uat-b.eksad.com/masterdata-h2/}
+#dam.cust.purch.h3               = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
+dam.claim.h2                    = ${DAM_CLAIM_H2:https://api-uat-b.eksad.com/claim-h2/}
+#dam.masterdata.h3               = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
 
-#Kafka Config
-#-----------------------------------------------------------------------
+# KAFKA
+#-----------------------------------------------------------------------------------------------------------------------
 # Kafka Bootstrap Server
-#spring.kafka.bootstrap-servers=localhost:9092
+spring.kafka.bootstrap-servers=localhost:9092
 
 # Kafka Producer Configuration
-#spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
-#spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
 
 # Kafka Consumer Configuration
-#spring.kafka.consumer.group-id=my-group
-#spring.kafka.consumer.auto-offset-reset=earliest
-#spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
-#spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer
+spring.kafka.consumer.group-id=my-group
+spring.kafka.consumer.auto-offset-reset=earliest
+spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
+spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer
 
 # Kafka Topic Name
-#kafka.topic.name=pipeline-topic
-
-ddms.h2.service.slave           = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8082/}
-dam.masterdata.h1               = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/}
-dam.ppn.query.url               = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn}
-dam.receipt.query.h3            = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
-dam.gigr.h3                     = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
-dam.receipt.command.h3          = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
-dam.masterdata.h2               = ${DAM_MASTERDATA_H2:https://api-uat-b.eksad.com/masterdata-h2/}
-dam.cust.purch.h3               = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
-dam.claim.h2                    = ${DAM_CLAIM_H2:https://api-uat-b.eksad.com/claim-h2/}
-dam.masterdata.h3               = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
+kafka.topic.name=pipeline-topic
 
 spring.main.allow-circular-references=true
\ No newline at end of file

target/classes/application-prod.properties

-server.port=8081
+# DATABASE - POSTGRE
+#-----------------------------------------------------------------------------------------------------------------------
+## Host, Username and Password Setup
+spring.datasource.url           = ${DATASOURCE_URL:jdbc:postgresql://149.129.246.61:1832/ddmsh2_cbr}
+spring.datasource.username      = ${DATASOURCE_USERNAME:ddmsh2app}
+spring.datasource.password      = ${DATASOURCE_PASSWORD:bandungh1h2h3}
 
-spring.datasource.url = jdbc:postgresql://localhost:5432/postgres
-spring.datasource.username = postgres
-spring.datasource.password = password.1
+## System Config
 spring.jpa.generate-ddl=false
 spring.jpa.hibernate.ddl-auto = none
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-
 spring.jpa.properties.hibernate.format_sql=true
-logging.level.org.hibernate.SQL=ERROR
-#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+spring.main.allow-circular-references=true
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+
+# SERVICE - SPRINGBOOT
+#-----------------------------------------------------------------------------------------------------------------------
+## POINTING
+ddms.h2.service.slave           = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8082/}
+dam.masterdata.h1               = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/}
+dam.ppn.query.url               = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn}
+dam.receipt.query.h3            = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
+dam.gigr.h3                     = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
+dam.receipt.command.h3          = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
+dam.masterdata.h2               = ${DAM_MASTERDATA_H2:https://api-uat-b.eksad.com/masterdata-h2/}
+dam.cust.purch.h3               = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
+dam.claim.h2                    = ${DAM_CLAIM_H2:https://api-uat-b.eksad.com/claim-h2/}
+dam.masterdata.h3               = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
+
+# KAFKA
+#-----------------------------------------------------------------------------------------------------------------------
+# Kafka Bootstrap Server
+spring.kafka.bootstrap-servers=localhost:9092
+
+# Kafka Producer Configuration
+spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
 
+# Kafka Consumer Configuration
+spring.kafka.consumer.group-id=my-group
+spring.kafka.consumer.auto-offset-reset=earliest
+spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
+spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer
 
+# Kafka Topic Name
+kafka.topic.name=pipeline-topic
\ No newline at end of file

target/classes/application.properties

 #please define with dev-prod for profiles below
 spring.profiles.active=dev
-
-
-
+server.port=8082
+ddms.auth.token=Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiJ9.5BG9SEVOGo_xRhtT8IkyoSy60kPg8HM9Vpvb0TdNew4
\ No newline at end of file
-
-