add created at to resources

ctrlplanedev · Nov 17, 2024 · 5314e67 · 5314e67
1 parent d5002db
commit 5314e67
Show file tree

Hide file tree

Showing 6 changed files with 4,704 additions and 7 deletions.
diff --git a/packages/api/src/root.ts b/packages/api/src/root.ts
@@ -4,10 +4,10 @@ import { environmentRouter } from "./router/environment";
 import { githubRouter } from "./router/github";
 import { jobRouter } from "./router/job";
 import { releaseRouter } from "./router/release";
+import { resourceRouter } from "./router/resources";
 import { runbookRouter } from "./router/runbook";
 import { runtimeRouter } from "./router/runtime";
 import { systemRouter } from "./router/system";
-import { resourceRouter } from "./router/target";
 import { profileRouter, userRouter } from "./router/user";
 import { variableSetRouter } from "./router/variable-set";
 import { workspaceRouter } from "./router/workspace";

diff --git a/packages/api/src/router/target.ts → packages/api/src/router/resources.ts b/packages/api/src/router/target.ts → packages/api/src/router/resources.ts
@@ -7,6 +7,7 @@ import {
   and,
   asc,
   count,
+  desc,
   eq,
   inArray,
   not,
@@ -300,8 +301,7 @@ const resourceQuery = (db: Tx, checks: Array<SQL<unknown>>) =>
       schema.resource.id,
       schema.resourceProvider.id,
       schema.workspace.id,
-    )
-    .orderBy(asc(schema.resource.kind), asc(schema.resource.name));
+    );
 
 export const resourceRouter = createTRPCRouter({
   metadataGroup: resourceMetadataGroupRouter,
@@ -346,6 +346,14 @@ export const resourceRouter = createTRPCRouter({
           filter: resourceCondition.optional(),
           limit: z.number().int().nonnegative().max(1000).default(200),
           offset: z.number().int().nonnegative().default(0),
+          orderBy: z
+            .array(
+              z.object({
+                property: z.enum(["kind", "name", "createdAt"]),
+                direction: z.enum(["asc", "desc"]).optional().default("asc"),
+              }),
+            )
+            .optional(),
         }),
       )
       .query(({ ctx, input }) => {
@@ -359,9 +367,28 @@ export const resourceRouter = createTRPCRouter({
         );
         const checks = [workspaceIdCheck, resourceConditions].filter(isPresent);
 
+        const properties = {
+          kind: schema.resource.kind,
+          name: schema.resource.name,
+          createdAt: schema.resource.createdAt,
+        };
+
+        const orderBy: SQL[] = input.orderBy
+          ? []
+          : [asc(schema.resource.kind), asc(schema.resource.name)];
+
+        if (input.orderBy)
+          for (const order of input.orderBy) {
+            const column = properties[order.property];
+            orderBy.push(
+              order.direction === "asc" ? asc(column) : desc(column),
+            );
+          }
+
         const items = resourceQuery(ctx.db, checks)
           .limit(input.limit)
           .offset(input.offset)
+          .orderBy(...orderBy)
           .then((t) =>
             t.map((a) => ({
               ...a.resource,
@@ -371,9 +398,7 @@ export const resourceRouter = createTRPCRouter({
           );
 
         const total = ctx.db
-          .select({
-            count: sql`COUNT(*)`.mapWith(Number),
-          })
+          .select({ count: sql`COUNT(*)`.mapWith(Number) })
           .from(schema.resource)
           .where(and(...checks))
           .then(takeFirst)

diff --git a/packages/db/drizzle/0038_fearless_stark_industries.sql b/packages/db/drizzle/0038_fearless_stark_industries.sql
@@ -0,0 +1 @@
+ALTER TABLE "resource" ADD COLUMN "created_at" timestamp with time zone DEFAULT now() NOT NULL;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE "resource" ADD COLUMN "created_at" timestamp with time zone DEFAULT now() NOT NULL;