chore: add new owner_id field to system_platform

Author: RostyslavKachan

common/peewee_model.py

@@ -216,6 +216,7 @@ class SystemPlatform(BaseModelRW):
     mssql = BooleanField(null=True)
     ansible = BooleanField(null=True)
     rhsm_version = TextField(null=True)
+    owner_id = UUIDField(null=True)
 
     class Meta:
         """system_platform table metadata"""

database/schema/upgrade_scripts/163-add-owner-id-to-system-platform.sql

@@ -0,0 +1,2 @@
+ALTER TABLE system_platform ADD COLUMN owner_id UUID;
+CREATE INDEX ON system_platform(owner_id);

database/schema/ve_db_postgresql.sql

@@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS db_version (
 ) TABLESPACE pg_default;
 
 -- set the schema version directly in the insert statement here!!
-INSERT INTO db_version (name, version) VALUES ('schema_version', 162);
+INSERT INTO db_version (name, version) VALUES ('schema_version', 163);
 -- INSERT INTO db_version (name, version) VALUES ('schema_version', :schema_version);
 
 
@@ -234,6 +234,7 @@ CREATE TABLE IF NOT EXISTS system_platform (
   mssql BOOLEAN,
   ansible BOOLEAN,
   rhsm_version TEXT,
+  owner_id UUID,
   sap_ids TEXT[],
   group_set_id BIGINT,
   tag_set_id BIGINT,
@@ -278,6 +279,8 @@ CREATE INDEX ON system_platform(updated_timestamp);
 
 CREATE INDEX ON system_platform(rhsm_version);
 
+CREATE INDEX ON system_platform(owner_id);
+
 CREATE TRIGGER system_platform_set_first_reported
   BEFORE INSERT ON system_platform
   FOR EACH ROW EXECUTE PROCEDURE set_first_reported();

listener/inventory_processor.py

@@ -335,19 +335,19 @@ async def _db_import_system(self, conn, fields: dict, org_id: str, inventory_id:
                 (rh_account_id, inventory_id, s3_url, vmaas_json, json_checksum, display_name,
                  stale_timestamp, stale_warning_timestamp, culled_timestamp,
                  host_type, last_upload, stale, operating_system_id, sap_ids, group_set_id, tag_set_id, insights_id, updated_timestamp,
-                 mssql, ansible, rhsm_version)
+                 mssql, ansible, rhsm_version, owner_id)
                 VALUES (%(rh_account_id)s, %(inventory_id)s, %(s3_url)s, %(vmaas_json)s, %(json_checksum)s, %(display_name)s,
                         %(stale_timestamp)s, %(stale_warning_timestamp)s, %(culled_timestamp)s,
                         %(host_type)s, %(last_upload)s, 'F', %(operating_system_id)s, %(sap_ids)s, %(group_set_id)s, %(tag_set_id)s, %(insights_id)s,
-                        %(updated_timestamp)s, %(mssql)s, %(ansible)s, %(rhsm_version)s)
+                        %(updated_timestamp)s, %(mssql)s, %(ansible)s, %(rhsm_version)s, %(owner_id)s)
                 ON CONFLICT (inventory_id) DO UPDATE SET
                 rh_account_id = EXCLUDED.rh_account_id, inventory_id = EXCLUDED.inventory_id, s3_url = EXCLUDED.s3_url, vmaas_json = EXCLUDED.vmaas_json,
                 json_checksum = EXCLUDED.json_checksum, display_name = EXCLUDED.display_name, stale_timestamp = EXCLUDED.stale_timestamp,
                 stale_warning_timestamp = EXCLUDED.stale_warning_timestamp, culled_timestamp = EXCLUDED.culled_timestamp,
                 host_type = EXCLUDED.host_type, last_upload = EXCLUDED.last_upload, stale = EXCLUDED.stale, operating_system_id = EXCLUDED.operating_system_id,
                 sap_ids = EXCLUDED.sap_ids, group_set_id = EXCLUDED.group_set_id, tag_set_id = EXCLUDED.tag_set_id,
                 insights_id = EXCLUDED.insights_id, updated_timestamp = EXCLUDED.updated_timestamp,
-                mssql = EXCLUDED.mssql, ansible = EXCLUDED.ansible, rhsm_version = EXCLUDED.rhsm_version
+                mssql = EXCLUDED.mssql, ansible = EXCLUDED.ansible, rhsm_version = EXCLUDED.rhsm_version, owner_id = EXCLUDED.owner_id
                 RETURNING (xmax = 0) AS inserted, unchanged_since, last_evaluation, id, when_deleted
             """
         else:
@@ -371,7 +371,8 @@ async def _db_import_system(self, conn, fields: dict, org_id: str, inventory_id:
                     updated_timestamp = %(updated_timestamp)s,
                     mssql = %(mssql)s,
                     ansible = %(ansible)s,
-                    rhsm_version = %(rhsm_version)s
+                    rhsm_version = %(rhsm_version)s,
+                    owner_id = %(owner_id)s
                 WHERE id = %(system_id)s
                 RETURNING (xmax = 0) AS inserted, unchanged_since, last_evaluation, id, when_deleted
             """
@@ -494,6 +495,7 @@ async def _process_upload(self, msg: InventoryMsg):
                     rhsm_version = system_profile.get("rhsm", {}).get("version")
                     insert_fields["insights_id"] = msg.msg["host"].get("insights_id")
                     insert_fields["updated_timestamp"] = msg.msg["host"].get("updated")
+                    insert_fields["owner_id"] = system_profile.get("owner_id")
                     insert_fields["mssql"] = mssql
                     insert_fields["ansible"] = ansible
                     insert_fields["rhsm_version"] = rhsm_version