From 04b3a985a963b87aed586e6b06718dd3052ad32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <git@minelli.me>
Date: Fri, 15 Mar 2024 19:23:24 +0100
Subject: [PATCH] Sonar => Reduce code duplication
---
helpers/Dojo/SharedAssignmentHelper.ts | 2 +-
helpers/Dojo/SharedExerciseHelper.ts | 4 ----
managers/SharedGitlabManager.ts | 4 ++--
3 files changed, 3 insertions(+), 7 deletions(-)
delete mode 100644 helpers/Dojo/SharedExerciseHelper.ts
diff --git a/helpers/Dojo/SharedAssignmentHelper.ts b/helpers/Dojo/SharedAssignmentHelper.ts
index c729540..0193b3e 100644
--- a/helpers/Dojo/SharedAssignmentHelper.ts
+++ b/helpers/Dojo/SharedAssignmentHelper.ts
@@ -20,7 +20,7 @@ class SharedAssignmentHelper {
}
async isPublishable(repositoryId: number): Promise<{ isPublishable: boolean, lastPipeline: Gitlab.PipelineSchema | null, status?: { code: DojoStatusCode, message: string } }> {
- const pipelines = await GlobalHelper.sharedGitlabManager.getRepositoryPipelines(repositoryId, 'main');
+ const pipelines = await GlobalHelper.gitlabManager.getRepositoryPipelines(repositoryId, 'main');
if ( pipelines.length > 0 ) {
const lastPipeline = pipelines[0];
if ( lastPipeline.status !== GitlabPipelineStatus.SUCCESS.valueOf() ) {
diff --git a/helpers/Dojo/SharedExerciseHelper.ts b/helpers/Dojo/SharedExerciseHelper.ts
deleted file mode 100644
index 97ccf7c..0000000
--- a/helpers/Dojo/SharedExerciseHelper.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-class SharedExerciseHelper {}
-
-
-export default new SharedExerciseHelper();
\ No newline at end of file
diff --git a/managers/SharedGitlabManager.ts b/managers/SharedGitlabManager.ts
index 4cea2ee..8a77156 100644
--- a/managers/SharedGitlabManager.ts
+++ b/managers/SharedGitlabManager.ts
@@ -8,7 +8,7 @@ import { StatusCodes } from 'http-status-c
class SharedGitlabManager {
- private api!: GitlabCore.Gitlab<false>;
+ protected api!: GitlabCore.Gitlab<false>;
private readonly refreshTokenFunction?: () => Promise<string>;
setToken(token: string) {
@@ -23,7 +23,7 @@ class SharedGitlabManager {
this.setToken(token);
}
- private async executeGitlabRequest<T>(request: () => Promise<T>, refreshTokenIfNeeded: boolean = true): Promise<T> {
+ protected async executeGitlabRequest<T>(request: () => Promise<T>, refreshTokenIfNeeded: boolean = true): Promise<T> {
try {
return await request();
} catch ( error ) {
--
GitLab