From 51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 Mon Sep 17 00:00:00 2001
From: Tal Gitelman <tg851x@intl.att.com>
Date: Sun, 10 Dec 2017 18:55:03 +0200
Subject: Final commit to master merge from

Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507
Issue-ID: SDC-714
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
---
 catalog-ui/src/app/models/graph/relationship.ts | 48 +++++++++++++++++++------
 1 file changed, 37 insertions(+), 11 deletions(-)

(limited to 'catalog-ui/src/app/models/graph/relationship.ts')

diff --git a/catalog-ui/src/app/models/graph/relationship.ts b/catalog-ui/src/app/models/graph/relationship.ts
index 67a5488b59..57ff45ef00 100644
--- a/catalog-ui/src/app/models/graph/relationship.ts
+++ b/catalog-ui/src/app/models/graph/relationship.ts
@@ -58,7 +58,8 @@ export class RelationType {
     }
 }
 
-export class Relationship {
+export class RelationshipType {
+    id:string;
     capability:string;
     capabilityOwnerId:string;
     capabilityUid:string;
@@ -67,8 +68,9 @@ export class Relationship {
     requirementOwnerId:string;
     requirementUid:string;
 
-    constructor(relationship?:Relationship) {
+    constructor(relationship?:RelationshipType) {
         if (relationship) {
+            this.id = relationship.id;
             this.capability = relationship.capability;
             this.capabilityOwnerId = relationship.capabilityOwnerId;
             this.capabilityUid = relationship.capabilityUid;
@@ -79,17 +81,41 @@ export class Relationship {
         } else {
             this.relationship = new RelationType();
         }
-
     }
 
-    public setRelationProperties = (capability:Capability, requirement:Requirement)=> {
-        this.capability = capability.name;
-        this.capabilityOwnerId = capability.ownerId;
-        this.capabilityUid = capability.uniqueId;
-        this.relationship = new RelationType(capability.type);
-        this.requirement = requirement.name;
-        this.requirementOwnerId = requirement.ownerId;
-        this.requirementUid = requirement.uniqueId;
+    public setRelationProperties = (capability?:Capability, requirement?:Requirement)=> {
+        if (capability) {
+            this.capability = capability.name;
+            this.capabilityOwnerId = capability.ownerId;
+            this.capabilityUid = capability.uniqueId;
+            this.relationship = new RelationType(capability.type);
+        }
+        if (requirement) {
+            this.requirement = requirement.name;
+            this.requirementOwnerId = requirement.ownerId;
+            this.requirementUid = requirement.uniqueId;
+        }
     };
+}
+
+export class Relationship {
+    relation: RelationshipType;
+    capability?: Capability;
+    requirement?: Requirement;
+
+    constructor(fullRelationship?:Relationship) {
+        if (fullRelationship) {
+            this.relation = new RelationshipType(fullRelationship.relation);
+            this.capability = fullRelationship.capability && new Capability(fullRelationship.capability);
+            this.requirement = fullRelationship.requirement && new Requirement(fullRelationship.requirement);
+        } else {
+            this.relation = new RelationshipType();
+        }
+    }
 
+    public setRelationProperties(capability?:Capability, requirement?:Requirement) {
+        this.relation.setRelationProperties(capability, requirement);
+        this.capability = capability;
+        this.requirement = requirement;
+    };
 }
-- 
cgit 1.2.3-korg