init refactor (#225)

Co-authored-by: Aditya Choudhari <[email protected]>

apps/pty-proxy/src/controller/agent-socket.ts

@@ -125,7 +125,7 @@ export class AgentSocket {
       "name" | "version" | "kind" | "identifier" | "workspaceId"
     >,
   ) {
-    const [res] = await upsertResources(db, [
+    const { updated } = await upsertResources(db, [
       {
         ...resource,
         name: this.name,
@@ -136,6 +136,7 @@ export class AgentSocket {
         updatedAt: new Date(),
       },
     ]);
+    const res = updated.at(0);
     if (res == null) throw new Error("Failed to create resource");
     this.resource = res;
     agents.set(res.id, { lastSync: new Date(), agent: this });

apps/webservice/src/app/api/v1/resources/[resourceId]/route.ts

@@ -93,9 +93,10 @@ export const PATCH = request()
         { status: 404 },
       );
 
-    const t = await upsertResources(db, [_.merge(resource, body)]);
-
-    return NextResponse.json(t[0]);
+    const { updated } = await upsertResources(db, [_.merge(resource, body)]);
+    const res = updated.at(0);
+    if (res == null) throw new Error("Failed to update resource");
+    return NextResponse.json(res);
   });
 
 export const DELETE = request()

apps/webservice/src/app/api/v1/resources/route.ts

@@ -63,6 +63,6 @@ export const POST = request()
         })),
       );
 
-      return NextResponse.json({ count: resources.length });
+      return NextResponse.json({ count: resources.all.length });
     },
   );

packages/api/src/router/environment.ts

@@ -28,7 +28,7 @@ import {
   updateEnvironment,
 } from "@ctrlplane/db/schema";
 import {
-  dispatchJobsForNewResources,
+  dispatchJobsForAddedResources,
   getEventsForEnvironmentDeleted,
   handleEvent,
 } from "@ctrlplane/job-dispatch";
@@ -324,7 +324,7 @@ export const environmentRouter = createTRPCRouter({
           }
 
           if (newResources.length > 0) {
-            await dispatchJobsForNewResources(
+            await dispatchJobsForAddedResources(
               ctx.db,
               newResources.map((r) => r.id),
               input.id,

packages/job-dispatch/src/events/triggers/resource-deleted.ts

@@ -10,8 +10,6 @@ import { ResourceFilterType } from "@ctrlplane/validators/resources";
 
 /**
  * Get events for a resource that has been deleted.
- * NOTE: Because we may need to do inner joins on resource metadata for the filter,
- * this actually needs to be called before the resource is actually deleted.
  * @param resource
  */
 export const getEventsForResourceDeleted = async (

packages/job-dispatch/src/index.ts

@@ -6,8 +6,6 @@ export * from "./policy-checker.js";
 export * from "./policy-create.js";
 export * from "./release-sequencing.js";
 export * from "./gradual-rollout.js";
-export * from "./new-resource.js";
-export * from "./resource.js";
 export * from "./lock-checker.js";
 export * from "./queue.js";
 
@@ -24,3 +22,4 @@ export * from "./policies/release-window.js";
 export * from "./environment-creation.js";
 export * from "./pending-job-checker.js";
 export * from "./events/index.js";
+export * from "./resource/index.js";