AMM-1187 : BenID generation issue

src/main/java/com/iemr/common/bengen/service/GenerateBeneficiaryService.java

@@ -21,16 +21,13 @@
 */
 package com.iemr.common.bengen.service;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -45,17 +42,34 @@
 import com.iemr.common.bengen.utils.Generator;
 import com.iemr.common.bengen.utils.config.ConfigProperties;
 
+import jakarta.annotation.PreDestroy;
+import jakarta.transaction.Transactional;
+
 @Service
 public class GenerateBeneficiaryService {
 	private static final Logger logger = LoggerFactory.getLogger(GenerateBeneficiaryService.class);
 	private ExecutorService executor = Executors.newCachedThreadPool();
 	private static final int BATCH_SIZE = 500;
+	private static final String ADMIN_BATCH = "admin-batch";
 	@Autowired
 	JdbcTemplate jdbcTemplate;
 
 	@Autowired
 	BeneficiaryIdRepo beneficiaryIdRepo;
 
+	@PreDestroy
+	public void cleanup() {
+		logger.info("Shutting down executor service");
+		executor.shutdown();
+		try {
+			if (!executor.awaitTermination(60, TimeUnit.SECONDS)) {
+				executor.shutdownNow();
+			}
+		} catch (InterruptedException e) {
+			executor.shutdownNow();
+			Thread.currentThread().interrupt();
+		}
+	}
 	public void generateBeneficiaryIDs() throws Exception {
 		logger.info("BengenApplication.run start");
 		long strt = System.currentTimeMillis();
@@ -69,26 +83,33 @@ public void generateBeneficiaryIDs() throws Exception {
 		long fin = System.currentTimeMillis() - strt;
 		logger.info("BengenApplication.run finish. time = " + fin + " ms.");
 	}
-
+	@Transactional
 	public void createFile() {
-	    logger.info("BengenApplication.createFile start");
-	    long strt = System.currentTimeMillis();
-
-	    Integer count = ConfigProperties.getInteger("no-of-benID-to-be-generate");
-	    List<Object[]> batchArgs = createBatchData(count);
+		logger.info("BengenApplication.createFile start");
+		long strt = System.currentTimeMillis();
 
-	    // Batch insert using JdbcTemplate
-	    String sql = "INSERT INTO `db_identity`.`m_beneficiaryregidmapping` " +
-	                 "(`BeneficiaryID`, `Provisioned`, `Deleted`, `CreatedDate`, `CreatedBy`) " +
-	                 "VALUES (?, b'0', b'0', ?, ?)";
+		Integer count = ConfigProperties.getInteger("no-of-benID-to-be-generate");
+
+		List<Object[]> batchArgs = createBatchData(count);
+
+		// Batch insert using JdbcTemplate
+		String sql = "INSERT INTO `db_identity`.`m_beneficiaryregidmapping` "
+				+ "(`BeneficiaryID`, `Provisioned`, `Deleted`, `CreatedDate`, `CreatedBy`) "
+				+ "VALUES (?, b'0', b'0', ?, ?)";
+
+		for (int i = 0; i < batchArgs.size(); i += BATCH_SIZE) {
+			List<Object[]> batch = batchArgs.subList(i, Math.min(i + BATCH_SIZE, batchArgs.size()));
+			try {
+				jdbcTemplate.batchUpdate(sql, batch);
+			} catch (Exception e) {
+				logger.error("Failed to insert batch starting at index {}: {}", i, e.getMessage());
+				throw new RuntimeException("Batch insert failed", e);
+			}
+		}
 
-	    for (int i = 0; i < batchArgs.size(); i += BATCH_SIZE) {
-	        List<Object[]> batch = batchArgs.subList(i, Math.min(i + BATCH_SIZE, batchArgs.size()));
-	        jdbcTemplate.batchUpdate(sql, batch);
-	    }
 
-	    long fin = System.currentTimeMillis() - strt;
-	    logger.info("BengenApplication.createFile finish. time = " + fin + " ms.");
+		long fin = System.currentTimeMillis() - strt;
+		logger.info("BengenApplication.createFile finish. time = " + fin + " ms.");
 	}
 
 	public List<Object[]> createBatchData(int num) {
@@ -103,7 +124,7 @@ public List<Object[]> createBatchData(int num) {
 	        .mapToObj(i -> new Object[]{
 	            g.generateBeneficiaryId(), // Assuming it's thread-safe
 	            ts,
-	            "admin-batch"
+	            ADMIN_BATCH
 	        })
 	        .collect(Collectors.toList());
 

src/main/java/com/iemr/common/bengen/utils/Generator.java

@@ -38,6 +38,8 @@ public class Generator {
     private static final Logger log = LoggerFactory.getLogger(Generator.class);
     private static final BigInteger TEN = BigInteger.TEN;
     private static final BigInteger TEN_POW_10 = TEN.pow(10);
+
+    private static final SecureRandom SECURE_RANDOM = new SecureRandom();
 
     public BigInteger generateBeneficiaryId() {
         BigInteger bid1 = generateFirst();
@@ -68,27 +70,13 @@ public BigInteger generateFirst() {
         return BigInteger.valueOf(digit).multiply(TEN_POW_10);
     }
 
-    protected BigInteger generateNumN(int n) {
-        int[] source = new int[n];
-        int[] target = new int[n];
-
-        for (int i = 0; i < n; i++) {
-            source[i] = getRandomDigit();
-        }
-
-        for (int i = 0, j = n - 1; i < n; i++, j--) {
-            int num = (j == 0) ? getRandomDigit() : getRandomDigit() % j;
-            target[j] = source[i];
-            source[i] = num;
-        }
-
-        StringBuilder sb = new StringBuilder(n);
-        for (int value : target) {
-            sb.append(value);
-        }
-
-        return new BigInteger(sb.toString());
-    }
+	protected BigInteger generateNumN(int n) {
+		StringBuilder sb = new StringBuilder(n);
+		for (int i = 0; i < n; i++) {
+			sb.append(getRandomDigit());
+		}
+		return new BigInteger(sb.toString());
+	}
 
     public int getDigitCount(BigInteger number) {
         double factor = Math.log10(2);
@@ -97,20 +85,18 @@ public int getDigitCount(BigInteger number) {
     }
 
     private int getRandomDigit() {
-        SecureRandom secureRandom = new SecureRandom();
-        return secureRandom.nextInt(10);
+    	return SECURE_RANDOM.nextInt(10);
 
     }
 
     private int getRandomInRange(int min, int max) {
-    	SecureRandom sr = new SecureRandom();
     	if (min > max) {
     	    throw new IllegalArgumentException("min must be <= max");
     	}
-    	if (max == Integer.MAX_VALUE) {
-    	    return sr.nextInt(max - min) + min;
-    	}
-    	return sr.nextInt(min, max + 1); // safe here
+		if (max == Integer.MAX_VALUE || (long) max - min + 1 > Integer.MAX_VALUE) {
+			return SECURE_RANDOM.nextInt(min, max + 1);
+		}
+    	return SECURE_RANDOM.nextInt(min, max + 1);
     }
 
     // Optional: only if you need debugging arrays