adjust get venues geojson to use standard uranus json header

Author: roaldchristesen

api/get_events.go

@@ -545,6 +545,7 @@ func (h *ApiHandler) GetEventsGeoJSON(gc *gin.Context) {
 	ctx := gc.Request.Context()
 	apiRequest := grains_api.NewRequest(gc, "get-events-geojson")
 
+	// Build SQL
 	dateConditions, conditionsStr, limitClause, args, _, err := h.buildEventFilters(gc)
 	if err != nil {
 		apiRequest.Error(http.StatusBadRequest, "")
@@ -570,6 +571,7 @@ func (h *ApiHandler) GetEventsGeoJSON(gc *gin.Context) {
 	}
 	defer rows.Close()
 
+	// Event scan type
 	type EventResponse struct {
 		EventDateId  int      `json:"event_date_id"`
 		EventId      int      `json:"event_id"`
@@ -584,6 +586,16 @@ func (h *ApiHandler) GetEventsGeoJSON(gc *gin.Context) {
 		StartTime    *string  `json:"start_time"`
 	}
 
+	type VenueEvents struct {
+		Name       string          `json:"name"`
+		Lon        *float64        `json:"lon"`
+		Lat        *float64        `json:"lat"`
+		Events     []EventResponse `json:"events"`
+		EventCount int             `json:"event_count"`
+	}
+
+	venues := make(map[int]*VenueEvents)
+
 	var events []EventResponse
 
 	for rows.Next() {
@@ -605,11 +617,33 @@ func (h *ApiHandler) GetEventsGeoJSON(gc *gin.Context) {
 			apiRequest.InternalServerError()
 			return
 		}
+
 		events = append(events, e)
+
+		// Skip events without a venue
+		if e.VenueId == nil {
+			continue
+		}
+
+		if e.VenueId != nil {
+			vId := *e.VenueId
+			if _, exists := venues[vId]; !exists {
+				venues[vId] = &VenueEvents{
+					Name:   derefString(e.VenueName, ""),
+					Lon:    e.VenueLon,
+					Lat:    e.VenueLat,
+					Events: []EventResponse{},
+					// don't set EventCount yet
+				}
+			}
+
+			venues[vId].Events = append(venues[vId].Events, e)
+			venues[vId].EventCount = len(venues[vId].Events)
+		}
 	}
 
 	if len(events) == 0 {
-		apiRequest.NotFound("no events found")
+		apiRequest.NoContent("no events found")
 		return
 	}
 
@@ -625,11 +659,12 @@ func (h *ApiHandler) GetEventsGeoJSON(gc *gin.Context) {
 	apiRequest.Success(
 		http.StatusOK,
 		gin.H{
-			"events":              events,
+			"venues":              venues,
 			"last_event_start_at": lastEventStartAt,
 			"last_event_date_id":  lastEventDateId,
 		},
-		"")
+		"",
+	)
 }
 
 func validateAllowedQueryParams(c *gin.Context, allowed map[string]struct{}) error {
@@ -640,3 +675,11 @@ func validateAllowedQueryParams(c *gin.Context, allowed map[string]struct{}) err
 	}
 	return nil
 }
+
+// Helper for nil strings
+func derefString(s *string, fallback string) string {
+	if s != nil && *s != "" {
+		return *s
+	}
+	return fallback
+}

api/get_venues_for_map.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/sndcds/grains/grains_api"
 	"github.com/sndcds/uranus/app"
 )
 
@@ -12,12 +13,17 @@ import (
 
 func (h *ApiHandler) GetVenuesGeoJSON(gc *gin.Context) {
 	ctx := gc.Request.Context()
+	apiRequest := grains_api.NewRequest(gc, "get-venues-geojson")
+
+	lang := gc.DefaultQuery("lang", "en")
+	apiRequest.SetMeta("language", lang)
 
 	query := app.UranusInstance.SqlGetGeojsonVenues
+
 	// TODO: languageStr, default "en"
 	rows, err := h.DbPool.Query(ctx, query, "en")
 	if err != nil {
-		gc.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		apiRequest.InternalServerError()
 		return
 	}
 	defer rows.Close()
@@ -30,30 +36,31 @@ func (h *ApiHandler) GetVenuesGeoJSON(gc *gin.Context) {
 	}
 
 	// Iterate over rows and build JSON
-	var results []map[string]interface{}
+	var venues []map[string]interface{}
 	for rows.Next() {
 		values, err := rows.Values()
 		if err != nil {
-			gc.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			apiRequest.InternalServerError()
 			return
 		}
 
 		rowMap := make(map[string]interface{}, len(values))
 		for i, col := range columnNames {
 			rowMap[col] = values[i]
 		}
-		results = append(results, rowMap)
+		venues = append(venues, rowMap)
 	}
 
 	if rows.Err() != nil {
-		gc.JSON(http.StatusInternalServerError, gin.H{"error": rows.Err().Error()})
+		apiRequest.InternalServerError()
 		return
 	}
 
-	if len(results) == 0 {
-		gc.JSON(http.StatusNoContent, gin.H{"message": "query returned 0 results"})
+	if len(venues) == 0 {
+		apiRequest.NoContent("no venues found")
 		return
 	}
+	apiRequest.SetMeta("venues_count", len(venues))
 
-	gc.IndentedJSON(http.StatusOK, results)
+	apiRequest.Success(http.StatusOK, gin.H{"venues": venues}, "")
 }