#24 | Fixed field type and name

Author: mahalakshme

goonj/src/main/java/org/avni_integration_service/goonj/domain/DistributionConstants.java

@@ -45,7 +45,7 @@ public interface DistributionConstants {
     String NUMBER_OF_RECEIVERS = "Total Number of Receivers";
     String ANY_OTHER_DOCUMENT_SUBMITTED = "Any Other Document Submitted";
     String CENTERS_NAME = "Centre’s Name";
-    String IS_CENTER_A_SCHOOL_ANGANWADI_LEARNING_CENTRE = "Is Centre a School/Anganwadi/Learning Centre?";
+    String IS_CENTRE_A_SCHOOL_ANGANWADI_LEARNING_CENTRE = "Is Centre a School/Anganwadi/Learning Centre?";
     String PROVIDED_MATERIAL = "Share a Brief Provided Material";
     String MATERIAL_MAKES_DIFFERENCE = "How the Material Makes a Difference";
     String MATERIAL_GIVEN_FOR = "Material Given for";

goonj/src/main/java/org/avni_integration_service/goonj/dto/DistributionDTO.java

@@ -97,7 +97,7 @@ public class DistributionDTO {
     @JsonProperty("centreName")
     private String centreName;
     @JsonProperty("IsCenteraSchoolAnganwadiLearning")
-    private boolean IsCenteraSchoolAnganwadiLearning;
+    private String IsCenteraSchoolAnganwadiLearning;
     @JsonProperty("shareABriefProvidedMaterial")
     private String shareABriefProvidedMaterial;
     @JsonProperty("howtheMaterialMakesaDifference")
@@ -639,12 +639,12 @@ public void setCentreName(String centreName) {
     }
 
     @JsonProperty("IsCenteraSchoolAnganwadiLearning")
-    public boolean getIsCenteraSchoolAnganwadiLearning() {
+    public String getIsCenteraSchoolAnganwadiLearning() {
         return IsCenteraSchoolAnganwadiLearning;
     }
 
     @JsonProperty("IsCenteraSchoolAnganwadiLearning")
-    public void setIsCenteraSchoolAnganwadiLearning(boolean isCenteraSchoolAnganwadiLearning) {
+    public void setIsCenteraSchoolAnganwadiLearning(String isCenteraSchoolAnganwadiLearning) {
         IsCenteraSchoolAnganwadiLearning = isCenteraSchoolAnganwadiLearning;
     }
 

goonj/src/main/java/org/avni_integration_service/goonj/repository/DistributionRepository.java

@@ -157,11 +157,7 @@ else if (subject.getObservation(TYPE_OF_INITIATIVE).equals(VAAPSI)) {
         } else if (subject.getObservation(TYPE_OF_INITIATIVE).equals(SPECIFIC_INITIATIVE)) {
             distributionDTO.setTypeOfInitiative((String) subject.getObservation(TYPE_OF_INITIATIVE));
             distributionDTO.setCentreName((String) subject.getObservation(CENTERS_NAME));
-            String isCenteraSchoolAnganwadiLearning = (String) subject.getObservation(IS_CENTER_A_SCHOOL_ANGANWADI_LEARNING_CENTRE);
-            if (isCenteraSchoolAnganwadiLearning != null && isCenteraSchoolAnganwadiLearning.equals(YES))
-                distributionDTO.setIsCenteraSchoolAnganwadiLearning(true);
-            else
-                distributionDTO.setIsCenteraSchoolAnganwadiLearning(false);
+            distributionDTO.setIsCenteraSchoolAnganwadiLearning((String) subject.getObservation(IS_CENTRE_A_SCHOOL_ANGANWADI_LEARNING_CENTRE));
             distributionDTO.setShareABriefProvidedMaterial((String) subject.getObservation(PROVIDED_MATERIAL));
             distributionDTO.setHowtheMaterialMakesaDifference((String) subject.getObservation(MATERIAL_MAKES_DIFFERENCE));
             distributionDTO.setMaterialGivenFor((String) subject.getObservation(MATERIAL_GIVEN_FOR));