fix: endpoints

This commit is contained in:
charles-gauthereau
2026-05-27 22:02:22 +02:00
parent 56517226b6
commit c1b71e7772
18 changed files with 941 additions and 457 deletions
+286 -96
View File
@@ -10,128 +10,318 @@ import {Agent} from "@/db/schema/08_agent";
import {userAction} from "@/lib/safe-actions/actions";
import {zString} from "@/lib/zod";
import {withUpdatedAt} from "@/db/utils";
import {AgentSchema} from "@/features/agents/agents.schema";
import {slugify} from "@/utils/slugify";
//
// type DeleteAgentInput = {
// organizationId?: string;
// agentId: string;
// organizationIds?: string[];
// };
//
// export async function deleteAgentService(input: DeleteAgentInput) {
//
//
//
// }
//
//
// export const deleteAgentAction = userAction
// .schema(
// z.object({
// agentId: zString(),
// organizationId: zString().optional(),
// organizationIds: z.array(z.string()).optional()
// })
// )
// .action(async ({parsedInput}): Promise<ServerActionResult<Agent>> => {
// const {agentId, organizationId, organizationIds} = parsedInput;
//
// try {
// let projectIds: string[] = [];
//
// const uuid = uuidv4();
// if (organizationId) {
// await db
// .delete(drizzleDb.schemas.organizationAgent)
// .where(
// and(
// eq(drizzleDb.schemas.organizationAgent.organizationId, organizationId),
// eq(drizzleDb.schemas.organizationAgent.agentId, agentId)
// )
// );
//
// const organization = await db.query.organization.findFirst({
// where: eq(drizzleDb.schemas.organization.id, organizationId),
// with: {
// projects: true,
// }
// });
//
// projectIds = organization?.projects?.map(project => project.id) ?? [];
//
//
// } else if (organizationIds) {
//
// const organizationsToRemoveDetails = await db.query.organization.findMany({
// where: inArray(drizzleDb.schemas.organization.id, organizationIds),
// with: {
// projects: true
// }
// });
//
// projectIds = organizationsToRemoveDetails.flatMap(org =>
// org.projects.map(project => project.id)
// );
//
// }
//
//
// if (projectIds?.length > 0) {
// const databases = await db.query.database.findMany({
// where: (db, {inArray}) => inArray(db.projectId, projectIds),
// columns: {id: true}
// });
//
// const databaseIds = databases.map(d => d.id);
//
// await db
// .update(drizzleDb.schemas.database)
// .set(withUpdatedAt({
// backupPolicy: null,
// projectId: null
// }))
// .where(inArray(drizzleDb.schemas.database.projectId, projectIds))
// .execute();
//
// await db.delete(drizzleDb.schemas.retentionPolicy)
// .where(inArray(drizzleDb.schemas.retentionPolicy.databaseId, databaseIds))
// .execute();
//
// await db.delete(drizzleDb.schemas.alertPolicy)
// .where(inArray(drizzleDb.schemas.alertPolicy.databaseId, databaseIds))
// .execute();
//
// await db.delete(drizzleDb.schemas.storagePolicy)
// .where(inArray(drizzleDb.schemas.storagePolicy.databaseId, databaseIds))
// .execute();
// }
//
//
// const updatedAgent = await db
// .update(drizzleDb.schemas.agent)
// .set(withUpdatedAt({
// isArchived: true,
// slug: uuid,
// deletedAt: new Date()
// }))
// .where(eq(drizzleDb.schemas.agent.id, agentId))
// .returning();
//
//
// if (!updatedAgent[0]) {
// return {
// success: false,
// actionError: {
// message: "Agent not found or update failed",
// status: 404,
// messageParams: {agentId: agentId},
// },
// };
// }
//
// return {
// success: true,
// value: updatedAgent[0],
// actionSuccess: {
// message: "Agent has been successfully deleted.",
// messageParams: {projectId: agentId},
// },
// };
// } catch (error) {
// return {
// success: false,
// actionError: {
// message: "Failed to delete agent.",
// status: 500,
// cause: error instanceof Error ? error.message : "Unknown error",
// messageParams: {agentId: agentId},
// },
// };
// }
// });
type DeleteAgentInput = {
organizationId?: string;
agentId: string;
organizationIds?: string[];
};
class AgentNotFoundError extends Error {
constructor(agentId: string) {
super(`Agent not found or update failed: ${agentId}`);
this.name = "AgentNotFoundError";
}
}
export async function deleteAgentService(input: DeleteAgentInput): Promise<Agent> {
const {agentId, organizationId, organizationIds} = input;
let projectIds: string[] = [];
const uuid = uuidv4();
if (organizationId) {
await db
.delete(drizzleDb.schemas.organizationAgent)
.where(
and(
eq(drizzleDb.schemas.organizationAgent.organizationId, organizationId),
eq(drizzleDb.schemas.organizationAgent.agentId, agentId)
)
);
const organization = await db.query.organization.findFirst({
where: eq(drizzleDb.schemas.organization.id, organizationId),
with: {
projects: true,
},
});
projectIds = organization?.projects?.map((project) => project.id) ?? [];
} else if (organizationIds?.length) {
const organizationsToRemoveDetails = await db.query.organization.findMany({
where: inArray(drizzleDb.schemas.organization.id, organizationIds),
with: {
projects: true,
},
});
projectIds = organizationsToRemoveDetails.flatMap((org) =>
org.projects.map((project) => project.id)
);
}
if (projectIds.length > 0) {
const databases = await db.query.database.findMany({
where: (database, {inArray}) => inArray(database.projectId, projectIds),
columns: {
id: true,
},
});
const databaseIds = databases.map((database) => database.id);
await db
.update(drizzleDb.schemas.database)
.set(
withUpdatedAt({
backupPolicy: null,
projectId: null,
})
)
.where(inArray(drizzleDb.schemas.database.projectId, projectIds))
.execute();
if (databaseIds.length > 0) {
await db
.delete(drizzleDb.schemas.retentionPolicy)
.where(
inArray(
drizzleDb.schemas.retentionPolicy.databaseId,
databaseIds
)
)
.execute();
await db
.delete(drizzleDb.schemas.alertPolicy)
.where(
inArray(
drizzleDb.schemas.alertPolicy.databaseId,
databaseIds
)
)
.execute();
await db
.delete(drizzleDb.schemas.storagePolicy)
.where(
inArray(
drizzleDb.schemas.storagePolicy.databaseId,
databaseIds
)
)
.execute();
}
}
const [updatedAgent] = await db
.update(drizzleDb.schemas.agent)
.set(
withUpdatedAt({
isArchived: true,
slug: uuid,
deletedAt: new Date(),
})
)
.where(eq(drizzleDb.schemas.agent.id, agentId))
.returning();
if (!updatedAgent) {
throw new AgentNotFoundError(agentId);
}
return updatedAgent;
}
export const deleteAgentAction = userAction
.schema(
z.object({
agentId: zString(),
organizationId: zString().optional(),
organizationIds: z.array(z.string()).optional()
organizationIds: z.array(zString()).optional(),
})
)
.action(async ({parsedInput}): Promise<ServerActionResult<Agent>> => {
const {agentId, organizationId, organizationIds} = parsedInput;
try {
let projectIds: string[] = [];
const deletedAgent = await deleteAgentService(parsedInput);
const uuid = uuidv4();
if (organizationId) {
await db
.delete(drizzleDb.schemas.organizationAgent)
.where(
and(
eq(drizzleDb.schemas.organizationAgent.organizationId, organizationId),
eq(drizzleDb.schemas.organizationAgent.agentId, agentId)
)
);
const organization = await db.query.organization.findFirst({
where: eq(drizzleDb.schemas.organization.id, organizationId),
with: {
projects: true,
}
});
projectIds = organization?.projects?.map(project => project.id) ?? [];
} else if (organizationIds) {
const organizationsToRemoveDetails = await db.query.organization.findMany({
where: inArray(drizzleDb.schemas.organization.id, organizationIds),
with: {
projects: true
}
});
projectIds = organizationsToRemoveDetails.flatMap(org =>
org.projects.map(project => project.id)
);
}
if (projectIds?.length > 0) {
const databases = await db.query.database.findMany({
where: (db, {inArray}) => inArray(db.projectId, projectIds),
columns: {id: true}
});
const databaseIds = databases.map(d => d.id);
await db
.update(drizzleDb.schemas.database)
.set(withUpdatedAt({
backupPolicy: null,
projectId: null
}))
.where(inArray(drizzleDb.schemas.database.projectId, projectIds))
.execute();
await db.delete(drizzleDb.schemas.retentionPolicy)
.where(inArray(drizzleDb.schemas.retentionPolicy.databaseId, databaseIds))
.execute();
await db.delete(drizzleDb.schemas.alertPolicy)
.where(inArray(drizzleDb.schemas.alertPolicy.databaseId, databaseIds))
.execute();
await db.delete(drizzleDb.schemas.storagePolicy)
.where(inArray(drizzleDb.schemas.storagePolicy.databaseId, databaseIds))
.execute();
}
const updatedAgent = await db
.update(drizzleDb.schemas.agent)
.set(withUpdatedAt({
isArchived: true,
slug: uuid,
deletedAt: new Date()
}))
.where(eq(drizzleDb.schemas.agent.id, agentId))
.returning();
if (!updatedAgent[0]) {
return {
success: true,
value: deletedAgent,
actionSuccess: {
message: "Agent has been successfully deleted.",
messageParams: {
agentId: parsedInput.agentId,
},
},
};
} catch (error) {
if (error instanceof AgentNotFoundError) {
return {
success: false,
actionError: {
message: "Agent not found or update failed",
status: 404,
messageParams: {agentId: agentId},
messageParams: {
agentId: parsedInput.agentId,
},
},
};
}
return {
success: true,
value: updatedAgent[0],
actionSuccess: {
message: "Agent has been successfully deleted.",
messageParams: {projectId: agentId},
},
};
} catch (error) {
return {
success: false,
actionError: {
message: "Failed to delete agent.",
status: 500,
cause: error instanceof Error ? error.message : "Unknown error",
messageParams: {agentId: agentId},
messageParams: {
agentId: parsedInput.agentId,
},
},
};
}
});
});
-13
View File
@@ -56,20 +56,7 @@ export const createAgentAction = userAction.schema(
data: AgentSchema,
})
).action(async ({parsedInput}) => {
// const slug = slugify(parsedInput.data.name);
// await verifySlugUniqueness(slug);
//
// const [createdAgent] = await db.insert(drizzleDb.schemas.agent).values({...parsedInput.data, slug: slug, organizationId: parsedInput.organizationId}).returning();
//
// if (createdAgent && parsedInput.organizationId){
// await db.insert(drizzleDb.schemas.organizationAgent).values({
// organizationId: parsedInput.organizationId,
// agentId: createdAgent.id,
// });
// }
const createdAgent = await createAgentService(parsedInput);
return {
data: createdAgent,
};