fix(sql): All metadata via listlocations

Author: devsjc

internal/server/postgres/dataserverimpl.go

@@ -1544,9 +1544,9 @@ func (s *DataPlatformDataServiceServerImpl) ListLocations(
 			l.Err(err).Msgf("querier.ListSourcesAtTimestampWithin(%+v)", llprms)
 		} else {
 			for _, loc := range glResp {
-				metadata, err := jsonbToStruct(loc.SourceMetadata)
+				metadata, err := jsonbToStruct(loc.MetadataJsonb)
 				if err != nil {
-					l.Err(err).Msgf("jsonbToStruct(%s)", loc.SourceMetadata)
+					l.Err(err).Msgf("jsonbToStruct(%s)", loc.MetadataJsonb)
 					metadata = nil
 				}
 
@@ -1580,9 +1580,9 @@ func (s *DataPlatformDataServiceServerImpl) ListLocations(
 			l.Err(err).Msgf("querier.ListSourcesAtTimestampWithout(%+v)", llprms)
 		} else {
 			for _, loc := range glResp {
-				metadata, err := jsonbToStruct(loc.SourceMetadata)
+				metadata, err := jsonbToStruct(loc.MetadataJsonb)
 				if err != nil {
-					l.Err(err).Msgf("jsonbToStruct(%s)", loc.SourceMetadata)
+					l.Err(err).Msgf("jsonbToStruct(%s)", loc.MetadataJsonb)
 					metadata = nil
 				}
 
@@ -1615,9 +1615,9 @@ func (s *DataPlatformDataServiceServerImpl) ListLocations(
 			l.Err(err).Msgf("querier.ListSourcesAtTimestamp(%+v)", lsprms)
 		} else {
 			for _, loc := range glResp {
-				metadata, err := jsonbToStruct(loc.SourceMetadata)
+				metadata, err := jsonbToStruct(loc.MetadataJsonb)
 				if err != nil {
-					l.Err(err).Msgf("jsonbToStruct(%s)", loc.SourceMetadata)
+					l.Err(err).Msgf("jsonbToStruct(%s)", loc.MetadataJsonb)
 					metadata = nil
 				}
 

internal/server/postgres/sql/queries/locations.sql

@@ -135,8 +135,7 @@ WITH unfiltered_sources AS (
         l.geometry_type_id,
         ST_X(l.associated_point)::REAL AS longitude,
         ST_Y(l.associated_point)::REAL AS latitude,
-        l.metadata AS geometry_metadata,
-        ls.metadata AS source_metadata
+        COALESCE(l.metadata || ls.metadata, l.metadata, ls.metadata)::JSONB AS metadata_jsonb
     FROM loc.sources_mv AS ls
         INNER JOIN loc.geometries AS l USING (geometry_uuid)
         LEFT OUTER JOIN iam.location_policies AS lp USING (geometry_uuid, source_type_id)
@@ -189,8 +188,7 @@ unfiltered_sources AS (
         l.geometry_type_id,
         ST_X(l.associated_point)::REAL AS longitude,
         ST_Y(l.associated_point)::REAL AS latitude,
-        l.metadata AS geometry_metadata,
-        ls.metadata AS source_metadata
+        COALESCE(l.metadata || ls.metadata, l.metadata, ls.metadata)::JSONB AS metadata_jsonb
     FROM loc.sources_mv AS ls
         INNER JOIN contained_geometries AS l USING (geometry_uuid)
         LEFT OUTER JOIN iam.location_policies AS lp USING (geometry_uuid, source_type_id)
@@ -243,8 +241,7 @@ unfiltered_sources AS (
         l.geometry_type_id,
         ST_X(l.associated_point)::REAL AS longitude,
         ST_Y(l.associated_point)::REAL AS latitude,
-        l.metadata AS geometry_metadata,
-        ls.metadata AS source_metadata
+        COALESCE(l.metadata || ls.metadata, l.metadata, ls.metadata)::JSONB AS metadata_jsonb
     FROM loc.sources_mv AS ls
         INNER JOIN containing_geometries AS l USING (geometry_uuid)
         LEFT OUTER JOIN iam.location_policies AS lp USING (geometry_uuid, source_type_id)