diff --git a/src/models/sake.ts b/src/models/sake.ts index ec107ff..dfc1860 100644 --- a/src/models/sake.ts +++ b/src/models/sake.ts @@ -1,5 +1,5 @@ import { ObjectId } from 'mongodb' -import { SakeDesignation, SakeStarter, Vintage } from '../types' +import { SakeDesignation, SakeStarter, VintageOptions } from '../types' import { Alpha2Code } from 'i18n-iso-countries' import { CurrencyCode } from 'currency-codes-ts/dist/types' @@ -18,7 +18,7 @@ export class Sake { public yeastStrain: number, public alcohol: number, // alcohol percentage public standardDrinks100ml: number, // number representing an amount of standard drinks per bottle per 100ml - public vintage: Vintage, // year, nv (non-vintage) or mv (multi-vintage) + public vintage: number | VintageOptions, // year, nv (non-vintage) or mv (multi-vintage) public RRPamount: number, // 20 public RRPcurrency: CurrencyCode, // USD public description: string, // detailed description of the product diff --git a/src/models/spirit.ts b/src/models/spirit.ts index 45c0d53..864457d 100644 --- a/src/models/spirit.ts +++ b/src/models/spirit.ts @@ -1,5 +1,5 @@ import { ObjectId } from 'mongodb' -import { SpiritType, SpiritVariant, Ingredient, Vintage } from '../types' +import { SpiritType, SpiritVariant, Ingredient, VintageOptions } from '../types' import { Alpha2Code } from 'i18n-iso-countries' import { CurrencyCode } from 'currency-codes-ts/dist/types' @@ -17,7 +17,7 @@ export class Spirit { public ingredients: Ingredient[], // an array of ingredients(flavouring) public alcohol: number, // alcohol percentage public standardDrinks100ml: number, // number representing an amount of standard drinks per bottle - public vintage: Vintage, // year, nv (non-vintage) or mv (multi-vintage) + public vintage: number | VintageOptions, // year, nv (non-vintage) or mv (multi-vintage) public RRPamount: number, // 20 public RRPcurrency: CurrencyCode, // USD public description: string, // detailed description of the product