[AAP-41483] feat: add edited_by to activation and allow is_enabled to be edited (#1232)

<!-- Mandatory: Provide a clear, concise description of the changes and
their purpose -->
The change allows user to directly start the activation after it is
updated by one API call.
It also shows who updates the activation by the edited_by field. It is
to be used together with the already existing edited_at field.
<!-- If applicable, provide a link to the issue that is being addressed
-->
[AAP-41483](https://issues.redhat.com/browse/AAP-41483)

<!-- What is being changed? -->
Added edited_by field to model Activation.
Added is_enabled field to the editable list in the serializer
<!-- Why is this change needed? -->
<!-- How does this change address the issue? -->
<!-- Does this change introduce any new dependencies, blockers or
breaking changes? -->
<!-- How it can be tested? -->
To test the new feature, set is_enabled to true in the patch API body
and verify the activation is restarted after it is updated. The patch
API returns the updated activation includes the new field edited_by.

Author: bzwei

src/aap_eda/api/serializers/activation.py

@@ -296,6 +296,7 @@ class ActivationListSerializer(serializers.ModelSerializer):
     )
     created_by = BasicUserFieldSerializer()
     modified_by = BasicUserFieldSerializer()
+    edited_by = BasicUserFieldSerializer()
 
     class Meta:
         model = models.Activation
@@ -321,6 +322,7 @@ class Meta:
             "edited_at",
             "created_by",
             "modified_by",
+            "edited_by",
             "status_message",
             "awx_token_id",
             "log_level",
@@ -380,6 +382,7 @@ def to_representation(self, activation):
             "skip_audit_events": activation.skip_audit_events,
             "created_by": BasicUserSerializer(activation.created_by).data,
             "modified_by": BasicUserSerializer(activation.modified_by).data,
+            "edited_by": BasicUserSerializer(activation.edited_by).data,
         }
 
 
@@ -565,6 +568,7 @@ class Meta:
         fields = [
             "name",
             "description",
+            "is_enabled",
             "decision_environment_id",
             "rulebook_id",
             "extra_var",
@@ -629,6 +633,7 @@ def prepare_update(self, activation: models.Activation):
         rulebook_id = self.validated_data.get("rulebook_id")
         self.validated_data["user_id"] = self.context["request"].user.id
         self.validated_data["edited_at"] = timezone.now()
+        self.validated_data["edited_by"] = self.context["request"].user
         if rulebook_id:
             rulebook = models.Rulebook.objects.get(id=rulebook_id)
             self.validated_data["rulebook_name"] = rulebook.name
@@ -822,6 +827,7 @@ class ActivationReadSerializer(serializers.ModelSerializer):
     )
     created_by = BasicUserFieldSerializer()
     modified_by = BasicUserFieldSerializer()
+    edited_by = BasicUserFieldSerializer()
 
     class Meta:
         model = models.Activation
@@ -850,6 +856,7 @@ class Meta:
             "edited_at",
             "created_by",
             "modified_by",
+            "edited_by",
             "restarted_at",
             "status_message",
             "awx_token_id",
@@ -962,6 +969,7 @@ def to_representation(self, activation):
             "skip_audit_events": activation.skip_audit_events,
             "created_by": BasicUserSerializer(activation.created_by).data,
             "modified_by": BasicUserSerializer(activation.modified_by).data,
+            "edited_by": BasicUserSerializer(activation.modified_by).data,
         }
 
 

src/aap_eda/api/views/activation.py

@@ -155,7 +155,9 @@ def partial_update(self, request, pk):
             ActivationStatus.WORKERS_OFFLINE,
         ]:
             return Response(
-                data="Activation is not in disabled mode or in stopped status",
+                data=(
+                    "Activation is not in disabled mode and in stopped status"
+                ),
                 status=status.HTTP_409_CONFLICT,
             )
         serializer = self.get_serializer(
@@ -165,6 +167,7 @@ def partial_update(self, request, pk):
         serializer.prepare_update(activation)
 
         old_data = model_to_dict(activation)
+        is_enabled = serializer.validated_data.pop("is_enabled", False)
         with transaction.atomic():
             serializer.update(activation, serializer.validated_data)
             check_related_permissions(
@@ -184,6 +187,11 @@ def partial_update(self, request, pk):
             )
         )
 
+        if is_enabled:
+            response = self._start(activation)
+            if response.status_code >= status.HTTP_400_BAD_REQUEST:
+                return response
+
         return Response(serializers.ActivationReadSerializer(activation).data)
 
     @extend_schema(
@@ -346,7 +354,9 @@ def instances(self, request, id):
     @action(methods=["post"], detail=True, rbac_action=Action.ENABLE)
     def enable(self, request, pk):
         activation = self.get_object()
+        return self._start(activation)
 
+    def _start(self, activation: models.Activation) -> Response:
         if activation.is_enabled:
             return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -391,7 +401,7 @@ def enable(self, request, pk):
         )
         start_rulebook_process(
             process_parent_type=ProcessParentType.ACTIVATION,
-            process_parent_id=pk,
+            process_parent_id=activation.id,
         )
 
         logger.info(

src/aap_eda/core/migrations/0060_activation_edited_by.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.16 on 2025-03-10 16:32
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0059_alter_activation_user_alter_eventstream_owner"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="activation",
+            name="edited_by",
+            field=models.ForeignKey(
+                default=None,
+                editable=False,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%s(class)s_edited+",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

src/aap_eda/core/models/activation.py

@@ -99,6 +99,14 @@ class Meta:
     edited_at = models.DateTimeField(null=True)
     status_updated_at = models.DateTimeField(null=True)
     status_message = models.TextField(null=True, default=None)
+    edited_by = models.ForeignKey(
+        User,
+        related_name="%s(class)s_edited+",
+        default=None,
+        null=True,
+        editable=False,
+        on_delete=models.SET_NULL,
+    )
     latest_instance = models.OneToOneField(
         "RulebookProcess",
         null=True,

tests/integration/api/test_activation.py

@@ -1132,14 +1132,19 @@ def test_update_activation(
 
     id = response.data["id"]
     response = admin_client.patch(
-        f"{api_url_v1}/activations/{id}/", data={"name": "another_name"}
+        f"{api_url_v1}/activations/{id}/",
+        data={"name": "another_name", "is_enabled": True},
     )
     assert response.status_code == status.HTTP_200_OK
     data = response.data
     assert data["edited_at"] is not None
+    assert data["edited_by"]["username"] == "test.admin"
     activation = models.Activation.objects.filter(id=data["id"]).first()
     assert activation.name == "another_name"
     assert activation.edited_at is not None
+    assert activation.edited_by.username == "test.admin"
+    assert activation.is_enabled is True
+    assert activation.status == enums.ActivationStatus.PENDING
 
 
 @pytest.mark.django_db
@@ -1180,7 +1185,7 @@ def test_update_enabled_activation(
     assert response.status_code == status.HTTP_409_CONFLICT
     assert (
         response.data
-        == "Activation is not in disabled mode or in stopped status"
+        == "Activation is not in disabled mode and in stopped status"
     )