submissions: fetch usernames from data service

pkg/cmds/serve.go

@@ -6,6 +6,7 @@ import (
 
 	"git.itzana.me/strafesnet/go-grpc/auth"
 	"git.itzana.me/strafesnet/go-grpc/maps"
+	"git.itzana.me/strafesnet/go-grpc/users"
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore/gormstore"
 	internal "git.itzana.me/strafesnet/maps-service/pkg/internal"
@@ -126,6 +127,7 @@ func serve(ctx *cli.Context) error {
 		DB:   db,
 		Nats: js,
 		Maps: maps.NewMapsServiceClient(conn),
+		Users: users.NewUsersServiceClient(conn),
 	}
 
 	conn, err = grpc.Dial(ctx.String("auth-rpc-host"), grpc.WithTransportCredentials(insecure.NewCredentials()))

pkg/service/audit_events.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 
+	"git.itzana.me/strafesnet/go-grpc/users"
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
@@ -83,6 +84,27 @@ func (svc *Service) ListMapfixAuditEvents(ctx context.Context, params api.ListMa
 		return nil, err
 	}
 
+	idMap := make(map[int64]bool)
+	for _, item := range items {
+		idMap[int64(item.User)] = true
+	}
+
+	var idList users.IdList
+	idList.ID = make([]int64,len(idMap))
+	for userId := range idMap {
+		idList.ID = append(idList.ID, userId)
+	}
+
+	userList, err := svc.Users.GetList(ctx, &idList)
+	if err != nil {
+		return nil, err
+	}
+
+	userMap := make(map[int64]*users.UserResponse)
+	for _,user := range userList.Users {
+		userMap[user.ID] = user
+	}
+
 	var resp []api.AuditEvent
 	for _, item := range items {
 		EventData := api.AuditEventEventData{}
@@ -90,10 +112,15 @@ func (svc *Service) ListMapfixAuditEvents(ctx context.Context, params api.ListMa
 		if err != nil {
 			return nil, err
 		}
+		username := ""
+		if userMap[int64(item.User)] != nil {
+			username = userMap[int64(item.User)].Username
+		}
 		resp = append(resp, api.AuditEvent{
 			ID:           item.ID,
 			Date:         item.CreatedAt.Unix(),
 			User:         int64(item.User),
+			Username:     username,
 			ResourceType: int32(item.ResourceType),
 			ResourceID:   item.ResourceID,
 			EventType:    int32(item.EventType),
@@ -178,6 +205,27 @@ func (svc *Service) ListSubmissionAuditEvents(ctx context.Context, params api.Li
 		return nil, err
 	}
 
+	idMap := make(map[int64]bool)
+	for _, item := range items {
+		idMap[int64(item.User)] = true
+	}
+
+	var idList users.IdList
+	idList.ID = make([]int64,len(idMap))
+	for userId := range idMap {
+		idList.ID = append(idList.ID, userId)
+	}
+
+	userList, err := svc.Users.GetList(ctx, &idList)
+	if err != nil {
+		return nil, err
+	}
+
+	userMap := make(map[int64]*users.UserResponse)
+	for _,user := range userList.Users {
+		userMap[user.ID] = user
+	}
+
 	var resp []api.AuditEvent
 	for _, item := range items {
 		EventData := api.AuditEventEventData{}
@@ -185,10 +233,15 @@ func (svc *Service) ListSubmissionAuditEvents(ctx context.Context, params api.Li
 		if err != nil {
 			return nil, err
 		}
+		username := ""
+		if userMap[int64(item.User)] != nil {
+			username = userMap[int64(item.User)].Username
+		}
 		resp = append(resp, api.AuditEvent{
 			ID:           item.ID,
 			Date:         item.CreatedAt.Unix(),
 			User:         int64(item.User),
+			Username:     username,
 			ResourceType: int32(item.ResourceType),
 			ResourceID:   item.ResourceID,
 			EventType:    int32(item.EventType),

pkg/service/service.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"git.itzana.me/strafesnet/go-grpc/maps"
+	"git.itzana.me/strafesnet/go-grpc/users"
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	"github.com/nats-io/nats.go"
@@ -33,6 +34,7 @@ type Service struct {
 	DB   datastore.Datastore
 	Nats nats.JetStreamContext
 	Maps maps.MapsServiceClient
+	Users users.UsersServiceClient
 }
 
 // NewError creates *ErrorStatusCode from error returned by handler.