Mobile + responsive - berth-form full-width on phones (was 480px fixed → overflowed iPhone) - currency-input switched to inputMode=decimal with live thousands separator - client-form Country/Timezone/Source/Preferred-Contact full-width <sm - contacts row restructured so Primary toggle + Remove get their own strip - customize-dashboard footer stacks vertically on mobile; Done full-width - interest-form client/berth pickers no longer cmdk-filter on UUID (typing "Carlos" now returns Carlos Vega instead of "No clients found") Data + consistency - SOURCES + SOURCE_LABELS + formatSource() in lib/constants; 9 surfaces now resolve interest/client source from one place - INTEREST_OUTCOMES adds lost_other (picker, badge, timeline) - Berth options natural-sort A1 → A2 → … → A10 via lib/utils/mooring-sort - archiver downgraded ^8 → ^7.0.1 so the GDPR export route compiles - TableBody last-row uses border-b-0 (not border-0); colored left-accent on the bottom berth row now renders - Hide Invite-to-Portal until port setting === true (was !== false default-show) - OwnerPicker primer query resolves entity name on first paint (no more UUID flash before the popover opens) Terminology - Replaced user-facing "Documenso" with "signing service" / "Generated EOI" / "Manual EOI" in 8 components (admin/internal references kept) - Plainer status-change copy on berth-detail-header Forms + editing - InlineEditableField gained a `date` variant (native picker); applied to company incorporation date and ready for other YYYY-MM-DD plaintext fields - Inline source picker on interest-tabs detail (was free text) - TagPicker self-hides when port has no tags AND nothing is selected - New ReminderDaysInput with preset chips (1d / 3d / 1wk / 2wk / 1mo / custom) - Compose dialog follow-up is now a toggle that reveals datetime picker Pipeline milestones - changeStageSchema accepts optional milestoneDate; service stamps it on the matching date column instead of always using now - MilestoneAdvanceButton popover collects a back-date before stage advance - Applied to every "Mark X manually" surface on the interest overview EOI / linked-berths polish - Add-bypass row aligned inline with toggle descriptions - Tooltips on "Specifically pitching" / "Mark in EOI bundle" explain their legal vs. public-map consequences Surfaces - Companies list now has the column picker + persisted hidden-column prefs - NotesList aggregate flag enabled on clients, companies, residential_clients (yachts already aggregated) ft/m unit toggle (interim, before drift fix) - "Berth size desired" gets a section-level ft/m toggle; per-field hint shows the converted value. Storage stays canonical-ft for now; the drift-safe persistence migration is the next step. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
260 lines
8.2 KiB
TypeScript
260 lines
8.2 KiB
TypeScript
import { describe, it, expect } from 'vitest';
|
|
import {
|
|
createCompany,
|
|
updateCompany,
|
|
archiveCompany,
|
|
listCompanies,
|
|
autocomplete,
|
|
upsertByName,
|
|
getCompanyById,
|
|
} from '@/lib/services/companies.service';
|
|
import { makeCompany, makePort, makeAuditMeta } from '../../helpers/factories';
|
|
import { db } from '@/lib/db';
|
|
import { companies } from '@/lib/db/schema';
|
|
import { eq } from 'drizzle-orm';
|
|
import { ConflictError, NotFoundError } from '@/lib/errors';
|
|
|
|
describe('companies.service — createCompany', () => {
|
|
it('creates a company with minimal required fields', async () => {
|
|
const port = await makePort();
|
|
|
|
const company = await createCompany(
|
|
port.id,
|
|
{ name: 'Aegean Holdings', status: 'active', tagIds: [] },
|
|
makeAuditMeta({ portId: port.id }),
|
|
);
|
|
|
|
expect(company.id).toBeTruthy();
|
|
expect(company.name).toBe('Aegean Holdings');
|
|
expect(company.status).toBe('active');
|
|
expect(company.portId).toBe(port.id);
|
|
});
|
|
|
|
it('rejects duplicate name case-insensitively (ConflictError)', async () => {
|
|
const port = await makePort();
|
|
await createCompany(port.id, { name: 'Aegean Holdings', status: 'active', tagIds: [] }, makeAuditMeta({ portId: port.id }));
|
|
|
|
await expect(
|
|
createCompany(port.id, { name: 'AEGEAN HOLDINGS', status: 'active', tagIds: [] }, makeAuditMeta({ portId: port.id })),
|
|
).rejects.toBeInstanceOf(ConflictError);
|
|
});
|
|
|
|
it('allows same name in different ports (tenant isolation)', async () => {
|
|
const portA = await makePort();
|
|
const portB = await makePort();
|
|
|
|
const a = await createCompany(
|
|
portA.id,
|
|
{ name: 'Shared Name Co', status: 'active', tagIds: [] },
|
|
makeAuditMeta({ portId: portA.id }),
|
|
);
|
|
const b = await createCompany(
|
|
portB.id,
|
|
{ name: 'Shared Name Co', status: 'active', tagIds: [] },
|
|
makeAuditMeta({ portId: portB.id }),
|
|
);
|
|
|
|
expect(a.id).not.toBe(b.id);
|
|
expect(a.portId).toBe(portA.id);
|
|
expect(b.portId).toBe(portB.id);
|
|
});
|
|
});
|
|
|
|
describe('companies.service — upsertByName', () => {
|
|
it('returns existing company on case-insensitive match', async () => {
|
|
const port = await makePort();
|
|
const original = await createCompany(
|
|
port.id,
|
|
{ name: 'Poseidon Maritime', status: 'active', tagIds: [] },
|
|
makeAuditMeta({ portId: port.id }),
|
|
);
|
|
|
|
const result = await upsertByName(
|
|
port.id,
|
|
'POSEIDON maritime',
|
|
makeAuditMeta({ portId: port.id }),
|
|
);
|
|
|
|
expect(result.id).toBe(original.id);
|
|
});
|
|
|
|
it('creates a new company when name not found', async () => {
|
|
const port = await makePort();
|
|
|
|
const result = await upsertByName(port.id, 'Brand New Co', makeAuditMeta({ portId: port.id }));
|
|
|
|
expect(result.id).toBeTruthy();
|
|
expect(result.name).toBe('Brand New Co');
|
|
expect(result.portId).toBe(port.id);
|
|
});
|
|
|
|
it('is tenant-scoped (same name in different ports creates distinct rows)', async () => {
|
|
const portA = await makePort();
|
|
const portB = await makePort();
|
|
|
|
const a = await upsertByName(portA.id, 'Cross Tenant Co', makeAuditMeta({ portId: portA.id }));
|
|
const b = await upsertByName(portB.id, 'Cross Tenant Co', makeAuditMeta({ portId: portB.id }));
|
|
|
|
expect(a.id).not.toBe(b.id);
|
|
expect(a.portId).toBe(portA.id);
|
|
expect(b.portId).toBe(portB.id);
|
|
});
|
|
});
|
|
|
|
describe('companies.service — updateCompany', () => {
|
|
it('updates fields', async () => {
|
|
const port = await makePort();
|
|
const company = await makeCompany({
|
|
portId: port.id,
|
|
overrides: { name: 'Original Name', notes: 'Old notes' },
|
|
});
|
|
|
|
const updated = await updateCompany(
|
|
company.id,
|
|
port.id,
|
|
{ name: 'New Name', notes: 'New notes' },
|
|
makeAuditMeta({ portId: port.id }),
|
|
);
|
|
|
|
expect(updated.name).toBe('New Name');
|
|
expect(updated.notes).toBe('New notes');
|
|
|
|
const [row] = await db.select().from(companies).where(eq(companies.id, company.id));
|
|
expect(row!.name).toBe('New Name');
|
|
});
|
|
|
|
it('throws NotFoundError for cross-tenant', async () => {
|
|
const portA = await makePort();
|
|
const portB = await makePort();
|
|
const companyInB = await makeCompany({ portId: portB.id });
|
|
|
|
await expect(
|
|
updateCompany(
|
|
companyInB.id,
|
|
portA.id,
|
|
{ name: 'Hijack' },
|
|
makeAuditMeta({ portId: portA.id }),
|
|
),
|
|
).rejects.toBeInstanceOf(NotFoundError);
|
|
});
|
|
});
|
|
|
|
describe('companies.service — archiveCompany', () => {
|
|
it('sets archivedAt to a non-null timestamp', async () => {
|
|
const port = await makePort();
|
|
const company = await makeCompany({ portId: port.id });
|
|
|
|
await archiveCompany(company.id, port.id, makeAuditMeta({ portId: port.id }));
|
|
|
|
const [row] = await db.select().from(companies).where(eq(companies.id, company.id));
|
|
expect(row!.archivedAt).not.toBeNull();
|
|
});
|
|
|
|
it('throws NotFoundError for missing or cross-tenant', async () => {
|
|
const portA = await makePort();
|
|
const portB = await makePort();
|
|
const companyInB = await makeCompany({ portId: portB.id });
|
|
|
|
await expect(
|
|
archiveCompany(companyInB.id, portA.id, makeAuditMeta({ portId: portA.id })),
|
|
).rejects.toBeInstanceOf(NotFoundError);
|
|
|
|
await expect(
|
|
archiveCompany('nonexistent-id', portA.id, makeAuditMeta({ portId: portA.id })),
|
|
).rejects.toBeInstanceOf(NotFoundError);
|
|
});
|
|
});
|
|
|
|
describe('companies.service — listCompanies', () => {
|
|
it('is tenant-scoped', async () => {
|
|
const portA = await makePort();
|
|
const portB = await makePort();
|
|
await makeCompany({ portId: portA.id, overrides: { name: 'In A' } });
|
|
await makeCompany({ portId: portB.id, overrides: { name: 'In B' } });
|
|
|
|
const result = await listCompanies(portA.id, {
|
|
page: 1,
|
|
limit: 20,
|
|
order: 'desc',
|
|
includeArchived: false,
|
|
});
|
|
expect(result.data.some((c) => c.name === 'In A')).toBe(true);
|
|
expect(result.data.some((c) => c.name === 'In B')).toBe(false);
|
|
});
|
|
|
|
it('filters by status', async () => {
|
|
const port = await makePort();
|
|
await makeCompany({
|
|
portId: port.id,
|
|
overrides: { name: 'Active Co', status: 'active' },
|
|
});
|
|
await makeCompany({
|
|
portId: port.id,
|
|
overrides: { name: 'Dissolved Co', status: 'dissolved' },
|
|
});
|
|
|
|
const result = await listCompanies(port.id, {
|
|
page: 1,
|
|
limit: 20,
|
|
order: 'desc',
|
|
includeArchived: false,
|
|
status: 'dissolved',
|
|
});
|
|
expect(result.data.map((c) => c.name)).toContain('Dissolved Co');
|
|
expect(result.data.map((c) => c.name)).not.toContain('Active Co');
|
|
});
|
|
|
|
it('searches by name (ILIKE)', async () => {
|
|
const port = await makePort();
|
|
await makeCompany({ portId: port.id, overrides: { name: 'Aegean Shipping' } });
|
|
await makeCompany({ portId: port.id, overrides: { name: 'Pacific Marine' } });
|
|
|
|
const result = await listCompanies(port.id, {
|
|
page: 1,
|
|
limit: 20,
|
|
order: 'desc',
|
|
includeArchived: false,
|
|
search: 'aegean',
|
|
});
|
|
expect(result.data.map((c) => c.name)).toContain('Aegean Shipping');
|
|
expect(result.data.map((c) => c.name)).not.toContain('Pacific Marine');
|
|
});
|
|
});
|
|
|
|
describe('companies.service — autocomplete', () => {
|
|
it('matches by name', async () => {
|
|
const port = await makePort();
|
|
await makeCompany({ portId: port.id, overrides: { name: 'Phoenix Ltd' } });
|
|
|
|
const result = await autocomplete(port.id, 'phoe');
|
|
expect(result.some((c) => c.name === 'Phoenix Ltd')).toBe(true);
|
|
});
|
|
|
|
it('is tenant-scoped', async () => {
|
|
const portA = await makePort();
|
|
const portB = await makePort();
|
|
await makeCompany({ portId: portA.id, overrides: { name: 'Only-A Co' } });
|
|
|
|
const result = await autocomplete(portB.id, 'only-a');
|
|
expect(result).toHaveLength(0);
|
|
});
|
|
});
|
|
|
|
describe('companies.service — getCompanyById', () => {
|
|
it('returns the company when same tenant', async () => {
|
|
const port = await makePort();
|
|
const company = await makeCompany({ portId: port.id });
|
|
|
|
const result = await getCompanyById(company.id, port.id);
|
|
expect(result.id).toBe(company.id);
|
|
});
|
|
|
|
it('throws NotFoundError for cross-tenant', async () => {
|
|
const portA = await makePort();
|
|
const portB = await makePort();
|
|
const companyInB = await makeCompany({ portId: portB.id });
|
|
|
|
await expect(getCompanyById(companyInB.id, portA.id)).rejects.toBeInstanceOf(NotFoundError);
|
|
});
|
|
});
|