Merge branch 'develop' into 3287-add-label-names-to-filter

nllong · web-flow · commit 4d279c7b5713 · 2022-06-10T09:40:04.000-06:00
diff --git a/seed/analysis_pipelines/better/pipeline.py b/seed/analysis_pipelines/better/pipeline.py
@@ -463,7 +463,7 @@ def _process_results(self, analysis_id):
             is_extra_data=True,
             column_name=column_data_path.column_name,
             display_name=column_data_path.column_display_name,
-            column_description=column_data_path.column_description,
+            column_description=column_data_path.column_display_name,
             organization=analysis.organization,
             table_name='PropertyState',
         )
diff --git a/seed/migrations/0168_datalogger_identifier.py b/seed/migrations/0168_datalogger_identifier.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.13 on 2022-06-09 21:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('seed', '0167_auto_20220608_0759'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='datalogger',
+            name='identifier',
+            field=models.CharField(default='', max_length=255),
+        ),
+    ]
diff --git a/seed/models/sensors.py b/seed/models/sensors.py
@@ -15,6 +15,7 @@ class DataLogger(models.Model):
     )
 
     display_name = models.CharField(max_length=255)
+    identifier = models.CharField(max_length=255, default="")
     location_description = models.CharField(max_length=2047, default="")
     is_occupied_data = models.JSONField(null=False, default=dict)
     manufacturer_name = models.CharField(max_length=255, null=True)
diff --git a/seed/static/seed/js/controllers/data_logger_upload_modal_controller.js b/seed/static/seed/js/controllers/data_logger_upload_modal_controller.js
@@ -26,6 +26,7 @@ angular.module('BE.seed.controller.data_logger_upload_modal', [])
           manufacturer_name: null,
           model_name: null,
           serial_number: null,
+          identifier: null,
       };
 
       $scope.create_data_logger = function(){
@@ -43,6 +44,7 @@ angular.module('BE.seed.controller.data_logger_upload_modal', [])
             $scope.data_logger.manufacturer_name,
             $scope.data_logger.model_name,
             $scope.data_logger.serial_number,
+            $scope.data_logger.identifier,
           ).then((result) => {
             $scope.data_logger = result;
             $scope.refresh_page();
diff --git a/seed/static/seed/js/controllers/inventory_detail_sensors_controller.js b/seed/static/seed/js/controllers/inventory_detail_sensors_controller.js
@@ -95,6 +95,10 @@ angular.module('BE.seed.controller.inventory_detail_sensors', [])
           enableHiding: false,
           type: 'string'
         }, {
+          field: 'identifier',
+          displayName: 'Datalogger ID',
+          enableHiding: false
+        },{
           field: 'location_description',
           displayName: 'Location Description',
           enableHiding: false
diff --git a/seed/static/seed/js/controllers/inventory_list_beta_controller.js b/seed/static/seed/js/controllers/inventory_list_beta_controller.js
@@ -1089,6 +1089,18 @@ angular.module('BE.seed.controller.inventory_list_beta', [])
                 return !_.has(row, '$$treeLevel');
               }), 'id');
             },
+            property_states: function () {
+              return _.map(_.filter($scope.gridApi.selection.getSelectedRows(), function (row) {
+                if ($scope.inventory_type === 'properties') return row.$$treeLevel === 0;
+                return !_.has(row, '$$treeLevel');
+              }), 'property_state_id');
+            },
+            taxlot_states: function () {
+              return _.map(_.filter($scope.gridApi.selection.getSelectedRows(), function (row) {
+                if ($scope.inventory_type === 'taxlots') return row.$$treeLevel === 0;
+                return !_.has(row, '$$treeLevel');
+              }), 'taxlot_state_id');
+            },
             inventory_type: _.constant($scope.inventory_type),
           }
         });
diff --git a/seed/static/seed/js/controllers/inventory_list_controller.js b/seed/static/seed/js/controllers/inventory_list_controller.js
@@ -1069,6 +1069,18 @@ angular.module('BE.seed.controller.inventory_list', [])
                 return !_.has(row, '$$treeLevel');
               }), 'id');
             },
+            property_states: function () {
+              return _.map(_.filter($scope.gridApi.selection.getSelectedRows(), function (row) {
+                if ($scope.inventory_type === 'properties') return row.$$treeLevel === 0;
+                return !_.has(row, '$$treeLevel');
+              }), 'property_state_id');
+            },
+            taxlot_states: function () {
+              return _.map(_.filter($scope.gridApi.selection.getSelectedRows(), function (row) {
+                if ($scope.inventory_type === 'taxlots') return row.$$treeLevel === 0;
+                return !_.has(row, '$$treeLevel');
+              }), 'taxlot_state_id');
+            },
             inventory_type: _.constant($scope.inventory_type),
           }
         });
