From 64b0928c960b83be3b1d5b5ac888ede75f82018e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20L=C3=A1szl=C3=B3?= <rlacko99@gmail.com>
Date: Sun, 24 Jan 2021 22:56:21 +0100
Subject: [PATCH] update types to match backend
---
src/types/News.ts | 2 +-
src/types/Profile.ts | 17 ++++++++---------
src/types/Term.ts | 16 ++++------------
3 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/types/News.ts b/src/types/News.ts
index 58b6d12..c2c6470 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 b6d94cb..190d3cb 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 0f40552..95267d0 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;
--
GitLab