From c9cd3e1354a5593244050e1472074f79f261a21f Mon Sep 17 00:00:00 2001
From: "althaf.hameez" <althaf.hameez@grabtaxi.com>
Date: Tue, 11 Aug 2020 16:25:38 +0800
Subject: [PATCH] Update GroupEntity spec definition * Make parent a single
 string instead of an array * Rename certain spec parameters * Make children,
 ancestors & descendents non-optional

---
 .../src/kinds/GroupEntityV1alpha1.test.ts     | 50 ++++++++++---------
 .../src/kinds/GroupEntityV1alpha1.ts          | 18 +++----
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/packages/catalog-model/src/kinds/GroupEntityV1alpha1.test.ts b/packages/catalog-model/src/kinds/GroupEntityV1alpha1.test.ts
index c0a98685e9..e7594772c1 100644
--- a/packages/catalog-model/src/kinds/GroupEntityV1alpha1.test.ts
+++ b/packages/catalog-model/src/kinds/GroupEntityV1alpha1.test.ts
@@ -35,11 +35,10 @@ describe('GroupV1alpha1Policy', () => {
       },
       spec: {
         type: 'squad',
-        owner: 'me',
-        parent: ['group a'],
+        parent: 'group-a',
         ancestors: ['group-a', 'global-synergies', 'acme-corp'],
-        children: [],
-        grandchildren: [],
+        children: ['child-a', 'child-b'],
+        descendents: ['desc-a', 'desc-b'],
       },
     };
     policy = new GroupEntityV1alpha1Policy();
@@ -79,38 +78,43 @@ describe('GroupV1alpha1Policy', () => {
     await expect(policy.enforce(entity)).rejects.toThrow(/type/);
   });
 
-  it('rejects missing owner', async () => {
-    delete (entity as any).spec.owner;
-    await expect(policy.enforce(entity)).rejects.toThrow(/owner/);
-  });
-
-  it('rejects wrong owner', async () => {
-    (entity as any).spec.owner = 7;
-    await expect(policy.enforce(entity)).rejects.toThrow(/owner/);
-  });
-
-  it('rejects empty owner', async () => {
-    (entity as any).spec.owner = '';
-    await expect(policy.enforce(entity)).rejects.toThrow(/owner/);
-  });
-
   it('accepts missing parent', async () => {
     delete (entity as any).spec.parent;
     await expect(policy.enforce(entity)).resolves.toBe(entity);
   });
 
-  it('accepts missing ancestors', async () => {
+  it('rejects empty parent', async () => {
+    (entity as any).spec.parent = '';
+    await expect(policy.enforce(entity)).rejects.toThrow(/parent/);
+  });
+
+  it('rejects missing ancestors', async () => {
     delete (entity as any).spec.ancestors;
+    await expect(policy.enforce(entity)).rejects.toThrow(/ancestor/);
+  });
+
+  it('accepts empty ancestors', async () => {
+    (entity as any).spec.ancestors = [''];
     await expect(policy.enforce(entity)).resolves.toBe(entity);
   });
 
-  it('accepts missing children', async () => {
+  it('rejects missing children', async () => {
     delete (entity as any).spec.children;
+    await expect(policy.enforce(entity)).rejects.toThrow(/children/);
+  });
+
+  it('accepts empty children', async () => {
+    (entity as any).spec.children = [''];
     await expect(policy.enforce(entity)).resolves.toBe(entity);
   });
 
-  it('accepts missing grandchildren', async () => {
-    delete (entity as any).spec.grandchildren;
+  it('rejects missing descendents', async () => {
+    delete (entity as any).spec.descendents;
+    await expect(policy.enforce(entity)).rejects.toThrow(/descendents/);
+  });
+
+  it('accepts empty descendents', async () => {
+    (entity as any).spec.descendents = [''];
     await expect(policy.enforce(entity)).resolves.toBe(entity);
   });
 });
diff --git a/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts b/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts
index f7902dbd86..b3ab406729 100644
--- a/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts
@@ -26,11 +26,10 @@ export interface GroupEntityV1alpha1 extends Entity {
   kind: typeof KIND;
   spec: {
     type: string;
-    owner: string;
-    parent?: string[];
-    ancestors?: string[];
-    children?: string[];
-    grandchildren?: string[];
+    parent?: string;
+    ancestors: string[];
+    children: string[];
+    descendents: string[];
   };
 }
 
@@ -44,11 +43,10 @@ export class GroupEntityV1alpha1Policy implements EntityPolicy {
       spec: yup
         .object({
           type: yup.string().required().min(1),
-          owner: yup.string().required().min(1),
-          parent: yup.array(yup.string()).notRequired(),
-          ancestors: yup.array(yup.string()).notRequired(),
-          children: yup.array(yup.string()).notRequired(),
-          grandchildren: yup.array(yup.string()).notRequired(),
+          parent: yup.string().notRequired().min(1),
+          ancestors: yup.array(yup.string()).required(),
+          children: yup.array(yup.string()).required(),
+          descendents: yup.array(yup.string()).required(),
         })
         .required(),
     });