⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.
TypeScript honoissue-managementissue-trackerjira-alternativekanbanlinear-alternativemcpproject-managementreactself-hostedtypescript
refactor: updating types for controllers
Andrej84db860f18e3
diff --git a/apps/api/src/project/controllers/create-project.ts b/apps/api/src/project/controllers/create-project.tsindex b6f711b4e..066e47783 100644--- a/apps/api/src/project/controllers/create-project.ts+++ b/apps/api/src/project/controllers/create-project.ts@@ -1,13 +1,20 @@import db from "../../database";import { projectTable } from "../../database/schema";-import type { CreateProjectPayload } from "../db/queries";async function createProject(- body: Pick<CreateProjectPayload, "name" | "slug" | "workspaceId" | "icon">,+ workspaceId: string,+ name: string,+ icon: string,+ slug: string,) {const [createdProject] = await db.insert(projectTable)- .values(body)+ .values({+ workspaceId,+ name,+ icon,+ slug,+ }).returning();return createdProject;diff --git a/apps/api/src/project/controllers/delete-project.ts b/apps/api/src/project/controllers/delete-project.tsindex 4d56af058..3616950f8 100644--- a/apps/api/src/project/controllers/delete-project.ts+++ b/apps/api/src/project/controllers/delete-project.ts@@ -1,12 +1,8 @@import { and, eq } from "drizzle-orm";import db from "../../database";import { projectTable } from "../../database/schema";-import type { DeleteProjectPayload } from "../db/queries";-async function deleteProject({- id,- workspaceId,-}: Pick<DeleteProjectPayload, "id" | "workspaceId">) {+async function deleteProject(id: string, workspaceId: string) {const [existingProject] = await db.select().from(projectTable)diff --git a/apps/api/src/project/controllers/get-project.ts b/apps/api/src/project/controllers/get-project.tsindex 6db83de46..4bba70b50 100644--- a/apps/api/src/project/controllers/get-project.ts+++ b/apps/api/src/project/controllers/get-project.ts@@ -1,12 +1,8 @@import { and, eq } from "drizzle-orm";import db from "../../database";import { projectTable, workspaceTable } from "../../database/schema";-import type { GetProjectPayload } from "../db/queries";-async function getProject({- id,- workspaceId,-}: Pick<GetProjectPayload, "id" | "workspaceId">) {+async function getProject(id: string, workspaceId: string) {const [project] = await db.select({id: projectTable.id,diff --git a/apps/api/src/project/controllers/get-projects.ts b/apps/api/src/project/controllers/get-projects.tsindex cfe187f3b..5c951290a 100644--- a/apps/api/src/project/controllers/get-projects.ts+++ b/apps/api/src/project/controllers/get-projects.ts@@ -1,11 +1,8 @@import { and, eq } from "drizzle-orm";import db from "../../database";import { projectTable, workspaceTable } from "../../database/schema";-import type { GetProjectsPayload } from "../db/queries";-async function getProjects({- workspaceId,-}: Pick<GetProjectsPayload, "workspaceId">) {+async function getProjects(workspaceId: string) {const projects = await db.select({id: projectTable.id,diff --git a/apps/api/src/project/controllers/update-project.ts b/apps/api/src/project/controllers/update-project.tsindex 0a115582d..42798ddd9 100644--- a/apps/api/src/project/controllers/update-project.ts+++ b/apps/api/src/project/controllers/update-project.ts@@ -1,14 +1,13 @@import { and, eq } from "drizzle-orm";import db from "../../database";import { projectTable } from "../../database/schema";-import type { UpdateProjectPayload } from "../db/queries";-async function updateProject({- id,- workspaceId,- name,- description,-}: UpdateProjectPayload) {+async function updateProject(+ id: string,+ workspaceId: string,+ name: string,+ description: string,+) {const [existingProject] = await db.select().from(projectTable)diff --git a/apps/api/src/project/db/queries.ts b/apps/api/src/project/db/queries.tsdeleted file mode 100644index 3dfae6b3d..000000000--- a/apps/api/src/project/db/queries.ts+++ /dev/null@@ -1,39 +0,0 @@-import {- createInsertSchema,- createSelectSchema,- createUpdateSchema,-} from "drizzle-typebox";-import { type Static, t } from "elysia";-import { projectTable } from "../../database/schema";--export const getProjectSchema = createSelectSchema(projectTable, {- workspaceId: t.String(),- id: t.String(),-});--export const getProjectsSchema = createSelectSchema(projectTable, {- workspaceId: t.String(),-});--export const createProjectSchema = createInsertSchema(projectTable, {- name: t.String(),- workspaceId: t.String(),- description: t.String(),-});--export const updateProjectSchema = createUpdateSchema(projectTable, {- id: t.String(),- name: t.String(),- description: t.String(),- workspaceId: t.String(),-});--export const deleteProjectSchema = createInsertSchema(projectTable, {- id: t.String(),-});--export type GetProjectPayload = Static<typeof getProjectSchema>;-export type GetProjectsPayload = Static<typeof getProjectsSchema>;-export type CreateProjectPayload = Static<typeof createProjectSchema>;-export type UpdateProjectPayload = Static<typeof updateProjectSchema>;-export type DeleteProjectPayload = Static<typeof deleteProjectSchema>;diff --git a/apps/api/src/project/index.ts b/apps/api/src/project/index.tsindex 9a4808dd4..0e3fea14a 100644--- a/apps/api/src/project/index.ts+++ b/apps/api/src/project/index.ts@@ -4,13 +4,12 @@ import deleteProject from "./controllers/delete-project";import getProject from "./controllers/get-project";import getProjects from "./controllers/get-projects";import updateProject from "./controllers/update-project";-import { updateProjectSchema } from "./db/queries";const project = new Elysia({ prefix: "/project" }).post("/create",- async ({ body }) => {- const createdProject = await createProject(body);+ async ({ body: { workspaceId, icon, slug, name } }) => {+ const createdProject = await createProject(workspaceId, name, icon, slug);return createdProject;},@@ -24,37 +23,41 @@ const project = new Elysia({ prefix: "/project" })},).get("/list/:workspaceId", async ({ params: { workspaceId } }) => {- const projects = await getProjects({ workspaceId });+ const projects = await getProjects(workspaceId);return projects;}).get("/:id", async ({ params: { id }, query: { workspaceId } }) => {if (!workspaceId) throw new Error("Workspace ID is required");- const project = await getProject({ id, workspaceId });+ const project = await getProject(id, workspaceId);return project;}).put("/:id",async ({ params: { id }, body: { workspaceId, name, description } }) => {- const updatedProject = await updateProject({+ const updatedProject = await updateProject(id,workspaceId,name,description,- });+ );return updatedProject;},{- body: updateProjectSchema,+ body: t.Object({+ workspaceId: t.String(),+ name: t.String(),+ description: t.String(),+ }),},).delete("/:id", async ({ params: { id }, query: { workspaceId } }) => {if (!workspaceId) throw new Error("Workspace ID is required");- const deletedProject = await deleteProject({ id, workspaceId });+ const deletedProject = await deleteProject(id, workspaceId);return deletedProject;});diff --git a/apps/api/src/user/controllers/sign-in.ts b/apps/api/src/user/controllers/sign-in.tsindex 465b87902..1bd7bd75c 100644--- a/apps/api/src/user/controllers/sign-in.ts+++ b/apps/api/src/user/controllers/sign-in.ts@@ -1,14 +1,7 @@-import type { Static } from "elysia";import db from "../../database";-import type { signInUserSchema } from "../db/queries";import { UserErrors } from "../errors";-type SignInArgs = Static<typeof signInUserSchema>;--async function signIn({- email,- password,-}: Pick<SignInArgs, "email" | "password">) {+async function signIn(email: string, password: string) {const user = await db.query.userTable.findFirst({where: (users, { eq }) => eq(users.email, email),});diff --git a/apps/api/src/user/controllers/sign-up.ts b/apps/api/src/user/controllers/sign-up.tsindex ea6518c9f..d7fe1133e 100644--- a/apps/api/src/user/controllers/sign-up.ts+++ b/apps/api/src/user/controllers/sign-up.ts@@ -1,13 +1,9 @@-import type { Static } from "elysia";import db from "../../database";import { userTable } from "../../database/schema";import { publishEvent } from "../../events";-import type { signUpUserSchema } from "../db/queries";import { UserErrors } from "../errors";-type SignUpArgs = Static<typeof signUpUserSchema>;--async function signUp({ email, name, password }: SignUpArgs) {+async function signUp(email: string, password: string, name: string) {const isEmailTaken = Boolean(await db.query.userTable.findFirst({where: (users, { eq }) => eq(users.email, email),diff --git a/apps/api/src/user/db/queries.ts b/apps/api/src/user/db/queries.tsdeleted file mode 100644index 8610621ae..000000000--- a/apps/api/src/user/db/queries.ts+++ /dev/null@@ -1,14 +0,0 @@-import { createInsertSchema, createSelectSchema } from "drizzle-typebox";-import { t } from "elysia";-import { userTable } from "../../database/schema";--export const signUpUserSchema = createInsertSchema(userTable, {- email: t.String({ format: "email" }),- password: t.String(),- name: t.String(),-});--export const signInUserSchema = createSelectSchema(userTable, {- email: t.String({ format: "email" }),- password: t.String(),-});diff --git a/apps/api/src/user/index.ts b/apps/api/src/user/index.tsindex e3a8c80eb..ff029352d 100644--- a/apps/api/src/user/index.ts+++ b/apps/api/src/user/index.ts@@ -4,7 +4,6 @@ import createSession from "./controllers/create-session";import invalidateSession from "./controllers/invalidate-session";import signIn from "./controllers/sign-in";import signUp from "./controllers/sign-up";-import { signInUserSchema, signUpUserSchema } from "./db/queries";import { UserErrors } from "./errors";import generateSessionToken from "./utils/generate-session-token";@@ -17,8 +16,8 @@ const user = new Elysia({ prefix: "/user" })).post("/sign-in",- async ({ body, set }) => {- const user = await signIn(body);+ async ({ body: { email, password }, set }) => {+ const user = await signIn(email, password);const token = generateSessionToken();const session = await createSession(token, user.id);@@ -36,13 +35,16 @@ const user = new Elysia({ prefix: "/user" })return user;},{- body: t.Omit(signInUserSchema, ["id", "name", "createdAt"]),+ body: t.Object({+ email: t.String(),+ password: t.String(),+ }),},).post("/sign-up",- async ({ body, set }) => {- const user = await signUp(body);+ async ({ body: { email, password, name }, set }) => {+ const user = await signUp(email, password, name);if (!user) throw new Error(UserErrors.FailedToCreateAnAccount);@@ -62,7 +64,11 @@ const user = new Elysia({ prefix: "/user" })return user;},{- body: signUpUserSchema,+ body: t.Object({+ email: t.String(),+ password: t.String(),+ name: t.String(),+ }),},).post("/sign-out", async ({ cookie, cookie: { session } }) => {diff --git a/apps/api/src/workspace/controllers/create-workspace.ts b/apps/api/src/workspace/controllers/create-workspace.tsindex af8a745b4..d9e6fe0f3 100644--- a/apps/api/src/workspace/controllers/create-workspace.ts+++ b/apps/api/src/workspace/controllers/create-workspace.ts@@ -1,15 +1,23 @@import db from "../../database";import { workspaceTable, workspaceUserTable } from "../../database/schema";-import type { CreateWorkspacePayload } from "../db/queries";-async function createWorkspace(body: CreateWorkspacePayload) {- const [workspace] = await db.insert(workspaceTable).values(body).returning();+async function createWorkspace(name: string, ownerEmail: string) {+ const [workspace] = await db+ .insert(workspaceTable)+ .values({+ name,+ ownerEmail,+ })+ .returning();++ // TODO: Replace with eventawait db.insert(workspaceUserTable).values({workspaceId: workspace.id,- userEmail: body.ownerEmail,+ userEmail: ownerEmail,role: "owner",status: "active",});+return workspace;}diff --git a/apps/api/src/workspace/controllers/delete-workspace.ts b/apps/api/src/workspace/controllers/delete-workspace.tsindex fab1301a4..09fde6ed4 100644--- a/apps/api/src/workspace/controllers/delete-workspace.ts+++ b/apps/api/src/workspace/controllers/delete-workspace.ts@@ -1,12 +1,8 @@import { and, eq } from "drizzle-orm";import db from "../../database";import { workspaceTable } from "../../database/schema";-import type { DeleteWorkspacePayload } from "../db/queries";-async function deleteWorkspace({- userEmail,- workspaceId,-}: DeleteWorkspacePayload) {+async function deleteWorkspace(userEmail: string, workspaceId: string) {const [existingWorkspace] = await db.select({id: workspaceTable.id,diff --git a/apps/api/src/workspace/controllers/get-workspace.ts b/apps/api/src/workspace/controllers/get-workspace.tsindex f0b4cf717..07e1c3687 100644--- a/apps/api/src/workspace/controllers/get-workspace.ts+++ b/apps/api/src/workspace/controllers/get-workspace.ts@@ -2,10 +2,7 @@ import { and, eq, or } from "drizzle-orm";import db from "../../database";import { workspaceTable, workspaceUserTable } from "../../database/schema";-async function getWorkspace({- userEmail,- workspaceId,-}: { userEmail: string; workspaceId: string }) {+async function getWorkspace(userEmail: string, workspaceId: string) {const [existingWorkspace] = await db.select({id: workspaceTable.id,diff --git a/apps/api/src/workspace/controllers/get-workspaces.ts b/apps/api/src/workspace/controllers/get-workspaces.tsindex fa2dfe754..43ab35325 100644--- a/apps/api/src/workspace/controllers/get-workspaces.ts+++ b/apps/api/src/workspace/controllers/get-workspaces.ts@@ -6,7 +6,7 @@ import {workspaceUserTable,} from "../../database/schema";-async function getWorkspaces({ userEmail }: { userEmail: string }) {+async function getWorkspaces(userEmail: string) {const workspaces = await db.select({id: workspaceTable.id,diff --git a/apps/api/src/workspace/controllers/update-workspace.ts b/apps/api/src/workspace/controllers/update-workspace.tsindex 237fe92d3..f5ccbbe2f 100644--- a/apps/api/src/workspace/controllers/update-workspace.ts+++ b/apps/api/src/workspace/controllers/update-workspace.ts@@ -1,13 +1,13 @@import { and, eq } from "drizzle-orm";import db from "../../database";import { workspaceTable } from "../../database/schema";-import type { UpdateWorkspacePayload } from "../db/queries";-async function updateWorkspace({- userEmail,- workspaceId,- body,-}: { userEmail: string; workspaceId: string; body: UpdateWorkspacePayload }) {+async function updateWorkspace(+ userEmail: string,+ workspaceId: string,+ name: string,+ description: string,+) {const [existingWorkspace] = await db.select({id: workspaceTable.id,@@ -31,7 +31,8 @@ async function updateWorkspace({const updatedWorkspace = await db.update(workspaceTable).set({- ...body,+ name,+ description,}).where(eq(workspaceTable.id, workspaceId)).returning({diff --git a/apps/api/src/workspace/db/queries.ts b/apps/api/src/workspace/db/queries.tsdeleted file mode 100644index 3a63271bf..000000000--- a/apps/api/src/workspace/db/queries.ts+++ /dev/null@@ -1,21 +0,0 @@-import { createInsertSchema } from "drizzle-typebox";-import { type Static, t } from "elysia";-import { workspaceTable } from "../../database/schema";--export const createWorkspaceSchema = createInsertSchema(workspaceTable, {- name: t.String(),-});--export const updateWorkspaceSchema = t.Object({- name: t.Optional(t.String()),- description: t.Optional(t.String()),-});--export const deleteWorkspaceSchema = t.Object({- userEmail: t.String(),- workspaceId: t.String(),-});--export type CreateWorkspacePayload = Static<typeof createWorkspaceSchema>;-export type UpdateWorkspacePayload = Static<typeof updateWorkspaceSchema>;-export type DeleteWorkspacePayload = Static<typeof deleteWorkspaceSchema>;diff --git a/apps/api/src/workspace/index.ts b/apps/api/src/workspace/index.tsindex 5e40817a2..790da3763 100644--- a/apps/api/src/workspace/index.ts+++ b/apps/api/src/workspace/index.ts@@ -4,19 +4,15 @@ import deleteWorkspace from "./controllers/delete-workspace";import getWorkspace from "./controllers/get-workspace";import getWorkspaces from "./controllers/get-workspaces";import updateWorkspace from "./controllers/update-workspace";-import { updateWorkspaceSchema } from "./db/queries";const workspace = new Elysia({ prefix: "/workspace" }).state("userEmail", "").post("/create",- async ({ body, store }) => {+ async ({ body: { name }, store }) => {const userEmail = store.userEmail;- const createdWorkspace = await createWorkspace({- ...body,- ownerEmail: userEmail,- });+ const createdWorkspace = await createWorkspace(name, userEmail);return createdWorkspace;},@@ -29,7 +25,7 @@ const workspace = new Elysia({ prefix: "/workspace" }).get("/list", async ({ store }) => {const userEmail = store.userEmail;- const workspaces = await getWorkspaces({ userEmail });+ const workspaces = await getWorkspaces(userEmail);return workspaces;})@@ -37,31 +33,37 @@ const workspace = new Elysia({ prefix: "/workspace" })const userEmail = store.userEmail;const workspaceId = params.id;- const workspace = await getWorkspace({ userEmail, workspaceId });+ const workspace = await getWorkspace(userEmail, workspaceId);return workspace;}).put("/:id",- async ({ store, params, body }) => {+ async ({ store, params, body: { name, description } }) => {const userEmail = store.userEmail;const workspaceId = params.id;- const updatedWorkspace = await updateWorkspace({+ const updatedWorkspace = await updateWorkspace(userEmail,workspaceId,- body,- });+ name,+ description,+ );return updatedWorkspace;},- { body: updateWorkspaceSchema },+ {+ body: t.Object({+ name: t.String(),+ description: t.String(),+ }),+ },).delete("/:id", async ({ store, params }) => {const userEmail = store.userEmail;const workspaceId = params.id;- const deletedWorkspace = await deleteWorkspace({ userEmail, workspaceId });+ const deletedWorkspace = await deleteWorkspace(userEmail, workspaceId);return deletedWorkspace;});diff --git a/bun.lockb b/bun.lockbindex 6d15ec2f9..da2e7b84b 100755Binary files a/bun.lockb and b/bun.lockb differ