Refactor activity log facet queries by scope

integration_tests/activitylog_filter.lua

@@ -102,6 +102,12 @@ Test.gql("Query activitylog list", function(t)
 		        resourceType
 		        resourceName
 		      }
+		      facets {
+		        resourceTypes {
+		          resourceType
+		          count
+		        }
+		      }
 		    }
 		  }
 		}
@@ -129,6 +135,12 @@ Test.gql("Query activitylog list", function(t)
 							resourceName = "app",
 						},
 					},
+					facets = {
+						resourceTypes = {
+							{ resourceType = "APP",    count = 1 },
+							{ resourceType = "VALKEY", count = 1 },
+						},
+					},
 				},
 			},
 		},

integration_tests/reconcilers.lua

@@ -283,6 +283,12 @@ Test.gql("list reconcilers after modifications", function(t)
 								}
 							}
 						}
+						facets {
+							resourceTypes {
+								resourceType
+								count
+							}
+						}
 					}
 					name
 					enabled
@@ -315,6 +321,11 @@ Test.gql("list reconcilers after modifications", function(t)
 									},
 								},
 							},
+							facets = {
+								resourceTypes = {
+									{ resourceType = "RECONCILER", count = 3 },
+								},
+							},
 						},
 						name = "reconciler-1",
 						enabled = true,
@@ -324,6 +335,11 @@ Test.gql("list reconcilers after modifications", function(t)
 							nodes = {
 								{ message = "Disable reconciler" },
 							},
+							facets = {
+								resourceTypes = {
+									{ resourceType = "RECONCILER", count = 1 },
+								},
+							},
 						},
 						name = "reconciler-2",
 						enabled = false,

integration_tests/serviceaccount_activitylog.lua

@@ -126,6 +126,12 @@ Test.gql("Team-scoped account only sees its own entries", function(t)
 					pageInfo {
 						totalCount
 					}
+					facets {
+						resourceTypes {
+							resourceType
+							count
+						}
+					}
 				}
 			}
 		}
@@ -150,6 +156,14 @@ Test.gql("Team-scoped account only sees its own entries", function(t)
 					pageInfo = {
 						totalCount = 2,
 					},
+					facets = {
+						resourceTypes = {
+							{
+								resourceType = "SERVICE_ACCOUNT",
+								count = 2,
+							},
+						},
+					},
 				},
 			},
 		},

integration_tests/tenant_activitylog.lua

@@ -51,6 +51,85 @@ Test.gql("Create repository event for team two", function(t)
 	}
 end)
 
+Helper.SQLExec([[
+	INSERT INTO activity_log_entries (actor, action, resource_type, resource_name, team_slug, environment, data)
+	VALUES ('deployer', 'DEPLOYMENT', 'APP', 'deployed-app', 'slug-1', 'dev', '{}')
+]])
+
+Test.gql("Tenant activity log includes deployments", function(t)
+	t.addHeader("x-user-email", admin:email())
+
+	t.query [[
+		query {
+			activityLog(first: 10, filter: { activityTypes: [DEPLOYMENT] }) {
+				nodes {
+					resourceName
+				}
+				pageInfo {
+					totalCount
+				}
+				facets {
+					activityTypes {
+						activityType
+						count
+					}
+					resourceTypes {
+						resourceType
+						count
+					}
+					environments {
+						value
+						count
+					}
+				}
+			}
+		}
+	]]
+
+	t.check {
+		data = {
+			activityLog = {
+				nodes = {
+					{
+						resourceName = "deployed-app",
+					},
+				},
+				pageInfo = {
+					totalCount = 1,
+				},
+				facets = {
+					activityTypes = {
+						{
+							activityType = "DEPLOYMENT",
+							count = 1,
+						},
+						{
+							activityType = "REPOSITORY_ADDED",
+							count = 0,
+						},
+					},
+					resourceTypes = {
+						{
+							resourceType = "APP",
+							count = 1,
+						},
+						{
+							resourceType = "REPOSITORY",
+							count = 0,
+						},
+					},
+					environments = {
+						{
+							value = "dev",
+							count = 1,
+						},
+					},
+				},
+			},
+		},
+	}
+end)
+
 Test.gql("Tenant activity log returns facets and pagination metadata", function(t)
 	t.addHeader("x-user-email", admin:email())
 
@@ -102,18 +181,31 @@ Test.gql("Tenant activity log returns facets and pagination metadata", function(
 				},
 				facets = {
 					activityTypes = {
+						{
+							activityType = "DEPLOYMENT",
+							count = 0,
+						},
 						{
 							activityType = "REPOSITORY_ADDED",
 							count = 2,
 						},
 					},
 					resourceTypes = {
+						{
+							resourceType = "APP",
+							count = 0,
+						},
 						{
 							resourceType = "REPOSITORY",
 							count = 2,
 						},
 					},
-					environments = {},
+					environments = {
+						{
+							value = "dev",
+							count = 0,
+						},
+					},
 				},
 			},
 		},

integration_tests/valkey_crud.lua

@@ -497,6 +497,62 @@ Test.gql("List valkeys for team", function(t)
 	}
 end)
 
+Test.gql("List activity log facets for valkey", function(t)
+	t.addHeader("x-user-email", user:email())
+
+	t.query [[
+		{
+		  team(slug: "someteamname") {
+		    environment(name: "dev") {
+		      valkey(name: "foobar") {
+		        activityLog {
+		          facets {
+		            activityTypes {
+		              activityType
+		              count
+		            }
+		            resourceTypes {
+		              resourceType
+		              count
+		            }
+		            environments {
+		              value
+		              count
+		            }
+		          }
+		        }
+		      }
+		    }
+		  }
+		}
+	]]
+
+	t.check {
+		data = {
+			team = {
+				environment = {
+					valkey = {
+						activityLog = {
+							facets = {
+								activityTypes = {
+									{ activityType = "VALKEY_CREATED", count = 1 },
+									{ activityType = "VALKEY_UPDATED", count = 1 },
+								},
+								resourceTypes = {
+									{ resourceType = "VALKEY", count = 2 },
+								},
+								environments = {
+									{ value = "dev", count = 2 },
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+end)
+
 Test.gql("Update Valkey with tier and memory equivalent to hobbyist plan", function(t)
 	t.addHeader("x-user-email", user:email())
 	t.query [[