Small fix for previous commit :)

keycloak/keycloak.go

@@ -129,7 +129,7 @@ func (k *Keycloak) ensureToken(ctx context.Context) (*gocloak.JWT, error) {
 }
 
 type AccessUser struct {
-	UUID         string
+	UUID, Name   string
 	KeyfobNumber int
 }
 
@@ -146,6 +146,7 @@ func newAccessUser(kcuser *gocloak.User) *AccessUser {
 
 	return &AccessUser{
 		UUID:         *kcuser.ID,
+		Name:         fmt.Sprintf("%s %s", gocloak.PString(kcuser.FirstName), gocloak.PString(kcuser.LastName)),
 		KeyfobNumber: fobID,
 	}
 }

reporting/controller.go

@@ -95,7 +95,14 @@ func (c *Controller) scrape(ctx context.Context) error {
 	}
 
 	fn := func(swipe *client.CardSwipe) error {
-		_, err := c.db.Exec("INSERT INTO swipes (id, cardID, doorID, time, name) VALUES ($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING", swipe.ID, swipe.CardID, swipe.DoorID, swipe.Time, usersByUUID[swipe.Name])
+		var name string
+		if user := usersByUUID[swipe.Name]; user != nil {
+			name = user.Name
+		} else {
+			name = swipe.Name // fall back to UUID
+		}
+
+		_, err := c.db.Exec("INSERT INTO swipes (id, cardID, doorID, time, name) VALUES ($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING", swipe.ID, swipe.CardID, swipe.DoorID, swipe.Time, name)
 		if err != nil {
 			return fmt.Errorf("inserting swipe %d into database: %s", swipe.ID, err)
 		}