feat: Observation.actions to capture activity (#15768)

Author: miketheman

tests/unit/admin/views/test_core.py

@@ -31,6 +31,8 @@ def test_dashboard(self, pyramid_request):
 
     def test_dashboard_with_permission_and_observation(self, db_request):
         ProjectObservationFactory.create(kind="is_malware")
+        ProjectObservationFactory.create(kind="is_malware", actions={"foo": "bar"})
+        ProjectObservationFactory.create(kind="something_else")
         db_request.user = pretend.stub()
         db_request.has_permission = pretend.call_recorder(lambda perm: True)
 

warehouse/admin/views/core.py

@@ -28,7 +28,8 @@ def dashboard(request):
         # Count how many Malware Project Observations are in the database
         malware_reports_count = (
             request.db.query(func.count(Observation.id)).filter(
-                Observation.kind == ObservationKind.IsMalware.value[0]
+                Observation.kind == ObservationKind.IsMalware.value[0],
+                Observation.actions == {},  # No actions have been taken
             )
         ).scalar()
     else:

warehouse/migrations/versions/8673550a67a3_add_observation_actions.py

@@ -0,0 +1,54 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""
+Add Observation.actions
+
+Revision ID: 8673550a67a3
+Revises: 73c201ff90f3
+Create Date: 2024-04-11 20:45:05.218380
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+revision = "8673550a67a3"
+down_revision = "73c201ff90f3"
+
+
+def upgrade():
+    op.add_column(
+        "project_observations",
+        sa.Column(
+            "actions",
+            postgresql.JSONB(astext_type=sa.Text()),
+            server_default=sa.text("'{}'"),
+            nullable=False,
+            comment="Actions taken based on the observation",
+        ),
+    )
+    op.add_column(
+        "release_observations",
+        sa.Column(
+            "actions",
+            postgresql.JSONB(astext_type=sa.Text()),
+            server_default=sa.text("'{}'"),
+            nullable=False,
+            comment="Actions taken based on the observation",
+        ),
+    )
+
+
+def downgrade():
+    op.drop_column("release_observations", "actions")
+    op.drop_column("project_observations", "actions")

warehouse/observations/models.py

@@ -156,6 +156,11 @@ class Observation(AbstractConcreteBase, db.Model):
         comment="Additional data for the observation",
         server_default=sql.text("'{}'"),
     )
+    actions: Mapped[dict] = mapped_column(
+        JSONB,
+        comment="Actions taken based on the observation",
+        server_default=sql.text("'{}'"),
+    )
 
     def __repr__(self):
         return f"<{self.__class__.__name__} {self.kind}>"