order

hms-dbmi · Jul 18, 2024 · 34bd7a9 · 34bd7a9
1 parent 69dc831
commit 34bd7a9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/out.json b/out.json
@@ -58,15 +58,6 @@
         "category": "study_ids_dataset_ids",
         "meta": null
       },
-      {
-        "name": "phs000007",
-        "display": "FHS",
-        "description": null,
-        "count": 1,
-        "children": null,
-        "category": "study_ids_dataset_ids",
-        "meta": null
-      },
       {
         "name": "phs002385",
         "display": "HCT_for_SCD",

diff --git a/src/main/java/edu/harvard/dbmi/avillach/dictionary/facet/FacetQueryGenerator.java b/src/main/java/edu/harvard/dbmi/avillach/dictionary/facet/FacetQueryGenerator.java
@@ -109,6 +109,8 @@ facet.facet_id, count(*) as facet_count
                             fcn.concept_node_id IN (%s)
                         GROUP BY
                             facet.facet_id
+                        ORDER BY
+                            facet_count DESC
                     )
                     """.formatted(allConceptsForCategory);
             })
@@ -135,6 +137,8 @@ fc.name NOT IN (:all_selected_facet_categories)
                     AND fcn.concept_node_id IN (%s)
                 GROUP BY
                     facet.facet_id
+                ORDER BY
+                    facet_count DESC
             )
             """.formatted(allConceptsForUnselectedCategories);
 
@@ -203,6 +207,8 @@ fcn.concept_node_id IN (%s)
                         AND fc.name = :facet_category_%s
                     GROUP BY
                         facet.facet_id
+                    ORDER BY
+                        facet_count DESC
                 )
                 """.formatted(allConceptsForCategory, categoryKeys.get(category));
             })
@@ -229,6 +235,8 @@ fc.name NOT IN (:all_selected_facet_categories)
                     AND fcn.concept_node_id IN (%s)
                 GROUP BY
                     facet.facet_id
+                ORDER BY
+                    facet_count DESC
             )
             """.formatted(allConceptsForUnselectedCategories);
 
@@ -269,6 +277,8 @@ facet.facet_id, count(*) as facet_count
                         )
                     GROUP BY
                         facet.facet_id
+                    ORDER BY
+                        facet_count DESC
                 )
                 UNION
                 (
@@ -303,6 +313,8 @@ facet.facet_id, count(*) as facet_count
                         fc.name <> :facet_category_name
                     GROUP BY
                         facet.facet_id
+                    ORDER BY
+                        facet_count DESC
                 )
                 """;
     }
@@ -334,6 +346,8 @@ facet.facet_id, count(*) as facet_count
                         )
                     GROUP BY
                         facet.facet_id
+                    ORDER BY
+                        facet_count DESC
                 )
                 UNION
                 (
@@ -368,6 +382,8 @@ facet.facet_id, count(*) as facet_count
                         fc.name <> :facet_category_name
                     GROUP BY
                         facet.facet_id
+                    ORDER BY
+                        facet_count DESC
                 )
                 """;
     }
@@ -397,6 +413,8 @@ facet.facet_id, count(*) as facet_count
                 )
             GROUP BY
                 facet.facet_id
+            ORDER BY
+                facet_count DESC
             """;
 
     }
@@ -421,6 +439,8 @@ facet.facet_id, count(*) as facet_count
                 categorical_values.value <> ''
             GROUP BY
                 facet.facet_id
+            ORDER BY
+                facet_count DESC
             """;
     }
 }