added validation error

Kira-Pilot · Kira-Pilot · commit 22b53ef3729f · 2022-10-31T18:03:58.000Z
diff --git a/coderd/audit.go b/coderd/audit.go
@@ -34,7 +34,8 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {
 
 	queryStr := r.URL.Query().Get("q")
 	filter, errs := auditSearchQuery(queryStr)
-	fmt.Println("BLOOP FILTER", filter)
+	fmt.Println("FILTER", filter.DateFrom)
+	fmt.Println("FILTER", filter.DateTo)
 
 	if len(errs) > 0 {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
@@ -52,7 +53,8 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {
 		Action:       filter.Action,
 		Username:     filter.Username,
 		Email:        filter.Email,
-		TimeFrom:     filter.TimeFrom,
+		DateFrom:     filter.DateFrom,
+		DateTo:       filter.DateTo,
 	})
 	if err != nil {
 		httpapi.InternalServerError(rw, err)
@@ -287,24 +289,34 @@ func auditSearchQuery(query string) (database.GetAuditLogsOffsetParams, []coders
 	const layout = "2006-01-02"
 
 	var (
-		timeFromString    = parser.String(searchParams, "", "time_from")
-		timeToString      = parser.String(searchParams, "", "time_to")
-		parsedTimeFrom, _ = time.Parse(layout, timeFromString)
-		parsedTimeTo, _   = time.Parse(layout, timeToString)
-		filter            = database.GetAuditLogsOffsetParams{
+		dateFromString    = parser.String(searchParams, "", "date_from")
+		dateToString      = parser.String(searchParams, "", "date_to")
+		parsedDateFrom, _ = time.Parse(layout, dateFromString)
+		parsedDateTo, _   = time.Parse(layout, dateToString)
+	)
+
+	if dateToString != "" {
+		parsedDateTo = parsedDateTo.Add(23*time.Hour + 59*time.Minute + 59*time.Second) // parsedDateTo goes to 23:59
+	}
+
+	if dateToString != "" && parsedDateTo.Before(parsedDateFrom) {
+		return database.GetAuditLogsOffsetParams{}, []codersdk.ValidationError{
+			{Field: "q", Detail: fmt.Sprintf("DateTo value %q cannot be before than DateFrom", parsedDateTo)},
+		}
+	}
+
+	var (
+		filter = database.GetAuditLogsOffsetParams{
 			ResourceType: resourceTypeFromString(parser.String(searchParams, "", "resource_type")),
 			ResourceID:   parser.UUID(searchParams, uuid.Nil, "resource_id"),
 			Action:       actionFromString(parser.String(searchParams, "", "action")),
 			Username:     parser.String(searchParams, "", "username"),
 			Email:        parser.String(searchParams, "", "email"),
-			TimeFrom:     parsedTimeFrom,
-			TimeTo:       parsedTimeTo,
+			DateFrom:     parsedDateFrom,
+			DateTo:       parsedDateTo,
 		}
 	)
 
-	fmt.Println("FROM!", parsedTimeFrom)
-	fmt.Println("TO!", parsedTimeTo)
-
 	return filter, parser.Errors
 }
 
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
@@ -50,16 +50,16 @@ WHERE
 			users.email = @email
 		ELSE true
 	END
-	-- Filter by time_from
+	-- Filter by date_from
 	AND CASE
-		WHEN @time_from :: timestamp with time zone != '0001-01-01 00:00:00' THEN
-			"time" >= @time_from
+		WHEN @date_from :: timestamp with time zone != '0001-01-01 00:00:00' THEN
+			"time" >= @date_from
 		ELSE true
 	END
-	-- Filter by time_to
+	-- Filter by date_to
 	AND CASE
-		WHEN @time_to :: timestamp with time zone != '0001-01-01 00:00:00' THEN
-			"time" <= @time_to
+		WHEN @date_to :: timestamp with time zone != '0001-01-01 00:00:00' THEN
+			"time" <= @date_to
 		ELSE true
 	END
 ORDER BY
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -563,10 +563,8 @@ export const getAuditLogs = async (
     searchParams.set("offset", options.offset.toString())
   }
   if (options.q) {
-    console.log('q', options.q)
     searchParams.set("q", options.q)
   }
-  console.log('searchParams', searchParams)
 
   const response = await axios.get(`/api/v2/audit?${searchParams.toString()}`)
   return response.data

Original file line number	Diff line number	Diff line change
`@@ -563,10 +563,8 @@ export const getAuditLogs = async (`
`563`	`563`	`searchParams.set("offset", options.offset.toString())`
`564`	`564`	`}`
`565`	`565`	`if (options.q) {`
`566`		`- console.log('q', options.q)`
`567`	`566`	`searchParams.set("q", options.q)`
`568`	`567`	`}`
`569`		`- console.log('searchParams', searchParams)`
`570`	`568`
`571`	`569`	const response = await axios.get(`/api/v2/audit?${searchParams.toString()}`)
`572`	`570`	`return response.data`