remove code duplication

jplag · Nov 27, 2023 · 961f98d · 961f98d
1 parent 2f5efab
commit 961f98d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 35 deletions.
diff --git a/report-viewer/src/components/VersionInfoComponent.vue b/report-viewer/src/components/VersionInfoComponent.vue
@@ -29,19 +29,8 @@
 
 <script setup lang="ts">
 import { Version } from '@/model/Version'
-import versionJson from '@/version.json'
 import { ref } from 'vue'
-import { OverviewFactory } from '@/model/factories/OverviewFactory'
-
-const reportViewerVersion: Version =
-  versionJson['report_viewer_version'] !== undefined
-    ? OverviewFactory.extractVersion(versionJson['report_viewer_version'])
-    : new Version(-1, -1, -1)
-
-const minimalReportVersion: Version =
-  versionJson['minimal_report_version'] !== undefined
-    ? OverviewFactory.extractVersion(versionJson['minimal_report_version'])
-    : new Version(-1, -1, -1)
+import { minimalReportVersion, reportViewerVersion } from '@/model/Version'
 
 const newestVersion = ref(new Version(-1, -1, -1))
 

diff --git a/report-viewer/src/model/Version.ts b/report-viewer/src/model/Version.ts
@@ -1,3 +1,5 @@
+import versionJson from '@/version.json'
+
 /**
  * Version of the report viewer.
  */
@@ -33,4 +35,14 @@ export class Version {
   public isInvalid(): boolean {
     return this.major < 0 || this.minor < 0 || this.patch < 0
   }
+
+  public static fromJsonField(versionField: Record<string, number> | undefined): Version {
+    if (versionField) {
+      return new Version(versionField.major, versionField.minor, versionField.patch)
+    }
+    return new Version(-1, -1, -1)
+  }
 }
+
+export const reportViewerVersion = Version.fromJsonField(versionJson['report_viewer_version'])
+export const minimalReportVersion = Version.fromJsonField(versionJson['minimal_report_version'])
diff --git a/report-viewer/src/model/factories/OverviewFactory.ts b/report-viewer/src/model/factories/OverviewFactory.ts
@@ -2,8 +2,7 @@ import { Overview } from '../Overview'
 import type { ComparisonListElement } from '../ComparisonListElement'
 import type { Cluster } from '@/model/Cluster'
 import { store } from '@/stores/store'
-import { Version } from '../Version'
-import versionJson from '@/version.json'
+import { Version, minimalReportVersion, reportViewerVersion } from '../Version'
 import { getLanguageParser } from '../Language'
 import { Distribution } from '../Distribution'
 import { MetricType } from '../MetricType'
@@ -15,16 +14,6 @@ import { TenValueDistribution } from '../TenValueDistribution'
  * Factory class for creating Overview objects
  */
 export class OverviewFactory extends BaseFactory {
-  static reportViewerVersion: Version =
-    versionJson['report_viewer_version'] !== undefined
-      ? this.extractVersion(versionJson['report_viewer_version'] as Record<string, number>)
-      : new Version(-1, -1, -1)
-
-  static minimalReportVersion: Version =
-    versionJson['minimal_report_version'] !== undefined
-      ? this.extractVersion(versionJson['minimal_report_version'] as Record<string, number>)
-      : new Version(-1, -1, -1)
-
   /**
    * Gets the overview file based on the used mode (zip, local, single).
    */
@@ -38,13 +27,9 @@ export class OverviewFactory extends BaseFactory {
    */
   private static extractOverview(json: Record<string, unknown>): Overview {
     const versionField = json.jplag_version as Record<string, number>
-    const jplagVersion = this.extractVersion(versionField)
+    const jplagVersion = Version.fromJsonField(versionField)
 
-    OverviewFactory.compareVersions(
-      jplagVersion,
-      this.reportViewerVersion,
-      this.minimalReportVersion
-    )
+    OverviewFactory.compareVersions(jplagVersion, reportViewerVersion, minimalReportVersion)
 
     const submissionFolder = json.submission_folder_path as Array<string>
     const baseCodeFolder = json.base_code_folder_path as string
@@ -73,10 +58,6 @@ export class OverviewFactory extends BaseFactory {
     )
   }
 
-  public static extractVersion(versionField: Record<string, number>): Version {
-    return new Version(versionField.major, versionField.minor, versionField.patch)
-  }
-
   private static extractDistributions(
     json: Record<string, unknown>
   ): Record<MetricType, Distribution> {
@@ -244,7 +225,7 @@ export class OverviewFactory extends BaseFactory {
         ') is older than the minimal support version of the report viewer(' +
         reportViewerVersion.toString() +
         '). ' +
-        'Can not read report.'
+        'Can not read the report.'
       )
     }
   }