Merge pull request #16 from fagbokforlaget/DCS-989-adjust-erudio-clie…

…nt-to-match-migration-changes
fagbokforlaget · Dec 11, 2024 · 5c10ec0 · 5c10ec0
2 parents 040a08d + 7b2dbe5
commit 5c10ec0
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 8 deletions.
diff --git a/src/content-fusion/content-fusion.ts b/src/content-fusion/content-fusion.ts
@@ -5,7 +5,7 @@ export class ContentFusion {
   private baseUrl: string;
 
   constructor(host: string) {
-    this.baseUrl = `http://edtech-content-fusion-service.${host}`;
+    this.baseUrl = `http://edtech-content-fusion-service${host}`;
   }
 
   public async getStructureNode(

diff --git a/src/erudio-client.ts b/src/erudio-client.ts
@@ -21,7 +21,15 @@ export class ErudioClient {
   private host: string;
 
   constructor(host: string) {
-    this.host = host;
+    if (host) {
+      if (host[0] === '.') {
+        this.host = host;
+      } else {
+        this.host = `.${host}`;
+      }
+    } else {
+      this.host = '';
+    }
   }
 
   public getStructures = async (

diff --git a/src/learning-path/learnig-path.ts b/src/learning-path/learnig-path.ts
@@ -8,7 +8,7 @@ export class LearningPath {
   private readonly baseUrl: string;
 
   constructor(host: string) {
-    this.baseUrl = `http://edtech-learning-path-runner-service.${host}`;
+    this.baseUrl = `http://edtech-learning-path-runner-service${host}`;
   }
 
   public async getLearningPath(

diff --git a/src/localization/localization.ts b/src/localization/localization.ts
@@ -6,7 +6,7 @@ export class Localization {
   private readonly baseUrl: string;
 
   constructor(host: string) {
-    this.baseUrl = `http://edtech-localization-service.${host}`;
+    this.baseUrl = `http://edtech-localization-service${host}`;
   }
 
   public async getStructureLocalization(

diff --git a/src/structure-link/structure-link.ts b/src/structure-link/structure-link.ts
@@ -8,7 +8,7 @@ export class StructureLink {
   private url: string;
 
   constructor(host: string) {
-    this.url = `http://edtech-structure-link-service.${host}/structures/links`;
+    this.url = `http://edtech-structure-link-service${host}/structures/links`;
   }
 
   public async listStructureLinks(

diff --git a/src/structure/structure.ts b/src/structure/structure.ts
@@ -1,11 +1,11 @@
-import { PaginatedNodes, Options, Node } from './dto/paginated-nodes-dto';
 import { HttpClientProxy } from '../utils/http-client-proxy';
+import { Node, Options, PaginatedNodes } from './dto/paginated-nodes-dto';
 
 export class Structure {
   private baseUrl: string;
 
   constructor(host: string) {
-    this.baseUrl = `http://edtech-structure-service.${host}`;
+    this.baseUrl = `http://edtech-structure-service${host}`;
   }
 
   public async getSingleNode(

diff --git a/src/tag/tag.ts b/src/tag/tag.ts
@@ -6,7 +6,7 @@ export class TagService {
   private baseUrl: string;
 
   constructor(host: string) {
-    this.baseUrl = `http://edtech-tag-store-service.${host}`;
+    this.baseUrl = `http://edtech-tag-store-service${host}`;
     // this.baseUrl = 'http://localhost:3000';
   }
 

diff --git a/test/erudio-client.spec.ts b/test/erudio-client.spec.ts
@@ -1,6 +1,8 @@
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
+import { randomUUID } from 'crypto';
 import { ErudioClient } from '../src/erudio-client';
+import { HttpClientProxy } from '../src/utils/http-client-proxy';
 import { ServiceType } from '../src/utils/service.types';
 import { structureLink } from './data/get-structure-link-data';
 import { structureLocalization } from './data/get-structure-localization';
@@ -262,4 +264,63 @@ describe('Erudio Client', () => {
       });
     });
   });
+
+  describe('Should properly set suffix for host value in constructor', () => {
+    it('Should properly set value for undefined given', async () => {
+      const namespaceId = randomUUID();
+      const spy = jest
+        .spyOn(HttpClientProxy.prototype, 'get')
+        .mockImplementation(jest.fn());
+
+      const client = new ErudioClient(undefined);
+
+      client.getStructures(namespaceId);
+      expect(spy).toBeCalledWith(
+        `http://edtech-structure-service/structures/${namespaceId}/nodes`,
+        { params: undefined },
+      );
+    });
+    it('Should properly set value for empty string given', () => {
+      const namespaceId = randomUUID();
+      const spy = jest
+        .spyOn(HttpClientProxy.prototype, 'get')
+        .mockImplementation(jest.fn());
+
+      const client = new ErudioClient('');
+
+      client.getStructures(namespaceId);
+      expect(spy).toBeCalledWith(
+        `http://edtech-structure-service/structures/${namespaceId}/nodes`,
+        { params: undefined },
+      );
+    });
+    it('Should properly set value for value with dot given', () => {
+      const namespaceId = randomUUID();
+      const spy = jest
+        .spyOn(HttpClientProxy.prototype, 'get')
+        .mockImplementation(jest.fn());
+
+      const client = new ErudioClient('.something');
+
+      client.getStructures(namespaceId);
+      expect(spy).toBeCalledWith(
+        `http://edtech-structure-service.something/structures/${namespaceId}/nodes`,
+        { params: undefined },
+      );
+    });
+    it('Should properly set value for value without dot given', () => {
+      const namespaceId = randomUUID();
+      const spy = jest
+        .spyOn(HttpClientProxy.prototype, 'get')
+        .mockImplementation(jest.fn());
+
+      const client = new ErudioClient('something');
+
+      client.getStructures(namespaceId);
+      expect(spy).toBeCalledWith(
+        `http://edtech-structure-service.something/structures/${namespaceId}/nodes`,
+        { params: undefined },
+      );
+    });
+  });
 });