Allow fromName to be null
This commit is contained in:
parent
bc7500ce3e
commit
4cbfd1a4f8
17
src/db/migrations/20210314175439_fromName_null.ts
Normal file
17
src/db/migrations/20210314175439_fromName_null.ts
Normal 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();
|
||||
})
|
||||
);
|
||||
}
|
@ -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} (
|
||||
|
Loading…
Reference in New Issue
Block a user