Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 52 additions & 6 deletions apps/api/src/activities/activities.contracts.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { ActivityType } from "@crm/db";
import { activityMeta } from "@crm/validation/activity-meta";
import { z } from "zod";
import { listInput } from "../trpc/list-input";
import { taskDueDayInput } from "./task-due-date";

const COMPOSABLE_TYPES = [
ActivityType.NOTE,
Expand Down Expand Up @@ -59,7 +61,7 @@ export const activityCreateInput = z
subject: z.string().trim().optional(),
body: z.string().trim().optional(),
occurredAt: z.string().optional(),
dueAt: z.string().nullable().optional(),
dueAt: taskDueDayInput.nullable().optional(),
companyId: z.string().optional(),
contactId: z.string().optional(),
dealId: z.string().optional(),
Expand All @@ -77,17 +79,29 @@ export const activityCreateInput = z

export type ActivityCreateInput = z.infer<typeof activityCreateInput>;

export const activityUpdateInput = z.object({
id: z.string(),
subject: z.string().trim().min(1, {
message: "A task needs a subject — it is the thing to do.",
}),
dueAt: taskDueDayInput.nullable(),
});

export type ActivityUpdateInput = z.infer<typeof activityUpdateInput>;

export const completeInput = z.object({
id: z.string(),
completed: z.boolean().default(true),
});

export const myTasksInput = z.object({
window: z.enum(["overdue", "upcoming", "all"]).default("all"),
limit: z.number().int().min(1).max(100).default(25),
export const taskListInput = listInput.extend({
status: z.string().default("all"),
due: z.array(z.string()).default([]),
createdBy: z.array(z.string()).default([]),
today: taskDueDayInput,
});

export type MyTasksInput = z.infer<typeof myTasksInput>;
export type TaskListInput = z.infer<typeof taskListInput>;

const activityAuthorOutput = z.object({
id: z.string(),
Expand Down Expand Up @@ -176,8 +190,40 @@ export const timelineCountsOutput = z.object({

export type TimelineCounts = z.infer<typeof timelineCountsOutput>;

export const myTasksOutput = z.array(activityEntryOutput);
const taskCompanyRefOutput = z
.object({
id: z.string(),
name: z.string(),
domain: z.string().nullable(),
iconUrl: z.string().nullable(),
iconDarkUrl: z.string().nullable(),
iconTone: z.string().nullable(),
logoUrl: z.string().nullable(),
})
.nullable();

const taskRowOutput = z.object({
id: z.string(),
subject: z.string().nullable(),
dueAt: z.string().nullable(),
completedAt: z.string().nullable(),
createdAt: z.string(),
createdBy: activityAuthorOutput,
company: taskCompanyRefOutput,
contact: activityContactRefOutput,
deal: activityDealRefOutput,
});

export const taskListOutput = z.object({
rows: z.array(taskRowOutput),
total: z.number(),
facetCounts: z.record(z.string(), z.record(z.string(), z.number())),
});

export type TaskListResult = z.infer<typeof taskListOutput>;

export const activityCreateOutput = activityEntryOutput;

export const activityUpdateOutput = activityEntryOutput;

export const completeOutput = activityEntryOutput;
28 changes: 18 additions & 10 deletions apps/api/src/activities/activities.router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ import { restMeta } from "../trpc/openapi";
import {
activityCreateInput,
activityCreateOutput,
activityUpdateInput,
activityUpdateOutput,
completeInput,
completeOutput,
myTasksInput,
myTasksOutput,
taskListInput,
taskListOutput,
timelineCountsInput,
timelineCountsOutput,
timelineInput,
Expand Down Expand Up @@ -51,15 +53,12 @@ export class ActivitiesRouter {
}

@Query({
input: myTasksInput,
output: myTasksOutput,
meta: restMeta("GET", "/activities/my-tasks", ["Activities"]),
input: taskListInput,
output: taskListOutput,
meta: restMeta("GET", "/activities/tasks", ["Activities"]),
})
async myTasks(
@Ctx() ctx: AuthedTrpcContext,
@Input() input: z.infer<typeof myTasksInput>,
) {
return this.activities.myTasks(input, ctx.user.id);
async tasks(@Input() input: z.infer<typeof taskListInput>) {
return this.activities.tasks(input);
}

@Mutation({
Expand All @@ -74,6 +73,15 @@ export class ActivitiesRouter {
return this.activities.create(input, ctx.user.id);
}

@Mutation({
input: activityUpdateInput,
output: activityUpdateOutput,
meta: restMeta("PATCH", "/activities/{id}", ["Activities"]),
})
async update(@Input() input: z.infer<typeof activityUpdateInput>) {
return this.activities.update(input);
}

@Mutation({
input: completeInput,
output: completeOutput,
Expand Down
Loading
Loading