Bug/drop down translation

CLAUDE.md

@@ -0,0 +1,98 @@
+# CLAUDE.md - Common-API
+
+## Project Overview
+
+Common-API is the gateway microservice for the AMRIT healthcare platform. It provides shared APIs consumed by all frontend UIs including authentication, beneficiary registration, call handling, location masters, notifications, feedback, reporting, and integrations with external systems (c-Zentrix CTI, Everwell, eAusadha, eSanjeevani, ABDM, Firebase, Honeywell POCT devices).
+
+## Tech Stack
+
+- Java 17
+- Spring Boot 3.2.2
+- Spring Data JPA / Hibernate
+- MySQL 8.0
+- Redis (session management, caching)
+- MongoDB (optional, for specific integrations)
+- Maven (build tool)
+- Swagger/OpenAPI (API documentation)
+- Lombok, MapStruct
+- CryptoJS-compatible AES encryption
+- Firebase Admin SDK
+- WAR packaging (deploys to Wildfly)
+
+## Build and Run
+
+```bash
+# Build
+mvn clean install -DENV_VAR=local
+
+# Run locally (start Redis first)
+mvn spring-boot:run -DENV_VAR=local
+
+# Package WAR
+mvn -B package --file pom.xml -P <profile>   # profiles: dev, local, test, ci, uat
+
+# Run tests
+mvn test
+```
+
+### Configuration
+
+- Copy `src/main/environment/common_example.properties` to `common_local.properties` and edit.
+- Environment selected via `-DENV_VAR=<env>`.
+- Swagger UI: `http://localhost:8083/swagger-ui.html`
+
+## Package Structure
+
+Base package: `com.iemr.common`
+
+| Layer | Package | Description |
+|-------|---------|-------------|
+| Controllers | `controller.*` | REST endpoints (40+ sub-packages) |
+| Services | `service.*` | Business logic |
+| Repositories | `repository.*`, `repo.*` | JPA repositories |
+| Entities | `data.*` | JPA entity classes |
+| DTOs | `model.*` | Transfer objects |
+| Mappers | `mapper.*` | Object mapping |
+| Config | `config.*` | Swagger, encryption, Firebase, Quartz, prototypes |
+| Constants | `constant` | Application constants |
+| Utils | `utils.*` | Redis, HTTP, session, validation, exception |
+
+## Key Functional Domains
+
+- **Authentication/Authorization**: `controller.users` - login, session, user management
+- **Beneficiary Registration**: `controller.beneficiary` - create, search, update beneficiaries
+- **Call Handling**: `controller.callhandling` - CTI integration, call lifecycle
+- **Feedback/Grievance**: `controller.feedback`, `controller.grievance` - feedback and complaint management
+- **Location**: `controller.location` - state, district, block, village masters
+- **Notifications**: `controller.notification` - alerts, SMS, email, Firebase push
+- **Reporting**: `controller.report`, `controller.secondaryReport` - CRM reports
+- **Helpline 104**: `controller.helpline104history` - medical advice history
+- **COVID**: `controller.covid` - vaccination status
+- **CTI Integration**: `controller.cti` - c-Zentrix computer telephony
+- **External Integrations**: `controller.eausadha`, `controller.esanjeevani`, `controller.everwell`, `controller.honeywell`, `controller.brd`, `controller.carestream`
+- **ABDM**: `controller.abdmfacility` - Ayushman Bharat Digital Mission
+- **KM File Management**: `controller.kmfilemanager` - OpenKM document management
+- **OTP/SMS**: `controller.otp`, `controller.sms` (via SMS gateway)
+- **Scheduling**: `controller.questionconfig`, `controller.scheme`
+- **Door-to-Door App**: `controller.door_to_door_app` - field worker support
+- **NHM Dashboard**: `controller.nhmdashboard` - National Health Mission integration
+
+## Architecture Notes
+
+- Entry point: `CommonMain.java` (main class in `utils` package)
+- Acts as the API gateway; all frontend UIs authenticate through Common-API
+- Session management via Redis with 27-minute timeout
+- HTTP interceptors attach `Authorization` and `ServerAuthorization` headers
+- Status code `5002` signals session expiration to frontends
+- AES + PBKDF2 encryption for password handling (`config.encryption`)
+- Firebase integration for push notifications (`config.firebase`)
+- Quartz scheduler for background jobs (`config.quartz`)
+- Extensive test coverage with unit tests under `src/test/`
+
+## CI/CD
+
+- GitHub Actions: `package.yml`, `build-on-pull-request.yml`, `sast.yml`, `commit-lint.yml`, `codeql.yml`
+- Conventional Commits enforced via Husky + commitlint
+- Checkstyle configuration in `checkstyle.xml`
+- JaCoCo for code coverage, SonarQube integration configured
+- Dockerfile for containerized deployment

src/main/java/com/iemr/common/CommonApplication.java

@@ -29,6 +29,7 @@
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.client.RestTemplate;
 
@@ -40,6 +41,7 @@
 
 @SpringBootApplication
 @EnableScheduling
+@EnableAsync(proxyTargetClass = true)
 public class CommonApplication extends SpringBootServletInitializer {
 
 	@Bean

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

@@ -97,4 +97,6 @@ public ResponseEntity<ApiResponse<?>> getStructuredForm(@PathVariable String for
     }
 
 
+
+
 }

src/main/java/com/iemr/common/data/dynamic_from/FormField.java

@@ -62,6 +62,9 @@ public class FormField {
     @Column(name = "created_at")
     private LocalDateTime createdAt = LocalDateTime.now();
 
+    @Column(name = "option_key")
+    private String optionKey;
+
 
 
 }

