Skip to content

Commit

Permalink
[vestingSchedule] removed vestingSchedule import and fixed type errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Alfredoeb9 committed Jul 22, 2024
1 parent 25bf87d commit 41e3560
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
20 changes: 12 additions & 8 deletions src/server/api/routes/company/share/create.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { withCompanyAuth } from "@/server/api/auth";
import { ApiError, ErrorResponses } from "@/server/api/error";
import type { PublicAPI } from "@/server/api/hono";
import { CreateShareSchema } from "@/server/api/schema/shares";
import { CreateShareSchema, ShareSchemaType } from "@/server/api/schema/shares";
import { getHonoUserAgent, getIp } from "@/server/api/utils";
import { addShare } from "@/server/services/shares/add-share";
import { createRoute, z } from "@hono/zod-openapi";
Expand Down Expand Up @@ -61,7 +61,7 @@ const create = (app: PublicAPI) => {
const { company, member, user } = await withCompanyAuth(c);
const body = await c.req.json();

const { success, message, data } = await addShare({
const response = await addShare({
...body,
companyId: company.id,
memberId: member.id,
Expand All @@ -73,6 +73,10 @@ const create = (app: PublicAPI) => {
},
});

const data = response?.data;
const success = response?.success;
const message: string = response?.message.toString();

if (!success || !data) {
throw new ApiError({
code: "INTERNAL_SERVER_ERROR",
Expand All @@ -81,8 +85,8 @@ const create = (app: PublicAPI) => {
}

// Ensure data matches ResponseSchema
const responseData = {
status: data.status as string, // Cast to string if necessary
const responseData: ShareSchemaType = {
status: data.status, // Cast to string if necessary
certificateId: data.certificateId,
quantity: data.quantity,
pricePerShare: data.pricePerShare ?? 0,
Expand All @@ -93,10 +97,10 @@ const create = (app: PublicAPI) => {
cliffYears: data.cliffYears ?? 0,
vestingYears: data.vestingYears ?? 0,
companyLegends: data.companyLegends ?? "", // Add missing fields
issueDate: data.issueDate ?? new Date().toISOString(), // Add missing fields
rule144Date: data.rule144Date ?? new Date().toISOString(), // Add missing fields
vestingStartDate: data.vestingStartDate ?? new Date().toISOString(), // Add missing fields
boardApprovalDate: data.boardApprovalDate ?? new Date().toISOString(), // Add boardApprovalDate
issueDate: data.issueDate ? data.issueDate.toISOString() : new Date().toISOString(), // Add missing fields
rule144Date: data.rule144Date ? data.rule144Date.toISOString() : new Date().toISOString(), // Convert rule144Date to string
vestingStartDate: data.vestingStartDate ? data.vestingStartDate.toISOString() : new Date().toISOString(), // Add missing fields
boardApprovalDate: data.boardApprovalDate ? data.boardApprovalDate.toISOString() : new Date().toISOString(), // Add boardApprovalDate
stakeholderId: data.stakeholderId ?? "", // Add stakeholderId
shareClassId: data.shareClassId,
};
Expand Down
3 changes: 2 additions & 1 deletion src/server/api/schema/shares.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export const ShareSchema = z
example: "cly13ipa40000i7ng42mv4x7b",
}),

companyId: z.string().cuid().openapi({
companyId: z.string().cuid().optional().openapi({
description: "Company ID",
example: "clyvb28ak0000f1ngcn2i0p2m",
}),
Expand Down Expand Up @@ -135,6 +135,7 @@ export const CreateShareSchema = ShareSchema.omit({
createdAt: true,
updatedAt: true,
companyId: true,
status: true,
}).openapi({
description: "Issue shares to a stakeholder in a company.",
});
Expand Down
1 change: 0 additions & 1 deletion src/trpc/routers/securities-router/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {
OptionStatusEnum,
OptionTypeEnum,
ShareLegendsEnum,
VestingScheduleEnum,
} from "@/prisma/enums";
import { SecuritiesStatusEnum } from "@prisma/client";
import { z } from "zod";
Expand Down

0 comments on commit 41e3560

Please sign in to comment.