return call for all memberships properly, change event bus log to inf…

…o-level (#37)
metal-toolbox · Aug 11, 2023 · 0cb8761 · 0cb8761
1 parent 16270f6
commit 0cb8761
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/internal/eventbus/client.go b/internal/eventbus/client.go
@@ -77,7 +77,7 @@ func (c *Client) Publish(_ context.Context, sub string, event *events.Event) err
 
 	subject := c.prefix + "." + sub
 
-	c.logger.Debug("publishing event on subject", zap.String("subject", subject), zap.Any("event", event))
+	c.logger.Info("publishing event to the event bus", zap.String("subject", subject), zap.Any("action", event.Action))
 
 	j, err := json.Marshal(event)
 	if err != nil {

diff --git a/pkg/api/v1alpha1/group_membership.go b/pkg/api/v1alpha1/group_membership.go
@@ -1233,7 +1233,7 @@ func (r *Router) getGroupMembershipsAll(c *gin.Context) {
 		qm.Load("Group"),
 	}
 
-	var response []string
+	var response []GroupMembership
 
 	if _, ok := c.GetQuery("expired"); ok {
 		queryMods = append(queryMods, qm.Where("expires_at <= NOW()"))
@@ -1246,7 +1246,7 @@ func (r *Router) getGroupMembershipsAll(c *gin.Context) {
 			}
 		}
 
-		response := make([]GroupMembership, len(groupMemberships))
+		response = make([]GroupMembership, len(groupMemberships))
 		for i, m := range groupMemberships {
 			response[i] = GroupMembership{
 				ID:        m.ID,
@@ -1265,7 +1265,8 @@ func (r *Router) getGroupMembershipsAll(c *gin.Context) {
 				return
 			}
 		}
-		response := make([]GroupMembership, len(enumeratedMemberships))
+
+		response = make([]GroupMembership, len(enumeratedMemberships))
 		for i, m := range enumeratedMemberships {
 			response[i] = GroupMembership{
 				ID:        "",