sql query

coder · Kira-Pilot · Nov 3, 2022 · Oct 28, 2022 · Oct 28, 2022 · Oct 31, 2022
commit 1f0cb46fa43ddf50cbf4d0a869f5ae5449cc0a87
diff --git a/coderd/audit.go b/coderd/audit.go
@@ -34,6 +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)
+
 	if len(errs) > 0 {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 			Message:     "Invalid audit search query.",
@@ -50,6 +52,7 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {
 		Action:       filter.Action,
 		Username:     filter.Username,
 		Email:        filter.Email,
+		TimeFrom:     filter.TimeFrom,
 	})
 	if err != nil {
 		httpapi.InternalServerError(rw, err)
@@ -257,12 +260,17 @@ func auditSearchQuery(query string) (database.GetAuditLogsOffsetParams, []coders
 		return database.GetAuditLogsOffsetParams{}, nil
 	}
 	query = strings.ToLower(query)
+	fmt.Println("KIRA query", query)
 	// Because we do this in 2 passes, we want to maintain quotes on the first
 	// pass.Further splitting occurs on the second pass and quotes will be
 	// dropped.
 	elements := splitQueryParameterByDelimiter(query, ' ', true)
+	fmt.Println("MARGE elements", elements)
+
 	for _, element := range elements {
 		parts := splitQueryParameterByDelimiter(element, ':', false)
+		fmt.Println("MARGOT parts", parts)
+
 		switch len(parts) {
 		case 1:
 			// No key:value pair.
@@ -285,6 +293,8 @@ func auditSearchQuery(query string) (database.GetAuditLogsOffsetParams, []coders
 		Action:       actionFromString(parser.String(searchParams, "", "action")),
 		Username:     parser.String(searchParams, "", "username"),
 		Email:        parser.String(searchParams, "", "email"),
+		TimeFrom: time.Date(
+			2022, 10, 27, 00, 00, 00, 000000000, time.UTC),
 	}
 
 	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
@@ -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
@@ -50,6 +50,12 @@ WHERE
 			users.email = @email
 		ELSE true
 	END
+	-- Filter by time_from
+	AND CASE
+		WHEN @time_from :: timestamp with time zone != '0001-01-01 00:00:00' THEN
+			"time" > @time_from
+		ELSE true
+	END
 ORDER BY
     "time" DESC
 LIMIT

diff --git a/enterprise/audit/table.go b/enterprise/audit/table.go
@@ -109,13 +109,14 @@ var AuditableResources = auditMap(map[any]map[string]Action{
 		"organization_id": ActionIgnore, // Never changes.
 		"avatar_url":      ActionTrack,
 	},
-	// We don't show any diff for the WorkspaceBuild resource
+	// We don't show any diff for the WorkspaceBuild resource,
+	// save for the template_version_id
 	&database.WorkspaceBuild{}: {
 		"id":                  ActionIgnore,
 		"created_at":          ActionIgnore,
 		"updated_at":          ActionIgnore,
 		"workspace_id":        ActionIgnore,
-		"template_version_id": ActionIgnore,
+		"template_version_id": ActionTrack,
 		"build_number":        ActionIgnore,
 		"transition":          ActionIgnore,
 		"initiator_id":        ActionIgnore,

diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -563,8 +563,10 @@ 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