refactor(platform): remove isApiCompatible

as the error is thrown from getApiVersion()
geonetwork · Dec 2, 2023 · 17b3c52 · 17b3c52
1 parent d51d1ab
commit 17b3c52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts b/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts
@@ -17,7 +17,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   private readonly type = 'GeoNetwork'
   private me$: Observable<UserModel>
   private users$: Observable<UserModel[]>
-  isAnonymous$: Observable<boolean>
+  private isAnonymous$: Observable<boolean>
 
   private settings$ = of(true).pipe(
     switchMap(() => this.siteApiService.getSiteOrPortalDescription()),
@@ -26,18 +26,16 @@ export class Gn4PlatformService implements PlatformServiceInterface {
 
   private readonly apiVersion$ = this.settings$.pipe(
     map((info) => info['system/platform/version'] as string),
+    tap((version) => {
+      if (ltr(version, minApiVersion)) {
+        throw new Error(
+          `Gn4 API version is not compatible.\nMinimum: ${minApiVersion}\nYour version: ${version}`
+        )
+      }
+    }),
     shareReplay(1)
   )
 
-  private readonly isApiCompatible$ = this.apiVersion$.pipe(
-    tap(
-      (version) =>
-        version < minApiVersion &&
-        console.warn(`The GeoNetwork Api version is too low ${version}`)
-    ),
-    map((version) => version >= minApiVersion)
-  )
-
   constructor(
     private siteApiService: SiteApiService,
     private meApi: MeApiService,
@@ -62,9 +60,6 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   getApiVersion(): Observable<string> {
     return this.apiVersion$
   }
-  isApiCompatible(): Observable<boolean> {
-    return this.isApiCompatible$
-  }
 
   getMe(): Observable<UserModel> {
     return this.me$

diff --git a/libs/common/domain/src/lib/platform.service.interface.ts b/libs/common/domain/src/lib/platform.service.interface.ts
@@ -5,7 +5,6 @@ import { Organization } from './model/record/organization.model'
 export abstract class PlatformServiceInterface {
   abstract getType(): string
   abstract getApiVersion(): Observable<string>
-  abstract isApiCompatible(): Observable<boolean>
 
   abstract getMe(): Observable<UserModel>
   abstract isAnonymous(): Observable<boolean>