Write tests

ammario · ammario · commit 72d074a41a53 · 2022-09-24T18:43:47.000Z
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -1956,6 +1956,22 @@ func (q *fakeQuerier) UpdateUserStatus(_ context.Context, arg database.UpdateUse
 	return database.User{}, sql.ErrNoRows
 }
 
+func (q *fakeQuerier) UpdateUserLastSeenAt(_ context.Context, arg database.UpdateUserLastSeenAtParams) (database.User, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for index, user := range q.users {
+		if user.ID != arg.ID {
+			continue
+		}
+		user.LastSeenAt = arg.LastSeenAt
+		user.UpdatedAt = arg.UpdatedAt
+		q.users[index] = user
+		return user, nil
+	}
+	return database.User{}, sql.ErrNoRows
+}
+
 func (q *fakeQuerier) UpdateUserHashedPassword(_ context.Context, arg database.UpdateUserHashedPasswordParams) error {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
diff --git a/coderd/httpmw/apikey.go b/coderd/httpmw/apikey.go
@@ -317,6 +317,19 @@ func ExtractAPIKey(cfg ExtractAPIKeyConfig) func(http.Handler) http.Handler {
 						return
 					}
 				}
+
+				_, err = cfg.DB.UpdateUserLastSeenAt(ctx, database.UpdateUserLastSeenAtParams{
+					ID:         key.UserID,
+					LastSeenAt: database.Now(),
+					UpdatedAt:  database.Now(),
+				})
+				if err != nil {
+					write(http.StatusInternalServerError, codersdk.Response{
+						Message: internalErrorMessage,
+						Detail:  fmt.Sprintf("update user last_seen_at: %s", err.Error()),
+					})
+					return
+				}
 			}
 
 			// If the key is valid, we also fetch the user roles and status.
diff --git a/coderd/users.go b/coderd/users.go
@@ -1210,6 +1210,7 @@ func convertUser(user database.User, organizationIDs []uuid.UUID) codersdk.User
 		ID:              user.ID,
 		Email:           user.Email,
 		CreatedAt:       user.CreatedAt,
+		LastSeenAt:      user.LastSeenAt,
 		Username:        user.Username,
 		Status:          codersdk.UserStatus(user.Status),
 		OrganizationIDs: organizationIDs,
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -65,6 +65,35 @@ func TestFirstUser(t *testing.T) {
 		_ = coderdtest.CreateFirstUser(t, client)
 	})
 
+	t.Run("LastSeenAt", func(t *testing.T) {
+		t.Parallel()
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		client := coderdtest.New(t, nil)
+		firstUserResp := coderdtest.CreateFirstUser(t, client)
+
+		firstUser, err := client.User(ctx, firstUserResp.UserID.String())
+		require.NoError(t, err)
+
+		_ = coderdtest.CreateAnotherUser(t, client, firstUserResp.OrganizationID)
+
+		allUsers, err := client.Users(ctx, codersdk.UsersRequest{})
+		require.NoError(t, err)
+
+		require.Len(t, allUsers, 2)
+
+		// We sent the "GET Users" request with the first user, but the second user
+		// should be Never since they haven't performed a request.
+		for _, user := range allUsers {
+			if user.ID == firstUser.ID {
+				require.WithinDuration(t, firstUser.LastSeenAt, database.Now(), testutil.WaitShort)
+			} else {
+				require.Zero(t, user.LastSeenAt)
+			}
+		}
+	})
+
 	t.Run("AutoImportsTemplates", func(t *testing.T) {
 		t.Parallel()
 
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -43,10 +43,12 @@ type UsersRequest struct {
 
 // User represents a user in Coder.
 type User struct {
-	ID              uuid.UUID   `json:"id" validate:"required" table:"id"`
-	Username        string      `json:"username" validate:"required" table:"username"`
-	Email           string      `json:"email" validate:"required" table:"email"`
-	CreatedAt       time.Time   `json:"created_at" validate:"required" table:"created at"`
+	ID         uuid.UUID `json:"id" validate:"required" table:"id"`
+	Username   string    `json:"username" validate:"required" table:"username"`
+	Email      string    `json:"email" validate:"required" table:"email"`
+	CreatedAt  time.Time `json:"created_at" validate:"required" table:"created at"`
+	LastSeenAt time.Time `json:"last_seen_at"`
+
 	Status          UserStatus  `json:"status" table:"status"`
 	OrganizationIDs []uuid.UUID `json:"organization_ids"`
 	Roles           []Role      `json:"roles"`

Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,19 @@ func ExtractAPIKey(cfg ExtractAPIKeyConfig) func(http.Handler) http.Handler {`
`317`	`317`	`return`
`318`	`318`	`}`
`319`	`319`	`}`
	`320`	`+`
	`321`	`+ _, err = cfg.DB.UpdateUserLastSeenAt(ctx, database.UpdateUserLastSeenAtParams{`
	`322`	`+ ID: key.UserID,`
	`323`	`+ LastSeenAt: database.Now(),`
	`324`	`+ UpdatedAt: database.Now(),`
	`325`	`+ })`
	`326`	`+ if err != nil {`
	`327`	`+ write(http.StatusInternalServerError, codersdk.Response{`
	`328`	`+ Message: internalErrorMessage,`
	`329`	`+ Detail: fmt.Sprintf("update user last_seen_at: %s", err.Error()),`
	`330`	`+ })`
	`331`	`+ return`
	`332`	`+ }`
`320`	`333`	`}`
`321`	`334`
`322`	`335`	`// If the key is valid, we also fetch the user roles and status.`