fix: ensure date_from and date_to are applied correct audit logs

deansheather · deansheather · commit d9eab84cf918 · 2022-11-02T14:07:15.000Z
diff --git a/coderd/audit.go b/coderd/audit.go
@@ -86,6 +86,8 @@ func (api *API) auditLogCount(rw http.ResponseWriter, r *http.Request) {
 		Action:       filter.Action,
 		Username:     filter.Username,
 		Email:        filter.Email,
+		DateFrom:     filter.DateFrom,
+		DateTo:       filter.DateTo,
 	})
 	if err != nil {
 		httpapi.InternalServerError(rw, err)
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -2995,6 +2995,16 @@ func (q *fakeQuerier) GetAuditLogsOffset(ctx context.Context, arg database.GetAu
 				continue
 			}
 		}
+		if arg.DateFrom != (time.Time{}) {
+			if alog.Time.Before(arg.DateFrom) {
+				continue
+			}
+		}
+		if arg.DateTo != (time.Time{}) {
+			if alog.Time.After(arg.DateTo) {
+				continue
+			}
+		}
 
 		user, err := q.GetUserByID(ctx, alog.UserID)
 		userValid := err == nil
@@ -3057,6 +3067,16 @@ func (q *fakeQuerier) GetAuditLogCount(_ context.Context, arg database.GetAuditL
 				continue
 			}
 		}
+		if arg.DateFrom != (time.Time{}) {
+			if alog.Time.Before(arg.DateFrom) {
+				continue
+			}
+		}
+		if arg.DateTo != (time.Time{}) {
+			if alog.Time.After(arg.DateTo) {
+				continue
+			}
+		}
 
 		logs = append(logs, alog)
 	}
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
@@ -11,7 +11,7 @@ SELECT
     users.avatar_url AS user_avatar_url
 FROM
 	audit_logs
-LEFT JOIN	
+LEFT JOIN
     users ON audit_logs.user_id = users.id
 WHERE
     -- Filter resource_type
@@ -110,6 +110,18 @@ WHERE
 		WHEN @email :: text != '' THEN
 			user_id = (SELECT id from users WHERE users.email = @email )
 		ELSE true
+	END
+	-- Filter by date_from
+	AND CASE
+		WHEN @date_from :: timestamp with time zone != '0001-01-01 00:00:00' 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
+			"time" <= @date_to
+		ELSE true
 	END;
 
 -- name: InsertAuditLog :one
