From 31e180089e6241e84b36559647d1cf76efa266be Mon Sep 17 00:00:00 2001 From: Kailash Nadh Date: Mon, 5 Nov 2018 11:19:08 +0530 Subject: [PATCH] WIP: Add dashboard stats queries and endpoint --- admin.go | 23 +++++++++++++--- frontend/my/src/Dashboard.js | 44 ++++++++++++++++++++++++------ frontend/my/src/constants.js | 1 + main.go | 1 + queries.go | 2 ++ queries.sql | 53 +++++++++++++++++++++++------------- 6 files changed, 92 insertions(+), 32 deletions(-) diff --git a/admin.go b/admin.go index 4f42570..9923c73 100644 --- a/admin.go +++ b/admin.go @@ -3,8 +3,10 @@ package main import ( "bytes" "encoding/json" + "fmt" "net/http" + "github.com/jmoiron/sqlx/types" "github.com/labstack/echo" ) @@ -15,10 +17,8 @@ type configScript struct { Messengers []string `json:"messengers"` } -// handleGetStats returns a collection of general statistics. -func handleGetStats(c echo.Context) error { - app := c.Get("app").(*App) - return c.JSON(http.StatusOK, okResp{app.Runner.GetMessengerNames()}) +type dashboardStats struct { + Stats types.JSONText `db:"stats"` } // handleGetConfigScript returns general configuration as a Javascript @@ -41,3 +41,18 @@ func handleGetConfigScript(c echo.Context) error { j.Encode(out) return c.Blob(http.StatusOK, "application/javascript", b.Bytes()) } + +// handleGetDashboardStats returns general states for the dashboard. +func handleGetDashboardStats(c echo.Context) error { + var ( + app = c.Get("app").(*App) + out dashboardStats + ) + + if err := app.Queries.GetDashboardStats.Get(&out); err != nil { + return echo.NewHTTPError(http.StatusInternalServerError, + fmt.Sprintf("Error fetching dashboard stats: %s", pqErrMsg(err))) + } + + return c.JSON(http.StatusOK, okResp{out.Stats}) +} diff --git a/frontend/my/src/Dashboard.js b/frontend/my/src/Dashboard.js index 63aa962..7b2eb2d 100644 --- a/frontend/my/src/Dashboard.js +++ b/frontend/my/src/Dashboard.js @@ -1,14 +1,40 @@ -import React from 'react'; +import { Button, Col, Form, Icon, Input, Modal, notification, Popconfirm, Row, Select, Spin, Table, Tag, Tooltip } from "antd" +import React from "react"; + +import * as cs from "./constants" class Dashboard extends React.PureComponent { - componentDidMount = () => { - this.props.pageTitle("Dashboard") - } - render() { - return ( -

Welcome

