Release 3.7.0

pom.xml

@@ -263,7 +263,7 @@
 			<artifactId>logback-core</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>

src/main/environment/common_ci.properties

@@ -174,7 +174,7 @@ grievanceUserAuthenticate = @env.GRIEVANCE_USER_AUTHENTICATE@
 grievanceDataSyncDuration = @env.GRIEVANCE_DATA_SYNC_DURATION@
 
 springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
-springdoc.swagger-ui.enabled=@env.SWAGGER_UI_ENABLED@
+springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
 
 
 isProduction=@env.IS_PRODUCTION@

src/main/environment/common_docker.properties

@@ -171,7 +171,7 @@ grievanceUserAuthenticate = ${GRIEVANCE_USER_AUTHENTICATE}
 grievanceDataSyncDuration = ${GRIEVANCE_DATA_SYNC_DURATION}
 
 springdoc.api-docs.enabled=${SWAGGER_DOC_ENABLED}
-springdoc.swagger-ui.enabled=${SWAGGER_UI_ENABLED}
+springdoc.swagger-ui.enabled=${SWAGGER_DOC_ENABLED}
 
 
 isProduction=${IS_PRODUCTION}

src/main/java/com/iemr/common/config/CorsConfig.java

@@ -9,7 +9,7 @@
 @Configuration
 public class CorsConfig implements WebMvcConfigurer {
 
-    @Value("${cors.allowed-origins}")
+    @Value("${cors.allowed-origin}")
     private String allowedOrigins;
     @Override
     public void addCorsMappings(CorsRegistry registry) {

src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java

@@ -103,6 +103,7 @@ public class BeneficiaryRegistrationController {
 	private BeneficiaryOccupationService beneficiaryOccupationService;
 	private GovtIdentityTypeService govtIdentityTypeService;
 
+
 	@Autowired
 	public void setBenRelationshipTypeService(BenRelationshipTypeService benRelationshipTypeService) {
 		this.benRelationshipTypeService = benRelationshipTypeService;

src/main/java/com/iemr/common/controller/dynamicForm/DynamicFormController.java

@@ -7,6 +7,7 @@
 import com.iemr.common.utils.response.ApiResponse;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -19,7 +20,7 @@
     @Autowired
     private FormMasterService formMasterService;
 
-    @PostMapping(value = "createModule",headers = "Authorization")
+    @PostMapping(value = "createModule")
     public ResponseEntity<ApiResponse<?>> createModule(@Valid @RequestBody ModuleDTO moduleDTO) {
         try {
             Object result = formMasterService.createModule(moduleDTO);
@@ -34,7 +35,7 @@
         }
     }
 
-    @PostMapping(value = "createForm",headers = "Authorization")
+    @PostMapping(value = "createForm")
     public ResponseEntity<ApiResponse<?>> createForm(@Valid @RequestBody FormDTO dto) {
         try {
             Object result = formMasterService.createForm(dto);
@@ -46,7 +47,7 @@
         }
     }
 
-    @PostMapping(value = "createFields",headers = "Authorization")
+    @PostMapping(value = "createFields")
     public ResponseEntity<ApiResponse<?>> createField(@Valid @RequestBody List<FieldDTO> dto) {
         try {
             Object result = formMasterService.createField(dto);
@@ -83,14 +84,15 @@
     }
 
     @GetMapping(value = "form/{formId}/fields")
-    public ResponseEntity<ApiResponse<?>> getStructuredForm(@PathVariable String formId) {
+    public ResponseEntity<ApiResponse<?>> getStructuredForm(@PathVariable String formId, @RequestParam(name = "lang", defaultValue = "en") String lang) {
         try {
-            Object result = formMasterService.getStructuredFormByFormId(formId);
+            Object result = formMasterService.getStructuredFormByFormId(formId,lang);
             return ResponseEntity.status(HttpStatus.OK)
                     .body(ApiResponse.success("Form structure fetched successfully", HttpStatus.OK.value(), result));
         } catch (Exception e) {
+
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(ApiResponse.error("Failed to fetch form structure", HttpStatus.INTERNAL_SERVER_ERROR.value(), null));
+                    .body(ApiResponse.error("Failed to fetch form structure:"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR.value(), e));
         }
     }
 

src/main/java/com/iemr/common/controller/users/IEMRAdminController.java

@@ -80,8 +80,8 @@ public class IEMRAdminController {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 	private InputMapper inputMapper = new InputMapper();
 
-	@Value("${captcha.enable-captcha}")
-	private boolean enableCaptcha;
+//	@Value("${captcha.enable-captcha}")
+	private boolean enableCaptcha =false;
 
 	@Autowired
 	private CaptchaValidationService captchaValidatorService;

src/main/java/com/iemr/common/data/translation/Translation.java

@@ -0,0 +1,23 @@
+package com.iemr.common.data.translation;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Entity
+@Table(name = "m_translation")
+@Data
+public class Translation {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "label_key")
+    private String labelKey;
+    @Column(name = "english")
+    private String english;
+    @Column(name = "hindi_translation")
+    private String hindiTranslation;
+    @Column(name = "is_active")
+    private Boolean isActive;
+}

src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java

@@ -81,6 +81,47 @@ public class BeneficiaryModel implements Comparable<BeneficiaryModel> {
 	@Expose
 	private Boolean isConsent=false;
 
+	@Expose
+	private Boolean isDeath;
+
+	@Expose
+	private String  dateOfDeath;
+
+	@Expose
+	private String isDeathValue;
+
+	@Expose
+	private String timeOfDeath;
+
+	@Expose
+	private String reasonOfDeath;
+
+	@Expose
+	private Integer reasonOfDeathId;
+
+	@Expose
+	private String placeOfDeath;
+
+	@Expose
+	private Integer placeOfDeathId;
+
+	@Expose
+	private String  otherPlaceOfDeath;
+
+	@Expose
+	private Boolean isSpouseAdded;
+
+	@Expose
+	private Boolean isChildrenAdded;
+
+	@Expose
+	private Boolean isMarried;
+
+	@Expose
+	private Integer doYouHavechildren;
+
+	@Expose
+	private Integer noofAlivechildren;
 
 	@Expose
 	private String beneficiaryID;