diff --git a/src/types/News.ts b/src/types/News.ts index 58b6d120a40e1a3f36ee3938560d77917d062034..c2c6470b389b9ef51438d7420105d3530f0c032a 100644 --- a/src/types/News.ts +++ b/src/types/News.ts @@ -2,6 +2,6 @@ export interface INews { title: string; text: string; publishedAt: Date; - publishedBy?: string; + publishedBy: string; updatedBy?: string; } diff --git a/src/types/Profile.ts b/src/types/Profile.ts index b6d94cbe2db5d2bf89298b70e0ff44222f3caea9..190d3cbc23b0019d864b036fa3e03769787e17ac 100644 --- a/src/types/Profile.ts +++ b/src/types/Profile.ts @@ -1,6 +1,6 @@ export enum Role { Admin = 'ADMIN', - User = 'USER', // default + User = 'USER', } export interface INotice { @@ -13,15 +13,14 @@ export interface INotice { export interface IWarning { _id: string; text: string; - date?: Date; - givenBy?: string; + date: Date; + givenBy: string; } export interface IProfile { - _id: string; - externalId?: string; - studentCardNumber: string; - roomNumber: Number; + externalId: string; + studentCardNumber?: string; + roomNumber?: Number; newPicture?: string; acceptedPicture?: string; role: Role; @@ -29,6 +28,6 @@ export interface IProfile { name: string; isStaffMember?: boolean; staffMemberText?: string; - warnings?: IWarning[]; - notices?: INotice[]; + warnings: IWarning[]; + notices: INotice[]; } diff --git a/src/types/Term.ts b/src/types/Term.ts index 0f405522973ce7365a8bf0952c6c8152d07d0acc..95267d0f0049d2c09690643695204cdde53b06f7 100644 --- a/src/types/Term.ts +++ b/src/types/Term.ts @@ -1,25 +1,17 @@ export enum MemberState { Accepted = 'ACCEPTED', - Applied = 'APPLIED', // default + Applied = 'APPLIED', Rejected = 'REJECTED', } export enum CardState { - Created = 'CREATED', // default + Created = 'CREATED', Printed = 'PRINTED', Given = 'GIVEN', } -// When Term members listed -export interface IUserAsMember { - _id: string; - name: string; - warnings: number; -} - export interface IMember { - _id: string; - user: IUserAsMember | string; // ... | Mongoose ID + user: string; memberState: MemberState; cardState: CardState; cardNumber: number; @@ -29,7 +21,7 @@ export interface IMember { export interface ITerm { backgroundFile?: string; name: string; - createDate: Date; + createDate?: Date; startDate: Date; endDate: Date; deadline: Date;