- ); - } + state = { + stats: null + } + + componentDidMount = () => { + this.props.pageTitle("Dashboard") + + this.props.request(cs.Routes.GetDashboarcStats, cs.MethodGet).then((resp) => { + this.setState({ stats: resp.data.data }) + }).catch(e => { + notification["error"]({ message: "Error", description: e.message }) + }) + } + + render() { + return ( +
+

Welcome

+ + { this.state.stats && +
+ + +

+ + +
+ } +
+ ); + } } export default Dashboard; diff --git a/frontend/my/src/constants.js b/frontend/my/src/constants.js index 11a42a6..1430593 100644 --- a/frontend/my/src/constants.js +++ b/frontend/my/src/constants.js @@ -52,6 +52,7 @@ export const SubscriptionStatusUnsubscribed = "unsubscribed" // API routes. export const Routes = { + GetDashboarcStats: "/api/dashboard/stats", GetUsers: "/api/users", GetLists: "/api/lists", diff --git a/main.go b/main.go index f13d054..8c645a6 100644 --- a/main.go +++ b/main.go @@ -80,6 +80,7 @@ func init() { func registerHandlers(e *echo.Echo) { e.GET("/", handleIndexPage) e.GET("/api/config.js", handleGetConfigScript) + e.GET("/api/dashboard/stats", handleGetDashboardStats) e.GET("/api/users", handleGetUsers) e.POST("/api/users", handleCreateUser) e.DELETE("/api/users/:id", handleDeleteUser) diff --git a/queries.go b/queries.go index 7d71ca0..b054cf4 100644 --- a/queries.go +++ b/queries.go @@ -8,6 +8,8 @@ import ( // Queries contains all prepared SQL queries. type Queries struct { + GetDashboardStats *sqlx.Stmt `query:"get-dashboard-stats"` + UpsertSubscriber *sqlx.Stmt `query:"upsert-subscriber"` GetSubscriber *sqlx.Stmt `query:"get-subscriber"` GetSubscribersByEmails *sqlx.Stmt `query:"get-subscribers-by-emails"` diff --git a/queries.sql b/queries.sql index 988ac34..489576a 100644 --- a/queries.sql +++ b/queries.sql @@ -382,22 +382,37 @@ INSERT INTO link_clicks (campaign_id, subscriber_id, link_id) RETURNING (SELECT url FROM link); --- -- name: get-stats --- WITH lists AS ( --- SELECT type, COUNT(id) AS num FROM lists GROUP BY type --- ), --- subs AS ( --- SELECT status, COUNT(id) AS num FROM subscribers GROUP by status --- ), --- orphans AS ( --- SELECT COUNT(id) FROM subscribers LEFT JOIN subscriber_lists ON (subscribers.id = subscriber_lists.subscriber_id) --- WHERE subscriber_lists.subscriber_id IS NULL --- ), --- camps AS ( --- SELECT status, COUNT(id) AS num FROM campaigns GROUP by status --- ) --- SELECT JSON_BUILD_OBJECT('lists', lists); --- row_to_json(t) --- from ( --- select type, num from lists --- ) t, \ No newline at end of file +-- name: get-dashboard-stats +WITH lists AS ( + SELECT JSON_AGG(ROW_TO_JSON(row)) FROM (SELECT type, COUNT(id) AS num FROM lists GROUP BY type) row +), +subs AS ( + SELECT JSON_AGG(ROW_TO_JSON(row)) FROM (SELECT status, COUNT(id) AS num FROM subscribers GROUP by status) row +), +orphans AS ( + SELECT COUNT(id) FROM subscribers LEFT JOIN subscriber_lists ON (subscribers.id = subscriber_lists.subscriber_id) + WHERE subscriber_lists.subscriber_id IS NULL +), +camps AS ( + SELECT JSON_AGG(ROW_TO_JSON(row)) FROM (SELECT status, COUNT(id) AS num FROM campaigns GROUP by status) row +), +clicks AS ( + -- Clicks by day for the last 3 months + SELECT JSON_AGG(ROW_TO_JSON(row)) + FROM (SELECT COUNT(*) AS num, created_at::DATE as date + FROM link_clicks GROUP by date ORDER BY date DESC LIMIT 100 + ) row +), +views AS ( + -- Views by day for the last 3 months + SELECT JSON_AGG(ROW_TO_JSON(row)) + FROM (SELECT COUNT(*) AS views, created_at::DATE as date + FROM campaign_views GROUP by date ORDER BY date DESC LIMIT 100 + ) row +) +SELECT JSON_BUILD_OBJECT('lists', COALESCE((SELECT * FROM lists), '[]'), + 'subscribers', COALESCE((SELECT * FROM subs), '[]'), + 'orphan_subscribers', (SELECT * FROM orphans), + 'campaigns', COALESCE((SELECT * FROM camps), '[]'), + 'link_clicks', COALESCE((SELECT * FROM clicks), '[]'), + 'campaign_views', COALESCE((SELECT * FROM views), '[]')) AS stats;