RHINENG-21443: update structs

Author: TenSt

base/inventory/inventory.go

@@ -1,6 +1,8 @@
 package inventory
 
-import "app/base/types"
+import (
+	"app/base/types"
+)
 
 type SystemProfile struct {
 	Arch              *string         `json:"arch,omitempty"`
@@ -14,6 +16,7 @@ type SystemProfile struct {
 	SatelliteManaged  bool            `json:"satellite_managed,omitempty"`
 	BootcStatus       Bootc           `json:"bootc_status,omitempty"`
 	ConsumerID        string          `json:"owner_id,omitempty"`
+	Workloads         Workloads       `json:"workloads,omitempty"`
 }
 
 func (t *SystemProfile) GetInstalledPackages() []string {
@@ -38,8 +41,8 @@ func (t *SystemProfile) GetYumRepos() []YumRepo {
 }
 
 type OperatingSystem struct {
-	Major int    `json:"major,omitempty"`
-	Minor int    `json:"minor,omitempty"`
+	Major int16  `json:"major,omitempty"`
+	Minor int16  `json:"minor,omitempty"`
 	Name  string `json:"name,omitempty"`
 }
 
@@ -72,3 +75,27 @@ type BootcBooted struct {
 type ReporterStaleness struct {
 	LastCheckIn types.Rfc3339TimestampWithZ `json:"last_check_in"`
 }
+
+type Group struct {
+	ID   string `json:"id"`
+	Name string `json:"name"`
+}
+
+type Workloads struct {
+	Sap     SapWorkload     `json:"sap,omitempty"`
+	Ansible AnsibleWorkload `json:"ansible,omitempty"`
+	Mssql   MssqlWorkload   `json:"mssql,omitempty"`
+}
+
+type SapWorkload struct {
+	SapSystem bool     `json:"sap_system,omitempty"`
+	Sids      []string `json:"sids,omitempty"`
+}
+
+type AnsibleWorkload struct {
+	ControllerVersion string `json:"controller_version,omitempty"`
+}
+
+type MssqlWorkload struct {
+	Version string `json:"version,omitempty"`
+}

base/models/models.go

@@ -104,8 +104,8 @@ type SystemInventory struct {
 	RhAccountID                      int    `gorm:"primaryKey"`
 	VmaasJSON                        *string
 	JSONChecksum                     *string
-	LastUpdated                      *time.Time `gorm:"default:null"`
-	UnchangedSince                   *time.Time `gorm:"default:null"`
+	LastUpdated                      *time.Time `gorm:"default:null"` // set by trigger system_inventory_set_last_updated
+	UnchangedSince                   *time.Time `gorm:"default:null"` // set by trigger system_inventory_check_unchanged
 	LastUpload                       *time.Time `gorm:"default:null"`
 	Stale                            bool
 	DisplayName                      string
@@ -116,8 +116,8 @@ type SystemInventory struct {
 	BuiltPkgcache                    bool    `gorm:"column:built_pkgcache"`
 	Arch                             *string
 	Bootc                            bool
-	Tags                             []byte `gorm:"column:tags"`
-	Created                          time.Time
+	Tags                             []byte         `gorm:"column:tags"`
+	Created                          time.Time      // set by trigger system_platform_insert_trigger
 	Workspaces                       pq.StringArray `gorm:"type:text[]"`
 	StaleTimestamp                   *time.Time
 	StaleWarningTimestamp            *time.Time