return Zos4Version from db

Author: Eslam-Nawara

node-registrar/pkg/db/version.go

@@ -2,36 +2,36 @@ package db
 
 import (
 	"errors"
+	"reflect"
 
 	"gorm.io/gorm"
 )
 
-func (db *Database) SetZOSVersion(version string) error {
+func (db *Database) SetZOSVersion(version ZosVersion) error {
 	var current ZosVersion
-	result := db.gormDB.Where(ZosVersion{Key: ZOS4VersionKey}).Attrs(ZosVersion{Version: version}).FirstOrCreate(&current)
+	result := db.gormDB.Where(ZosVersion{Key: ZOS4VersionKey}).Attrs(ZosVersion{Version: version.Version}).FirstOrCreate(&current)
 
 	if result.Error != nil {
 		return result.Error
 	}
 
 	if result.RowsAffected == 0 {
-		if current.Version == version {
+		if reflect.DeepEqual(current, version) {
 			return ErrVersionAlreadySet
 		}
 		return db.gormDB.Model(&current).
 			Select("version").
-			Update("version", version).Error
+			Updates(version).Error
 	}
 	return nil
 }
 
-func (db *Database) GetZOSVersion() (string, error) {
-	var setting ZosVersion
-	if err := db.gormDB.Where("key = ?", "zos_4").First(&setting).Error; err != nil {
+func (db *Database) GetZOSVersion() (version ZosVersion, err error) {
+	if err := db.gormDB.Where("key = ?", "zos_4").First(&version).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return "", ErrRecordNotFound
+			return version, ErrRecordNotFound
 		}
-		return "", err
+		return version, err
 	}
-	return setting.Version, nil
+	return version, nil
 }

node-registrar/pkg/server/handlers.go

@@ -729,7 +729,7 @@ func (s *Server) setZOSVersionHandler(c *gin.Context) {
 		return
 	}
 
-	if err := s.db.SetZOSVersion(req.Version); err != nil {
+	if err := s.db.SetZOSVersion(db.ZosVersion{Version: req.Version, SafeToUpgrade: req.SafeToUpgrade}); err != nil {
 		status := http.StatusInternalServerError
 		if err.Error() == "version already set" {
 			status = http.StatusConflict