Skip to content

Commit 9160e59

Browse files
committed
return host metdata with models
Signed-off-by: Pranav Singh <pranavsingh02@hotmail.com>
1 parent a85f6ae commit 9160e59

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

models/meshmodel/registry/registry.go

+9-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func registerModel(db *database.Handler, regID, modelID uuid.UUID) error {
5353
entity := Registry{
5454
RegistrantID: regID,
5555
Entity: modelID,
56-
Type: types.ModelDefinition,
56+
Type: types.Model,
5757
}
5858

5959
byt, err := json.Marshal(entity)
@@ -186,7 +186,6 @@ func (rm *RegistryManager) RegisterEntity(h Host, en Entity) error {
186186
if err != nil {
187187
return err
188188
}
189-
190189

191190
entry := Registry{
192191
ID: uuid.New(),
@@ -251,7 +250,7 @@ func (rm *RegistryManager) GetModels(db *database.Handler, f types.Filter) ([]v1
251250
var modelWithCategoriess []modelWithCategories
252251
finder := db.Model(&v1alpha1.ModelDB{}).
253252
Select("model_dbs.*, category_dbs.*").
254-
Joins("JOIN category_dbs ON model_dbs.category_id = category_dbs.id") //
253+
Joins("JOIN category_dbs ON model_dbs.category_id = category_dbs.id")
255254

256255
// total count before pagination
257256
var count int64
@@ -304,7 +303,13 @@ func (rm *RegistryManager) GetModels(db *database.Handler, f types.Filter) ([]v1
304303
}
305304

306305
for _, modelDB := range modelWithCategoriess {
307-
m = append(m, modelDB.ModelDB.GetModel(modelDB.GetCategory(db)))
306+
model := modelDB.ModelDB.GetModel(modelDB.GetCategory(db))
307+
// mod := Entity(model)
308+
host := rm.GetRegistrant(model)
309+
model.HostID = host.ID
310+
model.HostName = host.Hostname
311+
model.DisplayHostName = host.Hostname
312+
m = append(m, model)
308313
}
309314
return m, count, countUniqueModels(modelWithCategoriess)
310315
}

0 commit comments

Comments
 (0)