add events geojson

Author: roaldchristesen

api/get_events.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
+	"github.com/sndcds/grains/grains_api"
 	"github.com/sndcds/uranus/app"
 	"github.com/sndcds/uranus/sql_utils"
 )
@@ -540,6 +541,97 @@ FROM (
 	gc.JSON(http.StatusOK, gin.H{"venue-summary": venues})
 }
 
+func (h *ApiHandler) GetEventsGeoJSON(gc *gin.Context) {
+	ctx := gc.Request.Context()
+	apiRequest := grains_api.NewRequest(gc, "get-events-geojson")
+
+	dateConditions, conditionsStr, limitClause, args, _, err := h.buildEventFilters(gc)
+	if err != nil {
+		apiRequest.Error(http.StatusBadRequest, "")
+		return
+	}
+
+	query := app.UranusInstance.SqlGetEventsGeoJSON
+	query = strings.Replace(query, "{{date_conditions}}", dateConditions, 1)
+	query = strings.Replace(query, "{{conditions}}", conditionsStr, 1)
+	query = strings.Replace(query, "{{limit}}", limitClause, 1)
+
+	debugf(query)
+	debugf("ARGS (%d):\n", len(args))
+	for i, arg := range args {
+		fmt.Printf("  $%d = %#v (type %T)\n", i+1, arg, arg)
+	}
+
+	rows, err := h.DbPool.Query(ctx, query, args...)
+	if err != nil {
+		debugf("internal server error: %v", err.Error())
+		apiRequest.InternalServerError()
+		return
+	}
+	defer rows.Close()
+
+	type EventResponse struct {
+		EventDateId  int      `json:"event_date_id"`
+		EventId      int      `json:"event_id"`
+		VenueId      *int     `json:"venue_id"`
+		VenueName    *string  `json:"venue_name"`
+		VenueCity    *string  `json:"venue_city"`
+		VenueCountry *string  `json:"venue_country"`
+		VenueLat     *float64 `json:"venue_lat"`
+		VenueLon     *float64 `json:"venue_lon"`
+		Title        string   `json:"title"`
+		StartDate    string   `json:"start_date"`
+		StartTime    *string  `json:"start_time"`
+	}
+
+	var events []EventResponse
+
+	for rows.Next() {
+		var e EventResponse
+		if err := rows.Scan(
+			&e.EventDateId,
+			&e.EventId,
+			&e.VenueId,
+			&e.VenueName,
+			&e.VenueCity,
+			&e.VenueCountry,
+			&e.VenueLon,
+			&e.VenueLat,
+			&e.Title,
+			&e.StartDate,
+			&e.StartTime,
+		); err != nil {
+			debugf("internal server error: %v", err.Error())
+			apiRequest.InternalServerError()
+			return
+		}
+		events = append(events, e)
+	}
+
+	if len(events) == 0 {
+		apiRequest.NotFound("no events found")
+		return
+	}
+
+	apiRequest.SetMeta("event_count", len(events))
+
+	lastEvent := events[len(events)-1]
+	lastEventStartAt := lastEvent.StartDate
+	if lastEvent.StartTime != nil {
+		lastEventStartAt += "T" + *lastEvent.StartTime
+	}
+	lastEventDateId := lastEvent.EventDateId
+
+	apiRequest.Success(
+		http.StatusOK,
+		gin.H{
+			"events":              events,
+			"last_event_start_at": lastEventStartAt,
+			"last_event_date_id":  lastEventDateId,
+		},
+		"")
+}
+
 func validateAllowedQueryParams(c *gin.Context, allowed map[string]struct{}) error {
 	for key := range c.Request.URL.Query() {
 		if _, ok := allowed[key]; !ok {

api/get_venues_for_map.go

@@ -10,7 +10,7 @@ import (
 // TODO: Review code
 // TODO: Add url parameter
 
-func (h *ApiHandler) GetVenuesGeoJson(gc *gin.Context) {
+func (h *ApiHandler) GetVenuesGeoJSON(gc *gin.Context) {
 	ctx := gc.Request.Context()
 
 	query := app.UranusInstance.SqlGetGeojsonVenues

app/uranus.go

@@ -33,6 +33,7 @@ type Uranus struct {
 	SqlGetEventDates                    string
 	SqlGetEventsProjected               string
 	SqlGetEventsTypeSummary             string
+	SqlGetEventsGeoJSON                 string
 	SqlGetUserOrganizationPermissions   string
 	SqlGetUserEffectiveVenuePermissions string
 	SqlGetAdminOrganization             string
@@ -250,6 +251,7 @@ func (app *Uranus) PrepareSql() error {
 		{"sql/get-event.sql", &app.SqlGetEvent, nil},
 		{"sql/get-event-dates.sql", &app.SqlGetEventDates, nil},
 		{"sql/get-events-projected.sql", &app.SqlGetEventsProjected, nil},
+		{"sql/get-events-geojson.sql", &app.SqlGetEventsGeoJSON, nil},
 
 		{"sql/get-events-type-summary.sql", &app.SqlGetEventsTypeSummary, nil},
 

sql/get-events-geojson.sql

@@ -0,0 +1,26 @@
+SELECT
+    edp.event_date_id,
+    edp.event_id,
+    v.venue_id,
+    v.venue_name,
+    v.venue_city,
+    v.venue_country,
+    ST_X(v.venue_geo_pos) AS venue_lon,
+    ST_Y(v.venue_geo_pos) AS venue_lat,
+    ep.title,
+    TO_CHAR(edp.start_date, 'YYYY-MM-DD') AS start_date,
+    TO_CHAR(edp.start_time, 'HH24:MI') AS start_time
+FROM {{schema}}.event_date_projection edp
+JOIN {{schema}}.event_projection ep
+ON ep.event_id = edp.event_id
+LEFT JOIN LATERAL (
+    SELECT
+        COALESCE(edp.venue_id, ep.venue_id) AS venue_id,
+        COALESCE(edp.venue_name, ep.venue_name) AS venue_name,
+        COALESCE(edp.venue_city, ep.venue_city) AS venue_city,
+        COALESCE(edp.venue_country, ep.venue_country) AS venue_country,
+        COALESCE(edp.venue_geo_pos, ep.venue_geo_pos) AS venue_geo_pos
+) v ON true
+WHERE {{date_conditions}}
+{{conditions}}
+{{limit}}

uranus-api.go

@@ -101,11 +101,12 @@ func main() {
 	publicRoute.GET("/events", apiHandler.GetEvents)                          // TODO: check!
 	publicRoute.GET("/events/type-summary", apiHandler.GetEventTypeSummary)   // TODO: check!
 	publicRoute.GET("/events/venue-summary", apiHandler.GetEventVenueSummary) // TODO: check!
+	publicRoute.GET("/events/geojson", apiHandler.GetEventsGeoJSON)
 
 	publicRoute.GET("/event/:eventId/date/:dateId", apiHandler.GetEventByDateId)
 	publicRoute.GET("/event/:eventId/date/:dateId/ics", apiHandler.GetEventDateICS) // TODO: check!
 
-	publicRoute.GET("/venues/geojson", apiHandler.GetVenuesGeoJson) // TODO: check!
+	publicRoute.GET("/venues/geojson", apiHandler.GetVenuesGeoJSON) // TODO: check!
 
 	publicRoute.GET("/organization/:organizationId", apiHandler.GetOrganization) // TODO: check!
 	publicRoute.GET("/organizations", apiHandler.GetOrganizations)               // TODO: check!