fix: audit log query when Postgres TZ isn't UTC (#6067)

coadler · web-flow · commit b81d8464df78 · 2023-02-06T21:36:39.000Z
diff --git a/coderd/audit.go b/coderd/audit.go
@@ -57,19 +57,10 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {
 		})
 		return
 	}
+	filter.Offset = int32(page.Offset)
+	filter.Limit = int32(page.Limit)
 
-	dblogs, err := api.Database.GetAuditLogsOffset(ctx, database.GetAuditLogsOffsetParams{
-		Offset:       int32(page.Offset),
-		Limit:        int32(page.Limit),
-		ResourceType: filter.ResourceType,
-		ResourceID:   filter.ResourceID,
-		Action:       filter.Action,
-		Username:     filter.Username,
-		Email:        filter.Email,
-		DateFrom:     filter.DateFrom,
-		DateTo:       filter.DateTo,
-		BuildReason:  filter.BuildReason,
-	})
+	dblogs, err := api.Database.GetAuditLogsOffset(ctx, filter)
 	if err != nil {
 		httpapi.InternalServerError(rw, err)
 		return
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/auditlogs.sql b/coderd/database/queries/auditlogs.sql
@@ -76,13 +76,13 @@ WHERE
 	END
 	-- Filter by date_from
 	AND CASE
-		WHEN @date_from :: timestamp with time zone != '0001-01-01 00:00:00' THEN
+		WHEN @date_from :: timestamp with time zone != '0001-01-01 00:00:00Z' THEN
 			"time" >= @date_from
 		ELSE true
 	END
 	-- Filter by date_to
 	AND CASE
-		WHEN @date_to :: timestamp with time zone != '0001-01-01 00:00:00' THEN
+		WHEN @date_to :: timestamp with time zone != '0001-01-01 00:00:00Z' THEN
 			"time" <= @date_to
 		ELSE true
 	END
