Merge branch 'fix/mongo-schema-collections-order' of github.com:raush…

…an3737/appsmith into chore/issue-35842/shadow-36062
appsmithorg · Sep 25, 2024 · 24afc69 · 24afc69
2 parents a93e87b + 42a1c8e
commit 24afc69
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
@@ -964,6 +964,7 @@ public Mono<DatasourceStructure> getStructure(
                         }
                         return true;
                     })
+                    .sort((collectionName1, collectionName2) -> collectionName1.compareToIgnoreCase(collectionName2))
                     .flatMap(collectionName -> {
                         final ArrayList<DatasourceStructure.Column> columns = new ArrayList<>();
                         final ArrayList<DatasourceStructure.Template> templates = new ArrayList<>();

diff --git a/...psmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginQueriesTest.java b/...psmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginQueriesTest.java
@@ -655,6 +655,26 @@ public void testStructure() {
                 .verifyComplete();
     }
 
+    @Test
+    public void testStructure_should_return_collections_in_order() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<DatasourceStructure> structureMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .flatMap(connection -> pluginExecutor.getStructure(connection, dsConfig, null));
+
+        StepVerifier.create(structureMono)
+                .assertNext(structure -> {
+                    assertNotNull(structure);
+                    assertEquals(3, structure.getTables().size());
+
+                    // Check that the tables are sorted in ascending order
+                    assertEquals("address", structure.getTables().get(0).getName());
+                    assertEquals("teams", structure.getTables().get(1).getName());
+                    assertEquals("users", structure.getTables().get(2).getName());
+                })
+                .verifyComplete();
+    }
+
     @Test
     public void testCountCommand() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();