Make className and tenants in tenant related builders mandatory

Author: antas-marcin

src/batch/journey.test.ts

@@ -546,9 +546,7 @@ describe('multi tenancy', () => {
 
   it('create Passage classes tenants', () => {
     return client.schema
-      .tenantsCreator()
-      .withClassName(passageClassName)
-      .withTenants(tenants)
+      .tenantsCreator(passageClassName, tenants)
       .do()
       .then((res) => {
         expect(res).toHaveLength(2);
@@ -560,8 +558,7 @@ describe('multi tenancy', () => {
 
   it('get Passage classes tenants', () => {
     return client.schema
-      .tenantsGetter()
-      .withClassName(passageClassName)
+      .tenantsGetter(passageClassName)
       .do()
       .then((res) => {
         expect(res).toHaveLength(2);

src/data/journey.test.ts

@@ -1223,9 +1223,7 @@ describe('multi tenancy', () => {
       .catch((e) => fail('it should not have errord: ' + e));
 
     await client.schema
-      .tenantsCreator()
-      .withClassName(documentClassName)
-      .withTenants(tenants)
+      .tenantsCreator(documentClassName, tenants)
       .do()
       .then((res) => expect(res).toHaveLength(3))
       .catch((e) => fail('it should not have errord: ' + e));
@@ -1238,9 +1236,7 @@ describe('multi tenancy', () => {
       .catch((e) => fail('it should not have errord: ' + e));
 
     return client.schema
-      .tenantsCreator()
-      .withClassName(passageClassName)
-      .withTenants(tenants)
+      .tenantsCreator(passageClassName, tenants)
       .do()
       .then((res) => expect(res).toHaveLength(3))
       .catch((e) => fail('it should not have errord: ' + e));

src/graphql/journey.test.ts

@@ -1859,19 +1859,11 @@ const setupDocumentPassageSchema = async (
   await Promise.all([client.schema.classCreator().withClass(passage).do()]);
 
   if (tenants) {
-    const documentTenants = await client.schema
-      .tenantsCreator()
-      .withClassName(document.class!)
-      .withTenants(tenants)
-      .do();
+    const documentTenants = await client.schema.tenantsCreator(document.class!, tenants).do();
     expect(documentTenants).toBeDefined();
     expect(documentTenants).toHaveLength(tenants.length);
 
-    const passageTenants = await client.schema
-      .tenantsCreator()
-      .withClassName(passage.class!)
-      .withTenants(tenants)
-      .do();
+    const passageTenants = await client.schema.tenantsCreator(passage.class!, tenants).do();
     expect(passageTenants).toBeDefined();
     expect(passageTenants).toHaveLength(tenants.length);
   }

src/schema/index.ts

@@ -11,6 +11,7 @@ import TenantsCreator from './tenantsCreator';
 import TenantsGetter from './tenantsGetter';
 import TenantsDeleter from './tenantsDeleter';
 import Connection from '../connection';
+import { Tenant } from '../openapi/types';
 
 export interface Schema {
   classCreator: () => ClassCreator;
@@ -22,9 +23,9 @@ export interface Schema {
   shardsGetter: () => ShardsGetter;
   shardUpdater: () => ShardUpdater;
   shardsUpdater: () => ShardsUpdater;
-  tenantsCreator: () => TenantsCreator;
-  tenantsGetter: () => TenantsGetter;
-  tenantsDeleter: () => TenantsDeleter;
+  tenantsCreator: (className: string, tenants: Array<Tenant>) => TenantsCreator;
+  tenantsGetter: (className: string) => TenantsGetter;
+  tenantsDeleter: (className: string, tenants: Array<string>) => TenantsDeleter;
 }
 
 const schema = (client: Connection): Schema => {
@@ -38,9 +39,11 @@ const schema = (client: Connection): Schema => {
     shardsGetter: () => new ShardsGetter(client),
     shardUpdater: () => new ShardUpdater(client),
     shardsUpdater: () => new ShardsUpdater(client),
-    tenantsCreator: () => new TenantsCreator(client),
-    tenantsGetter: () => new TenantsGetter(client),
-    tenantsDeleter: () => new TenantsDeleter(client),
+    tenantsCreator: (className: string, tenants: Array<Tenant>) =>
+      new TenantsCreator(client, className, tenants),
+    tenantsGetter: (className: string) => new TenantsGetter(client, className),
+    tenantsDeleter: (className: string, tenants: Array<string>) =>
+      new TenantsDeleter(client, className, tenants),
   };
 };
 

src/schema/journey.test.ts

@@ -677,9 +677,7 @@ describe('multi tenancy', () => {
 
   it('defines tenants for MultiTenancy class', () => {
     return client.schema
-      .tenantsCreator()
-      .withClassName(classObj.class!)
-      .withTenants(tenants)
+      .tenantsCreator(classObj.class!, tenants)
       .do()
       .then((res: Array<Tenant>) => {
         expect(res).toEqual(tenants);
@@ -688,8 +686,7 @@ describe('multi tenancy', () => {
 
   it('gets tenants for MultiTenancy class', () => {
     return client.schema
-      .tenantsGetter()
-      .withClassName(classObj.class!)
+      .tenantsGetter(classObj.class!)
       .do()
       .then((res: Array<Tenant>) => {
         expect(res).toHaveLength(3);
@@ -698,9 +695,7 @@ describe('multi tenancy', () => {
 
   it('delete one tenant in MultiTenancy class', () => {
     return client.schema
-      .tenantsDeleter()
-      .withClassName(classObj.class!)
-      .withTenants([tenants[0].name!])
+      .tenantsDeleter(classObj.class!, [tenants[0].name!])
       .do()
       .then((res) => {
         expect(res).toEqual(undefined);
@@ -709,8 +704,7 @@ describe('multi tenancy', () => {
 
   it('get tenants after delete for MultiTenancy class', () => {
     return client.schema
-      .tenantsGetter()
-      .withClassName(classObj.class!)
+      .tenantsGetter(classObj.class!)
       .do()
       .then((res: Array<Tenant>) => {
         expect(res).toHaveLength(2);
@@ -735,9 +729,7 @@ describe('multi tenancy', () => {
 
   it('fails to define tenants for NoMultiTenancy class', () => {
     return client.schema
-      .tenantsCreator()
-      .withClassName(classObjWithoutMultiTenancyConfig.class!)
-      .withTenants(tenants)
+      .tenantsCreator(classObjWithoutMultiTenancyConfig.class!, tenants)
       .do()
       .catch((e: Error) => {
         expect(e.message).toContain('multi-tenancy is not enabled for class \\"NoMultiTenancy\\"');

src/schema/tenantsCreator.ts

@@ -1,49 +1,22 @@
-import { isValidStringProperty } from '../validation/string';
 import Connection from '../connection';
 import { CommandBase } from '../validation/commandBase';
 import { Tenant } from '../openapi/types';
 
 export default class TenantsCreator extends CommandBase {
-  private className?: string;
-  private tenants?: Array<Tenant>;
+  private className: string;
+  private tenants: Array<Tenant>;
 
-  constructor(client: Connection) {
+  constructor(client: Connection, className: string, tenants: Array<Tenant>) {
     super(client);
-  }
-
-  withClassName = (className: string) => {
     this.className = className;
-    return this;
-  };
-
-  withTenants = (tenants: Array<Tenant>) => {
     this.tenants = tenants;
-    return this;
-  };
-
-  validateClassName = () => {
-    if (!isValidStringProperty(this.className)) {
-      this.addError('className must be set - set with .withClassName(className)');
-    }
-  };
-
-  validateTenants = () => {
-    if (!this.tenants || this.tenants.length == 0) {
-      this.addError('tenants must be set - set with .withTenants(tenants)');
-    }
-  };
+  }
 
   validate = () => {
-    this.validateClassName();
-    this.validateTenants();
+    // nothing to validate
   };
 
   do = (): Promise<Array<Tenant>> => {
-    this.validate();
-    if (this.errors.length > 0) {
-      return Promise.reject(new Error('invalid usage: ' + this.errors.join(', ')));
-    }
-    const path = `/schema/${this.className}/tenants`;
-    return this.client.post(path, this.tenants);
+    return this.client.post(`/schema/${this.className}/tenants`, this.tenants);
   };
 }

src/schema/tenantsDeleter.ts

@@ -4,46 +4,20 @@ import { CommandBase } from '../validation/commandBase';
 import { Tenant } from '../openapi/types';
 
 export default class TenantsDeleter extends CommandBase {
-  private className?: string;
-  private tenants?: Array<string>;
+  private className: string;
+  private tenants: Array<string>;
 
-  constructor(client: Connection) {
+  constructor(client: Connection, className: string, tenants: Array<string>) {
     super(client);
-  }
-
-  withClassName = (className: string) => {
     this.className = className;
-    return this;
-  };
-
-  withTenants = (tenants: Array<string>) => {
     this.tenants = tenants;
-    return this;
-  };
-
-  validateClassName = () => {
-    if (!isValidStringProperty(this.className)) {
-      this.addError('className must be set - set with .withClassName(className)');
-    }
-  };
-
-  validateTenants = () => {
-    if (!this.tenants || this.tenants.length == 0) {
-      this.addError('tenants must be set - set with .withTenants(tenants)');
-    }
-  };
+  }
 
   validate = () => {
-    this.validateClassName();
-    this.validateTenants();
+    // nothing to validate
   };
 
   do = (): Promise<void> => {
-    this.validate();
-    if (this.errors.length > 0) {
-      return Promise.reject(new Error('invalid usage: ' + this.errors.join(', ')));
-    }
-    const path = `/schema/${this.className}/tenants`;
-    return this.client.delete(path, this.tenants, false);
+    return this.client.delete(`/schema/${this.className}/tenants`, this.tenants, false);
   };
 }

src/schema/tenantsGetter.ts

@@ -1,36 +1,20 @@
-import { isValidStringProperty } from '../validation/string';
 import Connection from '../connection';
 import { CommandBase } from '../validation/commandBase';
 import { Tenant } from '../openapi/types';
 
 export default class TenantsGetter extends CommandBase {
-  private className?: string;
+  private className: string;
 
-  constructor(client: Connection) {
+  constructor(client: Connection, className: string) {
     super(client);
-  }
-
-  withClassName = (className: string) => {
     this.className = className;
-    return this;
-  };
-
-  validateClassName = () => {
-    if (!isValidStringProperty(this.className)) {
-      this.addError('className must be set - set with .withClassName(className)');
-    }
-  };
+  }
 
   validate = () => {
-    this.validateClassName();
+    // nothing to validate
   };
 
   do = (): Promise<Array<Tenant>> => {
-    this.validate();
-    if (this.errors.length > 0) {
-      return Promise.reject(new Error('invalid usage: ' + this.errors.join(', ')));
-    }
-    const path = `/schema/${this.className}/tenants`;
-    return this.client.get(path);
+    return this.client.get(`/schema/${this.className}/tenants`);
   };
 }