avniproject/avni-server#836 | Fix issues with invoking rwb users sendMsg api

Author: himeshr

avni/src/main/java/org/avni_integration_service/avni/repository/AvniMessageRepository.java

@@ -21,7 +21,7 @@ public AvniMessageRepository(AvniHttpClient avniHttpClient) {
     }
 
     public String sendMessage(ManualMessageContract manualMessageContract) {
-        ResponseEntity<String> responseEntity = avniHttpClient.post("/sendMsg", manualMessageContract, String.class);
+        ResponseEntity<String> responseEntity = avniHttpClient.post("/web/message/sendMsg", manualMessageContract, String.class);
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity.getBody();
         }

bahmni/src/main/java/org/avni_integration_service/bahmni/client/HttpClient.java

@@ -10,7 +10,7 @@
 import java.io.IOException;
 import java.net.URI;
 
-import static org.avni_integration_service.bahmni.client.ObjectMapperRepository.objectMapper;
+import static org.avni_integration_service.util.ObjectJsonMapper.objectMapper;
 
 public class HttpClient {
     private Authenticator authenticator;

bahmni/src/main/java/org/avni_integration_service/bahmni/client/ObjectMapperRepository.java

@@ -59,7 +59,7 @@ dependencies {
 //    implementation group: 'mysql', name: 'mysql-connector-java', version: '5.1.6'
 
     implementation "log4j:log4j:1.2.17"
-    implementation "joda-time:joda-time:2.9.4"
+    implementation "joda-time:joda-time:2.10.10"
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.6'
 
 }

integration-data/build.gradle

@@ -0,0 +1 @@
+INSERT INTO integration_system (id, name, system_type, uuid, is_voided) VALUES (14, 'rwb', 'rwb', 'a6d29f03-0a6c-49b6-88ba-533ee5deb4e6', false);

integration-data/src/main/resources/db/migration/V2_4_3__AddRwbIntegrationSystem.sql

@@ -55,6 +55,8 @@ dependencies {
     implementation 'software.amazon.awssdk:cognitoidentity'
     implementation platform('com.amazonaws:aws-java-sdk-bom:1.11.939')
     implementation 'com.amazonaws:aws-java-sdk-cognitoidp'
+    implementation "joda-time:joda-time:2.10.10"
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.6'
 
     runtimeOnly group: 'mysql', name: 'mysql-connector-java', version: '5.1.6'
 

integrator/build.gradle

@@ -1,9 +1,12 @@
 package org.avni_integration_service.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.avni_integration_service.util.ObjectJsonMapper;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @Configuration
@@ -14,4 +17,10 @@ public class AvniSpringConfiguration {
     WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> enableDefaultServlet() {
         return (factory) -> factory.setRegisterDefaultServlet(true);
     }
+
+    @Bean
+    @Primary
+    public ObjectMapper objectMapper() {
+        return ObjectJsonMapper.objectMapper;
+    }
 }

integrator/src/main/java/org/avni_integration_service/config/AvniSpringConfiguration.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.core.PrettyPrinter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.log4j.Logger;
 import org.avni_integration_service.integration_data.domain.IntegrationSystem;
 import org.avni_integration_service.integration_data.domain.MappingGroup;
@@ -17,7 +16,6 @@
 import org.avni_integration_service.integration_data.repository.MappingTypeRepository;
 import org.avni_integration_service.integration_data.repository.config.IntegrationSystemConfigRepository;
 import org.avni_integration_service.util.BundleFileName;
-import org.avni_integration_service.util.ObjectMapperSingleton;
 import org.avni_integration_service.web.contract.ErrorTypeContract;
 import org.avni_integration_service.web.contract.IntegrationSystemConfigContract;
 import org.avni_integration_service.web.contract.MappingMetadataContract;
@@ -33,6 +31,8 @@
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
+import static org.avni_integration_service.util.ObjectJsonMapper.objectMapper;
+
 @Service
 public class BundleService {
     private static final Logger logger = Logger.getLogger(BundleService.class);
@@ -55,16 +55,14 @@ public class BundleService {
         add(BundleFileName.INTEGRATION_SYSTEM_CONFIG);
     }};
     private static final int BUFFER_SIZE = 2048;
-    private final ObjectMapper objectMapper;
-
 
     @Autowired
     public BundleService(MappingMetaDataRepository mappingMetaDataRepository, MappingGroupRepository mappingGroupRepository,
                          MappingTypeRepository mappingTypeRepository, ErrorTypeRepository errorTypeRepository,
                          IntegrationSystemConfigRepository integrationSystemConfigRepository,
                          MappingTypeService mappingTypeService, MappingGroupService mappingGroupService,
                          MappingMetadataService mappingMetadataService, ErrorTypeService errorTypeService,
-                         IntegrationSystemConfigService integrationSystemConfigService, ObjectMapper objectMapper) {
+                         IntegrationSystemConfigService integrationSystemConfigService) {
         this.mappingMetaDataRepository = mappingMetaDataRepository;
         this.mappingGroupRepository = mappingGroupRepository;
         this.mappingTypeRepository = mappingTypeRepository;
@@ -75,7 +73,6 @@ public BundleService(MappingMetaDataRepository mappingMetaDataRepository, Mappin
         this.mappingMetadataService = mappingMetadataService;
         this.errorTypeService = errorTypeService;
         this.integrationSystemConfigService = integrationSystemConfigService;
-        this.objectMapper = objectMapper;
     }
 
     public void exportMappingMetadataAsJsonToZip(IntegrationSystem integrationSystem, ZipOutputStream zos) throws IOException {
@@ -232,7 +229,7 @@ private void addFileToZip(ZipOutputStream zos, String fileName, Object fileConte
         zos.putNextEntry(entry);
         if (fileContent != null) {
             PrettyPrinter prettyPrinter = new DefaultPrettyPrinter();
-            byte[] bytes = ObjectMapperSingleton.getObjectMapper().writer(prettyPrinter).writeValueAsBytes(fileContent);
+            byte[] bytes = objectMapper.writer(prettyPrinter).writeValueAsBytes(fileContent);
             zos.write(bytes);
         }
         zos.closeEntry();

integrator/src/main/java/org/avni_integration_service/service/BundleService.java

@@ -1,4 +1,4 @@
-spring.config.import=classpath:/int-data.application.properties,classpath:/bahmni-application.properties,classpath:/avni-application.properties,classpath:/goonj-application.properties,classpath:/amrit-application.properties,classpath:/util-application.properties,classpath:/power-application.properties,classpath:/lahi-application.properties
+spring.config.import=classpath:/int-data.application.properties,classpath:/bahmni-application.properties,classpath:/avni-application.properties,classpath:/goonj-application.properties,classpath:/amrit-application.properties,classpath:/util-application.properties,classpath:/power-application.properties,classpath:/lahi-application.properties,classpath:/rwb-application.properties
 
 # Network
 server.port=${AVNI_INT_SERVER_PORT:6013}