Add AL to insights page charts (#4948)

* Add AL ro insights page

* Lint

* Fix test

---------

Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com>

Author: haneslinger

seed/static/seed/js/controllers/inventory_reports_controller.js

@@ -94,6 +94,13 @@ angular.module('SEED.controller.inventory_reports', []).controller('inventory_re
       // for (const key in $scope.potential_level_instances) {
       //   $scope.potential_level_instances[key].name = path_to_string($scope.potential_level_instances[key].path);
       // }
+      const group_by_level = $scope.level_names[new_level_instance_depth];
+      $scope.xAxisVars.splice($scope.xAxisVars.length - 1, 1, {
+        name: group_by_level,
+        label: group_by_level,
+        varName: group_by_level,
+        axisLabel: group_by_level
+      });
       $scope.access_level_instance_id = null;
       $scope.setModified();
     };
@@ -296,6 +303,13 @@ angular.module('SEED.controller.inventory_reports', []).controller('inventory_re
 
       $scope.level_name_index = JSON.parse(localStorage.getItem(localStorageALIndex)) || '0';
       const new_level_instance_depth = parseInt($scope.level_name_index, 10) + parseInt(users_depth, 10);
+      const group_by_level = $scope.level_names[new_level_instance_depth];
+      $scope.xAxisVars.push({
+        name: group_by_level,
+        label: group_by_level,
+        varName: group_by_level,
+        axisLabel: group_by_level
+      });
       $scope.potential_level_instances = access_level_instances_by_depth[new_level_instance_depth];
       $scope.access_level_instance_id = JSON.parse(localStorage.getItem(localStorageALIID)) || parseInt($scope.users_access_level_instance_id, 10);
     }
@@ -707,7 +721,7 @@ angular.module('SEED.controller.inventory_reports', []).controller('inventory_re
             };
 
             // new agg chart
-            const the_data = _.orderBy($scope.aggChartData.chartData, ['y'], ['acs']);
+            const the_data = $scope.aggChartData.chartData;
             $scope.barChart.data.labels = the_data.map((a) => a.y);
             $scope.barChart.data.datasets[0].data = the_data.map((a) => a.x);
             // add the colors to the datapoints, need to create a hash map first

seed/tests/test_reports.py

@@ -10,8 +10,12 @@
 from xlrd import open_workbook
 
 from seed.models import ASSESSED_RAW, Column, Property, PropertyState, PropertyView
-from seed.test_helpers.fake import FakeCycleFactory
-from seed.tests.util import DataMappingBaseTestCase
+from seed.test_helpers.fake import (
+    FakeCycleFactory,
+    FakePropertyFactory,
+    FakePropertyViewFactory,
+)
+from seed.tests.util import AccessLevelBaseTestCase, DataMappingBaseTestCase
 
 
 class ExportReport(DataMappingBaseTestCase):
@@ -120,6 +124,25 @@ def test_report_aggregated(self):
 
         assert response.json()["aggregated_data"]["property_counts"] == [{"yr_e": "2015", "num_properties": 5, "num_properties_w-data": 5}]
 
+    def test_report_aggregated_count(self):
+        url = reverse("api:v3:organizations-report-aggregated", args=[self.org.pk])
+        data = {
+            "cycle_ids": [self.cycle.id, self.cycle_2.id],
+            "x_var": "Count",
+            "y_var": "site_eui",
+            "access_level_instance_id": self.org.root.id,
+        }
+        response = self.client.get(url, data)
+        assert response.json()["aggregated_data"]["property_counts"] == [
+            {"yr_e": "2016", "num_properties": 5, "num_properties_w-data": 5},
+            {"yr_e": "2015", "num_properties": 5, "num_properties_w-data": 5},
+        ]
+
+        data["cycle_ids"] = [self.cycle.id]
+        response = self.client.get(url, data)
+
+        assert response.json()["aggregated_data"]["property_counts"] == [{"yr_e": "2015", "num_properties": 5, "num_properties_w-data": 5}]
+
     def test_report_missing_arg(self):
         url = reverse("api:v3:organizations-report-aggregated", args=[self.org.pk])
         data = {
@@ -130,3 +153,60 @@ def test_report_missing_arg(self):
         response = self.client.get(url, data)
 
         assert response.status_code == 400
+
+
+class ExportReportALITests(AccessLevelBaseTestCase):
+    def setUp(self):
+        super().setUp()
+        self.cycle = self.cycle_factory.get_cycle()
+        self.property_factory = FakePropertyFactory(organization=self.org)
+        self.property_view_factory = FakePropertyViewFactory(organization=self.org, cycle=self.cycle)
+
+        # two alis on the same level, "child"
+        self.kid_1 = self.child_level_instance
+        self.kid_2 = self.org.add_new_access_level_instance(self.org.root.id, "kid_2")
+
+        # two properties in each level
+        self.property_1 = self.property_factory.get_property(access_level_instance=self.kid_1)
+        self.view_1 = self.property_view_factory.get_property_view(prprty=self.property_1, site_eui=30)
+        self.property_2 = self.property_factory.get_property(access_level_instance=self.kid_1)
+        self.view_2 = self.property_view_factory.get_property_view(prprty=self.property_2, site_eui=40)
+
+        self.property_3 = self.property_factory.get_property(access_level_instance=self.kid_2)
+        self.view_3 = self.property_view_factory.get_property_view(prprty=self.property_3, site_eui=50)
+        self.property_4 = self.property_factory.get_property(access_level_instance=self.kid_2)
+        self.view_4 = self.property_view_factory.get_property_view(prprty=self.property_4, site_eui=60)
+
+    def test_report_aggregated_with_access_level(self):
+        url = reverse("api:v3:organizations-report-aggregated", args=[self.org.pk])
+        data = {
+            "cycle_ids": [self.cycle.id],
+            "x_var": "site_eui",
+            "y_var": "child",
+            "access_level_instance_id": self.org.root.id,
+        }
+
+        response = self.client.get(url, data)
+        self.assertListEqual(
+            response.json()["aggregated_data"]["chart_data"],
+            [{"y": "kid_2", "x": 55.0, "yr_e": "2016"}, {"y": "child", "x": 35.0, "yr_e": "2016"}],
+        )
+
+    def test_report_with_access_level(self):
+        url = reverse("api:v3:organizations-report", args=[self.org.pk])
+        data = {
+            "cycle_ids": [self.cycle.id],
+            "x_var": "child",
+            "y_var": "site_eui",
+        }
+        response = self.client.get(url, data)
+
+        self.assertListEqual(
+            response.json()["data"]["chart_data"],
+            [
+                {"id": self.view_1.id, "x": "child", "y": 30.0, "yr_e": "2016"},
+                {"id": self.view_2.id, "x": "child", "y": 40.0, "yr_e": "2016"},
+                {"id": self.view_3.id, "x": "kid_2", "y": 50.0, "yr_e": "2016"},
+                {"id": self.view_4.id, "x": "kid_2", "y": 60.0, "yr_e": "2016"},
+            ],
+        )

seed/views/v3/organizations.py

@@ -880,7 +880,11 @@ def setup_report_data(self, organization_id, access_level_instance, cycles, x_va
 
         # annotate properties with fields
         def get_column_model_field(column):
-            if column.is_extra_data:
+            if column in Organization.objects.get(pk=organization_id).access_level_names:
+                return F("property__access_level_instance__path__" + column)
+            elif column == "Count":
+                return Value(1)
+            elif column.is_extra_data:
                 return F("state__extra_data__" + column.column_name)
             elif column.derived_column:
                 return F("state__derived_data__" + column.column_name)
@@ -892,8 +896,6 @@ def get_column_model_field(column):
             "x": get_column_model_field(x_var),
             "y": get_column_model_field(y_var),
         }
-        if x_var == "Count":
-            fields["x"] = Value(1)
         for k, v in fields.items():
             all_property_views = all_property_views.annotate(**{k: v})
 
@@ -968,9 +970,20 @@ def report(self, request, pk=None):
                 {"status": "error", "message": f"Missing params: {', '.join(missing_params)}"}, status=status.HTTP_400_BAD_REQUEST
             )
 
+        # x could be an access level, else its a column
+        access_level_names = Organization.objects.get(pk=pk).access_level_names
+        if params["x_var"] not in access_level_names:
+            x_var = Column.objects.get(column_name=params["x_var"], organization=pk, table_name="PropertyState")
+        else:
+            x_var = params["x_var"]
+
+        # y could be count, else its a column
+        if params["y_var"] != "Count":
+            y_var = Column.objects.get(column_name=params["y_var"], organization=pk, table_name="PropertyState")
+        else:
+            y_var = params["y_var"]
+
         cycles = Cycle.objects.filter(id__in=params["cycle_ids"])
-        x_var = Column.objects.get(column_name=params["x_var"], organization=pk, table_name="PropertyState")
-        y_var = Column.objects.get(column_name=params["y_var"], organization=pk, table_name="PropertyState")
         report_data = self.setup_report_data(pk, ali, cycles, x_var, y_var, filter_group_id)
         data = self.get_raw_report_data(pk, cycles, report_data["all_property_views"], report_data["field_data"])
         axis_data = self.get_axis_data(
@@ -1033,10 +1046,20 @@ def report_aggregated(self, request, pk=None):
                 {"status": "error", "message": f"Missing params: {', '.join(missing_params)}"}, status=status.HTTP_400_BAD_REQUEST
             )
 
-        # get data
+        # X could be count, else its a column
+        if params["x_var"] != "Count":
+            x_var = Column.objects.get(column_name=params["x_var"], organization=pk, table_name="PropertyState")
+        else:
+            x_var = params["x_var"]
+
+        # y could be an access level, else its a column
+        access_level_names = Organization.objects.get(pk=pk).access_level_names
+        if params["y_var"] not in access_level_names:
+            y_var = Column.objects.get(column_name=params["y_var"], organization=pk, table_name="PropertyState")
+        else:
+            y_var = params["y_var"]
+
         cycles = Cycle.objects.filter(id__in=params["cycle_ids"])
-        x_var = Column.objects.get(column_name=params["x_var"], organization=pk, table_name="PropertyState")
-        y_var = Column.objects.get(column_name=params["y_var"], organization=pk, table_name="PropertyState")
         report_data = self.setup_report_data(pk, ali, cycles, x_var, y_var, filter_group_id)
         data = self.get_raw_report_data(pk, cycles, report_data["all_property_views"], report_data["field_data"])
         chart_data = []
@@ -1102,7 +1125,7 @@ def discrete_aggregate_data(self, yr_e, buildings, bins, count=False):
 
             results.append({"y": bin, "x": x, "yr_e": yr_e})
 
-        return results
+        return sorted(results, key=lambda d: d["x"], reverse=True)
 
     @swagger_auto_schema(
         manual_parameters=[