Merge pull request #343 from PSMRI/feature/form_validation

Feature/form validation

Author: SauravBizbRolly

src/main/java/com/iemr/common/config/encryption/SecurePassword.java

@@ -26,10 +26,8 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.spec.InvalidKeySpecException;
-
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
-
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -84,7 +84,7 @@ public ResponseEntity<ApiResponse<?>> deleteField(@PathVariable Long fieldId) {
     }
 
     @GetMapping(value = "form/{formId}/fields")
-    public ResponseEntity<ApiResponse<?>> getStructuredForm(@PathVariable String formId, @RequestParam(name = "lang", defaultValue = "en") String lang,@RequestHeader(value = "JwtToken") String token) {
+    public ResponseEntity<ApiResponse<?>> getStructuredForm(@PathVariable String formId, @RequestParam(name = "lang", defaultValue = "en") String lang,@RequestHeader(value = "jwttoken") String token) {
         try {
             Object result = formMasterService.getStructuredFormByFormId(formId,lang,token);
             return ResponseEntity.status(HttpStatus.OK)

src/main/java/com/iemr/common/repository/users/UserServiceRoleRepo.java

@@ -10,8 +10,7 @@
 
 @Repository
 public interface UserServiceRoleRepo extends JpaRepository<UserServiceRole, Integer> {
-    UserServiceRole findByUserName(String userName);
-    UserServiceRole findByUserId(Integer userId);
+    List<UserServiceRole> findByUserName(String userName);
 
 
 

src/main/java/com/iemr/common/service/dynamicForm/FormMasterServiceImpl.java

@@ -118,18 +118,24 @@ public FormField updateField(FieldDTO dto) {
     public FormResponseDTO getStructuredFormByFormId(String formId,String lang,String token) {
         int  stateId =0 ;
         try {
-            UserServiceRole userServiceRole=  userServiceRoleRepo.findByUserName(jwtUtil.getUsernameFromToken(token));
-            if(userServiceRole!=null){
-                stateId = userServiceRole.getStateId();
+            if(!token.isEmpty()){
+                List<UserServiceRole> userServiceRole=  userServiceRoleRepo.findByUserName(jwtUtil.getUsernameFromToken(token));
+                if(userServiceRole!=null){
+                    stateId = userServiceRole.get(0).getStateId();
+                    logger.info("State:Id"+stateId);
+                }
             }
+
+
+
             FormDefinition form = formRepo.findByFormId(formId)
                     .orElseThrow(() -> new IllegalArgumentException("Invalid form ID"));
 
             List<FormField> fields = fieldRepo.findByForm_FormIdOrderBySequenceAsc(formId);
             ObjectMapper objectMapper = new ObjectMapper();
 
             int finalStateId = stateId;
-            List<FieldResponseDTO> fieldDtos = fields.stream().filter(formField -> formField.getStateCode()== 0 || formField.getStateCode()== finalStateId)
+            List<FieldResponseDTO> fieldDtos = fields.stream().filter(formField -> (formField.getStateCode()==0 || formField.getStateCode().equals(finalStateId)))
                     .map(field -> {
                         String labelKey = field.getFieldId();  // field label already contains label_key
 

src/main/resources/application.properties

@@ -76,14 +76,14 @@ get-details-call-report-URL=http://CTI_SERVER/apps/customize_apps/piramil_report
 #============================================================================
 # Configure Main Scheduler Properties
 #============================================================================
- 
+
 org.quartz.scheduler.instanceId = AUTO
 org.quartz.scheduler.makeSchedulerThreadDaemon = true
- 
+
 #============================================================================
 # Configure ThreadPool
 #============================================================================
- 
+
 org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
 org.quartz.threadPool.makeThreadsDaemons = true
 org.quartz.threadPool.threadCount: 20
@@ -375,4 +375,4 @@ allowed.file.extensions=msg,pdf,png,jpeg,doc,docx,xlsx,xls,csv,txt
 ##sms details for beneficiary otp cosent
 sms-template-name = otp_consent
 
-cors.allowed-origin = 
+cors.allowed-origin =