Skip to content

Commit

Permalink
Merge pull request #549 from Jougan-0/revertLogic
Browse files Browse the repository at this point in the history
revert remove Redundant logic w/signoff
  • Loading branch information
leecalcote authored Aug 2, 2024
2 parents 1803ab0 + 2c7cbcd commit a93ee9b
Showing 1 changed file with 25 additions and 8 deletions.
33 changes: 25 additions & 8 deletions models/meshmodel/core/v1beta1/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,28 @@ func (m *Model) Create(db *database.Handler, hostID uuid.UUID) (uuid.UUID, error
if err != nil {
return uuid.UUID{}, err
}
err = registerModel(db, hostID, modelID)
if err != nil {
return uuid.UUID{}, err
}
return m.ID, nil
}
return model.ID, nil
}
func registerModel(db *database.Handler, regID, modelID uuid.UUID) error {
var count int64
err := db.Table("registries").Where("registrant_id=?", regID).Where("type = ?", "model").Where("entity = ?", modelID).Count(&count).Error
if err != nil && err != gorm.ErrRecordNotFound {
return err
}
if count == 0 {
err = db.Exec("INSERT INTO registries (registrant_id, entity,type) VALUES (?, ?, ?)", regID, modelID, "model").Error
if err != nil {
return err
}
}
return nil
}

func (m *Model) UpdateStatus(db *database.Handler, status entity.EntityStatus) error {
err := db.Model(&Model{}).Where("id = ?", m.ID).Update("status", status).Error
Expand All @@ -116,22 +134,21 @@ func (m *Model) UpdateStatus(db *database.Handler, status entity.EntityStatus) e
}

// WriteModelDefinition writes out the model to the given `modelDefPath` in the `outputType` format.
// `outputType` can be `yaml` or `json`.
// `outputType` can be `yaml` or `json`.
// Usage: model.WriteModelDefinition("./modelName/model.yaml", "yaml")
func (c Model) WriteModelDefinition(modelDefPath string, outputType string) error {
err := utils.CreateDirectory(filepath.Dir(modelDefPath))
if err != nil {
return err
}
if(outputType == "json"){
err = utils.WriteJSONToFile[Model](modelDefPath, c)
}
if(outputType == "yaml"){
err = utils.WriteYamlToFile[Model](modelDefPath, c)
}
if outputType == "json" {
err = utils.WriteJSONToFile[Model](modelDefPath, c)
}
if outputType == "yaml" {
err = utils.WriteYamlToFile[Model](modelDefPath, c)
}
if err != nil {
return err
}
return nil
}

0 comments on commit a93ee9b

Please sign in to comment.