From d00a4702230e780d175bf6d06f76865491849738 Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Thu, 18 Jun 2020 14:28:58 -0500 Subject: [PATCH 01/15] BH-67247 check field associated entity and add missing fields --- src/services/MetaService.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index 77fa23e..5eded02 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -197,6 +197,13 @@ export class MetaService { const exists = this.fields.find((f: any) => f.name === field.name); if (!exists) { this.fields.push(field); + } else if (field.associatedEntity && field.associatedEntity.fields) { + for (const assocEntityField of field.associatedEntity.fields) { + const assocEntityFieldExists = exists.associatedEntity.fields.find((f: any) => f.name === assocEntityField.name); + if(!assocEntityFieldExists) { + exists.associatedEntity.fields.push(assocEntityField) + } + } } if (typeof field !== 'string') { this.memory[field.name] = field; From afb50db92dc9ce191d824b5b74453510c3fef3a6 Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Thu, 18 Jun 2020 15:25:26 -0500 Subject: [PATCH 02/15] BH-67247 fix lint issues --- src/services/MetaService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index 5eded02..148b905 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -200,8 +200,8 @@ export class MetaService { } else if (field.associatedEntity && field.associatedEntity.fields) { for (const assocEntityField of field.associatedEntity.fields) { const assocEntityFieldExists = exists.associatedEntity.fields.find((f: any) => f.name === assocEntityField.name); - if(!assocEntityFieldExists) { - exists.associatedEntity.fields.push(assocEntityField) + if (!assocEntityFieldExists) { + exists.associatedEntity.fields.push(assocEntityField); } } } From 7dba11170ad49d0bbb3386765b35b6bfb1122c74 Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Fri, 19 Jun 2020 09:22:58 -0500 Subject: [PATCH 03/15] BH-67247 rebase and update type --- src/services/MetaService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index 148b905..4edc5df 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -199,7 +199,7 @@ export class MetaService { this.fields.push(field); } else if (field.associatedEntity && field.associatedEntity.fields) { for (const assocEntityField of field.associatedEntity.fields) { - const assocEntityFieldExists = exists.associatedEntity.fields.find((f: any) => f.name === assocEntityField.name); + const assocEntityFieldExists = exists.associatedEntity.fields.find((f: { name: string }) => f.name === assocEntityField.name); if (!assocEntityFieldExists) { exists.associatedEntity.fields.push(assocEntityField); } From 2ffa992703051c2bbb25365c25cb1db872c9d1f0 Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Fri, 19 Jun 2020 14:20:51 -0500 Subject: [PATCH 04/15] BH-67247 add field if missing some associated entity fields --- src/services/MetaService.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index 4edc5df..6876d31 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -261,7 +261,7 @@ export class MetaService { for (const field of fields) { const cleaned: string = this._clean(field); const meta: any = this.memory[cleaned]; - if (!meta) { + if (!meta || meta.associatedEntity && meta.associatedEntity.fields.length < this.subFieldLength(field)) { result.push(cleaned); } } @@ -275,6 +275,15 @@ export class MetaService { .split('(')[0]; } + subFieldLength(field: string): number { + if (field.includes('(')) { + return field + .split('(')[1] + .split(',').length - 1; + } + return 0; + } + /** * Get specific meta data properties */ From 28945df7251798060aa938c167501383ff074b82 Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Fri, 19 Jun 2020 15:19:24 -0500 Subject: [PATCH 05/15] BH-67247 get the math right --- src/services/MetaService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index 6876d31..e238730 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -279,7 +279,7 @@ export class MetaService { if (field.includes('(')) { return field .split('(')[1] - .split(',').length - 1; + .split(',').length; } return 0; } From beaef542255efaa311ea5dc553d47c363ff1b033 Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Mon, 22 Jun 2020 12:00:02 -0500 Subject: [PATCH 06/15] Better method for checking missing fields --- src/services/MetaService.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index e238730..99db290 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -261,7 +261,11 @@ export class MetaService { for (const field of fields) { const cleaned: string = this._clean(field); const meta: any = this.memory[cleaned]; - if (!meta || meta.associatedEntity && meta.associatedEntity.fields.length < this.subFieldLength(field)) { + if (!meta) { + result.push(cleaned); + } else if (meta.associatedEntity + && meta.associatedEntity.fields + && meta.associatedEntity.fields.some(f => !this.getSubFields(fields).includes(f.name))) { result.push(cleaned); } } @@ -275,13 +279,14 @@ export class MetaService { .split('(')[0]; } - subFieldLength(field: string): number { + getSubFields(field: string): string[] { if (field.includes('(')) { return field + .split(')')[0] .split('(')[1] - .split(',').length; + .split(','); } - return 0; + return []; } /** From d6013f3a58d22a78c8d2da3fa359c6998ee8add9 Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Mon, 22 Jun 2020 15:39:37 -0500 Subject: [PATCH 07/15] Even Better method for checking missing fields --- src/services/MetaService.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index 99db290..36d8cf9 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -265,7 +265,7 @@ export class MetaService { result.push(cleaned); } else if (meta.associatedEntity && meta.associatedEntity.fields - && meta.associatedEntity.fields.some(f => !this.getSubFields(fields).includes(f.name))) { + && meta.associatedEntity.fields.some(f => !this.getSubFields(field).includes(f.name))) { result.push(cleaned); } } @@ -280,13 +280,10 @@ export class MetaService { } getSubFields(field: string): string[] { - if (field.includes('(')) { - return field - .split(')')[0] - .split('(')[1] - .split(','); - } - return []; + return field + // remove [] and {} bracket contents from fields if present + .replace(/(\{[^\}]*?\})|(\[[^\]]*?\])/gi, '') + .match(/(?:\([^)]*\)|[^,\s])+/gi) || []; } /** From 95770bc01a0b78bf44f80ff2771ca23ce2f83d51 Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Mon, 22 Jun 2020 16:21:57 -0500 Subject: [PATCH 08/15] fix lint issue --- src/services/MetaService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index 36d8cf9..bb1ddb6 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -281,7 +281,7 @@ export class MetaService { getSubFields(field: string): string[] { return field - // remove [] and {} bracket contents from fields if present + // Remove [] and {} bracket contents from fields if present .replace(/(\{[^\}]*?\})|(\[[^\]]*?\])/gi, '') .match(/(?:\([^)]*\)|[^,\s])+/gi) || []; } From 244ce10ded88136731f76587eec1c7ebcaa3fbe3 Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Tue, 23 Jun 2020 09:28:10 -0500 Subject: [PATCH 09/15] unit tests and small improvement --- src/services/MetaService.ts | 2 +- test/MetaService.spec.ts | 157 ++++++++++++++++++++++++++---------- 2 files changed, 116 insertions(+), 43 deletions(-) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index bb1ddb6..e286365 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -282,7 +282,7 @@ export class MetaService { getSubFields(field: string): string[] { return field // Remove [] and {} bracket contents from fields if present - .replace(/(\{[^\}]*?\})|(\[[^\]]*?\])/gi, '') + .replace(/\s|(\{[^\}]*?\})|(\[[^\]]*?\])/gi, '') .match(/(?:\([^)]*\)|[^,\s])+/gi) || []; } diff --git a/test/MetaService.spec.ts b/test/MetaService.spec.ts index d8b9ffe..0ad92b8 100644 --- a/test/MetaService.spec.ts +++ b/test/MetaService.spec.ts @@ -1,47 +1,120 @@ import { MetaService } from '../src'; describe('MetaService', () => { - describe('function: hasMemory', () => { - it('should be defined', () => { - const meta: MetaService = new MetaService('Candidate'); - const actual = meta.hasMemory; - expect(actual).toBeDefined(); - }); - it('should return false when memory is undefined', () => { - const meta: MetaService = new MetaService('Candidate'); - meta.memory = undefined; - const actual = meta.hasMemory(); - expect(actual).toEqual(false); - }); - it('should return false when memory is null', () => { - const meta: MetaService = new MetaService('Candidate'); - meta.memory = null; - const actual = meta.hasMemory(); - expect(actual).toEqual(false); - }); - it('should return false when memory is false', () => { - const meta: MetaService = new MetaService('Candidate'); - meta.memory = false; - const actual = meta.hasMemory(); - expect(actual).toEqual(false); - }); - it('should return false when memory is not an Object', () => { - const meta: MetaService = new MetaService('Candidate'); - meta.memory = []; - const actual = meta.hasMemory(); - expect(actual).toEqual(false); - }); - it('should return false when memory is an empty Object', () => { - const meta: MetaService = new MetaService('Candidate'); - meta.memory = {}; - const actual = meta.hasMemory(); - expect(actual).toEqual(false); - }); - it('should return true when memory is a non-empty Object', () => { - const meta: MetaService = new MetaService('Candidate'); - meta.memory = { test: 'test' }; - const actual = meta.hasMemory(); - expect(actual).toEqual(true); - }); + describe('function: hasMemory', () => { + it('should be defined', () => { + const meta: MetaService = new MetaService('Candidate'); + const actual = meta.hasMemory; + expect(actual).toBeDefined(); }); + it('should return false when memory is undefined', () => { + const meta: MetaService = new MetaService('Candidate'); + meta.memory = undefined; + const actual = meta.hasMemory(); + expect(actual).toEqual(false); + }); + it('should return false when memory is null', () => { + const meta: MetaService = new MetaService('Candidate'); + meta.memory = null; + const actual = meta.hasMemory(); + expect(actual).toEqual(false); + }); + it('should return false when memory is false', () => { + const meta: MetaService = new MetaService('Candidate'); + meta.memory = false; + const actual = meta.hasMemory(); + expect(actual).toEqual(false); + }); + it('should return false when memory is not an Object', () => { + const meta: MetaService = new MetaService('Candidate'); + meta.memory = []; + const actual = meta.hasMemory(); + expect(actual).toEqual(false); + }); + it('should return false when memory is an empty Object', () => { + const meta: MetaService = new MetaService('Candidate'); + meta.memory = {}; + const actual = meta.hasMemory(); + expect(actual).toEqual(false); + }); + it('should return true when memory is a non-empty Object', () => { + const meta: MetaService = new MetaService('Candidate'); + meta.memory = {test: 'test'}; + const actual = meta.hasMemory(); + expect(actual).toEqual(true); + }); + }); + + describe('function: getSubFields', () => { + it('should be defined', () => { + const meta: MetaService = new MetaService('Candidate'); + const actual = meta.getSubFields; + expect(actual).toBeDefined(); + }); + it('should return array of fields case 1', () => { + const meta: MetaService = new MetaService('Candidate'); + const fields = 'id,name'; + const res = meta.getSubFields(fields); + expect(res[0]).toBe('id'); + expect(res[1]).toBe('name'); + }); + it('should return array of fields case 2', () => { + const meta: MetaService = new MetaService('Candidate'); + const fields = 'id,name,jobOrders(id,title,status)'; + const res = meta.getSubFields(fields); + expect(res[0]).toBe('id'); + expect(res[1]).toBe('name'); + expect(res[2]).toBe('jobOrders(id,title,status)'); + }); + it('should return array of fields case 3', () => { + const meta: MetaService = new MetaService('Candidate'); + const fields = 'id,name,jobOrders[5]{status=\'closed\'}(id,title)'; + const res = meta.getSubFields(fields); + expect(res[0]).toBe('id'); + expect(res[1]).toBe('name'); + expect(res[2]).toBe('jobOrders(id,title)'); + }); + it('should return array of fields case 4', () => { + const meta: MetaService = new MetaService('Candidate'); + const fields = 'id, name, jobOrders(id,title), businessSectors[3](name,id){name=\'Insurance\'}, category'; + const res = meta.getSubFields(fields); + expect(res[0]).toBe('id'); + expect(res[1]).toBe('name'); + expect(res[2]).toBe('jobOrders(id,title)'); + expect(res[3]).toBe('businessSectors(name,id)'); + expect(res[4]).toBe('category'); + }); + }); + + describe('function: _clean', () => { + it('should be defined', () => { + const meta: MetaService = new MetaService('Candidate'); + const actual = meta._clean; + expect(actual).toBeDefined(); + }); + it('should return a field name case 1', () => { + const meta: MetaService = new MetaService('Candidate'); + const field = 'name'; + const res = meta._clean(field); + expect(res).toBe('name'); + }); + it('should return a field name case 2', () => { + const meta: MetaService = new MetaService('Candidate'); + const field = 'jobOrder(id,title)'; + const res = meta._clean(field); + expect(res).toBe('jobOrder'); + }); + it('should return a field name case 3', () => { + const meta: MetaService = new MetaService('Candidate'); + const field = 'jobOrder[3](id,title)'; + const res = meta._clean(field); + expect(res).toBe('jobOrder'); + }); + it('should return a field name case 4', () => { + const meta: MetaService = new MetaService('Candidate'); + const field = 'jobOrder.title'; + const res = meta._clean(field); + expect(res).toBe('jobOrder'); + }); + }); }); From 95928858663761858765ee4b18e058ecc5f624ac Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Wed, 24 Jun 2020 13:53:16 -0500 Subject: [PATCH 10/15] Refactor logic and tests --- test/MetaService.spec.ts | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/test/MetaService.spec.ts b/test/MetaService.spec.ts index 0ad92b8..480904c 100644 --- a/test/MetaService.spec.ts +++ b/test/MetaService.spec.ts @@ -53,36 +53,42 @@ describe('MetaService', () => { }); it('should return array of fields case 1', () => { const meta: MetaService = new MetaService('Candidate'); - const fields = 'id,name'; - const res = meta.getSubFields(fields); + const field = 'jobOrders(id,title,status)'; + const res = meta.getSubFields(field); expect(res[0]).toBe('id'); - expect(res[1]).toBe('name'); + expect(res[1]).toBe('title'); + expect(res[2]).toBe('status'); }); it('should return array of fields case 2', () => { const meta: MetaService = new MetaService('Candidate'); - const fields = 'id,name,jobOrders(id,title,status)'; - const res = meta.getSubFields(fields); + const field = 'jobOrders[3](id,title,status)'; + const res = meta.getSubFields(field); expect(res[0]).toBe('id'); - expect(res[1]).toBe('name'); - expect(res[2]).toBe('jobOrders(id,title,status)'); + expect(res[1]).toBe('title'); + expect(res[2]).toBe('status'); }); it('should return array of fields case 3', () => { const meta: MetaService = new MetaService('Candidate'); - const fields = 'id,name,jobOrders[5]{status=\'closed\'}(id,title)'; - const res = meta.getSubFields(fields); + const field = 'jobOrders{status=\'closed\'}(id,title,status)'; + const res = meta.getSubFields(field); + expect(res[0]).toBe('id'); + expect(res[1]).toBe('title'); + expect(res[2]).toBe('status'); + }); + it('should return array of fields case 3', () => { + const meta: MetaService = new MetaService('Candidate'); + const field = 'jobOrders(id, title, status)'; + const res = meta.getSubFields(field); expect(res[0]).toBe('id'); - expect(res[1]).toBe('name'); - expect(res[2]).toBe('jobOrders(id,title)'); + expect(res[1]).toBe('title'); + expect(res[2]).toBe('status'); }); it('should return array of fields case 4', () => { const meta: MetaService = new MetaService('Candidate'); - const fields = 'id, name, jobOrders(id,title), businessSectors[3](name,id){name=\'Insurance\'}, category'; + const fields = ' businessSectors[3](name,id){name=\'Insurance\'}, category'; const res = meta.getSubFields(fields); - expect(res[0]).toBe('id'); - expect(res[1]).toBe('name'); - expect(res[2]).toBe('jobOrders(id,title)'); - expect(res[3]).toBe('businessSectors(name,id)'); - expect(res[4]).toBe('category'); + expect(res[0]).toBe('name'); + expect(res[1]).toBe('id'); }); }); From cf267a3d6cb50f1c5f06684ac2b9ff04fefcaacf Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Wed, 24 Jun 2020 13:59:11 -0500 Subject: [PATCH 11/15] Refactor logic and tests --- src/services/MetaService.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index e286365..02e64ca 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -265,7 +265,7 @@ export class MetaService { result.push(cleaned); } else if (meta.associatedEntity && meta.associatedEntity.fields - && meta.associatedEntity.fields.some(f => !this.getSubFields(field).includes(f.name))) { + && this.getSubFields(field).some(subField => !meta.associatedEntity.fields.find(aef => aef.name === subField))) { result.push(cleaned); } } @@ -281,9 +281,11 @@ export class MetaService { getSubFields(field: string): string[] { return field - // Remove [] and {} bracket contents from fields if present + // Remove spaces, [] and {} bracket contents from fields if present .replace(/\s|(\{[^\}]*?\})|(\[[^\]]*?\])/gi, '') - .match(/(?:\([^)]*\)|[^,\s])+/gi) || []; + .match(/(?:\(([^)]*)\))/gi)[0] + .match(/[^,\(\)]+/gi) + || [];[] } /** From a25f9a1e8ccb94ceae95d91be79d37f210403c08 Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Wed, 24 Jun 2020 15:26:40 -0500 Subject: [PATCH 12/15] typo --- src/services/MetaService.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index 02e64ca..47e851f 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -284,8 +284,7 @@ export class MetaService { // Remove spaces, [] and {} bracket contents from fields if present .replace(/\s|(\{[^\}]*?\})|(\[[^\]]*?\])/gi, '') .match(/(?:\(([^)]*)\))/gi)[0] - .match(/[^,\(\)]+/gi) - || [];[] + .match(/[^,\(\)]+/gi) || []; } /** From 133588005c68cc4f9711251d2a9da541114cf672 Mon Sep 17 00:00:00 2001 From: Michael Dill Date: Fri, 26 Jun 2020 11:07:51 -0500 Subject: [PATCH 13/15] Target Inline Embedded Entities --- src/services/MetaService.ts | 4 +++- test/MetaService.spec.ts | 20 ++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/services/MetaService.ts b/src/services/MetaService.ts index 47e851f..f11ff96 100644 --- a/src/services/MetaService.ts +++ b/src/services/MetaService.ts @@ -263,7 +263,9 @@ export class MetaService { const meta: any = this.memory[cleaned]; if (!meta) { result.push(cleaned); - } else if (meta.associatedEntity + } else if ( + meta.dataSpecialization === 'INLINE_EMBEDDED' + && meta.associatedEntity && meta.associatedEntity.fields && this.getSubFields(field).some(subField => !meta.associatedEntity.fields.find(aef => aef.name === subField))) { result.push(cleaned); diff --git a/test/MetaService.spec.ts b/test/MetaService.spec.ts index 480904c..7e4adf5 100644 --- a/test/MetaService.spec.ts +++ b/test/MetaService.spec.ts @@ -47,12 +47,20 @@ describe('MetaService', () => { describe('function: getSubFields', () => { it('should be defined', () => { - const meta: MetaService = new MetaService('Candidate'); + const meta: MetaService = new MetaService('EarnCodeGroup'); const actual = meta.getSubFields; expect(actual).toBeDefined(); }); it('should return array of fields case 1', () => { - const meta: MetaService = new MetaService('Candidate'); + const meta: MetaService = new MetaService('EarnCodeGroup'); + const field = 'jobOrders(id,title,status)'; + const res = meta.getSubFields(field); + expect(res[0]).toBe('id'); + expect(res[1]).toBe('title'); + expect(res[2]).toBe('status'); + }); + it('should return array of fields case 1', () => { + const meta: MetaService = new MetaService('EarnCodeGroup'); const field = 'jobOrders(id,title,status)'; const res = meta.getSubFields(field); expect(res[0]).toBe('id'); @@ -60,7 +68,7 @@ describe('MetaService', () => { expect(res[2]).toBe('status'); }); it('should return array of fields case 2', () => { - const meta: MetaService = new MetaService('Candidate'); + const meta: MetaService = new MetaService('EarnCodeGroup'); const field = 'jobOrders[3](id,title,status)'; const res = meta.getSubFields(field); expect(res[0]).toBe('id'); @@ -68,7 +76,7 @@ describe('MetaService', () => { expect(res[2]).toBe('status'); }); it('should return array of fields case 3', () => { - const meta: MetaService = new MetaService('Candidate'); + const meta: MetaService = new MetaService('EarnCodeGroup'); const field = 'jobOrders{status=\'closed\'}(id,title,status)'; const res = meta.getSubFields(field); expect(res[0]).toBe('id'); @@ -76,7 +84,7 @@ describe('MetaService', () => { expect(res[2]).toBe('status'); }); it('should return array of fields case 3', () => { - const meta: MetaService = new MetaService('Candidate'); + const meta: MetaService = new MetaService('EarnCodeGroup'); const field = 'jobOrders(id, title, status)'; const res = meta.getSubFields(field); expect(res[0]).toBe('id'); @@ -84,7 +92,7 @@ describe('MetaService', () => { expect(res[2]).toBe('status'); }); it('should return array of fields case 4', () => { - const meta: MetaService = new MetaService('Candidate'); + const meta: MetaService = new MetaService('EarnCodeGroup'); const fields = ' businessSectors[3](name,id){name=\'Insurance\'}, category'; const res = meta.getSubFields(fields); expect(res[0]).toBe('name'); From dc47a2533b9c815a809317e082687317c37850ee Mon Sep 17 00:00:00 2001 From: Charles Barnes Date: Fri, 26 Jun 2020 14:36:53 -0500 Subject: [PATCH 14/15] fix naming of test cases --- test/MetaService.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/MetaService.spec.ts b/test/MetaService.spec.ts index 7e4adf5..bcdf3e9 100644 --- a/test/MetaService.spec.ts +++ b/test/MetaService.spec.ts @@ -83,7 +83,7 @@ describe('MetaService', () => { expect(res[1]).toBe('title'); expect(res[2]).toBe('status'); }); - it('should return array of fields case 3', () => { + it('should return array of fields case 4', () => { const meta: MetaService = new MetaService('EarnCodeGroup'); const field = 'jobOrders(id, title, status)'; const res = meta.getSubFields(field); @@ -91,7 +91,7 @@ describe('MetaService', () => { expect(res[1]).toBe('title'); expect(res[2]).toBe('status'); }); - it('should return array of fields case 4', () => { + it('should return array of fields case 5', () => { const meta: MetaService = new MetaService('EarnCodeGroup'); const fields = ' businessSectors[3](name,id){name=\'Insurance\'}, category'; const res = meta.getSubFields(fields); From ac43bf6129ed0c89452a83f0013e9baf555c5b07 Mon Sep 17 00:00:00 2001 From: Charles Barnes Date: Fri, 26 Jun 2020 14:43:09 -0500 Subject: [PATCH 15/15] remove errant spaces --- test/MetaService.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/MetaService.spec.ts b/test/MetaService.spec.ts index bcdf3e9..2b921a0 100644 --- a/test/MetaService.spec.ts +++ b/test/MetaService.spec.ts @@ -93,7 +93,7 @@ describe('MetaService', () => { }); it('should return array of fields case 5', () => { const meta: MetaService = new MetaService('EarnCodeGroup'); - const fields = ' businessSectors[3](name,id){name=\'Insurance\'}, category'; + const fields = 'businessSectors[3](name,id){name=\'Insurance\'},category'; const res = meta.getSubFields(fields); expect(res[0]).toBe('name'); expect(res[1]).toBe('id');