Refactor mapset retrieval to include organization information

Laixer · Aug 13, 2024 · 31f7c53 · 31f7c53
1 parent c11a446
commit 31f7c53
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/FunderMaps.Data/Repositories/MapsetRepository.cs b/src/FunderMaps.Data/Repositories/MapsetRepository.cs
@@ -27,9 +27,9 @@ public async Task<Mapset> GetPublicAsync(string id)
                     c.consent,
                     c.note,
                     c.icon,
-                    c.fence_neighborhood,
-                    c.fence_district,
-                    c.fence_municipality,
+                    NULL::text AS fence_neighborhood,
+                    NULL::text AS fence_district,
+                    NULL::text AS fence_municipality,
                     c.order,
                     c.layerset
             FROM    maplayer.mapset_collection AS c
@@ -67,9 +67,9 @@ public async Task<Mapset> GetPublicByNameAsync(string name)
                     c.consent,
                     c.note,
                     c.icon,
-                    c.fence_neighborhood,
-                    c.fence_district,
-                    c.fence_municipality,
+                    NULL::text AS fence_neighborhood,
+                    NULL::text AS fence_district,
+                    NULL::text AS fence_municipality,
                     c.order,
                     c.layerset
             FROM    maplayer.mapset_collection AS c
@@ -104,13 +104,14 @@ public async IAsyncEnumerable<Mapset> GetByOrganizationIdAsync(Guid id)
                     c.consent,
                     c.note,
                     c.icon,
-                    c.fence_neighborhood,
-                    c.fence_district,
-                    c.fence_municipality,
+                    o.fence_neighborhood,
+                    o.fence_district,
+                    o.fence_municipality,
                     c.order,
                     c.layerset
             FROM    maplayer.mapset_collection AS c
             JOIN    maplayer.map_organization mo ON mo.map_id = c.id
+            JOIN    organization.organization AS o ON o.id = mo.organization_id
             WHERE   mo.organization_id = @id
             AND     c.public = false
             ORDER BY c.order ASC";