src/main/java/com/iemr/common/data/dynamic_from/FormFieldOption.java

@@ -0,0 +1,34 @@
+package com.iemr.common.data.dynamic_from;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Entity
+@Table(name = "form_field_options")
+@Data
+public class FormFieldOption {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "option_key")
+    private String optionKey;
+
+    @Column(name = "value")
+    private String value;
+
+    @Column(name = "label_en")
+    private String labelEn;
+
+    @Column(name = "label_hi")
+    private String labelHi;
+
+    @Column(name = "label_as")
+    private String labelAs;
+
+    @Column(name = "sort_order")
+    private Integer sortOrder;
+
+    // getters/setters
+}

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

@@ -22,4 +22,5 @@ public class Translation {
     private String assameseTranslation;
     @Column(name = "is_active")
     private Boolean isActive;
+
 }

src/main/java/com/iemr/common/dto/dynamicForm/FieldResponseDTO.java

@@ -20,7 +20,7 @@
     private Integer sequence;
     private Boolean isEditable;
     private Integer stateCode;
-    private List<String> options;
+    public List<Map<String, Object>> options;
     private Map<String, Object> validation;
     private Map<String, Object> conditional;
 }

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

@@ -118,7 +118,10 @@ public class BeneficiaryModel implements Comparable<BeneficiaryModel> {
 	private Boolean isMarried;
 
 	@Expose
-	private Integer doYouHavechildren;
+	private boolean doYouHavechildren;
+
+	@Expose
+	private Integer noOfchildren;
 
 	@Expose
 	private Integer noofAlivechildren;

src/main/java/com/iemr/common/repository/dynamic_form/FieldRepository.java

@@ -9,4 +9,10 @@
 @Repository
 public interface FieldRepository extends JpaRepository<FormField, Long> {
     List<FormField> findByForm_FormIdOrderBySequenceAsc(String formId);
+    List<FormField> findByForm_FormIdAndStateCodeOrderBySequenceAsc(
+            String formId,
+            Integer stateCode
+    );
+
+
 }

src/main/java/com/iemr/common/repository/dynamic_form/FormFieldOptionRepository.java

@@ -0,0 +1,14 @@
+package com.iemr.common.repository.dynamic_form;
+import com.iemr.common.data.dynamic_from.FormFieldOption;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface FormFieldOptionRepository
+    extends JpaRepository<FormFieldOption, Integer> {
+
+    List<FormFieldOption> findByOptionKeyOrderBySortOrderAsc(String optionKey);
+
+}

src/main/java/com/iemr/common/repository/translation/TranslationRepo.java

@@ -10,4 +10,5 @@ public interface TranslationRepo extends JpaRepository<Translation, Long> {
 
     Optional<Translation> findByLabelKeyAndIsActive(String labelKey, boolean isActive);
 
+
 }

src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java

@@ -29,6 +29,7 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 import com.iemr.common.model.beneficiary.RMNCHBeneficiaryDetailsRmnch;
 import com.iemr.common.service.welcomeSms.WelcomeBenificarySmsService;
@@ -120,7 +121,7 @@
 		}
 	}
 
-	@Async
+	// @Async
 	@Override
 	public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException {
 		Integer updatedRows = 0;
@@ -188,7 +189,7 @@
 	}
 
 	@Override
 	public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servletRequest) throws Exception {
 
 		 logger.info("benificiaryDetails: " + beneficiaryModel);
 
@@ -224,9 +225,27 @@
 			} else {
 				return response.toString();
 			}
-			if(beneficiary!=null){
-				if(beneficiary.getBenPhoneMaps().get(0).getPhoneNo()!=null){
-					welcomeBenificarySmsService.sendWelcomeSMStoBenificiary(beneficiary.getBenPhoneMaps().get(0).getPhoneNo(),beneficiary.getFirstName()+" "+beneficiary.getLastName(),beneficiary.getBeneficiaryID());
+			// ========== SEND SMS BUT DON'T FAIL IF IT ERRORS ==========
+			if (beneficiary != null && beneficiary.getBenPhoneMaps() != null && !beneficiary.getBenPhoneMaps().isEmpty()) {
+				String phoneNo = beneficiary.getBenPhoneMaps().get(0).getPhoneNo();
+
+				if (phoneNo != null && !phoneNo.trim().isEmpty()) {
+					String beneficiaryName = (beneficiary.getFirstName() != null ? beneficiary.getFirstName() : "") + " " +
+							(beneficiary.getLastName() != null ? beneficiary.getLastName() : "");
+
+					try {
+						logger.info("[SMS] Attempting to send welcome SMS to: " + phoneNo);
+						String smsResult = welcomeBenificarySmsService.sendWelcomeSMStoBenificiary(
+								phoneNo,
+								beneficiaryName.trim(),
+								beneficiary.getBeneficiaryID()
+						);
+						logger.info("[SMS] Result: " + smsResult);
+					} catch (Exception smsError) {
+						// SMS failed but beneficiary is already created - don't fail the request
+						logger.warn("[SMS] Failed to send SMS: " + smsError.getMessage() +
+								" - But beneficiary already created successfully");
+					}
 				}
 			}
 

src/main/java/com/iemr/common/service/cti/CTIServiceImpl.java

@@ -26,6 +26,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -90,6 +91,7 @@ public class CTIServiceImpl implements CTIService {
 	@Autowired
 	private BeneficiaryCallRepository beneficiaryCallRepository;
 
+	@Lazy
 	@Autowired
 	private CTIService ctiService;