Allow fromName to be null

This commit is contained in:
Matt Low 2021-03-14 12:17:42 -06:00
parent d9ac440498
commit 4da9429e6e
2 changed files with 27 additions and 9 deletions

View File

@ -0,0 +1,17 @@
import { Knex } from "knex";
export async function up(knex: Knex) {
return knex.transaction((trx) =>
trx.schema.alterTable("voicemails", (table) => {
table.string("fromName", 64).alter();
})
);
}
export async function down(knex: Knex) {
return knex.transaction((trx) =>
trx.schema.alterTable("voicemails", (table) => {
table.string("fromName", 64).notNullable().alter();
})
);
}

View File

@ -5,19 +5,21 @@ import { DateTime } from "luxon";
import type { Contact } from "./types";
import type { StoredVoicemail, StoredRecording } from "knex/types/tables";
export function getTicketSubject(
voicemail: StoredVoicemail,
contact?: Contact
) {
return `New Voicemail from ${getNationalNumber(voicemail.fromNumber)} (${
contact ? contact.name : voicemail.fromName
})`;
function fromName(vm: StoredVoicemail, contact?: Contact) {
return contact?.name ?? vm.fromName ?? "unknown";
}
export function getTicketSubject(vm: StoredVoicemail, contact?: Contact) {
const name = fromName(vm, contact);
return `New Voicemail from ${getNationalNumber(vm.fromNumber)} (${name})`;
}
export function getTicketBody(
vm: StoredVoicemail & StoredRecording,
contact?: Contact
) {
const name = fromName(vm, contact);
return ReactDOMServer.renderToStaticMarkup(
<div>
<div>
@ -25,8 +27,7 @@ export function getTicketBody(
{DateTime.fromISO(vm.received).toLocaleString(DateTime.DATETIME_MED)}
</div>
<div>
<b>From:</b> {getNationalNumber(vm.fromNumber)} (
{contact?.name ?? vm.fromName})
<b>From:</b> {getNationalNumber(vm.fromNumber)} ({name})
</div>
<div>
<b>To:</b> {getNationalNumber(vm.toNumber)}x{vm.extensionNumber} (