added report endpoints with report dat a column and custom type, currently broken :D

Author: TeisNP

cmd/api.go

@@ -75,6 +75,7 @@ func runAPI(cmd *cobra.Command, args []string) {
 		entities.IncidentComment{},
 		entities.Changelog{},
 		entities.ChangelogEntry{},
+		entities.Report{},
 	)
 
 	ch_db, err := clickhouse.NewClient(ctx, conf.Clickhouse)
@@ -125,7 +126,8 @@ func runAPI(cmd *cobra.Command, args []string) {
 	incidentRepository := incident.NewRepository(db)
 	incidentService := incident.NewService(incidentRepository)
 
-	reportsService := report.NewService(db)
+	reportRepository := report.NewRepository(db)
+	reportsService := report.NewService(reportRepository)
 
 	srv, err := rest.NewServer(
 		conf.REST,

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/go-playground/validator/v10 v10.11.1
 	github.com/gofrs/uuid v4.0.0+incompatible
 	github.com/golang-jwt/jwt v3.2.2+incompatible
-	github.com/google/uuid v1.3.0
+	github.com/google/uuid v1.6.0
 	github.com/jackc/pgconn v1.13.0
 	github.com/json-iterator/go v1.1.12
 	github.com/labstack/echo/v4 v4.9.1
@@ -38,16 +38,18 @@ require (
 	github.com/vmihailenco/msgpack v4.0.4+incompatible
 	github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0
 	go.uber.org/automaxprocs v1.5.2
-	golang.org/x/crypto v0.4.0
+	golang.org/x/crypto v0.23.0
+	gorm.io/datatypes v1.2.6
 	gorm.io/driver/clickhouse v0.5.0
-	gorm.io/driver/postgres v1.4.5
-	gorm.io/gorm v1.24.2
+	gorm.io/driver/postgres v1.5.0
+	gorm.io/gorm v1.30.0
 	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
 )
 
 require (
 	cloud.google.com/go/compute v1.12.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.1 // indirect
+	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/ClickHouse/ch-go v0.48.0 // indirect
 	github.com/ClickHouse/clickhouse-go/v2 v2.3.0 // indirect
 	github.com/Rican7/retry v0.3.1 // indirect
@@ -70,6 +72,7 @@ require (
 	github.com/go-faster/errors v0.6.1 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/mux v1.6.2 // indirect
@@ -82,9 +85,9 @@ require (
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgproto3/v2 v2.3.1 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.12.0 // indirect
-	github.com/jackc/pgx/v4 v4.17.2 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
+	github.com/jackc/pgx/v5 v5.5.5 // indirect
+	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -116,15 +119,17 @@ require (
 	github.com/valyala/fasttemplate v1.2.1 // indirect
 	go.opentelemetry.io/otel v1.10.0 // indirect
 	go.opentelemetry.io/otel/trace v1.10.0 // indirect
-	golang.org/x/net v0.5.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
+	golang.org/x/sync v0.9.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.20.0 // indirect
 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gorm.io/driver/mysql v1.5.6 // indirect
 )

go.sum

@@ -20,6 +20,7 @@ type Repository interface {
 	GetMonitorStatsByMonitorID(ctx context.Context, monitorID uint) (*MonitorStats, error)
 	GetMonitorOverviewStatsByTeamID(ctx context.Context, teamID uint) (*[]MonitorOverviewStats, error)
 	GetMonitorIDAndAssertions(ctx context.Context, monitorID uint, assertions []string) (*[]Check, error)
+	GetByTeamIDMonitorsUptime(ctx context.Context, teamID uint, start, end string) (*[]MonitorUptime, error)
 }
 
 type RepositoryImpl struct {
@@ -213,3 +214,33 @@ func (r *RepositoryImpl) GetMonitorIDAndAssertions(ctx context.Context, monitorI
 
 	return &checks, nil
 }
+
+type MonitorUptime struct {
+	MonitorID        uint
+	Url              string
+	UptimePercentage float32
+	Date             string
+}
+
+func (r *RepositoryImpl) GetByTeamIDMonitorsUptime(ctx context.Context, teamID uint, start, end string) (*[]MonitorUptime, error) {
+	var uptime []MonitorUptime
+	err := r.db.WithContext(
+		ctx,
+	).Table("checks").Select(`
+		monitor_id, 
+		url,
+		count(status_code <= 400) / count(status_code) * 100 as uptime_percentage, 
+		avg(timing_total/1000000) as average_response_time, 
+		toMonth(created_at) as date`).
+		Where("team_id = ?", teamID).
+		// Where("created_at BETWEEN ? AND ?", start, end).
+		Group("monitor_id, url, date").
+		Order("date ASC").
+		Find(&uptime).Error
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &uptime, nil
+}

internal/check/repository.go

@@ -18,6 +18,7 @@ type Service interface {
 	GetMonitorOverviewsByTeamID(ctx context.Context, teamID uint) (*[]MonitorOverviews, error)
 
 	GetMonitorIDAndAssertions(ctx context.Context, monitorID uint, assertions []string) (*[]Check, error)
+	GetByTeamIDMonitorsUptime(ctx context.Context, teamID uint, start, end string) (*[]MonitorUptime, error)
 }
 
 type ServiceImpl struct {
@@ -74,3 +75,6 @@ func (s *ServiceImpl) GetMonitorOverviewsByTeamID(ctx context.Context, teamID ui
 func (s *ServiceImpl) GetMonitorIDAndAssertions(ctx context.Context, monitorID uint, assertions []string) (*[]Check, error) {
 	return s.repository.GetMonitorIDAndAssertions(ctx, monitorID, assertions)
 }
+func (s *ServiceImpl) GetByTeamIDMonitorsUptime(ctx context.Context, teamID uint, start, end string) (*[]MonitorUptime, error) {
+	return s.repository.GetByTeamIDMonitorsUptime(ctx, teamID, start, end)
+}

internal/check/service.go

@@ -0,0 +1,63 @@
+package entities
+
+import (
+	"errors"
+	"time"
+
+	"github.com/opsway-io/backend/internal/check"
+	"gorm.io/datatypes"
+)
+
+type ReportType string
+
+const (
+	ReportTypeUptime      ReportType = "UPTIME"
+	ReportTypePerformance ReportType = "PERFORMANCE"
+	ReportTypeIncident    ReportType = "INCIDENT"
+	ReportTypeAll         ReportType = "ALL"
+	ReportTypeCustom      ReportType = "CUSTOM"
+)
+
+type Report struct {
+	ID     uint
+	TeamID uint                           `gorm:"index;not null"`
+	Type   ReportType                     `gorm:"index;not null"`
+	Report datatypes.JSONType[ReportData] `gorm:"not null"`
+
+	CreatedAt time.Time `gorm:"index"`
+	UpdatedAt time.Time `gorm:"index"`
+}
+
+func (Report) TableName() string {
+	return "reports"
+}
+
+type ReportData struct {
+	Uptime      *[]check.MonitorUptime `json:"uptime"`
+	Performance *string                `json:"performance"`
+	Incident    *string                `json:"incident"`
+	All         *string                `json:"all"`
+	Custom      *string                `json:"custom"`
+}
+
+func ReportFrom(source any) (ReportType, error) {
+	s, ok := source.(string)
+	if !ok {
+		return "", errors.New("invalid report type, must be string")
+	}
+
+	switch s {
+	case "UPTIME":
+		return ReportTypeUptime, nil
+	case "PERFORMANCE":
+		return ReportTypePerformance, nil
+	case "INCIDENT":
+		return ReportTypeIncident, nil
+	case "ALL":
+		return ReportTypeAll, nil
+	case "CUSTOM":
+		return ReportTypeCustom, nil
+	default:
+		return "", errors.New("invalid report type")
+	}
+}

internal/entities/report.go

@@ -0,0 +1,62 @@
+package report
+
+import (
+	"context"
+	"errors"
+
+	"github.com/opsway-io/backend/internal/entities"
+	"gorm.io/gorm"
+)
+
+var ErrNotFound = errors.New("monitor not found")
+
+type Repository interface {
+	GetReportsByTeamID(ctx context.Context, teamID uint) (*[]entities.Report, error)
+	Create(ctx context.Context, rep *entities.Report) error
+	Delete(ctx context.Context, teamID, reportID uint) error
+}
+
+type RepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewRepository(db *gorm.DB) Repository {
+	return &RepositoryImpl{
+		db: db,
+	}
+}
+
+func (r *RepositoryImpl) GetReportsByTeamID(ctx context.Context, teamID uint) (*[]entities.Report, error) {
+	var reports []entities.Report
+	err := r.db.WithContext(
+		ctx,
+	).Where(entities.Report{
+		TeamID: teamID,
+	}).Find(&reports).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
+
+		return nil, err
+	}
+
+	return &reports, err
+}
+
+func (r *RepositoryImpl) Create(ctx context.Context, rep *entities.Report) error {
+	return r.db.WithContext(ctx).Create(rep).Error
+}
+
+func (r *RepositoryImpl) Delete(ctx context.Context, teamID, reportID uint) error {
+	err := r.db.WithContext(ctx).
+		Where(entities.Report{
+			ID:     reportID,
+			TeamID: teamID,
+		}).Delete(&entities.Report{}).Error
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return ErrNotFound
+	}
+
+	return err
+}

internal/report/repository.go

@@ -3,20 +3,37 @@ package report
 import (
 	"context"
 
-	"gorm.io/gorm"
+	"github.com/opsway-io/backend/internal/entities"
+	"gorm.io/datatypes"
 )
 
 type Service interface {
-	GetResportsByTeam(ctx context.Context, teamID uint) (string, error)
+	GetResportsByTeam(ctx context.Context, teamID uint) (*[]entities.Report, error)
+	CreateReport(ctx context.Context, teamID uint, reportType string, reportData entities.ReportData) error
 }
 
 type ServiceImpl struct {
+	repository Repository
 }
 
-func NewService(db *gorm.DB) Service {
-	return &ServiceImpl{}
+func NewService(repository Repository) Service {
+	return &ServiceImpl{
+		repository: repository,
+	}
 }
 
-func (s *ServiceImpl) GetResportsByTeam(ctx context.Context, teamID uint) (string, error) {
-	return "", nil
+func (s *ServiceImpl) GetResportsByTeam(ctx context.Context, teamID uint) (*[]entities.Report, error) {
+	return s.repository.GetReportsByTeamID(ctx, teamID)
+}
+func (s *ServiceImpl) CreateReport(ctx context.Context, teamID uint, reportType string, reportData entities.ReportData) error {
+	reportTypeEnum, err := entities.ReportFrom(reportType)
+	if err != nil {
+		return err
+	}
+
+	return s.repository.Create(ctx, &entities.Report{
+		TeamID: teamID,
+		Type:   reportTypeEnum,
+		Report: datatypes.NewJSONType(reportData),
+	})
 }