@neuralinnovations/dataisland-sdk 0.0.1-dev2 → 0.0.1-dev4

package/test/index.test.ts

@@ -1,96 +1,52 @@
-import { version } from '../package.json'
+import { version } from "../package.json"
 import {
   AppSdk,
   BasicCredential,
   appSdk,
   SDK_VERSION,
   DEFAULT_NAME,
-  BearerCredential
-} from '../src'
-import { MiddlewareService } from '../src/services/middlewareService'
-import { CredentialService } from '../src/services/credentialService'
-import { RpcService } from '../src/services/rpcService'
-import { AppBuilder } from '../src/appBuilder'
-import { UnitTest, AppSdkUnitTest } from '../src/unitTest'
-import { HOST, TOKEN } from './setup'
-import { OrganizationImpl } from '../src/services/organizationImpl'
-
-test('SDK_VERSION', () => {
+  DebugCredential
+} from "../src"
+import { MiddlewareService } from "../src/services/middlewareService"
+import { CredentialService } from "../src/services/credentialService"
+import { RpcService } from "../src/services/rpcService"
+import { AppBuilder } from "../src/appBuilder"
+import { UnitTest, AppSdkUnitTest } from "../src/unitTest"
+import { HOST, randomHash, TOKEN } from "./setup"
+
+test("SDK_VERSION", () => {
   expect(SDK_VERSION).toBe(version)
 })
 
-test('Default SDK', async () => {
+test("Default SDK", async () => {
   // default
   const app = await appSdk(DEFAULT_NAME, async (builder: AppBuilder) => {
     builder.useHost(HOST)
-    builder.useCredential(new BearerCredential(TOKEN))
+    builder.useCredential(new DebugCredential(TOKEN))
   })
   expect(app).not.toBeUndefined()
 })
 
-test('Create and delete organization', async () => {
-  const randomName = `org-test-${Math.random().toString(16)}`
-  const app = await appSdk(randomName, async builder => {
-    builder.useHost(HOST)
-    builder.useCredential(new BearerCredential(TOKEN))
-  })
-
-  const initLength = app.organizations.collection.length
-
-  const org = await app.organizations.create(
-    randomName,
-    'this is a unitTest description'
-  )
-
-  // check organization
-  expect(org).not.toBeUndefined()
-  expect(org).not.toBeNull()
-  expect(org).toBeInstanceOf(OrganizationImpl)
-
-  expect(org.id).not.toBeUndefined()
-  expect(org.id).not.toBeNull()
-  expect(org.id.trim()).not.toBe('')
-
-  // check name
-  expect(org.name).not.toBeUndefined()
-  expect(org.name).not.toBeNull()
-  expect(org.name.trim()).not.toBe('')
-
-  // check description
-  expect(org.description).not.toBeUndefined()
-  expect(org.description).not.toBeNull()
-  expect(org.description.trim()).not.toBe('')
-
-  // check organizations
-  expect(app.organizations.get(org.id)).toBe(org)
-  expect(app.organizations.collection.length).toBe(initLength + 1)
-
-  await expect(app.organizations.delete(org.id)).resolves.not.toThrow()
-  expect((<OrganizationImpl>org).isDisposed).toBe(true)
-  expect(app.organizations.collection.length).toBe(initLength)
-  expect(app.organizations.tryGet(org.id)).toBeUndefined()
-})
-
-test('SDK, middleware', async () => {
+test("SDK, middleware", async () => {
   await AppSdkUnitTest.test(UnitTest.DEFAULT, async () => {
-    const app = await appSdk('test-settings', async (builder: AppBuilder) => {
-      builder.useHost('https://test.com')
+    const app = await appSdk("test-settings", async (builder: AppBuilder) => {
+      builder.useHost("https://test.com")
       builder.useAutomaticDataCollectionEnabled(false)
-      builder.useCredential(new BasicCredential('email', 'password'))
+      builder.useCredential(new BasicCredential("email", "password"))
       builder.registerMiddleware(async (req, next) => {
-        req.headers.set('X-Test', 'test')
+        req.headers.set("X-Test", "test")
         return await next(req)
       })
     })
-    expect(app.name).toBe('test-settings')
-    expect(app.host).toBe('https://test.com')
+    expect(app.name).toBe("test-settings")
+    expect(app.host).toBe("https://test.com")
     expect(app.automaticDataCollectionEnabled).toBe(false)
   })
 })
 
-test('SDK, services', async () => {
+test("SDK, services", async () => {
   await AppSdkUnitTest.test(UnitTest.DEFAULT, async () => {
-    const app = await appSdk('test-sdk')
+    const app = await appSdk("test-sdk")
     const middlewareService = app.resolve(MiddlewareService)
     expect(middlewareService).not.toBeUndefined()
     expect(app.resolve(MiddlewareService)).toBe(middlewareService)
@@ -100,35 +56,35 @@ test('SDK, services', async () => {
   })
 })
 
-test('SDK, middleware', async () => {
+test("SDK, middleware", async () => {
   await AppSdkUnitTest.test(UnitTest.DEFAULT, async () => {
-    const app = await appSdk('test-middleware')
+    const app = await appSdk("test-middleware")
     const middlewareService = app.resolve(MiddlewareService)
     expect(middlewareService).not.toBeUndefined()
     expect(app.resolve(MiddlewareService)).toBe(middlewareService)
     expect(app.resolve(CredentialService)).not.toBeUndefined()
 
     const response = await middlewareService?.process(
-      new Request('http://localhost:8080'),
+      new Request("http://localhost:8080"),
       async (req: Request): Promise<Response> => {
-        const headerXTest = req.headers.get('Custom-Test-Header')
+        const headerXTest = req.headers.get("Custom-Test-Header")
         expect(headerXTest).toBeNull()
-        return new Response('', { status: 200 })
+        return new Response("", { status: 200 })
       }
     )
     expect(response).not.toBeUndefined()
     expect(response?.status).toBe(200)
 
     middlewareService?.useMiddleware(async (req, next) => {
-      req.headers.set('X-Test', 'test-value')
+      req.headers.set("X-Test", "test-value")
       return await next(req)
     })
 
     const response2 = await middlewareService?.process(
-      new Request('https://localhost:8080'),
+      new Request("https://localhost:8080"),
       async (req: Request): Promise<Response> => {
-        expect(req.headers.get('X-Test')).toBe('test-value')
-        return new Response('', { status: 400 })
+        expect(req.headers.get("X-Test")).toBe("test-value")
+        return new Response("", { status: 400 })
       }
     )
     expect(response2).not.toBeUndefined()
@@ -136,28 +92,31 @@ test('SDK, middleware', async () => {
   })
 })
 
-test('SDK, it is impossible to setup the same application', async () => {
+test("SDK, it is impossible to setup the same application", async () => {
   await AppSdkUnitTest.test(UnitTest.DEFAULT, async () => {
     // this test is not stable if you run all tests at once
     // because the app is cached all app instances
     // we use a random identifier every time
-    const testId = Math.random().toString(16)
-    const promise = appSdk(`test-setup-${testId}`).then(() => {})
+    const testId = `test-setup-${randomHash()}`
+    const promise = appSdk(testId).then(() => {
+    })
     await expect(
-      appSdk(`test-setup-${testId}`, async () => {})
+      appSdk(testId, async () => {
+      })
     ).rejects.toThrow()
     await promise
   })
 })
 
-test('SDK, setup and get this app', async () => {
+test("SDK, setup and get this app", async () => {
   await AppSdkUnitTest.test(UnitTest.DEFAULT, async () => {
     // this test is not stable if you run all tests at once
     // because the app is cached all app instances
     // we use a random identifier every time
-    const testId = Math.random().toString(16)
-    const promise = appSdk(`test-get-${testId}`).then(() => {})
-    await expect(appSdk(`test-get-${testId}`)).resolves.toBeInstanceOf(AppSdk)
+    const testId = `test-get-${randomHash()}`
+    const promise = appSdk(testId).then(() => {
+    })
+    await expect(appSdk(testId)).resolves.toBeInstanceOf(AppSdk)
     await promise
   })
 })

package/test/organization.test.ts

@@ -0,0 +1,57 @@
+import { appSdk, DebugCredential } from "../src"
+import { HOST, randomHash, TOKEN } from "./setup"
+import { OrganizationImpl } from "../src/storages/organization.impl"
+
+test("Organization", async () => {
+  // make random name
+  const randomName = `org-test-${randomHash()}`
+
+  // create app
+  const app = await appSdk(randomName, async builder => {
+    builder.useHost(HOST)
+    builder.useCredential(new DebugCredential(TOKEN))
+  })
+
+  // save init length
+  const initLength = app.organizations.collection.length
+
+  // create organization
+  const org = await app.organizations.create(
+    randomName,
+    "this is a unitTest description"
+  )
+
+  // check organization
+  expect(org).not.toBeUndefined()
+  expect(org).not.toBeNull()
+  expect(org).toBeInstanceOf(OrganizationImpl)
+
+  expect(org.id).not.toBeUndefined()
+  expect(org.id).not.toBeNull()
+  expect(org.id.trim()).not.toBe("")
+
+  // check name
+  expect(org.name).not.toBeUndefined()
+  expect(org.name).not.toBeNull()
+  expect(org.name.trim()).not.toBe("")
+
+  // check description
+  expect(org.description).not.toBeUndefined()
+  expect(org.description).not.toBeNull()
+  expect(org.description.trim()).not.toBe("")
+
+  // check organizations
+  expect(app.organizations.get(org.id)).toBe(org)
+  expect(app.organizations.tryGet(org.id)).toBe(org)
+  expect(app.organizations.collection.length).toBe(initLength + 1)
+
+  // delete organization
+  await expect(app.organizations.delete(org.id)).resolves.not.toThrow()
+  expect((<OrganizationImpl>org).isDisposed).toBe(true)
+
+  // check init length
+  expect(app.organizations.collection.length).toBe(initLength)
+
+  // check organization must be undefined because it was deleted
+  expect(app.organizations.tryGet(org.id)).toBeUndefined()
+})

package/test/registry.test.ts

@@ -1,13 +1,13 @@
-import { Registry } from '../src/internal/registry'
+import { Registry } from "../src/internal/registry"
 
 class TestClass {
   constructor(public readonly value: string) {}
 }
 
-test('Registry, test factory', () => {
+test("Registry, test factory", () => {
   const registry = new Registry()
 
-  const item = new TestClass('test1')
+  const item = new TestClass("test1")
   registry.map(TestClass).asValue(item)
   expect(registry.get(TestClass)).toBe(item)
 
@@ -22,22 +22,22 @@ test('Registry, test factory', () => {
   expect(registry.get(TestClass)).not.toBe(item)
   expect(registry.get(TestClass)).not.toBe(registry.get(TestClass))
 
-  expect(registry.get(TestClass)?.value).toBe('test_5')
+  expect(registry.get(TestClass)?.value).toBe("test_5")
 })
 
-test('Registry, test value', () => {
+test("Registry, test value", () => {
   const registry = new Registry()
 
-  const item = new TestClass('test1')
+  const item = new TestClass("test1")
   registry.map(TestClass).asValue(item)
   expect(registry.get(TestClass)).toBeInstanceOf(TestClass)
   expect(registry.get(TestClass)).toBe(item)
 })
 
-test('Registry, test singleton', () => {
+test("Registry, test singleton", () => {
   const registry = new Registry()
 
-  registry.map(TestClass).asSingleton(() => new TestClass('test1'))
+  registry.map(TestClass).asSingleton(() => new TestClass("test1"))
   const singleton = registry.get(TestClass)
   expect(singleton).toBeInstanceOf(TestClass)
   expect(singleton).toBe(registry.get(TestClass))

package/test/services.test.ts

@@ -1,11 +1,11 @@
-import { appSdk, BasicCredential, DefaultCredential } from '../src'
-import { CredentialService } from '../src/services/credentialService'
-import { MiddlewareService } from '../src/services/middlewareService'
-import { UnitTest, AppSdkUnitTest } from '../src/unitTest'
+import { appSdk, BasicCredential, DefaultCredential } from "../src"
+import { CredentialService } from "../src/services/credentialService"
+import { MiddlewareService } from "../src/services/middlewareService"
+import { UnitTest, AppSdkUnitTest } from "../src/unitTest"
 
-test('CredentialService', async () => {
+test("CredentialService", async () => {
   await AppSdkUnitTest.test(UnitTest.DEFAULT, async () => {
-    const app = await appSdk('test-services', async builder => {
+    const app = await appSdk("test-services", async builder => {
       builder.env.unitTest = UnitTest.DO_NOT_START
     })
     const credentialService = app.resolve(CredentialService)
@@ -14,7 +14,7 @@ test('CredentialService', async () => {
     expect(app.resolve(CredentialService)).toBeInstanceOf(CredentialService)
     expect(app.credential).not.toBeUndefined()
 
-    const credential = new BasicCredential('email', 'password')
+    const credential = new BasicCredential("email", "password")
     app.credential = credential
     expect(app.credential).toBe(credential)
     expect(credentialService?.credential).toBe(credential)
@@ -22,15 +22,15 @@ test('CredentialService', async () => {
     const middleware = app.resolve(MiddlewareService) as MiddlewareService
     const emailPasswordDisposable = middleware.useMiddleware(
       async (req, next) => {
-        expect(req.headers.get('Authorization')).toBe('Basic email:password')
-        await next(req)
+        expect(req.headers.get("Authorization")).toBe("Basic email:password")
+        return await next(req)
       }
     )
     expect(emailPasswordDisposable).not.toBeUndefined()
     await middleware.process(
-      new Request('https://localhost:8080'),
+      new Request("https://localhost:8080"),
       async () => {
-        return new Response('', { status: 200 })
+        return new Response("", { status: 200 })
       }
     )
     emailPasswordDisposable?.dispose()
@@ -41,14 +41,14 @@ test('CredentialService', async () => {
     expect(credentialService?.credential).toBe(credential2)
 
     const defaultDisposable = middleware.useMiddleware(async (req, next) => {
-      expect(req.headers.get('Authorization')).toBeNull()
-      await next(req)
+      expect(req.headers.get("Authorization")).toBeNull()
+      return await next(req)
     })
     expect(defaultDisposable).not.toBeUndefined()
     await middleware.process(
-      new Request('https://localhost:8080'),
+      new Request("https://localhost:8080"),
       async () => {
-        return new Response('', { status: 200 })
+        return new Response("", { status: 200 })
       }
     )
     defaultDisposable?.dispose()

package/test/setup.ts

@@ -1,2 +1,54 @@
+import { appSdk, AppSdk, DebugCredential } from "../src"
+import { Organization } from "../src/storages/organization"
+import { Workspace } from "../src/storages/workspace"
+
 export const HOST = <string>process.env.HOST
 export const TOKEN = <string>process.env.TOKEN
+
+export const randomHash = (length: number = 5) => {
+  if (length <= 0) length = 1
+  return `name-${((Math.random() * Math.pow(10, length)) | 0).toString(16)}`
+}
+
+export const testInOrganization = async (func: (app: AppSdk, org: Organization) => Promise<void>, config ?: {
+    host: string,
+    token: string
+  }
+): Promise<void> => {
+  const randomName = `org-name-${randomHash()}`
+  const app = await appSdk(randomName, async builder => {
+    builder.useHost(config?.host ?? HOST)
+    builder.useCredential(new DebugCredential(config?.token ?? TOKEN))
+  })
+  const org = await app.organizations.create(
+    randomName,
+    "this is a unitTest description"
+  )
+  try {
+    await func(app, org)
+  } finally {
+    if (app
+      .organizations.tryGet(org.id)
+    ) {
+      await app.organizations.delete(org.id)
+    }
+  }
+}
+
+export const testInWorkspace = async (func: (app: AppSdk, org: Organization, workspace: Workspace)
+  => Promise<void>, config?: {
+  host: string,
+  token: string,
+}): Promise<void> => {
+  await testInOrganization(async (app, org) => {
+    const randomName = `workspace-${randomHash()}`
+    const workspace = await org.workspaces.create(randomName, `description of ${randomName}`)
+    try {
+      await func(app, org, workspace)
+    } finally {
+      if (org.workspaces.tryGet(workspace.id)) {
+        await org.workspaces.delete(workspace.id)
+      }
+    }
+  }, config)
+}

package/test/unitTest.test.ts

@@ -1,6 +1,6 @@
-import { AppSdkUnitTest, UnitTest } from '../src/unitTest'
+import { AppSdkUnitTest, UnitTest } from "../src/unitTest"
 
-test('SDK, unitTest', async () => {
+test("SDK, unitTest", async () => {
   expect(AppSdkUnitTest.current).toBe(UnitTest.DO_NOTHING)
   expect(
     await AppSdkUnitTest.test(UnitTest.DO_NOT_PRINT_INITIALIZED_LOG, () => {

package/test/workspace.test.ts

@@ -0,0 +1,71 @@
+import { testInOrganization, testInWorkspace } from "./setup"
+
+test("Workspace create / delete", async () => {
+  await testInOrganization(async (app, org) => {
+    // save init length
+    const initWorkspaceCount = org.workspaces.collection.length
+
+    // create workspace
+    const wsPromise = org.workspaces.create(
+      "test-workspace",
+      "test-workspace-description"
+    )
+
+    // check not throw
+    await expect(wsPromise).resolves.not.toThrow()
+
+    // get workspace
+    const ws = await wsPromise
+
+    // check exists
+    expect(ws).not.toBeUndefined()
+
+    // check exists
+    expect(ws).not.toBeNull()
+
+    // check name
+    expect(ws.name).toBe("test-workspace")
+
+    // check description
+    expect(ws.description).toBe("test-workspace-description")
+
+    // check collection length
+    expect(app.organizations.get(org.id).workspaces.collection.length).toBe(
+      initWorkspaceCount + 1
+    )
+
+    // check collection length
+    expect(org.workspaces.collection.length).toBe(initWorkspaceCount + 1)
+
+    // check get
+    expect(org.workspaces.get(ws.id)).toBe(ws)
+
+    // check tryGet
+    expect(org.workspaces.tryGet(ws.id)).toBe(ws)
+
+    // check contains
+    expect(org.workspaces.contains(ws.id)).toBe(true)
+
+    // check delete
+    await expect(org.workspaces.delete(ws.id)).resolves.not.toThrow()
+  })
+})
+
+test("Workspace, change", async () => {
+  await testInWorkspace(async (app, org, ws) => {
+
+    expect(ws.name).not.toBe("new-name")
+
+    // rename
+    await ws.change("new-name", "new-description")
+
+    // check name
+    expect(ws.name).toBe("new-name")
+
+    // check description
+    expect(ws.description).toBe("new-description")
+
+    // check name
+    expect(ws.name).toBe("new-name")
+  })
+})

package/src/services/organizationImpl.ts

@@ -1,51 +0,0 @@
-import { Organization, OrganizationId } from '../storages/organizations'
-import { Disposable } from '../disposable'
-import { OrganizationDto } from '../dto/userInfoResponse'
-import { OrganizationService } from './organizationService'
-import { OrganizationsImpl } from './organizationsImpl'
-
-export class OrganizationImpl extends Organization implements Disposable {
-  private _isDisposed: boolean = false
-  private _isAdmin: boolean = false
-  private _content?: OrganizationDto
-
-  constructor(
-    private readonly service: OrganizationService,
-    private readonly organizations: OrganizationsImpl
-  ) {
-    super()
-  }
-
-  get isAdmin(): boolean {
-    return this._isAdmin
-  }
-
-  get isDisposed(): boolean {
-    return this._isDisposed
-  }
-
-  dispose(): void {
-    this._isDisposed = true
-  }
-
-  public initFrom(
-    content: OrganizationDto,
-    isAdmin: boolean
-  ): OrganizationImpl {
-    this._content = content
-    this._isAdmin = isAdmin
-    return this
-  }
-
-  get id(): OrganizationId {
-    return <OrganizationId>this._content?.id
-  }
-
-  get name(): string {
-    return <OrganizationId>this._content?.profile.name
-  }
-
-  get description(): string {
-    return <OrganizationId>this._content?.profile.description
-  }
-}

package/src/services/organizationsImpl.ts

@@ -1,55 +0,0 @@
-import {
-  Organization,
-  OrganizationEvent,
-  OrganizationId,
-  Organizations
-} from '../storages/organizations'
-import { OrganizationImpl } from './organizationImpl'
-import { OrganizationService } from './organizationService'
-
-export class OrganizationsImpl extends Organizations {
-  constructor(public readonly service: OrganizationService) {
-    super()
-  }
-
-  public organizations: OrganizationImpl[] = []
-  public currentOrganizationId?: OrganizationId
-
-  get collection(): readonly Organization[] {
-    return this.organizations
-  }
-
-  get current(): OrganizationId {
-    return <OrganizationId>this.currentOrganizationId
-  }
-
-  set current(value: OrganizationId) {
-    if (this.currentOrganizationId !== value) {
-      this.currentOrganizationId = value
-      this.dispatch({
-        type: OrganizationEvent.CURRENT_CHANGED,
-        data: this
-      })
-    }
-  }
-
-  get(id: OrganizationId): Organization {
-    return <Organization>this.tryGet(id)
-  }
-
-  tryGet(id: OrganizationId): Organization | undefined {
-    return this.organizations.find(organization => organization.id === id)
-  }
-
-  contains(id: OrganizationId): boolean {
-    return this.organizations.some(organization => organization.id === id)
-  }
-
-  async create(name: string, description: string): Promise<Organization> {
-    return this.service.createOrganization(name, description)
-  }
-
-  delete(id: string): Promise<void> {
-    return this.service.deleteOrganization(id)
-  }
-}