diff --git a/seed/static/seed/js/controllers/refresh_metadata_modal_controller.js b/seed/static/seed/js/controllers/refresh_metadata_modal_controller.js
@@ -7,6 +7,8 @@ angular.module('BE.seed.controller.refresh_metadata_modal', []).controller('refr
     '$state',
     '$uibModalInstance',
     'ids',
+    'property_states',
+    'taxlot_states',
     'inventory_type',
     'inventory_service',
     'uploader_service',
@@ -15,11 +17,14 @@ angular.module('BE.seed.controller.refresh_metadata_modal', []).controller('refr
         $state,
         $uibModalInstance,
         ids,
+        property_states,
+        taxlot_states,
         inventory_type,
         inventory_service,
         uploader_service,
 
     ) {
+        const states = property_states || taxlot_states
         $scope.id_count = ids.length
         $scope.inventory_type = inventory_type
         $scope.refresh_progress = {
@@ -36,7 +41,7 @@ angular.module('BE.seed.controller.refresh_metadata_modal', []).controller('refr
                     function () { $scope.refresh_page()},
                     function () { },
                     $scope.refresh_progress);
-                return inventory_service.refresh_metadata(ids, inventory_type, data.data.progress_key);
+                return inventory_service.refresh_metadata(ids, states, inventory_type, data.data.progress_key);
             })
         }
 
diff --git a/seed/static/seed/js/services/inventory_service.js b/seed/static/seed/js/services/inventory_service.js
@@ -1164,9 +1164,10 @@ angular.module('BE.seed.service.inventory', []).factory('inventory_service', [
       });
     };
 
