NOISSUE - Add event store middleware to reports service for billing usage tracking

Signed-off-by: nyagamunene <stevenyaga2014@gmail.com>
This commit is contained in:
JeffMboya
2026-04-16 18:49:18 +03:00
committed by nyagamunene
parent ebb4d74783
commit b8d638c80b
4 changed files with 198 additions and 0 deletions
+6
View File
@@ -45,6 +45,7 @@ import (
grpcClient "github.com/absmach/magistrala/readers/api/grpc"
"github.com/absmach/magistrala/reports"
httpapi "github.com/absmach/magistrala/reports/api"
reportsevents "github.com/absmach/magistrala/reports/events"
"github.com/absmach/magistrala/reports/middleware"
"github.com/absmach/magistrala/reports/operations"
repg "github.com/absmach/magistrala/reports/postgres"
@@ -350,6 +351,11 @@ func newService(cfg config, db pgclient.Database, runInfo chan pkglog.RunInfo, a
return nil, fmt.Errorf("failed to create reports service: %w", err)
}
csvc, err = reportsevents.NewEventStoreMiddleware(ctx, csvc, cfg.ESURL)
if err != nil {
return nil, fmt.Errorf("failed to init reports event store middleware: %w", err)
}
permConfig, err := permissions.ParsePermissionsFile(cfg.PermissionsFile)
if err != nil {
return nil, fmt.Errorf("failed to parse permissions file: %w", err)
+6
View File
@@ -0,0 +1,6 @@
// Copyright (c) Abstract Machines
// SPDX-License-Identifier: Apache-2.0
// Package events provides the domain concept definitions needed to support
// reports events functionality.
package events
+72
View File
@@ -0,0 +1,72 @@
// Copyright (c) Abstract Machines
// SPDX-License-Identifier: Apache-2.0
package events
import (
"maps"
"github.com/absmach/magistrala/pkg/authn"
"github.com/absmach/magistrala/pkg/events"
"github.com/absmach/magistrala/reports"
)
const (
reportPrefix = "report."
reportCreate = reportPrefix + "create"
reportRemove = reportPrefix + "remove"
)
var (
_ events.Event = (*createReportConfigEvent)(nil)
_ events.Event = (*removeReportConfigEvent)(nil)
)
type baseReportEvent struct {
session authn.Session
requestID string
}
func newBaseReportEvent(session authn.Session, requestID string) baseReportEvent {
return baseReportEvent{
session: session,
requestID: requestID,
}
}
func (bre baseReportEvent) Encode() map[string]any {
return map[string]any{
"domain": bre.session.DomainID,
"user_id": bre.session.UserID,
"token_type": bre.session.Type.String(),
"super_admin": bre.session.SuperAdmin,
"request_id": bre.requestID,
}
}
type createReportConfigEvent struct {
cfg reports.ReportConfig
baseReportEvent
}
func (e createReportConfigEvent) Encode() (map[string]any, error) {
val := map[string]any{
"id": e.cfg.ID,
"name": e.cfg.Name,
}
maps.Copy(val, e.baseReportEvent.Encode())
val["operation"] = reportCreate
return val, nil
}
type removeReportConfigEvent struct {
id string
baseReportEvent
}
func (e removeReportConfigEvent) Encode() (map[string]any, error) {
val := e.baseReportEvent.Encode()
val["id"] = e.id
val["operation"] = reportRemove
return val, nil
}
+114
View File
@@ -0,0 +1,114 @@
// Copyright (c) Abstract Machines
// SPDX-License-Identifier: Apache-2.0
package events
import (
"context"
"github.com/absmach/magistrala/pkg/authn"
"github.com/absmach/magistrala/pkg/events"
"github.com/absmach/magistrala/pkg/events/store"
rmEvents "github.com/absmach/magistrala/pkg/roles/rolemanager/events"
"github.com/absmach/magistrala/reports"
"github.com/go-chi/chi/v5/middleware"
)
const (
magistralaPrefix = "magistrala."
CreateStream = magistralaPrefix + reportCreate
RemoveStream = magistralaPrefix + reportRemove
)
var _ reports.Service = (*eventStore)(nil)
type eventStore struct {
events.Publisher
svc reports.Service
rmEvents.RoleManagerEventStore
}
func NewEventStoreMiddleware(ctx context.Context, svc reports.Service, url string) (reports.Service, error) {
publisher, err := store.NewPublisher(ctx, url, "reports-es-pub")
if err != nil {
return nil, err
}
res := rmEvents.NewRoleManagerEventStore("reports", reportPrefix, svc, publisher)
return &eventStore{
svc: svc,
Publisher: publisher,
RoleManagerEventStore: res,
}, nil
}
func (es *eventStore) AddReportConfig(ctx context.Context, session authn.Session, cfg reports.ReportConfig) (reports.ReportConfig, error) {
reportCfg, err := es.svc.AddReportConfig(ctx, session, cfg)
if err != nil {
return reportCfg, err
}
event := createReportConfigEvent{
cfg: reportCfg,
baseReportEvent: newBaseReportEvent(session, middleware.GetReqID(ctx)),
}
if err := es.Publish(ctx, CreateStream, event); err != nil {
return reportCfg, err
}
return reportCfg, nil
}
func (es *eventStore) RemoveReportConfig(ctx context.Context, session authn.Session, id string) error {
if err := es.svc.RemoveReportConfig(ctx, session, id); err != nil {
return err
}
event := removeReportConfigEvent{
id: id,
baseReportEvent: newBaseReportEvent(session, middleware.GetReqID(ctx)),
}
return es.Publish(ctx, RemoveStream, event)
}
func (es *eventStore) ViewReportConfig(ctx context.Context, session authn.Session, id string, withRoles bool) (reports.ReportConfig, error) {
return es.svc.ViewReportConfig(ctx, session, id, withRoles)
}
func (es *eventStore) UpdateReportConfig(ctx context.Context, session authn.Session, cfg reports.ReportConfig) (reports.ReportConfig, error) {
return es.svc.UpdateReportConfig(ctx, session, cfg)
}
func (es *eventStore) UpdateReportSchedule(ctx context.Context, session authn.Session, cfg reports.ReportConfig) (reports.ReportConfig, error) {
return es.svc.UpdateReportSchedule(ctx, session, cfg)
}
func (es *eventStore) ListReportsConfig(ctx context.Context, session authn.Session, pm reports.PageMeta) (reports.ReportConfigPage, error) {
return es.svc.ListReportsConfig(ctx, session, pm)
}
func (es *eventStore) EnableReportConfig(ctx context.Context, session authn.Session, id string) (reports.ReportConfig, error) {
return es.svc.EnableReportConfig(ctx, session, id)
}
func (es *eventStore) DisableReportConfig(ctx context.Context, session authn.Session, id string) (reports.ReportConfig, error) {
return es.svc.DisableReportConfig(ctx, session, id)
}
func (es *eventStore) UpdateReportTemplate(ctx context.Context, session authn.Session, cfg reports.ReportConfig) error {
return es.svc.UpdateReportTemplate(ctx, session, cfg)
}
func (es *eventStore) ViewReportTemplate(ctx context.Context, session authn.Session, id string) (reports.ReportTemplate, error) {
return es.svc.ViewReportTemplate(ctx, session, id)
}
func (es *eventStore) DeleteReportTemplate(ctx context.Context, session authn.Session, id string) error {
return es.svc.DeleteReportTemplate(ctx, session, id)
}
func (es *eventStore) GenerateReport(ctx context.Context, session authn.Session, config reports.ReportConfig, action reports.ReportAction) (reports.ReportPage, error) {
return es.svc.GenerateReport(ctx, session, config, action)
}
func (es *eventStore) StartScheduler(ctx context.Context) error {
return es.svc.StartScheduler(ctx)
}