Merge pull request #595 from meshery/ts/index/relationship

Refactor code structure for improved readability and maintainability

Author: leecalcote

build/openapi.config.yml

@@ -37,8 +37,8 @@ import-mapping:
   "../v1alpha1/catalog_data.json": "github.com/meshery/schemas/models/v1alpha1/catalog_data"
 
   # v1alpha3
-  "../v1alpha3/relationship.json": "github.com/meshery/schemas/models/v1alpha3/relationship"
-  "../v1alpha3/selector.json": "github.com/meshery/schemas/models/v1alpha3/selector"
+  "../v1alpha3/relationship/relationship.json": "github.com/meshery/schemas/models/v1alpha3/relationship"
+  "../v1alpha3/selector/selector.json": "github.com/meshery/schemas/models/v1alpha3/selector"
 
   # v1beta1
   "../v1beta1/model.json": "github.com/meshery/schemas/models/v1beta1/model"

models/v1alpha3/relationship/relationship.go

@@ -25,21 +25,28 @@ func (r *RelationshipDefinition) GenerateID() (uuid.UUID, error) {
 }
 
 func (r RelationshipDefinition) GetID() uuid.UUID {
-	return r.Id
+	if r.Id == nil {
+		return uuid.Nil
+	}
+	return *r.Id
 }
 
 func (r *RelationshipDefinition) GetEntityDetail() string {
 	return fmt.Sprintf("type: %s, definition version: %s, kind: %s, model: %s, version: %s", r.Type(), r.Version, r.Kind, r.Model.DisplayName, r.Model.Version)
 }
 
 func (r *RelationshipDefinition) Create(db *database.Handler, hostID uuid.UUID) (uuid.UUID, error) {
-	r.Id, _ = r.GenerateID()
+	id, err := r.GenerateID()
+	if err != nil {
+		return uuid.UUID{}, err
+	}
+	r.Id = &id
 
-	err := db.Omit(clause.Associations).Create(&r).Error
+	err = db.Omit(clause.Associations).Create(&r).Error
 	if err != nil {
 		return uuid.UUID{}, err
 	}
-	return r.Id, err
+	return id, err
 }
 
 func (r *RelationshipDefinition) UpdateStatus(db *database.Handler, status entity.EntityStatus) error {
@@ -58,4 +65,4 @@ func (r RelationshipDefinition) WriteRelationshipDefinition(relDirPath string, f
 
 func (r *RelationshipDefinition) GetDefaultEvaluationQuery() string {
 	return fmt.Sprintf("%s_%s_relationship", strings.ToLower(string(r.Kind)), strings.ToLower(r.SubType))
-}
+}

models/v1alpha3/relationship/relationship_helper.go

@@ -0,0 +1,9 @@
+openapi: 3.0.0
+info:
+  title: relationship
+  version: 1.0.0
+paths: {}
+components:
+  schemas:
+    RelationshipDefinition:
+      $ref: "./relationship.yaml"