-    inventory_service.refresh_metadata = function (ids, inventory_type, progress_key) {
+    inventory_service.refresh_metadata = function (ids, states, inventory_type, progress_key) {
       return $http.post(`/api/v3/tax_lot_properties/refresh_metadata/`, {
         ids: ids,
+        states: states,
         inventory_type: inventory_type,
         progress_key: progress_key,
         organization_id: user_service.get_organization().id
diff --git a/seed/static/seed/js/services/sensor_service.js b/seed/static/seed/js/services/sensor_service.js
@@ -20,7 +20,8 @@ angular.module('BE.seed.service.sensor', [])
         location_description,
         manufacturer_name,
         model_name,
-        serial_number
+        serial_number,
+        identifier,
       ) {
         return $http(
           {
@@ -33,6 +34,7 @@ angular.module('BE.seed.service.sensor', [])
               manufacturer_name,
               model_name,
               serial_number,
+              identifier,
             }
           }
         ).then(function (response) {
diff --git a/seed/static/seed/partials/data_logger_upload_modal.html b/seed/static/seed/partials/data_logger_upload_modal.html
@@ -14,6 +14,13 @@ <h4 class="modal-title" translate>CREATE_DATA_LOGGER</h4>
                 </div>
             </div>
 
+            <div>
+                <label class="col-sm-3 col-sm-offset-1 control-label" translate>Datalogger ID</label>
+                <div class="col-sm-7">
+                    <input type="text" class="form-control" ng-model="data_logger.identifier">
+                </div>
+            </div>
+
             <div>
                 <label class="col-sm-3 col-sm-offset-1 control-label" translate>Location Description</label>
                 <div class="col-sm-7">
diff --git a/seed/tasks.py b/seed/tasks.py
@@ -411,23 +411,35 @@ def _delete_organization_taxlot_state_chunk(del_ids, prog_key, org_pk, *args, **
 
 
 @shared_task
-def update_inventory_metadata(ids, inventory_type, progress_key):
+def update_inventory_metadata(ids, states, inventory_type, progress_key):
     now = datetime.now(pytz.UTC)
     progress_data = ProgressData.from_key(progress_key)
     progress_data.total = 100
     id_count = len(ids)
     batch_size = math.ceil(id_count / 100)
 
+    # Find related Properties and PropertyStates
     if inventory_type == 'properties':
-        inventory = Property.objects.filter(id__in=ids)
-    else:
-        inventory = TaxLot.objects.filter(id__in=ids)
+        properties = Property.objects.filter(id__in=ids)
+        states = PropertyState.objects.filter(id__in=states)
+        inventory = list(properties) + list(states)
+
+    elif inventory_type == 'taxlots':
+        taxlots = TaxLot.objects.filter(id__in=ids)
+        states = TaxLotState.objects.filter(id__in=states)
+        inventory = list(taxlots) + list(states)
 
-    for idx, inv in enumerate(inventory):
-        inv.updated = now
-        inv.save()
+    else:
+        return
+
+    # Iterates across Properties (or Taxlots) and -States and refreshes each 'updated' attribute
+    # Updating Properties (or Taxlots) for OEP Connection
+    # Updating -States for UI feedack on inventory list
+    for idx, state in enumerate(inventory):
+        state.updated = now
+        state.save()
         if batch_size > 0 and idx % batch_size == 0:
-            progress_data.step(f'Refreshing ({idx}/{id_count}) ')
+            progress_data.step(f'Refreshing ({idx}/{id_count})')
 
     progress_data.finish_with_success()
     return progress_data.result()['progress']
diff --git a/seed/tests/test_tax_lot_property.py b/seed/tests/test_tax_lot_property.py
@@ -18,6 +18,7 @@
     Cycle,
     Note,
     Property,
+    PropertyState,
     PropertyView,
     TaxLotProperty
 )
@@ -221,21 +222,26 @@ def test_json_export(self):
         self.assertEqual(len(data['features']), 51)
 
     def test_refresh_metadata(self):
-        ids = []
         for i in range(50):
             p = self.property_view_factory.get_property_view()
-            ids.append(p.id)
             self.properties.append(p.id)
 
-        property_views = PropertyView.objects.filter(id__in=ids)
-        updated_initial = list(map(lambda pv: pv.property.updated, property_views))
+        ids = [prop.id for prop in Property.objects.all()]
+        ps_ids = [ps.id for ps in PropertyState.objects.all()]
+
+        p_updated_initial = [prop.updated for prop in Property.objects.all()]
+        ps_updated_initial = [state.updated for state in PropertyState.objects.all()]
+
         time.sleep(1)
 
         progress_data = ProgressData(func_name='refresh_metadata', unique_id=f'metadata{randint(10000,99999)}')
-        update_inventory_metadata(ids, 'properties', progress_data.key)
+        update_inventory_metadata(ids, ps_ids, 'properties', progress_data.key)
 
         for i, p in enumerate(Property.objects.filter(id__in=ids)):
-            self.assertGreater(p.updated, updated_initial[i])
+            self.assertGreater(p.updated, p_updated_initial[i])
+
+        for i, ps in enumerate(PropertyState.objects.filter(id__in=ps_ids)):
+            self.assertGreater(ps.updated, ps_updated_initial[i])
 
     def tearDown(self):
         for x in self.properties:
diff --git a/seed/views/v3/data_logger.py b/seed/views/v3/data_logger.py
@@ -44,6 +44,7 @@ def list(self, request):
                 "manufacturer_name": data_logger.manufacturer_name,
                 "model_name": data_logger.model_name,
                 "serial_number": data_logger.serial_number,
+                "identifier": data_logger.identifier,
             })
 
         return res
@@ -63,6 +64,7 @@ def create(self, request):
         model_name = body.get('model_name')
         serial_number = body.get('serial_number')
         location_description = body.get("location_description")
+        identifier = body.get("identifier")
 
         property_view = PropertyView.objects.get(
             pk=property_view_id,
@@ -77,6 +79,7 @@ def create(self, request):
             manufacturer_name=manufacturer_name,
             model_name=model_name,
             serial_number=serial_number,
+            identifier=identifier,
         )
 
         # for every weekday from 2020-2023, mark as occupied from 8-5
@@ -117,6 +120,7 @@ def create(self, request):
                 "manufacturer_name": data_logger.manufacturer_name,
                 "model_name": data_logger.model_name,
                 "serial_number": data_logger.serial_number,
+                "identifier": data_logger.identifier,
             }
 
         return result
diff --git a/seed/views/v3/tax_lot_properties.py b/seed/views/v3/tax_lot_properties.py
@@ -594,8 +594,9 @@ def refresh_metadata(self, request):
         Kick off celery task to refresh metadata of selected inventory
         """
         ids = request.data.get('ids')
+        states = request.data.get('states')
         inventory_type = request.data.get('inventory_type')
         progress_key = request.data.get('progress_key')
 
-        update_inventory_metadata.subtask([ids, inventory_type, progress_key]).apply_async()
+        update_inventory_metadata.subtask([ids, states, inventory_type, progress_key]).apply_async()
         return

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ def _process_results(self, analysis_id):`
`463`	`463`	`is_extra_data=True,`
`464`	`464`	`column_name=column_data_path.column_name,`
`465`	`465`	`display_name=column_data_path.column_display_name,`
`466`		`- column_description=column_data_path.column_description,`
	`466`	`+ column_description=column_data_path.column_display_name,`
`467`	`467`	`organization=analysis.organization,`
`468`	`468`	`table_name='PropertyState',`
`469`	`469`	`)`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ class DataLogger(models.Model):`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`display_name = models.CharField(max_length=255)`
	`18`	`+ identifier = models.CharField(max_length=255, default="")`
`18`	`19`	`location_description = models.CharField(max_length=2047, default="")`
`19`	`20`	`is_occupied_data = models.JSONField(null=False, default=dict)`
`20`	`21`	`manufacturer_name = models.CharField(max_length=255, null=True)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ angular.module('BE.seed.service.sensor', [])`
`20`	`20`	`location_description,`
`21`	`21`	`manufacturer_name,`
`22`	`22`	`model_name,`
`23`		`- serial_number`
	`23`	`+ serial_number,`
	`24`	`+ identifier,`
`24`	`25`	`) {`
`25`	`26`	`return $http(`
`26`	`27`	`{`
`@@ -33,6 +34,7 @@ angular.module('BE.seed.service.sensor', [])`
`33`	`34`	`manufacturer_name,`
`34`	`35`	`model_name,`
`35`	`36`	`serial_number,`
	`37`	`+ identifier,`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`	`).then(function (response) {`