From 488f4ee9aab9fb87d198af93fdb860cc626963d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me>
Date: Sat, 24 Feb 2024 15:24:10 +0100
Subject: [PATCH] Models => Move to GitBeaker types
---
models/Assignment.ts | 10 +++++-----
models/Exercise.ts | 11 +++++------
models/ExerciseAssignment.ts | 4 ++--
models/User.ts | 10 +++++-----
4 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/models/Assignment.ts b/models/Assignment.ts
index c56f425..554d4a5 100644
--- a/models/Assignment.ts
+++ b/models/Assignment.ts
@@ -1,14 +1,14 @@
-import GitlabRepository from '../../shared/types/Gitlab/GitlabRepository';
-import User from './User';
-import Exercise from './Exercise';
+import User from './User';
+import Exercise from './Exercise';
+import * as Gitlab from '@gitbeaker/rest';
interface Assignment {
name: string;
gitlabId: number;
gitlabLink: string;
- gitlabCreationInfo: GitlabRepository;
- gitlabLastInfo: GitlabRepository;
+ gitlabCreationInfo: Gitlab.ProjectSchema;
+ gitlabLastInfo: Gitlab.ProjectSchema;
gitlabLastInfoDate: string;
published: boolean;
diff --git a/models/Exercise.ts b/models/Exercise.ts
index b8a2b83..0ec86f6 100644
--- a/models/Exercise.ts
+++ b/models/Exercise.ts
@@ -1,7 +1,6 @@
-import GitlabRepository from '../../shared/types/Gitlab/GitlabRepository';
-import * as Gitlab from '@gitbeaker/rest';
-import User from './User';
-import Assignment from './Assignment';
+import User from './User';
+import Assignment from './Assignment';
+import * as Gitlab from '@gitbeaker/rest';
interface Exercise {
@@ -10,8 +9,8 @@ interface Exercise {
name: string;
gitlabId: number;
gitlabLink: string;
- gitlabCreationInfo: GitlabRepository;
- gitlabLastInfo: GitlabRepository;
+ gitlabCreationInfo: Gitlab.ProjectSchema;
+ gitlabLastInfo: Gitlab.ProjectSchema;
gitlabLastInfoDate: string;
members: Array<User> | undefined;
diff --git a/models/ExerciseAssignment.ts b/models/ExerciseAssignment.ts
index 727447f..ec75eda 100644
--- a/models/ExerciseAssignment.ts
+++ b/models/ExerciseAssignment.ts
@@ -1,12 +1,12 @@
import AssignmentFile from '../../shared/types/Dojo/AssignmentFile';
import Assignment from './Assignment';
-import GitlabFile from '../../shared/types/Gitlab/GitlabFile';
+import * as Gitlab from '@gitbeaker/rest';
interface ExerciseAssignment {
assignment: Assignment;
assignmentFile: AssignmentFile;
- immutable: Array<GitlabFile>;
+ immutable: Array<Gitlab.RepositoryFileSchema>;
}
diff --git a/models/User.ts b/models/User.ts
index 0be9e52..df757d1 100644
--- a/models/User.ts
+++ b/models/User.ts
@@ -1,7 +1,7 @@
-import UserRole from './UserRole';
-import Exercise from './Exercise';
-import Assignment from './Assignment';
-import GitlabProfile from '../../shared/types/Gitlab/GitlabProfile';
+import UserRole from './UserRole';
+import Exercise from './Exercise';
+import Assignment from './Assignment';
+import * as Gitlab from '@gitbeaker/rest';
interface User {
@@ -10,7 +10,7 @@ interface User {
mail: string;
role: UserRole;
gitlabUsername: string;
- gitlabLastInfo: GitlabProfile;
+ gitlabLastInfo: Gitlab.ExpandedUserSchema;
isTeachingStaff: boolean;
isAdmin: boolean;
deleted: boolean;
--
GitLab