Merge pull request #695 from jayesh12234/develop

MOSIP-28650-fixed impressionToPick logic
mosip · Jan 20, 2025 · 4d5b4a2 · 4d5b4a2
2 parents 8c27ee5 + 1f0941b
commit 4d5b4a2
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 14 deletions.
diff --git a/.github/workflows/automationtests.yaml b/.github/workflows/automationtests.yaml
@@ -60,7 +60,7 @@ jobs:
           cd ${{ env.SERVICE_LOCATION }} && find ./ -path '*/target/*' -exec zip ${{ env.BUILD_ARTIFACT }}.zip {} +
       - name: Upload the springboot jars
         if: ${{ !contains(github.ref, 'master') || !contains(github.ref, 'main') }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BUILD_ARTIFACT }}
           path: ./${{ env.SERVICE_LOCATION }}/${{ env.BUILD_ARTIFACT }}.zip

diff --git a/.github/workflows/packetcreator.yaml b/.github/workflows/packetcreator.yaml
@@ -39,8 +39,8 @@ jobs:
       SERVICE_LOCATION: mosip-packet-creator
       CONFIG_LOCATION: 'src/main/resources/dockersupport/centralized/mosip-packet-creator'
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         if: ${{ ( env.BUILD_ARTIFACT != 'false' ) }}
         with:
           name: ${{ env.BUILD_ARTIFACT }}
@@ -60,7 +60,7 @@ jobs:
           cp -r ./src/main/resources/dockersupport/centralized/mountvolume/profile_resource ./profile_resource
           zip -r ${{ env.NEW_BUILD_ARTIFACT }}.zip build_files/* profile_resource
       - name: Upload the springboot jars
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.NEW_BUILD_ARTIFACT }}
           path: ./${{env.SERVICE_LOCATION}}/${{ env.NEW_BUILD_ARTIFACT }}.zip

diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
@@ -74,7 +74,7 @@ jobs:
           cd ${{ env.SERVICE_LOCATION }} && find ./ -path '*/target/*' -exec zip ${{ env.BUILD_ARTIFACT }}.zip {} +
       - name: Upload the springboot jars
         if: ${{ !contains(github.ref, 'master') || !contains(github.ref, 'main') }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BUILD_ARTIFACT }}
           path: ./${{ env.SERVICE_LOCATION }}/${{ env.BUILD_ARTIFACT }}.zip
@@ -120,8 +120,8 @@ jobs:
       SERVICE_LOCATION: mosip-packet-creator
       CONFIG_LOCATION: 'src/main/resources/dockersupport/centralized/mosip-packet-creator'
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         if: ${{ ( env.BUILD_ARTIFACT != 'false' ) }}
         with:
           name: ${{ env.BUILD_ARTIFACT }}
@@ -141,7 +141,7 @@ jobs:
           cp -r ./src/main/resources/dockersupport/centralized/mountvolume/profile_resource ./profile_resource
           zip -r ${{ env.NEW_BUILD_ARTIFACT }}.zip build_files/* profile_resource
       - name: Upload the springboot jars
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.NEW_BUILD_ARTIFACT }}
           path: ./${{env.SERVICE_LOCATION}}/${{ env.NEW_BUILD_ARTIFACT }}.zip

diff --git a/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/BiometricDataProvider.java b/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/BiometricDataProvider.java
@@ -976,7 +976,19 @@ public static BiometricDataModel getBiometricData(Boolean bFinger, String contex
 				Hashtable<Integer, List<File>> tblFiles = new Hashtable<Integer, List<File>>();
 				File dir = new File(dirPath);
 
-				File listDir[] = dir.listFiles();
+				File listDir[]=null;
+				if (dir.isDirectory()) {
+		            // Use FileFilter to filter files
+					 listDir = dir.listFiles(new FileFilter() {
+		                @Override
+		                public boolean accept(File file) {
+		                    // Check if it's a directory and starts with "Impression"
+		                    return file.isDirectory() && file.getName().startsWith("Impression");
+		                }
+		            });		           
+		        } else {
+		        	logger.error(dirPath + " is not a directory.");
+		        }
 				int numberOfSubfolders = listDir.length;
 
 				int min = 1;
@@ -1049,7 +1061,19 @@ public static BiometricDataModel updateFingerData(String contextKey) throws IOEx
 		Hashtable<Integer, List<File>> tblFiles = new Hashtable<Integer, List<File>>();
 		File dir = new File(dirPath);
 
-		File listDir[] = dir.listFiles();
+		File listDir[]=null;
+		if (dir.isDirectory()) {
+            // Use FileFilter to filter files
+			 listDir = dir.listFiles(new FileFilter() {
+                @Override
+                public boolean accept(File file) {
+                    // Check if it's a directory and starts with "Impression"
+                    return file.isDirectory() && file.getName().startsWith("Impression");
+                }
+            });		           
+        } else {
+        	logger.error(dirPath + " is not a directory.");
+        }
 		int numberOfSubfolders = listDir.length;
 
 		int min = 1;

diff --git a/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/PhotoProvider.java b/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/PhotoProvider.java
@@ -34,7 +34,7 @@ static byte[][] getPhoto(String contextKey) {
 			FileFilter filter = new FileFilter() {
 				@Override
 				public boolean accept(File pathname) {
-					return !pathname.isDirectory();
+					return !pathname.isDirectory( ) && pathname.getName().startsWith("face");
 				}
 			};
 			File[] listDir = dir.listFiles(filter);

diff --git a/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/mds/MDSClient.java b/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/mds/MDSClient.java
@@ -3,6 +3,7 @@
 import static io.restassured.RestAssured.given;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -128,9 +129,19 @@ public void createProfile(String profilePath,String profile, ResidentModel resid
 		Hashtable<Integer, List<File>> tblFiles = new Hashtable<Integer, List<File>>();
 		File dir = new File(dirPath);
 
-		File listDir[] = dir.listFiles();
-		int numberOfSubfolders = listDir.length;
-
+		File listDir[]=null;
+		if (dir.isDirectory()) {
+            // Use FileFilter to filter files
+			 listDir = dir.listFiles(new FileFilter() {
+                @Override
+                public boolean accept(File file) {
+                    // Check if it's a directory and starts with "Impression"
+                    return file.isDirectory() && file.getName().startsWith("Impression");
+                }
+            });		           
+        } else {
+        	logger.error(dirPath + " is not a directory.");
+        }		int numberOfSubfolders = listDir.length;
 		int min=1;
 		int max=numberOfSubfolders ;
 		int randomNumber = (int) (Math.random()*(max-min)) + min;