added userAddress field in the indexes

health-services/transformer/src/main/java/org/egov/transformer/Constants.java

@@ -54,6 +54,8 @@ public interface Constants {
     String USERNAME = "userName";
     String NAME = "name";
     String ROLE = "role";
+
+    String CITY = "city";
     String INDIVIDUAL_ID = "individualId";
     String ADDRESS_CODE = "addressLocalityCode";
     String CHILDREN_PRESENTED_US = "childrenPresentedUS";

health-services/transformer/src/main/java/org/egov/transformer/models/downstream/HouseholdIndexV1.java

@@ -24,6 +24,8 @@ public class HouseholdIndexV1 {
     private String userName;
     @JsonProperty("nameOfUser")
     private String nameOfUser;
+    @JsonProperty("userAddress")
+    private String userAddress;
     @JsonProperty("taskDates")
     private String taskDates;
     @JsonProperty("syncedDate")

health-services/transformer/src/main/java/org/egov/transformer/models/downstream/PGRIndex.java

@@ -17,6 +17,12 @@
 public class PGRIndex {
     @JsonProperty("service")
     private Service service;
+    @JsonProperty("userName")
+    private String userName;
+    @JsonProperty("role")
+    private String role;
+    @JsonProperty("userAddress")
+    private String userAddress;
     @JsonProperty("boundaryHierarchy")
     private ObjectNode boundaryHierarchy;
 

health-services/transformer/src/main/java/org/egov/transformer/models/downstream/ProjectStaffIndexV1.java

@@ -22,6 +22,8 @@ public class ProjectStaffIndexV1 {
     private String projectId;
     @JsonProperty("userName")
     private String userName;
+    @JsonProperty("userAddress")
+    private String userAddress;
     @JsonProperty("role")
     private String role;
     @JsonProperty("taskDates")

health-services/transformer/src/main/java/org/egov/transformer/models/downstream/ProjectTaskIndexV1.java

@@ -29,8 +29,8 @@ public class ProjectTaskIndexV1 {
     private String nameOfUser;
     @JsonProperty("role")
     private String role;
-    @JsonProperty("userCity")
-    private String userCity;
+    @JsonProperty("userAddress")
+    private String userAddress;
     @JsonProperty("productVariant")
     private String productVariant;
     @JsonProperty("productName")

health-services/transformer/src/main/java/org/egov/transformer/models/downstream/ReferralIndexV1.java

@@ -27,6 +27,8 @@ public class ReferralIndexV1 {
     private String userName;
     @JsonProperty("role")
     private String role;
+    @JsonProperty("userAddress")
+    private String userAddress;
     @JsonProperty("age")
     private Integer age;
     @JsonProperty("boundaryHierarchy")

health-services/transformer/src/main/java/org/egov/transformer/models/downstream/ServiceIndexV1.java

@@ -37,6 +37,8 @@ public class ServiceIndexV1 {
     private String userName;
     @JsonProperty("role")
     private String role;
+    @JsonProperty("userAddress")
+    private String userAddress;
     @JsonProperty("boundaryHierarchy")
     private ObjectNode boundaryHierarchy;
     @JsonProperty("tenantId")

health-services/transformer/src/main/java/org/egov/transformer/models/downstream/StockIndexV1.java

@@ -61,6 +61,9 @@ public class StockIndexV1 {
     @JsonProperty("role")
     private String role;
 
+    @JsonProperty("userAddress")
+    private String userAddress;
+
     @JsonProperty("dateOfEntry")
     private Long dateOfEntry;
 

health-services/transformer/src/main/java/org/egov/transformer/service/HouseholdService.java

@@ -109,6 +109,7 @@ public HouseholdIndexV1 transform(Household household) {
                 .userName(userInfoMap.get(USERNAME))
                 .role(userInfoMap.get(ROLE))
                 .nameOfUser(userInfoMap.get(NAME))
+                .userAddress(userInfoMap.get(CITY))
                 .taskDates(commonUtils.getDateFromEpoch(household.getClientAuditDetails().getLastModifiedTime()))
                 .syncedDate(commonUtils.getDateFromEpoch(household.getAuditDetails().getLastModifiedTime()))
                 .geoPoint(commonUtils.getGeoPoint(household.getAddress()))

health-services/transformer/src/main/java/org/egov/transformer/service/PGRTransformationService.java

@@ -14,20 +14,24 @@
 
 import java.util.*;
 
+import static org.egov.transformer.Constants.*;
+
 @Slf4j
 @Component
 public class PGRTransformationService {
 
     private final ProjectService projectService;
+    private final UserService userService;
     private final TransformerProperties transformerProperties;
     private final Producer producer;
     private final CommonUtils commonUtils;
     private static final HashMap<String, String> translations = null;
 
 
-    public PGRTransformationService(ProjectService projectService, TransformerProperties transformerProperties, Producer producer, CommonUtils commonUtils) {
+    public PGRTransformationService(ProjectService projectService, UserService userService, TransformerProperties transformerProperties, Producer producer, CommonUtils commonUtils) {
 
         this.projectService = projectService;
+        this.userService = userService;
         this.transformerProperties = transformerProperties;
         this.producer = producer;
         this.commonUtils = commonUtils;
@@ -52,17 +56,23 @@ private void transform(Service service, List<PGRIndex> pgrIndexList) {
         if (localityCode.isPresent()) {
             boundaryLabelToNameMap = projectService.getBoundaryLabelToNameMap(localityCode.get(), service.getTenantId());
         }
-        //TODO change below logic to fetch default boundaryHierarchy using tenantId if we can't fetch projectTypeId
+
         ObjectNode boundaryHierarchy = (ObjectNode) commonUtils.getBoundaryHierarchy(tenantId, null, boundaryLabelToNameMap);
 
+        Map<String, String> userInfoMap = userService.getUserInfo(tenantId, service.getAuditDetails().getCreatedBy());
+
+        service.setAddress(null); //explicitly setting it to null as it is not needed
+        service.setApplicationStatus(commonUtils.getMDMSTransformerLocalizations(service.getApplicationStatus(), tenantId));
+        service.setServiceCode(commonUtils.getMDMSTransformerLocalizations(service.getServiceCode(), tenantId));
 
         PGRIndex pgrIndex = PGRIndex.builder()
                 .service(service)
+                .userName(userInfoMap.get(USERNAME))
+                .role(userInfoMap.get(ROLE))
+                .userAddress(userInfoMap.get(CITY))
                 .boundaryHierarchy(boundaryHierarchy)
                 .build();
-        service.setAddress(null); //explicitly setting it to null as it is not needed
-        service.setApplicationStatus(commonUtils.getMDMSTransformerLocalizations(service.getApplicationStatus(), tenantId));
-        service.setServiceCode(commonUtils.getMDMSTransformerLocalizations(service.getServiceCode(), tenantId));
+
         pgrIndexList.add(pgrIndex);
     }
 

health-services/transformer/src/main/java/org/egov/transformer/service/ProjectStaffTransformationService.java

@@ -18,8 +18,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static org.egov.transformer.Constants.ROLE;
-import static org.egov.transformer.Constants.USERNAME;
+import static org.egov.transformer.Constants.*;
 
 @Slf4j
 public abstract class ProjectStaffTransformationService implements TransformationService<ProjectStaff> {
@@ -91,6 +90,7 @@ public List<ProjectStaffIndexV1> transform(ProjectStaff projectStaff) {
                     .userId(projectStaff.getUserId())
                     .userName(userInfoMap.get(USERNAME))
                     .role(userInfoMap.get(ROLE))
+                    .userAddress(userInfoMap.get(CITY))
                     .taskDates(commonUtils.getProjectDatesList(project.getStartDate(), project.getEndDate()))
                     .createdTime(projectStaff.getAuditDetails().getCreatedTime())
                     .createdBy(projectStaff.getAuditDetails().getCreatedBy())

health-services/transformer/src/main/java/org/egov/transformer/service/ProjectTaskTransformationService.java

@@ -146,7 +146,7 @@ private ProjectTaskIndexV1 transformTaskToProjectTaskIndex(TaskResource taskReso
                     .userName(userInfoMap.get(USERNAME))
                     .nameOfUser(userInfoMap.get(NAME))
                     .role(userInfoMap.get(ROLE))
-                    .userCity(userInfoMap.get("city"))
+                    .userAddress(userInfoMap.get(CITY))
                     .productVariant(taskResource.getProductVariantId())
                     .isDelivered(taskResource.getIsDelivered())
                     .quantity(taskResource.getQuantity())

health-services/transformer/src/main/java/org/egov/transformer/service/ReferralService.java

@@ -98,6 +98,7 @@ public ReferralIndexV1 transform(Referral referral) {
                 .tenantId(referral.getTenantId())
                 .userName(userInfoMap.get(USERNAME))
                 .role(userInfoMap.get(ROLE))
+                .userAddress(userInfoMap.get(CITY))
                 .facilityName(facilityName)
                 .age(individualDetails.containsKey(AGE) ? (Integer) individualDetails.get(AGE) : null)
                 .dateOfBirth(individualDetails.containsKey(DATE_OF_BIRTH) ? (Long) individualDetails.get(DATE_OF_BIRTH) : null)

health-services/transformer/src/main/java/org/egov/transformer/service/ServiceTaskTransformationService.java

@@ -23,8 +23,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import static org.egov.transformer.Constants.ROLE;
-import static org.egov.transformer.Constants.USERNAME;
+import static org.egov.transformer.Constants.*;
 
 @Slf4j
 public abstract class ServiceTaskTransformationService implements TransformationService<Service> {
@@ -123,6 +122,7 @@ public List<ServiceIndexV1> transform(Service service) {
                     .checklistName(parts[1])
                     .userName(userInfoMap.get(USERNAME))
                     .role(userInfoMap.get(ROLE))
+                    .userAddress(userInfoMap.get(CITY))
                     .createdTime(service.getAuditDetails().getCreatedTime())
                     .taskDates(commonUtils.getDateFromEpoch(service.getAuditDetails().getLastModifiedTime()))
                     .createdBy(service.getAuditDetails().getCreatedBy())

health-services/transformer/src/main/java/org/egov/transformer/service/StockTransformationService.java

@@ -128,6 +128,7 @@ public List<StockIndexV1> transform(Stock stock) {
                     .transactingFacilityId(stock.getTransactingPartyId())
                     .userName(userInfoMap.get(USERNAME))
                     .role(userInfoMap.get(ROLE))
+                    .userAddress(userInfoMap.get(CITY))
                     .transactingFacilityName(transactingFacility != null ? transactingFacility.getName() : stock.getTransactingPartyId())
                     .facilityType(facilityType)
                     .transactingFacilityType(transactingFacilityType)

health-services/transformer/src/main/java/org/egov/transformer/service/UserService.java

@@ -63,7 +63,7 @@ public Map<String, String> getUserInfo(String tenantId, String userId) {
                 userMap.put(NAME, null);
                 userMap.put(ROLE, null);
                 userMap.put(ID, null);
-                userMap.put("city", null);
+                userMap.put(CITY, null);
                 return userMap;
             }
             userName = users.get(0).getUserName();
@@ -72,7 +72,7 @@ public Map<String, String> getUserInfo(String tenantId, String userId) {
             userMap.put(NAME, users.get(0).getName());
             userMap.put(ROLE, role);
             userMap.put(ID, String.valueOf(users.get(0).getId()));
-            userMap.put("city", users.get(0).getCorrespondenceAddress());
+            userMap.put(CITY, users.get(0).getCorrespondenceAddress());
             userIdVsUserInfoCache.put(userId, userMap);
             return userMap;
         }
@@ -91,8 +91,12 @@ public List<UserSearchResponseContent> getUsers(String tenantId, String userId)
                     searchRequest,
                     UserSearchResponse.class
             );
-            return Collections.singletonList(response.getUserSearchResponseContent().get(0));
-//            return response.getUserSearchResponseContent().get(0);
+            UserSearchResponseContent responseContent = response.getUserSearchResponseContent().get(0);
+            if (responseContent != null) {
+                return Collections.singletonList(responseContent);
+            } else {
+                return new ArrayList<>();
+            }
         } catch (Exception e) {
             log.error("Exception while searching users : {}", ExceptionUtils.getStackTrace(e));
         }