Merged with develop

src/interfaces/entity.ts

@@ -4,6 +4,11 @@ export interface Entity {
 	id: string;
 	label: string;
 	licenses: number;
+	expiryDate?: Date | null
+	payment?: {
+		currency: string
+		price: number
+	}
 }
 
 export interface Role {

src/interfaces/exam.ts

@@ -5,7 +5,7 @@ export type Exam = ReadingExam | ListeningExam | WritingExam | SpeakingExam | Le
 export type Variant = "full" | "partial";
 export type InstructorGender = "male" | "female" | "varied";
 
-export type Difficulty =  BasicDifficulty | CEFRLevels;
+export type Difficulty = BasicDifficulty | CEFRLevels;
 
 // Left easy, medium and hard to support older exam versions
 export type BasicDifficulty = "easy" | "medium" | "hard";
@@ -20,6 +20,7 @@ export interface ExamBase {
 	variant?: Variant;
 	difficulty?: Difficulty;
 	owners?: string[];
+	entities?: string[]
 	shuffle?: boolean;
 	createdBy?: string; // option as it has been added later
 	createdAt?: string; // option as it has been added later
@@ -52,7 +53,7 @@ export interface LevelExam extends ExamBase {
 }
 
 export interface LevelPart extends Section {
-	// to support old exams that have reading passage mc on context 
+	// to support old exams that have reading passage mc on context
 	context?: string;
 	exercises: Exercise[];
 	audio?: {

src/interfaces/paymob.ts

@@ -28,7 +28,7 @@ interface Customer {
 	extras: IntentionExtras;
 }
 
-type IntentionExtras = {[key: string]: string | number};
+type IntentionExtras = { [key: string]: string | number | undefined };
 
 export interface IntentionResult {
 	payment_keys: PaymentKeysItem[];

src/interfaces/paypal.ts

@@ -32,6 +32,7 @@ export type DurationUnit = "weeks" | "days" | "months" | "years";
 export interface Payment {
 	id: string;
 	corporate: string;
+	entity?: string
 	agent?: string;
 	agentCommission: number;
 	agentValue: number;

src/interfaces/user.ts

@@ -28,6 +28,7 @@ export interface BasicUser {
 export interface StudentUser extends BasicUser {
 	type: "student";
 	studentID?: string;
+	averageLevel?: number
 	preferredGender?: InstructorGender;
 	demographicInformation?: DemographicInformation;
 	preferredTopics?: string[];