Merge pull request #69 from AirWalk-Digital/feature/fix-aggregations

Feature/fix aggregations

README.md

@@ -63,3 +63,5 @@ SQLite is ok for dev, but for a more representative environment postgres should
 docker run --name some-postgres -e POSTGRES_PASSWORD=password -d -p 5432:5432 postgres
 FLASK_APP=./utils/debug.py FLASK_DEBUG=True DATABASE_URI=postgresql://postgres:[email protected]/airview CREATE_DB=True flask run
 ```
+
+

app/airview_api/services/aggregation_service.py

@@ -1,5 +1,6 @@
 from airview_api.database import db
 from sqlalchemy import func, literal
+from sqlalchemy.sql.functions import coalesce
 import itertools
 from datetime import datetime
 import json
@@ -36,6 +37,7 @@ def get_control_overviews(application_id: int, quality_model: str):
         .join(Control)
         .join(System)
         .join(Service)
+        .join(Resource)
         .group_by(
             TechnicalControl.id,
             TechnicalControl.name,
@@ -74,9 +76,9 @@ def get_compliance_aggregation(application_id):
             System.name,
             System.stage,
             TechnicalControl.name,
-            Control.severity,
-            Control.name,
-            Control.id,
+            coalesce(Control.severity, literal("HIGH")),
+            coalesce(Control.name, literal("Unmapped")),
+            coalesce(Control.id, literal(0)),
             Resource.id,
             Resource.name,
             MonitoredResource.last_modified,
@@ -86,8 +88,8 @@ def get_compliance_aggregation(application_id):
         .join(Resource)
         .join(MonitoredResource)
         .join(TechnicalControl)
-        .join(Control)
-        .join(System)
+        .join(Control, isouter=True)
+        .join(System, isouter=True)
         .where(MonitoredResource.monitoring_state == MonitoredResourceState.FLAGGED)
         .where(ApplicationEnvironment.application_id == application_id)
     )
@@ -131,7 +133,10 @@ def get_control_overview_resources(application_id, technical_control_id):
             Resource.id,
             Resource.name,
             Environment.name.label("environment"),
-            MonitoredResource.monitoring_state.label("status"),
+            coalesce(
+                MonitoredResource.monitoring_state,
+                literal("MONITORING"),
+            ).label("status"),
             literal(False).label("pending"),
         )
         .select_from(ApplicationEnvironment)

docs/openapi.json

@@ -1514,15 +1514,15 @@
         "parameters": [
           {
             "in": "query",
-            "name": "reference",
+            "name": "type",
             "required": false,
             "schema": {
               "type": "string"
             }
           },
           {
             "in": "query",
-            "name": "type",
+            "name": "reference",
             "required": false,
             "schema": {
               "type": "string"