marcogll/passkit-generator
1
0
Fork 0
mirror of https://github.com/marcogll/passkit-generator.git synced 2026-03-15 21:25:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unified date processing of expiration and relevantDate

Browse Source
This commit is contained in:
Alexander Cerutti
2019-06-29 17:50:50 +02:00
parent a981571c42
commit b410a435df
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/pass.ts
View File

@@ -243,15 +243,12 @@ export class Pass implements PassIndexSignature {
return this;
}
const dateParse = dateToW3CString(date);
const parsedDate = processDate("expirationDate", date);
if (!dateParse) {
genericDebug(formatMessage("DATE_FORMAT_UNMATCH", "Expiration date"));
return this;
if (parsedDate) {
this._props["expirationDate"] = parsedDate;
}
this._props["expirationDate"] = dateParse;
return this;
}
@@ -349,19 +346,12 @@ export class Pass implements PassIndexSignature {
return this;
}
if (!(date instanceof Date)) {
genericDebug(formatMessage("DATE_FORMAT_UNMATCH", "Relevant Date"));
return this;
const parsedDate = processDate("relevandDate", date);
if (parsedDate) {
this._props["relevantDate"] = parsedDate;
}
const parsedDate = dateToW3CString(date);
if (!parsedDate) {
// @TODO: create message "Unable to format date"
return this;
}
this._props["relevantDate"] = parsedDate;
return this;
}
@@ -693,3 +683,18 @@ function barcodesFromUncompleteData(message: string): schema.Barcode[] {
"PKBarcodeFormatCode128"
].map(format => schema.getValidated({ format, message }, "barcode"));
}
function processDate(key: string, date: Date): string | null {
if (!(date instanceof Date)) {
return null;
}
const dateParse = dateToW3CString(date);
if (!dateParse) {
genericDebug(formatMessage("DATE_FORMAT_UNMATCH", key));
return null;
}
return dateParse;
}