@vini-wine/admin-core-models 1.0.2 → 1.1.0

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { CurrencyCodeEnum, UploadVisibilityTypeEnum, ContactPointTypeEnum, CurrencyRateSourceEnum, OrganisationStatusEnum, UserStatusEnum, GenderEnum, LocaleEnum, ImageVariationEnum, ImageTypeEnum, UserOrganisationStatusEnum, TimezoneEnum, DateTimeFormatEnum, OfferAlertFilterCriteriaFieldEnum, FilterOperatorEnum, UploadStatusEnum, UploadTypeEnum, CountryEnum, NotificationChannelEnum, NotificationTypeEnum, VintageScoreAuthorEnum, PackageEnum, OfferAlertTimelineActionEnum, OfferRequestStatusEnum, OfferRequestOptionEnum, OfferRequestOptionStatusEnum, OfferRequestTimelineActionEnum, OrganisationUserInvitationStatusEnum } from '@vini-wine/core-enums';
+import { CurrencyCodeEnum, UploadVisibilityTypeEnum, ContactPointTypeEnum, CountryEnum, OrganisationStatusEnum, UserOrganisationStatusEnum, GenderEnum, LocaleEnum, UserStatusEnum, ImageVariationEnum, ImageTypeEnum, TimezoneEnum, DateTimeFormatEnum, CurrencyRateSourceEnum, OfferAlertFilterCriteriaFieldEnum, FilterOperatorEnum, UploadStatusEnum, UploadTypeEnum, NotificationTypeEnum, NotificationChannelEnum, VintageRatingEnum, VintageScoreAuthorEnum, PackageEnum, OfferAlertTimelineActionEnum, OfferRequestStatusEnum, OfferRequestOptionEnum, OfferRequestOptionStatusEnum, OfferRequestTimelineActionEnum, OrganisationUserInvitationStatusEnum } from '@vini-wine/core-enums';
 
 interface PriceModel {
     priceMicros: number;
@@ -23,32 +23,11 @@ interface ContactTypeModel {
 
 interface TelephoneModel {
     number: string;
-    countryCode: string;
-}
-
-interface ContactPointModel extends UUID {
-    email: string | null;
-    telephone: TelephoneModel | null;
-    name: string;
-    contactType: ContactTypeModel;
-}
-
-interface CountryModel {
-    name: string;
-    codeAlpha2: string;
-    codeAlpha3: string;
-    codeUn: string;
-}
-
-interface CurrencyRateModel {
-    currencyCode: CurrencyCodeEnum;
-    rate: number;
-    synchronizedAt: Date;
-    source: CurrencyRateSourceEnum;
+    countryCode: CountryEnum;
 }
 
 interface PostalAddressModel {
-    countryCode: string;
+    countryCode: CountryEnum;
     locality: string;
     region: string | null;
     postalCode: string;
@@ -56,7 +35,7 @@ interface PostalAddressModel {
 }
 
 interface VatTaxModel {
-    countryCode: string;
+    countryCode: CountryEnum;
     value: string;
 }
 
@@ -87,24 +66,40 @@ interface PermissionModel extends UUID {
     action: string;
 }
 
-interface UserStatusModel {
-    id: UserStatusEnum;
+interface UserOrganisationStatusModel {
+    id: UserOrganisationStatusEnum;
     name: string;
 }
 
+interface UserOrganisationModel {
+    organisation: OrganisationModel;
+    createdAt: Date;
+    isOrganisationOwner: boolean;
+    isUserDefaultOrganisation: boolean;
+    status: UserOrganisationStatusModel;
+    user?: UserAccountModel;
+    permissions?: PermissionModel[];
+    roles?: RoleModel[];
+}
+
 interface GenderModel extends UUID {
     id: GenderEnum;
     name: string;
 }
 
 interface PersonModel extends UUID {
+    gender: GenderModel;
     firstName: string;
     lastName: string;
     preferredLanguage: LocaleEnum;
-    gender: GenderModel;
     preferredCurrency: CurrencyCodeEnum;
 }
 
+interface UserStatusModel {
+    id: UserStatusEnum;
+    name: string;
+}
+
 interface ImageVariationModel {
     id: ImageVariationEnum;
 }
@@ -123,38 +118,6 @@ interface ImageModel extends UUID {
     type: ImageTypeModel;
 }
 
-interface UserModel extends UUID {
-    person: PersonModel;
-    defaultUserOrganisation?: UserOrganisationModel;
-    permissions?: PermissionModel[];
-    roles?: RoleModel[];
-    userOrganisations?: UserOrganisationModel[];
-    numNotificationsUnPreRead?: number;
-    avatar?: ImageModel;
-    status: UserStatusModel;
-    email: string;
-    emailVerified: boolean;
-    lastLoginAt: Date;
-    createdAt: Date;
-    updatedAt: Date;
-}
-
-interface UserOrganisationStatusModel {
-    id: UserOrganisationStatusEnum;
-    name: string;
-}
-
-interface UserOrganisationModel {
-    organisation: OrganisationModel;
-    createdAt: Date;
-    isOrganisationOwner: boolean;
-    isUserDefaultOrganisation: boolean;
-    status: UserOrganisationStatusModel;
-    user?: UserModel;
-    permissions?: PermissionModel[];
-    roles?: RoleModel[];
-}
-
 interface UserAccountModel extends UUID {
     person: PersonModel;
     defaultUserOrganisation?: UserOrganisationModel;
@@ -176,7 +139,7 @@ interface UserAccountModel extends UUID {
 interface OrganisationModel extends UUID {
     suppliers?: Partial<SupplierModel>[];
     billingPostalAddress?: PostalAddressModel;
-    defaultShippingPostalAddress?: PostalAddressModel;
+    defaultShippingPostalAddress?: PostalAddressModel | null;
     organisationOwner?: Partial<UserAccountModel>;
     registeredBy?: Partial<UserAccountModel>;
     userOrganisations?: UserOrganisationModel[];
@@ -184,7 +147,7 @@ interface OrganisationModel extends UUID {
     numSuppliers?: number;
     numSuppliedSuppliers?: number;
     numUploads?: number;
-    avatar?: ImageModel;
+    avatar?: ImageModel | null;
     name: string;
     legalName: string;
     vatTax: VatTaxModel;
@@ -193,6 +156,28 @@ interface OrganisationModel extends UUID {
     status: OrganisationStatusModel;
 }
 
+interface ContactPointModel extends UUID {
+    email: string | null;
+    telephone: TelephoneModel | null;
+    name: string;
+    contactType: ContactTypeModel;
+    createdOrganisation?: OrganisationModel;
+    createdUser?: UserAccountModel | null;
+}
+
+interface CountryModel {
+    codeAlpha2: CountryEnum;
+    codeAlpha3: string;
+    codeUn: string;
+}
+
+interface CurrencyRateModel {
+    currencyCode: CurrencyCodeEnum;
+    rate: number;
+    synchronizedAt: Date;
+    source: CurrencyRateSourceEnum;
+}
+
 interface CustomerModel extends UUID {
     isSupplier: boolean;
     name: string;
@@ -251,25 +236,23 @@ interface ImportResolvedFileHeaderValueModel {
 interface MarginMarketModel {
     countryCode: CountryEnum;
     margin: number;
+    organisation?: OrganisationModel;
+    createdBy?: UserAccountModel | null;
+    updatedBy?: UserAccountModel | null;
 }
 
 interface MarginOrganisationModel {
     margin: number;
-    marginOrganisation: Partial<OrganisationModel>;
-}
-
-interface NotificationChannelModel {
-    id: NotificationChannelEnum;
-    isActive: boolean;
-}
-
-interface NotificationTypeModel {
-    id: NotificationTypeEnum;
-    channels: NotificationChannelModel[];
+    marginOrganisation?: OrganisationModel;
+    organisation?: OrganisationModel;
+    createdBy?: UserAccountModel | null;
+    updatedBy?: UserAccountModel | null;
 }
 
 interface NotificationModel extends UUID {
-    type: Partial<NotificationTypeModel>;
+    type: {
+        id: NotificationTypeEnum;
+    };
     messagePlain: string;
     messageHtml: string | null;
     actionText: string;
@@ -280,14 +263,24 @@ interface NotificationModel extends UUID {
     name: string;
 }
 
+interface NotificationChannelModel {
+    id: NotificationChannelEnum;
+    isActive: boolean;
+}
+
+interface NotificationTypeModel {
+    id: NotificationTypeEnum;
+    channels: NotificationChannelModel[];
+}
+
 interface SellerModel extends UUID {
-    organisation: Partial<OrganisationModel>;
+    organisation?: OrganisationModel;
 }
 
 interface RegionModel extends UUID {
     country: CountryModel;
     mappedItems?: any;
-    parentRegion?: RegionModel;
+    parentRegion?: RegionModel | null;
     subRegions?: RegionModel[];
     images?: ImageModel[];
     name: string;
@@ -315,6 +308,8 @@ interface VintageRatingModel {
     numberOfRatings: number;
     averageOfRatings: number;
     updatedAt: Date;
+    status: VintageRatingEnum;
+    vintage?: VintageModel;
 }
 
 interface VintageScoreAuthorModel {
@@ -325,6 +320,7 @@ interface VintageScoreModel {
     scoreValue: number;
     scoreYear: number;
     author: VintageScoreAuthorModel;
+    vintage?: VintageModel;
 }
 
 interface VintageModel extends UUID {
@@ -354,27 +350,29 @@ interface OfferModel extends UUID {
     createdAt: Date;
 }
 
+interface OfferAlertTimelineModel {
+    actionCreatedAt: Date;
+    action: {
+        id: OfferAlertTimelineActionEnum;
+    };
+    offerAlert?: OfferAlertModel;
+    createdByUser?: UserAccountModel;
+}
+
 interface OfferAlertModel extends UUID {
     title: string;
     header: string;
     description: string | null;
-    backgroundImage: ImageModel | null;
     validFrom: string;
     validUntil: string;
     isExpired: boolean;
-    filterCriteria: FilterCriteriaModel[];
+    organisation?: OrganisationModel;
+    backgroundImage?: ImageModel | null;
+    filterCriteria?: FilterCriteriaModel[];
+    timeline?: OfferAlertTimelineModel;
     meta?: any;
 }
 
-interface OfferAlertTimelineModel {
-    actionCreatedAt: Date;
-    action: {
-        id: OfferAlertTimelineActionEnum;
-    };
-    offerAlert: OfferAlertModel;
-    createdByUser: Partial<UserAccountModel>;
-}
-
 interface OfferRequestStatusModel {
     id: OfferRequestStatusEnum;
     updatedAt: Date;
@@ -388,6 +386,7 @@ interface OfferRequestOptionModel {
     };
     requestedValue: string | null;
     providedValue: string | null;
+    offerRequest?: OfferRequestModel;
 }
 
 interface OfferRequestTimelineModel {
@@ -395,23 +394,25 @@ interface OfferRequestTimelineModel {
     action: {
         id: OfferRequestTimelineActionEnum;
     };
-    offerRequest: OfferRequestModel;
-    createdByUser: Partial<UserAccountModel>;
+    offerRequest?: OfferRequestModel;
+    createdByUser?: UserAccountModel | null;
 }
 
 interface OfferRequestModel extends UUID {
     status: OfferRequestStatusModel;
-    price: PriceModel | null;
+    createdAt: Date;
+    changedAt: Date;
+    updatedAt: Date;
     quantity: number;
-    images: ImageModel[];
+    price: PriceModel | null;
     offer: Partial<OfferModel> | null;
-    createdAt: Date;
     organisation: OrganisationModel;
-    vintageProducts: VintageProductModel[];
-    timeline: OfferRequestTimelineModel[];
     seller: OrganisationModel;
-    subOfferRequests: Partial<OfferRequestModel>[] | [];
-    userOrganisation: UserOrganisationModel;
+    images?: ImageModel[];
+    vintageProducts?: VintageProductModel[];
+    timeline?: OfferRequestTimelineModel[];
+    subOfferRequests?: Partial<OfferRequestModel>[] | [];
+    userOrganisation?: UserOrganisationModel;
     options?: OfferRequestOptionModel[];
 }
 
@@ -420,7 +421,12 @@ interface OrganisationUserInvitationStatusModel {
     name: string;
 }
 
-interface UserInvitationModel {
+interface OrganisationUserInvitationModel {
+    organisation?: Partial<OrganisationModel>;
+    invitedBy?: UserAccountModel;
+    acceptedByUserOrganisation?: UserOrganisationModel;
+    revokedBy?: UserAccountModel | null;
+    roles?: RoleModel[] | [];
     status: OrganisationUserInvitationStatusModel;
     token: string;
     expiredAt: Date;
@@ -429,12 +435,6 @@ interface UserInvitationModel {
     personLastName: string;
     personEmail: string;
     acceptedAt: Date | null;
-    invitedBy: UserModel;
-    acceptedBy: UserModel | null;
-    revokedBy: UserModel | null;
-    roles: RoleModel[] | [];
-    organisation: Partial<OrganisationModel>;
-    acceptedByUserOrganisation: UserOrganisationModel;
 }
 
-export type { B2bMarketPriceModel, ContactPointModel, ContactTypeModel, CountryModel, CurrencyRateModel, CustomerModel, FilterCriteriaModel, GenderModel, ImageModel, ImageTypeModel, ImageVariationModel, ImportFileHeaderModel, ImportResolvedFileHeaderValueModel, MarginMarketModel, MarginOrganisationModel, NotificationChannelModel, NotificationModel, NotificationTypeModel, OfferAlertModel, OfferAlertTimelineModel, OfferModel, OfferRequestModel, OfferRequestOptionModel, OfferRequestStatusModel, OfferRequestTimelineModel, OrganisationModel, OrganisationUserInvitationStatusModel, PermissionModel, PersonModel, PostalAddressModel, PriceModel, RegionModel, RoleModel, SellerModel, SupplierModel, TelephoneModel, UploadModel, UploadVisibilityTypeModel, UserAccountModel, UserInvitationModel, UserModel, UserOrganisationModel, UserOrganisationStatusModel, UserStatusModel, VatTaxModel, VintageModel, VintageProductModel, VintageRatingModel, VintageScoreAuthorModel, VintageScoreModel, WineModel, WineTypeModel, WineryModel };
+export type { B2bMarketPriceModel, ContactPointModel, ContactTypeModel, CountryModel, CurrencyRateModel, CustomerModel, FilterCriteriaModel, GenderModel, ImageModel, ImageTypeModel, ImageVariationModel, ImportFileHeaderModel, ImportResolvedFileHeaderValueModel, MarginMarketModel, MarginOrganisationModel, NotificationChannelModel, NotificationModel, NotificationTypeModel, OfferAlertModel, OfferAlertTimelineModel, OfferModel, OfferRequestModel, OfferRequestOptionModel, OfferRequestStatusModel, OfferRequestTimelineModel, OrganisationModel, OrganisationUserInvitationModel, OrganisationUserInvitationStatusModel, PermissionModel, PersonModel, PostalAddressModel, PriceModel, RegionModel, RoleModel, SellerModel, SupplierModel, TelephoneModel, UploadModel, UploadVisibilityTypeModel, UserAccountModel, UserOrganisationModel, UserOrganisationStatusModel, UserStatusModel, VatTaxModel, VintageModel, VintageProductModel, VintageRatingModel, VintageScoreAuthorModel, VintageScoreModel, WineModel, WineTypeModel, WineryModel };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { CurrencyCodeEnum, UploadVisibilityTypeEnum, ContactPointTypeEnum, CurrencyRateSourceEnum, OrganisationStatusEnum, UserStatusEnum, GenderEnum, LocaleEnum, ImageVariationEnum, ImageTypeEnum, UserOrganisationStatusEnum, TimezoneEnum, DateTimeFormatEnum, OfferAlertFilterCriteriaFieldEnum, FilterOperatorEnum, UploadStatusEnum, UploadTypeEnum, CountryEnum, NotificationChannelEnum, NotificationTypeEnum, VintageScoreAuthorEnum, PackageEnum, OfferAlertTimelineActionEnum, OfferRequestStatusEnum, OfferRequestOptionEnum, OfferRequestOptionStatusEnum, OfferRequestTimelineActionEnum, OrganisationUserInvitationStatusEnum } from '@vini-wine/core-enums';
+import { CurrencyCodeEnum, UploadVisibilityTypeEnum, ContactPointTypeEnum, CountryEnum, OrganisationStatusEnum, UserOrganisationStatusEnum, GenderEnum, LocaleEnum, UserStatusEnum, ImageVariationEnum, ImageTypeEnum, TimezoneEnum, DateTimeFormatEnum, CurrencyRateSourceEnum, OfferAlertFilterCriteriaFieldEnum, FilterOperatorEnum, UploadStatusEnum, UploadTypeEnum, NotificationTypeEnum, NotificationChannelEnum, VintageRatingEnum, VintageScoreAuthorEnum, PackageEnum, OfferAlertTimelineActionEnum, OfferRequestStatusEnum, OfferRequestOptionEnum, OfferRequestOptionStatusEnum, OfferRequestTimelineActionEnum, OrganisationUserInvitationStatusEnum } from '@vini-wine/core-enums';
 
 interface PriceModel {
     priceMicros: number;
@@ -23,32 +23,11 @@ interface ContactTypeModel {
 
 interface TelephoneModel {
     number: string;
-    countryCode: string;
-}
-
-interface ContactPointModel extends UUID {
-    email: string | null;
-    telephone: TelephoneModel | null;
-    name: string;
-    contactType: ContactTypeModel;
-}
-
-interface CountryModel {
-    name: string;
-    codeAlpha2: string;
-    codeAlpha3: string;
-    codeUn: string;
-}
-
-interface CurrencyRateModel {
-    currencyCode: CurrencyCodeEnum;
-    rate: number;
-    synchronizedAt: Date;
-    source: CurrencyRateSourceEnum;
+    countryCode: CountryEnum;
 }
 
 interface PostalAddressModel {
-    countryCode: string;
+    countryCode: CountryEnum;
     locality: string;
     region: string | null;
     postalCode: string;
@@ -56,7 +35,7 @@ interface PostalAddressModel {
 }
 
 interface VatTaxModel {
-    countryCode: string;
+    countryCode: CountryEnum;
     value: string;
 }
 
@@ -87,24 +66,40 @@ interface PermissionModel extends UUID {
     action: string;
 }
 
-interface UserStatusModel {
-    id: UserStatusEnum;
+interface UserOrganisationStatusModel {
+    id: UserOrganisationStatusEnum;
     name: string;
 }
 
+interface UserOrganisationModel {
+    organisation: OrganisationModel;
+    createdAt: Date;
+    isOrganisationOwner: boolean;
+    isUserDefaultOrganisation: boolean;
+    status: UserOrganisationStatusModel;
+    user?: UserAccountModel;
+    permissions?: PermissionModel[];
+    roles?: RoleModel[];
+}
+
 interface GenderModel extends UUID {
     id: GenderEnum;
     name: string;
 }
 
 interface PersonModel extends UUID {
+    gender: GenderModel;
     firstName: string;
     lastName: string;
     preferredLanguage: LocaleEnum;
-    gender: GenderModel;
     preferredCurrency: CurrencyCodeEnum;
 }
 
+interface UserStatusModel {
+    id: UserStatusEnum;
+    name: string;
+}
+
 interface ImageVariationModel {
     id: ImageVariationEnum;
 }
@@ -123,38 +118,6 @@ interface ImageModel extends UUID {
     type: ImageTypeModel;
 }
 
-interface UserModel extends UUID {
-    person: PersonModel;
-    defaultUserOrganisation?: UserOrganisationModel;
-    permissions?: PermissionModel[];
-    roles?: RoleModel[];
-    userOrganisations?: UserOrganisationModel[];
-    numNotificationsUnPreRead?: number;
-    avatar?: ImageModel;
-    status: UserStatusModel;
-    email: string;
-    emailVerified: boolean;
-    lastLoginAt: Date;
-    createdAt: Date;
-    updatedAt: Date;
-}
-
-interface UserOrganisationStatusModel {
-    id: UserOrganisationStatusEnum;
-    name: string;
-}
-
-interface UserOrganisationModel {
-    organisation: OrganisationModel;
-    createdAt: Date;
-    isOrganisationOwner: boolean;
-    isUserDefaultOrganisation: boolean;
-    status: UserOrganisationStatusModel;
-    user?: UserModel;
-    permissions?: PermissionModel[];
-    roles?: RoleModel[];
-}
-
 interface UserAccountModel extends UUID {
     person: PersonModel;
     defaultUserOrganisation?: UserOrganisationModel;
@@ -176,7 +139,7 @@ interface UserAccountModel extends UUID {
 interface OrganisationModel extends UUID {
     suppliers?: Partial<SupplierModel>[];
     billingPostalAddress?: PostalAddressModel;
-    defaultShippingPostalAddress?: PostalAddressModel;
+    defaultShippingPostalAddress?: PostalAddressModel | null;
     organisationOwner?: Partial<UserAccountModel>;
     registeredBy?: Partial<UserAccountModel>;
     userOrganisations?: UserOrganisationModel[];
@@ -184,7 +147,7 @@ interface OrganisationModel extends UUID {
     numSuppliers?: number;
     numSuppliedSuppliers?: number;
     numUploads?: number;
-    avatar?: ImageModel;
+    avatar?: ImageModel | null;
     name: string;
     legalName: string;
     vatTax: VatTaxModel;
@@ -193,6 +156,28 @@ interface OrganisationModel extends UUID {
     status: OrganisationStatusModel;
 }
 
+interface ContactPointModel extends UUID {
+    email: string | null;
+    telephone: TelephoneModel | null;
+    name: string;
+    contactType: ContactTypeModel;
+    createdOrganisation?: OrganisationModel;
+    createdUser?: UserAccountModel | null;
+}
+
+interface CountryModel {
+    codeAlpha2: CountryEnum;
+    codeAlpha3: string;
+    codeUn: string;
+}
+
+interface CurrencyRateModel {
+    currencyCode: CurrencyCodeEnum;
+    rate: number;
+    synchronizedAt: Date;
+    source: CurrencyRateSourceEnum;
+}
+
 interface CustomerModel extends UUID {
     isSupplier: boolean;
     name: string;
@@ -251,25 +236,23 @@ interface ImportResolvedFileHeaderValueModel {
 interface MarginMarketModel {
     countryCode: CountryEnum;
     margin: number;
+    organisation?: OrganisationModel;
+    createdBy?: UserAccountModel | null;
+    updatedBy?: UserAccountModel | null;
 }
 
 interface MarginOrganisationModel {
     margin: number;
-    marginOrganisation: Partial<OrganisationModel>;
-}
-
-interface NotificationChannelModel {
-    id: NotificationChannelEnum;
-    isActive: boolean;
-}
-
-interface NotificationTypeModel {
-    id: NotificationTypeEnum;
-    channels: NotificationChannelModel[];
+    marginOrganisation?: OrganisationModel;
+    organisation?: OrganisationModel;
+    createdBy?: UserAccountModel | null;
+    updatedBy?: UserAccountModel | null;
 }
 
 interface NotificationModel extends UUID {
-    type: Partial<NotificationTypeModel>;
+    type: {
+        id: NotificationTypeEnum;
+    };
     messagePlain: string;
     messageHtml: string | null;
     actionText: string;
@@ -280,14 +263,24 @@ interface NotificationModel extends UUID {
     name: string;
 }
 
+interface NotificationChannelModel {
+    id: NotificationChannelEnum;
+    isActive: boolean;
+}
+
+interface NotificationTypeModel {
+    id: NotificationTypeEnum;
+    channels: NotificationChannelModel[];
+}
+
 interface SellerModel extends UUID {
-    organisation: Partial<OrganisationModel>;
+    organisation?: OrganisationModel;
 }
 
 interface RegionModel extends UUID {
     country: CountryModel;
     mappedItems?: any;
-    parentRegion?: RegionModel;
+    parentRegion?: RegionModel | null;
     subRegions?: RegionModel[];
     images?: ImageModel[];
     name: string;
@@ -315,6 +308,8 @@ interface VintageRatingModel {
     numberOfRatings: number;
     averageOfRatings: number;
     updatedAt: Date;
+    status: VintageRatingEnum;
+    vintage?: VintageModel;
 }
 
 interface VintageScoreAuthorModel {
@@ -325,6 +320,7 @@ interface VintageScoreModel {
     scoreValue: number;
     scoreYear: number;
     author: VintageScoreAuthorModel;
+    vintage?: VintageModel;
 }
 
 interface VintageModel extends UUID {
@@ -354,27 +350,29 @@ interface OfferModel extends UUID {
     createdAt: Date;
 }
 
+interface OfferAlertTimelineModel {
+    actionCreatedAt: Date;
+    action: {
+        id: OfferAlertTimelineActionEnum;
+    };
+    offerAlert?: OfferAlertModel;
+    createdByUser?: UserAccountModel;
+}
+
 interface OfferAlertModel extends UUID {
     title: string;
     header: string;
     description: string | null;
-    backgroundImage: ImageModel | null;
     validFrom: string;
     validUntil: string;
     isExpired: boolean;
-    filterCriteria: FilterCriteriaModel[];
+    organisation?: OrganisationModel;
+    backgroundImage?: ImageModel | null;
+    filterCriteria?: FilterCriteriaModel[];
+    timeline?: OfferAlertTimelineModel;
     meta?: any;
 }
 
-interface OfferAlertTimelineModel {
-    actionCreatedAt: Date;
-    action: {
-        id: OfferAlertTimelineActionEnum;
-    };
-    offerAlert: OfferAlertModel;
-    createdByUser: Partial<UserAccountModel>;
-}
-
 interface OfferRequestStatusModel {
     id: OfferRequestStatusEnum;
     updatedAt: Date;
@@ -388,6 +386,7 @@ interface OfferRequestOptionModel {
     };
     requestedValue: string | null;
     providedValue: string | null;
+    offerRequest?: OfferRequestModel;
 }
 
 interface OfferRequestTimelineModel {
@@ -395,23 +394,25 @@ interface OfferRequestTimelineModel {
     action: {
         id: OfferRequestTimelineActionEnum;
     };
-    offerRequest: OfferRequestModel;
-    createdByUser: Partial<UserAccountModel>;
+    offerRequest?: OfferRequestModel;
+    createdByUser?: UserAccountModel | null;
 }
 
 interface OfferRequestModel extends UUID {
     status: OfferRequestStatusModel;
-    price: PriceModel | null;
+    createdAt: Date;
+    changedAt: Date;
+    updatedAt: Date;
     quantity: number;
-    images: ImageModel[];
+    price: PriceModel | null;
     offer: Partial<OfferModel> | null;
-    createdAt: Date;
     organisation: OrganisationModel;
-    vintageProducts: VintageProductModel[];
-    timeline: OfferRequestTimelineModel[];
     seller: OrganisationModel;
-    subOfferRequests: Partial<OfferRequestModel>[] | [];
-    userOrganisation: UserOrganisationModel;
+    images?: ImageModel[];
+    vintageProducts?: VintageProductModel[];
+    timeline?: OfferRequestTimelineModel[];
+    subOfferRequests?: Partial<OfferRequestModel>[] | [];
+    userOrganisation?: UserOrganisationModel;
     options?: OfferRequestOptionModel[];
 }
 
@@ -420,7 +421,12 @@ interface OrganisationUserInvitationStatusModel {
     name: string;
 }
 
-interface UserInvitationModel {
+interface OrganisationUserInvitationModel {
+    organisation?: Partial<OrganisationModel>;
+    invitedBy?: UserAccountModel;
+    acceptedByUserOrganisation?: UserOrganisationModel;
+    revokedBy?: UserAccountModel | null;
+    roles?: RoleModel[] | [];
     status: OrganisationUserInvitationStatusModel;
     token: string;
     expiredAt: Date;
@@ -429,12 +435,6 @@ interface UserInvitationModel {
     personLastName: string;
     personEmail: string;
     acceptedAt: Date | null;
-    invitedBy: UserModel;
-    acceptedBy: UserModel | null;
-    revokedBy: UserModel | null;
-    roles: RoleModel[] | [];
-    organisation: Partial<OrganisationModel>;
-    acceptedByUserOrganisation: UserOrganisationModel;
 }
 
-export type { B2bMarketPriceModel, ContactPointModel, ContactTypeModel, CountryModel, CurrencyRateModel, CustomerModel, FilterCriteriaModel, GenderModel, ImageModel, ImageTypeModel, ImageVariationModel, ImportFileHeaderModel, ImportResolvedFileHeaderValueModel, MarginMarketModel, MarginOrganisationModel, NotificationChannelModel, NotificationModel, NotificationTypeModel, OfferAlertModel, OfferAlertTimelineModel, OfferModel, OfferRequestModel, OfferRequestOptionModel, OfferRequestStatusModel, OfferRequestTimelineModel, OrganisationModel, OrganisationUserInvitationStatusModel, PermissionModel, PersonModel, PostalAddressModel, PriceModel, RegionModel, RoleModel, SellerModel, SupplierModel, TelephoneModel, UploadModel, UploadVisibilityTypeModel, UserAccountModel, UserInvitationModel, UserModel, UserOrganisationModel, UserOrganisationStatusModel, UserStatusModel, VatTaxModel, VintageModel, VintageProductModel, VintageRatingModel, VintageScoreAuthorModel, VintageScoreModel, WineModel, WineTypeModel, WineryModel };
+export type { B2bMarketPriceModel, ContactPointModel, ContactTypeModel, CountryModel, CurrencyRateModel, CustomerModel, FilterCriteriaModel, GenderModel, ImageModel, ImageTypeModel, ImageVariationModel, ImportFileHeaderModel, ImportResolvedFileHeaderValueModel, MarginMarketModel, MarginOrganisationModel, NotificationChannelModel, NotificationModel, NotificationTypeModel, OfferAlertModel, OfferAlertTimelineModel, OfferModel, OfferRequestModel, OfferRequestOptionModel, OfferRequestStatusModel, OfferRequestTimelineModel, OrganisationModel, OrganisationUserInvitationModel, OrganisationUserInvitationStatusModel, PermissionModel, PersonModel, PostalAddressModel, PriceModel, RegionModel, RoleModel, SellerModel, SupplierModel, TelephoneModel, UploadModel, UploadVisibilityTypeModel, UserAccountModel, UserOrganisationModel, UserOrganisationStatusModel, UserStatusModel, VatTaxModel, VintageModel, VintageProductModel, VintageRatingModel, VintageScoreAuthorModel, VintageScoreModel, WineModel, WineTypeModel, WineryModel };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { B2bMarketPriceModel } from \"./models/b2bMarketPrice\";\nimport { ContactPointModel } from \"./models/contactPoint\";\nimport { ContactTypeModel } from \"./models/contactType\";\nimport { CountryModel } from \"./models/country\";\nimport { CurrencyRateModel } from \"./models/currencyRate\";\nimport { CustomerModel } from \"./models/customer\";\nimport { FilterCriteriaModel } from \"./models/filterCriteria\";\nimport { GenderModel } from \"./models/gender\";\nimport { ImageModel } from \"./models/image\";\nimport { ImageTypeModel } from \"./models/imageType\";\nimport { ImageVariationModel } from \"./models/imageVariation\";\nimport { ImportFileHeaderModel } from \"./models/importFileHeader\";\nimport { ImportResolvedFileHeaderValueModel } from \"./models/importResolvedFileHeaderValue\";\nimport { MarginMarketModel } from \"./models/marginMarket\";\nimport { MarginOrganisationModel } from \"./models/marginOrganisation\";\nimport { NotificationModel } from \"./models/notification\";\nimport { NotificationChannelModel } from \"./models/notificationChannel\";\nimport { NotificationTypeModel } from \"./models/notificationType\";\nimport { OfferModel } from \"./models/offer\";\nimport { OfferAlertModel } from \"./models/offerAlert\";\nimport { OfferAlertTimelineModel } from \"./models/offerAlertTimeline\";\nimport { OfferRequestModel } from \"./models/offerRequest\";\nimport { OfferRequestOptionModel } from \"./models/offerRequestOption\";\nimport { OfferRequestStatusModel } from \"./models/offerRequestStatus\";\nimport { OfferRequestTimelineModel } from \"./models/offerRequestTimeline\";\nimport { OrganisationModel } from \"./models/organisation\";\nimport { OrganisationUserInvitationStatusModel } from \"./models/organisationUserInvitationStatus\";\nimport { PermissionModel } from \"./models/permission\";\nimport { PersonModel } from \"./models/person\";\nimport { PostalAddressModel } from \"./models/postalAddress\";\nimport { PriceModel } from \"./models/price\";\nimport { RegionModel } from \"./models/region\";\nimport { RoleModel } from \"./models/role\";\nimport { SellerModel } from \"./models/seller\";\nimport { SupplierModel } from \"./models/supplier\";\nimport { TelephoneModel } from \"./models/telephone\";\nimport { UploadModel } from \"./models/upload\";\nimport { UploadVisibilityTypeModel } from \"./models/uploadVisibilityType\";\nimport { UserModel } from \"./models/user\";\nimport { UserAccountModel } from \"./models/userAccount\";\nimport { UserInvitationModel } from \"./models/userInvitation\";\nimport { UserOrganisationModel } from \"./models/userOrganisation\";\nimport { UserOrganisationStatusModel } from \"./models/userOrganisationStatus\";\nimport { UserStatusModel } from \"./models/userStatus\";\nimport { VatTaxModel } from \"./models/vatTax\";\nimport { VintageModel } from \"./models/vintage\";\nimport { VintageProductModel } from \"./models/vintageProduct\";\nimport { VintageRatingModel } from \"./models/vintageRating\";\nimport { VintageScoreModel } from \"./models/vintageScore\";\nimport { VintageScoreAuthorModel } from \"./models/vintageScoreAuthor\";\nimport { WineModel } from \"./models/wine\";\nimport { WineryModel } from \"./models/winery\";\nimport { WineTypeModel } from \"./models/wineType\";\n\nexport {\n  B2bMarketPriceModel,\n  ContactPointModel,\n  ContactTypeModel,\n  CountryModel,\n  CurrencyRateModel,\n  CustomerModel,\n  FilterCriteriaModel,\n  GenderModel,\n  ImageModel,\n  ImageTypeModel,\n  ImageVariationModel,\n  ImportFileHeaderModel,\n  ImportResolvedFileHeaderValueModel,\n  MarginMarketModel,\n  MarginOrganisationModel,\n  NotificationModel,\n  NotificationChannelModel,\n  NotificationTypeModel,\n  OfferModel,\n  OfferAlertModel,\n  OfferAlertTimelineModel,\n  OfferRequestModel,\n  OfferRequestOptionModel,\n  OfferRequestStatusModel,\n  OfferRequestTimelineModel,\n  OrganisationModel,\n  OrganisationUserInvitationStatusModel,\n  PermissionModel,\n  PersonModel,\n  PostalAddressModel,\n  PriceModel,\n  RegionModel,\n  RoleModel,\n  SellerModel,\n  SupplierModel,\n  TelephoneModel,\n  UploadModel,\n  UploadVisibilityTypeModel,\n  UserModel,\n  UserAccountModel,\n  UserInvitationModel,\n  UserOrganisationModel,\n  UserOrganisationStatusModel,\n  UserStatusModel,\n  VatTaxModel,\n  VintageModel,\n  VintageProductModel,\n  VintageRatingModel,\n  VintageScoreModel,\n  VintageScoreAuthorModel,\n  WineModel,\n  WineryModel,\n  WineTypeModel,\n};\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { B2bMarketPriceModel } from \"./models/b2bMarketPrice\";\nimport { ContactPointModel } from \"./models/contactPoint\";\nimport { ContactTypeModel } from \"./models/contactType\";\nimport { CountryModel } from \"./models/country\";\nimport { CurrencyRateModel } from \"./models/currencyRate\";\nimport { CustomerModel } from \"./models/customer\";\nimport { FilterCriteriaModel } from \"./models/filterCriteria\";\nimport { GenderModel } from \"./models/gender\";\nimport { ImageModel } from \"./models/image\";\nimport { ImageTypeModel } from \"./models/imageType\";\nimport { ImageVariationModel } from \"./models/imageVariation\";\nimport { ImportFileHeaderModel } from \"./models/importFileHeader\";\nimport { ImportResolvedFileHeaderValueModel } from \"./models/importResolvedFileHeaderValue\";\nimport { MarginMarketModel } from \"./models/marginMarket\";\nimport { MarginOrganisationModel } from \"./models/marginOrganisation\";\nimport { NotificationModel } from \"./models/notification\";\nimport { NotificationChannelModel } from \"./models/notificationChannel\";\nimport { NotificationTypeModel } from \"./models/notificationType\";\nimport { OfferModel } from \"./models/offer\";\nimport { OfferAlertModel } from \"./models/offerAlert\";\nimport { OfferAlertTimelineModel } from \"./models/offerAlertTimeline\";\nimport { OfferRequestModel } from \"./models/offerRequest\";\nimport { OfferRequestOptionModel } from \"./models/offerRequestOption\";\nimport { OfferRequestStatusModel } from \"./models/offerRequestStatus\";\nimport { OfferRequestTimelineModel } from \"./models/offerRequestTimeline\";\nimport { OrganisationModel } from \"./models/organisation\";\nimport { OrganisationUserInvitationStatusModel } from \"./models/organisationUserInvitationStatus\";\nimport { PermissionModel } from \"./models/permission\";\nimport { PersonModel } from \"./models/person\";\nimport { PostalAddressModel } from \"./models/postalAddress\";\nimport { PriceModel } from \"./models/price\";\nimport { RegionModel } from \"./models/region\";\nimport { RoleModel } from \"./models/role\";\nimport { SellerModel } from \"./models/seller\";\nimport { SupplierModel } from \"./models/supplier\";\nimport { TelephoneModel } from \"./models/telephone\";\nimport { UploadModel } from \"./models/upload\";\nimport { UploadVisibilityTypeModel } from \"./models/uploadVisibilityType\";\nimport { UserAccountModel } from \"./models/userAccount\";\nimport { OrganisationUserInvitationModel } from \"./models/organisationUserInvitation\";\nimport { UserOrganisationModel } from \"./models/userOrganisation\";\nimport { UserOrganisationStatusModel } from \"./models/userOrganisationStatus\";\nimport { UserStatusModel } from \"./models/userStatus\";\nimport { VatTaxModel } from \"./models/vatTax\";\nimport { VintageModel } from \"./models/vintage\";\nimport { VintageProductModel } from \"./models/vintageProduct\";\nimport { VintageRatingModel } from \"./models/vintageRating\";\nimport { VintageScoreModel } from \"./models/vintageScore\";\nimport { VintageScoreAuthorModel } from \"./models/vintageScoreAuthor\";\nimport { WineModel } from \"./models/wine\";\nimport { WineryModel } from \"./models/winery\";\nimport { WineTypeModel } from \"./models/wineType\";\n\nexport {\n  B2bMarketPriceModel,\n  ContactPointModel,\n  ContactTypeModel,\n  CountryModel,\n  CurrencyRateModel,\n  CustomerModel,\n  FilterCriteriaModel,\n  GenderModel,\n  ImageModel,\n  ImageTypeModel,\n  ImageVariationModel,\n  ImportFileHeaderModel,\n  ImportResolvedFileHeaderValueModel,\n  MarginMarketModel,\n  MarginOrganisationModel,\n  NotificationModel,\n  NotificationChannelModel,\n  NotificationTypeModel,\n  OfferModel,\n  OfferAlertModel,\n  OfferAlertTimelineModel,\n  OfferRequestModel,\n  OfferRequestOptionModel,\n  OfferRequestStatusModel,\n  OfferRequestTimelineModel,\n  OrganisationModel,\n  OrganisationUserInvitationStatusModel,\n  PermissionModel,\n  PersonModel,\n  PostalAddressModel,\n  PriceModel,\n  RegionModel,\n  RoleModel,\n  SellerModel,\n  SupplierModel,\n  TelephoneModel,\n  UploadModel,\n  UploadVisibilityTypeModel,\n  UserAccountModel,\n  OrganisationUserInvitationModel,\n  UserOrganisationModel,\n  UserOrganisationStatusModel,\n  UserStatusModel,\n  VatTaxModel,\n  VintageModel,\n  VintageProductModel,\n  VintageRatingModel,\n  VintageScoreModel,\n  VintageScoreAuthorModel,\n  WineModel,\n  WineryModel,\n  WineTypeModel,\n};\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vini-wine/admin-core-models",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Core package for Vini models related to the admin API.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",