KB-7361 | Menu PLANNING DEVELOPMENT Transform insights into action p…

…lans You're in a company-managed project Projects Karmayogi Bharat KB-6422 KB-7361 Testing and Enhancements | BE | Self Registration | QR Code generation and registration link generation. (#272)

1. Upload for qrcode was missing added.
2. New Logic added to increment the counter value for the mapid.
3. It is configurable based on the flag, if enabled it will work with new logic else it will work as per old logic.

src/main/java/org/sunbird/common/util/CbExtServerProperties.java

@@ -972,6 +972,9 @@ public String getPublicAssessmentCloudCertificateFolderName() {
 	@Value("${qr.custom.self.registration.logoupload.path}")
 	private String qrCustomerSelfRegistrationLogoPath;
 
+	@Value("${map.id.counter.enabled}")
+	private String mapIdCounterEnabled;
+
 
 	public String getCiosCloudIconFolderName() {
 		return ciosCloudIconFolderName;
@@ -3362,4 +3365,12 @@ public String getQrCustomerSelfRegistrationLogoPath() {
 	public void setQrCustomerSelfRegistrationLogoPath(String qrCustomerSelfRegistrationLogoPath) {
 		this.qrCustomerSelfRegistrationLogoPath = qrCustomerSelfRegistrationLogoPath;
 	}
+
+	public String getMapIdCounterEnabled() {
+		return mapIdCounterEnabled;
+	}
+
+	public void setMapIdCounterEnabled(String mapIdCounterEnabled) {
+		this.mapIdCounterEnabled = mapIdCounterEnabled;
+	}
 }

src/main/java/org/sunbird/common/util/Constants.java

@@ -1313,6 +1313,7 @@ public class Constants {
 	public static final String IS_REGISTRATION_LINK_ACTIVE = "api.org.isqrcode.active";
 	public static final String IS_WHATSAPP_CONSENT="isWhatsappConsent";
 	public static final String QR_LOGO_PATH = "qrCodeLogoPath";
+	public static final String ENABLED = "enabled";
 
 	public static final String INVALID_GROUP_MESSAGE = "Invalid Group : Group can be only among one of these ";
 

src/main/java/org/sunbird/customselfregistration/service/CustomSelfRegistrationServiceImpl.java

@@ -107,6 +107,7 @@ public SBApiResponse getSelfRegistrationQRAndLink(String authUserToken, Map<Stri
         try {
             File qrCodeFile = generateQRCodeFile(registrationLink, qrCodeFilePath, orgId);
             File qrCodeLogoFile = QRCode.from(registrationLink).to(ImageType.JPG).withSize(750, 750).file(qrCodeFilePath);
+            outgoingResponse = uploadQRCodeFile(qrCodeFile);
             SBApiResponse qrLogoUploadResponse = uploadQRCodeFile(qrCodeLogoFile);
             if (outgoingResponse.getResponseCode() == HttpStatus.OK && qrLogoUploadResponse.getResponseCode() == HttpStatus.OK) {
                 CustomSelfRegistrationModel customSelfRegistrationModel = getCustomSelfRegistrationModel(requestBody, orgId, registrationLink, qrCodeFile, qrCodeLogoFile,userId, uniqueId);

src/main/java/org/sunbird/org/service/ExtendedOrgServiceImpl.java

@@ -1,13 +1,8 @@
 package org.sunbird.org.service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -543,7 +538,30 @@ private String createMapId(Map<String, Object> requestData) {
 					mapIdList.add(org.getMapId());
 				}
 			}
-			mapIdNew = prefix + (mapIdList.size() + 1);
+			if (Constants.ENABLED.equalsIgnoreCase(configProperties.getMapIdCounterEnabled())) {
+				String finalPrefix = prefix;
+				List<Integer> numbers = existingOrgList.stream()
+						.map(OrgHierarchy::getMapId)                // Extract mapId
+						.filter(mapId -> mapId.startsWith(finalPrefix)) // Filter by prefix
+						.map(mapId -> {
+							// Find all numeric parts and extract the last one
+							Matcher matcher = Pattern.compile("\\d+").matcher(mapId);
+							String lastNumber = null;
+							while (matcher.find()) {
+								lastNumber = matcher.group(); // Update with the current match
+							}
+							return lastNumber; // Return the last matched number
+						})
+						.filter(Objects::nonNull)                   // Exclude null values
+						.map(Integer::parseInt)                     // Convert to integers
+						.collect(Collectors.toList());             // Collect into a list
+
+				// Find the maximum number or default to 0 if the list is empty
+				int maxNumber = numbers.isEmpty() ? 0 : Collections.max(numbers);
+				mapIdNew = prefix + (maxNumber + 1);
+			}else{
+				mapIdNew = prefix + (mapIdList.size() + 1);
+			}
 		} else {
 			mapIdNew = prefix + "1";
 		}

src/main/resources/application.properties

@@ -516,6 +516,7 @@ qr.custom.self.registration.upload.path:  https://portal.dev.karmayogibharat.net
 qr.custom.self.registration.skip.validation: false
 qr.custom.self.registration.uploadlogo.folder.name: customselfregistration-logo
 qr.custom.self.registration.logoupload.path: https://portal.dev.karmayogibharat.net/content-store/customselfregistration-logo/
+map.id.counter.enabled: enabled
 
 #PublicUserEventBulkonboard
 public.user.event.bulk.onboard.topic=dev.public.user.event.bulk.onboard