Merge pull request #459 from glassbead0/return_all_areas_in_bulk_query

feat: return all leaf+non-leaf areas

Author: glassbead0

src/model/AreaDataSource.ts

@@ -287,6 +287,10 @@ export default class AreaDataSource extends MongoDataSource<AreaType> {
       })
     }
     const ancestorsCSV = ancestors.join(',')
-    return await this.findDescendantsByPath(ancestorsCSV)
+    const [leafAreas, nonLeafAreas] = await Promise.all([
+      this.findDescendantsByPath(ancestorsCSV, true),
+      this.findDescendantsByPath(ancestorsCSV, false)
+    ])
+    return nonLeafAreas.concat(leafAreas)
   }
 }