Restoring Category Filter Display names

openmrs · Aug 3, 2015 · 3b5ab4f · 3b5ab4f
1 parent c865cdd
commit 3b5ab4f
Showing 1 changed file with 27 additions and 1 deletion.
diff --git a/api/src/main/java/org/openmrs/module/chartsearch/ChartSearchCache.java b/api/src/main/java/org/openmrs/module/chartsearch/ChartSearchCache.java
@@ -451,13 +451,21 @@ public JSONArray saveEdittedNote(String uuid, String comment, String priority) {
 
 	public JSONObject restorePreferences() {
 		List<ChartSearchPreference> allPrefs = chartSearchService.getAllChartSearchPreferences();
+		List<ChartSearchCategoryDisplayName> allDNames = chartSearchService.getAllCategoryDisplayNames();
+
+		for (ChartSearchCategoryDisplayName name : allDNames) {
+			if (name.getPreference().getPreferenceOwner().getUserId().equals(Context.getAuthenticatedUser().getUserId())) {
+				chartSearchService.deleteChartSearchCategoryDisplayName(name);
+			}
+		}
 
 		for (ChartSearchPreference pref : allPrefs) {
 			if (pref.getPreferenceOwner().getUserId().equals(Context.getAuthenticatedUser().getUserId())) {
 				chartSearchService.deleteChartSearchPreference(pref);
 				break;
 			}
 		}
+
 		return GeneratingJson.generateDaemonPreferencesJSON();
 	}
 
@@ -535,14 +543,32 @@ private boolean categoryDiplayNameDoesExist(String displayName, String name) {
 			if (name2.getDisplayName().toLowerCase().equals(displayName.toLowerCase())
 			        && Context.getAuthenticatedUser().getUserId()
 			                .equals(name2.getPreference().getPreferenceOwner().getUserId())
-			        && name.toLowerCase().equals(name2.getCategoryFilter().getCategoryName())) {
+			        && name.toLowerCase().equals(name2.getCategoryFilter().getCategoryName())
+			        && !categoryDisplayNameExistAmongDisplayNames(displayName)) {
 				exist = true;
 			}
 		}
 
 		return exist;
 	}
 
+	public boolean categoryDisplayNameExistAmongDisplayNames(String dName) {
+		List<ChartSearchCategoryDisplayName> allCatDNames = chartSearchService.getAllCategoryDisplayNames();
+		boolean exist = false;
+		List<String> dNames = new ArrayList<String>();
+
+		for (ChartSearchCategoryDisplayName name : allCatDNames) {
+			if (Context.getAuthenticatedUser().getUserId().equals(name.getPreference().getPreferenceOwner().getUserId())) {
+				dNames.add(name.getDisplayName());
+			}
+		}
+		if (dNames.contains(dName)) {
+			exist = true;
+		}
+
+		return exist;
+	}
+
 	public ChartSearchPreference fetchRightMatchedPreferences() {
 		return chartSearchService.getRightMatchedPreferences();
 	}