Update tests, wip

presleyp · presleyp · commit 7363a70fa4e4 · 2022-11-16T14:37:49.000Z
diff --git a/coderd/audit_test.go b/coderd/audit_test.go
@@ -25,17 +25,14 @@ func TestAuditLogs(t *testing.T) {
 		err := client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{})
 		require.NoError(t, err)
 
-		count, err := client.AuditLogCount(ctx, codersdk.AuditLogCountRequest{})
-		require.NoError(t, err)
-
 		alogs, err := client.AuditLogs(ctx, codersdk.AuditLogsRequest{
 			Pagination: codersdk.Pagination{
 				Limit: 1,
 			},
 		})
 		require.NoError(t, err)
 
-		require.Equal(t, int64(1), count.Count)
+		require.Equal(t, int64(1), alogs.Count)
 		require.Len(t, alogs.AuditLogs, 1)
 	})
 }
@@ -161,16 +158,7 @@ func TestAuditLogsFilter(t *testing.T) {
 				})
 				require.NoError(t, err, "fetch audit logs")
 				require.Len(t, auditLogs.AuditLogs, testCase.ExpectedResult, "expected audit logs returned")
-			})
-
-			// Test count filtering
-			t.Run("GetCount"+testCase.Name, func(t *testing.T) {
-				t.Parallel()
-				response, err := client.AuditLogCount(ctx, codersdk.AuditLogCountRequest{
-					SearchQuery: testCase.SearchQuery,
-				})
-				require.NoError(t, err, "fetch audit logs count")
-				require.Equal(t, int(response.Count), testCase.ExpectedResult, "expected audit logs count returned")
+				require.Equal(t, testCase.ExpectedResult, int(auditLogs.Count), "expected audit log count returned")
 			})
 		}
 	})
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -3004,59 +3004,18 @@ func (q *fakeQuerier) GetAuditLogsOffset(ctx context.Context, arg database.GetAu
 			UserCreatedAt:    sql.NullTime{Time: user.CreatedAt, Valid: userValid},
 			UserStatus:       user.Status,
 			UserRoles:        user.RBACRoles,
+			Count:            0,
 		})
 
 		if len(logs) >= int(arg.Limit) {
 			break
 		}
 	}
 
-	return logs, nil
-}
-
-func (q *fakeQuerier) GetAuditLogCount(_ context.Context, arg database.GetAuditLogCountParams) (int64, error) {
-	q.mutex.RLock()
-	defer q.mutex.RUnlock()
-
-	logs := make([]database.AuditLog, 0)
-
-	for _, alog := range q.auditLogs {
-		if arg.Action != "" && !strings.Contains(string(alog.Action), arg.Action) {
-			continue
-		}
-		if arg.ResourceType != "" && !strings.Contains(string(alog.ResourceType), arg.ResourceType) {
-			continue
-		}
-		if arg.ResourceID != uuid.Nil && alog.ResourceID != arg.ResourceID {
-			continue
-		}
-		if arg.Username != "" {
-			user, err := q.GetUserByID(context.Background(), alog.UserID)
-			if err == nil && !strings.EqualFold(arg.Username, user.Username) {
-				continue
-			}
-		}
-		if arg.Email != "" {
-			user, err := q.GetUserByID(context.Background(), alog.UserID)
-			if err == nil && !strings.EqualFold(arg.Email, user.Email) {
-				continue
-			}
-		}
-		if !arg.DateFrom.IsZero() {
-			if alog.Time.Before(arg.DateFrom) {
-				continue
-			}
-		}
-		if !arg.DateTo.IsZero() {
-			if alog.Time.After(arg.DateTo) {
-				continue
-			}
-		}
+	count := int64(len(logs))
+	// TODO set count
 
-		logs = append(logs, alog)
-	}
-
-	return int64(len(logs)), nil
+	return logs, nil
 }
 
 func (q *fakeQuerier) InsertAuditLog(_ context.Context, arg database.InsertAuditLogParams) (database.AuditLog, error) {
