Skip to content

Commit ff63b38

Browse files
committed
register model into registry for relationship/policy registeration process
Signed-off-by: Pranav Singh <pranavsingh02@hotmail.com>
1 parent a51b1bf commit ff63b38

File tree

1 file changed

+23
-7
lines changed

1 file changed

+23
-7
lines changed

models/meshmodel/registry/registry.go

+23-7
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type RegistryManager struct {
4949
db *database.Handler //This database handler will be used to perform queries inside the database
5050
}
5151

52-
func RegisterModel(db *database.Handler, regID, modelID uuid.UUID) error {
52+
func registerModel(db *database.Handler, regID, modelID uuid.UUID) error {
5353
entity := Registry{
5454
RegistrantID: regID,
5555
Entity: modelID,
@@ -129,12 +129,11 @@ func (rm *RegistryManager) RegisterEntity(h Host, en Entity) error {
129129
return err
130130
}
131131

132-
err = RegisterModel(rm.db, registrantID, modelID)
132+
err = registerModel(rm.db, registrantID, modelID)
133133
if err != nil {
134134
return err
135135
}
136136

137-
138137
entry := Registry{
139138
ID: uuid.New(),
140139
RegistrantID: registrantID,
@@ -145,14 +144,23 @@ func (rm *RegistryManager) RegisterEntity(h Host, en Entity) error {
145144
}
146145
return rm.db.Create(&entry).Error
147146
case v1alpha1.RelationshipDefinition:
148-
relationshipID, err := v1alpha1.CreateRelationship(rm.db, entity)
147+
148+
registrantID, err := createHost(rm.db, h)
149+
if err != nil {
150+
return err
151+
}
152+
153+
154+
relationshipID, modelID, err := v1alpha1.CreateRelationship(rm.db, entity)
149155
if err != nil {
150156
return err
151157
}
152-
registrantID, err := createHost(rm.db, h)
158+
159+
err = registerModel(rm.db, registrantID, modelID)
153160
if err != nil {
154161
return err
155162
}
163+
156164
entry := Registry{
157165
ID: uuid.New(),
158166
RegistrantID: registrantID,
@@ -164,14 +172,22 @@ func (rm *RegistryManager) RegisterEntity(h Host, en Entity) error {
164172
return rm.db.Create(&entry).Error
165173
//Add logic for Policies and other entities below
166174
case v1alpha1.PolicyDefinition:
167-
policyID, err := v1alpha1.CreatePolicy(rm.db, entity)
175+
registrantID, err := createHost(rm.db, h)
168176
if err != nil {
169177
return err
170178
}
171-
registrantID, err := createHost(rm.db, h)
179+
180+
policyID, modelID, err := v1alpha1.CreatePolicy(rm.db, entity)
181+
if err != nil {
182+
return err
183+
}
184+
185+
err = registerModel(rm.db, registrantID, modelID)
172186
if err != nil {
173187
return err
174188
}
189+
190+
175191
entry := Registry{
176192
ID: uuid.New(),
177193
RegistrantID: registrantID,

0 commit comments

Comments
 (0)