From b746a451a0bc8a537802788febae476cdce8eccc Mon Sep 17 00:00:00 2001
From: Ephraim Kigamba <ekigamba@ona.io>
Date: Wed, 3 Feb 2021 18:04:01 +0300
Subject: [PATCH] Fix migration  filename pattern in AppFolderMigrationSource

---
 opensrp-app/src/main/java/org/smartregister/AllConstants.java  | 1 +
 .../smartregister/repository/dao/AppFolderMigrationSource.java | 3 ++-
 .../org/smartregister/repository/dao/AssetMigrationSource.java | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/opensrp-app/src/main/java/org/smartregister/AllConstants.java b/opensrp-app/src/main/java/org/smartregister/AllConstants.java
index 91d037d1b..494759bc8 100644
--- a/opensrp-app/src/main/java/org/smartregister/AllConstants.java
+++ b/opensrp-app/src/main/java/org/smartregister/AllConstants.java
@@ -140,6 +140,7 @@ public class AllConstants {
     public static final String COMBINE_CHECKBOX_OPTION_VALUES = "combine_checkbox_option_values";
 
     public static final String GPS = "gps";
+    public static final String MIGRATION_FILENAME_PATTERN = "(\\d)\\.(up|down)\\.sql";
 
 
     public static class Immunizations {
diff --git a/opensrp-app/src/main/java/org/smartregister/repository/dao/AppFolderMigrationSource.java b/opensrp-app/src/main/java/org/smartregister/repository/dao/AppFolderMigrationSource.java
index 858c14e2a..3c9b9757b 100644
--- a/opensrp-app/src/main/java/org/smartregister/repository/dao/AppFolderMigrationSource.java
+++ b/opensrp-app/src/main/java/org/smartregister/repository/dao/AppFolderMigrationSource.java
@@ -5,6 +5,7 @@
 import android.text.TextUtils;
 
 import org.apache.commons.io.FileUtils;
+import org.smartregister.AllConstants;
 import org.smartregister.repository.MigrationImpl;
 import org.smartregister.repository.contract.MigrationSource;
 import org.smartregister.util.Utils;
@@ -41,7 +42,7 @@ public HashMap<Integer, ArrayList<Migration>> getMigrations(int fromDbVersion) {
             File appFolderDirectory = new File(Environment.getDataDirectory(), "/data/" + Utils.getAppId(context) + "/files/migrations");
             String[] migrationFileNames = appFolderDirectory.list();
 
-            String regex = "(/d)/.(up|down)/.sql";
+            String regex = AllConstants.MIGRATION_FILENAME_PATTERN;
             Pattern filePattern  = Pattern.compile(regex);
 
             if (migrationFileNames != null) {
diff --git a/opensrp-app/src/main/java/org/smartregister/repository/dao/AssetMigrationSource.java b/opensrp-app/src/main/java/org/smartregister/repository/dao/AssetMigrationSource.java
index 7c5fd8613..24e7851c4 100644
--- a/opensrp-app/src/main/java/org/smartregister/repository/dao/AssetMigrationSource.java
+++ b/opensrp-app/src/main/java/org/smartregister/repository/dao/AssetMigrationSource.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.text.TextUtils;
 
+import org.smartregister.AllConstants;
 import org.smartregister.repository.MigrationImpl;
 import org.smartregister.repository.contract.MigrationSource;
 import org.smartregister.util.AssetHandler;
@@ -37,7 +38,7 @@ public HashMap<Integer, ArrayList<Migration>> getMigrations(int fromDbVersion) {
         try {
             String[] migrationFileNames = context.getAssets().list("config/migrations");
 
-            String regex = "(\\d)\\.(up|down)\\.sql";
+            String regex = AllConstants.MIGRATION_FILENAME_PATTERN;
             Pattern filePattern  = Pattern.compile(regex);
 
             if (migrationFileNames != null) {