MRG: Merge pull request #11 from aerosense-ai/fix/fix-software-config…

…uration-uniqueness-check Use correct column name when checking configuration uniqueness
aerosense-ai · Dec 13, 2021 · a25c0f6 · a25c0f6
2 parents 9ffb555 + 40d1f73
commit a25c0f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/cloud_functions/big_query.py b/cloud_functions/big_query.py
@@ -200,11 +200,14 @@ def add_configuration(self, configuration):
         # Installation data is stored in a separate column, so pop it before the next step.
         installation_data = configuration.pop("installation_data")
 
-        configuration_json = json.dumps(configuration)
-        configuration_hash = blake3(configuration_json.encode()).hexdigest()
+        software_configuration_json = json.dumps(configuration)
+        software_configuration_hash = blake3(software_configuration_json.encode()).hexdigest()
 
         configurations = list(
-            self.client.query(f"SELECT id FROM `{table_name}` WHERE `hash`='{configuration_hash}' LIMIT 1").result()
+            self.client.query(
+                f"SELECT id FROM `{table_name}` WHERE `software_configuration_hash`='{software_configuration_hash}' "
+                f"LIMIT 1"
+            ).result()
         )
 
         if len(configurations) > 0:
@@ -222,8 +225,8 @@ def add_configuration(self, configuration):
             rows=[
                 {
                     "id": configuration_id,
-                    "software_configuration": configuration_json,
-                    "software_configuration_hash": configuration_hash,
+                    "software_configuration": software_configuration_json,
+                    "software_configuration_hash": software_configuration_hash,
                     "installation_data": installation_data_json,
                     "installation_data_hash": installation_data_hash,
                 }

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name="data_gateway",
-    version="0.7.4",
+    version="0.7.5",
     install_requires=[
         "click>=7.1.2",
         "pyserial==3.5",