EM Builder fixes

Author: phantomii

.vscode/launch.json

@@ -4,15 +4,6 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-        
-
-
-
-
-
-
-
-
         {
             "name": "Python Debugger: User API",
             "type": "debugpy",

genesis_core/elements/dm/models.py

@@ -218,16 +218,19 @@ class ElementIncorrectStatusesView(
         read_only=True,
     )
 
-    def actualize_api_status(self):
+    def actualize_status(self):
         engine = engines.engine_factory.get_engine()
         with engine.session_manager() as s:
             s.execute(
-                """
-                UPDATE em_elements
+                f"""
+                UPDATE {Element.__tablename__}
                 SET status = %s
                 WHERE uuid = %s;
                 """,
-                [self.actual_status, self.uuid],
+                (
+                    self.actual_status,
+                    self.uuid,
+                ),
             )
 
 
@@ -416,17 +419,34 @@ def kind(self):
 
     def calculate_full_hash(self):
         if self.actual_resource is not None:
-            self.full_hash = self.actual_resource.full_hash
-        else:
-            target_state = self.render_target_state()
-            self.full_hash = sdk_utils.calculate_hash(target_state)
-        self.update()
-        return self.full_hash
+            return self.actual_resource.full_hash
+        target_state = self.render_target_state()
+        return sdk_utils.calculate_hash(target_state)
+
+    def _find_actual_resource(self):
+        if self.actual_resource is None:
+            for actual_resource in sdk_models.Resource.objects.get_all(
+                filters={
+                    "uuid": ra_filters.EQ(self.uuid),
+                    "kind": ra_filters.EQ(self.kind),
+                },
+            ):
+                return actual_resource
+        return None
 
     def actualize(self):
-        target_state = self.render_target_state()
+        try:
+            target_state = self.render_target_state()
+        except KeyError as e:
+            LOG.debug(
+                "Target state is not available for resource %s by reason: %r",
+                self,
+                str(e),
+            )
+            return
+        self.actual_resource = self._find_actual_resource()
         hash = sdk_utils.calculate_hash(target_state)
-        self.calculate_full_hash()
+        self.full_hash = self.calculate_full_hash()
         if self.target_resource is None:
             target_resource = sdk_models.TargetResource(
                 uuid=self.uuid,
@@ -439,22 +459,37 @@ def actualize(self):
             target_resource.insert()
             self.target_resource = target_resource
             self.update()
-            LOG.debug("Target resource %r has been created.", target_resource)
+            LOG.debug("Target resource %s has been created.", target_resource)
         elif self.target_resource.hash != hash:
             self.target_resource.value = target_state
             self.target_resource.calculate_hash()
             self.target_resource.full_hash = self.full_hash
             self.target_resource.tracked_at = self.updated_at
             self.target_resource.update()
             LOG.debug(
-                "Target resource %r has been updated.",
+                "Target resource %s has been updated.",
+                self.target_resource,
+            )
+        elif self.target_resource.full_hash != self.full_hash:
+            self.target_resource.full_hash = self.full_hash
+            self.target_resource.update()
+            LOG.debug(
+                "Target resource %s full hash has been updated.",
+                self.target_resource,
+            )
+        elif self.target_resource.tracked_at != self.updated_at:
+            self.target_resource.tracked_at = self.updated_at
+            self.target_resource.update()
+            LOG.debug(
+                "Target resource %s tracked_at has been updated.",
                 self.target_resource,
             )
         else:
             LOG.debug(
-                "Target resource %r is actual state.",
+                "Target resource %s is actual state.",
                 self.target_resource,
             )
+        self.update()
 
     def delete(self, session=None):
         for ts in sdk_models.TargetResource.objects.get_all(
@@ -480,6 +515,33 @@ class OutdatedResources(models.ModelWithUUID, orm.SQLStorableMixin):
     )
 
 
+class ResourceIncorrectStatusesView(
+    models.ModelWithUUID, orm.SQLStorableMixin
+):
+    __tablename__ = "em_incorrect_resource_statuses_view"
+
+    current_status = properties.property(
+        ra_types.String(),
+        required=True,
+    )
+    actual_status = properties.property(
+        ra_types.AllowNone(ra_types.String()),
+        default=None,
+    )
+
+    def actualize_status(self, session):
+        new_status = Status.NEW
+        if self.actual_status == Status.ACTIVE.value:
+            new_status = Status.ACTIVE
+        elif self.actual_status is not None:
+            new_status = Status.IN_PROGRESS
+
+        session.execute(
+            f'UPDATE {Resource.__tablename__} SET status=%s WHERE "uuid"=%s;',
+            (new_status, self.uuid),
+        )
+
+
 class Namespace:
 
     def __init__(self, element):

genesis_core/elements/services/builders.py

@@ -17,6 +17,7 @@
 import logging
 
 from gcl_looper.services import basic
+from restalchemy.common import contexts
 
 from genesis_core.elements.dm import models
 
@@ -36,30 +37,45 @@ def __init__(
         self._first_step = True
 
     def _actualize_target_resources(self):
+        # Delete outdated resources that do not have a corresponding EM
         for info in models.OutdatedResources.objects.get_all():
             if info.em_resource is None:
                 info.target_resource.delete()
+                LOG.info(" Resource %s has been deleted", info.target_resource)
 
         for resource in self._element_engine.get_resources():
             resource.actualize()
 
-    def _actualize_statuses(self):
-        incorrect_statuses = (
+    def _actualize_statuses(self, session):
+        incorrect_resource_statuses = (
+            models.ResourceIncorrectStatusesView.objects.get_all()
+        )
+        for em_status_model in incorrect_resource_statuses:
+            LOG.info(
+                "Actualizing status for resource (%s): %s -> %s...",
+                em_status_model.uuid,
+                em_status_model.current_status,
+                em_status_model.actual_status,
+            )
+            em_status_model.actualize_status(session)
+
+        incorrect_element_statuses = (
             models.ElementIncorrectStatusesView.objects.get_all()
         )
-        for em_status_model in incorrect_statuses:
+        for em_status_model in incorrect_element_statuses:
             LOG.info(
                 "Actualizing status for element (%s): %s -> %s...",
                 em_status_model.name,
                 em_status_model.api_status,
                 em_status_model.actual_status,
             )
-            em_status_model.actualize_api_status()
+            em_status_model.actualize_status()
 
     def _iteration(self):
-        if self._first_step:
-            self._element_engine.load_from_database()
-            self._first_step = True  # Disable optimization
-        self._actualize_target_resources()
-        self._actualize_statuses()
-        LOG.debug("Starting iteration")
+        with contexts.Context().session_manager() as session:
+            if self._first_step:
+                self._element_engine.load_from_database()
+                self._first_step = True  # Disable optimization
+            self._actualize_target_resources()
+            self._actualize_statuses(session)
+            LOG.debug("Starting iteration")

migrations/0019-add-elements-76bca4.py

@@ -147,6 +147,21 @@ def upgrade(self, session):
                     OR "utr"."uuid" IS NULL
                     OR "er"."updated_at" <> "utr"."tracked_at";
             """,
+            """
+                CREATE OR REPLACE VIEW "em_incorrect_resource_statuses_view" AS
+                SELECT
+                    "er"."uuid" AS "uuid",
+                    "er"."status" AS "current_status",
+                    "uar"."status" AS "actual_status"
+                FROM
+                    "em_resources" "er"
+                LEFT JOIN
+                    "ua_actual_resources" "uar"
+                ON
+                    "er"."uuid" = "uar"."uuid"
+                WHERE
+                    "er"."status" <> "uar"."status";
+            """,
         ]
 
         for expression in expressions:
@@ -160,6 +175,7 @@ def downgrade(self, session):
         ]
         views = [
             "em_incorrect_statuses_view",
+            "em_incorrect_resource_statuses_view",
             "em_outdated_resources_view",
         ]