Use type designators for parameter files

Author: szarnyasg

cypher/bi.py

@@ -35,14 +35,13 @@ def convert_to_datetime(timestamp):
         parameters_csv = csv.DictReader(open(f'parameters/bi-{query_id}.txt'), delimiter='|')
 
         for query_parameters in parameters_csv:
-            query_parameters = {k: int(v) if re.match(r'^[0-9]+$', v) else v for k, v in query_parameters.items()}
-            query_parameters = {
-              k.replace('[]', ''):
-              v.split(';') if re.findall('\[\]$', k) else v for k, v in query_parameters.items()
-            }
-            #re.findall('\[\]$', 'A')
-            query_parameters = {k: convert_to_datetime(v) if re.findall('date', k.lower()) else v for k, v in query_parameters.items()}
-            print(query_parameters)
+            # convert fields based on type designators
+            query_parameters = {k: int(v)                 if re.match('.*:(ID|LONG)', k) else v for k, v in query_parameters.items()}
+            query_parameters = {k: convert_to_datetime(v) if re.match('.*:DATETIME', k)  else v for k, v in query_parameters.items()}
+            query_parameters = {k: v.split(';')           if re.findall('\[\]$', k)      else v for k, v in query_parameters.items()}
+            # drop type designators
+            type_pattern = re.compile(':.*')
+            query_parameters = {type_pattern.sub('', k): v for k, v in query_parameters.items()}
             run_query(session, query_id, query_spec, query_parameters)
 
 driver.close()

cypher/parameters/bi-1.txt

@@ -1,2 +1,2 @@
-datetime
+datetime:DATETIME
 2011-12-01

cypher/parameters/bi-10.txt

@@ -1,2 +1,2 @@
-personId|country|tagClass|minPathDistance|maxPathDistance
+personId:ID|country:STRING|tagClass:STRING|minPathDistance:LONG|maxPathDistance:LONG
 5|France|Sports|2|3

cypher/parameters/bi-11.txt

@@ -1,2 +1,2 @@
-country|startDate
+country:STRING|startDate:DATETIME
 France|2010-05-01

cypher/parameters/bi-12.txt

@@ -1,2 +1,2 @@
-date|lengthThreshold|languages[]
+date:DATETIME|lengthThreshold:LONG|languages:STRING[]
 2010-07-22|50|en;fr

cypher/parameters/bi-13.txt

@@ -1,2 +1,2 @@
-country|endDate
+country:STRING|endDate:DATETIME
 France|2013-01-01

cypher/parameters/bi-14.txt

@@ -1,2 +1,2 @@
-country1|country2
+country1:STRING|country2:STRING
 France|Spain

cypher/parameters/bi-15.txt

@@ -1,2 +1,2 @@
-person1Id|person2Id|startDate|endDate
+person1Id:ID|person2Id:ID|startDate:DATETIME|endDate:DATETIME
 2|4|2011-06-01|2012-05-31

cypher/parameters/bi-16.txt

@@ -1,2 +1,2 @@
-tagA|dateA|tagB|dateB|maxKnowsLimit
+tagA:STRING|dateA:DATETIME|tagB:STRING|dateB:DATETIME|maxKnowsLimit:LONG
 Pyrenees|2011-10-10|Snowboard|2012-03-04|5

cypher/parameters/bi-17.txt

@@ -1,2 +1,2 @@
-tag|delta
+tag:STRING|delta:LONG
 Snowboard|10